jufubao-base 1.0.56-beta5 → 1.0.56-beta7

package/package.json

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

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'] +')'}">
@@ -143,7 +142,7 @@
                 <text>券号：</text>
                 <text>{{item.card_number}}</text>
               </view>
-              <view @click.stop="toDetail(item)">
+              <view @click.stop="toDetail(item)" v-if="0">
                 <view>
                   <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
                 </view>
@@ -156,29 +155,50 @@
             </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.entry.length === 1">
-              <view :style="{color: mainColor}">{{login_name}}</view>
+            <view class="card-list__entry" v-if="item.entries.length === 1">
+              <view @click.stop="handleBindLogin(item,item['entries'][0])" :style="{color: mainColor}">{{login_name}}</view>
             </view>
-            <view class="card-list__nodata" v-if="item.entry.length === 0">暂无支持服务列表</view>
-            <view class="card-list__entrys" v-if="item.entry.length > 1">
-              <view>
-                <view></view>
-                <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 @click="toDetail(item, false)">
+                  <text>查看详情</text>
+                  <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
+                </view>
+              </view>
+              <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"
+                      @click.stop="handleBindLogin(item, entry)"
+                    >
+                      <view><image :src="entry.image_url"></image></view>
+                      <view>{{entry|cutstr}}</view>
+                      <view>
+                        <text>去兑换</text>
+                        <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
+                      </view>
+                    </view>
+                  </view>
+                </scroll-view>
               </view>
-              <div></div>
             </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">
@@ -212,6 +232,7 @@ import extsMixins from "@/mixins/extsMixins";
 import { mapState, mapActions } from "vuex";
 import { getContainerPropsValue, isWechat } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
+import getServiceUrl from "@/common/getServiceUrl";
 import { Base64 } from "js-base64";
 const Color = require("color");
 
