jufubao-base 1.0.46 → 1.0.47-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.46",
+  "version": "1.0.47-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -17,34 +17,24 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-detail__body" v-if="info !== null">
-      <view class="jfb-base-card-detail__body-tips"
-        >提示：满减券仅支持微信补差，不接受现金补差</view
-      >
+      <view class="jfb-base-card-detail__body-tips">提示：满减券仅支持微信补差，不接受现金补差</view>
       <view
         class="jfb-base-card-detail__body-info"
         v-for="(item, index) in valueKey"
         :key="index"
       >
-        <view class="jfb-base-card-detail__body-info-label">{{
-          item.label
-        }}</view>
-        <view class="jfb-base-card-detail__body-info-value">{{
-          info[item.key]
-        }}</view>
+        <view class="jfb-base-card-detail__body-info-label">{{item.label }}</view>
+        <view class="jfb-base-card-detail__body-info-value">{{info[item.key] }}</view>
         <view
           class="jfb-base-card-detail__body-info-relieve"
           @click="handleUnBindCard"
-          v-if="item.key === 'card_number'"
-        >
-          解除绑定
-        </view>
+          v-if="item.key === 'card_number' && isShowUnbind"
+        >解除绑定</view>
       </view>
       <view class="jfb-base-card-detail__body-residue">
         <view class="jfb-base-card-detail__body-residue-wrap">
           <view class="jfb-base-card-detail__body-residue-label">
-            <view :style="{ color: '#242424', fontSize: '28rpx' }"
-              >剩余元宝</view
-            >
+            <view :style="{ color: '#242424', fontSize: '28rpx' }">剩余元宝</view>
           </view>
           <view class="jfb-base-card-detail__body-residue-value">
             <xd-unit
@@ -58,15 +48,12 @@
           <view
             v-if="info.other_card_point && info.card_point_type !== 1"
             class="jfb-base-card-detail__body-residue-reach"
-            >购买其他物品可抵：{{ info.other_card_point }}</view
-          >
+          >购买其他物品可抵：{{ info.other_card_point }}</view>
         </view>
         <view
           class="jfb-base-card-detail__body-residue-business"
           v-if="info.card_point_type !== 1"
-        >
-          所属业务线：{{ info.main_business_code_name }}
-        </view>
+        >所属业务线：{{ info.main_business_code_name }}</view>
       </view>
       <view class="jfb-base-card-detail__body-qrcode">
         <view>
@@ -76,14 +63,12 @@
         </view>
         <view style="position: relative">
           <image
-            style="width: 300rpx; height: 300rpx"
+            :style="{width: '300rpx', height: '300rpx'}"
             :src="info.card_qrcode"
           ></image>
           <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
         </view>
-        <view style="margin-top: 20rpx" v-if="timeStr"
-          >消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view
-        >
+        <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view>
         <view v-if="timeStr">距离刷新还有{{ timeStr }}</view>
       </view>
       <!--      <xd-edit-pwd-->
@@ -124,6 +109,7 @@ import XdEditPwd from "./XdEditPwd";
 import getBusinessImageUrl from "@/common/getBusinessImageUrl";
 import { Base64 } from "js-base64";
 import { getContainerPropsValue } from "@/utils/xd.base";
