@10yun/cv-mobile-ui 0.5.60 → 0.5.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.60",
+  "version": "0.5.62",
   "description": "十云cvjs移动端ui，适用uniapp",
   "homepage": "http://cvjs.cn/cv-mobile-ui/",
   "license": "Apache-2.0",

package/plugins/storage.js

@@ -11,7 +11,7 @@ class StorageClass {
   constructor(options = {}) {
     this.config = Object.assign(
       {
-        cache_keys: 'syCacheKeys',
+        cache_keys: '___keys',
         expiration: 7 * 86400, // 60 * 60 * 24 * 7,// 默认7天
         prefix: '',
         suffix: ''
@@ -19,7 +19,7 @@ class StorageClass {
       options
     );
 
-    this.KEYS_CACHE_FLAG = this.__getFullKeyName(this.config.cache_keys) || '___';
+    this.KEYS_CACHE_FLAG = this.__getFullKeyName(this.config.cache_keys);
 
     // 内存缓存层
     this.cacheMap = new Map();

package/plugins/uni-extend.js

@@ -0,0 +1,109 @@
+/**
+ * uni-app 自带地图
+ */
+/**
+ * 选择地图
+ * @param {Object} keyword 搜索关键字
+ * @return {Object}
+ *
+ *   位置名称：res.name
+ *   详细地址： res.address
+ *   纬度： res.latitude
+ *   经度：res.longitude
+ */
+export function extChooseLocation(keyword) {
+  return new Promise((resolve, reject) => {
+    uni.chooseLocation({
+      keyword: keyword,
+      success(res) {
+        resolve(res);
+      },
+      fail(err) {
+        reject(err);
+      }
+    });
+  });
+}
+/**
+ * 打开地图
+ * @param {Object} lat  经度
+ * @param {Object} lng  纬度
+ */
+export function extOpenLocation(lat, lng) {
+  return new Promise((resolve, reject) => {
+    uni.openLocation({
+      latitude: lat,
+      longitude: lng,
+      success: function () {
+        resolve();
+      },
+      fail(err) {
+        reject(err);
+      }
+    });
+  });
+}
+export function extEleOffset(selector) {
+  // 获取高度
+  return new Promise((resolve) =>
+    uni
+      .createSelectorQuery()
+      .in(this)
+      .select(selector)
+      .boundingClientRect((data) => resolve(data))
+      .exec()
+  );
+}
+export function extScanCode() {
+  // #ifdef H5
+  uni.showToast({
+    title: 'h5不支持扫码'
+  });
+  // #endif
+  // #ifndef H5
+
+  // #ifdef APP-PLUS
+  var icon = plus.nativeObj.View.getViewById('icon0');
+  if (icon) {
+    setTimeout(function () {
+      icon.hide();
+    }, 5);
+    uni.setTabBarItem({
+      index: 0,
+      selectedIconPath: '/static/a2.png'
+    });
+  }
+  // #endif
+
+  return new Promise((resolve, reject) => {
+    uni.scanCode({
+      scanType: ['qrCode'],
+      success: function (res) {
+        // uni.showModal({
+        // 	title: '提示',
+        // 	showCancel: false,
+        // 	content:'条码内容：' + res.result
+        // });
+        console.log('条码类型：' + res.scanType);
+        console.log('条码内容：' + res.result);
+        let codeRes = res.result;
+        codeRes = codeRes.toString();
+        return resolve({
+          scanType: res.scanType,
+          result: codeRes
+        });
+      },
+      complete: function (res) {
+        console.log('scancomplete');
+      },
+      fail: (res) => {
+        reject(res.result);
+        console.log('failfailfailfailfailfailfailfailfailfailfail');
+        uni.showToast({
+          title: res.result
+        });
+      }
+    });
+  });
+  // #endif
+}

package/ui-cv/components/cv-dialog-bottom/cv-dialog-bottom.vue

@@ -1,9 +1,13 @@
 <template>
-  <view class="cv-dialog-bottom__wrap" :class="show ? 'show' : ''">
+  <view class="cv-dialog-bottom__wrap" :class="isLastShow ? 'show' : ''">
+    <view class="cv-dialog-bottom__mask" @click.stop="maskClick"></view>
     <view class="cv-dialog-bottom__box">
       <view class="cv-dialog-bottom__bar">
-        <view class="action cv-dialog-bottom__bar-left" @tap="cancel">取消</view>
-        <view class="action cv-dialog-bottom__bar-right" @tap="confirm">确定</view>
+        <view class="cv-dialog-bottom__bar-left" v-if="showLeft" @tap="cancel">取消</view>
+        <view class="cv-dialog-bottom__bar-title">
+          <slot name="title">{{ title }}</slot>
+        </view>
+        <view class="cv-dialog-bottom__bar-right" v-if="showRight" @tap="confirm">确定</view>
       </view>
       <view class="cv-dialog-bottom__body" :style="bodyClass">
         <slot name="default" />
@@ -17,7 +21,7 @@ import mixin from '../../libs/mixin/mixin.js';
 export default {
   mixins: [mpMixin, mixin],
   name: 'cvDialogBottom',
-  emits: ['confirm'],
+  emits: ['cancel', 'confirm'],
   props: {
     show: {
       type: Boolean,
@@ -26,28 +30,63 @@ export default {
     bodyClass: {
       type: [String],
       default: ''
+    },
+    isMaskClick: {
+      type: Boolean,
+      default: true
+    },
+    showLeft: {
+      type: Boolean,
+      default: true
+    },
+    showRight: {
+      type: Boolean,
+      default: true
+    },
+    title: {
+      type: [String],
+      default: ''
     }
   },
   watch: {},
+  computed: {
+    isLastShow() {
+      return this.localShow || this.show;
+    }
+  },
   data() {
-    return {};
+    return {
+      localShow: false
+    };
   },
   created() {},
   methods: {
+    open() {
+      this.localShow = true;
+    },
+    close() {
+      this.localShow = false;
+    },
     confirm() {
-      this.onConfirm(true);
+      this.close();
+      this.$emit('confirm');
     },
     cancel() {
-      this.onConfirm(false);
+      this.close();
+      this.$emit('cancel');
     },
-    onConfirm(e) {
-      this.$emit('confirm', e);
+
+    maskClick() {
+      if (this.isMaskClick) {
+        this.close();
+      }
     }
   }
 };
 </script>
 <style>
 .cv-dialog-bottom__wrap {
+  background: rgba(0, 0, 0, 0.6);
   position: fixed;
   top: 0;
   right: 0;
@@ -55,36 +94,33 @@ export default {
   left: 0;
   z-index: 999;
   opacity: 0;
+  width: 100%;
   outline: 0;
-  text-align: center;
-  transform: scale(1.185);
   backface-visibility: hidden;
   -webkit-perspective: 1104px;
   perspective: 1104px;
-  background: rgba(0, 0, 0, 0.6);
-  transition: all 0.3s ease-in-out 0s;
   pointer-events: none;
+  text-align: center;
+  transform: scale(1.185);
+  transition: all 0.3s ease-in-out 0s;
   margin-bottom: -552px;
+  display: flex;
+  flex-direction: column;
 }
-.cv-dialog-bottom__wrap::before {
-  vertical-align: bottom;
-}
-.cv-dialog-bottom__wrap::before {
-  content: '\200B';
-  display: inline-block;
-  height: 100%;
+.cv-dialog-bottom__mask {
+  flex: 1;
+  min-height: 60px;
 }
 .cv-dialog-bottom__wrap.show {
   opacity: 1;
-  transition-duration: 0.3s;
-  transform: scale(1);
   overflow-x: hidden;
   overflow-y: auto;
   pointer-events: auto;
+  transition-duration: 0.3s;
+  transform: scale(1);
   margin-bottom: 0;
 }
 .cv-dialog-bottom__box {
-  position: relative;
   display: inline-block;
   vertical-align: middle;
   margin-left: auto;
@@ -100,7 +136,6 @@ export default {
 }
 .cv-dialog-bottom__bar {
   display: flex;
-  position: relative;
   -webkit-box-align: center;
   -webkit-align-items: center;
   align-items: center;
@@ -110,44 +145,33 @@ export default {
   justify-content: space-between;
   background-color: #ffffff;
   color: #666666;
+  padding: 0 10px;
+  font-size: 15px;
+}
+.cv-dialog-bottom__bar-title {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  font-size: 15px;
+  font-weight: 400;
 }
 .cv-dialog-bottom__bar-left {
-  min-width: 55px;
-  min-height: 45px;
-  margin-right: 0;
-  margin-left: 16px;
   display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
   align-items: center;
-  height: 100%;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
   justify-content: center;
-  max-width: 100%;
+  min-width: 55px;
   color: #0081ff;
 }
 .cv-dialog-bottom__bar-right {
-  min-width: 55px;
-  min-height: 45px;
-  margin-right: 16px;
-  font-size: 16px;
   display: flex;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
   align-items: center;
-  height: 100%;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
   justify-content: center;
-  max-width: 100%;
+  min-width: 55px;
   color: #39b54a;
 }
 .cv-dialog-bottom__body {
-  padding-top: 10px;
-  max-height: 500px;
+  padding: 10px;
   overflow: auto;
-  text-align: left;
   background-color: #fff;
 }
 </style>

package/ui-cv/components/cv-dialog-full/cv-dialog-full.vue

@@ -1,9 +1,11 @@
 <template>
-  <view class="cv-dialog-full__wrap" :class="localShow ? 'show' : ''">
+  <view class="cv-dialog-full__wrap" :class="isLastShow ? 'show' : ''">
     <view class="cv-dialog-full__box">
       <view class="cv-dialog-full__bar">
         <view class="cv-dialog-full__bar-left" v-if="showLeft" @tap="cancel">取消</view>
-        <view class="cv-dialog-full__bar-title"><slot name="title">{{ title }}</slot></view>
+        <view class="cv-dialog-full__bar-title">
+          <slot name="title">{{ title }}</slot>
+        </view>
         <view class="cv-dialog-full__bar-right" v-if="showRight" @tap="confirm">确定</view>
       </view>
       <view class="cv-dialog-full__body" :style="bodyClass">
@@ -42,6 +44,11 @@ export default {
     }
   },
   watch: {},
+  computed: {
+    isLastShow() {
+      return this.localShow || this.show;
+    }
+  },
   data() {
     return {
       localShow: false
@@ -56,13 +63,12 @@ export default {
       this.localShow = false;
     },
     confirm() {
-      this.onConfirm(true);
+      this.close();
+      this.$emit('confirm');
     },
     cancel() {
-      this.onConfirm(false);
-    },
-    onConfirm(e) {
-      this.$emit('confirm', e);
+      this.close();
+      this.$emit('cancel');
     }
   }
 };
@@ -81,16 +87,17 @@ export default {
   -webkit-perspective: 1104px;
   perspective: 1104px;
   background: rgba(0, 0, 0, 0.6);
-  transition: all 0.2s ease-in-out 0s;
+
   pointer-events: none;
+  transition: all 0.2s ease-in-out 0s;
 }
 .cv-dialog-full__wrap.show {
-  left: 0;
   opacity: 1;
-  transition-duration: 0.2s;
   overflow-x: hidden;
   overflow-y: auto;
   pointer-events: auto;
+  left: 0;
+  transition-duration: 0.2s;
 }
 .cv-dialog-full__wrap::before {
   content: '\200B';
@@ -99,16 +106,12 @@ export default {
   vertical-align: middle;
   vertical-align: bottom;
 }
-.cv-dialog-full__wrap .cv-dialog {
-  width: 100%;
-  border-radius: 0;
-  height: 100%;
-}
 .cv-dialog-full__box {
   display: inline-block;
   vertical-align: middle;
-  width: 100%;
+
   max-width: 100%;
+  width: 100%;
   background-color: #f8f8f8;
   overflow: hidden;
   height: 100%;
@@ -149,8 +152,8 @@ export default {
 }
 .cv-dialog-full__body {
   padding: 10px;
-  height: calc(100% - 45px);
   overflow: auto;
   background-color: #fff;
+  height: calc(100% - 45px);
 }
 </style>

package/ui-cv/components/cv-upload-avatar/cv-upload-avatar.vue

@@ -93,7 +93,6 @@ export default {
         filePath: tempFilePaths,
         name: 'xcx_pper_avatar',
         formData: {
-          postType: 'update',
           file_name: 'xcx_pper_avatar'
         }
       }).then((resData) => {

package/ui-cv/components/cv-upload-image/cv-upload-image.vue

@@ -292,7 +292,6 @@ export default {
       let uploadParam = Object.assign(
         {},
         {
-          postType: 'create',
           file_name: filename,
           savesign: 'uni-upload'
         },