From fad3dc189c1f3418c89540bd610a17601389436f Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Wed, 27 Apr 2022 12:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E6=A8=A1=E7=89=88=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/.env.dev | 14 + template/admin/.env.production | 15 + template/admin/package.json | 7 +- template/admin/src/api/system.js | 24 +- template/admin/src/api/user.js | 21 ++ template/admin/src/assets/images/ag-phone.png | Bin 0 -> 7869 bytes .../admin/src/components/remark/index.vue | 76 +++++ .../admin/src/components/wangEditor/index.vue | 85 ++--- .../pages/marketing/storeIntegral/create.vue | 19 +- .../admin/src/pages/order/offline/index.vue | 4 +- .../src/pages/setting/agreement/index.vue | 166 +++++++++ template/admin/src/pages/system/group/pc.vue | 2 +- .../src/pages/user/cancel/handle/task.vue | 314 ++++++++++++++++++ .../admin/src/pages/user/cancel/index.vue | 269 +++++++++++++++ template/admin/src/router/modules/setting.js | 9 + template/admin/src/router/modules/user.js | 28 +- template/admin/src/setting.js | 3 +- template/uni-app-live/pages.json | 17 +- template/uni-app/androidPrivacy.json | 10 +- template/uni-app/api/user.js | 33 +- .../components/productConSwiper/index.vue | 2 +- template/uni-app/manifest.json | 4 +- template/uni-app/pages.json | 15 +- .../pages/activity/presell_details/index.vue | 2 +- .../uni-app/pages/admin/orderDetail/index.vue | 40 ++- .../pages/columnGoods/static/yszc.html | 37 +++ .../uni-app/pages/goods_details/index.vue | 12 +- template/uni-app/pages/index/diy/index.vue | 17 +- .../pages/index/visualization/index.vue | 23 +- .../points_mall/integral_goods_details.vue | 2 +- template/uni-app/pages/user/index.vue | 2 +- .../pages/users/admin_order_detail/index.vue | 41 ++- .../pages/users/order_details/index.vue | 2 +- .../uni-app/pages/users/privacy/index.vue | 13 +- .../uni-app/pages/users/static/address.png | Bin 0 -> 13322 bytes .../pages/users/user_cancellation/index.vue | 213 ++++++++++++ .../uni-app/pages/users/user_info/index.vue | 6 + .../pages/users/user_integral/index.vue | 44 ++- 38 files changed, 1437 insertions(+), 154 deletions(-) create mode 100644 template/admin/.env.dev create mode 100644 template/admin/.env.production create mode 100644 template/admin/src/assets/images/ag-phone.png create mode 100644 template/admin/src/components/remark/index.vue create mode 100644 template/admin/src/pages/setting/agreement/index.vue create mode 100644 template/admin/src/pages/user/cancel/handle/task.vue create mode 100644 template/admin/src/pages/user/cancel/index.vue create mode 100644 template/uni-app/pages/columnGoods/static/yszc.html create mode 100644 template/uni-app/pages/users/static/address.png create mode 100644 template/uni-app/pages/users/user_cancellation/index.vue diff --git a/template/admin/.env.dev b/template/admin/.env.dev new file mode 100644 index 000000000..b70e9f851 --- /dev/null +++ b/template/admin/.env.dev @@ -0,0 +1,14 @@ +# 环境 +NODE_ENV=development +VUE_APP_ENV='dev' +# 页面 title +VUE_APP_TITLE=CRMEB +# socket 客服连接地址 +VUE_APP_WS_KEFU_URL="" +# socket 系统连接地址 +VUE_APP_WS_ADMIN_URL="" + + + +# 接口请求地址 +VUE_APP_API_URL='' diff --git a/template/admin/.env.production b/template/admin/.env.production new file mode 100644 index 000000000..77d98d2e8 --- /dev/null +++ b/template/admin/.env.production @@ -0,0 +1,15 @@ +# 环境 +NODE_ENV=production +VUE_APP_ENV='production' + +# 页面 title +VUE_APP_TITLE=CRMEB +# socket 客服连接地址 +VUE_APP_WS_KEFU_URL="" +# socket 系统连接地址 +VUE_APP_WS_ADMIN_URL="" + + + +# 接口请求地址 +VUE_APP_API_URL="" diff --git a/template/admin/package.json b/template/admin/package.json index 33c3a426b..c7ed0ef27 100644 --- a/template/admin/package.json +++ b/template/admin/package.json @@ -4,11 +4,8 @@ "author": "Lison", "private": false, "scripts": { - "serve": "vue-cli-service serve --open", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "test:unit": "vue-cli-service test:unit", - "test:e2e": "vue-cli-service test:e2e" + "serve": "vue-cli-service serve --open --mode=dev", + "build": "vue-cli-service build --mode=production" }, "dependencies": { "@babel/polyfill": "^7.8.7", diff --git a/template/admin/src/api/system.js b/template/admin/src/api/system.js index 48fc47e72..43d5df08b 100644 --- a/template/admin/src/api/system.js +++ b/template/admin/src/api/system.js @@ -506,4 +506,26 @@ export function setAgreement(data) { method: 'post', data }) -} \ No newline at end of file +} + +/** + * @description 获取协议 + * @param data + */ + export function getAgreements(type) { + return request({ + url: `setting/get_agreement/${type}`, + method: 'get', + }) +} +/** + * @description 设置隐私协议 + * @param data + */ + export function setAgreements(data, type) { + return request({ + url: `setting/save_agreement`, + method: 'post', + data + }) +} diff --git a/template/admin/src/api/user.js b/template/admin/src/api/user.js index 965e757ad..13d541f25 100644 --- a/template/admin/src/api/user.js +++ b/template/admin/src/api/user.js @@ -644,4 +644,25 @@ export function getUserInfo(uid) { url: `user/user/user_save_info/${uid}`, method: 'get' }); +} + +/** + * 用户注销列表 + */ +export function userCancelList(data) { + return request({ + url: '/user/cancel_list', + method: 'get', + params: data + }); +} +/** + * 用户注销列表 + */ +export function userCancelSetMark(data) { + return request({ + url: '/user/cancel/set_mark', + method: 'post', + data + }); } \ No newline at end of file diff --git a/template/admin/src/assets/images/ag-phone.png b/template/admin/src/assets/images/ag-phone.png new file mode 100644 index 0000000000000000000000000000000000000000..46f4ac63bf58e58b5c41b0f217d59cff7039b14a GIT binary patch literal 7869 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 pRy}YJY3117toMW=z + +
+ + + +
+
+ + +
+ + + + + + diff --git a/template/admin/src/components/wangEditor/index.vue b/template/admin/src/components/wangEditor/index.vue index 64f073aa7..b73377d96 100644 --- a/template/admin/src/components/wangEditor/index.vue +++ b/template/admin/src/components/wangEditor/index.vue @@ -4,40 +4,17 @@
- +
- - + + - - + + @@ -50,7 +27,7 @@ import uploadPictures from "@/components/uploadPictures"; import uploadVideo from "@/components/uploadVideo2"; import { getCookies } from "@/libs/util"; -import util from '../../utils/bus' +import util from "../../utils/bus"; export default { name: "Index", components: { @@ -84,28 +61,22 @@ export default { }; }, watch: { - content: function (val) { - if (val !== "") { - this.editor.txt.html(val); - } else { - this.editor.txt.clear(); - } + content(val) { + this.editor.txt.html(val); }, }, created() { // window.getvideoint = this.getvideoint; // window.getHtmlint = this.getHtmlint; - }, mounted() { this.createEditor(); - util.$on('Video',(Video)=>{ - this.getvideoint(); - }) - util.$on('Html',(Html)=>{ - this.getHtmlint(); - }) - + util.$on("Video", (Video) => { + this.getvideoint(); + }); + util.$on("Html", (Html) => { + this.getHtmlint(); + }); }, methods: { @@ -142,6 +113,8 @@ export default { getPicD(data) { let _this = this; _this.modalPic = false; + console.log("222"); + data.map((d) => { this.editor.cmd.do( "insertHTML", @@ -153,10 +126,16 @@ export default { let _this = this; _this.modalVideo = false; this.video = data; - this.editor.cmd.do( - "insertHTML", - `