1、代码优化

2、bug修复 3、数据库优化
2020-08-21 12:09:20 +08:00
parent 13f5d5348f
commit a02bd7eeda
61 changed files with 445 additions and 1077 deletions
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -5259,6 +5259,21 @@
        }
      }
    },
+    "dom7": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npm.taobao.org/dom7/download/dom7-2.1.5.tgz?cache=0&sync_timestamp=1594742476927&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdom7%2Fdownload%2Fdom7-2.1.5.tgz",
+      "integrity": "sha1-p5QRAXgAsx2EAAcM2uu/ySwfY3c=",
+      "requires": {
+        "ssr-window": "^2.0.0"
+      },
+      "dependencies": {
+        "ssr-window": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/ssr-window/download/ssr-window-2.0.0.tgz",
+          "integrity": "sha1-mMMBrvmVIzF/jWlhjwAQeRCW78Q="
+        }
+      }
+    },
    "domain-browser": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -15780,6 +15795,11 @@
        "tweetnacl": "~0.14.0"
      }
    },
+    "ssr-window": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/ssr-window/download/ssr-window-1.0.1.tgz",
+      "integrity": "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
+    },
    "ssri": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -16358,6 +16378,15 @@
        "upper-case": "^1.1.1"
      }
    },
+    "swiper": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npm.taobao.org/swiper/download/swiper-4.5.1.tgz",
+      "integrity": "sha1-7UOZjngM60eGEAecjSP9Ql7KY28=",
+      "requires": {
+        "dom7": "^2.1.3",
+        "ssr-window": "^1.0.1"
+      }
+    },
    "symbol-observable": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
@@ -16905,6 +16934,21 @@
      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
      "dev": true
    },
+    "tree": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npm.taobao.org/tree/download/tree-0.1.3.tgz",
+      "integrity": "sha1-FPulc9eFMAnEzO9E90CfrHFik48=",
+      "requires": {
+        "underscore": "^1.10.2"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npm.taobao.org/underscore/download/underscore-1.10.2.tgz",
+          "integrity": "sha1-c9aqNmjzGI5K2w8ZQ70Sz9fvqq8="
+        }
+      }
+    },
    "trim-newlines": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -17442,6 +17486,15 @@
      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
      "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
    },
