jufubao-base 1.0.56-beta2013 → 1.0.56-beta2015

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.56-beta2013",
+  "version": "1.0.56-beta2015",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCardDetailEntry/Api.js

@@ -44,4 +44,15 @@ module.exports = [
     },
     disabled: true,
   },
+  {
+    mapFnName: 'detailLoginEntryCardBind',
+    isRule: false,
+    title: '登录卡',
+    prefix: 'login',
+    path: '/card/v1/card-bind/login-card',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+    },
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -88,12 +88,13 @@
        <view
        class="jfb-base-card-detail-entry__body-business-title"
        >
-      业务板块
+      进入业务板块
       </view>
       <view style="display:flex;align-content:center;justify-content:center">
         <view class="jfb-base-card-detail-entry__body-business-content">
         <view
         class="jfb-base-card-detail-entry__body-business-content-item"
+        @click="handleBindLogin(item)"
         v-for="(item,index) in info.site_entry_settings"
         :key="index">
           <view><image :src="item.image_url"></image></view>
@@ -214,6 +215,7 @@ export default {
   },
   computed: {
     ...mapState(["brandInfo"]),
+    jfbAuthorize: (state) => state.jfbAuthorize,
     prod_bottom() {
         return this.fixedStyle({height: 0, zIndex: 111});
       },
@@ -370,6 +372,77 @@ export default {
           })
           .catch();
       }, time);
+    },
+     /**
+     * @description 已绑定卡登录
+     * @param item
+     */
+     handleBindLogin(entry) {
+      //卡券登陆
+      this.$xdShowLoading({});
+      jfbRootExec("detailLoginEntryCardBind", {
+          vm: this,
+          data: { card_number: this.info["card_number"] },
+        })
+          .then((res) => {
+            this.$xdHideLoading();
+            //#ifdef MP-WEIXIN
+            if (this.jfbAuthorize !== null) {
+              this.jfbAuthorize.setToken("card", res["card_token"], {
+                expires: res["card_expire_in"] / 60 / 60,
+              });
+              this.handleToApp(entry);
+            }
+            //#endif
+            if (this.$configProject.isPreview) {
+              console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
+            }
+            
+            else {
+              this.handleToApp(entry);
+            }
+          })
+          .catch((res) => {
+            this.$xdHideLoading();
+          });
+    },
+    toApp(url){
+      this.$xdUniHelper.redirectTo({
+        url
+      })
+    },
+    handleToApp(entry){
+      let item, redirectUrl;
+      try{
+        item = JSON.parse(entry['redirect_data']);
+      }catch (e) {
+        return;
+      }
+      const {dir, path, host} = item;
+      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;
+      }
+      
+      //站内转换
+      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()}`
+      }
+      else {
+        redirectUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+      }
+      this.toApp(redirectUrl);
     },
     handleOnClose() {
       this.editShow = false;
@@ -445,7 +518,7 @@ export default {
     },
     handleToShift() {
       this.$xdUniHelper.navigateTo({
-          url: this.shift_url,
+          url: `${this.shift_url}?card_number=${this.info["card_number"]}`,
       });
     },
     onJfbBack(options) {

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -109,7 +109,7 @@
           class="jfb-base-card-info-entry__body-business"
         >
           <view class="jfb-base-card-info-entry__body-business-title">
-            业务板块
+            支持业务板块
           </view>
           <view
             style="

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -42,7 +42,7 @@
             icon="iconzhuanhuanshitu"
             style="margin-right:10rpx"
           ></xd-font-icon>
-            {{info.card_type_name}}
+            转换的票券
           </view>
         </view>
           <view style="padding-top:40rpx" class="jfb-base-card-shift-entry__body-header-item">
@@ -107,7 +107,7 @@
         <view> {{ item.label }}： </view>
           <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
-            <text>{{info.unit}}</text>
+            <text>点</text>
           </view>
           <view style="color: #333; font-weight: 500" v-else>
             {{ info[item.key] }}
@@ -297,7 +297,7 @@ export default {
             this.valueKey.splice(1,1);
             this.changeValueKey.splice(1,1)
           }
-          this.headerBg = this.getCardThemes(res);
+          this.headerBg = this.getCardThemes(res.card_type_name);
           this.info = temp;
         })
         .catch((err) => {});
@@ -339,6 +339,7 @@ export default {
 
     
       & > view {
+        padding: 0 unit(80, rpx);
         font-size: unit(24, rpx);
         line-height: unit(56, rpx);
         background: rgba(102, 102, 102, 0.4);