Merge branch 'master' of

.env.development

@@ -3,8 +3,9 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
- VUE_APP_BASE_API = 'http://192.168.1.22:9104'
-#VUE_APP_BASE_API = 'http://127.0.0.1:8108'
+
+VUE_APP_BASE_API = 'http://192.168.1.22:9104'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9104'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

.env.staging

@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
 

src/views/club/list.vue

@@ -22,12 +22,14 @@
             v-model="listQuery.startTime"
             type="datetime"
             placeholder="选择日期时间"
+            @change="handleFilter"
           />
           至
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
             placeholder="选择日期时间"
+            @change="handleFilter"
           />
         </el-form-item>
         <el-form-item style="width:100px;float: left;">

src/views/goods/list-commonly.vue

@@ -31,6 +31,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
     >
       <el-table-column align="center" label="序号" width="50px">

src/views/goods/list-preferential.vue

@@ -31,6 +31,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
     >
       <el-table-column align="center" label="序号" width="50px">

src/views/goods/list-preferred.vue

@@ -31,6 +31,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
     >
       <el-table-column align="center" label="序号" width="50px">

src/views/goods/list-select.vue

@@ -31,6 +31,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
       style="width:100%;margin-top:20px;"
       @selection-change="handleSelectionChange"
     >

src/views/goods/list.vue

@@ -48,36 +48,36 @@
       style="width:100%;margin-top:20px;"
       :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
-      <el-table-column align="center" label="序号" width="50px">
+      <el-table-column align="center" label="序号" width="35">
         <template slot-scope="scope">
           {{ scope.$index }}
         </template>
       </el-table-column>
-      <el-table-column label="商品ID" align="center" prop="id" width="70px" />
+      <el-table-column label="商品ID" align="center" prop="id" width="70" />
       <el-table-column label="商品图片" align="center" prop="mainImage">
         <template slot-scope="{row}">
           <img :src="row.mainImage" alt="" width="50">
         </template>
       </el-table-column>
-      <el-table-column label="商品名称" align="center" prop="productName" min-width="200px" />
-      <el-table-column label="供应商" align="center" prop="shopName" min-width="120px" />
+      <el-table-column label="商品名称" align="center" prop="productName" min-width="200" />
+      <el-table-column label="供应商" align="center" prop="shopName" min-width="120" />
       <el-table-column label="市场价" align="center" prop="normalPrice" />
       <el-table-column label="成本价" align="center" prop="costPrice" />
       <el-table-column label="售价" align="center" prop="retailPrice" />
       <el-table-column label="起订量" align="center" prop="minBuyNumber" />
-      <el-table-column label="星范优选" align="center" prop="preferredProduct">
+      <el-table-column label="星范优选" align="center" prop="preferredProduct" width="50">
         <template slot-scope="{row}">
           <!--<el-tag :type="row.preferredProduct | statusFilter">{{ row.preferredProduct*1 === 1 ? '启用' : '停用' }}</el-tag>-->
           <i v-if="row.preferredProduct*1 === 1" class="el-icon-success" type="success" />
         </template>
       </el-table-column>
-      <el-table-column label="星范精品" align="center" prop="preferentialProduct">
+      <el-table-column label="星范精品" align="center" prop="preferentialProduct" width="50">
         <template slot-scope="{row}">
           <!--<el-tag :type="row.preferentialProduct | statusFilter">{{ row.preferentialProduct*1 === 1 ? '启用' : '停用' }}</el-tag>-->
           <i v-if="row.preferentialProduct*1 === 1" class="el-icon-success" type="success" />
         </template>
       </el-table-column>
-      <el-table-column label="常用商品" align="center" prop="commonlyProduct">
+      <el-table-column label="常用商品" align="center" prop="commonlyProduct" width="50">
         <template slot-scope="{row}">
           <!--<el-tag :type="row.commonlyProduct | statusFilter">{{ row.commonlyProduct*1 === 1 ? '启用' : '停用' }}</el-tag>-->
           <i v-if="row.commonlyProduct*1 === 1" class="el-icon-success" type="success" />

src/views/order/list.vue

@@ -14,6 +14,7 @@
             placeholder="下单时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
+            @change="handleFilter"
           />
           至
           <el-date-picker
@@ -23,6 +24,7 @@
             placeholder="下单时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
+            @change="handleFilter"
           />
         </el-form-item>
         <el-select v-model="listQuery.status" placeholder="订单状态" clearable style="width: 110px" class="filter-item" value="" @change="handleFilter">
@@ -68,6 +70,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">

src/views/order/refund-record.vue

@@ -62,6 +62,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">
@@ -92,6 +93,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">

src/views/order/refund.vue

@@ -19,6 +19,7 @@
             placeholder="申请时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
+            @change="handleFilter"
           />
           至
           <el-date-picker
@@ -28,6 +29,7 @@
             placeholder="申请时间"
             format="yyyy/MM/dd"
             value-format="yyyy-MM-dd"
+            @change="handleFilter"
           />
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
@@ -41,6 +43,7 @@
       border
       fit
       highlight-current-row
+      :header-cell-style="{background:'#eef1f6',color:'#606266'}"
     >
       <el-table-column align="center" label="序号" width="50">
         <template slot-scope="scope">

vue.config.js

@@ -24,9 +24,10 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production'
+  /* publicPath: process.env.NODE_ENV === 'production'
     ? '/vue-admin/'
-    : '/',
+    : '/', */
+  publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',