Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue

src/views/mall/trade/afterSale/detail/index.vue

@@ -57,7 +57,7 @@
           v-for="(item, index) in formData.applyPicUrls"
           :key="index"
           :src="item.url"
-          class="w-60px h-60px mr-10px"
+          class="mr-10px h-60px w-60px"
           @click="imagePreview(formData.applyPicUrls)"
         />
       </el-descriptions-item>

src/views/mall/trade/afterSale/index.vue

@@ -123,7 +123,7 @@
           <div class="flex items-center">
             <el-image
               :src="row.picUrl"
-              class="w-30px h-30px mr-10px"
+              class="mr-10px h-30px w-30px"
               @click="imagePreview(row.picUrl)"
             />
             <span class="mr-10px">{{ row.spuName }}</span>

src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue

@@ -28,13 +28,13 @@
               <!--   区域数据太多，用赖加载方式，要不然性能有问题 -->
               <el-tree-select
                 v-model="row.areaIds"
-                lazy
                 :load="loadChargeArea"
                 :props="defaultProps"
-                multiple
                 node-key="id"
+                multiple
                 check-strictly
                 show-checkbox
+                lazy
                 check-on-click-node
                 :render-after-expand="false"
                 :cache-data="areaCache"

src/views/mall/trade/order/index.vue

@@ -199,7 +199,7 @@
                 <div class="flex items-center">
                   <el-image
                     :src="row.picUrl"
-                    class="w-30px h-30px mr-10px"
+                    class="mr-10px h-30px w-30px"
                     @click="imagePreview(row.picUrl)"
                   />
                   <span class="mr-10px">{{ row.spuName }}</span>