商城首页修改

components/CommercePart.vue

@@ -166,7 +166,7 @@
 
 				.list-content {
           color: #2c2c2c;
-          padding: 10 rpx 16 rpx 0;
+          padding: 10rpx16rpx0;
           // display: flex;
           .list-content-text2 {
             font-family: D-DIN, D-DIN;

components/tabbar/tabbar.vue

@@ -96,12 +96,12 @@ export default {
 
 <style scoped>
 .u-page__item__slot-icon {
-  width: 60 rpx !important;
-  height: 60 rpx !important;
+  width: 60rpx !important;
+  height: 60rpx !important;
 }
 
 .u-page__item__slot-icon-index {
-  width: 60 rpx !important;
-  height: 60 rpx !important;
+  width: 60rpx !important;
+  height: 60rpx !important;
 }
 </style>

components/uview-ui/components/u-parse/parser.js

@@ -229,7 +229,7 @@ parser.prototype.parseStyle = function (node) {
 
                     value = value.substr(0, j) + this.getUrl(value.substr(j))
                 }
-            } // 转换 rpx（rich-text 内部不支持 rpx）
+            } // 转换rpx（rich-text 内部不支持rpx）
             else if (value.includes('rpx')) {
                 value = value.replace(/[0-9.]+\s*rpx/g, ($) => `${parseFloat($) * windowWidth / 750}px`)
             }

components/uview-ui/components/u-tabbar-item/u-tabbar-item.vue

@@ -100,13 +100,13 @@
     &__icon {
       @include flex;
       position: relative;
-      width: 192 rpx;
+      width: 192rpx;
       justify-content: center;
     }
 
     &__text {
       margin-top: 2px;
-      font-size: 26 rpx;
+      font-size: 26rpx;
 			color: $u-content-color;
 		}
 	}

pages/home/index.vue

