gxd-uni-library-editx 1.0.76 → 1.0.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdUnit/XdUnit.vue

@@ -12,7 +12,7 @@
         fontSize: fontSize + 'rpx',
         fontWeight: fontWeight,
         textDecoration: deleteLine ? 'line-through': 'none',
-        color: uiColor
+        color: isGray?'#999':uiColor
       }"
     >{{uiPrice}}</view>
     <view class="xd-unit__image" v-if="uiIcon && isShowIcon && (unit === null)">
@@ -25,7 +25,7 @@
           :style=" {
             lineHeight: fontSize + 'rpx',
             fontSize: unitFontSize > 0 ? (unitFontSize + 'rpx') :(fontSize - 8) + 'rpx',
-            color: uiColor
+            color: isGray?'#999':uiColor
           }"
           v-if="unit">{{unit}}</view>
         <view v-else>
@@ -113,7 +113,7 @@
         type: Number,
         default: 0
       },
-      
+
       isOld: {
         type: Boolean,
         default: true,
@@ -138,8 +138,8 @@
       },
     },
     async created() {
-      
-      
+
+
 
       //配置中获取
       let optionsIcon = null;
@@ -152,7 +152,7 @@
       if (this.brandInfo && this.brandInfo['unit_icon']) {
         brandIncon = this.brandInfo['unit_icon'];
       }
-      
+
       //保留几位小数
       if ((this.brandInfo && this.brandInfo['unit_float'])) {
         let unit_float = this.brandInfo['unit_float'];
@@ -165,23 +165,23 @@
         if (unit_float > 2) unit_float = null;
         this.fixedNum = unit_float;
       }
-      
-      
+
+
 
       //项目配置中获取
       let projectIcon;
       if (this.webUnitIcon) {
         projectIcon = this.webUnitIcon;
       }
-  
+
       if (this.colorNew) this.uiColor = this.colorNew;
-      
+
       this.uiIcon = projectIcon || brandIncon || optionsIcon;
-      
+
       if(this.unit === null) {
         this.uiIcon = projectIcon || brandIncon || optionsIcon;
       }
-  
+
       //设置显示数字
       this.initPrice();
     },
@@ -195,7 +195,7 @@
           this.show = false;
           return;
         }
-        
+
         //设置显示数字
         if (this.isOld) this.uiPrice = this.price;
         else {
@@ -203,7 +203,7 @@
           if(this.$xdUniHelper.checkVarType(price) === 'string') {
             price = Number(price);
           }
-          
+
           this.uiPrice = this.$xdUniHelper.divisionFloatNumber(price, 100);
           if(this.fixedNum !== null) {
             this.uiPrice = this.uiPrice.toFixed(this.fixedNum);
@@ -231,7 +231,7 @@
       margin-right: unit(12, rpx);
       font-weight: normal;
     }
-    
+
     &__image {
       display: flex;
       justify-content: center;

package/src/mixins/cardListMixins.js

@@ -101,7 +101,6 @@ export default {
             return card
           });
           this.cardList = (this.cardList||[]).concat(arr);
-          this.cardPageNum++;
           this.$xdHideLoading();
         }).exec();
       })
@@ -118,7 +117,8 @@ export default {
       });
 
       this.cardOrgList = this.$xdUniHelper.cloneDeep(validCardList);
-      this.cardComputedList = this.cardOrgList.slice(this.cardPageNum,this.cardPageLen);
+      console.warn(`cardOrgList:${this.cardOrgList.length}`)
+      this.cardComputedList = this.$xdUniHelper.cloneDeep(this.cardOrgList).slice(this.cardPageNum,this.cardPageLen);
       if(this.cardComputedList.length < this.cardPageLen) {
         this.hasContent = false;
       }
@@ -143,7 +143,7 @@ export default {
         setTimeout(()=>{
           this.cardLoading = false;
           this.$xdHideLoading();
-          this.cardComputedList = this.cardOrgList.slice(
+          this.cardComputedList = this.$xdUniHelper.cloneDeep(this.cardOrgList).slice(
             this.cardPageNum*this.cardPageLen,
             this.cardPageNum*this.cardPageLen + this.cardPageLen
           );

package/src/utils/XdNetwork.js

@@ -1,5 +1,7 @@
 'use strict';
 import helper from "@/utils/helper";
+import {getJfbConfig,getColorBaseUrl} from "@/lib/conf.domain";
+
 class XdNetwork {
   constructor(){
     this.eventObj = {
@@ -109,8 +111,8 @@ class XdNetwork {
   getNetworkEnv(paths=[]){
     if(paths.length === 0) {
       paths = [
-        {path: 'https://image.jufubao.cn/network/10x10.png', size:0.94},
-        {path: 'https://image.jufubao.cn/network/100x100.png', size: 1.078},
+        {path: `${getColorBaseUrl(getJfbConfig('apiBasePath'))}/common/10x10.png`, size:0.94},
+        {path: `${getColorBaseUrl(getJfbConfig('apiBasePath'))}/common/100x100.png`, size: 1.078},
       ]
     }
     let promiseArr= [];

package/src/utils/xd.common.js

@@ -187,6 +187,32 @@ const uriIgnoreErrors = (url, useTime)=>{
   return reg.test(url) || useTime < useTimeMax;
 }
 
+/**
+ * @description 体验模式报错处理
+ */
+const noticeExperience= ($vm)=>{
+  $vm.$xdConfirm({
+    title:'体验模式暂不支持该功能',
+    content:"您可以退出体验模式并登录正式账号使用完整功能",
+    cancelText:'继续体验',
+    confirmText:'去登陆',
+    styles: store.state.styleCommon,
+    success:(res)=>{
+      if(res.confirm){
+        $vm.$xdShowLoading({});
+        store.dispatch('logout').then(res=>{
+          $vm.$xdHideLoading();
+          store.state.jfbAuthorize.removeToken('card');
+          store.state.jfbAuthorize.jumpToUserLogin($vm, false);
+        }).catch(err=>{
+          console.error(err);
+          $vm.$xdHideLoading();
+        })
+      }
+    }
+  })
+}
+
 /**
  * @description 异步请求统一处理
  * @param request {Request}
@@ -225,6 +251,17 @@ export function handlePesponse(
     getApp().saveLogs(requestInfo, 'alert', 'ajax');
   }
 
+  //非200状态体检报错处理
+  if(response['statusCode'] !== 200
+    && response.data
+    && response.data.message
+    && response.data.message.indexOf('体验模式')!==-1
+  ){
+    noticeExperience($vm);
+    reject(response);
+    return;
+  }
+
   //200
   if (response['statusCode'] === 200) {
     //当前卡卡去不支持当前业务线
@@ -245,6 +282,14 @@ export function handlePesponse(
 
   //400
   else if (response['statusCode'] === 400) {
+    if(response.data.code === 'RefuseUserExperience' ||
+      response.data.message.indexOf('体验模式')!==-1
+    ) {
+      noticeExperience($vm);
+      reject(response);
+      return
+    }
+
     if (!$vm) {
       reject(response);
       throw new Error(response.data.message);