jufubao-base 1.0.158 → 1.0.159-beta2

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -115,8 +115,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() {
@@ -160,13 +161,12 @@ export default {
     },
     handleUnBindCard(item) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗",
         title: "系统提示",
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             jfbRootExec("disabledCardUnbind", {

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -11,7 +11,7 @@
       v-if="isEditx && active"
     >
       <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit"
-        >删除</view
+      >删除</view
       >
     </view>
     <!-- #endif -->
@@ -178,12 +178,13 @@ export default {
       return this.fixedStyle({height: 0, zIndex: 111});
     },
     emptyBg() {
-        return this.getNoData();
+      return this.getNoData();
     },
   },
   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() {
@@ -195,7 +196,6 @@ export default {
       this.getCardList();
     },
 
-
     getCardList() {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
@@ -226,13 +226,12 @@ export default {
 
     handleAllUnBindCard(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定所有票券吗？",
         title: "系统提示",
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             let cardIds = this.cardOrgList.map(item=>{
@@ -259,13 +258,12 @@ export default {
 
     handleUnBindCard(item) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗？",
         title: "系统提示",
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             jfbRootExec("disabledCardUnbindEntry", {

package/src/components/JfbBaseCardEntry/Attr.js

@@ -4,6 +4,28 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: '选择综合入口类型:',
+      ele: 'xd-site-select-list',
+      valueKey: 'entryGroupId',
+      value: 'default',
+      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-site-news',
@@ -312,6 +334,5 @@ export default {
       },
       inline: false,
     },
-
   ],
 };

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -76,6 +76,7 @@
           :style="{ background: noticeBackgroundColor }"
         >
           <xd-notice-bar
+            style="width: 100%"
             :showIcon="true"
             :scrollable="true"
             :speed="20"
@@ -386,6 +387,8 @@ import { mapState, mapActions } from "vuex";
 import { getContainerPropsValue, isWechat,isQrCode } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
 import { Base64 } from "js-base64";
+import getServiceUrl from "@/common/getServiceUrl";
+import {parsePath} from "@/utils/linkUrl";
 const Color = require("color");
 
 export default {
@@ -413,8 +416,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)
     },
     tabIndex(){
       this.clearDefault();
@@ -433,6 +437,7 @@ export default {
       isPreview: false,
       noticeStatus: false,
       loadingCardList: true,
+      entryGroupId: '',//加载入口数据组别
 
       cutIndex: 1,
       tabIndex: 1,
@@ -486,7 +491,6 @@ export default {
   methods: {
 
     init(container){
-      //设置
       this.cardLayout = getContainerPropsValue(container,"content.cardLayout","1");
       this.changeUrl = getContainerPropsValue(container,"content.change_url",{value: ""}).value;
       this.disabledUrl = getContainerPropsValue(container,"content.disabled_url",{value: ""}).value;
@@ -496,6 +500,8 @@ export default {
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       this.isShowCode = getContainerPropsValue(container, "content.isShowCode", "Y");
       this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
+      //'wechat_mini_program|default'
+      this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
 
     handleToLink(path) {
@@ -577,6 +583,7 @@ export default {
     /**
      * @description 已绑定卡登录
      * @param item
+     * @param entry
      */
     handleBindLogin(item , entry) {
       //卡券登录
@@ -595,7 +602,7 @@ export default {
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
-              this.handleToApp(entry);
+              this.handleClick(entry);
             }
             //#endif
             if (this.$configProject.isPreview) {
@@ -603,7 +610,7 @@ export default {
             }
 
             else {
-              this.handleToApp(entry);
+              this.handleClick(entry);
             }
           })
           .catch((res) => {
@@ -618,43 +625,78 @@ export default {
         }, false);
       }
     },
-    toApp(url){
-      this.$xdUniHelper.redirectTo({
-        url
-      })
-    },
-    handleToApp(entry){
-      let item, redirectUrl;
-      try{
-        item = JSON.parse(entry['redirect_data']);
-      }catch (e) {
-        return;
+
+
+    getCardPath(custom_redirect_data = {}){
+      //#ifdef H5
+      return null;
+      //#endif
+      //#ifdef MP-WEIXIN
+      const dir = custom_redirect_data.dir;
+      const actDir = this.projectAttr['deploy_dir'];
+      if(custom_redirect_data.appType === 'wxmp') {
+        if(dir === actDir) {
+          return {
+            cardPath:  custom_redirect_data.path,
+            cardSelf: 'wxmp',
+          };
+        }
+        else return null;
+      }
+      else if(custom_redirect_data.appType === 'h5'){
+        return {
+          cardPath: custom_redirect_data.site_url,
+          cardSelf: 'h5',
+        };
       }
-      const {dir, path, host} = item;
+      else return null;
+      //#endif
+    },
+
+    handleClick(entry){
+      const {dir, path, host, appType} = entry['redirect_data'];
+      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      let regSp = /(-apiuri\/v)/;
+
+      if(appType === undefined) entry.redirect_data.appType = 'h5';
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
 
       //外站配置地址
-      if (entry.redirect_type === 'URL') {
-        if (item['path'].indexOf('?') === -1) {
-          redirectUrl = `${item['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
-        } else redirectUrl = `${item['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
-        this.toApp(redirectUrl);
-        return;
+      if(entry.redirect_type === 'URL') {
+        if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+          this.$xdUniHelper.redirectTo({
+            url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+          }, false)
+        }
+        else {
+          console.error(`配置错误：${entry.redirect_data['path']}`);
+          throw new Error(`配置错误：${entry.redirect_data['path']}`)
+        }
+        return
       }
 
-      //站内转换
-      let jumpUrl = item.path;
-      //#ifdef H5
-      jumpUrl = `//${host}/${dir}${path}`;
+      //站内应用处理
+      let jumpUrl = '';
+      let jumpUrlObj = parsePath(path);
+      let cardPathStr = '';
+      if(jumpUrlObj.isSameApp) jumpUrl = jumpUrlObj.url;
+      else jumpUrl = `//${host}/${jumpUrlObj.dir}${jumpUrlObj.url}`;
+
+      //#ifdef MP-WEIXIN
+      //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+      if(entry.redirect_data.appType === 'h5') {
+        const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['custom_redirect_data']:{};
+        const cardPathObject = this.getCardPath(custom_redirect_data);
+        if(cardPathObject !== null) {
+          const {cardPath, cardSelf} =cardPathObject
+          if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+        }
+      }
       //#endif
 
-      if (item['fixed_business_code'] === '') {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      else {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-      }
-      this.toApp(redirectUrl);
+      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
     },
 
     toDetail(item, out=true) {
@@ -692,6 +734,7 @@ export default {
       if(options['jfb_business_code']) {
         params['card_business_code'] = options['jfb_business_code'];
       }
+      if(this.entryGroupId) params['group_id'] = this.entryGroupId;
       this.$xdShowLoading({});
       jfbRootExec("getListEntryCardBind", {
         vm: this,
@@ -713,6 +756,10 @@ export default {
               ),
             };
           });
+
+          //过滤入口配置
+          res['site_entry_settings'] = this.filterNotSupportEntry(res['site_entry_settings']);
+
           this.ajaxCardList =  res;
           this.hasChangeStatus = this.getCardGroupItem(this.ajaxCardList.list.filter((item) => {
             return item["is_exchange"] === "Y";

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -36,16 +36,24 @@
               v-model="card_password"
               :placeholder="card_pwd_placeholder"
             />
+            <!--#ifdef H5-->
             <xd-font-icon
-              @click="isPassword = !isPassword"
+              @click="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
+            <!--#endif-->
+            <!--#ifdef MP-WEIXIN-->
+            <xd-font-icon
+              :width="72"
+              :height="72"
+              @click="handleIcon()"
+              :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
+            ></xd-font-icon>
+            <!--#endif-->
           </view>
         </view>
         <view class="jfb-base-card-info__body-footer" :style="prod_bottom">
-          <xd-button type="primary" width="360rpx" @click="handleGetInfo"
-            >确认</xd-button
-          >
+          <xd-button type="primary" width="360rpx" @click="handleGetInfo">确认</xd-button>
         </view>
       </view>
 
@@ -78,15 +86,12 @@
               <view
                 v-if="info.other_card_point && info.card_point_type !== 1"
                 class="jfb-base-card-info__body-residue-reach"
-                >购买其他物品可抵：{{ info.other_card_point }}</view
-              >
+              >购买其他物品可抵：{{ info.other_card_point }}</view>
             </view>
             <view
               class="jfb-base-card-info__body-residue-business"
               v-if="info.card_point_type !== 1"
-            >
-              所属业务线：{{ info.main_business_code_name }}
-            </view>
+            >所属业务线：{{ info.main_business_code_name }}</view>
           </view>
           <view :style="{ height: '100rpx' }"></view>
         </view>
@@ -129,18 +134,10 @@ export default {
           label: "票券号码",
           key: "card_number",
         },
-        // {
-        //   label: "票券类型",
-        //   key: "unit",
-        // },
         {
           label: "票券状态",
           key: "card_status_name",
         },
-        // {
-        //   label: "票券转换",
-        //   key: "is_exchange_name",
-        // },
         {
           label: "有效期",
           key: "end_time",
@@ -177,7 +174,7 @@ export default {
       return true;
     },
     showValueKey(){
-      if(this.info.is_expired === "Y"){
+      if(this.info && this.info.is_expired === "Y"){
         return this.valueKey.filter(item => item.key !== "end_time");
       }
       return this.valueKey;
@@ -185,6 +182,9 @@ export default {
   },
   created() {},
   methods: {
+    handleIcon(){
+      this.isPassword = !this.isPassword
+    },
     toShowCouponDialog(){
       if(this.info){
         jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
@@ -256,7 +256,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',
@@ -293,6 +293,12 @@ export default {
     onJfbLoad(options) {
       this.init();
       this.qrcode = options.qrcode;
+      //#ifdef MP-WEIXIN
+      if(options.qrcode) {
+        this.qrcode = decodeURIComponent(options.qrcode);
+      }
+
+      //#endif
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
@@ -407,6 +413,16 @@ export default {
         color: #a6a6a6;
         margin-right: unit(70, rpx);
         text-align: center;
+
+
+      }
+
+      & .mp {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 72rpx;
+        height: 72rpx
       }
 
       input {

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -168,8 +168,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: {
@@ -194,7 +195,7 @@ export default {
     handleToLink() {
       if(this.info.card_point===0) {
         this.$xdConfirm({
-        $vm: this,
+          styles: this.styles,
         content: "票券余额为0，是否确认绑定?",
         width: "80%",
         success: (res) => {
@@ -269,7 +270,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',
@@ -308,6 +309,9 @@ export default {
     onJfbLoad(options) {
       this.init();
       this.qrcode = options.qrcode;
+      //#ifdef MP-WEIXIN
+      this.qrcode = decodeURIComponent(options.qrcode);
+      //#endif
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }

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) {