+    "vue-awesome-swiper": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npm.taobao.org/vue-awesome-swiper/download/vue-awesome-swiper-3.1.3.tgz",
+      "integrity": "sha1-BVALUB/7P+yb9+uZhbz0roNg7Z4=",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "swiper": "^4.0.7"
+      }
+    },
    "vue-count-to": {
      "version": "1.0.13",
      "resolved": "https://registry.npmjs.org/vue-count-to/-/vue-count-to-1.0.13.tgz",
--- a/admin/package.json
+++ b/admin/package.json
@@ -57,8 +57,8 @@
    "js-cookie": "2.2.0",
    "jsonlint": "1.6.3",
    "jszip": "3.2.1",
-    "node-sass": "^4.13.1",
    "monaco-editor": "^0.20.0",
+    "node-sass": "^4.13.1",
    "normalize.css": "7.0.0",
    "nprogress": "0.2.0",
    "path-to-regexp": "2.4.0",
@@ -68,6 +68,7 @@
    "showdown": "1.9.0",
    "sortablejs": "1.8.4",
    "throttle-debounce": "^2.1.0",
+    "tree": "^0.1.3",
    "tui-editor": "1.3.3",
    "vue": "2.6.10",
    "vue-awesome-swiper": "^3.1.3",
--- a/admin/src/utils/request.js
+++ b/admin/src/utils/request.js
@@ -49,6 +49,18 @@ service.interceptors.response.use(
  response => {
    const res = response.data
    // if the custom code is not 20000, it is judged as an error.
+    if (res.code === 401) {
+      // to re-login
+      MessageBox.confirm('您已经登出，您可以取消停留在这个页面，或重新登录', '退出', {
+        confirmButtonText: '或重新登录',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        store.dispatch('user/resetToken').then(() => {
+          location.reload()
+        })
+      })
+    }
    if (res.code !== 200) {
      Message({
        message: res.message || 'Error',
@@ -57,19 +69,7 @@ service.interceptors.response.use(
      })

      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 401) {
-        // to re-login
-        MessageBox.confirm('您已经登出，您可以取消停留在这个页面，或重新登录', '退出', {
-          confirmButtonText: '或重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
-      return Promise.reject(new Error(res.message || 'Error'))
+      // return Promise.reject(new Error(res.message || 'Error'))
    } else {
      return res.data
    }
--- a/admin/src/views/login/index.vue
+++ b/admin/src/views/login/index.vue
@@ -121,7 +121,7 @@ export default {
      },
      loginForm: {
        account: 'demo', // admin
-        pwd: '123456',
+        pwd: 'crmeb.com',
        key: '',
        code: ''
      },
--- a/admin/src/views/order/index.vue
+++ b/admin/src/views/order/index.vue
@@ -95,12 +95,12 @@
          min-width="400"
        >
          <template slot-scope="scope">
-            <div v-if="scope.row.productList.length">
+            <div v-if=" scope.row.productList && scope.row.productList.length">
              <div v-for="(val, i ) in scope.row.productList" :key="i" class="tabBox acea-row row-middle">
                <div class="demo-image__preview">
                  <el-image
                    :src="val.info.productInfo.image"
-                    :preview-src-list="imgList"
+                    :preview-src-list="[val.info.productInfo.image]"
                  />
                </div>
                <span class="tabBox_tit mr10">{{ val.info.productInfo.storeName + ' | ' }}{{ val.info.productInfo.attrInfo.suk ? val.info.productInfo.attrInfo.suk:'-' }}</span>
@@ -308,7 +308,6 @@
          isCreate: 1,
          editData: null,
          dialogVisible: false,
-          imgList: [],
          tableData: {
            data: [],
            total: 0
@@ -508,11 +507,6 @@
          this.tableData.data = res.list.list || []
          this.tableData.total = res.list.total
          this.orderChartType = res.status
-          this.tableData.data.map((item) => {
-            item.productList.map((i) => {
-              this.imgList.push(i.info.productInfo.image)
-            })
-          })
          const stat = res.top
          this.cardLists = [
            { name: '订单数量', count: stat.count },
--- a/admin/src/views/order/orderSend.vue
+++ b/admin/src/views/order/orderSend.vue
@@ -69,7 +69,7 @@
            },
            // 物流公司列表
            getList () {
-              expressList({ page: 1, limit: 999, isShow:true }).then(async res => {
+              expressList({ page: 1, limit: 999, isShow:1 }).then(async res => {
                    this.express = res.list
                })
            },
--- a/admin/src/views/store/creatStore/index.vue
+++ b/admin/src/views/store/creatStore/index.vue
@@ -237,12 +237,12 @@
                <template v-if="formValidate.isSub">
                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
+                      <el-input v-model="scope.row.brokerage" type="number" :min="0" class="priceBox" />
                    </template>
                  </el-table-column>
                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
+                      <el-input v-model="scope.row.brokerageTwo" type="number" :min="0" class="priceBox" />
                    </template>
                  </el-table-column>
                </template>
@@ -276,12 +276,12 @@
                <template v-if="formValidate.isSub">
                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
+                      <el-input v-model="scope.row.brokerage" type="number" :min="0" class="priceBox" />
                    </template>
                  </el-table-column>
                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
+                      <el-input v-model="scope.row.brokerageTwo" type="number" :min="0" class="priceBox" />
                    </template>
                  </el-table-column>
                </template>
@@ -315,12 +315,12 @@
                <template v-if="formValidate.isSub">
                  <el-table-column align="center" label="一级返佣(元)" min-width="120">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
+                      <el-input v-model="scope.row.brokerage" type="number" :min="0" class="priceBox" />
                    </template>
                  </el-table-column>
                  <el-table-column align="center" label="二级返佣(元)" min-width="120">
                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
+                      <el-input v-model="scope.row.brokerageTwo" type="number" :min="0" class="priceBox" />
                    </template>
                  </el-table-column>
                </template>
@@ -735,23 +735,23 @@
      onChangetype(item) {
        if (item === 1) {
          this.OneattrValue.map(item => {
-            this.$set(item, 'extension_one', null)
-            this.$set(item, 'extension_two', null)
+            this.$set(item, 'brokerage', null)
+            this.$set(item, 'brokerageTwo', null)
          })
          this.ManyAttrValue.map(item => {
-            this.$set(item, 'extension_one', null)
-            this.$set(item, 'extension_two', null)
+            this.$set(item, 'brokerage', null)
+            this.$set(item, 'brokerageTwo', null)
          })
        } else {
          this.OneattrValue.map(item => {
-            delete item.extension_one
-            delete item.extension_two
-            this.$set(item, 'extension_one', null)
-            this.$set(item, 'extension_two', null)
+            delete item.brokerage
+            delete item.brokerageTwo
+            this.$set(item, 'brokerage', null)
+            this.$set(item, 'brokerageTwo', null)
          })
          this.ManyAttrValue.map(item => {
-            delete item.extension_one
-            delete item.extension_two
+            delete item.brokerage
+            delete item.brokerageTwo
          })
        }
      },
@@ -772,8 +772,8 @@
          this.$set(val, 'barCode', this.oneFormBatch[0].barCode)
          this.$set(val, 'weight', this.oneFormBatch[0].weight)
          this.$set(val, 'volume', this.oneFormBatch[0].volume)
-          this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
-          this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
+          this.$set(val, 'brokerage', this.oneFormBatch[0].brokerage)
+          this.$set(val, 'brokerageTwo', this.oneFormBatch[0].brokerageTwo)
        }
      },
      // 添加按钮