jufubao-base 1.0.159 → 1.0.161

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,
@@ -465,9 +470,9 @@ export default {
     this.init(this.container);
     this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject.isPreview;
+    this.isQrCode = isQrCode(this);
 
     //#ifdef H5
-    this.isQrCode = isQrCode(this);
     if (!this.$configProject.isPreview) {
       jfbRootExec("getH5WxAuthorize", {
         vm: this,
@@ -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) {
@@ -553,7 +559,7 @@ export default {
         uni.scanCode({
           scanType: ["qrCode"],
           success: (res) => {
-            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
+            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`)
             this.$xdUniHelper.navigateTo({
               url:path,
             });
@@ -577,6 +583,7 @@ export default {
     /**
      * @description 已绑定卡登录
      * @param item
+     * @param entry
      */
     handleBindLogin(item , entry) {
       //卡券登录
@@ -592,10 +599,12 @@ export default {
         })
           .then((res) => {
             this.$xdHideLoading();
+
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
               this.jfbAuthorize.setCardToken(res);
-              this.handleToApp(entry);
+              this.handleClick(entry);
+              return
             }
             //#endif
             if (this.$configProject.isPreview) {
@@ -603,7 +612,7 @@ export default {
             }
 
             else {
-              this.handleToApp(entry);
+              this.handleClick(entry);
             }
           })
           .catch((res) => {
@@ -618,43 +627,84 @@ 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;
       }
-      const {dir, path, host} = item;
+      else if(custom_redirect_data.appType === 'h5'){
+        return {
+          cardPath: custom_redirect_data.site_url,
+          cardSelf: 'h5',
+        };
+      }
+      else return null;
+      //#endif
+    },
+
+    handleClick(entry){
+      const {dir, path, host, appType} = entry['redirect_data'];
+      let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+      let regSp = /(-apiuri\/v)/;
+
+      if(!appType) 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}`;
-      //#endif
-
-      if (item['fixed_business_code'] === '') {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+      //站内应用处理
+      let jumpUrl = path;
+      let cardPathStr = '';
+      const {deploy_dir} = this.projectAttr;
+      if(host === this.projectAttr.host && deploy_dir !== dir){
+        jumpUrl = `//${host}/${dir}${path}`;
+        //#ifdef MP-WEIXIN
+        jumpUrl = `https:${jumpUrl}`;
+        //#endif
       }
-      else {
-        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+
+
+      //#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}`
+        }
       }
-      this.toApp(redirectUrl);
+      //#endif
+
+      jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+      console.warn(`entry.path:${jumpUrl}`);
+      if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+      else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
     },
 
     toDetail(item, out=true) {
@@ -692,6 +742,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 +764,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

@@ -31,21 +31,30 @@
           <view class="jfb-base-card-info__body-form">
             <view class="jfb-base-card-info__body-form-label">票券密码</view>
             <input
+              class="mp"
               max="18"
               :password="isPassword"
               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>
 
@@ -62,9 +71,7 @@
           <view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
             <view class="jfb-base-card-info__body-residue-wrap">
               <view class="jfb-base-card-info__body-residue-label">
-                <view :style="{ color: '#242424', fontSize: '28rpx' }"
-                  >剩余元宝</view
-                >
+                <view :style="{ color: '#242424', fontSize: '28rpx' }">剩余元宝</view>
               </view>
               <view class="jfb-base-card-info__body-residue-value">
                 <xd-unit
@@ -78,15 +85,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 +133,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 +173,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 +181,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})
@@ -255,7 +254,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',
@@ -291,7 +290,15 @@ 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;
       }
@@ -406,6 +413,15 @@ export default {
         color: #a6a6a6;
         margin-right: unit(70, rpx);
         text-align: center;
+
+
+      }
+
+      & .mp {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 72rpx
       }
 
       input {

package/src/components/JfbBaseCardInfoEntry/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-select-pages-path',