Преглед изворни кода

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy

lilei пре 4 година
родитељ
комит
f74a537852

+ 202 - 25
package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "chelingzhu",
-  "version": "2.0.0",
+  "name": "zxyj",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3147,8 +3147,7 @@
     "base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
     "batch": {
       "version": "0.6.1",
@@ -3441,11 +3440,29 @@
         }
       }
     },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "buffer-indexof": {
       "version": "1.1.1",
@@ -4079,7 +4096,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -4087,8 +4103,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
       "version": "1.5.3",
@@ -5483,6 +5498,11 @@
         "randombytes": "^2.0.0"
       }
     },
+    "dijkstrajs": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz",
+      "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
+    },
     "dir-glob": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
@@ -5744,8 +5764,7 @@
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "emojis-list": {
       "version": "2.1.0",
@@ -8571,8 +8590,7 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -8980,8 +8998,7 @@
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
     },
     "is-generator-fn": {
       "version": "1.0.0",
@@ -12722,8 +12739,7 @@
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -12885,6 +12901,11 @@
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
       "dev": true
     },
+    "pngjs": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
+    },
     "point-at-length": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/point-at-length/-/point-at-length-1.0.2.tgz",
@@ -13812,6 +13833,166 @@
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
+    "qrcode": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz",
+      "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==",
+      "requires": {
+        "buffer": "^5.4.3",
+        "buffer-alloc": "^1.2.0",
+        "buffer-from": "^1.1.1",
+        "dijkstrajs": "^1.0.1",
+        "isarray": "^2.0.1",
+        "pngjs": "^3.3.0",
+        "yargs": "^13.2.4"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+        },
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -14260,8 +14441,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-main-filename": {
       "version": "1.0.1",
@@ -14678,8 +14858,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-value": {
       "version": "2.0.1",
@@ -17172,8 +17351,7 @@
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
     "window-size": {
       "version": "0.1.0",
@@ -17281,8 +17459,7 @@
     "y18n": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
     },
     "yallist": {
       "version": "3.1.1",

+ 2 - 1
src/api/order.js

@@ -47,6 +47,7 @@ export const orderExport = (params) => {
   return axios.request({
     url: '/order/exportExcel',
     data: params,
-    method: 'post'
+    method: 'post',
+    responseType: 'blob'
   })
 }

+ 1 - 1
src/permission.js

@@ -37,7 +37,7 @@ router.beforeEach((to, from, next) => {
         })
       }
       console.log(store.getters.roles)
