jufubao-base 1.0.204 → 1.0.205

package/package.json

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

package/src/components/JfbBaseBackground/JfbBaseBackground.vue

@@ -14,7 +14,11 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-background__body">
-      <view :style="{background:backgroundColor,color:warningColor}" class="jfb-base-background__body-pop" v-if="isPreview">设置背景模式方便编辑(占位)，在线上此模块不显</view>
+      <view
+        :style="{background:backgroundColor,color:warningColor}"
+        class="jfb-base-background__body-pop"
+        v-if="isPreview"
+      >设置背景模式方便编辑(占位)，在线上此模块不显</view>
     </view>
   </view>
 </template>
@@ -95,7 +99,7 @@ export default {
 
 .jfb-base-background {
   &__body {
-    min-height: 100rpx;
+
     &-pop {
       min-height: 100rpx;
       text-align: center;

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -154,7 +154,7 @@
           this.$xdHideLoading();
           let isH5FilterEntryList = [];
           let isMpFilterEntryList = [];
-          this.entryList = res.list.filter(item=>{
+          let entryList = res.list.filter(item=>{
             //#ifdef H5
             //在H5平台应用中不可跳转到微信小程序应用
             if(item.redirect_data.appType === 'wxmp'){
@@ -172,59 +172,70 @@
             }
             return true
             //#endif
-          }).map(item => {
-            const {dir, path, host,appType} = item['redirect_data'];
-            if(appType === undefined) item.redirect_data.appType = 'h5';
-            item['image_url'] = getServiceUrl(item.image_url);
-            item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
-            item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
-            let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
+          })
+            .map(item => {
+              const {dir, path, host,appType} = item['redirect_data'];
+              if(appType === undefined) item.redirect_data.appType = 'h5';
+              item['image_url'] = getServiceUrl(item.image_url);
+              item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
+              item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
+              let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
 
-            //外站配置地址
-            if(item.redirect_type === 'URL') {
-              if(item['redirect_data']['path'].indexOf('?') === -1) {
-                item['redirect_data']['path'] = `${item['redirect_data']['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
+              //外站配置地址
+              if(item.redirect_type === 'URL') {
+                if(item['redirect_data']['path'].indexOf('?') === -1) {
+                  item['redirect_data']['path'] = `${item['redirect_data']['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
+                }
+                else item['redirect_data']['path'] = `${item['redirect_data']['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
+                return item;
               }
-              else item['redirect_data']['path'] = `${item['redirect_data']['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
-              return item;
-            }
 
-            let jumpUrl = path;
+              let jumpUrl = path;
 
-            //域名相同并且应用路径不相同时候处理
-            if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
-              jumpUrl = `//${host}/${dir}${path}`;
+              //域名相同并且应用路径不相同时候处理
+              if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
+                jumpUrl = `//${host}/${dir}${path}`;
+                //#ifdef MP-WEIXIN
+                jumpUrl = `https:${jumpUrl}`;
+                //#endif
+              }
+
+              //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+              let cardPathStr = '';
               //#ifdef MP-WEIXIN
-              jumpUrl = `https:${jumpUrl}`;
+              if(item.redirect_data.appType === 'h5') {
+                const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['custom_redirect_data']:{};
+                const cardPathObject = this.getCardPath(custom_redirect_data);
+                if(cardPathObject !== null) {
+                  const {cardPath, cardSelf} =cardPathObject
+                  if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+                }
+              }
               //#endif
-            }
+              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+              return item;
+            });
 
-            //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
-            let cardPathStr = '';
-            //#ifdef MP-WEIXIN
-            if(item.redirect_data.appType === 'h5') {
-              const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['custom_redirect_data']:{};
-              const cardPathObject = this.getCardPath(custom_redirect_data);
-              if(cardPathObject !== null) {
-                const {cardPath, cardSelf} =cardPathObject
-                if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
-              }
-            }
-            //#endif
-            item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
-            return item;
-          });
           //#ifdef MP-WEIXIN
           console.warn(`微信小程序端被过滤的入口列表：${JSON.stringify(isMpFilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
           //#endif
           //#ifdef H5
           console.warn(`H5端被过滤的入口列表：${JSON.stringify(isH5FilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
           //#endif
-          console.warn(`福利入口链接列表:${JSON.stringify(this.entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
-          if(res.list.length === 1) this.toLink(this.entryList[0]);
+          console.warn(`福利入口链接列表:${JSON.stringify(entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
+
+          //一条数据直接跳转到入口
+          if(entryList.length === 1){
+            this.toLink(entryList[0]);
+            return
+          }
+          //无数据提示
           if(res.list.length === 0) {
             this.$xdAlert({content: '当前票券暂无支持服务'})
+            return;
           }
+          //复制
+          this.entryList = entryList;
         })
       },
       toLink(item){

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -242,18 +242,16 @@
 
   .jfb-base-fast-link {
     display: flex;
-    min-height: unit(100, rpx);
 
     &__body{
       flex: 1;
 
       &-pop {
-        min-height: 58rpx;
+        min-height: 100rpx;
         text-align: center;
-        line-height: 58rpx;
+        line-height: 100rpx;
         color: #666;
         font-size: unit(24, rpx);
-        padding:unit(20, rpx);
       }
     }
   }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -678,7 +678,7 @@
                 size="28"
                 icon="iconxia_down"
               ></xd-font-icon>
-            </view>         
+            </view>
           </view>
           <view class="jfb-base-order-detail__body-html" v-if="showAllProductDetail">
             <view v-html="info.productDetail"></view>
@@ -967,7 +967,7 @@ export default {
         this.getCountDown();
       }
     },
-    getOrderDetail() {      
+    getOrderDetail() {
       jfbRootExec("getBaseOrderDetail", {
         vm: this,
         data: {
@@ -979,6 +979,13 @@ export default {
         },
       })
         .then((res) => {
+
+          //跳转到第三方订单
+          if(res['third_order_detail_url']) {
+            this.$xdUniHelper.redirectTo({url: res['third_order_detail_url']}, false, false);
+            return;
+          }
+
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
 
@@ -1135,9 +1142,9 @@ export default {
               });
             } catch (error) {
               console.log(error,'apapapa');
-              
+
             }
-            
+
           }
           else {
             this.info = res;