jufubao-base 1.0.159-beta1 → 1.0.159-beta3

package/src/components/JfbBaseMergeUserCard/JfbBaseMergeUserCard.vue

@@ -32,8 +32,7 @@
                 class="get_code"
                 @click="sendMsgCode"
                 :style="{color: mainColor}"
-              >{{time ? time + '秒后获取':'获取验证码'}}
-              </view>
+              >{{time ? time + '秒后获取':'获取验证码'}}</view>
             </view>
           </xd-form-item>
         </xd-form>
@@ -62,7 +61,7 @@
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdButton from "@/components/XdButton/XdButton";
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
-  
+
   export default {
     name: "JfbBaseMergeUserCard",
     components: {
@@ -89,10 +88,11 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       },
-      
+
       "accountForm.verification_code"(value) {
         if (value && value.length >= 8 && value.length % 2 === 0) {
           let start = value.slice(0, value.length / 2);
@@ -135,13 +135,13 @@
               url: this.callback_url
             })
           }, 1500);
-          
+
         }).catch(error=>{
           this.$xdHideLoading();
           this.$xdLog.catch(error)
         })
       },
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -149,7 +149,7 @@
       init(container) {
         this.callback_url = getContainerPropsValue(container, 'content.callback_url', {value: ''}).value;
       },
-  
+
       sendMsgCode() {
         if (this.time > 0) return;
         const {phone_number} = this.accountForm;
@@ -180,7 +180,7 @@
           this.$xdLog.catch(error)
         })
       },
-      
+
     }
   }
 
@@ -196,69 +196,70 @@
           font-size: unit(26, rpx) !important;
         }
       }
-    
+
       .xd-form-checkbox {
         /deep/ .checklist-box {
           margin: 0 !important;
         }
       }
-    
+
       .xd-form-checkbox {
         /deep/ .checklist-group {
           justify-content: center;
         }
       }
-    
+
       .xd-form-checkbox {
         /deep/ .checklist-text {
           margin-left: unit(20, rpx) !important;
         }
       }
-    
+
       .form-group {
         padding: unit(40, rpx) unit(70, rpx);
       }
-    
+
       .get_code {
         color: @xd-base-color;
         font-size: unit(24, rpx);
+        flex-shrink: 0;
       }
