From 3cd15fe9e1bc4c91f5587f95f8ad48b5eb868cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Mon, 4 Nov 2024 18:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=A0=E7=BE=8E,=E8=BF=94=E4=BD=A3,=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=B0=83=E6=95=B4,test=E7=8E=AF=E5=A2=83=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test                                    | 11 +++++++
 package.json                                 |  1 +
 src/views/product/addProduct/index.vue       | 31 +++++++++++---------
 src/views/product/productList/editAttr.vue   |  8 ++---
 src/views/product/productList/index.vue      |  6 +++-
 src/views/product/productList/proDetails.vue | 18 +++++++-----
 src/views/product/productList/taoBao.vue     |  8 ++---
 src/views/user/list/index.vue                |  6 ++--
 8 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 .env.test

diff --git a/.env.test b/.env.test
new file mode 100644
index 0000000..6bb96f4
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,11 @@
+NODE_ENV = production
+
+# just a flag
+ENV = 'test'
+
+# base api
+VUE_APP_BASE_API = ''
+
+VUE_APP_WS_URL = ''
+
+# VUE_APP_OPEN_HTTP_URL = 'http://test.tropjoin.com'
diff --git a/package.json b/package.json
index b633d22..802d086 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:test": "vue-cli-service build --mode test",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index a5839ce..d0155b3 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -81,17 +81,6 @@
               />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="24">
-            <el-form-item label="是否为惠美乡村:">
-              <el-radio-group
-                v-model="formValidate.is_huimei"
-                :disabled='virStatus'
-              >
-                <el-radio :label="1" class="radio">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="24">
             <el-form-item label="平台商品分类：" prop="cate_id">
               <el-cascader
@@ -107,7 +96,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="5">
             <el-form-item label="定制产品：">
               <el-radio-group
                 :disabled="virStatus"
@@ -121,6 +110,17 @@
               </div> -->
             </el-form-item>
           </el-col>
+          <el-col :span="19">
+            <el-form-item label="惠美乡村产品:">
+              <el-radio-group
+                v-model="formValidate.is_huimei"
+                :disabled="virStatus"
+              >
+                <el-radio :label="1" class="radio">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <!-- <el-col :span="24">
             <el-form-item label="商户商品分类：">
               <el-cascader
@@ -710,7 +710,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="其他资质：" prop="qualification.otherList">
+              <el-form-item
+                label="其他资质或惠美乡村文件："
+                prop="qualification.otherList"
+              >
                 <el-upload
                   class="upload-demo"
                   ref="otherList"
@@ -2535,7 +2538,7 @@ const defaultObj = {
   product_type: 0,
   qualification_type: 0,
   remark: "",
-  // is_huimei:0,
+  is_huimei: 0,
   audit_type: 0,
   qualification: {
     production_name: "",
diff --git a/src/views/product/productList/editAttr.vue b/src/views/product/productList/editAttr.vue
index 9345d86..eb2684e 100644
--- a/src/views/product/productList/editAttr.vue
+++ b/src/views/product/productList/editAttr.vue
@@ -157,7 +157,7 @@
                     <el-input-number v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.extension_type === 1">
+                <!-- <template v-if="formValidate.extension_type === 1">
                   <el-table-column align="center" label="一级返佣(元)" min-width="100">
                     <template slot-scope="scope">
                       <el-input-number v-model="scope.row.extension_one" :min="0" class="priceBox" controls-position="right"/>
@@ -168,7 +168,7 @@
                       <el-input-number v-model="scope.row.extension_two" :min="0" class="priceBox" controls-position="right"/>
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
               </el-table>
             </el-form-item>
             <el-form-item v-if="formValidate.spec_type === 1" class="labeltop" label="规格列表：">
@@ -196,7 +196,7 @@
                     <el-input-number v-else v-model="scope.row[iii]" :min="0" class="priceBox" controls-position="right"/>
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.extension_type === 1">
+                <!-- <template v-if="formValidate.extension_type === 1">
                   <el-table-column align="center" label="一级返佣(元)" min-width="100">
                     <template slot-scope="scope">
                       <el-input-number v-model="scope.row.extension_one" :min="0" class="priceBox" controls-position="right"/>
@@ -207,7 +207,7 @@
                       <el-input-number v-model="scope.row.extension_two" :min="0" class="priceBox" controls-position="right"/>
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
               </el-table>
             </el-form-item> 
             <el-form-item label="商品详情：">
diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index 401d7fb..751006e 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -342,7 +342,11 @@
             </div>
           </template>
         </el-table-column>
-
+        <el-table-column prop="store_name" label="惠美乡村产品" min-width="230">
+          <template slot-scope="scope">
+            {{ scope.row.is_huimei ? "是" : "否" }}
+          </template>
+        </el-table-column>
         <el-table-column prop="is_customize" label="定制产品" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.is_customize ? "是" : "否" }}
