@10yun/cv-mobile-ui 0.4.6 → 0.4.8

package/plugins/uni-upgrade.js

@@ -1,3 +1,5 @@
+import HttpObj from '@/plugins/http.js';
+
 uni.request({
   url: 'https://uniapp.dcloud.io/update', // 检查更新的服务器地址
   data: {
@@ -23,13 +25,17 @@ uni.request({
 });
 // APP检测更新 具体可以参考：https://ask.dcloud.net.cn/article/35667
 plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
-  this.$Request.post(this.$api.common.update, {
-    appid: widgetInfo.appid, //当前应用的APPID
-    version: widgetInfo.version, // 当前应用的版本  
-    name: widgetInfo.name, // 当前应用的名称 
-    imei: plus.device.imei,
-    os: plus.os.name // OS环境 ios / android 
-  }).then((res) => {
+
+  uni.request({
+    url: 'https://uniapp.dcloud.io/update', // 检查更新的服务器地址
+    data: {
+      appid: widgetInfo.appid, //当前应用的APPID
+      version: widgetInfo.version, // 当前应用的版本  
+      name: widgetInfo.name, // 当前应用的名称 
+      imei: plus.device.imei,
+      os: plus.os.name // OS环境 ios / android 
+    },
+    success: res => {
     if (res.code == 200) {
       uni.downloadFile({
         url: res.data.wgtUrl,
@@ -45,9 +51,9 @@ plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
             })
           }
         }
-      })
+      });
     }
-  })
+  }
 });
 
 
