gxd-uni-library-editx 1.0.70 → 1.0.72

package/package.json

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

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -35,7 +35,7 @@
               ></xd-unit>
             </view>
           </view>
-          
+
         </view>
         <view
           class="ticket_list"
@@ -212,7 +212,7 @@ import {
   } from '@/utils/xd.base';
 
 export default {
-  name: "XdCardPay",
+  name: "XdCardPayChose",
   components: {
     XdDownDrawer,
     XdButton,
@@ -278,7 +278,7 @@ export default {
       }
       this.$emit('update:show', n);
       this.$emit("onAlert");
-      
+
     },
     orderTotalPrice: {
       handler(n){
@@ -346,7 +346,7 @@ export default {
     alert_bottom(){
       return this.fixedStyle({paddingBottom: 24, zIndex: 110})
     },
-    
+
   },
   async created(){
     this.switchValidToken();
@@ -442,7 +442,7 @@ export default {
         });
       })
     },
-    
+
     //选择卡券
     handlerTicketSelect(flat, ticket, options){
       if(flat){ //选择卡券，重新调用接口获取 selectedCardList, neePayPrice
@@ -513,7 +513,7 @@ export default {
       }
 
     },
-    
+
     filterMGinfo(list){
       //深拷贝
       if(this.$xdUniHelper.checkVarType(list) === 'object'
@@ -528,7 +528,7 @@ export default {
         if (list.card_password) list.card_password = list.card_password.substr(0, 2) + '********' + list.card_password.substr(-3);
         return list;
       }
-      
+
       //array
       return list.map(item => {
         if(item.card_use_certificate) item.card_use_certificate = item.card_use_certificate.substr(0, 2) + '********' + item.card_use_certificate.substr(-3);
@@ -537,7 +537,7 @@ export default {
         return item
       });
     },
-    
+
     //添加新卡券
     addNewCard(options={}){
       const { cardForm, total_price, submitCardList } = this;
@@ -576,10 +576,10 @@ export default {
           res: resOptions
         },'add_card');
         this.$xdHideLoading();
-        
+
         //成功回调
         let {selected_card_list=[], need_pay_price, is_need_pop, card_total_use_price} = res;
-        
+
         if(is_need_pop){
           this.useCardPop(res).then((select_content) => {
             if(select_content) this.addNewCard({select_content});
@@ -594,7 +594,7 @@ export default {
           let filterCard = selected_card_list.filter(item => !r_cards.includes(item.card_number));
           //重合的卡券列表
           let repeatCardList = selected_card_list.filter(item => r_cards.includes(item.card_number));
-          
+
           if(repeatCardList.length > 0){
             for(let i = 0; i < repeatCardList.length; i++){
               let repeatCard = repeatCardList[i];
@@ -833,7 +833,7 @@ export default {
           box-sizing: border-box;
           margin: 30rpx auto;
           font-size: 28rpx;
-          
+
           .icon{
             width: 64rpx;
             height: 64rpx;
@@ -858,4 +858,4 @@ export default {
       }
     }
   }
-</style>
+</style>

package/src/components/XdCardV2/XdCardV2Skeleton.vue

@@ -14,6 +14,12 @@
   </view>
 </template>
 
+<script>
+export default {
+  name:'XdCardV2Skeleton'
+}
+</script>
+
 <style lang="less" scoped>
 .skeleton-card-item {
   display: flex;

package/src/components/XdConfirm/XdConfirm.vue

@@ -82,11 +82,14 @@
       ]),
       ...mapState({
         currentStyle:(state)=>{
-          let style = {};
-          Object.keys(state.currentStyle).map(key=>{
-            style[`$${key}`] = state.currentStyle[key];
-          });
-          return style
+          if(state.currentStyle !== null) {
+            let style = {};
+            Object.keys(state.currentStyle).map(key=>{
+              style[`$${key}`] = state.currentStyle[key];
+            });
+            return style
+          }
+          return {}
         }
       })
 
@@ -166,10 +169,7 @@
           this.show = false;
           this.confirm = {}
         } else {
-          this.$currentStyle = value.styles
-            || (this.styleCommon && this.styleCommon.styles)
-            || this.currentStyle ||
-            (value.$vm && value.$vm.styles) || {};
+          this.$currentStyle = value.styles || this.styleCommon || this.currentStyle || (value.$vm && value.$vm.styles) || {};
           this.confirm = Object.assign({},
             this.$xdUniHelper.cloneDeep(this.defaultConfirm),
             value,

package/src/components/XdFormCheckbox/XdFormCheckbox.vue

@@ -28,7 +28,12 @@
         </view>
         <view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
           <text class="checklist-text" :style="item.styleIconText">
+            <!-- #ifdef h5 -->
             <slot :name="'a' +item.value" :text="item.text">{{item}}{{item[map.text]}}</slot>
+            <!--  #endif  -->
+            <!-- #ifdef MP-WEIXIN -->
+            <slot name="a1" :text="item.text">{{item}}{{item[map.text]}}</slot>
+            <!--  #endif  -->
           </text>
           <view
             v-if="mode === 'list' && icon === 'right'"
@@ -97,7 +102,7 @@
 	 * @value right 右侧显示
 	 * @event {Function} change  选中发生变化触发
 	 */
-  
+
   import {
     getParentsStyle,
   } from '@/utils/xd.base';
@@ -217,7 +222,7 @@
 				isLocal:true,
 				styles: null,
 				isTop:0,
-        
+
         styleMainColor: '', //选中颜色
 			};
 		},

package/src/components/XdLayout/XdLayout.vue

@@ -114,7 +114,7 @@
       <!--tabbar-->
       <view class="xd-Layout__footer-height" :style="{height: (bottomHeight + (isFooterSolt ? footerHeight: 110)) + 'rpx' }"></view>
     </view>
-    <view v-if="websiteStatus === false" class="website-disable">
+    <view v-if="websiteStatus === false && this.mpSiteLoading" class="website-disable">
       <image src="//img.jufubao.cn/component/disabel_phone.png" mode="widthFix"></image>
     </view>
     <xd-confirm v-if="getLayoutInfo" :get-layout-info="getLayoutInfo"></xd-confirm>
@@ -267,7 +267,8 @@
         default(){
           return {}
         },
-      }
+      },
+
     },
     data() {
       return {
@@ -276,6 +277,7 @@
         layoutLoading: false,
         startTime: new Date().getTime(),
         websiteStatus: null,
+        mpSiteLoading: true,
 
         startAnimation : false, //开始动画效果
         doneAnimation: false, //完成动画效果
@@ -510,9 +512,13 @@
     },
 
     created() {
+
       this.wiewType = this.$configProject.isPreview;
       this.systemInfoSyn = uni.getSystemInfoSync();
       this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;
+      // #ifdef MP-WEIXIN
+      this.mpSiteLoading = false;
+      // #endif
 
       //判断是否禁用
       if(this.wiewType) {
@@ -525,6 +531,7 @@
       if(!uni.getStorageSync('xd-max-window-height')) {
         uni.setStorageSync('xd-max-window-height', uni.getSystemInfoSync().windowHeight);
       }
+
       this.isConsole = !!this.$xdUniHelper.getParmater('is-console')
       uni.onWindowResize(()=>{
         this.gWindowHeight =  uni.getSystemInfoSync().windowHeight;

package/src/utils/StyleForm.js

@@ -318,7 +318,7 @@ class StyleForm {
         type: 'number',
         valueKey: borderWidth,
         value: data[borderWidth] || '',
-        placeholder: '请输入边框颜色',
+        placeholder: '请输入边框大小',
         className: 'input80',
       },
     ].filter(i=>i).map(item=>{

package/src/utils/helper.js

@@ -812,6 +812,13 @@ class Helpers {
   }
 
   replacePathForDir(url){
+    //#ifndef H5
+    return url
+    //#endif
+
+
+
+    //#ifdef H5
     let siteDomain = `${window.location.protocol}//${window.location.host}`;
     let dir = '';
     if(store.state.brandInfo && store.state.brandInfo.deploy_dir) {
@@ -830,6 +837,7 @@ class Helpers {
       else return `${siteDomain}${url.replace(reg, '')}`;
     }
     return url;
+    //#endif
   }
 
   /**

package/src/utils/xd.common.js

@@ -209,12 +209,12 @@ export function handlePesponse(
   /**
    * @type {Vue}
    */
-  let $vm = (getApp().globalData && getApp().globalData.$vm) || null;
+  let $vm = (getApp() && getApp().globalData && getApp().globalData.$vm) || null;
   let useTime = new Date().getTime() - request.start;
   let requestInfo = xdGetPesponseParams(request, response);
 
   //长连接（耗时连接）
-  if (getApp().globalData
+  if (getApp() && getApp().globalData
     && getApp().globalData.$store
     && typeof getApp().saveLogs === 'function'
     && !checkNotLogs(request.options)
@@ -261,7 +261,7 @@ export function handlePesponse(
     }
 
     //记录错误日志
-    if (typeof getApp().saveLogs === 'function'
+    if (getApp() && typeof getApp().saveLogs === 'function'
       && !checkNotLogs(request.options)
     ) {
       getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -342,7 +342,7 @@ export function handlePesponse(
     }
 
     //记录错误日志
-    if (typeof getApp().saveLogs === 'function'
+    if (getApp() && typeof getApp().saveLogs === 'function'
       && !checkNotLogs(request.options)
     ) {
       getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -360,7 +360,7 @@ export function handlePesponse(
     }
 
     //记录错误日志
-    if (typeof getApp().saveLogs === 'function'
+    if (getApp() && typeof getApp().saveLogs === 'function'
       && !checkNotLogs(request.options)
     ) {
       getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -392,7 +392,7 @@ export function handlePesponse(
     //记录错误日志
     //statusCode === undefined 并且 忽略：.json静态文件和请求返沪时间小雨15秒的
     if(!uriIgnoreErrors(request.options.url, useTime)) {
-      if (typeof getApp().saveLogs === 'function'
+      if (getApp() && typeof getApp().saveLogs === 'function'
         && !checkNotLogs(request.options)
       ) {
         getApp().saveLogs(requestInfo, 'alert', 'ajax');
@@ -402,7 +402,7 @@ export function handlePesponse(
 
     if (!$vm) {
       reject(response);
-      throw new Error(message);
+      console.warn(message)
     } else {
       $vm.$xdHideLoading();
       reject(response);

package/src/utils/xdWxLog.js

@@ -5,7 +5,7 @@ import {runtime} from "@/common/runtime";
 const settings = require('./../../settings');
 const md5 = require('md5');
 import Vue from 'vue';
-import store from "@/store";
+import store from "@/store/index";
 import {
   baseIsEmpty,
   baseJsDateToTime,
@@ -46,6 +46,22 @@ class Logs {
     return typeof uni.setStorageSync === 'function';
   }
 
+  setProject(pos, params){
+    console.warn(`${pos}:${JSON.stringify(params)}`)
+  }
+
+  getParams(data){
+    return {}
+  }
+
+  setARMSError(error){
+    console.error(error)
+  }
+
+  setARMSCustomError(name, errorObj){
+    console.error(JSON.stringify({name,errorObj}))
+  }
+
 
   checkApiHost() {
     if (typeof getApp !== 'function') return false;

package/src/utils/xdWxLog.js.tpl

@@ -0,0 +1,302 @@
+'use strict';
+import {Base64} from 'js-base64';
+import {runtime} from "@/common/runtime";
+
+const settings = require('./../../settings');
+const md5 = require('md5');
+import Vue from 'vue';
+import store from "@/store";
+import {
+  baseIsEmpty,
+  baseJsDateToTime,
+  baseGetHost
+} from "@/utils/xd.base";
+
+
+let logInstance = null;
+
+
+class Logs {
+  constructor() {
+    this.initDone = false; //是否已加载uni.request和brandInfo['api_host']完成
+    this.checkcount = 0; //最大检查1000次
+    this.startcount = 0; //最大检查可以上传日志次数
+    this.checkMaxWaitTime = 1000;
+    //this.check();
+    this.saveUploadedLog = [];
+    this.onUpdateKeyword = [
+      '$vm', //跟uniApp uni.createSelectorQuery() 有关
+      "e.x", //跟uniApp滚动组件有关
+      'null is not an object (evaluating', //跟uniApp滚动组件有关
+      "Cannot read property 'x' of ",// 跟uniApp滚动组件有关
+    ];
+
+    //#ifdef H5
+    this.initH5GlobalEvent()
+    //#endif
+  }
+
+  checkUniRequest() {
+    if (typeof uni === 'undefined') return false;
+    return typeof uni.request === 'function';
+  }
+
+  checkUniSetStorage() {
+    if (typeof uni === 'undefined') return false;
+    return typeof uni.setStorageSync === 'function';
+  }
+
+
+  checkApiHost() {
+    if (typeof getApp !== 'function') return false;
+    if (typeof getApp().globalData === "undefined") return false;
+    if (typeof getApp().globalData.$xd === 'undefined') return false;
+    if (typeof getApp().globalData.$xd['brandInfo'] === 'undefined') return false;
+    return typeof getApp().globalData.$xd['brandInfo']['api_host'] !== 'undefined';
+  }
+
+  check() {
+    let timer = setInterval(() => {
+      if ((this.checkUniRequest() && this.checkApiHost())
+        || this.checkcount > this.checkMaxWaitTime
+      ) {
+        this.initDone = true;
+        if (this.checkUniRequest() && this.checkApiHost()) {
+          setTimeout(() => {
+            this.checkBeforeStart();
+          }, 2000)
+        }
+        clearInterval(timer);
+      } else {
+        this.checkcount++;
+      }
+    }, 10)
+  }
+
+  checkBeforeStart() {
+    let timer = setInterval(() => {
+      if (this.startcount > this.checkMaxWaitTime) {
+        clearTimeout(timer);
+        return;
+      }
+      if (getApp().globalData.$xd['userInfo'] !== undefined
+        && !baseIsEmpty(getApp().globalData.$xd['userInfo'])
+      ) {
+        this.goBeforeUploadLogs();
+        clearTimeout(timer);
+      } else {
+        this.startcount++;
+      }
+    }, 10)
+  }
+
+  goBeforeUploadLogs() {
+    let logsSave = uni.getStorageInfoSync();
+    let logs = [];
+    logsSave.keys.map((key) => {
+      if (key.indexOf('xd.log.') === 0) {
+        logs.push(key);
+      }
+    });
+    logs.map((key) => {
+      let logStorage = uni.getStorageSync(key);
+      let system = this.getSystemInfo();
+
+      this.ajaxLogs({
+        baseApi: getApp().globalData.$xd.brandInfo['api_host'],
+        level: logStorage.level,
+        content: JSON.stringify({
+          ...system,
+          date: baseJsDateToTime(new Date().getTime() / 1000),
+          ...logStorage.logs
+        })
+      })
+      uni.removeStorageSync(key);
+    })
+
+  }
+
+  getSystemInfo() {
+    console.log(getApp().globalData.$xd.userInfo);
+    let userInfo = {};
+    let ext = {};
+    if (getApp().globalData
+      && getApp().globalData.$xd
+      && getApp().globalData.$xd.userInfo
+    ) {
+      userInfo = Base64.encodeURI(JSON.stringify(getApp().globalData.$xd.userInfo));
+    }
+
+    //#ifdef MP-WEIXIN
+    if (!baseIsEmpty(uni.getExtConfigSync())) {
+      ext = Base64.encodeURI(JSON.stringify(uni.getExtConfigSync()));
+    }
+    //#endif
+
+    const {
+      SDKVersion,
+      model,
+      system,
+      version,
+      deviceOrientation
+    } = uni.getSystemInfoSync();
+
+    console.log(userInfo, ext, uni.getSystemInfoSync());
+    return {
+      platform: 'weixin',
+      project: settings.system,
+      SDKVersion,
+      model,
+      system,
+      version,
+      deviceOrientation,
+      userInfo,
+      ext,
+    }
+  }
+
+
+  /**
+   * @description 上报日志
+   * @param log {Object} 上报日志内容
+   * @param type {String} 上报日志内容类型
+   * type = global(全局错误)
+   * type = onerror(系统捕获全局错误信息)
+   * type = promise(异步请求全局捕获错误)
+   * type = info(普通日志上报错误)
+   * type = debug(上报调试日志)
+   * type = ajax(返回异步请求字符串错误)
+   * type = unkown(返回异步请求字符串错误)
+   * tyoe = setting.error (项目配置错误)
+   * type = entry.index (记录访问首页入口来源)
+   * type = ajax.default {记录异步请求不知道的code的值}
+   * @param level {String} 上报级别 alert|info|debug
+   */
+  push(log, level = 'alert', type = "info") {
+    if (level === 'debug') {
+      if (settings.isDebug) {
+        level = 'info';
+        type = 'debug';
+      } else return;
+    }
+    type = `handle.${type}`;
+    if (!this.initDone) {
+      this.saveLog({log, type, level});
+    } else {
+      this.updateLog(log, type, level);
+    }
+  }
+
+  ajaxLogs(data) {
+    store['dispatch']('saveLogs', data)
+      .then(res => {
+      })
+      .catch(res => {
+      })
+  }
+
+  /**
+   * @description 上报日志
+   * @param log
+   * @param type
+   * @param level
+   */
+  updateLog(log, type, level) {
+    console.log(log, type, level);
+    let system = this.getSystemInfo();
+    if (level === 'info') system = {}
+    let logs = {...system, type, ...log};
+    let key = 'xd.log.' + md5(JSON.stringify(logs));
+    if (!this.saveUploadedLog.includes(key)) {
+      this.ajaxLogs({
+        baseApi: getApp().globalData.$xd.brandInfo['api_host'],
+        level: level,
+        content: JSON.stringify({
+          date: baseJsDateToTime(new Date().getTime() / 1000),
+          ...logs
+        }),
+      });
+      this.saveUploadedLog.push(key);
+    }
+  }
+
+  saveLog({log, type, level}) {
+    let logs = {type, before: true, ...log};
+    let key = 'xd.log.' + md5(JSON.stringify(logs));
+    if (this.checkUniSetStorage()) {
+      uni.setStorageSync(key, {logs, level});
+    }
+  }
+
+  checkMessage(error) {
+    let errorStr = error;
+    if (Object.prototype.toString.call(error) === '[object Error]') {
+      errorStr = JSON.stringify(runtime().getErrorInfo(error));
+    }
+    if (Object.prototype.toString.call(error) === '[object String]') {
+      errorStr = error;
+    }
+    if (Object.prototype.toString.call(error) === '[object Object]') {
+      errorStr = JSON.stringify(error);
+    }
+
+    let isUpdate = true;
+    this.onUpdateKeyword.map((keyword) => {
+      if (errorStr.indexOf(keyword) !== -1) {
+        isUpdate = false
+      }
+    });
+    return isUpdate === false ? isUpdate : Base64.encodeURI(errorStr);
+  }
+
+  initH5GlobalEvent() {
+    /**vue捕获全局错误**/
+    this.vueErrorHandler();
+  }
+
+  /**
+   * @description vue全局报错
+   */
+  vueErrorHandler() {
+    Vue.config.errorHandler = (error, vm) => {
+      let messageStr = this.checkMessage(error);
+      if (messageStr !== false) {
+        this.push(
+          {error: messageStr},
+          'alert',
+          'global'
+        )
+      }
+
+    };
+  }
+
+  /**
+   * @description 统一Promise catch处理
+   * @param error {Error|String} 错误对象（new Error（））|字符串当为字符串时候，全局捕获不会处理
+   * @param callback 回调事件
+   */
+  catch(error, callback = null) {
+    let messageStr = logInstance.checkMessage(error);
+    if (messageStr !== false) {
+      logInstance.push(
+        {error: messageStr},
+        'alert',
+        'catch'
+      );
+    }
+    if (typeof callback === 'function') callback()
+  }
+}
+
+function xdWxlog() {
+  if (logInstance === null) {
+    logInstance = new Logs();
+  }
+  return logInstance;
+}
+
+
+export default xdWxlog();
+
+