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
2025-08-07 14:41:54 +08:00 · 2023-09-24 12:00:10 +08:00
parent 1be57ea8d3 2a58e3f691
commit e489627748
74 changed files with 279 additions and 280 deletions
--- a/src/views/mall/product/comment/CommentForm.vue
+++ b/src/views/mall/product/comment/CommentForm.vue
@@ -8,7 +8,7 @@
      v-loading="formLoading"
    >
      <el-form-item label="商品" prop="spuId">
-        <div @click="handleSelectSpu" class="w-60px h-60px">
+        <div @click="handleSelectSpu" class="h-60px w-60px">
          <div v-if="spuData && spuData.picUrl">
            <el-image :src="spuData.picUrl" />
          </div>
@@ -18,7 +18,7 @@
        </div>
      </el-form-item>
      <el-form-item label="商品规格" prop="skuId" v-if="formData.spuId">
-        <div @click="handleSelectSku" class="w-60px h-60px">
+        <div @click="handleSelectSku" class="h-60px w-60px">
          <div v-if="skuData && skuData.picUrl">
            <el-image :src="skuData.picUrl" />
          </div>
@@ -150,6 +150,7 @@ const resetForm = () => {
    userNickname: undefined,
    userAvatar: undefined,
    spuId: undefined,
+    spuName: undefined,
    skuId: undefined,
    descriptionScores: 5,
    benefitScores: 5,
@@ -182,11 +183,11 @@ const handleSkuChange = (sku: ProductSpuApi.Sku) => {
 <style>
 .select-box {
  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1px dashed var(--el-border-color-darker);
-  border-radius: 8px;
  width: 100%;
  height: 100%;
+  border: 1px dashed var(--el-border-color-darker);
+  border-radius: 8px;
+  align-items: center;
+  justify-content: center;
 }
 </style>
--- a/src/views/mall/product/comment/index.vue
+++ b/src/views/mall/product/comment/index.vue
@@ -63,12 +63,12 @@
      <el-table-column label="用户名称" align="center" prop="userNickname" width="80" />
      <el-table-column label="商品信息" align="center" min-width="300">
        <template #default="scope">
-          <div class="flex row items-center gap-x-4px">
+          <div class="row flex items-center gap-x-4px">
            <el-image
              v-if="scope.row.skuPicUrl"
              :src="scope.row.skuPicUrl"
              :preview-src-list="[scope.row.skuPicUrl]"
-              class="w-40px h-40px shrink-0"
+              class="h-40px w-40px shrink-0"
              preview-teleported
            />
            <div>{{ scope.row.spuName }}</div>
@@ -95,7 +95,7 @@
              :src="picUrl"
              :preview-src-list="scope.row.picUrls"
              :initial-index="index"
-              class="w-40px h-40px"
+              class="h-40px w-40px"
              preview-teleported
            />
          </div>
--- a/src/views/mall/product/spu/components/SkuList.vue
+++ b/src/views/mall/product/spu/components/SkuList.vue
@@ -124,7 +124,7 @@
    <el-table-column v-if="isComponent" type="selection" width="45" />
    <el-table-column align="center" label="图片" min-width="80">
      <template #default="{ row }">
-        <el-image :src="row.picUrl" class="w-60px h-60px" @click="imagePreview(row.picUrl)" />
+        <el-image :src="row.picUrl" class="h-60px w-60px" @click="imagePreview(row.picUrl)" />
      </template>
    </el-table-column>
    <template v-if="formData!.specType && !isBatch">
@@ -204,7 +204,7 @@
    <el-table-column v-if="isComponent" type="selection" width="45" />
    <el-table-column align="center" label="图片" min-width="80">
      <template #default="{ row }">
-        <el-image :src="row.picUrl" class="w-60px h-60px" @click="imagePreview(row.picUrl)" />
+        <el-image :src="row.picUrl" class="h-60px w-60px" @click="imagePreview(row.picUrl)" />
      </template>
    </el-table-column>
    <template v-if="formData!.specType">
--- a/src/views/mall/product/spu/components/SkuTableSelect.vue
+++ b/src/views/mall/product/spu/components/SkuTableSelect.vue
@@ -12,7 +12,7 @@
        <template #default="{ row }">
          <el-image
            :src="row.picUrl"
-            class="w-30px h-30px"
+            class="h-30px w-30px"
            :preview-src-list="[row.picUrl]"
            preview-teleported
          />
--- a/src/views/mall/product/spu/components/SpuTableSelect.vue
+++ b/src/views/mall/product/spu/components/SpuTableSelect.vue
@@ -73,7 +73,7 @@
          <template #default="{ row }">
            <el-image
              :src="row.picUrl"
-              class="w-30px h-30px"
+              class="h-30px w-30px"
              :preview-src-list="[row.picUrl]"
              preview-teleported
            />
--- a/src/views/mall/product/spu/form/BasicInfoForm.vue
+++ b/src/views/mall/product/spu/form/BasicInfoForm.vue
@@ -117,7 +117,7 @@
          />
        </el-form-item>
        <el-form-item v-if="formData.specType" label="商品属性">
-          <el-button class="mr-15px mb-10px" @click="attributesAddFormRef.open">添加规格</el-button>
+          <el-button class="mb-10px mr-15px" @click="attributesAddFormRef.open">添加规格</el-button>
          <ProductAttributes :propertyList="propertyList" @success="generateSkus" />
        </el-form-item>
        <template v-if="formData.specType && propertyList.length > 0">
@@ -153,14 +153,14 @@
      {{ row.subCommissionType ? '自行设置' : '默认设置' }}
    </template>
    <template #picUrl="{ row }">
-      <el-image :src="row.picUrl" class="w-60px h-60px" @click="imagePreview(row.picUrl)" />
+      <el-image :src="row.picUrl" class="h-60px w-60px" @click="imagePreview(row.picUrl)" />
    </template>
    <template #sliderPicUrls="{ row }">
      <el-image
        v-for="(item, index) in row.sliderPicUrls"
        :key="index"
        :src="item.url"
-        class="w-60px h-60px mr-10px"
+        class="mr-10px h-60px w-60px"
        @click="imagePreview(row.sliderPicUrls)"
      />
    </template>
--- a/src/views/mall/product/spu/index.vue
+++ b/src/views/mall/product/spu/index.vue
@@ -125,7 +125,7 @@
      <el-table-column key="id" align="center" label="商品编号" prop="id" />
      <el-table-column label="商品图" min-width="80">
        <template #default="{ row }">
-          <el-image :src="row.picUrl" class="w-30px h-30px" @click="imagePreview(row.picUrl)" />
+          <el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" label="商品名称" min-width="300" prop="name" />
--- a/src/views/mall/promotion/bargain/activity/index.vue
+++ b/src/views/mall/promotion/bargain/activity/index.vue
@@ -32,7 +32,7 @@
      <template #spuId="{ row }">
        <el-image
          :src="row.picUrl"
-          class="w-30px h-30px align-middle mr-5px"
+          class="mr-5px h-30px w-30px align-middle"
          @click="imagePreview(row.picUrl)"
        />
        <span class="align-middle">{{ row.spuName }}</span>
--- a/src/views/mall/promotion/combination/activity/index.vue
+++ b/src/views/mall/promotion/combination/activity/index.vue
@@ -33,7 +33,7 @@
      <template #spuId="{ row }">
        <el-image
          :src="row.picUrl"
-          class="w-30px h-30px align-middle mr-5px"
+          class="mr-5px h-30px w-30px align-middle"
          @click="imagePreview(row.picUrl)"
        />
        <span class="align-middle">{{ row.spuName }}</span>
--- a/src/views/mall/promotion/components/SpuAndSkuList.vue
+++ b/src/views/mall/promotion/components/SpuAndSkuList.vue
@@ -18,7 +18,7 @@
    <el-table-column key="id" align="center" label="商品编号" prop="id" />
    <el-table-column label="商品图" min-width="80">
      <template #default="{ row }">
-        <el-image :src="row.picUrl" class="w-30px h-30px" @click="imagePreview(row.picUrl)" />
+        <el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />
      </template>
    </el-table-column>
    <el-table-column :show-overflow-tooltip="true" label="商品名称" min-width="300" prop="name" />
--- a/src/views/mall/promotion/components/SpuSelect.vue
+++ b/src/views/mall/promotion/components/SpuSelect.vue
@@ -70,7 +70,7 @@
        <el-table-column key="id" align="center" label="商品编号" prop="id" />
        <el-table-column label="商品图" min-width="80">
          <template #default="{ row }">
-            <el-image :src="row.picUrl" class="w-30px h-30px" @click="imagePreview(row.picUrl)" />
+            <el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />
          </template>
        </el-table-column>
        <el-table-column
--- a/src/views/mall/promotion/coupon/template/CouponTemplateForm.vue
+++ b/src/views/mall/promotion/coupon/template/CouponTemplateForm.vue
@@ -26,7 +26,7 @@
        v-if="formData.productScope === PromotionProductScopeEnum.SPU.scope"
        prop="productSpuIds"
      >
-        <div class="flex items-center gap-1 flex-wrap">
+        <div class="flex flex-wrap items-center gap-1">
          <div class="select-box spu-pic" v-for="(spu, index) in productSpus" :key="spu.id">
            <el-image :src="spu.picUrl" />
            <Icon icon="ep:circle-close-filled" class="del-icon" @click="handleRemoveSpu(index)" />
@@ -62,7 +62,7 @@
        <el-input-number
          v-model="formData.discountPrice"
          placeholder="请输入优惠金额，单位：元"
-          class="!w-400px mr-2"
+          class="mr-2 !w-400px"
          :precision="2"
          :min="0"
        />
@@ -76,7 +76,7 @@
        <el-input-number
          v-model="formData.discountPercent"
          placeholder="优惠券折扣不能小于 1 折，且不可大于 9.9 折"
-          class="!w-400px mr-2"
+          class="mr-2 !w-400px"
          :precision="1"
          :min="1"
          :max="9.9"
@@ -91,7 +91,7 @@
        <el-input-number
          v-model="formData.discountLimitPrice"
          placeholder="请输入最多优惠"
-          class="!w-400px mr-2"
+          class="mr-2 !w-400px"
          :precision="2"
          :min="0"
        />
@@ -101,7 +101,7 @@
        <el-input-number
          v-model="formData.usePrice"
          placeholder="无门槛请设为 0"
-          class="!w-400px mr-2"
+          class="mr-2 !w-400px"
          :precision="2"
          :min="0"
        />
@@ -117,7 +117,7 @@
        <el-input-number
          v-model="formData.totalCount"
          placeholder="发放数量，没有之后不能领取或发放，-1 为不限制"
-          class="!w-400px mr-2"
+          class="mr-2 !w-400px"
          :precision="0"
          :min="-1"
        />
@@ -127,7 +127,7 @@
        <el-input-number
          v-model="formData.takeLimitCount"
          placeholder="设置为 -1 时，可无限领取"
-          class="!w-400px mr-2"
+          class="mr-2 !w-400px"
          :precision="0"
          :min="-1"
        />
@@ -423,22 +423,24 @@ const handleRemoveSpu = (index: number) => {
 <style scoped lang="scss">
 .select-box {
  display: flex;
-  align-items: center;
-  justify-content: center;
-  border: 1px dashed var(--el-border-color-darker);
-  border-radius: 8px;
  width: 60px;
  height: 60px;
+  border: 1px dashed var(--el-border-color-darker);
+  border-radius: 8px;
+  align-items: center;
+  justify-content: center;
 }
+
 .spu-pic {
  position: relative;
 }
+
 .del-icon {
  position: absolute;
+  top: -10px;
+  right: -10px;
  z-index: 1;
  width: 20px !important;
  height: 20px !important;
-  right: -10px;
-  top: -10px;
 }
 </style>
--- a/src/views/mall/promotion/seckill/activity/index.vue
+++ b/src/views/mall/promotion/seckill/activity/index.vue
@@ -36,7 +36,7 @@
      <template #spuId="{ row }">
        <el-image
          :src="row.picUrl"
-          class="w-30px h-30px align-middle mr-5px"
+          class="mr-5px h-30px w-30px align-middle"
          @click="imagePreview(row.picUrl)"
        />
        <span class="align-middle">{{ row.spuName }}</span>
--- a/src/views/mall/promotion/seckill/config/index.vue
+++ b/src/views/mall/promotion/seckill/config/index.vue
@@ -36,7 +36,7 @@
          v-for="(item, index) in row.sliderPicUrls"
          :key="index"
          :src="item"
-          class="w-60px h-60px mr-10px"
+          class="mr-10px h-60px w-60px"
          @click="imagePreview(row.sliderPicUrls)"
        />
      </template>
--- a/src/views/mall/trade/afterSale/detail/index.vue
+++ b/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>
--- a/src/views/mall/trade/afterSale/index.vue
+++ b/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>
--- a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
+++ b/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"
--- a/src/views/mall/trade/order/index.vue
+++ b/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>