jufubao-base 1.0.56-beta2012 → 1.0.56-beta2014

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.56-beta2012",
+  "version": "1.0.56-beta2014",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -50,7 +50,7 @@
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.13-beta5",
+    "gxd-uni-library-editx": "1.0.13-beta7",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

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

@@ -55,9 +55,7 @@
           :key="index"
         >
         <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -90,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>
@@ -216,6 +215,7 @@ export default {
   },
   computed: {
     ...mapState(["brandInfo"]),
+    jfbAuthorize: (state) => state.jfbAuthorize,
     prod_bottom() {
         return this.fixedStyle({height: 0, zIndex: 111});
       },
@@ -308,6 +308,9 @@ export default {
               return item
             })
           }
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1)
+          }
           this.info = res;
           if(!this.$configProject.isPreview) {
             this.setInval(this.info.card_qrcode_expire);
@@ -369,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;
@@ -542,13 +616,13 @@ export default {
       font-weight: 700;
       color: #fff;
       position: relative;
-      height: unit(260,rpx);
+      min-height: unit(260,rpx);
 
       &-wrap {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
-        height: 100%;
+        min-height: unit(260,rpx);
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -560,6 +634,11 @@ export default {
         align-content: center;
         padding-bottom: unit(32, rpx);
         padding-left: unit(40,rpx);
+
+        & > view:first-child {
+          flex-basis: unit(120,rpx);
+          flex-shrink: 0;
+        }
       }
     }
 

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -94,9 +94,7 @@
             :key="index"
           >
           <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -111,7 +109,7 @@
           class="jfb-base-card-info-entry__body-business"
         >
           <view class="jfb-base-card-info-entry__body-business-title">
-            业务板块
+            支持业务板块
           </view>
           <view
             style="
@@ -216,7 +214,23 @@ export default {
   },
   created() {},
   methods: {
-    handleToLink(path) {
+    handleToLink() {
+      if(this.info.card_point===0) {
+        this.$xdConfirm({
+        $vm: this,
+        content: "票券余额为0，是否确认绑定?",
+        width: "80%",
+        success: (res) => {
+          if (res.confirm) {
+           this.handleToBind()
+          }
+        },
+      });
+      return 
+      }
+      this.handleToBind()
+    },
+    handleToBind() {
       if (this.qrcode) {
         jfbRootExec("qrCardBindEntry", {
           vm: this,
@@ -318,6 +332,9 @@ export default {
               item['image_url'] = getServiceUrl(item['image_url'])
               return item
             })
+          }
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1);
           }
             this.headerBg = this.getCardThemes(res.card_type_name);
             this.showInfo = true;
@@ -355,6 +372,9 @@ export default {
               return item
             })
           }
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1);
+          }
           this.headerBg = this.getCardThemes(res.card_type_name);
           this.showInfo = true;
           this.showForm = false;
@@ -446,13 +466,13 @@ export default {
       font-weight: 700;
       color: #fff;
       position: relative;
-      height: unit(260,rpx);
+      min-height: unit(260,rpx);
 
       &-wrap {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
-        height: 100%;
+        min-height: unit(260,rpx);
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -464,6 +484,11 @@ export default {
         align-content: center;
         padding-bottom: unit(32, rpx);
         padding-left: unit(40,rpx);
+
+        & > view:first-child {
+          flex-basis: unit(120,rpx);
+          flex-shrink: 0;
+        }
       }
     }
 

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntryMixin.js

@@ -16,7 +16,7 @@ export default {
       //@EndAttrData
       
       // #endif
-      cssRoot: ''
+      cssRoot: 'jfb-base-card-info-entry'
     }
   },
   created() {

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntryMixin.js

@@ -10,21 +10,21 @@ export default {
   data() {
     return {
       //#ifdef H5
-
+      
       //@AttrData
       Attr:{}, //对外开发编辑属性
       //@EndAttrData
-
+      
       // #endif
       cssRoot: 'jfb-base-card-merge-entry'
     }
   },
   created() {
-
+    
     //@AttrDataCreated
     this.Attr = this.$xdUniHelper.customClone(Attr);
     //@EndAttrDataCreated
-
+    
 
   },
 }

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -50,7 +50,7 @@
             <view>{{info.card_type_name}}</view>
           </view>
           <view
-            style="padding-bottom: 0px"
+            style="padding-bottom: 20rpx"
             class="jfb-base-card-shift-entry__body-header-item"
           >
             <view>券号：</view>
@@ -71,10 +71,8 @@
           v-for="(item, index) in valueKey"
           :key="index"
         >
-          <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+        <view> {{ item.label }}： </view>
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -106,10 +104,8 @@
           v-for="(item, index) in changeValueKey"
           :key="index"
         >
-          <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+        <view> {{ item.label }}： </view>
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -297,6 +293,10 @@ export default {
               temp[key] = res[key];
             }
           });
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1);
+            this.changeValueKey.splice(1,1)
+          }
           this.headerBg = this.getCardThemes(res);
           this.info = temp;
         })
@@ -329,19 +329,16 @@ export default {
       font-weight: 700;
       color: #fff;
       position: relative;
-      height: unit(260,rpx);
+      min-height: unit(260,rpx);
 
       &__title {
         height: unit(56, rpx);
         display: flex;
         justify-content: flex-start;
         align-items: center;
-        position: absolute;
-        top: 0;
-        left: 0;
+
     
       & > view {
-        padding: 0 unit(80, rpx);
         font-size: unit(24, rpx);
         line-height: unit(56, rpx);
         background: rgba(102, 102, 102, 0.4);
@@ -356,7 +353,7 @@ export default {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
-        height: 100%;
+        min-height: 100%;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -368,6 +365,11 @@ export default {
         align-content: center;
         padding-bottom: unit(32, rpx);
         padding-left: unit(40,rpx);
+
+        & > view:first-child {
+          flex-basis: unit(120,rpx);
+          flex-shrink: 0;
+      }
       }
     }
 

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntryMixin.js

@@ -10,21 +10,21 @@ export default {
   data() {
     return {
       //#ifdef H5
-
+      
       //@AttrData
       Attr:{}, //对外开发编辑属性
       //@EndAttrData
-
+      
       // #endif
       cssRoot: 'jfb-base-card-shift-entry'
     }
   },
   created() {
-
+    
     //@AttrDataCreated
     this.Attr = this.$xdUniHelper.customClone(Attr);
     //@EndAttrDataCreated
-
+    
 
   },
 }