From 0c6094af96ff4e60221667a15a5917c88c056f8a Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Tue, 19 Dec 2023 16:32:45 +0800 Subject: [PATCH] merge --- .DS_Store | Bin 14340 -> 14340 bytes .env | 4 +- .env.development | 4 +- .env.preview | 4 +- package.json | 6 +- .../GlobalHeader/AvatarDropdown.vue | 4 +- src/config/router.config.js | 6 +- src/views/sales/Offline.vue | 2 +- src/views/sales/OnStock.vue | 2 +- src/views/sales/Online.vue | 2 +- src/views/sales/widgets/StockInfo.vue | 12 +- src/views/stock/DealerIn.vue | 4 +- src/views/stock/DealerOut.vue | 4 +- src/views/stock/In.vue | 2 +- src/views/user/Index.vue | 252 +----------- src/views/user/widgets/QuillEditorVue.vue | 359 ++++++++++++++++++ vue.config.js | 7 +- yarn.lock | 30 +- 18 files changed, 430 insertions(+), 274 deletions(-) create mode 100644 src/views/user/widgets/QuillEditorVue.vue diff --git a/.DS_Store b/.DS_Store index b3086b48ffb7cc485c082c285a9c60e17ff80432..b1fd0b0a5694e7d668840ac417239b789e2f3f86 100644 GIT binary patch delta 825 zcmZoEXepTBFPgx>z`)GFAi%(o#E`>~$&l=slb<~CqVi+|6PAhHqLVrGWH#>c=V#QK ztg82!$$R@`DSa9COz!=j*KChYw$+#AfU+GYPLN|NVA#wfV9gXE5tIZrwwR%aAvrhS z#U&{xA0)!j+q+UgW7<(iWZ4uvvIQB2!O8i#1wi!-49W?c=L;z_*5{-n2{P%w07|hj z6f=}CBmyze2gnwlYB~XODab-JH3(~QsX?)vDFEaIkQtkI3THF1ujm3BJXu>z8phu2 zD|VBe(R4G9!a5dq&YSzdL3B_>7RKKER7Hsi)%ETtLBYbpkOFi!&yJjabODA z~$&g%-VHiB|qVi+|6PAhHqLU*9`It5^Og2!E z+<4N7pHXphrl2)bguJysSYI(i5kqorzKcszPJR+lgoA;h;r73tBaXVFlY&E{v)i+xOur~5)(U+AD!HBWU_#SG>pC3Na7~@#s^Os8I3mcD6C_FiBCSL zA`4@0eyXCxG`U_q112!}ow_89y_rwr2=nAaI^vrb>U1+roUA#SN8mHlvL}-n1!Z)g l7J{74#!$de3JZ|jd}I%R9pyOj;?l+J2JE=(narn=2LRg*WVQeR diff --git a/.env b/.env index ea1b018..fe161d5 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ NODE_ENV=production VUE_APP_PREVIEW=false # -VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api +# VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # -# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api +VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api diff --git a/.env.development b/.env.development index 20fb007..5b6193b 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ NODE_ENV=development VUE_APP_PREVIEW=true # -VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api +# VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # -# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file +VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file diff --git a/.env.preview b/.env.preview index 6ce5ce8..0ea88de 100644 --- a/.env.preview +++ b/.env.preview @@ -9,7 +9,7 @@ NODE_ENV=production VUE_APP_PREVIEW=true # -VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api +# VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # -# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file +VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api \ No newline at end of file diff --git a/package.json b/package.json index d45157f..b726abc 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,17 @@ "md5": "^2.3.0", "moment": "^2.24.0", "nprogress": "^0.2.0", + "quill": "1.3.7", + "quill-image-drop-module": "1.0.3", + "quill-image-extend-module": "1.1.2", + "quill-image-resize-module": "3.0.0", "store": "^2.0.12", "viser-vue": "^2.4.6", "vue": "^2.6.12", "vue-clipboard2": "^0.2.1", "vue-cropper": "0.4.9", "vue-i18n": "^8.22.3", - "vue-quill-editor": "^3.0.6", + "vue-quill-editor": "3.0.6", "vue-router": "^3.4.9", "vue-sku-form": "^0.4.1", "vue-svg-component-runtime": "^1.0.1", diff --git a/src/components/GlobalHeader/AvatarDropdown.vue b/src/components/GlobalHeader/AvatarDropdown.vue index e389c6e..15cd581 100644 --- a/src/components/GlobalHeader/AvatarDropdown.vue +++ b/src/components/GlobalHeader/AvatarDropdown.vue @@ -14,10 +14,10 @@ 修改密码 - + 退出登录 diff --git a/src/config/router.config.js b/src/config/router.config.js index af8f28b..74ee31d 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -1,7 +1,7 @@ /* * @Author: Aimee~ * @Date: 2023-05-11 12:02:45 - * @LastEditTime: 2023-12-12 16:13:30 + * @LastEditTime: 2023-12-13 13:11:46 * @LastEditors: Aimee * @FilePath: /water_dealer-agent/src/config/router.config.js * @Description: 路由 @@ -13,7 +13,7 @@ import { import detail from './routes/detail' import stock from './routes/stock' import user from './routes/user' -import coupon from './routes/coupon' +// import coupon from './routes/coupon' import permission from './routes/permission' import sales from './routes/sales' // import cityExperienceOfficer from './routes/cityExperienceOfficer' @@ -42,7 +42,7 @@ export const asyncRouterMap = [{ ...stock, ...sales, ...user, - ...coupon, + // ...coupon, ...permission ] }, diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue index 2682e0a..debae51 100644 --- a/src/views/sales/Offline.vue +++ b/src/views/sales/Offline.vue @@ -61,7 +61,7 @@
{{ record.name }} {{ record.mobile?'('+record.mobile+')':'--' }}
{{ record.address || '--' }}
-
{{ record.number }}件
+
{{ record.number }}（支）
￥{{ record.total || '0.00' }}
{{ record.channel == 'express' ?'快递':'自提' }}
diff --git a/src/views/sales/OnStock.vue b/src/views/sales/OnStock.vue index 9f81276..4c8a61c 100644 --- a/src/views/sales/OnStock.vue +++ b/src/views/sales/OnStock.vue @@ -60,7 +60,7 @@
{{ record.express.full_address || '--' }}
￥{{ record.total }} - {{ record.items_qty }}件 + {{ record.items_qty }}（支）
查看详情 diff --git a/src/views/sales/Online.vue b/src/views/sales/Online.vue index 33418e5..8833df3 100644 --- a/src/views/sales/Online.vue +++ b/src/views/sales/Online.vue @@ -60,7 +60,7 @@
{{ record.express.full_address || '--' }}
￥{{ record.total }} - {{ record.items_qty }}件 + {{ record.items_qty }}（支）
查看详情 diff --git a/src/views/sales/widgets/StockInfo.vue b/src/views/sales/widgets/StockInfo.vue index ab6e403..b43305a 100644 --- a/src/views/sales/widgets/StockInfo.vue +++ b/src/views/sales/widgets/StockInfo.vue @@ -1,3 +1,11 @@ +