jufubao-base 1.0.159-beta18 → 1.0.159-beta20

package/package.json

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

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -177,9 +177,15 @@ export default {
         return this.valueKey.filter(item => item.key !== "end_time");
       }
       return this.valueKey;
-    }
+    },
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
+    },
+  },
+  created() {
+    this.init(this.container)
   },
-  created() {},
   methods: {
     handleIcon(){
       this.isPassword = !this.isPassword
@@ -270,39 +276,37 @@ export default {
         }
       })
     },
-    init() {
-      this.backUrl = getContainerPropsValue(
-        this.container,
-        "content.back_url",
-        { value: "/pages/card/card" }
-      ).value;
-      this.card_num_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_num_placeholder",
-        "请输入券号(电子券除外)"
-      );
-      this.card_pwd_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_pwd_placeholder",
-        "请输入密码"
-      );
-      this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
-      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
+    init(container) {
+      this.backUrl = getContainerPropsValue(container, "content.back_url", { value: "/pages/card/card" }).value;
+      this.card_num_placeholder = getContainerPropsValue(container, "content.card_num_placeholder", "请输入券号(电子券除外)");
+      this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
+      this.is_show_balance = getContainerPropsValue(container, 'content.is_show_balance', "N");
+      this.my_card_url = getContainerPropsValue(container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
-      this.init();
-
-      this.qrcode = options.qrcode;
+      this.qrcode = options.qrcode || options.pa;
 
       //#ifdef MP-WEIXIN
-      if(options.qrcode) {
-        this.qrcode = decodeURIComponent(options.qrcode);
+      if(this.qrcode) {
+        this.qrcode = decodeURIComponent(this.qrcode);
       }
       //#endif
 
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
+
+      //正式环境判断参数错误
+      if(!this.$configProject.isPreview) {
+        if(!this.qrcode) {
+          this.$xdAlert({
+            content: '参数配置错误',
+            type: 'error'
+          });
+          return
+        }
+      }
+
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetail", {
           vm: this,

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -302,17 +302,29 @@ export default {
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
     onJfbLoad(options) {
-      this.qrcode = options.qrcode;
+      this.qrcode = options.qrcode || options.pa;
 
       //#ifdef MP-WEIXIN
-      if(options.qrcode) {
-        this.qrcode = decodeURIComponent(options.qrcode);
+      if(this.qrcode) {
+        this.qrcode = decodeURIComponent(this.qrcode);
       }
       //#endif
 
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
+
+      //正式环境判断参数错误
+      if(!this.$configProject.isPreview) {
+        if(!this.qrcode) {
+          this.$xdAlert({
+            content: '参数配置错误',
+            type: 'error'
+          });
+          return
+        }
+      }
+
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetailEntry", {
           vm: this,

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-sweep-info__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-card-sweep-info__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-sweep-info__body" style="position: relative">
@@ -186,6 +184,7 @@ export default {
     },
     onJfbLoad(options) {
       this.pa = options.pa;
+
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -273,7 +273,7 @@
             </view>
 
             <view v-if="info.codes[0].can_read_password" class="jfb-base-order-detail__body-cashier-password" @click="showPassword = true">
-              {{ showPassword ? info.codes[0].can_read_code : "查看密码" }}
+              {{ showPassword ? info.codes[0].can_read_code : "查看" }}
             </view>
             <view v-else class="jfb-base-order-detail__body-cashier-text">
               {{ info.codes[0].can_read_code }}
@@ -387,7 +387,7 @@
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     style="margin-top: 0;"
-                    @click="handleShowCode(item)">查看二维码和密码</view>
+                    @click="handleShowCode(item)">查看二维码和{{ item.password_title }}</view>
                   <view
                     v-if="item.code_end_time"
                     class="jfb-base-order-detail__body-cashier-code"

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -107,7 +107,7 @@
                   class="jfb-base-success__body-cashier-password"
                   @click="showPassword = true"
                   :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                >{{ showPassword ? info.codes[0].can_read_code : "查看密码" }}</view>
+                >{{ showPassword ? info.codes[0].can_read_code : "查看" }}</view>
                 <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
@@ -218,7 +218,7 @@
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleShowCode(item)"
                         :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                      >查看二维码和密码</view>
+                      >查看二维码和{{ item.password_title }}</view>
                       <view
                         v-if="item['code_end_time']"
                         class="jfb-base-success__body-cashier-code"