From 0ec4b34b05769b31567967769fa4036c27550165 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Sat, 16 May 2020 00:43:18 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=80=82=E9=85=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/{home => data}/CustomerDetail.vue | 0 src/pages/shop/IncreaseDataCompany.vue | 2 +- src/router/index.js | 2 +- vue.config.js | 12 ------------ 4 files changed, 2 insertions(+), 14 deletions(-) rename src/pages/{home => data}/CustomerDetail.vue (100%) diff --git a/src/pages/home/CustomerDetail.vue b/src/pages/data/CustomerDetail.vue similarity index 100% rename from src/pages/home/CustomerDetail.vue rename to src/pages/data/CustomerDetail.vue diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue index fb85cc8..69ab396 100644 --- a/src/pages/shop/IncreaseDataCompany.vue +++ b/src/pages/shop/IncreaseDataCompany.vue @@ -142,7 +142,7 @@ } }, mounted: function () { - let startDate = this.$moment(new Date()).add(-29, "day").format("YYYY-MM-DD"); + let startDate = this.$moment(new Date()).add(-6, "day").format("YYYY-MM-DD"); let endDate = this.$moment(new Date()).format("YYYY-MM-DD"); this.selectDate.push(startDate); this.selectDate.push(endDate); diff --git a/src/router/index.js b/src/router/index.js index 8de1026..d6a8dd1 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,7 +14,7 @@ import TableAnalysis from "@/pages/TableAnalysis"; import AddCustomerTable from "@/pages/analysis/AddCustomerTable"; import ApplyCustomerTable from "@/pages/analysis/ApplyCustomerTable"; import ZeroExtendDetail from "@/pages/home/ZeroExtendDetail"; -import CustomerDetail from "@/pages/home/CustomerDetail"; +import CustomerDetail from "@/pages/data/CustomerDetail"; import IncreaseData from '@/pages/shop/IncreaseData'; import IncreaseDataCompany from '@/pages/shop/IncreaseDataCompany'; import IncreaseDataStaff from '@/pages/shop/IncreaseDataStaff'; diff --git a/vue.config.js b/vue.config.js index a552216..853dbc6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -32,17 +32,5 @@ module.exports = { // proxy: 'http://192.168.31.177:8312/' proxy: 'http://localhost:8312/' // proxy: 'http://jdxdev.vipgz4.idcfengye.com/' - }, - chainWebpack: config => { - config.module - .rule('css') - .test(/\.css$/) - .oneOf('vue') - .resourceQuery(/\?vue/) - .use('px2rem') - .loader('px2rem-loader') - .options({ - remUnit: 192 - }) } } From a14cd5f04cd170dd01a97325aeb925699a9248ee Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Sun, 17 May 2020 12:49:37 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=97=E5=9D=87?= =?UTF-8?q?=E6=8B=93=E5=AE=A2=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/IncreaseDataCompany.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue index 69ab396..95abd80 100644 --- a/src/pages/shop/IncreaseDataCompany.vue +++ b/src/pages/shop/IncreaseDataCompany.vue @@ -130,6 +130,10 @@ { title: '拉黑率（累计）', key: 'delRate' + }, + { + title: '店均拓客数', + key: 'avgStoreCustomer' } ], data1: [], @@ -254,9 +258,9 @@ let title = "零售公司推广情况" + that.selectDate[0] + '-' + that.selectDate[1]; require.ensure([], () => { const {export_json_to_excel} = require('../../excel/Export2Excel'); - const tHeader = ['序号', '零售公司名称', '总好友数', '总好友数（去重）', '新增好友数', '新增好友数（去重）', '日增好友平均', '日增好友平均（去重）', '删除/拉黑成员客户数（累计）', '拉黑率（累计）']; + const tHeader = ['序号', '零售公司名称', '总好友数', '总好友数（去重）', '新增好友数', '新增好友数（去重）', '日增好友平均', '日增好友平均（去重）', '删除/拉黑成员客户数（累计）', '拉黑率（累计）', '店均拓客数']; // 属性名 - const filterVal = ['index', 'retailCompany', 'allCustomer', 'effectiveCustomer', 'newCustomer', 'newEffectiveCustomer', 'avgNewCustomer', 'avgNewEffectiveCustomer', 'delCustomer', 'delRate']; + const filterVal = ['index', 'retailCompany', 'allCustomer', 'effectiveCustomer', 'newCustomer', 'newEffectiveCustomer', 'avgNewCustomer', 'avgNewEffectiveCustomer', 'delCustomer', 'delRate', 'avgStoreCustomer']; // 数据 //把data里的tableData存到list const data = that.formatJson(filterVal, originAllData); From 9f3010b31d27bd8f700a21c4db19d0ef394ac26a Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 18 May 2020 10:35:28 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E4=BC=98=E5=8C=96-=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=BA=94=E8=AF=A5=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/IncreaseStaffManager.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/shop/IncreaseStaffManager.vue b/src/pages/shop/IncreaseStaffManager.vue index 501ea38..d0b66b8 100644 --- a/src/pages/shop/IncreaseStaffManager.vue +++ b/src/pages/shop/IncreaseStaffManager.vue @@ -209,6 +209,10 @@ staffCode: [ {required: true, message: '工号不能为空', trigger: 'blur'} ], + phone: [ + {required: true, message: '手机号码不能为空', trigger: 'blur'}, + {pattern: /^1[3456789]\d{9}$/, message: "手机号码格式不正确", trigger: "blur"} + ], // mail: [ // { required: true, message: '邮箱不能为空', trigger: 'blur' }, // { type: 'email', message: '邮箱格式错误', trigger: 'blur' } From a098ad36496ff5128e9fb863fb630451a98b9190 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Mon, 18 May 2020 14:20:33 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/analysis/AddCustomerTable.vue | 1 - src/pages/analysis/ApplyCustomerTable.vue | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/analysis/AddCustomerTable.vue b/src/pages/analysis/AddCustomerTable.vue index cb26639..7ea80c1 100644 --- a/src/pages/analysis/AddCustomerTable.vue +++ b/src/pages/analysis/AddCustomerTable.vue @@ -27,7 +27,6 @@ - diff --git a/src/pages/analysis/ApplyCustomerTable.vue b/src/pages/analysis/ApplyCustomerTable.vue index 375ff5e..6c98b9b 100644 --- a/src/pages/analysis/ApplyCustomerTable.vue +++ b/src/pages/analysis/ApplyCustomerTable.vue @@ -27,7 +27,6 @@ - @@ -36,7 +35,7 @@ 累计拓客报表 - 拓客以内门店数量 + 拓客以内门店数量 @@ -185,6 +184,7 @@ //自定义日期 diyDateChange: function () { if (this.selectStartTime && this.selectEndTime) { + //超过15天，柱状图不显示数字 this.dateSelectChange('自定义'); } }, From d1508a85fb29f147a13b7caf453c1bce19fd11d0 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Mon, 18 May 2020 16:50:42 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/data/StoreDetail.vue | 384 ++++++++++++++++++++++++++ src/router/index.js | 6 + src/services/datacenter/DataCenter.js | 8 + 3 files changed, 398 insertions(+) create mode 100644 src/pages/data/StoreDetail.vue diff --git a/src/pages/data/StoreDetail.vue b/src/pages/data/StoreDetail.vue new file mode 100644 index 0000000..d123468 --- /dev/null +++ b/src/pages/data/StoreDetail.vue @@ -0,0 +1,384 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index d6a8dd1..0d14182 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,6 +15,7 @@ import AddCustomerTable from "@/pages/analysis/AddCustomerTable"; import ApplyCustomerTable from "@/pages/analysis/ApplyCustomerTable"; import ZeroExtendDetail from "@/pages/home/ZeroExtendDetail"; import CustomerDetail from "@/pages/data/CustomerDetail"; +import StoreDetail from "@/pages/data/StoreDetail"; import IncreaseData from '@/pages/shop/IncreaseData'; import IncreaseDataCompany from '@/pages/shop/IncreaseDataCompany'; import IncreaseDataStaff from '@/pages/shop/IncreaseDataStaff'; @@ -211,6 +212,11 @@ const router = new Router({ name: 'CustomerDetail', component: CustomerDetail, }, + { + path: '/store/data/detail', + name: 'StoreDetail', + component: StoreDetail, + }, { path: '/no/permission', name: 'NoPermission', diff --git a/src/services/datacenter/DataCenter.js b/src/services/datacenter/DataCenter.js index abb19fd..b9bed5f 100644 --- a/src/services/datacenter/DataCenter.js +++ b/src/services/datacenter/DataCenter.js @@ -11,6 +11,13 @@ export function dataDetail(params, call, errorCallBack) { return http.post('/customer/info',params).then(call).catch(errorCallBack) } +/** + * 查询客户数据明细 + */ +export function storeDataDetail(params, call, errorCallBack) { + return http.post('/store/promotion/data/behavior',params).then(call).catch(errorCallBack) +} + /** * 下拉框数据导购 */ @@ -49,6 +56,7 @@ export function downCompanyData(params, call) { export default { dataDetail: dataDetail, downSellerData: downSellerData, + storeDataDetail, downShopData, downRegionData, editCustomerData, From 7e145f6ed64d7cab7b0c969bed0e8fd00c5e0130 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Mon, 18 May 2020 17:15:50 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/analysis/ApplyCustomerTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/analysis/ApplyCustomerTable.vue b/src/pages/analysis/ApplyCustomerTable.vue index 6c98b9b..9f6c3a8 100644 --- a/src/pages/analysis/ApplyCustomerTable.vue +++ b/src/pages/analysis/ApplyCustomerTable.vue @@ -58,7 +58,7 @@ userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId, //加载遮罩 spinShow: false, - count: 3, + count: 10, dateBtnValue: "今日", viewDate: this.$moment(new Date()).format("YYYY-MM-DD"), //近七天日期 From 32b072c6eab33666b457ffd9184ebd26916bbdfe Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Tue, 19 May 2020 11:09:01 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 +- src/pages/user/AccountManager.vue | 198 ++++++++++++++++------ src/services/account/AccountManagement.js | 4 +- 3 files changed, 148 insertions(+), 58 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7402194..7c867d9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,8 +37,8 @@ .search-span { font-size: 16px; line-height: 32px; - margin-left: 20px; - margin-right: 20px; + margin-left: 10px; + margin-right: 10px; } .search-row{ diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue index 19c938e..de31d2f 100644 --- a/src/pages/user/AccountManager.vue +++ b/src/pages/user/AccountManager.vue @@ -2,29 +2,28 @@
@@ -45,10 +44,13 @@ diff --git a/src/services/account/AccountManagement.js b/src/services/account/AccountManagement.js index d00cc95..3ec9abc 100644 --- a/src/services/account/AccountManagement.js +++ b/src/services/account/AccountManagement.js @@ -11,8 +11,8 @@ import http from '../CommonHttp' * @param call * @returns {Promise} */ -export function listAccountInfoApi(params, call) { - return http.post('account/info/list', params).then(call); +export function listAccountInfoApi(params, call, errorCallback) { + return http.post('account/info/list', params).then(call).catch(errorCallback); } /** * 删除账号 From 16cdfe3006624a077c648dff3b9f5b562eab561c Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Tue, 19 May 2020 13:45:53 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/analysis/AddCustomerTable.vue | 14 +++++++++----- src/pages/analysis/ApplyCustomerTable.vue | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/pages/analysis/AddCustomerTable.vue b/src/pages/analysis/AddCustomerTable.vue index 7ea80c1..17fa86b 100644 --- a/src/pages/analysis/AddCustomerTable.vue +++ b/src/pages/analysis/AddCustomerTable.vue @@ -1,10 +1,10 @@ @@ -47,6 +50,7 @@ import accountManagement from "../../services/account/AccountManagement"; import zeroExtend from "../../services/customer/zeroExtend"; import staff from "../../services/staff/staff"; + import IncreaseData from "../../services/generalize/IncreaseData"; export default { data() { @@ -457,6 +461,60 @@ } }) }, + //零推广导出 + exportData: function () { + + this.loading = true; + let that = this; + let request = { + searchContent: that.searchContent, + pageNum: that.pageNum, + pageSize: that.totalSize, + roleId: that.selectedRoleId, + companyId: that.selectedCompanyId, + shopId: that.selectedShopId + }; + accountManagement.listAccountInfoApi(request, function (data) { + that.loading = false; + + that.data1 = []; + data = data.data; + if (data.code === '0001') { + return + } + if (data.code === '0000') { + if (data) { + let row = data.results.list; + that.totalSize = data.results.total; + if (row && row.length > 0) { + let originAllData = []; + for (let i = 0; i < row.length; i++) { + let entity = row[i]; + entity.index = i + 1; + originAllData.push(entity); + } + let title = "账号"; + require.ensure([], () => { + const {export_json_to_excel} = require('../../excel/Export2Excel'); + const tHeader = ['序号', '用户名', '别名', '账号', '手机号码', '角色', '零售公司', '零售公司编码', '店铺名称', '店铺编码']; + // 属性名 + const filterVal = ['index', 'userName', 'abbreviation', 'account', 'mobil', 'roleName', 'companyName', 'companyCode', 'shopName', 'shopCode']; + + // 数据 + //把data里的tableData存到list + const data = that.formatJson(filterVal, originAllData); + export_json_to_excel(tHeader, data, title); + }); + } + } + } + }, function () { + that.loading = false; + }); + }, + formatJson(filterVal, jsonData) { + return jsonData.map(v => filterVal.map(j => v[j])) + }, }, } From 36eb9a11e830b791d63538b3a0b067e57e9b9b50 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Sun, 24 May 2020 01:54:13 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/user/AccountManagementModify.vue | 2 -- src/pages/user/AccountManagerAdd.vue | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/pages/user/AccountManagementModify.vue b/src/pages/user/AccountManagementModify.vue index 517c280..4b962b5 100644 --- a/src/pages/user/AccountManagementModify.vue +++ b/src/pages/user/AccountManagementModify.vue @@ -113,12 +113,10 @@ ], userName:[ {required:true,message:'用户名不能为空',trigger:'blur'}, - { min: 1, max: 8, message: '长度在 1 到 8 个字符', trigger: 'blur' }, { pattern: /^[\u4e00-\u9fa5_0-9a-zA-Z]+$/, message: '只可以输入数字,字母,中文',trigger: 'blur'} ], account:[ {required:true,message:'账号不能为空',trigger:'blur'}, - { min: 2, max: 8, message: '长度在 2 到 8 个字符', trigger: 'blur' }, { pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母',trigger: 'blur'}, ], password:null, diff --git a/src/pages/user/AccountManagerAdd.vue b/src/pages/user/AccountManagerAdd.vue index 32b2902..9e10f77 100644 --- a/src/pages/user/AccountManagerAdd.vue +++ b/src/pages/user/AccountManagerAdd.vue @@ -103,12 +103,10 @@ addValidate: { userName: [ {required: true, message: '用户名不能为空', trigger: 'blur'}, - {min: 1, max: 8, message: '长度在 1 到 8 个字符', trigger: 'blur'}, {pattern: /^[\u4e00-\u9fa5_0-9a-zA-Z]+$/, message: '只可以输入数字,字母,中文', trigger: 'blur'} ], account: [ {required: true, message: '账号不能为空', trigger: 'blur'}, - {min: 2, max: 8, message: '长度在 2 到 8 个字符', trigger: 'blur'}, {pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'}, ], mobil: [ From 9d03d245cf988cbef1b38637d16f6dca50bf3ec7 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Tue, 26 May 2020 15:19:15 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/CommonHttp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js index 02facf7..867412f 100755 --- a/src/services/CommonHttp.js +++ b/src/services/CommonHttp.js @@ -10,7 +10,7 @@ axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/'; // axios.defaults.baseURL = '/kiisoo-ic'; //响应时间 -axios.defaults.timeout = 120000; +axios.defaults.timeout = 3600000; axios.defaults.withCredentials=true; //配置请求头 From 5ea54cf402b20af8f156f5d8909a97b165f6d71c Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Tue, 26 May 2020 15:23:50 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/IncreaseStoreManager.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue index cd2c6c1..7759439 100644 --- a/src/pages/shop/IncreaseStoreManager.vue +++ b/src/pages/shop/IncreaseStoreManager.vue @@ -536,10 +536,14 @@ value.storeId = '' }, downloadStoreCode() { + this.loading = true; http.downloadStoreCode({}, null); + this.loading = false; }, downloadStoreSellerCode() { + this.loading = true; http.downloadStoreSellerCode({}, null); + this.loading = false; }, updateSuccess(response) { if (response.code === "0000") { From b9e983ba7c6b2e15c858176346a0e5b3f17f2fe3 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Tue, 26 May 2020 15:48:22 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/IncreaseStoreManager.vue | 8 ++++---- src/services/CommonHttp.js | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue index 7759439..b21eb39 100644 --- a/src/pages/shop/IncreaseStoreManager.vue +++ b/src/pages/shop/IncreaseStoreManager.vue @@ -537,13 +537,13 @@ }, downloadStoreCode() { this.loading = true; - http.downloadStoreCode({}, null); - this.loading = false; + let that = this; + http.downloadStoreCode({page:that}, null); }, downloadStoreSellerCode() { this.loading = true; - http.downloadStoreSellerCode({}, null); - this.loading = false; + let that = this; + http.downloadStoreSellerCode({page:that}, null); }, updateSuccess(response) { if (response.code === "0000") { diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js index 867412f..5cdcff0 100755 --- a/src/services/CommonHttp.js +++ b/src/services/CommonHttp.js @@ -7,7 +7,7 @@ import commonUtils from '../utils/Common' // http://mf.kiisoo.com:58080/ axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/'; -// axios.defaults.baseURL = '/kiisoo-ic'; +// axios.defaults.baseURL = '/ic'; //响应时间 axios.defaults.timeout = 3600000; @@ -200,7 +200,7 @@ export function downloadZip(url,filename, options = {}) { axios({ method: 'post', url: url, // 请求地址 - data: options, // 参数 + data: {}, // 参数 responseType: 'blob' // 表明返回服务器返回的数据类型 }).then( response => { @@ -222,8 +222,10 @@ export function downloadZip(url,filename, options = {}) { //释放内存 window.URL.revokeObjectURL(link.href) } + options.page.loading = false }, err => { + options.page.loading = false reject(err) } ) From 0b3a6fe1558bf297c923f13ceaa3c2d593d5cb36 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Wed, 27 May 2020 14:31:30 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/user/AccountManager.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue index 3c85bfc..af96aaf 100644 --- a/src/pages/user/AccountManager.vue +++ b/src/pages/user/AccountManager.vue @@ -476,8 +476,6 @@ }; accountManagement.listAccountInfoApi(request, function (data) { that.loading = false; - - that.data1 = []; data = data.data; if (data.code === '0001') { return @@ -485,7 +483,6 @@ if (data.code === '0000') { if (data) { let row = data.results.list; - that.totalSize = data.results.total; if (row && row.length > 0) { let originAllData = []; for (let i = 0; i < row.length; i++) { From af6bdfd94db73ce6d09ba2a36057adbf1bdab73e Mon Sep 17 00:00:00 2001 From: yechenhao Date: Wed, 27 May 2020 17:11:10 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/IncreaseStoreManager.vue | 6 +++--- src/pages/user/AccountManager.vue | 2 +- static/excel/批量账户导入.xls | Bin 18944 -> 18432 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue index b21eb39..6dccc87 100644 --- a/src/pages/shop/IncreaseStoreManager.vue +++ b/src/pages/shop/IncreaseStoreManager.vue @@ -3,7 +3,7 @@ - + 大区 - - - - - - - - - - - - + - + - - - - - - - 通过邮箱或短信发送企业邀请 - - - - + @@ -199,7 +162,6 @@ companyList: [], customerList: [], companyId: 0, - errorList: [], selectedStore: 0, shopList: [], @@ -262,36 +224,22 @@ } ], data1: [], - // 开通企业微信 表单 formValidate: { alias: '', - userId: '', - gender: '', + id: '', + cpUserId: '', mobile: '', - email: '', - address: '', - departIds: '', - selectedPhoneRegion: '86', - duty: '', - position: '', - interest: [], - desc: '', checkbox: ['vail'], storeId: '', + cpUserName: '', + shopName: '' }, ruleValidate: { mobile: [ {required: true, message: '手机号码不能为空', trigger: 'blur'} ], - // mail: [ - // { required: true, message: '邮箱不能为空', trigger: 'blur' }, - // { type: 'email', message: '邮箱格式错误', trigger: 'blur' } - // ], - departIds: [ - {required: true, message: '请选择部门', trigger: 'change'} - ], - storeId: [ - {required: true, message: '请选择部门', trigger: 'change'}, + cpUserName: [ + {required: true, message: '名称不能为空', trigger: 'blur'} ] } } @@ -300,8 +248,6 @@ this.setMenuName("门店推广", "推广管理"); this.listOfStore(); this.getSelectList(); - // this.downBigRegionData(); - // this.downRegionData(); this.downShopData(); }, methods: { @@ -344,19 +290,14 @@ that.loading = false; }); }, - addStoreWX: function (request) { + modifyStoreWX: function (request) { let that = this; - http.addStoreWX(request, function (data) { + http.modifyStoreWX(request, function (data) { data = data.data; if (data.code == "0000") { - if (data.results.indexOf("8888") != -1) { - let str = data.results.split(","); - that.$Message.success('该企业微信已被 【' + str[1] + '】绑定 请从新绑定微信号'); - } else { - that.$Message.success('添加成功!'); - that.listOfStore(); - this.handleAdd(this.formValidate); - } + that.$Message.success('修改成功!'); + that.listOfStore(); + this.handleAdd(this.formValidate); } }) }, @@ -493,9 +434,19 @@ cancel: function () { this.isShow = false; }, - open: function () { + open: function (item) { this.isShowAdd = true; + this.formValidate = { + alias: item.alias, + cpUserName: item.cpUserName, + cpUserId: item.cpUserId, + id: item.userId, + mobile: item.mobile, + checkbox: ['vail'], + storeId: item.id, + shopName: item.name + } }, remove: function () { @@ -504,10 +455,10 @@ this.isShowImport = true; this.isShowError = false }, - handleSubmit(name) { - if (name) { + handleSubmit(value) { + if (value) { // 调用添加接口 - this.addStoreWX(name); + this.modifyStoreWX(value); } else { this.$Message.error('Fail!'); } diff --git a/src/services/store/IncreaseStoreManager.js b/src/services/store/IncreaseStoreManager.js index 8da0563..c6fd64a 100644 --- a/src/services/store/IncreaseStoreManager.js +++ b/src/services/store/IncreaseStoreManager.js @@ -21,6 +21,9 @@ export function storeList(params, call, errorCallBack) { export function addStoreWX(params, call) { return http.post('/user/add', params).then(call); } +export function modifyStoreWX(params, call) { + return http.post('/user/update', params).then(call); +} export function downloadImg(params,name, call) { return http.downloadImg('/user/img/download',name, params).then(call); } @@ -78,6 +81,7 @@ export default { getBaseUrl, storeList, addStoreWX, + modifyStoreWX, downloadImg, downCompanyData, downBigRegionData,