@@ -618,16 +618,16 @@ export default {
   .adv-box {
     position: relative;
     // padding: 0 33rpx 20rpx;
-    height: 64 rpx;
+    height: 64rpx;
     background-color: white;
-    padding: 0 20 rpx 0;
-    border-radius: 16 rpx;
-    margin: 40 rpx 0 20 rpx;
+    padding: 0 20rpx 0;
+    border-radius: 16rpx;
+    margin: 40rpx 0 20rpx;
     font-weight: 500;
 
     .adv-icon {
       position: absolute;
-      left: 6 rpx;
+      left: 6rpx;
       top: 50%;
       transform: translateY(-50%);
     }
@@ -645,26 +645,26 @@ export default {
 
   .custom-indicator {
     position: absolute;
-    left: 0 rpx;
-    right: 0 rpx;
-    bottom: 29 rpx;
-    width: 712 rpx;
+    left: 0rpx;
+    right: 0rpx;
+    bottom: 29rpx;
+    width: 712rpx;
     display: flex;
-    margin: 0 20 rpx 0 20 rpx;
+    margin: 0 20rpx 0 20rpx;
     flex-direction: row;
     justify-content: center;
     transform: translateX(-48rpx);
 
     .custom-indicator-item {
-      width: 16 rpx;
-      height: 16 rpx;
-      margin: 0 6 rpx;
-      border-radius: 12 rpx;
+      width: 16rpx;
+      height: 16rpx;
+      margin: 0 6rpx;
+      border-radius: 12rpx;
       background-color: #666666;
     }
 
     .banner-active {
-      width: 48 rpx;
+      width: 48rpx;
       background-color: #222222;
     }
   }
@@ -677,27 +677,27 @@ export default {
   .content-box {
     // overflow-y: auto;
     background-color: $primary-bg-color;
-    padding: 20 rpx 0 0;
+    padding: 20rpx 0 0;
 
     .part-box {
       background: linear-gradient(180deg, #fdd118 0%, #f7f7f7 100%);
-      border-radius: 10 rpx 10 rpx 10 rpx 10 rpx;
-      padding: 18 rpx 14 rpx;
+      border-radius: 10rpx 10rpx 10rpx 10rpx;
+      padding: 18rpx 14rpx;
 
       .part-list {
         display: flex !important;
         flex-direction: row !important;
         // justify-content: space-between;
         background-color: #fff;
-        border-radius: 10 rpx;
-        padding: 15 rpx 15 rpx 30 rpx;
-        font-size: 24 rpx;
+        border-radius: 10rpx;
+        padding: 15rpx 15rpx 30rpx;
+        font-size: 24rpx;
         color: #1d161f;
-        margin-top: 15 rpx;
+        margin-top: 15rpx;
 
         &-item {
           width: calc(33% - 10rpx);
-          margin-right: 10 rpx;
+          margin-right: 10rpx;
         }
       }
     }
@@ -718,26 +718,26 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding: 0 20 rpx;
+        padding: 0 20rpx;
         box-sizing: border-box;
 
         .search-box {
-          margin: 0 auto 0 rpx;
-          height: 61 rpx;
+          margin: 0 auto 0rpx;
+          height: 61rpx;
           background: rgba(255, 255, 255, 0.3);
-          border-radius: 30 rpx;
+          border-radius: 30rpx;
           opacity: 1;
           display: flex;
           align-items: center;
           flex-direction: row;
 
           text {
-            font-size: 24 rpx;
+            font-size: 24rpx;
             font-family: PingFang SC-Regular, PingFang SC;
             font-weight: 400;
             color: #9D9D9D;
-            line-height: 61 rpx;
-            margin-left: 11 rpx;
+            line-height: 61rpx;
+            margin-left: 11rpx;
           }
         }
       }
@@ -746,7 +746,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 61 rpx;
+        height: 61rpx;
       }
     }
 
@@ -755,15 +755,15 @@ export default {
       z-index: 50;
       // margin-top: -60rpx;s
       .title-tab {
-        font-size: 34 rpx;
+        font-size: 34rpx;
         color: #aca9af;
         font-style: italic;
         font-weight: 700;
-        margin-bottom: 26 rpx;
-        padding: 0 20 rpx;
+        margin-bottom: 26rpx;
+        padding: 0 20rpx;
 
         &-item {
-          margin-right: 30 rpx;
+          margin-right: 30rpx;
         }
 
         &-actived {
@@ -779,22 +779,22 @@ export default {
     flex-wrap: wrap;
     justify-content: flex-start;
     background-color: #FFFFFF;;
-    padding: 0 20 rpx;
-    padding-top: 40 rpx;
+    padding: 0 20rpx;
+    padding-top: 40rpx;
 
     &-item {
       width: 20%;
       flex-shrink: 0;
       text-align: center;
-      margin-bottom: 30 rpx;
+      margin-bottom: 30rpx;
       color: #1d161f;
-      font-size: 26 rpx;
+      font-size: 26rpx;
     }
   }
 
   .biaoti {
     width: 100%;
-    height: 180 rpx;
+    height: 180rpx;
     display: flex;
     justify-content: center;
     align-items: center
@@ -803,25 +803,25 @@ export default {
   .huodongText {
     font-family: PingFang SC, PingFang SC;
     font-weight: 400;
-    font-size: 26 rpx;
+    font-size: 26rpx;
     color: #333333;
-    line-height: 36 rpx; // 修正拼写错误
+    line-height: 36rpx; // 修正拼写错误
     text-align: left; // 如果需要水平居中，可以改为 'center'
     font-style: normal;
     text-transform: none;
-    height: 98 rpx;
+    height: 98rpx;
     display: flex; // 添加 flex 布局
     align-items: center; // 垂直居中
-    margin-left: 30 rpx; // 添加左边距
+    margin-left: 30rpx; // 添加左边距
   }
 
   .huodongText2 {
     font-family: PingFang SC, PingFang SC;
     font-weight: 400;
-    font-size: 20 rpx;
+    font-size: 20rpx;
     color: #666666;
-    height: 98 rpx;
-    line-height: 28 rpx;
+    height: 98rpx;
+    line-height: 28rpx;
     text-align: left;
     font-style: normal;
     display: flex; // 添加 flex 布局
@@ -829,8 +829,8 @@ export default {
     text-transform: none;
 
     .huodongText2-img {
-      margin-right: 15 rpx;
-      margin-left: 15 rpx
+      margin-right: 15rpx;
+      margin-left: 15rpx
     }
   }
 

pages/home/index2.vue

@@ -606,16 +606,16 @@ export default {
   .adv-box {
     position: relative;
     // padding: 0 33rpx 20rpx;
-    height: 64 rpx;
+    height: 64rpx;
     background-color: white;
-    padding: 0 20 rpx 0;
-    border-radius: 16 rpx;
-    margin: 40 rpx 0 20 rpx;
+    padding: 0 20rpx0;
+    border-radius: 16rpx;
+    margin: 40rpx0 20rpx;
     font-weight: 500;
 
     .adv-icon {
       position: absolute;
-      left: 6 rpx;
+      left: 6rpx;
       top: 50%;
       transform: translateY(-50%);
     }
@@ -633,26 +633,26 @@ export default {
 
   .custom-indicator {
     position: absolute;
-    left: 0 rpx;
-    right: 0 rpx;
-    bottom: 29 rpx;
-    width: 712 rpx;
+    left: 0rpx;
+    right: 0rpx;
+    bottom: 29rpx;
+    width: 712rpx;
     display: flex;
-    margin: 0 20 rpx 0 20 rpx;
+    margin: 0 20rpx0 20rpx;
     flex-direction: row;
     justify-content: center;
     transform: translateX(-48rpx);
 
     .custom-indicator-item {
-      width: 16 rpx;
-      height: 16 rpx;
-      margin: 0 6 rpx;
-      border-radius: 12 rpx;
+      width: 16rpx;
+      height: 16rpx;
+      margin: 0 6rpx;
+      border-radius: 12rpx;
       background-color: #666666;
     }
 
     .banner-active {
-      width: 48 rpx;
+      width: 48rpx;
       background-color: #222222;
     }
   }
@@ -665,27 +665,27 @@ export default {
   .content-box {
     // overflow-y: auto;
     background-color: $primary-bg-color;
-    padding: 20 rpx 0 0;
+    padding: 20rpx0 0;
 
     .part-box {
       background: linear-gradient(180deg, #fdd118 0%, #f7f7f7 100%);
-      border-radius: 10 rpx 10 rpx 10 rpx 10 rpx;
-      padding: 18 rpx 14 rpx;
+      border-radius: 10rpx10rpx10rpx10rpx;
+      padding: 18rpx14rpx;
 
       .part-list {
         display: flex !important;
         flex-direction: row !important;
         // justify-content: space-between;
         background-color: #fff;
-        border-radius: 10 rpx;
-        padding: 15 rpx 15 rpx 30 rpx;
-        font-size: 24 rpx;
+        border-radius: 10rpx;
+        padding: 15rpx15rpx30rpx;
+        font-size: 24rpx;
         color: #1d161f;
-        margin-top: 15 rpx;
+        margin-top: 15rpx;
 
         &-item {
           width: calc(33% - 10rpx);
-          margin-right: 10 rpx;
+          margin-right: 10rpx;
         }
       }
     }
@@ -706,26 +706,26 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding: 0 20 rpx;
+        padding: 0 20rpx;
         box-sizing: border-box;
 
         .search-box {
-          margin: 0 auto 0 rpx;
-          height: 61 rpx;
+          margin: 0 auto 0rpx;
+          height: 61rpx;
           background: rgba(255, 255, 255, 0.3);
-          border-radius: 30 rpx;
+          border-radius: 30rpx;
           opacity: 1;
           display: flex;
           align-items: center;
           flex-direction: row;
 
           text {
-            font-size: 24 rpx;
+            font-size: 24rpx;
             font-family: PingFang SC-Regular, PingFang SC;
             font-weight: 400;
             color: #9D9D9D;
-            line-height: 61 rpx;
-            margin-left: 11 rpx;
+            line-height: 61rpx;
+            margin-left: 11rpx;
           }
         }
       }
@@ -734,7 +734,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 61 rpx;
+        height: 61rpx;
       }
     }
 
@@ -743,15 +743,15 @@ export default {
       z-index: 50;
       // margin-top: -60rpx;s
       .title-tab {
-        font-size: 34 rpx;
+        font-size: 34rpx;
         color: #aca9af;
         font-style: italic;
         font-weight: 700;
-        margin-bottom: 26 rpx;
-        padding: 0 20 rpx;
+        margin-bottom: 26rpx;
+        padding: 0 20rpx;
 
         &-item {
-          margin-right: 30 rpx;
+          margin-right: 30rpx;
         }
 
         &-actived {
@@ -767,22 +767,22 @@ export default {
     flex-wrap: wrap;
     justify-content: flex-start;
     background-color: #FFFFFF;;
-    padding: 0 20 rpx;
-    padding-top: 40 rpx;
+    padding: 0 20rpx;
+    padding-top: 40rpx;
 
     &-item {
       width: 20%;
       flex-shrink: 0;
       text-align: center;
-      margin-bottom: 30 rpx;
+      margin-bottom: 30rpx;
       color: #1d161f;
-      font-size: 26 rpx;
+      font-size: 26rpx;
     }
   }
 
   .biaoti {
     width: 100%;
-    height: 180 rpx;
+    height: 180rpx;
     display: flex;
     justify-content: center;
     align-items: center
@@ -791,25 +791,25 @@ export default {
   .huodongText {
     font-family: PingFang SC, PingFang SC;
     font-weight: 400;
-    font-size: 26 rpx;
+    font-size: 26rpx;
     color: #333333;
-    line-height: 36 rpx; // 修正拼写错误
+    line-height: 36rpx; // 修正拼写错误
     text-align: left; // 如果需要水平居中，可以改为 'center'
     font-style: normal;
     text-transform: none;
-    height: 98 rpx;
+    height: 98rpx;
     display: flex; // 添加 flex 布局
     align-items: center; // 垂直居中
-    margin-left: 30 rpx; // 添加左边距
+    margin-left: 30rpx; // 添加左边距
   }
 
   .huodongText2 {
     font-family: PingFang SC, PingFang SC;
     font-weight: 400;
-    font-size: 20 rpx;
+    font-size: 20rpx;
     color: #666666;
-    height: 98 rpx;
-    line-height: 28 rpx;
+    height: 98rpx;
+    line-height: 28rpx;
     text-align: left;
     font-style: normal;
     display: flex; // 添加 flex 布局
@@ -817,8 +817,8 @@ export default {
     text-transform: none;
 
     .huodongText2-img {
-      margin-right: 15 rpx;
-      margin-left: 15 rpx
+      margin-right: 15rpx;
+      margin-left: 15rpx
     }
   }
 

pages/productCenter2/filterBar.vue

@@ -170,30 +170,30 @@ export default {
   position: relative;
   display: flex;
   align-items: center;
-  padding: 33 rpx 0 30 rpx 0;
+  padding: 33rpx0 30rpx0;
 
   .item {
     display: flex;
     justify-content: center;
     align-items: center;
-    font-size: 24 rpx;
+    font-size: 24rpx;
     font-weight: 500;
     color: #767676;
-    line-height: 34 rpx;
+    line-height: 34rpx;
 
     &.sales_num {
       flex: 1;
-      margin-left: 20 rpx;
+      margin-left: 20rpx;
     }
 
     &.price {
       flex: 1;
-      margin-right: 20 rpx;
+      margin-right: 20rpx;
     }
 
     &.synthesis,
     &.classify {
-      padding: 0 24 rpx;
+      padding: 0 24rpx;
       flex-shrink: 0;
     }
 
@@ -203,7 +203,7 @@ export default {
     }
 
     .price-icon {
-      margin-left: 4 rpx;
+      margin-left: 4rpx;
     }
   }
 
@@ -225,17 +225,17 @@ export default {
   }
 
   .cate-select-wrap {
-    padding: 20 rpx 10 rpx 40 rpx;
+    padding: 20rpx10rpx40rpx;
     display: flex;
     flex-wrap: wrap;
 
     .cate-item {
-      font-size: 24 rpx;
-      border: 2 rpx solid #2979ff;
+      font-size: 24rpx;
+      border: 2rpxsolid #2979ff;
       color: #2979ff;
-      padding: 4 rpx 28 rpx;
-      margin: 10 rpx;
-      border-radius: 72 rpx;
+      padding: 4rpx28rpx;
+      margin: 10rpx;
+      border-radius: 72rpx;
 
       &.active {
         color: #fff;
@@ -250,18 +250,18 @@ export default {
   flex-wrap: wrap;
 
   &-list {
-    width: 166 rpx;
-    height: 55 rpx;
-    font-size: 24 rpx;
-    border-radius: 12 rpx;
+    width: 166rpx;
+    height: 55rpx;
+    font-size: 24rpx;
+    border-radius: 12rpx;
     background-color: #fff;
     color: #626262;
     overflow: hidden;
-    line-height: 55 rpx;
+    line-height: 55rpx;
     text-overflow: ellipsis;
     text-align: center;
-    margin-right: 15 rpx;
-    margin-bottom: 23 rpx;
+    margin-right: 15rpx;
+    margin-bottom: 23rpx;
   }
 
   &-active {

pages/productCenter2/productCenter.vue

@@ -154,7 +154,7 @@ export default {
 
 <style lang="scss" scoped>
 .common-page {
-  padding: 25 rpx 20 rpx;
+  padding: 25rpx20rpx;
   height: 100vh;
   background-color: $primary-bg-color;
 }

uview-ui1/components/u1-lazy-load/u-lazy-load.vue

@@ -24,7 +24,7 @@
 	 * @property {String} image 图片路径
 	 * @property {String} loading-img 预加载时的占位图
 	 * @property {String} error-img 图片加载出错时的占位图
-	 * @property {String} threshold 触发加载时的位置，见上方说明，单位 rpx（默认300）
+	 * @property {String} threshold 触发加载时的位置，见上方说明，单位rpx（默认300）
 	 * @property {String Number} duration 图片加载成功时，淡入淡出时间，单位ms（默认）
 	 * @property {String} effect 图片加载成功时，淡入淡出的css动画效果（默认ease-in-out）
 	 * @property {Boolean} is-effect 图片加载成功时，是否启用淡入淡出效果（默认true）
@@ -170,7 +170,7 @@
 				if (this.loadStatus == '') {
 					this.loadStatus = 'lazyed';
 				}
-				// 真正的图片加载完成 
+				// 真正的图片加载完成
 				else if (this.loadStatus == 'lazyed') {
 					this.loadStatus = 'loaded';
 					this.$emit('load', this.index);
@@ -225,7 +225,7 @@
 
 <style scoped lang="scss">
 	@import "../../libs/css/style.components.scss";
-	
+
 	.u-wrap {
 		background-color: #eee;
 		overflow: hidden;

uview-ui1/components/u1-parse/libs/MpHtmlParser.js

@@ -270,7 +270,7 @@ MpHtmlParser.prototype.setNode = function() {
 					value = value.substr(0, j) + this.getUrl(value.substr(j));
 				}
 			}
-			// 转换 rpx
+			// 转换rpx
 			else if (value.includes('rpx'))
 				value = value.replace(/[0-9.]+\s*rpx/g, $ => parseFloat($) * windowWidth / 750 + 'px');
 			else if (key == 'white-space' && value.includes('pre') && !close)

uview-ui1/components/u1-parse/u-parse.vue

@@ -540,7 +540,7 @@
 					style += '</style>';
 					html = style + html;
 				}
-				// 处理 rpx
+				// 处理rpx
 				if (html.includes('rpx'))
 					html = html.replace(/[0-9.]+\s*rpx/g, $ => (parseFloat($) * windowWidth / 750) + 'px');
 				return html;

uview-ui1/libs/css/common.scss

@@ -125,7 +125,7 @@ text {
 // 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
 @for $i from 20 through 40 {
 	.u-font-#{$i} {
-		font-size: $i + rpx;
+		font-size: $i +rpx;
 	}
 }
 
@@ -135,35 +135,35 @@ text {
 	@if $i % 2 == 0 or $i % 5 == 0 {
 		// 得出：u-margin-30或者u-m-30
 		.u-margin-#{$i}, .u-m-#{$i} {
-			margin: $i + rpx!important;
+			margin: $i +rpx!important;
 		}
-		
+
 		// 得出：u-padding-30或者u-p-30
 		.u-padding-#{$i}, .u-p-#{$i} {
-			padding: $i + rpx!important;
+			padding: $i +rpx!important;
 		}
-		
+
 		@each $short, $long in l left, t top, r right, b bottom {
 			// 缩写版，结果如： u-m-l-30
 			// 定义外边距
 			.u-m-#{$short}-#{$i} {
-				margin-#{$long}: $i + rpx!important;
+				margin-#{$long}: $i +rpx!important;
 			}
-			
+
 			// 定义内边距
 			.u-p-#{$short}-#{$i} {
-				padding-#{$long}: $i + rpx!important;
+				padding-#{$long}: $i +rpx!important;
 			}
-			
+
 			// 完整版，结果如：u-margin-left-30
 			// 定义外边距
 			.u-margin-#{$long}-#{$i} {
-				margin-#{$long}: $i + rpx!important;
+				margin-#{$long}: $i +rpx!important;
 			}
-			
+
 			// 定义内边距
 			.u-padding-#{$long}-#{$i} {
-				padding-#{$long}: $i + rpx!important;
+				padding-#{$long}: $i +rpx!important;
 			}
 		}
 	}
@@ -173,4 +173,4 @@ text {
 .u-reset-nvue {
 	flex-direction: row;
 	align-items: center;
-}
+}

wxcomponents/vant/dist/stepper/index.wxml

@@ -1,42 +1,42 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view class="{{ utils.bem('stepper', [theme]) }} custom-class">
     <view
-            bind:tap="onTap"
-            bind:touchend="onTouchEnd"
-            bind:touchstart="onTouchStart"
-            class="minus-class {{ utils.bem('stepper__minus', { disabled: disabled || disableMinus || currentValue <= min }) }}"
+            wx:if="{{ showMinus }}"
             data-type="minus"
+            style="{{ computed.buttonStyle({ buttonSize }) }}"
+            class="minus-class {{ utils.bem('stepper__minus', { disabled: disabled || disableMinus || currentValue <= min }) }}"
             hover-class="van-stepper__minus--hover"
             hover-stay-time="70"
-            style="{{ computed.buttonStyle({ buttonSize }) }}"
-            wx:if="{{ showMinus }}"
+            bind:tap="onTap"
+            bind:touchstart="onTouchStart"
+            bind:touchend="onTouchEnd"
     >
         <slot name="minus"/>
     </view>
     <input
-            always-embed="{{ alwaysEmbed }}"
-            bind:blur="onBlur"
-            bind:focus="onFocus"
-            bindinput="onInput"
+            type="{{ integer ? 'number' : 'digit' }}"
             class="input-class {{ utils.bem('stepper__input', { disabled: disabled || disableInput }) }}"
-            disabled="{{ disabled || disableInput }}"
-            focus="{{ focus }}"
             style="{{ computed.inputStyle({ buttonSize, inputWidth }) }}"
-            type="{{ integer ? 'number' : 'digit' }}"
             value="{{ currentValue }}"
+            focus="{{ focus }}"
+            disabled="{{ disabled || disableInput }}"
+            always-embed="{{ alwaysEmbed }}"
+            bindinput="onInput"
+            bind:focus="onFocus"
+            bind:blur="onBlur"
     />
     <view
-            bind:tap="onTap"
-            bind:touchend="onTouchEnd"
-            bind:touchstart="onTouchStart"
-            class="plus-class {{ utils.bem('stepper__plus', { disabled: disabled || disablePlus || currentValue >= max }) }}"
+            wx:if="{{ showPlus }}"
             data-type="plus"
+            style="{{ computed.buttonStyle({ buttonSize }) }}"
+            class="plus-class {{ utils.bem('stepper__plus', { disabled: disabled || disablePlus || currentValue >= max }) }}"
             hover-class="van-stepper__plus--hover"
             hover-stay-time="70"
-            style="{{ computed.buttonStyle({ buttonSize }) }}"
-            wx:if="{{ showPlus }}"
+            bind:tap="onTap"
+            bind:touchstart="onTouchStart"
+            bind:touchend="onTouchEnd"
     >
         <slot name="plus"/>
     </view>

wxcomponents/vant/dist/steps/index.wxml

@@ -1,14 +1,14 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
 
 <view class="custom-class {{ utils.bem('steps', [direction]) }}">
     <view class="van-step__wrapper">
         <view
+                wx:for="{{ steps }}"
+                wx:key="index"
                 bindtap="onClick"
-                class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
                 data-index="{{ index }}"
+                class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
                 style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
-                wx:for="{{ steps }}"
-                wx:key="index"
         >
             <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
                 <view>{{ item.text }}</view>
@@ -17,25 +17,25 @@
             <view class="van-step__circle-container">
                 <block wx:if="{{ index !== active }}">
                     <van-icon
-                            class="van-step__icon"
+                            wx:if="{{ item.inactiveIcon || inactiveIcon }}"
                             color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}"
                             name="{{ item.inactiveIcon || inactiveIcon }}"
-                            wx:if="{{ item.inactiveIcon || inactiveIcon }}"
+                            class="van-step__icon"
                     />
                     <view
+                            wx:else
                             class="van-step__circle"
                             style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
-                            wx:else
                     />
                 </block>
 
-                <van-icon class="van-step__icon" color="{{ activeColor }}" name="{{ item.activeIcon || activeIcon }}"
-                          wx:else/>
+                <van-icon wx:else name="{{ item.activeIcon || activeIcon }}" color="{{ activeColor }}"
+                          class="van-step__icon"/>
             </view>
             <view
+                    wx:if="{{ index !== steps.length - 1 }}"
                     class="van-step__line"
                     style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
-                    wx:if="{{ index !== steps.length - 1 }}"
             />
         </view>
     </view>

wxcomponents/vant/dist/sticky/index.wxml

@@ -1,5 +1,5 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view class="custom-class van-sticky" style="{{ computed.containerStyle({ fixed, height, zIndex }) }}">
     <view class="{{ utils.bem('sticky-wrap', { fixed }) }}"

wxcomponents/vant/dist/submit-bar/index.wxml

@@ -1,16 +1,16 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
 
 <view class="van-submit-bar custom-class">
     <slot name="top"/>
 
     <view class="van-submit-bar__tip">
         <van-icon
-                custom-class="van-submit-bar__tip-icon"
-                name="{{ tipIcon }}"
-                size="12px"
                 wx:if="{{ tipIcon }}"
+                size="12px"
+                name="{{ tipIcon }}"
+                custom-class="van-submit-bar__tip-icon"
         />
-        <view class="van-submit-bar__tip-text" wx:if="{{ hasTip }}">
+        <view wx:if="{{ hasTip }}" class="van-submit-bar__tip-text">
             {{ tip }}
         </view>
         <slot name="tip"/>
@@ -18,7 +18,7 @@
 
     <view class="bar-class van-submit-bar__bar">
         <slot/>
-        <view class="van-submit-bar__text" wx:if="{{ hasPrice }}">
+        <view wx:if="{{ hasPrice }}" class="van-submit-bar__text">
             <text>{{ label || '合计：' }}</text>
             <text class="van-submit-bar__price price-class">
                 <text class="van-submit-bar__currency">{{ currency }}</text>
@@ -28,18 +28,18 @@
             <text class="van-submit-bar__suffix-label">{{ suffixLabel }}</text>
         </view>
         <van-button
-                bind:click="onSubmit"
+                round
+                type="{{ buttonType }}"
+                loading="{{ loading }}"
+                disabled="{{ disabled }}"
                 class="van-submit-bar__button"
                 custom-class="button-class"
                 custom-style="width: 100%;"
-                disabled="{{ disabled }}"
-                loading="{{ loading }}"
-                round
-                type="{{ buttonType }}"
+                bind:click="onSubmit"
         >
             {{ loading ? '' : buttonText }}
         </van-button>
     </view>
 
-    <view class="van-submit-bar__safe" wx:if="{{ safeAreaInsetBottom }}"/>
+    <view wx:if="{{ safeAreaInsetBottom }}" class="van-submit-bar__safe"/>
 </view>

wxcomponents/vant/dist/swipe-cell/index.wxml

@@ -1,19 +1,19 @@
 <view
-        bindtouchcancel="endDrag"
-        bindtouchend="endDrag"
-        bindtouchstart="startDrag"
-        capture-bind:touchmove="onDrag"
-        catchtap="onClick"
-        catchtouchmove="{{ catchMove ? 'noop' : '' }}"
         class="van-swipe-cell custom-class"
         data-key="cell"
+        catchtap="onClick"
+        bindtouchstart="startDrag"
+        catchtouchmove="{{ catchMove ? 'noop' : '' }}"
+        capture-bind:touchmove="onDrag"
+        bindtouchend="endDrag"
+        bindtouchcancel="endDrag"
 >
     <view style="{{ wrapperStyle }}">
-        <view catch:tap="onClick" class="van-swipe-cell__left" data-key="left" wx:if="{{ leftWidth }}">
+        <view wx:if="{{ leftWidth }}" class="van-swipe-cell__left" data-key="left" catch:tap="onClick">
             <slot name="left"/>
         </view>
         <slot/>
-        <view catch:tap="onClick" class="van-swipe-cell__right" data-key="right" wx:if="{{ rightWidth }}">
+        <view wx:if="{{ rightWidth }}" class="van-swipe-cell__right" data-key="right" catch:tap="onClick">
             <slot name="right"/>
         </view>
     </view>

wxcomponents/vant/dist/switch/index.wxml

@@ -1,16 +1,16 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view
-        bind:tap="onClick"
         class="{{ utils.bem('switch', { on: checked === activeValue, disabled }) }} custom-class"
         style="{{ computed.rootStyle({ size, checked, activeColor, inactiveColor, activeValue }) }}"
+        bind:tap="onClick"
 >
     <view class="van-switch__node node-class">
         <van-loading
+                wx:if="{{ loading }}"
                 color="{{ computed.loadingColor({ checked, activeColor, inactiveColor, activeValue }) }}"
                 custom-class="van-switch__loading"
-                wx:if="{{ loading }}"
         />
     </view>
 </view>

wxcomponents/vant/dist/tab/index.wxml

@@ -1,4 +1,4 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
 
 <view
         class="custom-class {{ utils.bem('tab__pane', { active, inactive: !active }) }}"

wxcomponents/vant/dist/tabbar-item/index.wxml

@@ -1,25 +1,25 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
 
 <view
-        bindtap="onClick"
         class="{{ utils.bem('tabbar-item', { active }) }} custom-class"
         style="color: {{ active ? activeColor : inactiveColor }}"
+        bindtap="onClick"
 >
     <view class="van-tabbar-item__icon">
         <van-icon
+                wx:if="{{ icon }}"
+                name="{{ icon }}"
                 class-prefix="{{ iconPrefix }}"
                 custom-class="van-tabbar-item__icon__inner"
-                name="{{ icon }}"
-                wx:if="{{ icon }}"
         />
         <block wx:else>
-            <slot name="icon-active" wx:if="{{ active }}"/>
-            <slot name="icon" wx:else/>
+            <slot wx:if="{{ active }}" name="icon-active"/>
+            <slot wx:else name="icon"/>
         </block>
         <van-info
-                custom-class="van-tabbar-item__info"
                 dot="{{ dot }}"
                 info="{{ info }}"
+                custom-class="van-tabbar-item__info"
         />
     </view>
     <view class="van-tabbar-item__text">

wxcomponents/vant/dist/tabbar/index.wxml

@@ -1,4 +1,4 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
 
 <view
         class="{{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }} custom-class"
@@ -7,4 +7,4 @@
     <slot/>
 </view>
 
-<view style="height: {{ height }}px;" wx:if="{{ fixed && placeholder }}"></view>
+<view wx:if="{{ fixed && placeholder }}" style="height: {{ height }}px;"></view>

wxcomponents/vant/dist/tabs/index.wxml

@@ -1,43 +1,43 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view class="custom-class {{ utils.bem('tabs') }}">
     <van-sticky
-            bind:scroll="onTouchScroll"
-            container="{{ container }}"
             disabled="{{ !sticky }}"
-            offset-top="{{ offsetTop }}"
             z-index="{{ zIndex }}"
+            offset-top="{{ offsetTop }}"
+            container="{{ container }}"
+            bind:scroll="onTouchScroll"
     >
         <view class="{{ utils.bem('tabs--') + type }} {{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} wrap-class">
             <slot name="nav-left"/>
 
             <scroll-view
-                    class="{{ utils.bem('tabs__scroll', [type]) }}"
-                    scroll-left="{{ scrollLeft }}"
-                    scroll-with-animation="{{ scrollWithAnimation }}"
                     scroll-x="{{ scrollable }}"
+                    scroll-with-animation="{{ scrollWithAnimation }}"
+                    scroll-left="{{ scrollLeft }}"
+                    class="{{ utils.bem('tabs__scroll', [type]) }}"
                     style="{{ color ? 'border-color: ' + color : '' }}"
             >
                 <view class="{{ utils.bem('tabs__nav', [type, { complete: !ellipsis }]) }} nav-class"
                       style="{{ computed.navStyle(color, type) }}">
-                    <view class="van-tabs__line" style="{{ computed.lineStyle({ color, lineOffsetLeft, lineHeight, skipTransition, duration, lineWidth, inited }) }}"
-                          wx:if="{{ type === 'line' }}"/>
+                    <view wx:if="{{ type === 'line' }}" class="van-tabs__line"
+                          style="{{ computed.lineStyle({ color, lineOffsetLeft, lineHeight, skipTransition, duration, lineWidth, inited }) }}"/>
                     <view
-                            bind:tap="onTap"
-                            class="{{ computed.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
-                            data-index="{{ index }}"
-                            style="{{ computed.tabStyle({ active: index === currentIndex, ellipsis, color, type, disabled: item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable }) }}"
                             wx:for="{{ tabs }}"
                             wx:key="index"
+                            data-index="{{ index }}"
+                            class="{{ computed.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
+                            style="{{ computed.tabStyle({ active: index === currentIndex, ellipsis, color, type, disabled: item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable }) }}"
+                            bind:tap="onTap"
                     >
                         <view class="{{ ellipsis ? 'van-ellipsis' : '' }}" style="{{ item.titleStyle }}">
                             {{ item.title }}
                             <van-info
-                                    custom-class="van-tab__title__info"
-                                    dot="{{ item.dot }}"
-                                    info="{{ item.info }}"
                                     wx:if="{{ item.info !== null || item.dot }}"
+                                    info="{{ item.info }}"
+                                    dot="{{ item.dot }}"
+                                    custom-class="van-tab__title__info"
                             />
                         </view>
                     </view>
@@ -49,11 +49,11 @@
     </van-sticky>
 
     <view
-            bind:touchcancel="onTouchEnd"
-            bind:touchend="onTouchEnd"
-            bind:touchmove="onTouchMove"
-            bind:touchstart="onTouchStart"
             class="van-tabs__content"
+            bind:touchstart="onTouchStart"
+            bind:touchmove="onTouchMove"
+            bind:touchend="onTouchEnd"
+            bind:touchcancel="onTouchEnd"
     >
         <view
                 class="{{ utils.bem('tabs__track', [{ animated }]) }} van-tabs__track"

wxcomponents/vant/dist/tag/index.wxml

@@ -1,5 +1,5 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view
         class="custom-class {{ utils.bem('tag', [type, size, { mark, plain, round }]) }}"
@@ -7,9 +7,9 @@
 >
     <slot/>
     <van-icon
-            bind:click="onClose"
-            custom-class="van-tag__close"
-            name="cross"
             wx:if="{{ closeable }}"
+            name="cross"
+            custom-class="van-tag__close"
+            bind:click="onClose"
     />
 </view>

wxcomponents/vant/dist/toast/index.wxml

@@ -1,34 +1,34 @@
 <van-overlay
-        custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
-        show="{{ show }}"
         wx:if="{{ mask || forbidClick }}"
+        show="{{ show }}"
         z-index="{{ zIndex }}"
+        custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
 />
 <van-transition
-        custom-class="van-toast__container"
-        custom-style="z-index: {{ zIndex }}"
         show="{{ show }}"
+        custom-style="z-index: {{ zIndex }}"
+        custom-class="van-toast__container"
 >
     <view
-            catch:touchmove="noop"
             class="van-toast van-toast--{{ (type === 'text' || type === 'html') ? 'text' : 'icon' }} van-toast--{{ position }}"
+            catch:touchmove="noop"
     >
         <!-- text only -->
         <text wx:if="{{ type === 'text' }}">{{ message }}</text>
 
         <!-- html only -->
-        <rich-text nodes="{{ message }}" wx:elif="{{ type === 'html' }}"></rich-text>
+        <rich-text wx:elif="{{ type === 'html' }}" nodes="{{ message }}"></rich-text>
 
         <!-- with icon -->
         <block wx:else>
             <van-loading
+                    wx:if="{{ type === 'loading' }}"
                     color="white"
-                    custom-class="van-toast__loading"
                     type="{{ loadingType }}"
-                    wx:if="{{ type === 'loading' }}"
+                    custom-class="van-toast__loading"
             />
-            <van-icon class="van-toast__icon" name="{{ type }}" wx:else/>
-            <text class="van-toast__text" wx:if="{{ message }}">{{ message }}</text>
+            <van-icon wx:else class="van-toast__icon" name="{{ type }}"/>
+            <text wx:if="{{ message }}" class="van-toast__text">{{ message }}</text>
         </block>
 
         <slot/>

wxcomponents/vant/dist/transition/index.wxml

@@ -1,10 +1,10 @@
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view
-        bind:transitionend="onTransitionEnd"
+        wx:if="{{ inited }}"
         class="van-transition custom-class {{ classes }}"
         style="{{ computed.rootStyle({ currentDuration, display, customStyle }) }}"
-        wx:if="{{ inited }}"
+        bind:transitionend="onTransitionEnd"
 >
     <slot/>
 </view>

wxcomponents/vant/dist/tree-select/index.wxml

@@ -1,41 +1,41 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="wxs" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="wxs"/>
 
 <view
         class="van-tree-select"
         style="height: {{ utils.addUnit(height) }}"
 >
-    <scroll-view class="van-tree-select__nav" scroll-y>
+    <scroll-view scroll-y class="van-tree-select__nav">
         <van-sidebar active-key="{{ mainActiveIndex }}" bind:change="onClickNav"
                      custom-class="van-tree-select__nav__inner">
             <van-sidebar-item
-                    active-class="main-active-class"
-                    badge="{{ item.badge }}"
+                    wx:for="{{ items }}"
+                    wx:key="index"
                     custom-class="main-item-class"
-                    disabled="{{ item.disabled }}"
+                    active-class="main-active-class"
                     disabled-class="main-disabled-class"
+                    badge="{{ item.badge }}"
                     dot="{{ item.dot }}"
                     title="{{ item.text }}"
-                    wx:for="{{ items }}"
-                    wx:key="index"
+                    disabled="{{ item.disabled }}"
             />
         </van-sidebar>
     </scroll-view>
-    <scroll-view class="van-tree-select__content" scroll-y>
+    <scroll-view scroll-y class="van-tree-select__content">
         <slot name="content"/>
         <view
-                bind:tap="onSelectItem"
-                class="van-ellipsis content-item-class {{ utils.bem('tree-select__item', { active: wxs.isActive(activeId, item.id), disabled: item.disabled }) }} {{ wxs.isActive(activeId, item.id) ? 'content-active-class' : '' }} {{ item.disabled ? 'content-disabled-class' : '' }}"
-                data-item="{{ item }}"
                 wx:for="{{ subItems }}"
                 wx:key="id"
+                class="van-ellipsis content-item-class {{ utils.bem('tree-select__item', { active: wxs.isActive(activeId, item.id), disabled: item.disabled }) }} {{ wxs.isActive(activeId, item.id) ? 'content-active-class' : '' }} {{ item.disabled ? 'content-disabled-class' : '' }}"
+                data-item="{{ item }}"
+                bind:tap="onSelectItem"
         >
             {{ item.text }}
             <van-icon
-                    class="van-tree-select__selected"
+                    wx:if="{{ wxs.isActive(activeId, item.id) }}"
                     name="{{ selectedIcon }}"
                     size="16px"
-                    wx:if="{{ wxs.isActive(activeId, item.id) }}"
+                    class="van-tree-select__selected"
             />
         </view>
     </scroll-view>

wxcomponents/vant/dist/uploader/index.wxml

@@ -1,84 +1,84 @@
-<wxs module="utils" src="../wxs/utils.wxs"/>
-<wxs module="computed" src="./index.wxs"/>
+<wxs src="../wxs/utils.wxs" module="utils"/>
+<wxs src="./index.wxs" module="computed"/>
 
 <view class="van-uploader">
     <view class="van-uploader__wrapper">
         <!-- 预览样式 -->
         <view
-                bindtap="onClickPreview"
-                class="van-uploader__preview"
-                data-index="{{ index }}"
-                wx:for="{{ lists }}"
                 wx:if="{{ previewImage }}"
+                wx:for="{{ lists }}"
                 wx:key="index"
+                class="van-uploader__preview"
+                data-index="{{ index }}"
+                bindtap="onClickPreview"
         >
             <image
-                    alt="{{ item.name || ('图片' + index) }}"
-                    bindtap="onPreviewImage"
-                    class="van-uploader__preview-image"
-                    data-index="{{ index }}"
+                    wx:if="{{ item.isImage }}"
                     mode="{{ imageFit }}"
                     src="{{ item.thumb || item.url }}"
+                    alt="{{ item.name || ('图片' + index) }}"
+                    class="van-uploader__preview-image"
                     style="{{ computed.sizeStyle({ previewSize }) }}"
-                    wx:if="{{ item.isImage }}"
+                    data-index="{{ index }}"
+                    bindtap="onPreviewImage"
             />
             <video
+                    wx:elif="{{ item.isVideo }}"
+                    src="{{ item.url }}"
+                    title="{{ item.name || ('视频' + index) }}"
+                    poster="{{ item.thumb }}"
                     autoplay="{{ item.autoplay }}"
-                    bindtap="onPreviewVideo"
-                    class="van-uploader__preview-image"
-                    data-index="{{ index }}"
                     object-fit="{{videoFit}}"
-                    poster="{{ item.thumb }}"
                     referrer-policy="{{ referrerPolicy }}"
-                    src="{{ item.url }}"
+                    class="van-uploader__preview-image"
                     style="{{ computed.sizeStyle({ previewSize }) }}"
-                    title="{{ item.name || ('视频' + index) }}"
-                    wx:elif="{{ item.isVideo }}"
+                    data-index="{{ index }}"
+                    bindtap="onPreviewVideo"
             >
             </video>
             <view
-                    bindtap="onPreviewFile"
+                    wx:else
                     class="van-uploader__file"
-                    data-index="{{ index }}"
                     style="{{ computed.sizeStyle({ previewSize }) }}"
-                    wx:else
+                    data-index="{{ index }}"
+                    bindtap="onPreviewFile"
             >
-                <van-icon class="van-uploader__file-icon" name="description"/>
+                <van-icon name="description" class="van-uploader__file-icon"/>
                 <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url }}</view>
             </view>
             <view
-                    class="van-uploader__mask"
                     wx:if="{{ item.status === 'uploading' || item.status === 'failed' }}"
+                    class="van-uploader__mask"
             >
-                <van-icon class="van-uploader__mask-icon" name="close" wx:if="{{ item.status === 'failed' }}"/>
-                <van-loading custom-class="van-uploader__loading" wx:else/>
-                <text class="van-uploader__mask-message" wx:if="{{ item.message }}">{{ item.message }}</text>
+                <van-icon wx:if="{{ item.status === 'failed' }}" name="close" class="van-uploader__mask-icon"/>
+                <van-loading wx:else custom-class="van-uploader__loading"/>
+                <text wx:if="{{ item.message }}" class="van-uploader__mask-message">{{ item.message }}</text>
             </view>
             <view
-                    catch:tap="deleteItem"
-                    class="van-uploader__preview-delete"
-                    data-index="{{ index }}"
                     wx:if="{{ deletable && item.deletable }}"
+                    data-index="{{ index }}"
+                    class="van-uploader__preview-delete"
+                    catch:tap="deleteItem"
             >
-                <van-icon class="van-uploader__preview-delete-icon" name="cross"/>
+                <van-icon name="cross" class="van-uploader__preview-delete-icon"/>
             </view>
         </view>
 
         <!-- 上传样式 -->
         <block wx:if="{{ isInCount }}">
-            <view bindtap="startUpload" class="van-uploader__slot">
+            <view class="van-uploader__slot" bindtap="startUpload">
                 <slot/>
             </view>
 
             <!-- 默认上传样式 -->
             <view
-                    bindtap="startUpload"
+                    wx:if="{{ showUpload }}"
                     class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}"
                     style="{{ computed.sizeStyle({ previewSize }) }}"
-                    wx:if="{{ showUpload }}"
+                    bindtap="startUpload"
             >
-                <van-icon class="van-uploader__upload-icon" name="{{ uploadIcon }}"/>
-                <text class="van-uploader__upload-text" wx:if="{{ uploadText }}">{{ uploadText }}</text>
+                <van-icon name="{{ uploadIcon }}" class="van-uploader__upload-icon"/>
+                <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
             </view>
         </block>
     </view>