diff --git a/api/api.js b/api/api.js index 78742a6..e83360f 100644 --- a/api/api.js +++ b/api/api.js @@ -12,7 +12,7 @@ const config = { // limit : 1000 // }, - getConfig : {url : '/api/getConfig', method : 'GET', limit : 500}, + getConfig : {url : '/login/getConfigInfo', method : 'GET', limit : 500}, // 微信登录接口 @@ -37,6 +37,13 @@ const config = { auth: true, limit : 500, }, + // 绑定手机号码 + bindPhone: { + url: '/login/bindPhone', + method: 'GET', + auth: true, + limit : 500, + }, //隐私政策 getPrivacyPolicy: { url: '/login/getPrivacyPolicy', @@ -363,6 +370,13 @@ const config = { url: '/token/myShop', method: 'GET', auth : true, + }, + + // 领取提现成功 + requestMerchantTransfer : { + url: '/cashout/getMoney', + method: 'GET', + auth : true, } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 5ee0686..bb998fc 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -146,6 +146,7 @@ + @@ -331,8 +332,7 @@ // }else if(!this.userInfo.idCardOpen){ // this.$refs.certificationPopup.open() // }else{ - this.$refs.sharePopup.open(); - + this.$refs.sharePopup.open(); // } }, diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index 74c82fb..8419997 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -84,6 +84,29 @@ {{ form.address || '请选择居住地址'}} + + + 手机号 + + + + + + + + + + + { + if(res.code == 200){ + let phoneObj = JSON.parse(res.result) + if(phoneObj.errmsg == 'ok'){ + this.form.phone = phoneObj.phone_info.phoneNumber + }else{ + uni.showModal({ + title: phoneObj.errmsg + }) + } + console.log(phoneObj); + } + }) + }, onChooseAvatar(res) { let self = this self.$Oss.ossUpload(res.target.avatarUrl) @@ -187,6 +228,8 @@ this.form.sex = res.result.sex || this.form.sex + this.form.phone = res.result.phone || this.form.phone + this.form.yearDate = res.result.yearDate && this.$dayjs(res.result.yearDate + '-01-01').valueOf() || this.form.yearDate @@ -210,6 +253,7 @@ headImage: '请选择头像', nickName: '请填写昵称', address: '请选择居住地址', + phone: '请获取手机号', })) { return } @@ -293,6 +337,34 @@ margin-top: 30rpx; } + + .line { + display: flex; + justify-content: space-between; + align-items: center; + background-color: #f7f7f7; + width: 600rpx; + height: 80rpx; + padding: 0 30rpx; + margin: 0 auto; + border-radius: 40rpx; + margin-top: 30rpx; + box-sizing: border-box; + .getPhoneNumber{ + // all: unset; + display: flex; + justify-content: center; + align-items: center; + // background: $uni-linear-gradient-btn-color; + background: $uni-color; + color: #fff; + width: 200rpx; + height: 60rpx; + border-radius: 30rpx; + font-size: 24rpx; + } + } + .sexSelect{ background-color: #f7f7f7; width: 600rpx; diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue index c598c92..4b81f0b 100644 --- a/pages_order/mine/purse.vue +++ b/pages_order/mine/purse.vue @@ -13,7 +13,7 @@ - + - + + + + @@ -36,14 +38,19 @@ @click="submit">提交 + + +