From acae75a307e0fb7fab1da898d9799228e5d961d8 Mon Sep 17 00:00:00 2001
From: boom <654612@qq.com>
Date: Thu, 3 Sep 2020 10:16:33 +0800
Subject: [PATCH] update

---
 .env.development                          |   2 +-
 package.json                              | 106 +++++++++++-----------
 src/components/Management/AddDialog.vue   |  11 +++
 src/components/Management/Container.vue   |   1 +
 src/components/Management/checkDialog.vue |   8 ++
 5 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/.env.development b/.env.development
index accdaad..f2923e7 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ ENV = 'development'
 VUE_APP_PROJECT_NAME = 'cereshop-admin-web'
 
 # 请求服务配置
-VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'https://ceres.zkthink.com'
+VUE_APP_DEV_REQUEST_DOMAIN_PREFIX = 'http://192.168.10.78:8764'
 
 # 是否启用验证码
 VUE_APP_IS_CAPTCHA = true
diff --git a/package.json b/package.json
index acd3873..9100fec 100644
--- a/package.json
+++ b/package.json
@@ -41,74 +41,76 @@
     "url": ""
   },
   "dependencies": {
-    "@riophae/vue-treeselect": "0.0.38",
-    "axios": "^0.19.0",
-    "chromedriver": "^79.0.0",
-    "clipboard": "2.0.4",
-    "codemirror": "5.45.0",
-    "core-js": "^2.6.11",
-    "css-loader": "^3.5.3",
+    "@riophae/vue-treeselect": "^0.4.0",
+    "acorn": "^6.4.1",
+    "axios": "^0.20.0",
+    "clipboard": "^2.0.6",
+    "codemirror": "^5.57.0",
+    "core-js": "^3.6.5",
+    "css-loader": "^4.2.2",
     "dragula": "^3.7.2",
-    "driver.js": "0.9.5",
-    "dropzone": "5.5.1",
+    "driver.js": "^0.9.8",
+    "dropzone": "^5.7.2",
     "echarts": "^4.2.1",
-    "element-ui": "2.12.0",
-    "file-saver": "2.0.1",
-    "fuse.js": "3.4.4",
+    "element-ui": "^2.13.2",
+    "file-saver": "^2.0.2",
+    "fuse.js": "^6.4.1",
     "jsonlint": "1.6.3",
-    "jszip": "3.2.1",
-    "less-loader": "^6.1.0",
-    "normalize.css": "7.0.0",
+    "jszip": "^3.5.0",
+    "less": "^3.12.2",
+    "less-loader": "^7.0.0",
+    "normalize.css": "^8.0.1",
     "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
-    "screenfull": "4.2.0",
-    "showdown": "1.9.0",
-    "sortablejs": "1.8.4",
-    "tui-editor": "1.3.3",
+    "path-to-regexp": "^6.1.0",
+    "screenfull": "^5.0.2",
+    "showdown": "^1.9.1",
+    "sortablejs": "^1.10.2",
+    "tui-editor": "^1.4.10",
     "v-viewer": "^1.5.1",
-    "vue": "2.6.10",
+    "vue": "^2.6.12",
     "vue-count-to": "^1.0.13",
-    "vue-i18n": "7.3.2",
+    "vue-i18n": "^8.21.0",
     "vue-loader": "^15.9.2",
     "vue-photo-preview": "^1.1.3",
     "vue-quill-editor": "^3.0.6",
-    "vue-router": "3.0.2",
-    "vue-splitpane": "1.0.4",
-    "vuedraggable": "2.20.0",
-    "vuex": "3.1.0",
-    "xlsx": "0.14.1"
+    "vue-router": "^3.4.3",
+    "vue-splitpane": "^1.0.6",
+    "vuedraggable": "^2.24.1",
+    "vuex": "^3.5.1",
+    "webpack": "^4.44.1",
+    "xlsx": "^0.16.6"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0",
-    "@babel/register": "7.0.0",
-    "@vue/cli-plugin-babel": "3.5.3",
-    "@vue/cli-plugin-eslint": "3.5.1",
-    "@vue/cli-plugin-unit-jest": "^3.9.0",
-    "@vue/cli-service": "3.5.3",
-    "@vue/test-utils": "1.0.0-beta.29",
+    "@babel/core": "^7.11.4",
+    "@babel/register": "^7.10.5",
+    "@vue/cli-plugin-babel": "^4.5.4",
+    "@vue/cli-plugin-eslint": "^4.5.4",
+    "@vue/cli-plugin-unit-jest": "^4.5.4",
+    "@vue/cli-service": "^4.5.4",
+    "@vue/test-utils": "^1.0.4",
     "autoprefixer": "^9.5.1",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "8.0.1",
-    "babel-jest": "23.6.0",
-    "chalk": "2.4.2",
-    "chokidar": "2.1.5",
-    "connect": "3.6.6",
-    "eslint": "5.15.3",
-    "eslint-plugin-vue": "5.2.2",
-    "html-webpack-plugin": "3.2.0",
-    "husky": "1.3.1",
-    "lint-staged": "8.1.5",
-    "mockjs": "1.0.1-beta3",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^26.3.0",
+    "chalk": "^4.1.0",
+    "chokidar": "^3.4.2",
+    "connect": "^3.7.0",
+    "eslint": "^7.7.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "html-webpack-plugin": "^4.3.0",
+    "husky": "^4.2.5",
+    "lint-staged": "^10.2.13",
+    "mockjs": "^1.1.0",
     "node-sass": "^4.13.1",
-    "plop": "2.3.0",
+    "plop": "^2.7.4",
     "runjs": "^4.3.2",
-    "sass-loader": "^7.1.0",
-    "script-ext-html-webpack-plugin": "2.1.3",
+    "sass-loader": "^10.0.1",
+    "script-ext-html-webpack-plugin": "^2.1.4",
     "script-loader": "0.7.2",
     "serve-static": "^1.13.2",
-    "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.0",
-    "vue-template-compiler": "2.6.10"
+    "svg-sprite-loader": "^5.0.0",
+    "svgo": "^1.3.2",
+    "vue-template-compiler": "^2.6.12"
   },
   "engines": {
     "node": ">=8.9",
diff --git a/src/components/Management/AddDialog.vue b/src/components/Management/AddDialog.vue
index 39f7f9f..0c1fc37 100644
--- a/src/components/Management/AddDialog.vue
+++ b/src/components/Management/AddDialog.vue
@@ -68,6 +68,14 @@
               <Option label="无效" value="FORBIDDEN" />
             </Select>
           </form-item>
+
+          <form-item label="收单类型">
+            <Select v-model="formParams.posType.code" size="mini">
+              <Option label="普通餐饮" value="NORMALSTORE" />
+              <Option label="快消奶茶" value="FASTSTORE" />
+            </Select>
+          </form-item>
+
           <form-item size="large">
             <Button type="primary" @click="next">下一步</Button>
             <Button @click="close">取消</Button>
@@ -179,6 +187,9 @@ export default {
     return {
       activeName: 'authorize',
       formParams: {
+        posType: {
+          code: 'NORMALSTORE'
+        },
         status: {
           code: 'NORMAL'
         }
diff --git a/src/components/Management/Container.vue b/src/components/Management/Container.vue
index c470709..6ea1fc5 100644
--- a/src/components/Management/Container.vue
+++ b/src/components/Management/Container.vue
@@ -3,6 +3,7 @@
     <Table :data="dataList.records" style="width: 100%" border>
       <table-column prop="name" label="店铺名称" />
       <table-column prop="code" label="店铺编码" />
+      <table-column prop="posType.desc" label="店铺类型" width="180" />
       <table-column prop="duty" label="负责人" width="180" />
       <table-column prop="contactTel" label="联系电话" width="180" />
       <table-column label="合同状态" width="180">
diff --git a/src/components/Management/checkDialog.vue b/src/components/Management/checkDialog.vue
index a86fcab..abdd790 100644
--- a/src/components/Management/checkDialog.vue
+++ b/src/components/Management/checkDialog.vue
@@ -78,6 +78,14 @@
               clearable
             />
           </form-item>
+
+          <form-item label="收单类型">
+            <Select v-model="dataMap.posType.code" size="mini">
+              <Option label="普通餐饮" value="NORMALSTORE" />
+              <Option label="快消餐饮" value="FASTSTORE" />
+            </Select>
+          </form-item>
+
           <form-item size="large">
             <Button v-if="!dataMap.check" type="primary" @click="sumbit">确定</Button>
           </form-item>