diff --git a/src/views/product/productList/proDetails.vue b/src/views/product/productList/proDetails.vue
index a30cea4..7d16a1d 100644
--- a/src/views/product/productList/proDetails.vue
+++ b/src/views/product/productList/proDetails.vue
@@ -190,6 +190,12 @@
                     </div>
                   </template>
                 </li>
+                <li class="item">
+                  <div class="item-title">惠美乡村产品：</div>
+                  <div class="value">
+                    {{ productData.is_huimei ? "是" : "否" }}
+                  </div>
+                </li>
               </ul>
               <ul v-if="productData.video_link" class="list">
                 <li class="item item100">
@@ -272,7 +278,7 @@
                         <span v-else class="priceBox" v-text="scope.row[iii]" />
                       </template>
                     </el-table-column>
-                    <template v-if="productData.extension_type === 1">
+                    <!-- <template v-if="productData.extension_type === 1">
                       <el-table-column
                         align="center"
                         label="一级返佣(元)"
@@ -297,7 +303,7 @@
                           />
                         </template>
                       </el-table-column>
-                    </template>
+                    </template> -->
                   </el-table>
                 </template>
                 <template v-if="productData.spec_type === 1">
@@ -349,7 +355,7 @@
                         }}</span>
                       </template>
                     </el-table-column>
-                    <template v-if="productData.extension_type === 1">
+                    <!-- <template v-if="productData.extension_type === 1">
                       <el-table-column
                         align="center"
                         label="一级返佣(元)"
@@ -372,7 +378,7 @@
                           }}</span>
                         </template>
                       </el-table-column>
-                    </template>
+                    </template> -->
                   </el-table>
                 </template>
               </div>
@@ -485,9 +491,7 @@
                   <div class="item-title">实际销量 ：</div>
                   <div class="value">
                     <span>
-                      {{
-                        productData.sales - productData.ficti
-                      }}
+                      {{ productData.sales - productData.ficti }}
                       (指实际售出数量)</span
                     >
                   </div>
diff --git a/src/views/product/productList/taoBao.vue b/src/views/product/productList/taoBao.vue
index 1099099..7bb4628 100644
--- a/src/views/product/productList/taoBao.vue
+++ b/src/views/product/productList/taoBao.vue
@@ -251,7 +251,7 @@
                     <el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.extension_type === 1">
+                <!-- <template v-if="formValidate.extension_type === 1">
                   <el-table-column align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
                       <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
@@ -262,7 +262,7 @@
                       <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
               </el-table>
             </el-form-item>
             <!-- 多规格表格-->
@@ -290,7 +290,7 @@
                     <el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" class="priceBox" />
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.extension_type === 1">
+                <!-- <template v-if="formValidate.extension_type === 1">
                   <el-table-column align="center" label="一级返佣(元)" min-width="120">
                     <template slot-scope="scope">
                       <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
@@ -301,7 +301,7 @@
                       <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
               </el-table>
             </el-form-item>
             <el-form-item label="商品详情：">
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index 66e240b..d0e0847 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -5,9 +5,9 @@
             <el-form-item label="用户昵称：" prop="nickname">
                 <el-input v-model="userFrom.nickname" placeholder="请输入昵称" clearable class="selWidth" @keyup.enter.native="getList(1)" />
             </el-form-item>
-            <!-- <el-form-item label="用户ID：" prop="uid">
+            <el-form-item label="用户ID：" prop="uid">
                 <el-input v-model="userFrom.uid" placeholder="请输入用户ID" clearable class="selWidth" @keyup.enter.native="getList(1)" />
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item label="用户标签：" prop="label_id">
                 <el-select v-model="userFrom.label_id" placeholder="请选择" class="selWidth" clearable filterable @change="getList(1)">
                     <el-option value="">全部</el-option>
@@ -82,7 +82,7 @@
               <el-checkbox :value="checkedIds.indexOf(scope.row.uid) > -1 || (chkName === 'duo' && noChecked.indexOf(scope.row.uid) === -1)" @change="(v)=>changeOne(v,scope.row)" />
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="uid" label="ID" min-width="60" /> -->
+          <el-table-column prop="uid" label="ID" min-width="60" />
           <el-table-column label="头像" min-width="50">
             <template slot-scope="scope">
                 <div class="demo-image__preview">