gxd-uni-library-editx 1.0.78 → 1.0.80-beta1

package/package.json

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

package/src/components/XdCardPay/XdCardPay.vue

@@ -249,6 +249,10 @@ export default {
       type: Boolean,
       default: false
     },
+    payThird: { //是否支持补差
+      tyep: Boolean,
+      default: true
+    },
     // payChannels: {  //三方支付列表
     //   type: Array,
     //   default: () => {
@@ -614,6 +618,10 @@ export default {
     },
     
     handleConfirmAllWxPay(){
+      if(!this.payThird){
+        this.$xdAlert({content: "请选择兑换方式"});
+        return Promise.reject("请选择兑换方式");
+      }
       return new Promise((resolve, reject) => {
         uni.showModal({
           title: '提示',

package/src/utils/XdNetwork.js

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

package/src/utils/XdNetwork.js.tlp

@@ -0,0 +1,135 @@
+'use strict';
+import helper from "@/utils/helper";
+import {getJfbConfig,getColorBaseUrl} from "@/lib/conf.domain";
+
+class XdNetwork {
+  constructor(){
+    this.eventObj = {
+      online: [],
+      offline: [],
+    };
+
+    //网络定义
+    this.status = {
+      strong: '',//0-230ms
+      normal: '',//230-750ms
+      low: '' //750-1400ms
+    };
+
+    this.init();
+  }
+
+  addEvent(eventName, cb){
+    this.eventObj[eventName].push(cb);
+    return this;
+  }
+
+  $mount(type){
+    let eventsFn = this.eventObj[type];
+    eventsFn.map(item=>{
+      item();
+    })
+  }
+
+  handleH5(){
+    let timer = null;
+    const handleOffline = () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      timer = setTimeout(() => {
+        this.$mount('offline');
+      }, 100)
+    };
+    const handleOnline = () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      timer = setTimeout(() => {
+        this.$mount('online');
+      }, 100)
+    };
+    if (window.addEventListener) {
+      window.addEventListener("offline", function () {
+        handleOffline();
+      }, true);
+      window.addEventListener("online", function () {
+        handleOnline();
+      }, true);
+    }
+    else if (window['attachEvent']) {
+      window['attachEvent']("onoffline", function () {
+        handleOffline();
+      });
+      window['attachEvent']("online", function () {
+        handleOnline();
+      });
+    }
+    else {
+      window.onoffline = function () {
+        handleOffline();
+      };
+      window.ononline = function () {
+        handleOnline();
+      };
+    }
+  }
+
+  init(){
+    //#ifdef H5
+    this.handleH5();
+    // #endif
+    //#ifndef H5
+    uni.onNetworkStatusChange(({isConnected, networkType})=>{
+      uni.getNetworkType({
+        success: function (res) {
+          console.log('onNetworkStatusChange', isConnected, res.networkType)
+        }
+      });
+    });
+    // #endif
+  }
+
+  handleImage(image){
+    let time = new Date().getTime();
+    return new Promise((resolve, reject) => {
+      uni.getImageInfo({
+        src: `${image.path}?v=${time}`,
+        success:(res)=>{
+          let end = (new Date().getTime() - time)/1000;
+          resolve(helper.divisionFloatNumber(image.size, end));
+        },
+        fail:()=>{
+          reject(0)
+        }
+      })
+    });
+  }
+
+  getNetworkEnv(paths=[]){
+    if(paths.length === 0) {
+      paths = [
+        {path: `${getColorBaseUrl(getJfbConfig('apiBasePath'))}/common/10x10.png`, size:0.94},
+        {path: `${getColorBaseUrl(getJfbConfig('apiBasePath'))}/common/100x100.png`, size: 1.078},
+      ]
+    }
+    let promiseArr= [];
+    paths.map(path=>{
+      promiseArr.push(this.handleImage(path));
+    });
+    return new Promise((resolve, reject) => {
+      Promise.all(promiseArr)
+        .then(res=>{
+          console.log(res)
+          resolve((res[0] + res[1])/2);
+        })
+        .catch()
+    });
+  }
+}
+
+export default function () {
+  return new XdNetwork();
+};