diff --git a/common/js/request.js b/common/js/request.js index 4a28a3e..99dcf8d 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -11,9 +11,9 @@ export default { title: '加载中' }) // request 触发前拼接 url - // args.url = 'https://www.opsoul.com:8881' + args.url; + args.url = 'https://www.opsoul.com:8881' + args.url; // args.url = 'http://192.168.2.60:80' + args.url; - args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'http://127.0.0.1:80' + args.url; if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') { args.data.deptId = globalData.deptId; args.data.from = globalData.from; @@ -121,7 +121,8 @@ export default { async login() { let userInfo = await wx.getUserProfile({ desc: '用于小程序登录' - }); + }); + console.log(userInfo) // 获取微信登录凭证 const wxLoginRes = await wx.login(); // 获取openid diff --git a/components/vertify/vertify-login.vue b/components/vertify/vertify-login.vue index 21fccc1..75353a8 100644 --- a/components/vertify/vertify-login.vue +++ b/components/vertify/vertify-login.vue @@ -4,9 +4,7 @@ - 需先授权微信登录才可正常使用功能,小程序将获取并使用以下信息: - 1.微信昵称 - 2.微信头像 + 需先授权微信登录才可正常使用功能 拒绝授权 diff --git a/pages.json b/pages.json index 0d46427..6a9318d 100644 --- a/pages.json +++ b/pages.json @@ -24,7 +24,9 @@ }] }, { "root": "pages/my/", - "pages": [{ + "pages": [{ + "path": "edit-user-basic-info" + }, { "path": "my-order" }, { "path": "my-cart" diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue index e5e03bf..1bb82a1 100644 --- a/pages/index/my-home.vue +++ b/pages/index/my-home.vue @@ -4,9 +4,10 @@ + :style="'width: 120rpx; height: 120rpx; background-image:url(' + curUserInfo.customerLogoUrl + ');'" + @click="getWxUserBasicInfo"> - {{curUserInfo.name}} + {{curUserInfo.name}} {{myInfo.vipInfo.level}}会员 @@ -359,6 +360,9 @@ appQrcode: '', appShareQrcodeModal: false } + }, + onShow() { + this.loadData(); }, onReady() { this.loadData(); @@ -369,6 +373,11 @@ this.curUserInfo = this.$request.getCurUserInfo(); this.myInfo = await this.$api.data('myInfo'); }, + getWxUserBasicInfo() { + uni.navigateTo({ + url: '/pages/my/edit-user-basic-info' + }) + }, showMyOrders(tabHeaderList, tabCur, orderType) { let tabInfo = { orderType: orderType, diff --git a/pages/my/edit-user-basic-info.vue b/pages/my/edit-user-basic-info.vue new file mode 100644 index 0000000..63e093a --- /dev/null +++ b/pages/my/edit-user-basic-info.vue @@ -0,0 +1,74 @@ + + + diff --git a/pages/my/my-operator.vue b/pages/my/my-operator.vue index b91e8fa..19e78e3 100644 --- a/pages/my/my-operator.vue +++ b/pages/my/my-operator.vue @@ -151,7 +151,7 @@ code: 'showTeamMembers', name: '查看团队' }, { - code: '', + code: 'showCustomers', name: '查看客户' }, { code: '', @@ -222,9 +222,13 @@ break; case 'showTeamMembers': uni.navigateTo({ - url: '/pages/my/my-team-member' + url: '/pages/my/my-team-member?placeStatus=2' }) - break; + break; + case 'showCustomers': + uni.navigateTo({ + url: '/pages/my/my-team-member' + }) default: break; } diff --git a/pages/my/my-team-member.vue b/pages/my/my-team-member.vue index c48efff..9487ef2 100644 --- a/pages/my/my-team-member.vue +++ b/pages/my/my-team-member.vue @@ -69,14 +69,18 @@ members: [], curUserInfo: {}, pageNum: 0, - pageSize: 0 + pageSize: 0, + placeStatus: null } }, - onLoad() { - this.loadData(); + onLoad(option) { + this.loadData(option); }, methods: { - async loadData() { + async loadData(option) { + if (option && option.placeStatus != undefined) { + this.placeStatus = this.option.placeStatus + } this.curUserInfo = this.$request.getCurUserInfo(); this.resetData(); // this.myOperaMembers = await this.$api.data('myOperaMembers'); @@ -96,7 +100,9 @@ params.pageSize = this.pageSize; params.customerPlace = this.curUserInfo.customerId; params.isDistributor = true; - params.placeStatus = 2; + if (this.placeStatus != null && this.placeStatus != undefined) { + params.placeStatus = this.placeStatus; + } params.status = 0; this.$refs.loadStatusBar.showLoading(); try {