From a849d8906aa34d68df1540a9ae95ae94d7b73e95 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 12 Aug 2021 17:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E8=AF=A6=E6=83=85=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8A=95=E8=AF=89=E8=A7=84=E5=88=99=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB2=E7=BA=A7?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=B2=A1=E6=9C=89=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/memberCenter/ComplainList.vue        | 8 ++++----
 manager/src/views/goods/goods-manage/category.vue         | 2 +-
 seller/src/views/goods/goods-seller/goodsOperationSec.vue | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buyer/src/pages/home/memberCenter/ComplainList.vue b/buyer/src/pages/home/memberCenter/ComplainList.vue
index ad65726d..5e442efb 100644
--- a/buyer/src/pages/home/memberCenter/ComplainList.vue
+++ b/buyer/src/pages/home/memberCenter/ComplainList.vue
@@ -19,7 +19,7 @@
             <span>投诉单号:{{item.id}}</span>
             <span class="color999 ml_10">{{item.createTime}}</span>
             <span class="hover-pointer fontsize_12 eval-detail" @click="goDetail(item.id)">投诉详情</span>
-            <span class="hover-pointer fontsize_12 eval-detail" style="right: 90px" v-if="item.complainStatus != 'EXPIRED' && item.complainStatus != 'CANCEL'" @click="cancel(item.id)">取消投诉</span>
+            <span class="hover-pointer fontsize_12 eval-detail" style="right: 90px" v-if="item.complainStatus === 'APPLYING' || item.complainStatus === 'NEW'" @click="cancel(item.id)">取消投诉</span>
           </div>
           <Row class="order-item-view">
             <i-col span="12" class="item-view-name">
@@ -70,10 +70,10 @@ export default {
       statusLabel: { // 投诉状态
         NO_APPLY: '未申请',
         APPLYING: '申请中',
-        COMPLETE: '已完成，此时可申请',
-        EXPIRED: '已失效，不可申请',
+        COMPLETE: '已完成',
+        EXPIRED: '已失效',
         CANCEL: '已取消',
-        NEW: '申请中'
+        NEW: '新订单'
       },
       total: 0, // 投诉总数
       params: { // 请求参数
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index 9f55d894..c4803e9c 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -59,7 +59,7 @@
           <FormItem label="分类名称" prop="name">
             <Input v-model="formAdd.name" clearable style="width: 100%" />
           </FormItem>
-          <FormItem label="分类图标" prop="image" v-if="formAdd.level === 2">
+          <FormItem label="分类图标" prop="image" v-if="formAdd.level !== 1">
             <upload-pic-input v-model="formAdd.image" style="width: 100%"></upload-pic-input>
           </FormItem>
           <FormItem label="排序值" prop="sortOrder" style="width: 345px">
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index a248823c..5b08e6ba 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -19,7 +19,7 @@
               <Input v-model="baseInfoForm.sellingPoint" type="textarea" :rows="4" style="width: 260px"/>
             </FormItem>
             <FormItem label="商品品牌" prop="brandId">
-              <Select v-model="baseInfoForm.brandId" style="width: 200px">
+              <Select v-model="baseInfoForm.brandId" filterable style="width: 200px">
                 <Option v-for="item in brandList" :value="item.id" :key="item.id" :label="item.name"></Option>
               </Select>
             </FormItem>