jufubao-base 1.0.159-beta2 → 1.0.159-beta3

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -255,7 +255,7 @@ export default {
       if(this.login_text_color) style['color'] = this.login_text_color;
       if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
       if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
-      return style;
+      return  this.styleObjectToString(style);
     },
     lookStyle(){
       let style = { backgroundColor: this.cardLayout === '2'? '' : this.mainColor};
@@ -263,7 +263,7 @@ export default {
       if(this.look_text_color) style['color'] = this.look_text_color;
       if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
       if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx';
-      return style;
+      return this.styleObjectToString(style);
     }
   },
   watch: {

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -323,12 +323,13 @@ export default {
           if (this.jfbAuthorize !== null) {
             this.jfbAuthorize.setCardToken(res);
             this.handleClick(entry);
+            return
           }
           //#endif
+
           if (this.$configProject.isPreview) {
             console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
           }
-
           else {
             this.handleClick(entry);
           }

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -599,10 +599,12 @@ export default {
         })
           .then((res) => {
             this.$xdHideLoading();
+
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
               this.handleClick(entry);
+              return
             }
             //#endif
             if (this.$configProject.isPreview) {

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -39,8 +39,7 @@
             type="primary"
             radius="20rpx"
             @click="doWxMpLogin"
-            >快捷登录</xd-button
-          >
+            >快捷登录</xd-button>
           <!-- #endif -->
           <view class="login-pub">
             <xd-button
@@ -51,7 +50,6 @@
               @click="doLoginAccount"
               >账号登录</xd-button>
           </view>
-
           <view class="protocol">
             <xd-form-checkbox
               class="xd-form-checkbox"
@@ -167,8 +165,7 @@
           v-if="accountLoginType === 'pwd'"
           class="forget_password"
           @click="toValidPhone"
-          >忘记密码</view
-        >
+        >忘记密码</view>
       </view>
       <view  class="bottom_btn" :style="prod_bottom" v-if="isPreview === 'Y' || isDebugPreview">
         <view
@@ -225,6 +222,10 @@ import {
 } from "@/utils/xd.base";
 
 export default {
+  // #ifdef MP-WEIXIN
+  options: { styleIsolation: 'shared' },
+  // #endif
+
   name: "JfbBaseLogin",
   components: {
     XdFontIcon,
@@ -1013,7 +1014,13 @@ export default {
 }
 
 /* #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;
   }

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -81,6 +81,9 @@
 
   export default {
     name: "JfbBaseLoginSetPwd",
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     components: {
       XdFontIcon,
       XdFormItem,

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
@@ -388,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/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -102,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,
@@ -329,7 +333,13 @@ export default {
   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;
   }

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -100,6 +100,10 @@
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
 
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
+
     name: "JfbBasePhoneLogin",
     components: {
       XdFontIcon,
@@ -362,7 +366,13 @@
     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;
     }

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>