@@ -65,7 +71,10 @@ var UniUpgradeClass = function{
     updateManager.onCheckForUpdate((ForUpdateRes) => {
       // 请求完新版本信息的回调
       if (ForUpdateRes.hasUpdate === true) { //有新的版本
-        this.$message.loading("应用升级中");
+        uni.showLoading({
+          title: '应用升级中', //正在加载中
+          mask: true
+        }); 
       }
     });
 

package/plugins/uni-upgrade3.js

@@ -1,3 +1,4 @@
+import HttpObj from '@/plugins/http.js';
 let xx = {
   //检测当前版本号
   dqbanben: function () {
@@ -13,11 +14,10 @@ let xx = {
   //检查更新
   checkUpdate: function () {
     var that = this;
-    this.$http
-      .post(this.GLOBAL.host + '/version/checkUpdate', {
-        version: that.wgtVer
-      })
-      .then(function (res) {
+    HttpObj.post('/version/checkUpdate', {
+      version: that.wgtVer
+    })
+      .then((res) => {
         if (res.data.code == 0) {
           if (res.data.result == 1) {
             //跟后台传过来的版本号比对，如果版本号不一致

package/ui-cv/cv-button/cv-button.vue

@@ -8,13 +8,13 @@
 export default {
   name: 'cvButton',
   props: {
-    label: {
+    size: {
       type: [String],
-      default: 'primary'
+      default: 'default'
     },
     type: {
       type: [String],
-      default: 'save'
+      default: 'default'
     },
     formType: {
       type: [String],
@@ -25,15 +25,9 @@ export default {
     }
   },
   data() {
-    return {
-      themesData: {} // 获取用户主题配置
-    };
-  },
-  created() {
-    if (this.$store) {
-      // this.themesData = this.$store.state.storeSystem.themesData || '';
-    }
+    return {};
   },
+  created() {},
   methods: {
     diyClick() {
       if (typeof this.click == 'function') {
@@ -58,7 +52,6 @@ export default {
   margin: 0px 15px;
   line-height: 100%;
   padding: 10px 0;
-  color: #fff;
   border-radius: 40px;
 }
 

package/ui-cv/cv-checkbox-group/cv-checkbox-group.vue

@@ -39,13 +39,12 @@ export default {
     cvCheckboxOptBase,
     cvCheckboxOptTag
   },
-  inject: {},
   props: {
     type: {
-      type: String,
+      type: [String],
       default: 'base'
     },
-    //默认输入框内容
+    //默认内容
     value: {
       type: [Array, String, Number],
       default: []
@@ -61,11 +60,6 @@ export default {
         return [];
       }
     },
-    //选项数组的网络请求地址，用于获取dataLists但优先级高于dataLists
-    dataUrl: {
-      type: String,
-      default: ''
-    },
     //数据类型value的名称
     dataValue: {
       type: String,
@@ -94,6 +88,11 @@ export default {
   watch: {
     value(newVal) {
       this._doValueType(newVal);
+    },
+    dataLists(newVal) {
+      this.dataLists = newVal;
+      this.items = this.itemsSortOut();
+      // this._dealValue();
     }
   },
   created() {
@@ -121,11 +120,8 @@ export default {
     },
     itemsSortOut() {
       let original = [];
-      if (this.dataUrl) {
-        //网络请求
-      } else {
-        original = this.dataLists;
-      }
+      original = this.dataLists || [];
+
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }

package/ui-cv/cv-lists-swiper/cv-lists-swiper.vue

@@ -298,10 +298,8 @@ export default {
         console.warn('执行方法', this.localTabs[this.tabCurr]['apiFunc']);
 
         // if (successRes.data.length == 0) {
-        //   this.$message.show('无更多商铺~');
         //   return;
         // } else {
-        //   this.$message.show('加载中...');
         // }
         return new Promise((res) => {
           // console.log('--');

package/ui-cv/cv-picker1/cv-picker1.vue

@@ -35,11 +35,6 @@ export default {
       type: [Array, String],
       default: []
     },
-    //选项数组的网络请求地址，用于获取dataLists但优先级高于dataLists
-    dataUrl: {
-      type: String,
-      default: ''
-    },
     //数据类型value的名称
     dataValue: {
       type: String,
@@ -122,18 +117,8 @@ export default {
     },
     itemsSortOut() {
       let original = [];
-      if (this.dataUrl) {
-        //网络请求
-        if (typeof this.dataUrl == 'function') {
-          this.dataUrl({}).then((successRes) => {
-            original = successRes.data;
-          });
-        } else {
-          console.warn('此处需要自定义请求方法');
-        }
-      } else {
-        original = this.dataLists;
-      }
+      original = this.dataLists || [];
+
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }

package/ui-cv/cv-picker2/cv-picker2.vue

@@ -42,11 +42,6 @@ export default {
       type: [Array, String],
       default: []
     },
-    //选项数组的网络请求地址，用于获取dataLists但优先级高于dataLists
-    dataUrl: {
-      type: String,
-      default: ''
-    },
     //数据类型value的名称
     dataValue: {
       type: String,
@@ -99,18 +94,8 @@ export default {
   methods: {
     itemsSortOut() {
       let original = [];
-      if (this.dataUrl) {
-        //网络请求
-        if (typeof this.dataUrl == 'function') {
-          this.dataUrl({}).then((successRes) => {
-            original = successRes.data;
-          });
-        } else {
-          console.warn('此处需要自定义请求方法');
-        }
-      } else {
-        original = this.dataLists;
-      }
+      original = this.dataLists || [];
+
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }

package/ui-cv/cv-picker3/cv-picker3.vue

@@ -53,11 +53,6 @@ export default {
       type: [Array, String],
       default: []
     },
-    //选项数组的网络请求地址，用于获取dataLists但优先级高于dataLists
-    dataUrl: {
-      type: String,
-      default: ''
-    },
     //数据类型value的名称
     dataValue: {
       type: String,
@@ -111,18 +106,8 @@ export default {
   methods: {
     itemsSortOut() {
       let original = [];
-      if (this.dataUrl) {
-        //网络请求
-        if (typeof this.dataUrl == 'function') {
-          this.dataUrl({}).then((successRes) => {
-            original = successRes.data;
-          });
-        } else {
-          console.warn('此处需要自定义请求方法');
-        }
-      } else {
-        original = this.dataLists;
-      }
+      original = this.dataLists || [];
+
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }

package/ui-cv/cv-radio-group/cv-radio-group.vue

@@ -42,9 +42,10 @@ export default {
   },
   props: {
     type: {
-      type: String,
+      type: [String],
       default: 'base'
     },
+    //默认内容
     value: {
       type: [String, Number],
       default: ''
@@ -53,24 +54,22 @@ export default {
       type: String,
       default: 'value'
     },
-
-    dataUrl: {
-      type: String,
-      default: ''
+    //选项数组
+    dataLists: {
+      type: [Array, String],
+      default: () => {
+        return [];
+      }
     },
+    //数据类型value的名称
     dataValue: {
       type: String,
       default: 'value'
     },
+    //数据类型text的名称
     dataText: {
       type: String,
       default: 'text'
-    },
-    dataLists: {
-      type: [Array, String],
-      default: () => {
-        return [];
-      }
     }
   },
   data() {
@@ -86,11 +85,9 @@ export default {
       this._dealValue();
     },
     dataLists(newVal) {
-      if (this.dataUrl == '') {
-        this.dataLists = newVal;
-        this.items = this.itemsSortOut();
-        this._dealValue();
-      }
+      this.dataLists = newVal;
+      this.items = this.itemsSortOut();
+      this._dealValue();
     }
   },
   created() {
@@ -115,37 +112,14 @@ export default {
         this.itemsValue = this.localVal;
       }
     },
-    radioChange(e) {
-      let value = e.detail.value;
-      let localVal = value;
-      if (this.dataType == 'text') {
-        let items = this.items;
-        for (let index = 0; index < items.length; index++) {
-          if (localVal == items[index].value) {
-            localVal = items[index].text;
-          }
-        }
-      }
-      this.localVal = localVal;
-      this.$emit('input', this.localVal);
-    },
     itemsSortOut() {
       let original = [];
-      if (this.dataUrl) {
-        //网络请求
-        if (typeof this.dataUrl == 'function') {
-          this.dataUrl({}).then((successRes) => {
-            original = successRes.data;
-          });
-        } else {
-          console.warn('此处需要自定义请求方法');
-        }
-      } else {
-        original = this.dataLists;
-      }
+      original = this.dataLists || [];
+
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }
+
       //整理数据
       let items = [];
       let dataValue = this.dataValue ? this.dataValue : 'value';
@@ -159,6 +133,20 @@ export default {
         });
       }
       return items;
+    },
+    radioChange(e) {
+      let value = e.detail.value;
+      let localVal = value;
+      if (this.dataType == 'text') {
+        let items = this.items;
+        for (let index = 0; index < items.length; index++) {
+          if (localVal == items[index].value) {
+            localVal = items[index].text;
+          }
+        }
+      }
+      this.localVal = localVal;
+      this.$emit('input', this.localVal);
     }
   }
 };

package/ui-cv/cv-tab-lists/cv-tab-lists.vue

@@ -59,11 +59,11 @@
         :disableTouch="disableTouch"
       >
         <swiper-item v-for="(item, index) in localTabLists" :key="index" :show-scrollbar="true">
+          <!-- refresher-background="#eeeeee" -->
           <scroll-view
             class="cv-tab-lists-data-scroll-box"
             scroll-y="true"
             :refresher-enabled="localTabLists[index].enabled && disableEnabled === false"
-            refresher-background="#eeeeee"
             :refresher-triggered="localTabLists[index].triggered"
             @scrolltolower="onTolower(index)"
             @scrolltoupper="onToupper"

package/ui-uni/uni-drawer/keypress.js

@@ -7,7 +7,7 @@ export default {
       default: false
     }
   },
-  mounted () {
+  mounted() {
     const keyNames = {
       esc: ['Esc', 'Escape'],
       tab: 'Tab',
@@ -18,28 +18,28 @@ export default {
       right: ['Right', 'ArrowRight'],
       down: ['Down', 'ArrowDown'],
       delete: ['Backspace', 'Delete', 'Del']
-    }
+    };
     const listener = ($event) => {
       if (this.disable) {
-        return
+        return;
       }
-      const keyName = Object.keys(keyNames).find(key => {
-        const keyName = $event.key
-        const value = keyNames[key]
-        return value === keyName || (Array.isArray(value) && value.includes(keyName))
-      })
+      const keyName = Object.keys(keyNames).find((key) => {
+        const keyName = $event.key;
+        const value = keyNames[key];
+        return value === keyName || (Array.isArray(value) && value.includes(keyName));
+      });
       if (keyName) {
         // 避免和其他按键事件冲突
         setTimeout(() => {
-          this.$emit(keyName, {})
-        }, 0)
+          this.$emit(keyName, {});
+        }, 0);
       }
-    }
-    document.addEventListener('keyup', listener)
+    };
+    document.addEventListener('keyup', listener);
     // this.$once('hook:beforeDestroy', () => {
     //   document.removeEventListener('keyup', listener)
     // })
   },
-	render: () => {}
-}
+  render: () => {}
+};
 // #endif