jufubao-base 1.0.307-beta1 → 1.0.308

package/src/components/JfbBaseCodeOpenVip/Mock.js

@@ -8,8 +8,6 @@ module.exports = {
   
   removeCodeFilmAddress:{},
   
-  addCodeFilmcart: {},
-  getOpenBaseUserInfo: { "user_name": "", "user_code": "Uf4zx6EPfV", "nickname": "未来～", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/Q0j4TwGTfTJsajZzh53IB56crRSdmKvRbjT4V1Ha8v5uCOkASbWS0GibgLeic8OKBzAwUyBa3vZGhjwmd6RfpG9g\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "", "sex_name": "未知", "birthday_date": "", "phone_number": "13611111111", "show_user_name": "未来～", "user_level": "", "vip_expire_time": 1745026677, "request_id": "250e5709e6c95066" },
-
+  addCodeFilmcart:{},
   
 }

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -197,13 +197,6 @@
         </view>
       </view>
     </view>
-    <CusVipOpenDialog
-      v-if="is_vip==='N'"
-      :bgImg="openVipBgImg"
-      :btnBgImg="openVipBtnBgImg"
-      @onOpen="handleToOpen"
-      @onClose="handleCloseOpenVip"
-    ></CusVipOpenDialog>
   </view>
 </template>
 
