edit

src/views/order/index.vue

@@ -128,7 +128,7 @@
           <el-button size="small">导入批量发货</el-button>
         </el-upload>
         <el-button size="small" @click="getDeliveryList">批量发货记录</el-button>
-        <el-button size="small" @click="batchSend">批量发送货</el-button>
+        <!-- <el-button size="small" @click="batchSend">批量发送货</el-button> -->
       </div>
       <el-table v-loading="listLoading" :data="tableData.data" size="small" class="table mt20" highlight-current-row :cell-class-name="addTdClass">
         <el-table-column type="expand">

src/views/order/orderDetails.vue

@@ -92,10 +92,10 @@
                     }}
                   </div>
                 </li>
-                <li class="item">
+                <!-- <li class="item">
                   <div>用户ID：</div>
                   <div class="value">{{ orderDetailList.user.uid ? orderDetailList.user.uid : '-' }}</div>
-                </li>
+                </li> -->
                 <li class="item">
                   <div>绑定电话：</div>
                   <div class="value">{{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }}</div>
@@ -167,7 +167,7 @@
                   <div>上级推广人：</div>
                   <div class="value">{{ orderDetailList.TopSpread.nickname }}</div>
                 </li>
-                <li v-if="!orderDetailList.activity_type" class="item">
+                <!-- <li v-if="!orderDetailList.activity_type" class="item">
                   <div>一级佣金：</div>
                   <div class="value">
                     {{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }}
@@ -180,11 +180,11 @@
                     {{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }}
                     <em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>
                   </div>
-                </li>
+                </li> -->
-                 <li class="item">
+                 <!-- <li class="item">
                   <div>赠送积分：</div>
                   <div class="value">{{orderDetailList.give_integral || '-'}}</div>
-                </li>
+                </li> -->
                 <li class="item">
                   <div>发货方式：</div>
                   <div v-if="orderDetailList.order_type == 1" class="value">核销</div>

src/views/product/addProduct/index.vue

@@ -70,7 +70,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="是否为惠美乡村:">
               <el-radio-group
                 v-model="formValidate.is_huimei"
@@ -80,7 +80,7 @@
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="平台商品分类：" prop="cate_id">
               <el-cascader
@@ -2138,7 +2138,7 @@ const defaultObj = {
   product_type: 0,
   qualification_type: 0,
   remark: '',
-  is_huimei:0,
+  // is_huimei:0,
   audit_type:0,
   qualification: {
     production_name: '',
@@ -3722,7 +3722,7 @@ export default {
         extend: info.extend || [],
         svip_price_type: info.svip_price_type || 0,
         qualification:info.qualification || Object.assign({}, defaultObj.qualification),
-        is_huimei:info.is_huimei
+        // is_huimei:info.is_huimei
       };
       console.log(info.qualification);
       if (info.svip_price_type != 0 && info.mer_svip_status)

src/views/product/productList/index.vue

@@ -80,7 +80,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="关键字：" prop="keyword">
-          <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，关键字" class="selWidth" clearable @keyup.enter.native="getList(1)" />
+          <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，ID号" class="selWidth" clearable @keyup.enter.native="getList(1)" />
         </el-form-item>
         <el-form-item label="商品类型：" prop="is_ficti">
           <el-select v-model="tableFrom.is_ficti" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
@@ -103,6 +103,22 @@
           clearable
         />
         </el-form-item>
+        <el-form-item label="审核时间：" prop="update_date">
+          <el-date-picker
+          v-model="updateTimeVal"
+          value-format="yyyy/MM/dd"
+          format="yyyy/MM/dd"
+          type="daterange"
+          placement="bottom-end"
+          placeholder="自定义时间"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 280px;"
+          :picker-options="pickerOptions"
+          @change="onchangeUpdateTime"
+          clearable
+        />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
           <el-button size="small" @click="searchReset()">重置</el-button>
@@ -575,6 +591,7 @@ export default {
       labelList: [],
       tempList: [],
       timeVal: [],
+      updateTimeVal:[],
       listLoading: true,
       tableData: {
         data: [],
@@ -673,6 +690,12 @@ export default {
       this.timeVal = e
       this.tableFrom.date = e ? this.timeVal.join('-') : ''
       this.getList(1)
+    },
+      // 审核日期
+    onchangeUpdateTime(e) {
+      this.updateTimeVal = e
+      this.tableFrom.update_date = e ? this.updateTimeVal.join('-') : ''
+      this.getList(1)
     },
     /** 重置 */
     searchReset() {

src/views/product/productList/proDetails.vue

@@ -311,10 +311,10 @@
             <div class="section">
               <ul class="list">
                 <li class="audit" v-if="productData.refusal">
-                  <div class="item-title">审核拒绝原因：</div>
+                  <div class="item-title">{{productData.status==0?'锁定原因':'审核拒绝原因'}}：</div>
                   <div style="margin-left: 100px;" class="value">{{productData.refusal || ''}}</div>
                 </li>
-                <li class="item item100">
+                <li class="item item100" v-if="productData.status!=0">
                   <div class="item-title">佐证图片：</div>
                   <el-image v-for="(item,index) in productData.status_img" :key="index" :src="item" style="width:40px;height:40px;margin-right:12px;" :preview-src-list="productData.status_img" />
                 </li>  

src/views/user/list/index.vue

@@ -5,16 +5,16 @@
             <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>
                     <el-option v-for="(item, index) in labelLists" :key="index" :value="item.label_id" :label="item.label_name" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="用户性别：" prop="sex">
+            <!-- <el-form-item label="用户性别：" prop="sex">
                 <el-select v-model="userFrom.sex" placeholder="请选择" class="selWidth" clearable filterable @change="getList(1)">
                     <el-option value="">全部</el-option>
                     <el-option value="1" label="男" />
@@ -28,7 +28,7 @@
                     <el-option value="1" label="推广员" />
                     <el-option value="0" label="普通用户" />
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="访问情况：" prop="user_time_type">
                 <el-select v-model="userFrom.user_time_type" placeholder="请选择" class="selWidth" clearable  @change="getList(1)">
                     <el-option value="visit" label="最后访问" />
@@ -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">

src/views/user/list/userDetails.vue

@@ -71,7 +71,7 @@ export default {
       Visible: false,
       list: [
         { val: '0', label: '消费记录' },
-        { val: '3', label: '持有优惠券' }
+        // { val: '3', label: '持有优惠券' }
       ],
       tableData: {
         data: [],

src/views/user/search/index.vue

@@ -40,11 +40,11 @@
             </el-tabs>
         </div>
         <el-table v-loading="listLoading" :data="tableData.data" size="small" >         
-            <el-table-column prop="uid" label="用户ID" min-width="60">
+            <!-- <el-table-column prop="uid" label="用户ID" min-width="60">
                 <template slot-scope="scope">
                     <span>{{scope.row.uid !=0 ? scope.row.uid : '未知'}}</span>
                 </template>
-            </el-table-column> 
+            </el-table-column>  -->
             <el-table-column label="头像" min-width="50">
                 <template slot-scope="scope">
                     <div class="demo-image__preview">