From 323c52a972b180c496d5219008f93dd011a5ca1e Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 2 Jun 2022 11:49:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B9=E6=A1=88=E3=80=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=A2=E6=88=B7=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/modules/client.js | 10 ++- apis/modules/order.js | 4 + apis/request.js | 2 +- manifest.json | 2 +- pages.json | 33 +++----- pages/addCourse/addCourse.vue | 4 +- pages/agreement/agreement.vue | 45 ----------- pages/clients/clients.vue | 63 ++++++++------- pages/detail/detail.vue | 57 +++++++++----- pages/editCourse/editCourse.vue | 9 ++- pages/index/index.vue | 48 ++++++----- pages/login/login.vue | 27 +++---- pages/orderDetail/orderDetail.vue | 13 ++- pages/orders/orders.vue | 113 ++++++++++++++------------ pages/plans/plans.vue | 127 ++++++++++++++++++++++-------- pages/products/products.vue | 3 +- static/image/avatar.png | Bin 3084 -> 1740 bytes static/image/course1.png | Bin 3709 -> 2365 bytes static/image/login1.png | Bin 37135 -> 13967 bytes static/image/login2.png | Bin 8018 -> 5900 bytes static/image/logo.png | Bin 11671 -> 5625 bytes static/image/none.png | Bin 27957 -> 10577 bytes static/image/person-bg.png | Bin 99560 -> 42340 bytes static/image/person1.png | Bin 1318 -> 658 bytes static/image/person2.png | Bin 1380 -> 754 bytes static/image/person3.png | Bin 1212 -> 643 bytes static/image/phone.png | Bin 367 -> 332 bytes static/image/qrcode.png | Bin 666 -> 346 bytes static/image/tab1-1.png | Bin 702 -> 444 bytes static/image/tab1.png | Bin 724 -> 441 bytes static/image/tab2-1.png | Bin 1096 -> 645 bytes static/image/tab2.png | Bin 1139 -> 612 bytes static/image/tab3-1.png | Bin 790 -> 487 bytes static/image/tab3.png | Bin 805 -> 467 bytes static/image/wechat.png | Bin 698 -> 597 bytes 35 files changed, 312 insertions(+), 248 deletions(-) delete mode 100644 pages/agreement/agreement.vue diff --git a/apis/modules/client.js b/apis/modules/client.js index 3cdef8d..00d79da 100644 --- a/apis/modules/client.js +++ b/apis/modules/client.js @@ -6,7 +6,11 @@ export const queryCustomer = (data) => { } export const list = (data) => { - return post('nakadai/nakadai/customer/GetCustomerListBasedOnBusinessManagerId', data) + return post('nakadai/applets/customer/getCustomerListBasedOnBusinessManagerId', data) +} + +export const all = (data) => { + return post('nakadai/applets/customer/allClientsOfTheTeam', data) } export const queryCustomerDetails = (data) => { @@ -39,4 +43,8 @@ export const updateCustomer = (data) => { export const getProductsSubscribedByCustomers = (data) => { return get('nakadai/nakadai/customer/getProductsSubscribedByCustomers', data) +} + +export const getTeamsByAccountId = (data) => { + return post('nakadai/applets/customer/getTeamsByAccountId', data) } \ No newline at end of file diff --git a/apis/modules/order.js b/apis/modules/order.js index 78b6b3f..0ec1924 100644 --- a/apis/modules/order.js +++ b/apis/modules/order.js @@ -19,4 +19,8 @@ export const getDetail = (data) => { export const renew = (data) => { return post('nakadai/nakadai/orderOther/renew', data) +} + +export const list = (data) => { + return post('nakadai/applets/order/getOrderBasedOnBusinessManagerId', data) } \ No newline at end of file diff --git a/apis/request.js b/apis/request.js index d513239..81c964d 100644 --- a/apis/request.js +++ b/apis/request.js @@ -12,7 +12,7 @@ const request = options => { }) } const header = Object.assign({}, config.headers, { - token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzODc2NDczLCJleHAiOjE2NTM5MTk2NzMsImFjY291bnRJZCI6IjEifQ.sX2qEUJk_EzltbrLOos_ZFuyj_5OrXFhvq_qahbIfmc' + token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjU0MTM1MDg4LCJleHAiOjE2NTQxNzgyODgsImFjY291bnRJZCI6IjEifQ.wSb1OgO7vfJoRRNe9tHirTAiTd7vHQLsKFU58cQTe84' }) return new Promise((resolve, reject)=>{ const { url } = options diff --git a/manifest.json b/manifest.json index c1f6e37..a17a7af 100644 --- a/manifest.json +++ b/manifest.json @@ -49,7 +49,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 小程序特有相关 */ - "appid" : "wx3a64f97291b0b976", + "appid" : "wx77a8a2a23138998b", "setting" : { "urlCheck" : false }, diff --git a/pages.json b/pages.json index daa5377..feb93be 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,11 @@ { "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "首页" + } + }, { "path" : "pages/login/login", "style" : @@ -16,19 +22,19 @@ "enablePullDownRefresh": true } }, - { - "path" : "pages/products/products", + { + "path" : "pages/clients/clients", "style" : { - "navigationBarTitleText": "产品", + "navigationBarTitleText": "客户列表", "enablePullDownRefresh": true } }, - { - "path" : "pages/clients/clients", + { + "path" : "pages/products/products", "style" : { - "navigationBarTitleText": "客户列表", + "navigationBarTitleText": "产品", "enablePullDownRefresh": true } }, @@ -40,12 +46,6 @@ "enablePullDownRefresh": true } }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页" - } - }, { "path" : "pages/clientDetail/clientDetail", "style" : @@ -158,15 +158,6 @@ "enablePullDownRefresh": false } } - ,{ - "path" : "pages/agreement/agreement", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } ], "condition": { //模式配置,仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) diff --git a/pages/addCourse/addCourse.vue b/pages/addCourse/addCourse.vue index 3d4f4d2..291519e 100644 --- a/pages/addCourse/addCourse.vue +++ b/pages/addCourse/addCourse.vue @@ -11,7 +11,7 @@ @@ -167,7 +167,7 @@ marketPrice: e.marketPrice, // 市场单价 finalPrice: this.orderType === 2 ? 0 : '', // 成交价 discountRate: '', // 折扣率 - accountNum: '', // 账号数 + accountNum: e.productType === 2 ? '' : 1, // 账号数 totalAmount: '', // 总价 isEnable: 1, // 启用否:1启用,0禁用 ship: 0, // 发货否(0未发货,1已发货,默认不发货) diff --git a/pages/agreement/agreement.vue b/pages/agreement/agreement.vue deleted file mode 100644 index 8de3cfe..0000000 --- a/pages/agreement/agreement.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - - diff --git a/pages/clients/clients.vue b/pages/clients/clients.vue index cbc8c7b..406879a 100644 --- a/pages/clients/clients.vue +++ b/pages/clients/clients.vue @@ -11,29 +11,33 @@ -