jufubao-base 1.0.159-beta1 → 1.0.159-beta2

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -190,8 +190,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() {

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -44,9 +44,7 @@
           <xd-radio size="small" v-model="isCheck"></xd-radio>
           <view>我已经阅读和同意积分转换规则</view>
         </view>
-        <xd-button type="primary" width="360rpx" @click="handleChange"
-          >立即转换</xd-button
-        >
+        <xd-button type="primary" width="360rpx" @click="handleChange">立即转换</xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -63,13 +61,8 @@
             icon="icondui-01"
           ></xd-font-icon>
           <view class="jfb-base-card-shift__body-success-title">转换成功</view>
-          <view class="jfb-base-card-shift__body-success-content">
-            您已成功将 {{ card_number }} 转换为
-            {{ changeNumber }}已自动帮您绑定成功，可在卡列表查询
-          </view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink"
-            >返回列表</xd-button
-          >
+          <view class="jfb-base-card-shift__body-success-content">您已成功将{{ card_number }} 转换为{{ changeNumber }}已自动帮您绑定成功，可在卡列表查询</view>
+          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
         </view>
       </xd-dailog>
     </view>

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -24,7 +24,7 @@
       <view
         class="card-list"
         :style="{
-           background: headerBg['color'],
+            background: headerBg['color'],
             backgroundSize: '100%'
           }">
         <view class="card-list-warp" :style="{backgroundImage: `url(${headerBg['image']})`}">
@@ -74,21 +74,17 @@
           <view>转换后预估票券额度</view>
         </view>
         <view
-          :class="
-            item.key === 'other_card_point'
-              ? 'jfb-base-card-shift-entry__body-content-special'
-              : 'jfb-base-card-shift-entry__body-content-item'
-          "
+          :class=" item.key === 'other_card_point'? 'jfb-base-card-shift-entry__body-content-special': 'jfb-base-card-shift-entry__body-content-item'"
           v-for="(item, index) in changeValueKey"
           :key="index"
         >
           <view> {{ item.label }}： </view>
           <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
-            {{ info[item.key] }}
+            <text>{{ info[item.key] }}</text>
             <text>点</text>
           </view>
           <view style="color: #333; font-weight: 500" v-else>
-            {{ info[item.key] }}
+            <text>{{ info[item.key] }}</text>
             <text v-if="item.type === 'type'">券</text>
           </view>
         </view>
@@ -109,9 +105,8 @@
         <xd-button
           @click="handleChange"
           width="500rpx"
-          type="primary">
-          转换
-        </xd-button>
+          type="primary"
+        >立即转换</xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -132,12 +127,13 @@
             <text :style="{color:mainColor,marginLeft:'20rpx'}">转换成功</text>
           </view>
           <view class="jfb-base-card-shift-entry__body-success-content">
-            已成功将  <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>  转换成为
-            <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>可在券包中查看
+            <text>已成功将</text>
+            <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>
+            <text>转换成为</text>
+            <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>
+            <text>可在券包中查看</text>
           </view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink"
-          >返回列表</xd-button
-          >
+          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
         </view>
       </xd-dailog>
     </view>