-      if (store.getters.roles.permissionList.length === 0) {
+      if (store.getters.roles.permissionList.length === 0 && (token != 'null')) {
         store
           .dispatch('GetInfo', token)
           .then(res => {

+ 43 - 31
src/views/businessManage/partnerManage/partnerManage.vue

@@ -41,7 +41,7 @@
           class="actionBtn icon-blues"
           @click="handleEdit(record)" />
 
-        <a-icon type="qrcode" title="查看小程序码" @click="getQrCode(record)" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" v-hasPermission="'B_partnerManage_QRcode'" />
+        <a-icon type="qrcode" title="查看二维码" @click="getQrCode(record)" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" v-hasPermission="'B_partnerManage_QRcode'" />
         <span v-if="!($hasPermissions('B_partnerManage_edit') && record.state==0) && !$hasPermissions('B_partnerManage_QRcode') ">--</span>
       </span>
       <span slot="state" slot-scope="text, record">
@@ -61,23 +61,25 @@
     <!-- 查看小程序码 -->
     <a-modal
       class="qrCodeModal"
-      title="查看小程序码"
+      title="查看二维码"
       :width="500"
       :footer="null"
+      :shName="shName"
       :destroyOnClose="true"
       @cancel="isQrCodeModal = false"
       v-model="isQrCodeModal">
       <img :src="qrCode" width="400" height="400" class="qrCode" />
-      <a-button type="primary" class="downQrCode" @click="downloadCode">下载小程序码</a-button>
+      <a-button type="primary" class="downQrCode" @click="downloadCode">下载二维码</a-button>
+      <!-- <a-button type="primary" class="downQrCode" @click="downloadCode">下载小程序码</a-button> -->
     </a-modal>
   </a-card>
 </template>
 
 <script>
-import moment from 'moment'
 import { Upload, STable, VSelect } from '@/components'
-import { getSellerList, changeSellerStatus, sellerQrCode } from '@/api/businessManage.js'
+import { getSellerList, changeSellerStatus } from '@/api/businessManage.js'
 import addPartnerModal from './addPartnerModal.vue'
+import QRCode from 'qrcode'
 export default {
   components: {
     STable,
@@ -96,6 +98,7 @@ export default {
 	  qrCode: '',
 	  itemId: null, // 编辑行id
 	  itemData: {}, // 编辑行数据
+	  shName: '', // 商户名称
       // 表头
       columns: [
         {
@@ -154,13 +157,6 @@ export default {
       loadData: parameter => {
 		  const searchData = Object.assign(parameter, this.queryParam)
 		  console.log(this.queryOrderDate, 'this.queryOrderDate')
-		  // if (this.queryOrderDate && this.queryOrderDate.length) {
-		  //   searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-		  //   searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-		  // } else {
-		  //   searchData.beginDate = ''
-		  //   searchData.endDate = ''
-		  // }
         return getSellerList(
           searchData
         ).then(res => {
@@ -188,10 +184,6 @@ export default {
     }
   },
   methods: {
-	  // 禁止不可选日期
-	  // disabledDate (current) {
-	  //   return current && current > moment().endOf('day')
-	  // },
     showModal () {
       this.itemId = null
 	  this.itemData = {}
@@ -210,10 +202,7 @@ export default {
     },
     // 重置
     resetForm () {
-      // this.queryOrderDate = undefined
       this.queryParam.name = ''
-	  // this.queryParam.beginDate = ''
-	  // this.queryParam.endDate = ''
 	  this.queryParam.contactPhone = ''
       this.$refs.table.refresh(true)
     },
@@ -234,22 +223,45 @@ export default {
     	  }
       })
     },
-    // 查看小程序
+    // 查看二维
     getQrCode (item) {
-	  sellerQrCode({ officialPartnerNo: item.officialPartnerNo }).then(res => {
-	    if (res.status == 200) {
-	      this.qrCode = 'data:image/png;base64,' + res.data
-	      this.isQrCodeModal = true
-	    } else {
-	      this.qrCode = ''
-	    }
-	  })
+      const _this = this
+      const opts = {
+        errorCorrectionLevel: 'H',
+        type: 'image/jpeg',
+        quality: 0.3,
+        margin: 1.5,
+        width: 240,
+        color: {
+          dark: '#000000',
+          light: '#ffffff'
+        }
+      }
+	  const url = 'officialPartnerNo=' + item.officialPartnerNo + '&codeType=hexiao'
+	  _this.shName = item.name
+      if (url) {
+        QRCode.toDataURL(url, opts, function (err, url) {
+          _this.qrCode = url
+		  _this.isQrCodeModal = true
+        })
+      }
     },
-    //  下载小程序码
-    downloadCode () {
+    // 查看小程序码
+    //  getQrCode (item) {
+	  // sellerQrCode({ officialPartnerNo: item.officialPartnerNo }).then(res => {
+	  //   if (res.status == 200) {
+	  //     this.qrCode = 'data:image/png;base64,' + res.data
+	  //     this.isQrCodeModal = true
+	  //   } else {
+	  //     this.qrCode = ''
+	  //   }
+	  // })
+    //  },
+    //  下载二维码
+    downloadCode (item) {
 	  const link = document.createElement('a')
 	  link.href = this.qrCode
-	  link.download = 'qrCode.png'
+	  link.download = this.shName + '.png'
 	  link.click()
     }
   }

+ 0 - 1
src/views/businessManage/userManage/userManage.vue

@@ -58,7 +58,6 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal" v-hasPermission="'B_userManage_add'">新增</a-button>
     </div>

+ 14 - 8
src/views/equipmentManage/boxSetting/AddBoxModal.vue

@@ -1,5 +1,13 @@
 <template>
   <div>
+    <v-select
+      id="addBoxModal-status"
+      ref="rubbishType"
+      code="RUBBISH_TYPE"
+      placeholder="请选择分类"
+      v-show="false"
+    >
+    </v-select>
     <a-modal
       class="modalBox"
       :title="titleText"
@@ -84,15 +92,13 @@
                 trigger: ['change'],
               }"
             >
-              <v-select
-                id="addBoxModal-status"
-                ref="orderStatus"
-                code="RUBBISH_TYPE"
+              <a-select
+                :id="'addBoxModal-status' + index"
                 placeholder="请选择分类"
                 allowClear
-                v-model="item.rubbishType"
-              >
-              </v-select>
+                v-model="item.rubbishType">
+                <a-select-option v-for="item in $refs.rubbishType.getOptionDatas()" :key="item.code" :value="item.code">{{ item.dispName }}</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -158,7 +164,7 @@ export default {
       for (let i = 0; i < v; i++) {
         this.formData.deviceTypeBoxList.push({
           maxWeight: '',
-          rubbishType: '',
+          rubbishType: undefined,
           boxCode: i + 1
         })
       }

+ 0 - 1
src/views/equipmentManage/network/network.vue

@@ -36,7 +36,6 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
       <a-button v-if="$hasPermissions('B_network_add')" class="add-btn" id="network-btn-add" type="primary" @click="handleEdit">新增网点</a-button>
     </div>

+ 1 - 2
src/views/power/role/roleList.vue

@@ -27,9 +27,8 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_power_role_add'">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_power_role_add'" style="margin-top:18px ;">新增</a-button>
     </div>
 
     <s-table

+ 7 - 2
src/views/power/user/userList.vue

@@ -39,9 +39,14 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal" v-hasPermission="'B_power_user_add'">新增</a-button>
+      <a-button
+        type="primary"
+        icon="plus"
+        @click="openModal"
+        id="userList-openModal"
+        v-hasPermission="'B_power_user_add'"
+        style="margin-top:18px ;">新增</a-button>
     </div>
 
     <s-table

+ 3 - 3
src/views/shop/GoodsOrder.vue

@@ -5,7 +5,7 @@
       <!-- 待发货 -->
       <div class="unDelivered" v-if="type == 'orderGoods'">
         <p class="order-status">待发货</p>
-        <a-button v-if="$hasPermissions('B_order_sendGoods') && (orderState != 'CANCEL')" id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
+        <a-button v-if="$hasPermissions('B_order_sendGoods') && (orderState != 'WAIT_PAY') && (orderState != 'CANCEL')" id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
       </div>
       <!-- 已发货 -->
       <div class="delivered" v-if="type == 'express'">
@@ -65,8 +65,8 @@ export default {
       }
     },
     rowSelection: function () {
-      //  订单状态不可为"已取消" 且 "待发货" 且 有立即发货 权限的即可操作表格
-      if (this.orderState != 'CANCEL' && this.type == 'orderGoods' && this.$hasPermissions('B_order_sendGoods')) {
+      //  订单状态不可为"待支付"、"已取消" 且 "待发货" 且 有立即发货 权限的即可操作表格
+      if (this.orderState != 'CANCEL' && this.orderState != 'WAIT_PAY' && this.type == 'orderGoods' && this.$hasPermissions('B_order_sendGoods')) {
         return { selectedRowKeys: this.selectedRowKeys, onChange: this.onSelectChange }
       } else {
         return null

+ 1 - 1
src/views/shop/bannerSetting.vue

@@ -166,7 +166,7 @@
               :disabled="disabled"
               @change="getbannerImage"
               listType="picture-card" ></Upload>
-            <span class="upload-desc">请上传200*150尺寸的图片,大小不超过0.25MB,png、jpg、jpeg格式。</span>
+            <span class="upload-desc">请上传750*250尺寸的图片,大小不超过0.25MB,png、jpg、jpeg格式。</span>
           </div>
           <img v-else :src="formData.image" style="max-width:400px ;height: auto;" />
         </a-form-item>

+ 1 - 2
src/views/shop/goodsList.vue

@@ -40,9 +40,8 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
-      <a-button v-if="$hasPermissions('B_goodsManage_add')" id="goodsList-btn-add" type="primary" icon="plus" @click="handleGoods('add')">新增</a-button>
+      <a-button v-if="$hasPermissions('B_goodsManage_add')" id="goodsList-btn-add" type="primary" icon="plus" @click="handleGoods('add')" style="margin-top: 18px;">新增</a-button>
     </div>
     <s-table
       ref="table"

+ 1 - 2
src/views/shop/shopOrder.vue

@@ -42,7 +42,6 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
       <a-button
         v-if="$hasPermissions('B_orderManage_export')"
@@ -50,7 +49,7 @@
         id="shopOrder-btn-export"
         type=""
         :loading="loading"
-        @click="handleExport">导出</a-button>
+        @click="handleExport" style="margin-top: 18px;">导出</a-button>
     </div>
     <s-table
       ref="table"

+ 1 - 1
src/views/shopSetting/supplier.vue

@@ -3,7 +3,7 @@
     <!-- 搜索框 -->
     <div class="table-page-search-wrapper" style="margin-bottom: 15px;">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
+        <a-row :gutter="48" >
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商名称" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }"><a-input allowClear v-model.trim="searchData.name" :maxLength="30" placeholder="请输入" id="supplier-name"/></a-form-item>
           </a-col>

+ 0 - 1
src/views/userInfo/userManageList.vue

@@ -33,7 +33,6 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
       <a-button
         class="export-btn"