Merge remote-tracking branch 'yudao/dev' into dev-to-dev

# Conflicts:
#	src/views/mall/product/spu/components/index.ts
#	src/views/mall/product/spu/form/BasicInfoForm.vue

src/views/mall/product/brand/index.vue

@@ -59,7 +59,7 @@
       <el-table-column label="品牌名称" prop="name" sortable />
       <el-table-column label="品牌图片" align="center" prop="picUrl">
         <template #default="scope">
-          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="品牌图片" class="h-100px" />
+          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="品牌图片" class="h-30px" />
         </template>
       </el-table-column>
       <el-table-column label="品牌排序" align="center" prop="sort" />

src/views/mall/product/category/index.vue

@@ -38,7 +38,7 @@
       <el-table-column label="分类名称" prop="name" sortable />
       <el-table-column label="移动端分类图" align="center" prop="picUrl">
         <template #default="scope">
-          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="移动端分类图" class="h-100px" />
+          <img v-if="scope.row.picUrl" :src="scope.row.picUrl" alt="移动端分类图" class="h-30px" />
         </template>
       </el-table-column>
       <el-table-column label="分类排序" align="center" prop="sort" />

src/views/mall/product/comment/index.vue

@@ -115,7 +115,7 @@
         :formatter="dateFormatter"
         width="170"
       />
-      <el-table-column label="状态" align="center" width="65px">
+      <el-table-column label="是否展示" align="center" width="80px">
         <template #default="scope">
           <el-switch
             v-model="scope.row.visible"

src/views/mall/product/property/value/index.vue

@@ -147,7 +147,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await PropertyApi.deleteProperty(id)
+    await PropertyApi.deletePropertyValue(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()

src/views/mall/product/spu/form/index.vue

@@ -189,7 +189,7 @@ const submitForm = async () => {
 /** 关闭按钮 */
 const close = () => {
   delView(unref(currentRoute))
-  push('/product/product-spu')
+  push({ name: 'ProductSpu' })
 }
 /** 初始化 */
 onMounted(async () => {

src/views/mall/product/spu/index.vue

@@ -170,6 +170,14 @@
           >
             详情
           </el-button>
+          <el-button
+            v-hasPermi="['product:spu:update']"
+            link
+            type="primary"
+            @click="openForm(row.id)"
+          >
+            修改
+          </el-button>
           <template v-if="queryParams.tabType === 4">
             <el-button
               v-hasPermi="['product:spu:delete']"
@@ -189,16 +197,6 @@
             </el-button>
           </template>
           <template v-else>
-            <!-- 只有不是上架和回收站的商品可以编辑 -->
-            <el-button
-              v-if="queryParams.tabType !== 0"
-              v-hasPermi="['product:spu:update']"
-              link
-              type="primary"
-              @click="openForm(row.id)"
-            >
-              修改
-            </el-button>
             <el-button
               v-hasPermi="['product:spu:update']"
               link

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

@@ -154,44 +154,41 @@ const getDetail = async () => {
     formData.value = await AfterSaleApi.getAfterSale(id)
   }
 }
-/**
+
- *  同意售后
+// TODO @puhui999：操作后，需要提示和刷新哈。
- */
+/** 同意售后 */
 const agree = () => {
   message.confirm('是否同意售后？').then(() => {
     AfterSaleApi.agree(formData.value.id)
   })
 }
-/**
+
- *  拒绝售后
+/** 拒绝售后 */
- */
 const disagree = () => {
   updateAuditReasonFormRef.value?.open(formData.value)
 }
-/**
+
- *  确认收货
+/** 确认收货 */
- */
 const receive = () => {
   message.confirm('是否确认收货？').then(() => {
     AfterSaleApi.receive(formData.value.id)
   })
 }
-/**
+
- *  拒绝收货
+/** 拒绝收货 */
- */
 const refuse = () => {
   message.confirm('是否拒绝收货？').then(() => {
     AfterSaleApi.refuse(formData.value.id)
   })
 }
-/**
+
- *  确认退款
+/** 确认退款 */
- */
 const refund = () => {
   message.confirm('是否确认退款？').then(() => {
     AfterSaleApi.refund(formData.value.id)
   })
 }
+
 /** 图片预览 */
 const imagePreview = (args) => {
   const urlList = []
@@ -206,6 +203,7 @@ const imagePreview = (args) => {
     urlList
   })
 }
+
 onMounted(async () => {
   await getDetail()
 })