+import {mapState} from 'vuex';
 
 export default {
   name: "JfbBaseCardDetail",
@@ -134,8 +120,13 @@ export default {
     XdUnit,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseCardDetailMixin],
+  computed:{
+    ...mapState(['brandInfo'])
+  },
   data() {
     return {
+      userInfo: null, //用户信息（暂时不可用）
+      
       info: null,
       valueKey: [
         {
@@ -170,10 +161,6 @@ export default {
       password: "",
       card_number: "",
       stopTimer: false, //停止轮询
-
-      userInfo: null, //用户信息
-      brandInfo: null, //brand
-
       download: "",
       qrcode: "",
       backUrl: "",
@@ -182,6 +169,8 @@ export default {
       brandLogo:
         "data:image/png;base64,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",
       isBrandLogo: false,
+      
+      isShowUnbind: false, //是否启动绑定按钮
     };
   },
   created() {},
@@ -195,16 +184,11 @@ export default {
           console.warn(options["x-params"]);
         }
       }
+      
       this.$nextTick(() => {
-        this.userInfo = getApp().globalData.$xd["userInfo"];
-        this.brandInfo = getApp().globalData.$xd["brandInfo"];
-        // this.download = getBusinessImageUrl('base_download.png')
-        // this.qrcode = getBusinessImageUrl('base_qr.png')
-        // this.editPhone = this.userInfo.mobile
-        let card_number = options.card_number;
-        this.card_number = card_number;
+        this.card_number = options.card_number;
         this.init();
-        console.log(this.card_number, "options");
+    
         // if (card_number) {
         //   this.card_number = card_number;
         //   if (this.brandInfo['is_enable_pay_password'] === 'N') {
@@ -235,31 +219,32 @@ export default {
     },
     onJfbShow(options) {
       console.log("event.onJfbShow", options);
-      if (this.first) {
-        if (this.brandInfo["is_enable_pay_password"] === "N") {
-          this.init();
-        } else if (
-          this.brandInfo["is_enable_pay_password"] === "Y" &&
-          this.userInfo["has_user_set_password"] === "N"
-        ) {
-          this.editShow = true;
-          this.pwdTitle = "您还未设置支付密码，请设置您的平台支付密码";
-        } else if (
-          this.brandInfo["is_enable_pay_password"] === "Y" &&
-          this.userInfo["has_user_set_password"] === "Y"
-        ) {
-          this.show = true;
-          this.textList = [
-            {
-              label: "查看卡详情",
-            },
-            {
-              label: "请输入支付密码",
-            },
-          ];
-        }
-      }
+      // if (this.first) {
+      //   if (this.brandInfo["is_enable_pay_password"] === "N") {
+      //     this.init();
+      //   } else if (
+      //     this.brandInfo["is_enable_pay_password"] === "Y" &&
+      //     this.userInfo["has_user_set_password"] === "N"
+      //   ) {
+      //     this.editShow = true;
+      //     this.pwdTitle = "您还未设置支付密码，请设置您的平台支付密码";
+      //   } else if (
+      //     this.brandInfo["is_enable_pay_password"] === "Y" &&
+      //     this.userInfo["has_user_set_password"] === "Y"
+      //   ) {
+      //     this.show = true;
+      //     this.textList = [
+      //       {
+      //         label: "查看卡详情",
+      //       },
+      //       {
+      //         label: "请输入支付密码",
+      //       },
+      //     ];
+      //   }
+      // }
     },
+    
     onJfbUnload() {
       if (this.timeer) {
         clearTimeout(this.timeer);
@@ -268,6 +253,7 @@ export default {
         clearTimeout(this.refrushTimeer);
       }
     },
+    
     onJfbBack(options) {
       if (this.timeer) {
         clearTimeout(this.timeer);
@@ -277,6 +263,7 @@ export default {
       }
       this.$xdUniHelper.navigateBack();
     },
+    
     setInval(time) {
       console.log("pppppp", time);
       this.timeer = setInterval(() => {
@@ -294,6 +281,7 @@ export default {
         }
       }, 1000);
     },
+    
     handleUnBindCard() {
       this.$xdConfirm({
         $vm: this,
@@ -332,6 +320,7 @@ export default {
         },
       });
     },
+    
     refrush() {
       if (this.stopTimer) return;
       if (this.time >= this.maxTime) {
@@ -375,40 +364,29 @@ export default {
           .catch();
       }, time);
     },
+    
     init() {
       this.detail();
       this.refrush();
-      this.backUrl = getContainerPropsValue(
-        this.container,
-        "content.back_url",
-        { value: "" }
-      ).value;
+      this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
     },
+    
     /**
      * @description 获取卡详情
      */
     detail() {
       jfbRootExec("getBaseByIdCardDetail", {
         vm: this,
-        data: {
-          card_number: this.card_number,
-        },
+        data: {card_number: this.card_number,},
       })
         .then((res) => {
           if (res && res.card_point) {
-            res["card_point"] = this.$xdUniHelper.divisionFloatNumber(
-              res.card_point,
-              100
-            );
+            res["card_point"] = this.$xdUniHelper.divisionFloatNumber(res.card_point, 100);
           }
           if (res && res.card_point) {
-            res["other_card_point"] = this.$xdUniHelper.divisionFloatNumber(
-              res.other_card_point,
-              100
-            );
+            res["other_card_point"] = this.$xdUniHelper.divisionFloatNumber(res.other_card_point, 100);
           }
           this.info = res;
-          console.log(this.info.card_qrcode_expire, "lllll");
           this.setInval(this.info.card_qrcode_expire);
           this.show = false;
 
@@ -416,23 +394,18 @@ export default {
           if (res["is_show_qrcode_logo"] === "Y") {
             this.isBrandLogo = true;
           }
+          
+          this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
         })
         .catch((err) => {
           // this.$refs["pwPay"].clearPwd();
         });
     },
-    onJfbUnload() {
-      if (this.timeer) {
-        clearTimeout(this.timeer);
-      }
-      if (this.refrushTimeer) {
-        clearTimeout(this.refrushTimeer);
-      }
-    },
 
     handleOnClose() {
       this.editShow = false;
     },
+    
     handlePwdOnSubmit(val) {
       this.password = val;
       this.init();
@@ -491,9 +464,9 @@ export default {
         // width: unit(100, rpx);
         // height: unit(30, rpx);
         border-radius: unit(20, rpx);
-        border: unit(1, rpx) solid #cccccc;
-        font-size: unit(18, rpx);
-        color: #cccccc;
+        border: unit(1, rpx) solid #999;
+        font-size: unit(24, rpx);
+        color: #999;
         text-align: center;
         line-height: unit(32, rpx);
         padding: unit(6, rpx) unit(16, rpx);

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -39,7 +39,7 @@
                 <xd-font-icon
                   icon="iconkaquan"
                   size="38"
-                  style="margin-right: 18rpx"
+                  :style="{marginRight: '18rpx'}"
                   color="#B8B7BE"
                 ></xd-font-icon>
                 <view style="color: #b8b7be">{{ item.card_type_name }}</view>
@@ -50,21 +50,17 @@
               </view>
             </view>
             <view class="jfb-base-card-disabled__body-card-item-right-bottom">
-              <view
-                class="jfb-base-card-disabled__body-card-item-right-bottom-info"
-              >
+              <view class="jfb-base-card-disabled__body-card-item-right-bottom-info">
                 <view
                   style="color: #b8b7be"
                   class="jfb-base-card-disabled__body-card-item-right-bottom-info-residue"
-                >
-                  剩余{{ item.unit }}数：--{{ item.unit }}
-                </view>
+                >剩余{{ item.unit }}数：--{{ item.unit }}</view>
               </view>
               <view
                 @click.stop="handleUnBindCard(item)"
-                :style="{ background: mainColor }"
-                >解绑</view
-              >
+                v-if="isShowUnbind"
+                :style="{ background: '#fff',color:'#999',border: '1px solid #999' }"
+                >解绑</view>
             </view>
           </view>
         </view>
@@ -92,6 +88,7 @@ export default {
   data() {
     return {
       disableList: [],
+      isShowUnbind: false
     };
   },
   watch: {
@@ -116,6 +113,7 @@ export default {
         },
       })
         .then((res) => {
+          this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,