订单报表功能支持

.env.dev

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 后台管理系统
 
 # 后台管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.10.113:48080'
+VUE_APP_BASE_API = 'http://192.168.18.147:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/utils/request.js

@@ -15,7 +15,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API + '/admin-api/', // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
   // 超时
-  timeout: 10000
+  timeout: 50000
 })
 // request拦截器
 service.interceptors.request.use(config => {

src/views/bxg/shop/order/index.vue

@@ -36,7 +36,8 @@
         <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
           <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
         </el-select>
-        <el-select v-model="orderType" clearable placeholder="订单类型" class="filter-item" style="width: 130px">
+        <el-select v-model="orderType"
+                   clearable placeholder="订单类型" class="filter-item" style="width: 130px">
           <el-option
             v-for="item in typeOptions"
             :key="item.value"
@@ -47,7 +48,7 @@
         <el-date-picker
           v-model="createTime"
           :default-time="['00:00:00','23:59:59']"
-          type="daterange"
+          type="datetimerange"
           range-separator=":"
           size="small"
           class="date-item"
@@ -145,6 +146,7 @@
             <span v-html="scope.row.statusName"></span>
           </template>
         </el-table-column>
+        <el-table-column prop="mark" label="订单备注" />
         <el-table-column prop="addTime" width="160" label="创建时间">
           <template slot-scope="scope">
             <span>{{ formatTime(scope.row.createTime) }}</span>
@@ -283,7 +285,7 @@
       return {
         delLoading: false,
         status: '-9',
-        orderType: '0',
+        orderType: 0,
         createTime: '',
         checkList: [],
         printChecked: false,
@@ -293,7 +295,9 @@
         queryTypeOptions: [
           { key: 'orderId', display_name: '订单号' },
           { key: 'realName', display_name: '用户姓名' },
-          { key: 'userPhone', display_name: '用户电话' }
+          { key: 'userPhone', display_name: '用户电话' },
+          { key: 'userAddress', display_name: '用户地址' }
+
         ],
         statusOptions: [
           { value: '0', label: '未支付' },