修改页面

src/components/order/orderDetial.vue

@@ -85,8 +85,8 @@
                 </template>
               </el-table-column>
               <el-table-column label="商品分类" align="center" prop="categoryName" />
-              <el-table-column label="原售价" align="center" prop="price" />
-              <el-table-column label="折扣价" align="center" prop="discount" />
+              <el-table-column label="原售价" align="center" prop="amount" />
+              <el-table-column label="折扣价" align="center" prop="realAmount" />
               <el-table-column label="实付" align="center" prop="realAmount" />
               <el-table-column label="数量" align="center" prop="num" />              
             </el-table>  

src/views/customer/index.vue

@@ -40,7 +40,12 @@
           <el-table-column label="退款金额" align="center"  prop="refundAmount"/>   
           <el-table-column label="最近订单时间" align="center"  prop="lastOrderDate"/> 
           <el-table-column label="注册时间" align="center"  prop="createDate"/>      
-          <el-table-column label="来源" align="center"  prop="source"/>
+          <el-table-column label="来源" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.source=='3'">小程序</span>
+              <span v-if="scope.row.source=='12'">点单屏</span>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
           v-show="total > 0"
@@ -203,6 +208,10 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      if(this.createdTime.length>0){
+        this.queryParams.createAtStart=this.createdTime[0];
+        this.queryParams.createAtEnd=this.createdTime[1];
+      }
       this.queryParams.pageNum = 1;
       this.getList();
     },

src/views/shop/shop/components/recommend.vue

@@ -15,7 +15,7 @@
 			<el-table-column label="折扣价" align="center" prop="discount" />
 			<el-table-column label="原价" align="center" prop="price" />
 			<el-table-column label="总销售" align="center" prop="salesVolume" />
-      <el-table-column label="推荐时间" align="center" prop="recDate" />
+      <el-table-column label="推荐时间" align="center" prop="recommendDate" />
       <el-table-column label="推荐排序">
         <template slot-scope="scope">
           <div style="display: flex;">

src/views/system/user/index.vue

@@ -9,7 +9,7 @@
         >
         <el-form-item label="人员名称" prop="userName">
           <el-input
-            v-model="queryParams.userName"
+            v-model="queryParams.userInfo"
             placeholder="请输入姓名、手机号"
             clearable
             style="width: 240px"
@@ -180,9 +180,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined
+        userInfo: null,
+        status: null
       },  
       // 表单校验
       rules: {