@10yun/cv-mobile-ui 0.5.43 → 0.5.45

package/other/uParse/components/wxParseImg.vue

@@ -45,14 +45,16 @@ export default {
     wxParseImgLoad(e) {
       const { src } = e.currentTarget.dataset;
       if (!src) return;
-      let { width, height } = e.mp.detail;
+      const { width, height } = e.mp.detail;
       const recal = this.wxAutoImageCal(width, height);
       const { imageheight, imageWidth } = recal;
-      const { padding, mode } = this.node.attr; //删除padding
+      const { padding, mode } = this.node.attr; 
+      //删除padding
       // const { mode } = this.node.attr;
       const { styleStr } = this.node;
       const imageHeightStyle = mode === 'widthFix' ? '' : `height: ${imageheight}px;`;
-      this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`; //删除padding
+      this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`; 
+      //删除padding
       // this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px;`;
     },
     // 计算视觉优先的图片宽高
@@ -60,6 +62,7 @@ export default {
       // 获取图片的原始长宽
       const windowWidth = this.parseWidth.value;
       const results = {};
+
       if (originalWidth < 60 || originalHeight < 60) {
         const { src } = this.node.attr;
         let parent = this.$parent;
@@ -69,6 +72,7 @@ export default {
         parent.removeImageUrl(src);
         this.preview = false;
       }
+
       // 判断按照那种方式进行缩放
       if (originalWidth > windowWidth) {
         // 在图片width大于手机屏幕width时候
@@ -79,6 +83,7 @@ export default {
         results.imageWidth = originalWidth;
         results.imageheight = originalHeight;
       }
+
       return results;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.43",
+  "version": "0.5.45",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "10yun",
   "license": "Apache-2.0",

package/ui-cv/components/cv-filter-hm/cv-filter-hm.vue

@@ -1,31 +1,27 @@
 <template>
-  <view
-    class="cv-filter-hm"
-    :class="{ setDropdownBottom: maskVisibility }"
-    :style="{ top: menuTop + 'rpx' }"
-    @touchmove.stop.prevent="discard"
-    @tap.stop="discard"
-  >
-    <view class="nav">
-      <block v-for="(item, index) in menu" :key="index">
+  <view class="cv-filter-hm" :class="{ setDropdownBottom: maskVisibility }" @touchmove.stop.prevent="discard" @tap.stop="discard">
+    <view class="nav" :class="{ 'z-index': isShowMask }">
+      <template v-for="(item, index) in menu" :key="index">
         <view class="first-menu" :class="{ on: showPage == index }" @tap="togglePage(index)">
-          <text class="name">{{ item.name }}</text>
-          <!-- <text class="iconfont triangle" :style="'transform:rotate('+triangleDeg[index]+'deg);'"></text> -->
+          <text class="name" :style="{ color: color }">{{ item.name }}</text>
+          <!-- <cv-icons type="arrow-type1-up" size="12" class="arrows" v-if="statusList[index].isActive" />
+          <cv-icons type="arrow-type1-down" size="12" class="arrows" v-if="!statusList[index].isActive" /> -->
           <cv-icons type="arrow-type1-down" size="12" color="#aaa" :style="'transform:rotate(' + triangleDeg[index] + 'deg);'" />
         </view>
-      </block>
+      </template>
     </view>
     <view class="mask" :class="{ show: isShowMask, hide: maskVisibility != true }" @tap="togglePage(showPage)"></view>
-    <block v-for="(page, page_index) in subData" :key="page_index">
+    <template v-for="(page, page_index) in subData" :key="page_index">
       <view class="sub-menu-class" :class="{ show: showPage == page_index, hide: pageState[page_index] != true }">
-        <block v-if="page.type == 'hierarchy' && page.submenu.length > 0">
+        <template v-if="page.type == 'hierarchy' && page.submenu.length > 0">
           <scroll-view
             class="sub-menu-list"
+            :class2="[page.submenu[activeMenuArr[page_index][0]].submenu.length > 0 ? 'first' : 'alone']"
             :class="[activeMenuArr[page_index].length > 1 ? 'first' : 'alone']"
             :scroll-y="true"
             :scroll-into-view="'first_id' + firstScrollInto"
           >
-            <block v-for="(sub, index) in page.submenu" :key="index">
+            <template v-for="(sub, index) in page.submenu" :key="index">
               <view
                 class="sub-menu"
                 :id="'first_id' + index"
@@ -34,19 +30,19 @@
               >
                 <view class="menu-name">
                   <text>{{ sub.name }}</text>
-                  <!-- <text class="iconfont selected"></text> -->
+                  <text class="iconfont selected"></text>
                 </view>
               </view>
-            </block>
+            </template>
           </scroll-view>
-          <block v-for="(sub, index) in page.submenu" :key="index">
+          <template v-for="(sub, index) in page.submenu" :key="index">
             <scroll-view
               class="sub-menu-list not-first"
               :scroll-y="true"
               v-if="activeMenuArr[page_index][0] == index && sub.submenu.length > 0"
               :scroll-into-view="'second_id' + secondScrollInto"
             >
-              <block v-for="(sub_second, second_index) in sub.submenu" :key="second_index">
+              <template v-for="(sub_second, second_index) in sub.submenu" :key="second_index">
                 <view
                   class="sub-menu"
                   :id="'second_id' + second_index"
@@ -57,15 +53,14 @@
                     @tap="selectHierarchyMenu(page_index, activeMenuArr[page_index][0], second_index, null)"
                   >
                     <text>{{ sub_second.name }}</text>
-                    <!-- <text class="iconfont selected"></text> -->
+                    <text class="iconfont selected"></text>
                   </view>
                   <view
                     class="more-sub-menu"
                     v-if="sub_second.submenu && sub.submenu.length > 0 && sub_second.submenu.length > 0"
                   >
-                    <block v-for="(sub2, sub2_index) in sub_second.submenu" :key="sub2_index">
+                    <template v-for="(sub2, sub2_index) in sub_second.submenu" :key="sub2_index">
                       <text
-                        v-if="sub_second.showAllSub || sub2_index < 8"
                         :class="{
                           on: activeMenuArr[page_index][1] == second_index && activeMenuArr[page_index][2] == sub2_index
                         }"
@@ -73,21 +68,14 @@
                       >
                         {{ sub2.name }}
                       </text>
-                      <text
-                        v-if="sub_second.showAllSub != true && sub2_index == 8 && sub_second.submenu.length > 9"
-                        @tap="showMoreSub(second_index)"
-                      >
-                        更多
-                        <text class="iconfont triangle"></text>
-                      </text>
-                    </block>
+                    </template>
                   </view>
                 </view>
-              </block>
+              </template>
             </scroll-view>
-          </block>
-        </block>
-        <block v-if="page.type == 'filter'">
+          </template>
+        </template>
+        <template v-if="page.type == 'filter'">
           <view class="filter">
             <scroll-view class="menu-box" :scroll-y="true">
               <view class="box" v-for="(box, box_index) in page.submenu" :key="box_index">
@@ -105,12 +93,12 @@
               </view>
             </scroll-view>
             <view class="btn-box">
-              <view class="reset" @tap="resetFilterData(page_index)">重置</view>
-              <view class="submit" @tap="setFilterData(page_index)">确定</view>
+              <view class="pub-btn_reset reset" @tap="resetFilterData(page_index)">重置</view>
+              <view class="pub-btn_submit submit" @tap="setFilterData(page_index)">确定</view>
             </view>
           </view>
-        </block>
-        <block v-if="page.type == 'radio'">
+        </template>
+        <template v-if="page.type == 'radio'">
           <view class="filter">
             <scroll-view class="menu-box" :scroll-y="true">
               <view class="box" v-for="(box, box_index) in page.submenu" :key="box_index">
@@ -132,18 +120,14 @@
               <view class="submit" @tap="setFilterData(page_index)">确定</view>
             </view>
           </view>
-        </block>
+        </template>
       </view>
-    </block>
+    </template>
   </view>
 </template>
 <script>
-import mpMixin from '../../libs/mixin/mpMixin.js';
-import mixin from '../../libs/mixin/mixin.js';
 export default {
-  mixins: [mpMixin, mixin],
-  name: 'cvFilterHm',
-  emits: ['confirm'],
+  name: 'ccFilterHm',
   data() {
     return {
       subData: [], //菜单数据
@@ -164,31 +148,28 @@ export default {
     };
   },
   props: {
-    menuTop: {
-      value: Number,
-      default: false
-    },
     filterData: {
-      value: Array,
+      type: [Array],
       default: []
     },
     defaultSelected: {
-      value: Array,
+      type: [Array],
       default: []
     },
     updateMenuName: {
-      value: Boolean,
+      type: [Boolean],
       default: true
     },
     dataFormat: {
-      value: String,
+      type: [String],
       default: 'Array'
     }
   },
   watch: {
+    // filterData重新赋值初始化菜单
     filterData: {
       handler() {
-        this.initMenu(); //filterData重新赋值初始化菜单
+        this.initMenu();
       },
       immediate: true
     },
@@ -262,11 +243,6 @@ export default {
         }
       }
     },
-    //展开更多
-    showMoreSub(index) {
-      this.subData[this.showPage].submenu[this.activeMenuArr[this.showPage][0]].submenu[index].showAllSub = true;
-      this.$forceUpdate();
-    },
     //选中
     selectHierarchyMenu(page_index, level1_index, level2_index, level3_index) {
       //读取记录
@@ -320,6 +296,7 @@ export default {
         }
         level--;
       }
+      this.shadowActiveMenuArr[page_index] = JSON.parse(JSON.stringify(tmpArr));
       this.activeMenuArr[page_index] = JSON.parse(JSON.stringify(tmpArr));
       this.$forceUpdate();
     },
@@ -364,6 +341,15 @@ export default {
         this.showPageLayer(index);
         this.showMask();
       }
+      // 没用的
+      //  this.selectedIndex = index;
+      // if (this.statusList[index].isActive == true) {
+      //   this.$refs.popupRef.close();
+      //   this.statusList[index].isActive = false;
+      // } else {
+      //   this.menuTabClick(index);
+      //   this.$refs.popupRef.show();
+      // }
     },
     //hide遮罩层
     hideMask() {
@@ -572,7 +558,6 @@ export default {
 .cv-filter-hm {
   flex-shrink: 0;
   width: 100%;
-  /* position: fixed; */
   position: inherit;
   z-index: 997;
   flex-wrap: nowrap;
@@ -593,10 +578,35 @@ export default {
   flex: 1;
   height: 44px;
 }
+
+.pub-btn_submit {
+  width: 320rpx;
+  height: 80rpx;
+  border-radius: 14rpx;
+  font-size: 30rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  background-image: linear-gradient(to right, #ffab00, #ff6400);
+}
+.pub-btn_reset {
+  width: 320rpx;
+  height: 80rpx;
+  border-radius: 14rpx;
+  font-size: 30rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: solid 2rpx #ff6400;
+  color: #ff6400;
+  background: #fff;
+}
+
 .nav {
   width: 100%;
   height: 44px;
-  border-bottom: solid 1px #eee;
+  border-bottom: solid 1rpx #eee;
   z-index: 12;
   background-color: #ffffff;
   flex-direction: row;
@@ -617,6 +627,7 @@ export default {
   color: #409eff;
 }
 .nav .first-menu .name {
+  height: 100%;
   font-size: 12px;
   height: 20px;
   line-height: 20px;
@@ -650,7 +661,7 @@ export default {
 }
 
 .sub-menu-class.show {
-  transform: translate3d(0, calc(44px + 1px), 0);
+  transform: translate3d(0, calc(44px + 1rpx), 0);
 }
 .sub-menu-list {
   width: 100%;
@@ -692,9 +703,9 @@ export default {
   height: auto;
 }
 .sub-menu-list.alone .sub-menu {
-  min-height: calc(44px - 1px);
+  min-height: calc(44px - 1rpx);
   margin-left: 15px;
-  border-bottom: solid 1px #e5e5e5;
+  border-bottom: solid 1rpx #e5e5e5;
 }
 .sub-menu-list.alone .sub-menu.on {
   color: #409eff;
@@ -707,13 +718,13 @@ export default {
 .sub-menu-list.not-first {
 }
 .sub-menu-list.not-first .sub-menu {
-  min-height: calc(44px - 1px);
+  min-height: calc(44px - 1rpx);
   margin-left: 15px;
-  border-bottom: solid 1px #e5e5e5;
+  border-bottom: solid 1rpx #e5e5e5;
 }
 
 .sub-menu-list.not-first .sub-menu > .menu-name {
-  height: calc(44px - 1px);
+  height: calc(44px - 1rpx);
 }
 .sub-menu-list.not-first .sub-menu > .menu-name > .iconfont {
   display: none;
@@ -742,7 +753,7 @@ export default {
   margin-right: 6px;
   text-align: center;
   line-height: 30px;
-  border: solid #f5f5f5 1px;
+  border: solid #f5f5f5 1rpx;
   flex: 0 0 calc(33.33% - 6px);
   overflow: hidden;
   font-size: 12px;
@@ -760,7 +771,8 @@ export default {
 
 .filter {
   width: 100%;
-  height: 345px;
+  height: 100%;
+  max-height: 345px;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -768,7 +780,8 @@ export default {
 }
 .filter .menu-box {
   width: 349px;
-  height: calc(345px - 75px);
+  height: 100%;
+  max-height: calc(345px - 75px);
   flex-shrink: 1;
 }
 .filter .menu-box .box {
@@ -791,7 +804,9 @@ export default {
   color: #fff;
 }
 .filter .menu-box .box .labels > view {
-  border: solid 0.5px #adadad;
+  width: 148rpx;
+  height: 30px;
+  border: solid 1rpx #adadad;
   border-radius: 2px;
   padding: 4px 10px;
   margin-right: 12px;
@@ -801,32 +816,38 @@ export default {
   justify-content: center;
   align-items: center;
 }
-/* .filter .menu-box .box .labels > view:nth-child(4n) {
+.filter .menu-box .box .labels > view:nth-child(4n) {
   margin-right: 0;
-} */
+}
 .filter .btn-box {
   flex-shrink: 0;
   width: 349px;
   height: 75px;
   flex-direction: row !important;
   align-items: center;
-  justify-content: flex-end;
+  justify-content: space-between;
 }
 .filter .btn-box > view {
   font-size: 12px;
   padding: 5px 10px;
   margin: 0px 5px;
   border-radius: 3px;
-  border: solid 0.5px #409eff;
+  width: 320rpx;
+  height: 40px;
+  border-radius: 40px;
+  border: solid 1rpx #409eff;
   align-items: center;
   justify-content: center;
 }
 .filter .btn-box .reset {
+  border: solid 2rpx #ec652b;
+  color: #ff6400;
   color: #409eff;
 }
 .filter .btn-box .submit {
   color: #fff;
   background-color: #409eff;
+  background-image: linear-gradient(to right, #ffab00, #ff6400);
 }
 
 .mask {
@@ -842,6 +863,9 @@ export default {
 .mask.show {
   background-color: rgba(0, 0, 0, 0.5);
 }
+.nav.z-index {
+  z-index: 0;
+}
 .mask.hide {
   display: none;
 }

package/ui-cv/components/cv-geo-local/cv-geo-local.vue

@@ -178,7 +178,7 @@ export default {
       }
       console.log('--', this.map_location);
       if (this.localVal) {
-        this.$set(this.map_location, 'address', this.localVal);
+        this.map_location['address'] = this.localVal;
       }
     },
     chooseLocation() {

package/ui-cv/components/cv-svgs/{cc-svgs.vue → cv-svgs.vue}

@@ -3,7 +3,7 @@
 </template>
 <script>
 export default {
-  name: 'CcGgIcons',
+  name: 'cvSvgs',
   emits: ['click'],
   props: {
     type: {