jufubao-base 1.0.56-beta6 → 1.0.56-beta8

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -59,10 +59,10 @@ export default {
       inline: false,
     },
     {
-      label: '卡券绑定地址:', //label
+      label: '卡券密码绑定地址:', //label
       ele: 'xd-select-pages-path', //package 名称
       valueKey: 'bind_url', //form[valueKey]
-      placeholder: '请选择卡券绑定地址',
+      placeholder: '请选择卡券密码绑定地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
@@ -70,10 +70,10 @@ export default {
       inline: false,
     },
     {
-      label: '卡券绑定确认地址:', //label
+      label: '扫码绑定卡券确认地址:', //label
       ele: 'xd-select-pages-path', //package 名称
       valueKey: 'confirm_url', //form[valueKey]
-      placeholder: '请选择卡券绑定确认地址',
+      placeholder: '请选择扫码绑定卡券确认地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardEntry/Attr.js

@@ -4,16 +4,6 @@ export default {
   style: [],
   advanced: [],
   content: [
-    {
-      label: "票券布局",
-      ele: "xd-radio",
-      valueKey: "cardLayout",
-      value: "1",
-      list: [
-        {label: "布局1", value: "1"},
-        {label: "布局2", value: "2"},
-      ]
-    },
     {
       label: '票券登陆文案:',
       ele: 'el-input',
@@ -59,10 +49,10 @@ export default {
       inline: false,
     },
     {
-      label: '卡券绑定地址:', //label
+      label: '卡券密码绑定地址:', //label
       ele: 'xd-select-pages-path', //package 名称
       valueKey: 'bind_url', //form[valueKey]
-      placeholder: '请选择卡券绑定地址',
+      placeholder: '请选择卡券密码绑定地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
@@ -70,10 +60,10 @@ export default {
       inline: false,
     },
     {
-      label: '卡券绑定确认地址:', //label
+      label: '扫码绑定卡券确认地址:', //label
       ele: 'xd-select-pages-path', //package 名称
       valueKey: 'confirm_url', //form[valueKey]
-      placeholder: '请选择卡券绑定确认地址',
+      placeholder: '请选择扫码绑定卡券确认地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -31,7 +31,7 @@
             <view>使用扫码绑定</view>
             <xd-font-icon
               :style="{marginLeft: '15rpx'}"
-              size="50"
+              size="45"
               icon="iconsaoma"
             ></xd-font-icon>
             
@@ -48,7 +48,7 @@
             <view>券号密码绑定</view>
             <xd-font-icon
               :style="{marginLeft: '15rpx'}"
-              size="50"
+              size="45"
               icon="iconyuechi"
             ></xd-font-icon>
          
@@ -114,26 +114,25 @@
             color: tabIndex === 2 ? '#fff' : '#B8B7BE',
             background: tabIndex === 2 ? mainColor : '#fff',
           }"
-        >
-          可转换票券
-        </view>
+        >可转换票券</view>
       </view>
       <view
         class="jfb-base-card-entry__body-tips"
-        :style="{ color: mainColor }"
+        :style="{ color: warningColor }"
         v-if="tabIndex === 2"
-        >*目前仅支持电影票兑换券进行转换</view
-      >
+      >* 目前仅支持电影票兑换券进行转换</view>
       <view
         v-if="tabIndex === 2 || tabIndex === 1"
         class="jfb-base-card-entry__body-card"
       >
         <view
-          v-for="(item,index) in cardList"
+          v-for="(item) in showList"
           class="card-list"
           :key="item.card_number"
+          @click="toDetail(item)"
           :style="{
-            backgroundImage: item['theme']['color'],
+            background: item['theme']['color'],
+            backgroundSize: '100%'
           }"
         >
           <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
@@ -156,19 +155,19 @@
             </view>
             <view class="card-list__yue">
               <text>余额：</text>
-              <text>{{item.card_point}}</text>
+              <text>{{item.card_point}} {{ item.unit }}</text>
             </view>
-            <view class="card-list__other" v-if="item.other_card_point && item.card_point_type !== 1">
-              <view><text>购买其他物品可抵：</text><text>{{item.other_card_point}}</text></view>
+            <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
+              <view><text>购买其他物品可抵：</text><text>{{item.other_card_point}} {{ item.unit }}</text></view>
             </view>
             <view class="card-list__entry" v-if="item.entries.length === 1">
-              <view :style="{color: mainColor}">{{login_name}}</view>
+              <view @click.stop="handleBindLogin(item,item['entries'][0])" :style="{color: mainColor}">{{login_name}}</view>
             </view>
             <view class="card-list__nodata" v-if="item.entries.length === 0">暂无支持服务列表</view>
             <view class="card-list__entrys" v-if="item.entries.length > 1">
               <view class="card-list__entrys-title">
                 <view>可兑换权益</view>
-                <view>
+                <view @click="toDetail(item, false)">
                   <text>查看详情</text>
                   <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
                 </view>
@@ -176,7 +175,11 @@
               <view class="card-list__entrys-list">
                 <scroll-view scroll-x class="card-list__entrys-scroll">
                   <view class="card-list__entrys-item">
-                    <view v-for="(entry,idx) in item.entries" :key="idx">
+                    <view
+                      v-for="(entry,idx) in item.entries"
+                      :key="idx"
+                      @click.stop="handleBindLogin(item, entry)"
+                    >
                       <view><image :src="entry.image_url"></image></view>
                       <view>{{entry|cutstr}}</view>
                       <view>
@@ -189,12 +192,13 @@
               </view>
             </view>
           </view>
-         
         </view>
       </view>
-      <view v-if="showDisabled==='Y'" @click="handleToDisabled" class="jfb-base-card-entry__body-disabled">
-        已失效票券>>>
-      </view>
+      <view
+        v-if="showDisabled==='Y'"
+        @click="handleToDisabled"
+        class="jfb-base-card-entry__body-disabled"
+      >已失效票券>>></view>
     </view>
       <view class="jfb-base-card-entry__body-dialog" v-if="dialogEvent">
         <view class="jfb-base-card-entry__body-dialog-content">
@@ -246,6 +250,9 @@ export default {
       jwxSDK: (state) => state.jwxSDK,
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
+    showList(){
+      return this.tabIndex === 1 ? this.cardList: this.changeList
+    }
   },
   filters:{
     cutstr(val){
@@ -254,13 +261,6 @@ export default {
     }
   },
   watch: {
-    tabIndex(newVal, oldVal) {
-      if (newVal === 1) {
-        this.showList = this.cardList;
-      } else {
-        this.showList = this.changeList;
-      }
-    },
     container(value) {
       this.init(value)
     }
@@ -278,7 +278,6 @@ export default {
       tabIndex: 1,
       isBack: null, //是否使用返回键
       cardList: [],
-      showList: [],
       changeList: [],
       disableList: [],
       inCallback: null, //内部跳转地址
@@ -291,19 +290,30 @@ export default {
       confirmUrl: "",
       //allEntryPath: "", //综合福利入口页
       disabledUrl: "",
-      cardLayout: "1",  //票券布局
+      //cardLayout: "1",  //票券布局
       showDisabled: 'Y',
       
+      
       cardThemesColor: [
         'radial-gradient(50% 50%, rgba(255, 151, 128, 1) 0%, rgba(255, 64, 61, 1) 100%)',
         'radial-gradient(50% 50%, rgba(247, 198, 35, 1) 0%, rgba(255, 81, 0, 1) 99.91%)',
         'radial-gradient(50% 50%, rgba(0, 207, 193, 1) 0%, rgba(0, 117, 108, 1) 99.91%)',
         'radial-gradient(50% 50%, rgba(255, 148, 77, 1) 0%, rgba(240, 92, 0, 1) 100%)',
-        'radial-gradient(50% 50%, rgba(252, 126, 49, 1) 0%, rgba(255, 143, 67, 1) 100%)'
+        'radial-gradient(50% 50%, rgba(252, 126, 49, 1) 0%, rgba(255, 143, 67, 1) 100%)',
+        '#FF524D', '#FFAA00', '#00C2B8', '#33AAFF', '#FF8636', '#FF744A', '#38C4EB', '#AF5EE0', '#D98643', '#17C26F'
       ],
       cardThemesImage: [
-        '//img.jufubao.cn/component/card/vip.png',
-        //'//img.jufubao.cn/component/card/vip2.png'
+        //'//img.jufubao.cn/component/card/vip.png',
+        '//img.jufubao.cn/component/card/1.png',
+        '//img.jufubao.cn/component/card/2.png',
+        '//img.jufubao.cn/component/card/3.png',
+        '//img.jufubao.cn/component/card/4.png',
+        '//img.jufubao.cn/component/card/5.png',
+        '//img.jufubao.cn/component/card/6.png',
+        '//img.jufubao.cn/component/card/7.png',
+        '//img.jufubao.cn/component/card/8.png',
+        '//img.jufubao.cn/component/card/9.png',
+        '//img.jufubao.cn/component/card/10.png'
       ],
 
       //活动
@@ -373,7 +383,7 @@ export default {
     getCardGroupItem(list, allEntry){
       list.map(item=>{
         //设置卡片样式
-        item['theme'] = this.getCardThemes(item['card_type_name']);
+        item['theme'] = this.getCardThemes(item['card_type_name'] + item['card_type']);
         item['entries'] = this.getEntry(item['business_codes'], allEntry)
       });
       return list
@@ -469,63 +479,99 @@ export default {
      * @description 已绑定卡登录
      * @param item
      */
-    handleBindLogin(item) {
+    handleBindLogin(item , entry) {
+      //卡券登陆
       if (this.tabIndex === 1) {
-        console.log("bindCardLogin", this.inCallback);
-
-        //无效卡
         if (item["is_valid"] !== "Y") {
-          console.log(
-            item,
-            item["is_valid"],
-            item["is_valid"] !== "Y",
-            "itemitem"
-          );
           return;
         }
+        
         this.$xdShowLoading({});
-        jfbRootExec("loginCardBind", {
+        jfbRootExec("loginEntryCardBind", {
           vm: this,
           data: { card_number: item["card_number"] },
         })
           .then((res) => {
-            console.log(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.$xdUniHelper.redirectTo({
-                url: this.inCallback,
-              });
+            }
+            
+            else {
+              this.handleToApp(entry);
             }
           })
           .catch((res) => {
             this.$xdHideLoading();
           });
-      } else {
-        this.$xdUniHelper.navigateTo(
-          {
-            url: `${this.changeUrl}?card_number=${item["card_number"]}`,
-          },
-          false
-        );
+      }
+      
+      //转换卡跳转
+      else {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.changeUrl}?card_number=${item["card_number"]}`
+        }, false);
       }
     },
-    toDetail(item) {
-      this.$xdUniHelper.navigateTo(
-        {
+    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);
+    },
+    
+    toDetail(item, out=true) {
+      if(out && item.entries.length === 1) {
+        this.$xdUniHelper.navigateTo({
           url: `${this.detailUrl}?card_number=${item["card_number"]}`,
-        },
-        false
-      );
+        }, false);
+      }
+      else{
+        this.$xdUniHelper.navigateTo({
+          url: `${this.detailUrl}?card_number=${item["card_number"]}`,
+        }, false);
+      }
+      
     },
 
     onJfbLoad(options) {
@@ -572,16 +618,15 @@ export default {
               ),
             };
           });
+          
           this.cardList = this.getCardGroupItem(res.list.filter((item) => {
             return item["is_valid"] === "Y";
           }), res['site_entry_settings']);
-          this.disableList = res.list.filter((item) => {
-            return item["is_valid"] === "N";
-          });
-          this.changeList = this.cardList.filter((item) => {
+          
+          this.changeList = this.getCardGroupItem(this.cardList.filter((item) => {
             return item["is_exchange"] === "Y";
-          });
-          this.showList = this.cardList;
+          }), res['site_entry_settings']);
+          
           this.$xdHideLoading();
         })
         .catch(() => this.$xdHideLoading());
@@ -678,8 +723,8 @@ export default {
       display: flex;
       align-items: center;
       font-size: unit(28, rpx);
-      margin-bottom: unit(46, rpx);
-      margin-top: unit(46, rpx);
+      margin-bottom: unit(40, rpx);
+      margin-top: unit(40, rpx);
 
       & > view {
         // width: unit(214, rpx);
@@ -694,7 +739,7 @@ export default {
 
     &-tips {
       font-size: unit(20, rpx);
-      margin-bottom: unit(46, rpx);
+      margin-bottom: unit(40, rpx);
     }
 
     &-disabled {
@@ -709,7 +754,11 @@ export default {
 .card-list {
   overflow: hidden;
   border-radius: unit(16, rpx);
-  background-size: 100%;
+  margin-bottom: unit(30, rpx);
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
   
   
   &__title {
@@ -804,12 +853,7 @@ export default {
   }
   
   &__entry {
-    position: absolute;
-    bottom: unit(28, rpx);
-    left: unit(40, rpx);
-    right: unit(40, rpx);
-    height: unit(64, rpx);
-    
+    padding: unit(20, rpx) unit(40, rpx) 0;
     & > view {
       line-height: unit(64, rpx);
       text-align: center;
@@ -909,13 +953,13 @@ export default {
   }
   
   
-  & > view {
+  &-warp {
     width: unit(700, rpx);
-    min-height: unit(410, rpx);
+    min-height: unit(310, rpx);
     position: relative;
     border-radius: unit(16, rpx);
     background-size: 100%;
-    padding-bottom: unit(10, rpx);
+    padding-bottom: unit(20, rpx);
   }
 }
 </style>

package/src/components/JfbBaseCardV2/Attr.js

@@ -43,10 +43,10 @@ export default {
         inline: false,
       },
       {
-        label: '卡券绑定地址:', //label
+        label: '卡券密码绑定地址:', //label
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'cardBindPath', //form[valueKey]
-        placeholder: '请选择卡券绑定地址',
+        placeholder: '请选择卡券密码绑定地址',
         value: data.cardBindPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardV3/Attr.js

@@ -19,10 +19,10 @@ export default {
         notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
       },
       {
-        label: '卡券绑定地址:', //label
+        label: '卡券密码绑定地址:', //label
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'cardBindPath', //form[valueKey]
-        placeholder: '请选择卡券绑定地址',
+        placeholder: '卡券密码绑定地址',
         value: data.cardBindPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),