jufubao-third 1.0.13 → 1.0.14-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.13",
+  "version": "1.0.14-beta2",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdPay/Attr.js

@@ -56,6 +56,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '开通会员',
+        ele: 'xd-select-pages-path',
+        valueKey: 'openPath',
+        placeholder: '选择开通会员路径',
+        value: data.openPath || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        groupKey: 'advanced',
+        className: 'input100',
+      },
       {
         label: "是否可以使用新票券",
         ele: "xd-radio",
@@ -67,6 +79,46 @@ export default {
           {label: "否", value: "2"},
         ]
       },
+      {
+        label: "开通PLUS背景图",
+        ele: 'xd-upload',
+        valueKey: "openVipBgImg",
+        groupKey: "style",
+        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",
+        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,
+      },
     ]
   },
 }

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -64,15 +64,15 @@
           </view>
         </view>
         
-        <view v-if="show_vip_card==='Y'" class="pay_section">
+        <!-- <view v-if="show_vip_card==='Y'" class="pay_section">
           <cus-vip-list :list="vipCardList"
             :vip_card_id="vip_card_id"
             :plus_saving_money="plus_saving_money"
             @choseVipCard="handleChoseVipCard"></cus-vip-list>
-        </view>
+        </view> -->
         <view v-if="isShowPlusSaveMoney" class="pay_section">
           <xd-list-item label="PLUS专项立减" size="small" paddingLR="40rpx" >
-            <view slot="label" style="color: #86541E;">PLUS专享立减</view>
+            <view slot="label" style="color: #86541E;">PLUS会员立减</view>
             <!-- <view style="color: #FF7070;">-5.00</view> -->
             <xd-unit :price="-plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
           </xd-list-item>
@@ -311,6 +311,13 @@
         @click="addNewCard"
       >使用新票券</xd-button>
     </xd-down-drawer>
+    <CusVipOpenDialog
+      v-if="!isVip"
+      :bgImg="openVipBgImg"
+      :btnBgImg="openVipBtnBgImg"
+      @onOpen="handleOpenVip"
+      @onClose="handleCloseOpenVip"
+    ></CusVipOpenDialog>
   </view>
 </template>
 
@@ -335,6 +342,8 @@
   import CusVipList from "@/components/CusVipList/CusVipList"
   import {mapState} from "vuex"
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import CusVipOpenDialog from "@/components/CusVipOpenDialog/CusVipOpenDialog"
+  import getServiceUrl from "@/common/getServiceUrl"
   export default {
     name: "JfbThirdPay",
     components: {
@@ -350,7 +359,8 @@
       XdListItem,
       XdCardPayChose,
       XdWalletChose,
-      CusVipList
+      CusVipList,
+      CusVipOpenDialog
     },
     mixins: [
       componentsMixins, extsMixins, JfbThirdPayMixin, WalletMixins
@@ -398,6 +408,9 @@
         xnamespace: "",
         bindCard: '1',
         skipTip: "N",
+        openVipBtnBgImg: "",
+        openVipBgImg: "",
+        openPath: ""
       }
     },
     watch: {
@@ -459,7 +472,9 @@
       let valid_token = this.$xdUniHelper.randomChar(20);
       this.$set(this.cardForm, "valid_token", valid_token);
       this.isVip = this.getTokenForKey('user_level') === 'VIP';
-
+      if (this.$configProject['isPreview']) {
+        this.isVip=true
+      }
       // #ifdef H5
       if (!this.$configProject.isPreview) {
         this.p_getH5WxAuthorize();
@@ -489,6 +504,13 @@
         this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
         this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
+        this.openVipBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBgImg", { url: "" }).url,
+        );
+        this.openVipBtnBgImg = getServiceUrl(
+          getContainerPropsValue(container, "content.openVipBtnBgImg", { url: "" }).url
+        );
+        this.openPath = getContainerPropsValue(container, "content.openPath", { value: "" }).value;
       },
       getTimeFormat(time){
         let date = null;
@@ -890,6 +912,14 @@
           valid_token: "",  //验证码token
         }
       },
+      handleCloseOpenVip() {
+        this.$xdUniHelper.navigateBack()
+      },
+      handleOpenVip() {
+        this.$xdUniHelper.navigateTo({
+          url: this.openPath
+        })
+      },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
       },
@@ -898,6 +928,10 @@
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
+        this.isVip = this.getTokenForKey('user_level') === 'VIP';
+        if (this.$configProject['isPreview']) {
+          this.isVip=true
+        }
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)