jufubao-base 1.0.56-beta5 → 1.0.56-beta6

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -143,7 +143,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>
@@ -161,16 +161,32 @@
             <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>
-            <view class="card-list__entry" v-if="item.entry.length === 1">
+            <view class="card-list__entry" v-if="item.entries.length === 1">
               <view :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>
+                  <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">
+                      <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>
          
@@ -212,6 +228,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");
 
@@ -230,6 +247,12 @@ export default {
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
   },
+  filters:{
+    cutstr(val){
+      if(typeof val.entry_name === 'string') return val.entry_name.slice(0,4);
+      return ''
+    }
+  },
   watch: {
     tabIndex(newVal, oldVal) {
       if (newVal === 1) {
@@ -338,6 +361,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);
           }
@@ -350,7 +374,7 @@ export default {
       list.map(item=>{
         //设置卡片样式
         item['theme'] = this.getCardThemes(item['card_type_name']);
-        item['entry'] = this.getEntry(item['business_codes'], allEntry)
+        item['entries'] = this.getEntry(item['business_codes'], allEntry)
       });
       return list
     },
@@ -689,7 +713,7 @@ export default {
   
   
   &__title {
-    height: unit(46, rpx);
+    height: unit(56, rpx);
     display: flex;
     justify-content: flex-start;
     align-items: center;
@@ -697,7 +721,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 +730,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;
@@ -797,12 +821,101 @@ export default {
     }
   }
   
+  &__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;
+        }
+        
+      }
+      
+      
+    }
+  }
+  
+  
   & > view {
     width: unit(700, rpx);
     min-height: unit(410, rpx);
     position: relative;
     border-radius: unit(16, rpx);
     background-size: 100%;
+    padding-bottom: unit(10, 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)
           }