@@ -196,7 +192,8 @@ export default {
       //页面跳转地址
       backUrl: "",
       bottomHeight: 120,
-      changeBg: ''
+      changeBg: '',
+      headerBg:'',
     };
   },
   computed: {
@@ -591,7 +588,7 @@ export default {
     .fixe_bottom{
       display: flex;
       align-items: center;
-      justify-content: space-between;
+      justify-content: center;
       height: unit(100, rpx);
       padding: 0 unit(40, rpx);
       background: #FFF;

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -114,8 +114,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/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -51,6 +51,8 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
+  import {mapState} from "vuex";
+
   export default {
     name: "JfbBaseCardV3",
     components: {
@@ -77,11 +79,13 @@
       }
     },
     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: {
+      ...mapState(['jfbAuthorize']),
       button_bottom() {
         return this.fixedStyle({paddingBottom: 24, zIndex: 111})
       },
@@ -140,12 +144,7 @@
         })
       },
       toDetail(item) {
-        this.$xdUniHelper.navigateTo(
-          {
-            url: `${this.detailUrl}?card_number=${item["card_number"]}`,
-          },
-          false
-        );
+        this.$xdUniHelper.navigateTo({url: `${this.detailUrl}?card_number=${item["card_number"]}`,}, false);
       },
       /**
        * @description 已绑定卡登录
@@ -175,10 +174,11 @@
               this.$xdHideLoading();
               //#ifdef MP-WEIXIN
               if (this.jfbAuthorize !== null) {
-                this.jfbAuthorize.setCardToken(res);
+                this.jfbAuthorize.setCardToken(res, null);
               }
               //#endif
-
+              console.log(this.inCallback);
+              debugger
               if (this.$configProject.isPreview) {
                 console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
               } else {
@@ -190,9 +190,9 @@
             .catch((res) => {
               this.$xdHideLoading();
             });
-        } else {
-          this.$xdUniHelper.navigateTo(
-            {
+        }
+        else {
+          this.$xdUniHelper.navigateTo({
               url: `${this.changeUrl}?card_number=${item["card_number"]}`,
             },
             false

package/src/components/JfbBaseCity/JfbBaseCity.vue

@@ -44,8 +44,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() {

package/src/components/JfbBaseClear/JfbBaseClear.vue

@@ -54,8 +54,9 @@
       ...mapState(['jfbAuthorize']),
     },
     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/JfbBaseConList/JfbBaseConList.vue

@@ -203,8 +203,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() {

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -194,8 +194,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() {

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -93,9 +93,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);

package/src/components/JfbBaseExpressDetail/JfbBaseExpressDetail.vue

@@ -50,14 +50,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/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -67,6 +67,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import {parsePath} from '@/utils/linkUrl'
   import XdFastNav from "./XdFastNav.vue";
   import Color from "color";
   const color = require('color');
@@ -113,8 +114,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)
       }
     },
 
@@ -187,30 +189,30 @@
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
         if(this.is_layout === 'fixed') {
           this.listNave = this.list.map(item=>{
-            debugger
-            const {appValue,path,host} = item.path
-            if(appValue === undefined && path === undefined) {
+            let {appValue,path} = item.path
+            if(appValue === '0') {
               return { name: item.name, path: item.path.value, icon: item.icon, size: item.size}
             }
             else{
               const {dir,fixed_business_code} = item.path;
               let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
               if(bus) bus = `?x-common=${bus}`;
+              let jumpUrl = '';
+              //#ifdef H5
+              if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
+              else jumpUrl = path;
+              //#endif
 
-              let jumpUrl = path;
+              //#ifdef MP-WEIXIN
+              const pathObj = parsePath(path);
+              if(pathObj.isSameApp) jumpUrl = pathObj.url;
+              else jumpUrl =  `https://${this.projectAttr.host}/${pathObj.dir}${pathObj.url}`;
+              //#endif
 
-              //域名相同并且应用路径不相同时候处理
-              if(this.projectAttr['deploy_dir'] !== dir){
-                jumpUrl = `//${host}/${dir}${path}`;
-                //#ifdef MP-WEIXIN
-                jumpUrl = `https:${jumpUrl}`;
-                //#endif
-              }
+              jumpUrl = `${jumpUrl}${bus}`;
               return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
             }
           });
-          console.log(this.listNave,this.list);
-          debugger
         }
 
       },

package/src/components/JfbBaseFooter/JfbBaseFooter.vue

@@ -64,7 +64,6 @@
       container(value,oloValue) {
         if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
         if (this.$configProject['isPreview']){
-          debugger
           this.init(value);
           this.getNumber();
           this.footerBarKey = this.$xdUniHelper.randomChar(20);

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -144,8 +144,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/JfbBaseLogin/JfbBaseLogin.vue

@@ -61,7 +61,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>
@@ -145,7 +145,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>
@@ -305,8 +305,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) {
@@ -1011,5 +1012,14 @@ export default {
   }
 }
 
+/* #ifdef MP-WEIXIN */
+.text-content {
+  & > text {
+    font-size: 26rpx;
+  }
+}
+/* #endif */
+
+
 
 </style>

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -13,18 +13,14 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-login-forget-pwd__body">
       <view class="panel-forget-password">
         <view class="form-group" style="padding-top: 60rpx;padding-bottom: 40rpx;">
           <view style="font-size: 36rpx;color: #333;">请输入手机号</view>
-          <view style="font-size: 26rpx; color: #999; margin-top: 20rpx"
-            >为了您的账号安全，请先验证手机号</view
-          >
+          <view style="font-size: 26rpx; color: #999; margin-top: 20rpx">为了您的账号安全，请先验证手机号</view>
         </view>
         <xd-form
           label-width="170"
@@ -117,8 +113,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)
     },
     "resetForm.verification_code"(value) {
       if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -231,6 +228,7 @@ export default {
       color: @xd-base-color;
       font-size: 24rpx;
       margin-right: unit(20,rpx);
+      flex-shrink: 0;
     }
     .panel-forget-password {
       /deep/ .uni-forms-item__label {

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -99,7 +99,6 @@
         },
         success_url: "",
         pwd_type: "", //设置密码 1， 重设密码 2
-        //todo
       }
     },
     computed: {
@@ -108,8 +107,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/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

@@ -20,7 +20,7 @@
         <iframe frameborder="0" v-if="iframe" :src="iframe" class="jfb-base-map-overlay__body-iframe"></iframe>
         <xd-baidu-overlay v-else :defaultOverlays="overlays" :level="11"></xd-baidu-overlay>
       </template>
-      
+
       <!-- #endif -->
       <!-- #ifdef MP -->
       <xd-map-overlay :defaultOverlays="overlays" :level="11"></xd-map-overlay>
@@ -76,8 +76,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() {
@@ -216,7 +217,7 @@
       onJfbBack(options) {
 			  this.$xdUniHelper.navigateBack()
       },
-      
+
     }
   }
 
@@ -228,7 +229,7 @@
   .jfb-base-map-overlay {
     &__body{
       width: 750rpx;
-      
+
       &-iframe {
         height: 100%;
         width: 100%;

package/src/components/JfbBaseMapSearch/JfbBaseMapSearch.vue

@@ -58,8 +58,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() {