@@ -224,7 +217,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from 'vuex';
-  import CusVipOpenDialog from "@/components/CusVipOpenDialog/CusVipOpenDialog"
+
   export default {
     //#ifdef MP-WEIXIN
     options: { styleIsolation: 'shared' },
@@ -236,8 +229,7 @@
       XdButton,
       XdDownDrawer,
       ShopList,
-      XdDeductSort,
-      CusVipOpenDialog
+      XdDeductSort
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseConsumpCodeMixin, QPMixin, JHDMixin, shopListMixin
@@ -294,8 +286,7 @@
         QPIconType: "",
         QPIcon: "",
         QPImg: "",
-        openVipBtnBgImg: "",
-        openVipBgImg: "",
+
       }
     },
     watch: {
@@ -330,9 +321,6 @@
     created() {
       this.isPreview = this.$configProject['isPreview']
       this.is_vip = this.getTokenForKey('user_level') && this.getTokenForKey('user_level') === 'VIP' ? 'Y' : 'N'
-      if (this.$configProject['isPreview']) {
-        this.is_vip='Y'
-      }
       this.init(this.container);
       // #ifdef H5
       if (!this.$configProject.isPreview && (isWechat() || isWechatTools())) {
@@ -417,12 +405,7 @@
         this.QPIconType = gCPVal(container, 'QPIconType', "icon");
         this.QPIcon = gCPVal(container, 'QPIcon', 'iconerweima');
         this.QPImg = getServiceUrl(gCPVal(container, 'QPImg', {url: ""}).url);
-        this.openVipBgImg = getServiceUrl(
-          getContainerPropsValue(container, "content.openVipBgImg", { url: "" }).url,
-        );
-        this.openVipBtnBgImg = getServiceUrl(
-          getContainerPropsValue(container, "content.openVipBtnBgImg", { url: "" }).url
-        );
+
         console.log("this.scanImg", this.scanImg);
       },
       handleConsumeType(consumeType){
@@ -545,9 +528,6 @@
         if (this.statusTimer) clearTimeout(this.statusTimer);
         if (this.orderTimer) clearTimeout(this.orderTimer);
       },
-      handleCloseOpenVip() {
-        this.$xdUniHelper.navigateBack()
-      },
 
       onJfbUnload(options) {
         console.log('event.onJfbUnload', options)

package/src/components/JfbBaseConsumpCode/cusAttr/advanced.js

@@ -68,7 +68,7 @@ export default (data)=>{
       className: 'input100',
     },
     {
-      label: '选取城市',
+      label: '选取城市:',
       ele: 'xd-select-pages-path',
       valueKey: 'cityPath',
       placeholder: '请选择选取城市跳转页面',

package/src/components/JfbBaseConsumpCode/cusAttr/style.js

@@ -89,48 +89,6 @@ export default function (data={},gValue={},gColor={},oldData) {
       maxlen: 100,
       labelInline: true,
     },
-    { ele: 'group_end' },
-    {
-      label: "开通PLUS背景图",
-      ele: 'xd-upload',
-      valueKey: "openVipBgImg",
-      groupKey: "style",
-      labelInline: true,
-      value: data.openVipBgImg || {},
-      defaultValue: data.openVipBgImg || null,
-      slot: true,
-      oneWidth: 355,
-      oneHeight: 355,
-      elinputClassName: 'input40',
-      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>，高度为<span style="color:red">710px</span>',
-      type: ['jpg', 'png', 'jpeg'],
-      styleType: 'one',
-      uploadType: 'aliyun',
-      size: 5,
-      action: 'action',
-      sort: true,
-      maxlen: 100,
-    },
-    {
-      label: "开通PLUS按钮背景图",
-      ele: 'xd-upload',
-      valueKey: "openVipBtnBgImg",
-      groupKey: "style",
-      labelInline: true,
-      value: data.openVipBtnBgImg || {},
-      defaultValue: data.openVipBtnBgImg || null,
-      slot: true,
-      oneWidth: 223,
-      oneHeight: 44,
-      elinputClassName: 'input40',
-      tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">446px</span>，宽度为<span style="color:red">88px</span>',
-      type: ['jpg', 'png', 'jpeg'],
-      styleType: 'one',
-      uploadType: 'aliyun',
-      size: 5,
-      action: 'action',
-      sort: true,
-      maxlen: 100,
-    },
+    {ele: 'group_end'},
   ].filter(i=>i)
 }

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -115,7 +115,7 @@
                   :style="{
                     fontSize: fontSize + 'rpx',
                   }"
-                  v-html="$xdUniHelper.filterHtml(content)"
+                  v-html="contentComp"
                   @click="handleShowStatic"
                 >
                 </view>
@@ -282,6 +282,10 @@
       },
     },
     computed:{
+      contentComp(){
+        if(this.show_tip_icon==='Y') return  this.$xdUniHelper.filterHtml(this.content,'')
+        return this.content
+      },
       marginUi() {
         let str = `${this.checkValue(this.margin.top, 20)}rpx`;
         str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
@@ -350,13 +354,19 @@
         this.time = Number(getContainerPropsValue(container, 'content.time', 3));
         this.textColor = getContainerPropsValue(container, 'content.textColor', this.warningColor);
         this.textAlign = getContainerPropsValue(container, 'content.textAlign', 'left');
+
         this.bgc = getContainerPropsValue(container, 'content.bgc', `rgba(${colorBg.join(',')})`);
-        this.borderTitleColor = Color(this.bgc).lighten(.15).hex();
+        if(Color(this.bgc).isDark()) this.borderTitleColor = Color(this.bgc).lighten(0.9).toString();
+        else if(Color(this.bgc).isLight()) this.borderTitleColor = Color(this.bgc).darken(0.05).toString();
+
+
+
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
         this.padding = getContainerPropsValue(container, 'content.padding', {top: 8, left: 10, bottom: 8, right: 10});
         this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.fontSize = Number(getContainerPropsValue(container, 'content.fontSize', '20'));
+        this.titleFontSize = this.fontSize * 1.2;
         this.btnConfirmWidth = getContainerPropsValue(container, 'content.btnConfirmWidth', '');
         this.btnConfirmBgColor = getContainerPropsValue(container, 'content.btnConfirmBgColor', '');
         this.btnConfirmTextColor = getContainerPropsValue(container, 'content.btnConfirmTextColor', '');
@@ -364,13 +374,13 @@
         let staticTipIcon = getContainerPropsValue(container, 'content.staticTipIcon', '');
         this.staticTipIcon = staticTipIcon ? getServiceUrl(staticTipIcon.url) : '';
         this.tipIconHeight = getContainerPropsValue(container, 'content.tipIconHeight', 50);
+
+
         if (this.fontSize === 20) this.titleFontSize = 28;
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
 
-        console.log("this.staticTipIcon", this.staticTipIcon);
-
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
           //#ifdef H5
@@ -384,19 +394,20 @@
         this.is_hide_dailog = getContainerPropsValue(container, 'content.is_hide_dailog', 'N');
       },
       handleShowStatic(){
-        this.$xdConfirm({
-          styles: this.styles,
-          isTitle: false,
-          content: this.content,
-          isHtml: true,
-          zIndex: 2000,
-          cancel: false,
-          width: '700rpx'
-        });
+        if(this.show_tip_icon === 'Y') {
+          this.$xdConfirm({
+            styles: this.styles,
+            isTitle: false,
+            content: this.content,
+            isHtml: true,
+            zIndex: 2000,
+            cancel: false,
+            width: '700rpx'
+          });
+        }
       },
 
       handlePop(){
-        console.log('this.time', this.time * 60 + '分钟');
         storage.set(this.containerId, 1, this.time);
         this.$xdConfirm({
           styles: this.styles,

package/src/components/JfbBaseOpenVip/Attr.js

@@ -243,56 +243,6 @@ export default {
         inline: false,
         notice: '',
       },
-      {
-        label: "用户信息背景颜色:",
-        ele: "xd-color",
-        valueKey: "userBgColor",
-        value: data.userBgColor || null,
-        groupKey: "style",
-      },
-      {
-        label: "用户信息背景图",
-        ele: 'xd-upload',
-        valueKey: "userBgImg",
-        groupKey: "content",
-        value: data.userBgImg || {},
-        defaultValue: data.userBgImg || null,
-        slot: true,
-        oneWidth: 355,
-        oneHeight: 84,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>,高度<span style="color:red">196px</span>',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5,
-        action: 'action',
-        sort: true,
-        maxlen: 100,
-      },
-      {
-        label: "激活码开通",
-        ele: 'xd-upload',
-        valueKey: "codeImg",
-        groupKey: "content",
-        value: data.codeImg || {},
-        defaultValue: data.codeImg || null,
-        slot: true,
-        oneWidth: 355,
-        oneHeight: 100,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>,高度<span style="color:red">200px</span>',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5,
-        action: 'action',
-        sort: true,
-        maxlen: 100,
-        rules: [
-          { required: true, message: '请添加背景图', trigger: 'change' },
-        ],
-      },
       {
         label: "PLUS会员banner背景图",
         ele: 'xd-upload',
@@ -302,9 +252,9 @@ export default {
         defaultValue: data.bannerBgImg || null,
         slot: true,
         oneWidth: 355,
-        oneHeight: 170,
+        oneHeight: 92,
         elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>,高度<span style="color:red">340px</span>',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">710px</span>,高度<span style="color:red">184px</span>',
         type: ['jpg', 'png', 'jpeg'],
         styleType: 'one',
         uploadType: 'aliyun',

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -15,7 +15,7 @@
     <!-- #endif -->
     <view class="jfb-base-open-vip__body" :style="[bodyStyle]">
       <!-- 用户信息 -->
-      <view class="u_header" :style="[userStyle]">
+      <view class="u_header">
         <view class="u_avatar">
           <image :src="uInfo.head_url" mode="aspectFill"></image>
         </view>
@@ -26,12 +26,11 @@
             <view v-else class="vip_level">普通用户</view>
           </view>
           <view class="u_sub">
-            <!-- <view v-if="isVip" style="color:#999999;" @click="handleToDetail">已省{{ $xdUniHelper.divisionFloatNumber(save_amount, 100) }}</view> -->
-            <view v-if="isVip" style="color:#666666;">到期时间：{{ vip_expire_time }}</view>
-            <view v-else style="color:#666666;">您暂未开通PLUS会员</view>
+            <view v-if="isVip" style="color:#999999;" @click="handleToDetail">已省{{ $xdUniHelper.divisionFloatNumber(save_amount, 100) }}</view>
+            <view v-else style="color:#333333;">{{ uInfo.phone_number }}</view>
           </view>
         </view>
-        <!-- <view v-if="isVip" class="buy_btn" @click="showDrawer=true">立即续费</view> -->
+        <view v-if="isVip" class="buy_btn" @click="showDrawer=true">立即续费</view>
         <!-- <view v-else class="buy_btn" @click="showDrawer=true">立即开通</view> -->
       </view>
 
@@ -40,28 +39,17 @@
         <view class="vip_box" :style="{
           backgroundImage: `url(${bannerBgImg})`,
         }">
-          <!-- <view class="vip_box-left">
+          <view class="vip_box-left">
             <view class="vip_box-title">PLUS会员</view>
             <view v-if="isVip">有效期至：{{ vip_expire_time }}</view>
             <view v-else>开通享受更多权益</view>
-          </view> -->
+          </view>
           <!-- <view class="vip_logo">
             <image :src="siteLogo" mode="aspectFill"></image>
           </view> -->
         </view>
       </view>
-        <xd-vip-list :list="showVipCardList"
-          @handlePrivacy="handlePrivacy"
-          @toVipDetail="toVipDetail"
-          :mainColor="mainColor"
-        ></xd-vip-list>
-        <view>
-        <view v-if="showExchangeCode==='Y'" @click="toVipDetail(-1)" class="vip_code_info">
-          <view class="vip_code_box" :style="{
-            backgroundImage: `url(${codeImg})`,
-          }">
-          </view>
-        </view>
+      <view>
         <image :src="specialImage" mode="widthFix" style="width: 100%;"></image>
         <!--
         <view class="vip_banner">
@@ -86,17 +74,22 @@
           </view>
         </view> -->
       </view>
-      <!-- <view :style="{height: '342rpx'}"></view> -->
-      <!-- <view :style="prod_bottom"> -->
-      <!-- </view> -->
+      <view :style="{height: '342rpx'}"></view>
+      <view :style="prod_bottom">
+        <xd-vip-list v-if="!isVip" :list="showVipCardList"
+          @handlePrivacy="handlePrivacy"
+          @toVipDetail="toVipDetail"
+        ></xd-vip-list>
+      </view>
 
-      <!-- <xd-down-drawer :show.sync="showDrawer" height="480rpx">
+      <xd-down-drawer :show.sync="showDrawer" height="480rpx">
         <view class="drawer_title">立即续费</view>
         <xd-vip-list :list="showVipCardList"
           @handlePrivacy="handlePrivacy"
           @toVipDetail="toVipDetail"
         ></xd-vip-list>
-      </xd-down-drawer> -->
+      </xd-down-drawer>
+
     </view>
   </view>
 </template>
@@ -106,7 +99,6 @@
   import XdButton from "@/components/XdButton/XdButton";
   import XdVipList from "./XdVipList.vue";
   import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer.vue"
-  import XdDailog from "@/components/XdDailog/XdDailog";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseOpenVipMixin from "./JfbBaseOpenVipMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -120,8 +112,7 @@
       XdFontIcon,
       XdButton,
       XdVipList,
-      XdDownDrawer,
-      XdDailog
+      XdDownDrawer
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseOpenVipMixin
@@ -149,9 +140,6 @@
         showExchangeCode: "",
         exchangeCodePath: "",
         moneyDetailPath: "",
-        userBgImg: '',
-        userBgColor: '',
-        codeImg: '',
       }
     },
     computed: {
@@ -165,20 +153,11 @@
         return this.uInfo.user_level === 'VIP';
       },
       showVipCardList(){
-        // return this.showExchangeCode === 'Y' ? [this.exchangeCodeVip, ...this.vipCardList] : [...this.vipCardList]
-        return [...this.vipCardList]
+        return this.showExchangeCode === 'Y' ? [this.exchangeCodeVip, ...this.vipCardList] : [...this.vipCardList]
       },
       prod_bottom() {
         return this.fixedStyle({height: 0, zIndex: 111});
       },
-      userStyle() {
-        return {
-          backgroundImage: `url(${this.userBgImg})`,
-          backgroundColor: this.userBgColor,
-          backgroundRepeat: 'no-repeat',
-          backgroundSize: '100% 100%',
-        }
-      }
     },
     watch: {
       container(value, oldValue) {
@@ -207,10 +186,7 @@
         this.specialImage = getServiceUrl(getContainerPropsValue(container, 'content.specialImage', {url: ""}).url);
         this.exchangeCodePath = getContainerPropsValue(container, 'content.exchangeCodePath', {value: ""}).value;
         this.showExchangeCode = getContainerPropsValue(container, 'content.showExchangeCode', '');
-        this.moneyDetailPath = getContainerPropsValue(container, 'content.moneyDetailPath', { value: "" }).value;
-        this.userBgImg = getServiceUrl(getContainerPropsValue(container, 'content.userBgImg', { url: "" }).url);
-        this.userBgColor = getContainerPropsValue(container, "content.userBgColor", "#FFFFFF");
-        this.codeImg = getServiceUrl(getContainerPropsValue(container, 'content.codeImg', {url: ""}).url);
+        this.moneyDetailPath = getContainerPropsValue(container, 'content.moneyDetailPath', {value: ""}).value;
       },
       p_getBaseUserInfo(){
         jfbRootExec("getOpenBaseUserInfo", {
@@ -298,7 +274,7 @@
         display: flex;
         align-items: center;
         padding: 24rpx 40rpx;
-        margin-bottom: 20rpx;
+        margin: 20rpx;
 
         .u_avatar{
           width: 120rpx;
@@ -350,35 +326,13 @@
         }
       }
 
-      .vip_code_info{
-        margin-bottom: 20rpx;
-        background: #fff;
-        .vip_code_box{
-          width: 710rpx;
-          height: 200rpx;
-          margin: auto;
-          border-radius: 60rpx;
-          background-color: #E8A841;
-          // background: linear-gradient(90deg, #E8A841 0%, #FAD48E 100%);
-          background-size: 100% 100%;
-          background-repeat: no-repeat;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding: 40rpx;
-          box-sizing: border-box;
-        }
-      }
-
       .vip_info{
         // padding: 20rpx;
-        margin-bottom: 20rpx;
-        background: #fff;
         .vip_box{
           width: 710rpx;
-          height: 340rpx;
+          height: 184rpx;
           margin: auto;
-          border-radius: 32rpx;
+          border-radius: 24rpx;
           background-color: #E8A841;
           // background: linear-gradient(90deg, #E8A841 0%, #FAD48E 100%);
           background-size: 100% 100%;
@@ -425,7 +379,7 @@
               width: 108rpx;
               height: 108rpx;
               border-radius: 108rpx;
-              // background-color: #EBB963;
+              background-color: #EBB963;
             }
             .banner_text{
               color: #333333;

package/src/components/JfbBaseOpenVip/Mock.js

@@ -2,6 +2,6 @@
 
 module.exports = {
   getOpenBaseUserInfo: {"user_name":"","user_code":"Uf4zx6EPfV","nickname":"未来～","real_name":"","head_url":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/Q0j4TwGTfTJsajZzh53IB56crRSdmKvRbjT4V1Ha8v5uCOkASbWS0GibgLeic8OKBzAwUyBa3vZGhjwmd6RfpG9g\/132","province_code":"","city_code":"","province_name":"","city_name":"","sex":"","sex_name":"未知","birthday_date":"","phone_number":"13611111111","show_user_name":"未来～","user_level":"","vip_expire_time":1745026677,"request_id":"250e5709e6c95066"},
-  getOpenVipList: {"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":200,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":2678,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":9999,"vip_card_icon":""}],"request_id":"6b4aef5e06411d8a"},
+  getOpenVipList: {"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":200,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":2678,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":20085,"vip_card_icon":""}],"request_id":"6b4aef5e06411d8a"},
   getVipMoneySaving: { "save_amount": 100 , "request_id": "6b4aef5e06411d8a" }
 }