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 000000000..46f4ac63b Binary files /dev/null and b/template/admin/src/assets/images/ag-phone.png differ diff --git a/template/admin/src/components/remark/index.vue b/template/admin/src/components/remark/index.vue new file mode 100644 index 000000000..177e9a96b --- /dev/null +++ b/template/admin/src/components/remark/index.vue @@ -0,0 +1,76 @@ + + + + + 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", - `