-    
+
       .panel-login-password {
         padding: unit(20, rpx) 0;
-  
+
         /deep/ .uni-forms-item__label {
           .label-text {
             font-size: unit(26, rpx);
             color: #A6A6A6;
           }
         }
-      
+
         /deep/ .uni-easyinput__placeholder-class {
           font-size: unit(26, rpx);
           color: #D4D4D4;
         }
-      
+
         .phone-login-type {
           display: flex;
           color: #808080;
           font-size: unit(32, rpx);
           padding: unit(20, rpx) unit(70, rpx);
           align-items: center;
-        
+
           ._item {
             margin: 0 unit(30, rpx);
             position: relative;
             line-height: 2;
-          
+
             &:first-child {
               margin-left: 0;
             }
-          
+
             &.active {
               color: #383838;
               font-size: unit(36, rpx);
-            
+
               text {
                 position: absolute;
                 height: unit(6, rpx);
@@ -271,15 +272,15 @@
             }
           }
         }
-      
+
         .forget_password {
           font-size: unit(24, rpx);
           color: #A6A6A6;
           text-align: right;
           margin: unit(20, rpx) unit(70, rpx) 0 0;
-        
+
         }
-      
+
         .not_login {
           position: fixed;
           width: 100%;
@@ -288,7 +289,7 @@
           font-size: unit(26, rpx);
           color: #FE7A63;
         }
-      
+
         &-form {
           margin-top: unit(40, rpx)
         }

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpress.vue

@@ -130,14 +130,13 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {

package/src/components/JfbBaseMy/JfbBaseMy.vue

@@ -112,12 +112,12 @@
         quick_url_list: [],
         add_url: '',
         bgColor: ''
-        //todo
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseMySetting/JfbBaseMySetting.vue

@@ -86,9 +86,10 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
-      }
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
     },
     created() {
       this.init(this.container);
@@ -165,7 +166,8 @@
           this.$xdShowLoading({});
           store.dispatch('logout').then(res=>{
             this.$xdHideLoading();
-            this.jfbAuthorize.removeToken('card');
+            this.jfbAuthorize.removeAllToken();
+            this.jfbAuthorize.removeAllCardToken();
             this.jfbAuthorize.jumpToUserLogin(this, false);
           }).catch(err=>{
             console.error(err);

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -224,10 +224,12 @@
       }
     },
     watch: {
-      container(value,oloValue) {
-        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
-        this.init(this.container);
-        if (this.$configProject['isPreview']) this.onJfbLoad()
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) {
+          this.init(value) ;
+          this.onJfbLoad()
+        }
       },
       num(){
         if (this.$configProject['isPreview']) this.onJfbLoad()

package/src/components/JfbBaseNoticeBottom/JfbBaseNoticeBottom.vue

@@ -38,8 +38,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTop.vue

@@ -39,8 +39,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -858,8 +858,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     viewStatus(n, o) {
       if (this.isPreview) {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -136,7 +136,7 @@
                 class="order-list-icon"
                 :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
                 v-if="item.products.length > showLen"
-                @click.stop="item['isOpen'] = !item['isOpen']"
+                @click.stop="switchOpen(item)"
               >
                 <view :style="{ background: backgroundColor }">
                   <xd-font-icon
@@ -285,8 +285,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
@@ -387,6 +388,10 @@ export default {
       console.log("this.tabList", this.tabList);
     },
 
+    switchOpen(item){
+      item['isOpen'] = !item['isOpen']
+    },
+
     cancelUnPayOrder(main_order_id) {
       this.$xdConfirm({
         styles: this.styles,

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -216,8 +216,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -13,9 +13,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-phone-collect__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-phone-collect__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-phone-collect__body">
@@ -57,7 +55,7 @@
             :localdata="[{ value: 1, text: '登录即同意《隐私政策》《用户服务协议》' },]"
           >
             <template slot="a1">
-              <view>
+              <view class="text-content">
                 <text>请阅读并同意</text>
                 <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                 <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -104,6 +102,10 @@ import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
+  // #ifdef MP-WEIXIN
+  options: { styleIsolation: 'shared' },
+  // #endif
+
   name: "JfbBasePhoneCollect",
   components: {
     XdFontIcon,
@@ -125,7 +127,6 @@ export default {
       interval: null,
       provider_id: "",
       callback_url: "",
-      //todo
     };
   },
   computed: {
@@ -134,8 +135,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     "accountForm.verification_code"(value) {
       if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -330,4 +332,17 @@ export default {
 .align-center {
   align-items: center;
 }
+/* #ifdef MP-WEIXIN */
+/deep/ .xd-form-checkbox .checklist-group {
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+.text-content {
+  width: 100%;
+  & > text {
+    font-size: 26rpx;
+  }
+}
+/* #endif */
 </style>

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -17,9 +17,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-phone-login__body">
-      <view
-        class="panel-login-password"
-      >
+      <view class="panel-login-password">
         <xd-form label-width="128"
           style="margin-top: 40rpx;"
           label-align="right"
@@ -61,7 +59,7 @@
             :localdata="[{value: 1, text: '登录即同意《隐私政策》《用户服务协议》'}]"
           >
             <template slot="a1">
-              <view>
+              <view class="text-content">
                 <text>请阅读并同意</text>
                 <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                 <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -102,6 +100,10 @@
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
 
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
+
     name: "JfbBasePhoneLogin",
     components: {
       XdFontIcon,
@@ -133,8 +135,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       },
       "accountForm.verification_code"(value) {
         if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -167,7 +170,7 @@
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(value) {
+      init(container) {
         //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
         //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
@@ -362,4 +365,17 @@
   .align-center{
     align-items: center;
   }
+  /* #ifdef MP-WEIXIN */
+  /deep/ .xd-form-checkbox .checklist-group {
+    justify-content: center;
+    display: flex;
+    align-items: center;
+  }
+  .text-content {
+    width: 100%;
+    & > text {
+      font-size: 26rpx;
+    }
+  }
+  /* #endif */
 </style>

package/src/components/JfbBasePosterType/FourScreen.vue

@@ -170,14 +170,19 @@
 		computed:{
       getHeight() {
         let len = this.filterContentList.length
-        //不足一行数量，设置高度
-        if(len > 0 && len <= this.config.cells * 1){
+
+        //数量小于等于2,3行
+        if(len <= this.config.cells) {
           return this.height + this.rpxText
         }
-        //不足二行数量，设置高度
-        if(len > this.config.cells && len <= this.config.cells * 2 && this.config.jdRows >=2){
-          return this.height * 2 + this.rpxText * 2
+
+        //三行小于等于两个数量
+        if(this.config.jdRows === 3) {
+          if(len <= this.config.cells * 2) {
+            return this.height * 2 + this.rpxText * 2
+          }
         }
+
         return this.height * this.config.jdRows + this.rpxText * this.config.jdRows;
       },
 			rpxText(){
@@ -251,7 +256,7 @@
           }
         });
         console.warn(`PostTypeLists:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
-        this.filterContentList = this.$xdUniHelper.checkVarType(content);
+        this.filterContentList = this.$xdUniHelper.cloneDeep(content);
         return content;
 
       },
@@ -520,6 +525,7 @@
 					& > view:last-child {
 						text-align: center;
 						line-height: 15px;
+            font-size: unit(24, rpx);
 					}
 				}
 			}

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -38,8 +38,7 @@
             :bgColor="mainColor"
             @click="handleToRecharge"
             :disabled="!amount || !card_point || !cardNumber"
-            >提交</xd-button
-          >
+            >提交</xd-button>
         </view>
       </view>
       <view class="xd-notice-content" v-if="content">
@@ -91,8 +90,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     card_point(value) {
       if(this.timer) clearTimeout(this.timer);

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -150,8 +150,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {
@@ -175,8 +176,6 @@ export default {
   },
   created() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-recharge-order-detail__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-recharge-order-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view v-if="info!==null" class="jfb-base-recharge-order-detail__body">
@@ -81,14 +79,13 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-recharge-success__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-recharge-success__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-success__body" v-if="info !== null">
@@ -38,9 +36,7 @@
           @click="handleToBtn(item)"
           type="primary"
           :bgColor="mainColor"
-        >
-          {{ item.label }}
-        </xd-button>
+        >{{ item.label }}</xd-button>
       </view>
     </view>
   </view>
@@ -73,8 +69,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
@@ -168,7 +165,7 @@ export default {
         }, Math.pow(this.date, this.time > this.maxTime ? this.maxTime : this.time) * 1000);
       }
     },
-    
+
     onJfbUnload() {
       if (this.timeer) {
         clearTimeout(this.timeer);

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -54,8 +54,9 @@
       return {}
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -65,7 +65,7 @@
             <view class="settle-item" v-for="(settle,index) in info.settleInfo" :key="index">
               <view>{{settle.label}}：</view>
               <view v-if="settle.type === 'price'">
-                <xd-unit :price="settle.value" unit="" :is-old="false"></xd-unit>
+                <xd-unit :price="settle.value" :is-old="false"></xd-unit>
               </view>
               <view v-else v-html="settle.value"></view>
             </view>

package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue

@@ -121,8 +121,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {