jufubao-base 1.0.159-beta2 → 1.0.159-beta20

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);
           }
@@ -338,13 +339,39 @@ export default {
         });
     },
 
+    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',
+        };
+      }
+      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';
+      if(!appType) entry.redirect_data.appType = 'h5';
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
 
       //外站配置地址
@@ -362,11 +389,16 @@ export default {
       }
 
       //站内应用处理
-      let jumpUrl = '';
-      let jumpUrlObj = parsePath(path);
+      let jumpUrl = path;
       let cardPathStr = '';
-      if(jumpUrlObj.isSameApp) jumpUrl = jumpUrlObj.url;
-      else jumpUrl = `//${host}/${jumpUrlObj.dir}${jumpUrlObj.url}`;
+      const {deploy_dir} = this.projectAttr;
+      if(host === this.projectAttr.host && deploy_dir !== dir){
+        jumpUrl = `//${host}/${dir}${path}`;
+        //#ifdef MP-WEIXIN
+        jumpUrl = `https:${jumpUrl}`;
+        //#endif
+      }
+
 
       //#ifdef MP-WEIXIN
       //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
@@ -381,6 +413,7 @@ export default {
       //#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)
     },

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -81,7 +81,7 @@
                   @click.stop="handleUnBindCard(item)"
                   v-if="isShowUnbind"
                   :style="{ background: '#fff',color:'#999',border: '1px solid #999' }"
-                  >解绑</view>
+                >解绑</view>
               </view>
             </view>
           </view>
@@ -110,7 +110,7 @@ export default {
   data() {
     return {
       disableList: [],
-      isShowUnbind: false,
+      isShowUnbind: true,
       loadingList: true,
     };
   },
@@ -138,7 +138,7 @@ export default {
       })
         .then((res) => {
           this.loadingList = false;
-          this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
+          //this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -169,7 +169,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseCardDisabledEntryMixin, colorCardMixins, cardListMixins],
   data() {
     return {
-      isShowUnbind: false,
+      isShowUnbind: true,
       isShowIndex:false,
     };
   },
@@ -200,7 +200,7 @@ export default {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
         .then((res) => {
-          this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
+          //this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardEntry/Attr.js

@@ -252,6 +252,18 @@ export default {
       inline: false,
       notice: '请配置温馨提示内容，未配置的情况将不显示此模块',
     },
+    {
+      label: '票券已登录文案:',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'logged_name',
+      groupKey:'content',
+      value: '',
+      placeholder: '请输入票券已登录文案',
+      className: 'input80',
+      inline: false,
+      notice: '当未设置文案时候，前台页面显示为"<span style="color:red">已登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
+    },
     {
       label: "是否展示核销二维码",
       ele: "xd-radio",

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -173,7 +173,12 @@
               }"
             >
               <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
-                <view class="card-list__title"><view>{{item['card_type_name']}}</view></view>
+                <view class="card-list__title">
+                  <view>
+                    <view>{{item['card_type_name']}}</view>
+                    <view v-if="item['is_login'] === 'Y'"><text></text><text>已登录</text></view>
+                  </view>
+                </view>
                 <view class="card-list__content">
                   <view>
                     <text>券号：</text>
@@ -470,9 +475,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,
@@ -559,7 +564,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,
             });
@@ -599,10 +604,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) {
@@ -658,7 +665,7 @@ export default {
       let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
       let regSp = /(-apiuri\/v)/;
 
-      if(appType === undefined) entry.redirect_data.appType = 'h5';
+      if(!appType) entry.redirect_data.appType = 'h5';
       let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
 
       //外站配置地址
@@ -676,11 +683,16 @@ export default {
       }
 
       //站内应用处理
-      let jumpUrl = '';
-      let jumpUrlObj = parsePath(path);
+      let jumpUrl = path;
       let cardPathStr = '';
-      if(jumpUrlObj.isSameApp) jumpUrl = jumpUrlObj.url;
-      else jumpUrl = `//${host}/${jumpUrlObj.dir}${jumpUrlObj.url}`;
+      const {deploy_dir} = this.projectAttr;
+      if(host === this.projectAttr.host && deploy_dir !== dir){
+        jumpUrl = `//${host}/${dir}${path}`;
+        //#ifdef MP-WEIXIN
+        jumpUrl = `https:${jumpUrl}`;
+        //#endif
+      }
+
 
       //#ifdef MP-WEIXIN
       //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
@@ -695,6 +707,7 @@ export default {
       //#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)
     },
@@ -949,16 +962,44 @@ export default {
     align-items: center;
 
     & > view {
-      padding: 0 unit(80, rpx);
+      padding: 0 unit(40, rpx);
       font-size: unit(24, rpx);
       line-height: unit(56, rpx);
       background: rgba(102, 102, 102, 0.4);
       color: #fff;
       border-radius: 0 0 unit(16, rpx) 0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
       .skeleton-card &{
         .skeleton-item(120rpx, 50rpx, 0 0 16rpx 0, #EEEEEE);
       }
+
+      & > view:nth-child(2) {
+        height: 36rpx;
+        line-height: 36rpx;
+        background-color: rgb(41, 203, 151);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 30rpx;
+        padding: 0 20rpx;
+        border-radius: 8rpx;
+
+        & > text:nth-child(1) {
+          width: 10rpx;
+          height: 10rpx;
+          border-radius: 50%;
+          background-color: #fff;
+          margin-right: 10rpx;
+        }
+
+        & > text:nth-child(2) {
+          font-size: 24rpx;
+        }
+      }
+
     }
 
   }

package/src/components/JfbBaseCardEntry/Mock.js

@@ -14,6 +14,7 @@ module.exports = {
       "other_card_point": 0,
       "is_exchange": "N",
       "card_point_type": 1,
+      "is_login":'Y',
       "business_codes": ["health"]
     }, {
       "card_number": "121000100000028",

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -31,6 +31,7 @@
           <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"
@@ -70,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
@@ -178,9 +177,15 @@ export default {
         return this.valueKey.filter(item => item.key !== "end_time");
       }
       return this.valueKey;
-    }
+    },
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
+    },
+  },
+  created() {
+    this.init(this.container)
   },
-  created() {},
   methods: {
     handleIcon(){
       this.isPassword = !this.isPassword
@@ -271,37 +276,37 @@ export default {
         }
       })
     },
-    init() {
-      this.backUrl = getContainerPropsValue(
-        this.container,
-        "content.back_url",
-        { value: "/pages/card/card" }
-      ).value;
-      this.card_num_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_num_placeholder",
-        "请输入券号(电子券除外)"
-      );
-      this.card_pwd_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_pwd_placeholder",
-        "请输入密码"
-      );
-      this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
-      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
+    init(container) {
+      this.backUrl = getContainerPropsValue(container, "content.back_url", { value: "/pages/card/card" }).value;
+      this.card_num_placeholder = getContainerPropsValue(container, "content.card_num_placeholder", "请输入券号(电子券除外)");
+      this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
+      this.is_show_balance = getContainerPropsValue(container, 'content.is_show_balance', "N");
+      this.my_card_url = getContainerPropsValue(container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
-      this.init();
-      this.qrcode = options.qrcode;
+      this.qrcode = options.qrcode || options.pa;
+
       //#ifdef MP-WEIXIN
-      if(options.qrcode) {
-        this.qrcode = decodeURIComponent(options.qrcode);
+      if(this.qrcode) {
+        this.qrcode = decodeURIComponent(this.qrcode);
       }
-
       //#endif
+
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
+
+      //正式环境判断参数错误
+      if(!this.$configProject.isPreview) {
+        if(!this.qrcode) {
+          this.$xdAlert({
+            content: '参数配置错误',
+            type: 'error'
+          });
+          return
+        }
+      }
+
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetail", {
           vm: this,
@@ -421,7 +426,6 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        width: 72rpx;
         height: 72rpx
       }
 

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',