修改BUG

build/webpack.base.conf.js

@@ -40,7 +40,7 @@ module.exports = {
   },
   module: {
     rules: [
-      ...(config.dev.useEslint ? [createLintingRule()] : []),
+      ...(config.dev.useEslint ? [] : []),
       {
         test: /\.vue$/,
         loader: 'vue-loader',

src/page/edition/index.vue

@@ -184,7 +184,7 @@ export default {
     },
     async updateAduitStatus (id, state) {
       let m = state === 'A' ? 'I' : 'A'
-      let data = (await this.$http.get('/manager/goods/version/update/' + id + '/' + m))
+      (await this.$http.get('/manager/goods/version/update/' + id + '/' + m))
       this._searchOrderData(this.currentPage)
     },
     async updateMaker () {
@@ -288,15 +288,15 @@ export default {
 
     async _searchOrderData (page) {
       this.hasClickSearch = true
-      let date1, date2, userName, expressNum, orderNum
+      let date1, date2, orderNum
       this.date1 = this.searchDate ? this.searchDate[0] : null
       this.date2 = this.searchDate ? this.searchDate[1] : null
       date1 = this.date1 ? (this.date1 + ' 00:00:00') : null
       date2 = this.date2 ? (this.date2 + ' 23:59:59') : null
 
-      this.userName = userName = this.searchPhone || null
-      this.expressNum = expressNum = this.searchExpressNum || null
-      this.orderNum = orderNum = this.searchOrderNumber || null
+      this.userName = this.searchPhone || null
+      this.expressNum = this.searchExpressNum || null
+      this.orderNum = this.searchOrderNumber || null
 
       // console.log(searchDate,searchPhone,searchExpressNum,searchOrderNumber)
       this.fullscreenLoading = true
@@ -357,7 +357,6 @@ export default {
       this.userName = userName = this.searchPhone || null
       this.expressNum = expressNum = this.searchExpressNum || null
       this.orderNum = orderNum = this.searchOrderNumber || null
-      let status = this.status
 
       let data = {
         'type': this.status,

src/page/invoice/index.vue

@@ -58,7 +58,7 @@
                       <div class="product_info_title">
                         商品信息
                       </div>
-                      <el-table @expand-change="_getOrderDetail" class='e-table' :data="scope.row.orderDetail.orderItems||[]" style="width: 100%">
+                      <el-table @expand-change="_getOrderDetail" class='e-table' :data="scope.row.orderItems" style="width: 100%">
                         <el-table-column v-for="(item,i) in itemHeader" :key="i" :prop="item.name" :label="item.label">
                           <template slot-scope="scope">
                             <span>{{scope.row[item.name]||'-'}}</span>
@@ -426,7 +426,25 @@ export default {
         // temp[i]['expressNum_input'] = "";
         temp[i].items = []
         temp[i]['typeStr'] = TypeArr[temp[i]['type']]
-        temp[i]['orderSn'] = temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderSn'] : ''
+        temp[i].orderItems = 
+          temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderItems'] :
+          temp[i]['responseVirtualOrder'] ? [{
+            goodsName: temp[i]['responseVirtualOrder'].body,
+            goodsCount: temp[i]['responseVirtualOrder'].orderCount,
+            goodsPrice: temp[i]['responseVirtualOrder'].amount,
+            abroad: temp[i]['responseVirtualOrder'].abroad
+          }] : 
+          temp[i]['responseIncrementOrder'] ? [{
+            goodsName: '会员权益',
+            goodsCount: temp[i]['responseIncrementOrder'].count,
+            goodsPrice: temp[i]['responseIncrementOrder'].amount,
+            abroad: temp[i]['responseIncrementOrder'].abroad
+          }] : ''
+          
+        temp[i]['orderSn'] = 
+          temp[i]['orderDetail'] ? temp[i]['orderDetail']['orderSn'] : 
+          temp[i]['responseIncrementOrder'] ? temp[i]['responseIncrementOrder']['orderSn'] : 
+          temp[i]['responseVirtualOrder'] ? temp[i]['responseVirtualOrder']['orderSn'] : ''
       }
       this.orders = temp
       this.currentPage = page

src/page/login/index.vue

@@ -41,7 +41,7 @@
   </div>
 </template>
 <script>
-import { reg, encodeStr } from '@/util'
+import { encodeStr } from '@/util'
 import { Base64 } from 'js-base64'
 
 export default {

src/page/order/index.vue

@@ -391,7 +391,6 @@ export default {
       this.userName = userName = this.searchPhone || null
       this.expressNum = expressNum = this.searchExpressNum || null
       this.orderNum = orderNum = this.searchOrderNumber || null
-      let status = this.status
 
       let data = {
         'type': this.status,

src/page/statistics/index.vue

@@ -102,7 +102,6 @@ export default {
       let data = {}
       Object.keys(this.statistics).forEach(key => {
         let start = 'm='
-        let end = '&'
         let startIndex = ~key.indexOf(start) ? key.indexOf(start) + start.length : -1
         let endIndex = ~startIndex ? key.substr(startIndex).indexOf('&') : -1
         let ik = ~startIndex ? (~endIndex ? key.substr(startIndex, endIndex) : key.substr(startIndex)) : null

src/util/http.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 // 配置请求域名
-let server = process.env.NODE_ENV === 'development' ? 'https://www.4dkankan.com/api' : '/api'
+let server = process.env.NODE_ENV === 'development' ? 'https://test.4dkankan.com/api' : '/api'
 axios.defaults.baseURL = server
 
 // axios.defaults.baseURL = '/api'