diff --git a/apis/modules/article.js b/apis/modules/article.js new file mode 100644 index 0000000..f9e2af9 --- /dev/null +++ b/apis/modules/article.js @@ -0,0 +1,18 @@ +import request from '@/apis/request.js' +const { get, post } = request + +export const partnerOperatingList = (data) => { + return post('nakadai/nakadai/partner/article/management/partnerOperatingList', data) +} + +export const findById = id => { + return post('nakadai/nakadai/applets/partner/browse?contentId=' + id) +} + +export const queryClassificationByType = id => { + return post('nakadai/nakadai/partner/article/classification/queryClassificationByType?typeId=' + id) +} + +export const schemeList = data => { + return post('nakadai/nakadai/partner/schemeManagement/schemeList', data) +} \ No newline at end of file diff --git a/apis/modules/parner.js b/apis/modules/parner.js index 8d9925e..da2adfe 100644 --- a/apis/modules/parner.js +++ b/apis/modules/parner.js @@ -23,4 +23,8 @@ export const my = (data) => { export const mailFileSend = (data) => { return post('nakadai/nakadai/partnerAccount/mailFileSend', data) +} + +export const salesProgress = data => { + return post(`nakadai/nakadai/applets/partner/salesProgress`, data) } \ No newline at end of file diff --git a/apis/modules/user.js b/apis/modules/user.js index 03d5982..88e8df1 100644 --- a/apis/modules/user.js +++ b/apis/modules/user.js @@ -5,6 +5,14 @@ export const login = (data) => { return post('users/users/user/weChatAppletCallbackByPartner', data) } +export const queryProvince = () => { + return get('nakadai/nakadai/province/queryProvince') +} + +export const queryCity = (data) => { + return get('nakadai/nakadai/city/queryCity', data) +} + export const userBinding = (data) => { return post('users/users/user/userBinding', data) } @@ -49,4 +57,24 @@ export const checkIfThePhoneNumberExists = phone => { return post(`users/users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`) } +export const queryPartnerAccount = phone => { + return post(`nakadai/nakadai/partnerAccount/queryPartnerAccount?phone=${phone}`) +} + +export const getSessionKey = data => { + return post(`users/users/user/getSessionKey`, data) +} + +export const partnerAccountApplication = data => { + return post(`nakadai/nakadai/partnerAccount/partnerAccountApplication`, data) +} + +export const loginByOpenid = openid => { + return post(`users/users/user/loginByOpenid?openid=` + openid) +} + +export const checkWorkNumOrAccount = account => { + return post(`occupationlab/occupationlab/architecture/checkWorkNumOrAccount?platformId=4&type=0&account=` + account) +} + export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars` \ No newline at end of file diff --git a/apis/request.js b/apis/request.js index a75d827..e60efea 100644 --- a/apis/request.js +++ b/apis/request.js @@ -14,13 +14,13 @@ const request = options => { const header = Object.assign({}, config.headers, { token: uni.getStorageSync('token') }) - const otherUrl = ['getTeamsByAccountId'] + const otherUrl = ['queryPartnerAccount', 'getSessionKey', 'loginByOpenid', 'partnerAccountApplication', 'checkWorkNumOrAccount'] return new Promise((resolve, reject)=>{ const { url } = options uni.request({ header, - // url: (otherUrl.map(e => config.baseURL.includes(e)) ? 'http://192.168.31.137:9000/' : config.baseURL) + url, - url: config.baseURL + url, + url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.116:9000/' : config.baseURL) + url, + // url: config.baseURL + url, method: options.method || 'GET', // 请求类型，默认为GET data: options.data || {}, // 请求参数，默认空对象 success: ({ data }) => { diff --git a/config/request.js b/config/request.js index 308ce08..3656ab0 100644 --- a/config/request.js +++ b/config/request.js @@ -5,8 +5,8 @@ */ export default { - baseURL: 'https://huorantech.cn/', - // baseURL: 'http://192.168.31.116:9000/', + // baseURL: 'https://huorantech.cn/', + baseURL: 'http://192.168.31.151:9000/', // baseURL: 'http://121.37.12.51/', headers: { 'Content-Type': 'application/json;charset=UTF-8' diff --git a/manifest.json b/manifest.json index ff2358e..01ed783 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "或然crm", + "name" : "或然合伙人运营管理平台", "appid" : "__UNI__2E89BA6", "description" : "", "versionName" : "1.0.0", @@ -54,7 +54,10 @@ "es6" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "optimization": { + "subPackages": true + } }, "vueVersion" : "2" } diff --git a/pages.json b/pages.json index 616762e..a395d8a 100644 --- a/pages.json +++ b/pages.json @@ -15,14 +15,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - }, - { - "path" : "pages/qrcode/qrcode", - "style" : - { - "navigationBarTitleText": "邀请加入", - "enablePullDownRefresh": false - } }, { "path" : "pages/clients/clients", @@ -61,7 +53,7 @@ "style" : { "navigationBarTitleText": "产品方案", - "enablePullDownRefresh": false + "enablePullDownRefresh": true } }, { @@ -79,113 +71,163 @@ "navigationBarTitleText": "下载发送", "enablePullDownRefresh": false } - }, - { - "path" : "pages/password/password", - "style" : - { - "navigationBarTitleText": "修改密码", - "enablePullDownRefresh": false - } - }, - { - "path" : "pages/setting/setting", - "style" : - { - "navigationBarTitleText": "设置", - "enablePullDownRefresh": false - } - }, - { - "path" : "pages/teams/teams", - "style" : - { - "navigationBarTitleText": "团队", - "enablePullDownRefresh": true - } - }, - { - "path" : "pages/account/account", + } + ,{ + "path" : "pages/reg/reg", "style" : { - "navigationBarTitleText": "修改账号", + "navigationBarTitleText": "", "enablePullDownRefresh": false } + } ,{ - "path" : "pages/phone/phone", + "path" : "pages/study/study", "style" : { - "navigationBarTitleText": "修改手机号", - "enablePullDownRefresh": false + "navigationBarTitleText": "学习", + "enablePullDownRefresh": true } + } ,{ - "path" : "pages/email/email", + "path" : "pages/info/info", "style" : { - "navigationBarTitleText": "修改邮箱", - "enablePullDownRefresh": false + "navigationBarTitleText": "资讯", + "enablePullDownRefresh": true } + } ], - "subPackages": [{ - "root": "order", - "pages": [ - { - "path": "orders/orders", - "style" : + "subPackages": [ + { + "root": "order", + "pages": [ { - "navigationBarTitleText": "订单列表", - "enablePullDownRefresh": true - } - }, - { - "path" : "addCourse/addCourse", - "style" : + "path": "orders/orders", + "style" : + { + "navigationBarTitleText": "订单列表", + "enablePullDownRefresh": true + } + }, { - "navigationBarTitleText": "选择产品", - "enablePullDownRefresh": true - } - }, - { - "path" : "orderDetail/orderDetail", - "style" : + "path" : "addCourse/addCourse", + "style" : + { + "navigationBarTitleText": "选择产品", + "enablePullDownRefresh": true + } + }, { - "navigationBarTitleText": "订单详情", - "enablePullDownRefresh": false - } - }, - { - "path" : "ordered/ordered", - "style" : + "path" : "orderDetail/orderDetail", + "style" : + { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false + } + }, { - "navigationBarTitleText": "已订阅产品", - "enablePullDownRefresh": false + "path" : "ordered/ordered", + "style" : + { + "navigationBarTitleText": "已订阅产品", + "enablePullDownRefresh": false + } + }, + { + "path" : "editCourse/editCourse", + "style" : + { + "navigationBarTitleText": "编辑产品", + "enablePullDownRefresh": false + } + }, + { + "path" : "curClient/curClient", + "style" : + { + "navigationBarTitleText": "订单记录", + "enablePullDownRefresh": false + } } - }, - { - "path" : "editCourse/editCourse", - "style" : + ] + }, + { + "root": "team", + "pages": [ + { + "path" : "setting/setting", + "style" : + { + "navigationBarTitleText": "设置", + "enablePullDownRefresh": false + } + }, + { + "path" : "password/password", + "style" : + { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": false + } + }, + { + "path" : "teams/teams", + "style" : + { + "navigationBarTitleText": "团队", + "enablePullDownRefresh": true + } + }, { - "navigationBarTitleText": "编辑产品", - "enablePullDownRefresh": false + "path" : "account/account", + "style" : + { + "navigationBarTitleText": "修改账号", + "enablePullDownRefresh": false + } } - }, - { - "path" : "curClient/curClient", - "style" : - { - "navigationBarTitleText": "订单记录", - "enablePullDownRefresh": false + ,{ + "path" : "phone/phone", + "style" : + { + "navigationBarTitleText": "修改手机号", + "enablePullDownRefresh": false + } + } + ,{ + "path" : "email/email", + "style" : + { + "navigationBarTitleText": "修改邮箱", + "enablePullDownRefresh": false + } + } + ,{ + "path" : "qrcode/qrcode", + "style" : + { + "navigationBarTitleText": "邀请加入", + "enablePullDownRefresh": false + } + } + ,{ + "path" : "article/article", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } } - } ] - }], + } + ], "preloadRule": { - "order/orders/orders": { + "pages/index/index": { "network": "all", - "packages": ["__APP__"] + "packages": ["order"] } }, "condition": { //模式配置，仅开发期间生效 @@ -217,14 +259,19 @@ "selectedIconPath": "static/image/tab1-1.png", "text": "首页" }, { - "pagePath": "pages/teams/teams", + "pagePath": "pages/study/study", "iconPath": "static/image/tab2.png", "selectedIconPath": "static/image/tab2-1.png", - "text": "团队" + "text": "学习" }, { - "pagePath": "pages/person/person", + "pagePath": "pages/info/info", "iconPath": "static/image/tab3.png", "selectedIconPath": "static/image/tab3-1.png", + "text": "资讯" + }, { + "pagePath": "pages/person/person", + "iconPath": "static/image/tab4.png", + "selectedIconPath": "static/image/tab4-1.png", "text": "我的" }] } diff --git a/pages/index/index.vue b/pages/index/index.vue index b794d0f..748699f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -32,6 +32,37 @@ + + + + + 学习速递 + + + + + + 本月新增客户 + 0 + + + 我的客户 + 0 + + + + + 本月新增产品试用 + 0 + + + 试用客户 + 0 + + + + + @@ -48,21 +79,21 @@ 本月新增客户 - 0 + {{ sell.officialProduct }} 我的客户 - 0 + {{ sell.regularUser }} 本月新增产品试用 - 0 + {{ sell.trialProduct }} 试用客户 - 0 + {{ sell.trialUser }} @@ -105,7 +136,7 @@ + + diff --git a/pages/login/login.vue b/pages/login/login.vue index c317734..d2bf190 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -5,13 +5,14 @@ Hi，城市合伙人请登录 @@ -24,7 +25,7 @@ + + diff --git a/pages/study/study.vue b/pages/study/study.vue new file mode 100644 index 0000000..9caf01c --- /dev/null +++ b/pages/study/study.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/static/image/person4.png b/static/image/person4.png index 84b1d54..c4ca57f 100644 Binary files a/static/image/person4.png and b/static/image/person4.png differ diff --git a/static/image/person5.png b/static/image/person5.png new file mode 100644 index 0000000..4d508a6 Binary files /dev/null and b/static/image/person5.png differ diff --git a/static/image/person6.png b/static/image/person6.png new file mode 100644 index 0000000..9ed8244 Binary files /dev/null and b/static/image/person6.png differ diff --git a/static/image/person7.png b/static/image/person7.png new file mode 100644 index 0000000..16f8a7c Binary files /dev/null and b/static/image/person7.png differ diff --git a/static/image/tab2-1.png b/static/image/tab2-1.png index f025de2..1a93aba 100644 Binary files a/static/image/tab2-1.png and b/static/image/tab2-1.png differ diff --git a/static/image/tab2.png b/static/image/tab2.png index 7b4f739..43d8538 100644 Binary files a/static/image/tab2.png and b/static/image/tab2.png differ diff --git a/static/image/tab3-1.png b/static/image/tab3-1.png index 80644ff..2da7ae4 100644 Binary files a/static/image/tab3-1.png and b/static/image/tab3-1.png differ diff --git a/static/image/tab3.png b/static/image/tab3.png index 96461e7..41b4d3a 100644 Binary files a/static/image/tab3.png and b/static/image/tab3.png differ diff --git a/static/image/tab4-1.png b/static/image/tab4-1.png new file mode 100644 index 0000000..80644ff Binary files /dev/null and b/static/image/tab4-1.png differ diff --git a/static/image/tab4.png b/static/image/tab4.png new file mode 100644 index 0000000..96461e7 Binary files /dev/null and b/static/image/tab4.png differ diff --git a/pages/account/account.vue b/team/account/account.vue similarity index 100% rename from pages/account/account.vue rename to team/account/account.vue diff --git a/team/article/article.vue b/team/article/article.vue new file mode 100644 index 0000000..df22695 --- /dev/null +++ b/team/article/article.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/pages/email/email.vue b/team/email/email.vue similarity index 100% rename from pages/email/email.vue rename to team/email/email.vue diff --git a/pages/password/password.vue b/team/password/password.vue similarity index 100% rename from pages/password/password.vue rename to team/password/password.vue diff --git a/pages/phone/phone.vue b/team/phone/phone.vue similarity index 100% rename from pages/phone/phone.vue rename to team/phone/phone.vue diff --git a/pages/qrcode/qrcode.vue b/team/qrcode/qrcode.vue similarity index 100% rename from pages/qrcode/qrcode.vue rename to team/qrcode/qrcode.vue diff --git a/pages/setting/setting.vue b/team/setting/setting.vue similarity index 75% rename from pages/setting/setting.vue rename to team/setting/setting.vue index 34e99a7..17e029f 100644 --- a/pages/setting/setting.vue +++ b/team/setting/setting.vue @@ -7,7 +7,16 @@ - 退出登录 + + + + + + + + + + 退出登录 @@ -36,6 +45,11 @@ size: '22', type: 'locked' }, + locationIcon: { + color: '#007eff', + size: '22', + type: 'location' + }, info: { account: '', phone: '', @@ -49,10 +63,10 @@ methods: { // 获取个人信息 getInfo() { - const team = uni.getStorageSync('team') + const { partnerId, teamId } = uni.getStorageSync('team') my({ - partnerId: team.partnerId, - teamId: team.teamId + partnerId, + teamId }).then(({ my }) => { this.info = my.info }).catch(e => {}) @@ -69,7 +83,7 @@ success(res) { if (res.confirm) { uni.clearStorageSync() - that.$util.to('../login/login') + that.$util.to('/pages/login/login') } } }) @@ -79,6 +93,9 @@