@@ -229,15 +250,17 @@ export default {
       jwxSDK: (state) => state.jwxSDK,
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
+    showList(){
+      return this.tabIndex === 1 ? this.cardList: this.changeList
+    }
+  },
+  filters:{
+    cutstr(val){
+      if(typeof val.entry_name === 'string') return val.entry_name.slice(0,4);
+      return ''
+    }
   },
   watch: {
-    tabIndex(newVal, oldVal) {
-      if (newVal === 1) {
-        this.showList = this.cardList;
-      } else {
-        this.showList = this.changeList;
-      }
-    },
     container(value) {
       this.init(value)
     }
@@ -255,7 +278,6 @@ export default {
       tabIndex: 1,
       isBack: null, //是否使用返回键
       cardList: [],
-      showList: [],
       changeList: [],
       disableList: [],
       inCallback: null, //内部跳转地址
@@ -271,16 +293,27 @@ export default {
       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'
       ],
 
       //活动
@@ -338,6 +371,7 @@ export default {
       let support = [];
       codes.map(bus=>{
         allEntry.map(it=>{
+          it['image_url'] = getServiceUrl(it['image_url'])
           if(bus === it['business_code']){
             support.push(it);
           }
@@ -349,8 +383,8 @@ export default {
     getCardGroupItem(list, allEntry){
       list.map(item=>{
         //设置卡片样式
-        item['theme'] = this.getCardThemes(item['card_type_name']);
-        item['entry'] = this.getEntry(item['business_codes'], allEntry)
+        item['theme'] = this.getCardThemes(item['card_type_name'] + item['card_type']);
+        item['entries'] = this.getEntry(item['business_codes'], allEntry)
       });
       return list
     },
@@ -445,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);
+      }
+    },
+    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) {
-      this.$xdUniHelper.navigateTo(
-        {
+    
+    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) {
@@ -548,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());
@@ -654,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);
@@ -670,7 +739,7 @@ export default {
 
     &-tips {
       font-size: unit(20, rpx);
-      margin-bottom: unit(46, rpx);
+      margin-bottom: unit(40, rpx);
     }
 
     &-disabled {
@@ -685,11 +754,15 @@ 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 {
-    height: unit(46, rpx);
+    height: unit(56, rpx);
     display: flex;
     justify-content: flex-start;
     align-items: center;
@@ -697,7 +770,7 @@ export default {
     & > view {
       padding: 0 unit(80, rpx);
       font-size: unit(24, rpx);
-      line-height: unit(46, rpx);
+      line-height: unit(56, rpx);
       background: rgba(102, 102, 102, 0.4);
       color: #fff;
       border-radius: 0 0 unit(16, rpx) 0;
@@ -706,7 +779,7 @@ export default {
   }
   
   &__content {
-    padding: unit(20, rpx) unit(40, rpx) 0;
+    padding: unit(10, rpx) unit(40, rpx) 0;
     height: unit(86, rpx);
     display: flex;
     justify-content: space-between;
@@ -780,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;
@@ -797,12 +865,101 @@ export default {
     }
   }
   
-  & > view {
+  &__entrys {
+    margin: unit(20, rpx) unit(20, rpx) 0;
+    padding: unit(30, rpx);
+    border-radius: unit(16, rpx);
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
+    
+    &-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+     
+      
+      & > view:first-child {
+        font-size: unit(28, rpx);
+        font-weight: 500;
+        flex: 1;
+      }
+      
+      & > view:nth-child(2) {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        flex-shrink: 0;
+        font-size: unit(20, rpx);
+        color: #999;
+      }
+    }
+    
+    &-scroll {
+    
+    }
+  
+    &-item {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      flex-flow: nowrap;
+      margin-left: unit(-16, rpx);
+      padding-top: unit(20, rpx);
+      
+      & > view {
+        width: unit(120, rpx);
+        margin-right: unit(10, rpx);
+        flex-shrink: 0;
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+        
+        & > view:first-child {
+          width: unit(76, rpx);
+          height: unit(76, rpx);
+          overflow: hidden;
+    
+          & > image {
+            height: 100%;
+            width: 100%;
+          }
+        }
+        
+        & > view:nth-child(2) {
+          margin-top: unit(10, rpx);
+          font-size: unit(24, rpx);
+          line-height: unit(36, rpx);
+          margin-bottom: unit(10, rpx);
+        }
+        
+        & > view:nth-child(3) {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          flex-shrink: 0;
+          font-size: unit(20, rpx);
+          color: #999;
+        }
+        
+        &:last-child {
+          margin-right: 0;
+        }
+        
+      }
+      
+      
+    }
+  }
+  
+  
+  &-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(20, rpx);
   }
 }
 </style>

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -285,6 +285,7 @@ export default {
     this.init(this.container);
     this.base = this.jfbAuthorize.getBasePath(this);
     this.site_logo = getServiceUrl(this.projectAttr["site_logo"]);
+    this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.create.done')
   },
 
   methods: {
@@ -295,30 +296,40 @@ export default {
         url: `/pages/content/content?${params}`
       })
     },
+    
+    
     onJfbLoad(options) {
       this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
       // #ifdef MP-WEIXIN
       this.authWxMpListProviders();
       // #endif
-
+      
+      this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
+      
       // #ifdef H5
-      this.authH5ListProviders();
+      try{
+        this.authH5ListProviders();
+      }catch (error) {
+        this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.error');
+        this.$xdLog.setARMSError(error);
+      }
+      
       //#endif
 
-      if (options.isDebug === "1") {
-        getAllPath(this, "main/play/index");
-        getDomainAllPath(this, "main/play/index");
-        getLocalJumpOutSiteCallbackUrl(
-          this,
-          { customParams: 1 },
-          false,
-          "main/play/index"
-        );
-
-        getAllPath(this);
-        getDomainAllPath(this);
-        getLocalJumpOutSiteCallbackUrl(this, { customParams: 1 }, false);
-      }
+      // if (options.isDebug === "1") {
+      //   getAllPath(this, "main/play/index");
+      //   getDomainAllPath(this, "main/play/index");
+      //   getLocalJumpOutSiteCallbackUrl(
+      //     this,
+      //     { customParams: 1 },
+      //     false,
+      //     "main/play/index"
+      //   );
+      //
+      //   getAllPath(this);
+      //   getDomainAllPath(this);
+      //   getLocalJumpOutSiteCallbackUrl(this, { customParams: 1 }, false);
+      // }
     },
 
     /**
@@ -448,6 +459,7 @@ export default {
      * @description h5获取登陆方式
      */
     authH5ListProviders() {
+      this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading.')
       let providers = this.projectAttr["login_providers"] || [
         "62fde99f2583a19c58fd937b",
         "62fde9432583a19c58fd937a",
@@ -459,7 +471,7 @@ export default {
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)
       }
-      console.warn(`authH5ListProviders.redirect.url: ${redirect_url}`);
+      
       try {
         let redirectURL = new URL(redirect_url);
         redirect_url = redirectURL.href;
@@ -467,13 +479,17 @@ export default {
         redirect_url = location.origin + this.base + redirect_url;
       }
       
+      
       let params = {
         providers: providers.join(","),
         callback_url: redirect_url,
         phone_number_login_url: location.origin + this.base + this.phone_number_login_url,
         phone_number_collect_url: location.origin + this.base + this.phone_number_collect_url,
         error_callback_url: location.origin + this.base + this.error_callback_url,
-      }
+      };
+  
+      this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading..');
+      
       jfbRootExec("listSiteProvider", {
         vm: this,
         data: params,
@@ -483,7 +499,7 @@ export default {
         })
         .catch((error) => {
           if (this.$xdUniHelper.checkVarType(error) === 'object') {
-            this.$xdLog.setARMSCustomError('list_site_provider_error', {...params, fn:'listSiteProvider'})
+            this.$xdLog.setARMSCustomError('list_site_provider_error', {...params, fn:'listSiteProvider', error})
           } else {
             this.$xdLog.setARMSError(error)
           }