jufubao-base 1.0.159 → 1.0.160-beta1

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -135,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)
     },
   },
   created() {
@@ -203,7 +204,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content: `转出卡号：${
           this.mergeForm.from_card_number
         }(剩余点数:${this.$xdUniHelper.divisionFloatNumber(

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -40,13 +40,14 @@
           </view>
         </view>
         <view class="merge-item" :style="{background: themeInStyle['color']}">
-          <view class="merge-item-box" :style="{backgroundImage: `url(${themeInStyle})`}">
-            <view class="merge-item-title">
+          <view class="merge-item-box" :style="{backgroundImage: `url(//img.jufubao.cn/component/card/mergbg.jpg)`}">
+            <view class="merge-item-title" :style="{background: themeOutStyle['color']}">
               <xd-font-icon icon="iconzhuanru"></xd-font-icon>
               <view>转入的票券</view>
             </view>
             <view>
               <xd-select
+                v-if="toListLoading"
                 :disabled="toList.length === 0"
                 :key="randomKey"
                 :height="66"
@@ -88,10 +89,11 @@
       <view class="bottom_btn-mask"></view>
       <view class="bottom_btn" :style="prod_bottom">
         <xd-button
+          v-if="btnLoading"
           :key="disabledKey"
           :disabled="disabled"
           @click="handleToSubmit"
-          width="90%"
+          style="width: 90%"
           :type="disabled ?'info': 'primary'"
         >合并</xd-button>
       </view>
@@ -137,9 +139,11 @@ export default {
       toList: [],
       fromSelect: null,
       toSelect: null,
-      randomKey: Date.now(),
+      randomKey:'randomKey',
       valid_code:'',
       valid_token: 'valid_token',
+      toListLoading: true,
+      btnLoading: true,
 
 
       content: "",
@@ -178,13 +182,17 @@ export default {
     },
 
     disabled(){
-      this.disabledKey = Date.now();
+      this.btnLoading = false;
+      setTimeout(()=>{
+        this.btnLoading = true;
+      },10)
       return this.fromSelect === null || this.toSelect === null;
     },
   },
   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() {
@@ -194,7 +202,6 @@ export default {
     this.switchValidToken();
     this.validImageAPIUrl = this.brandInfo["api_host"] + "/common/v1/valid_code/image/show";
     this.contentBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
-
   },
   methods: {
     onJfbLoad(options) {
@@ -251,14 +258,6 @@ export default {
     },
 
     handleToSubmit() {
-      // if (!this.valid_code) {
-      //   uni.showToast({
-      //     title: "验证码不能为空！",
-      //     icon: "none",
-      //   });
-      //   return;
-      // }
-
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
       let inPrice = this.$xdUniHelper.divisionFloatNumber(this.toSelect.card_point, 100);
@@ -266,7 +265,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认合并票券",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content: `<div class="label-value"><div><span>转出票券：</span><span>${outHtml}</span></div><div><span>转入票券：</span><span>${inHtml}</span></div></div>`,
         success: (action) => {
           let params = {
@@ -295,6 +294,8 @@ export default {
       });
     },
     handleChangeFrom(select) {
+      this.toListLoading = false;
+      this.randomKey = null;
       this.fromSelect = select.item;
       jfbRootExec("toCardListEntry", {vm: this, data: {card_number: select.item.value,},})
         .then((res) => {
@@ -308,7 +309,11 @@ export default {
               name: item.card_type_name
             };
           });
-          this.randomKey = Date.now();
+          this.randomKey = this.$xdUniHelper.randomChar(20);
+          setTimeout(()=>{
+            this.toListLoading = true;
+          },50)
+
         })
         .catch((err) => {
           this.$xdLog.catch(err)

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>
@@ -159,7 +152,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {

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: {
@@ -219,7 +216,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {
@@ -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/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -82,22 +82,13 @@
               </view>
               <view class="jfb-base-card__body-card-item-right-bottom">
                 <view class="jfb-base-card__body-card-item-right-bottom-info">
-                  <view
-                    class="jfb-base-card__body-card-item-right-bottom-info-residue"
-                  >
-                    剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}
-                  </view>
-                  <view
-                    class="jfb-base-card__body-card-item-right-bottom-info-deduction"
-                  >
-                    购买其他物品可抵：{{ item.other_card_point }}
-                  </view>
+                  <view class="jfb-base-card__body-card-item-right-bottom-info-residue">剩余{{ item.unit }}数：{{ item.card_point }}{{ item.unit }}</view>
+                  <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">购买其他物品可抵：{{ item.other_card_point }}</view>
                 </view>
                 <view
                   @click.stop="toDetail(item)"
                   :style="{ background: mainColor }"
-                  >查看</view
-                >
+                >查看</view>
               </view>
             </view>
           </view>
@@ -106,8 +97,14 @@
       <view :style="{height:'128rpx'}"></view>
       <view class="bottom_fix" :style="button_bottom">
         <view>
+          <!-- #ifdef MP-WEIXIN-->
+          <view><xd-button type="primary" @click="toBindCard">绑定新卡</xd-button></view>
+          <view><xd-button type="primary" @click="toOrderList">我的订单</xd-button></view>
+          <!-- #endif-->
+          <!-- #ifdef H5-->
           <xd-button type="primary" @click="toBindCard">绑定新卡</xd-button>
           <xd-button type="primary" @click="toOrderList">我的订单</xd-button>
+          <!-- #endif-->
         </view>
       </view>
     </view>
@@ -123,6 +120,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import {Base64} from "js-base64";
+  import {mapState} from "vuex";
 
   export default {
     name: "JfbBaseCardV2",
@@ -137,6 +135,7 @@
       return {
         cardList: [],
         inCallback: "",
+
         //面板
         cardInfoPath: "", //卡券详情
         cardBindPath: "",
@@ -154,11 +153,14 @@
       }
     },
     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: 0, zIndex: 111})
       },
@@ -204,6 +206,7 @@
           }).filter((item) => item["is_valid"] === "Y");
         })
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -215,6 +218,7 @@
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
       },
+
       handleBindLogin(item){
         this.$xdShowLoading({});
         jfbRootExec("loginCardBind", {
@@ -222,8 +226,8 @@
           data: { card_number: item["card_number"] },
         })
           .then((res) => {
-            console.log(res);
             this.$xdHideLoading();
+
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
@@ -232,13 +236,16 @@
 
             if (this.$configProject.isPreview) {
               console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
-            } else {
+            }
+            else {
+              console.warn(`handleBindLogin: ${this.inCallback}`);
               this.$xdUniHelper.redirectTo({
                 url: this.inCallback,
               });
             }
           })
           .catch((res) => {
+            console.error(res);
             this.$xdHideLoading();
           });
       },
@@ -284,13 +291,22 @@
         box-shadow: 0px 0px 8rpx 0px rgba(179, 193, 196, 0.5);
         z-index: 111;
 
-        &>view {
+        & > view {
           width: 100%;
           display: flex;
           justify-content: center;
           align-items: center;
           padding: unit(24, rpx);
           box-sizing: border-box;
+
+          /* #ifdef MP-WEIXIN */
+          & > view {
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          /* #endif */
         }
       }
     }

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

@@ -187,8 +187,7 @@
                 boxShadow: shadow,
                 fontSize: btnTextSize+'rpx'
               }"
-              >查看已领票券</view
-            >
+              >查看已领票券</view>
           </view>
         </view>
 
@@ -308,8 +307,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/Attr.js

@@ -7,6 +7,28 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryType',
+        value: data['entryType'],
+        placeholder: '请选择综合入口类型',
+        multiple: false,
+        groupKey:'content',
+        className: 'input50',
+        rules: [
+          {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
+        ],
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         label: '每行显示数量',
         ele: 'xd-radio',