bug修复

src/views/system/cleanConsumer/index.vue

@@ -86,7 +86,7 @@
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="角色类型" align="center" prop="roleType" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.consumer_role_type" :value="scope.row.roleType"/>
+          <dict-tag :options="dict.type.wechat_role_type" :value="scope.row.roleType"/>
         </template>
       </el-table-column>
       <el-table-column label="性别" align="center" prop="sex">
@@ -156,7 +156,7 @@ import { listConsumer, getConsumer, delConsumer, addConsumer, updateConsumer } f
 
 export default {
   name: "Consumer",
-  dicts: ['sys_user_sex','consumer_role_type'],
+  dicts: ['sys_user_sex','wechat_role_type'],
   data() {
     return {
       // 遮罩层

src/views/system/consumer/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="px">
       <el-form-item label="用户昵称" prop="nickName">
         <el-input
           v-model="queryParams.nickName"
@@ -17,30 +17,36 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="会员性别" prop="gender">-->
+      <el-form-item label="会员性别" prop="sex">
+        <el-select
+          v-model="queryParams.sex"
+          placeholder="会员性别"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="充值余额" prop="amount">-->
 <!--        <el-input-->
-<!--          v-model="queryParams.gender"-->
-<!--          placeholder="请输入会员性别"-->
+<!--          v-model="queryParams.amount"-->
+<!--          placeholder="请输入充值余额"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="赠送余额" prop="freeAmount">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.freeAmount"-->
+<!--          placeholder="请输入赠送余额"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="充值余额" prop="amount">
-        <el-input
-          v-model="queryParams.amount"
-          placeholder="请输入充值余额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="赠送余额" prop="freeAmount">
-        <el-input
-          v-model="queryParams.freeAmount"
-          placeholder="请输入赠送余额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 <!--      <el-form-item label="消费次数" prop="totalTimes">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.totalTimes"-->
@@ -125,9 +131,9 @@
           <dict-tag :options="dict.type.wechat_role_type" :value="scope.row.roleType"/>
         </template>
       </el-table-column>
-      <el-table-column label="会员性别" align="center" prop="gender">
+      <el-table-column label="会员性别" align="center" prop="sex">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.gender"/>
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
       </el-table-column>
       <el-table-column label="详细地址" align="center" prop="addres" />
@@ -265,7 +271,7 @@ export default {
         phone: null,
         level: null,
         roleType: null,
-        gender: null,
+        sex: null,
         amount: null,
         freeAmount: null,
         totalTimes: null,

src/views/system/order/index.vue

@@ -79,29 +79,41 @@
       <el-form-item label="订单状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择订单状态" clearable>
           <el-option
-            v-for="dict in dict.type.store_order_status"
+            v-for="dict in dict.type.order_status_admin"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="开始时间" prop="startDate">
-        <el-date-picker clearable
-          v-model="queryParams.startDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endDate">
-        <el-date-picker clearable
-          v-model="queryParams.endDate"
-          type="date"
+      <el-form-item label="下单时间">
+        <el-date-picker
+          v-model="dateValue"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
+          :default-time="['00:00:00', '23:59:59']">
         </el-date-picker>
+
       </el-form-item>
+<!--      <el-form-item label="开始时间" prop="startDate">-->
+<!--        <el-date-picker clearable-->
+<!--          v-model="queryParams.startDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="请选择开始时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="结束时间" prop="endDate">-->
+<!--        <el-date-picker clearable-->
+<!--          v-model="queryParams.endDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="请选择结束时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -238,7 +250,7 @@
       </el-table-column>
       <el-table-column label="订单状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.store_order_status" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.order_status_admin" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime"  width="150">
@@ -395,7 +407,7 @@ import {queryCouponList} from "@/api/system/consumerCoupon";
 
 export default {
   name: "Order",
-  dicts: ['store_order_type', 'store_coupon_type', 'store_is_use_coupon', 'store_order_status','store_pay_ways','order_pay_status'],
+  dicts: ['store_order_type', 'store_coupon_type', 'store_is_use_coupon', 'store_order_status','store_pay_ways','order_pay_status','order_status_admin'],
   data() {
     return {
       // 遮罩层
@@ -426,6 +438,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      dateValue: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -515,6 +528,11 @@ export default {
     },
     /** 查询订单列表 */
     getList() {
+      // console.log(this.dateValue)
+      if (this.dateValue && this.dateValue.length > 0) {
+        this.queryParams.startDate = this.dateValue[0];
+        this.queryParams.endDate = this.dateValue[1];
+      }
       this.loading = true;
       listOrder(this.queryParams).then(response => {
         this.orderList = response.rows;
@@ -568,6 +586,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.dateValue = null;
       this.handleQuery();
     },
     // 多选框选中数据