diff --git a/api/model/login.js b/api/model/login.js
index 42c5d5f..c818a04 100644
--- a/api/model/login.js
+++ b/api/model/login.js
@@ -10,6 +10,12 @@ const api = {
limit : 500,
showLoading : true,
},
+ // 获取绑定手机号码
+ bindPhone: {
+ url: '/login_common/bindPhone',
+ method: 'GET',
+ auth: true,
+ },
// 修改个人信息接口
updateInfo: {
url: '/info_common/updateInfo',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4fc8614..4618437 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,7 +7,11 @@
- -->
+
+
diff --git a/pages/index/member.vue b/pages/index/member.vue
index 3c45927..05ff505 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -336,7 +336,7 @@
.middlex-minBox {
display: flex;
flex-direction: column;
- padding: 60rpx 0rpx 0rpx 40rpx;
+ padding: 60rpx 0rpx 30rpx 40rpx;
font-size: 24rpx;
color: #474747;
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 73d06f4..038c1d6 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -6,6 +6,9 @@
欢迎使用{{ configList.logo_name }}
+
+
+
@@ -15,9 +18,25 @@
微信授权登录
-
+
+
+
+
+ 取消登录
+
@@ -58,22 +77,29 @@
}
},
methods: {
-
- wxLogin(){
+ getPhoneNumber(e){
+ console.log(e, e.detail.code);
+ this.wxLogin(phoneCode)
+ },
+ wxLogin(phoneCode){
if(!this.checkboxValue.length){
return uni.showToast({
title: '请先同意隐私协议',
icon:'none'
})
}
- this.$store.commit('login')
+ this.$store.commit('login', phoneCode)
},
//打开应用配置
openConfigDetail(key){
this.$refs.popup.open(key)
- }
-
+ },
+ qux(){
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ },
}
}
@@ -112,6 +138,7 @@
}
}
.btn{
+ all: unset;
width: 80%;
height: 100rpx;
background-color: $uni-color;
@@ -121,6 +148,10 @@
align-items: center;
margin: 20rpx 0;
border-radius: 20rpx;
+ border: none;
+ &::after{
+
+ }
.icon{
margin-right: 10rpx;
image{
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 24fa41d..738bc6d 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -1,5 +1,8 @@
+
+
+
{{ configList.logo_name }}
@@ -13,7 +16,7 @@
头像
-
@@ -26,9 +29,34 @@
+ v-model="userInfoForm.nickName" />
+
+
+ 手机号
+
+
+
+
+
+
+
+
+
+
+
+
+
确认
@@ -39,21 +67,44 @@
export default {
data() {
return {
- userInfo: {
+ userInfoForm: {
headImage: '',
nickName: '',
+ phone : '',
}
};
},
onShow() {},
+ onLoad() {
+ this.userInfoForm.phone = this.userInfo.phone || ''
+ this.userInfoForm.nickName = this.userInfo.nickName || ''
+ this.userInfoForm.headImage = this.userInfo.headImage || ''
+ },
computed: {},
methods: {
onChooseAvatar(res) {
let self = this
self.$Oss.ossUpload(res.target.avatarUrl)
- .then(url => {
- self.userInfo.headImage = url
- })
+ .then(url => {
+ self.userInfoForm.headImage = url
+ })
+ },
+ getPhone(e){
+ this.$api('bindPhone', {
+ phoneCode : e.detail.code
+ }, res => {
+ if(res.code == 200){
+ let phoneObj = JSON.parse(res.result)
+ if(phoneObj.errmsg == 'ok'){
+ this.userInfoForm.phone = phoneObj.phone_info.phoneNumber
+ }else{
+ uni.showModal({
+ title: phoneObj.errmsg
+ })
+ }
+ console.log(phoneObj);
+ }
+ })
},
submit() {
let self = this
@@ -65,18 +116,20 @@
})
.exec((res) => {
const nickName = res?.[0]?.value
- self.userInfo.nickName = nickName
+ self.userInfoForm.nickName = nickName
- if (self.$utils.verificationAll(self.userInfo, {
+ if (self.$utils.verificationAll(self.userInfoForm, {
headImage: '请选择头像',
nickName: '请填写昵称',
+ phone: '请填写昵称',
})) {
return
}
self.$api('updateInfo', {
- avatarUrl : self.userInfo.headImage,
- nickName : self.userInfo.nickName
+ avatarUrl : self.userInfoForm.headImage,
+ nickName : self.userInfoForm.nickName,
+ phone : self.userInfoForm.phone,
}, res => {
if (res.code == 200) {
uni.reLaunch({
@@ -98,6 +151,16 @@
justify-content: center;
align-items: center;
height: 80vh;
+ .logo{
+ height: 140rpx;
+ width: 140rpx;
+ image{
+ height: 140rpx;
+ width: 140rpx;
+ border-radius: 30rpx;
+ }
+ margin-bottom: 20rpx;
+ }
.title {
line-height: 45rpx;
@@ -132,5 +195,18 @@
border-radius: 15rpx;
margin-top: 10vh;
}
+ .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;
+ }
}
\ No newline at end of file
diff --git a/pages_order/home/addEnterprise.vue b/pages_order/home/addEnterprise.vue
index 757d7fb..f3f1533 100644
--- a/pages_order/home/addEnterprise.vue
+++ b/pages_order/home/addEnterprise.vue
@@ -1,12 +1,27 @@
-
+
-
- 申请信息
+
+
+ 成为渠道商
+
+
+
+
+
+ ①{{ configList.qu_price_keyValue }}
+
+ ②{{ configList.qu_price_money_keyValue }}
+
+
+
+
+
+
+ 申请信息
类型
@@ -29,7 +44,7 @@
身份证
+ v-if="form.type">身份证正反面
营业执照
@@ -48,14 +63,27 @@
-
+
姓名
-
+
+
+
+ 企业名称
+
+
+
+
+
+
性别
@@ -82,10 +110,10 @@
- 身份证号
+ 身份证号码
+ :disabled="isUpdate" placeholder="请输入身份证号码" clearable>
@@ -213,15 +241,17 @@
this.form.image = this.fileList.map((item) => item.url).join(",")
let p = {
- image: '请上传店铺照片',
- name: '请输入您的姓名',
+ image: '请上传营业执照',
+ name: '请输入您的企业名称',
phone: '请输入联系电话',
no: '请输入社会信用代码',
address: '请输入邮寄地址',
}
if(this.form.type){
- p.no = '请输入身份证号'
+ p.no = '请输入身份证号码'
+ p.name = '请输您的入姓名'
+ p.image = '请上传身份证正反面'
}
if (this.$utils.verificationAll(this.form, p)) {
@@ -251,7 +281,11 @@
this.$api('getCommonUser', res => {
if(res.code == 200){
- this.form = res.result
+ this.form = res.result || this.form
+
+ if(!this.form.id){
+ return
+ }
delete this.form.userId
delete this.form.createTime
@@ -277,9 +311,17 @@
* {
box-sizing: border-box;
}
+
+ .heeng{
+ width: 10rpx;
+ height: 40rpx;
+ background-color: #f78142;
+ border-radius: 10rpx;
+ overflow: hidden;
+ margin-right: 10rpx;
+ }
.applyLaundryStore {
- padding: 0 20rpx 0 20rpx;
background-color: #f5f5f5;
.frame {
@@ -289,6 +331,18 @@
background-color: #FFF;
margin-top: 20rpx;
padding: 20rpx;
+
+ .title-nav{
+ text-align: center;
+ font-size: 40rpx;
+ font-weight: 900;
+ }
+
+ .desc{
+ padding: 0 20rpx;
+ font-size: 28rpx;
+ line-height: 46rpx;
+ }
.title {
display: flex;
diff --git a/pages_order/mine/recommend - 副本.vue b/pages_order/mine/recommend - 副本.vue
new file mode 100644
index 0000000..fa4bce3
--- /dev/null
+++ b/pages_order/mine/recommend - 副本.vue
@@ -0,0 +1,89 @@
+
+
+
+
+
+ {{ total }}
+ 直推人数
+
+
+
+ 推广明细
+
+
+
+
+
+ {{ vipType[item.isPay] }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/mine/recommend.vue b/pages_order/mine/recommend.vue
index fa4bce3..61e47bb 100644
--- a/pages_order/mine/recommend.vue
+++ b/pages_order/mine/recommend.vue
@@ -1,6 +1,16 @@
+
+
+
+
+
{{ total }}
@@ -8,22 +18,36 @@
- 推广明细
+
-
-
-
-
- {{ vipType[item.isPay] }}
-
-
-
-
+
+
+
+
+
+ 昵称：
+ {{ item.nickName }}
+
+
+ 上级ID：
+ {{ item.shareId && item.shareId.substring(0, 8) }}...
+
+
+
+
+
+ 级别：
+ 直属下级
+
+
+ 时间：
+ {{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
+
+
@@ -50,10 +74,26 @@
.page {
background-color: #F3F3F3;
height: 100vh;
+ .search {
+ position: relative;
+ background: #FFFFFF;
+ margin: 20rpx;
+ border-radius: 41rpx;
+ padding: 10rpx 20rpx;
+ display: flex;
+ align-items: center;
+
+ /deep/ .uv-search__action {
+ background-color: $uni-color;
+ color: #FFFFFF;
+ padding: 10rpx 20rpx;
+ border-radius: 30rpx;
+ }
+ }
.top {
display: flex;
- height: 400rpx;
+ height: 200rpx;
justify-content: center;
align-items: center;
color: #474747;
@@ -73,9 +113,40 @@
}
.cell {
- margin: 20rpx;
- background-color: #FFFFFF;
- border-radius: 16rpx;
+ .cell-box{
+ border-radius: 16rpx;
+ margin: 20rpx;
+ background-color: #FFFFFF;
+ padding: 20rpx;
+ display: flex;
+ align-items: center;
+ .headImage{
+ width: 120rpx;
+ height: 120rpx;
+ margin-right: 20rpx;
+ flex-shrink: 0;
+ image{
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ }
+ }
+ .info{
+ flex: 1;
+ font-size: 22rpx;
+ flex-shrink: 0;
+ view{
+ width: 240rpx;
+ overflow:hidden; //超出的文本隐藏
+ text-overflow:ellipsis; //溢出用省略号显示
+ white-space:nowrap; //溢出不换行
+ }
+ text{
+ font-weight: 900;
+ color: #474747;
+ }
+ }
+ }
.cell-top {
diff --git a/pages_order/mine/withdraw.vue b/pages_order/mine/withdraw.vue
index 34f9ca4..d8f8133 100644
--- a/pages_order/mine/withdraw.vue
+++ b/pages_order/mine/withdraw.vue
@@ -9,18 +9,31 @@
-
+
-
+
全部提现
+
+
+
+
+
+
+
+
+
+
可提现金额：{{ riceInfo.canWithdraw || 0 }}
@@ -80,7 +93,9 @@
type : ['+', '-'],
state : ['未到账', '已到账'],
form : {
- money : 0,
+ money : '',
+ bankNo : '',
+ bankName : '',
},
}
},
@@ -98,7 +113,9 @@
submit(){
if(this.$utils.verificationAll(this.form, {
- money : '请输入金额'
+ money : '请输入金额',
+ bankName : '请输入开户行',
+ bankNo : 'bankNo',
})){
return
}
@@ -117,7 +134,7 @@
title: '提现成功',
icon : 'none'
})
- this.form.money = 0
+ this.form.money = ''
this.$store.commit('getUserInfo')
this.$store.commit('getRiceInfo')
this.getData()
@@ -132,7 +149,7 @@
.page{
.bg{
background-color: $uni-color;
- height: 380rpx;
+ height: 640rpx;
position: absolute;
left: 0;
width: 100%;
@@ -159,8 +176,8 @@
margin: 20rpx 0;
.input{
color: #000;
- font-size: 40rpx;
- font-weight: 900;
+ // font-size: 40rpx;
+ // font-weight: 900;
display: flex;
flex: 1;
input{
diff --git a/static/image/home/logo.png b/static/image/home/logo.png
index d0be97b..cc893f5 100644
Binary files a/static/image/home/logo.png and b/static/image/home/logo.png differ
diff --git a/store/store.js b/store/store.js
index fe745f1..52d0db8 100644
--- a/store/store.js
+++ b/store/store.js
@@ -23,6 +23,7 @@ const store = new Vuex.Store({
if(res.code == 200){
res.result.forEach(n => {
state.configList[n.keyName] = n.keyContent
+ state.configList[n.keyName + '_keyValue'] = n.keyValue
})
}
})
@@ -36,7 +37,7 @@ const store = new Vuex.Store({
// })
// })
},
- login(state){
+ login(state, phoneCode){
uni.showLoading({
title: '登录中...'
})
@@ -47,7 +48,8 @@ const store = new Vuex.Store({
}
let data = {
- code : res.code
+ code : res.code,
+ phoneCode,
}
if(uni.getStorageSync('shareId')){
@@ -65,7 +67,10 @@ const store = new Vuex.Store({
state.userInfo = res.result.userInfo
uni.setStorageSync('token', res.result.token)
- if(!state.userInfo.nickName || !state.userInfo.headImage){
+ if(!state.userInfo.nickName
+ || !state.userInfo.headImage
+ || !state.userInfo.phone
+ ){
uni.navigateTo({
url: '/pages_order/auth/wxUserInfo'
})
@@ -80,6 +85,24 @@ const store = new Vuex.Store({
api('getInfo', res => {
if(res.code == 200){
state.userInfo = res.result
+
+ if(!state.userInfo.nickName
+ || !state.userInfo.headImage
+ || !state.userInfo.phone
+ ){
+ uni.showModal({
+ title: '小程序申请获取你的手机号！',
+ cancelText: '稍后补全',
+ confirmText: '现在补全',
+ success(e) {
+ if(e.confirm){
+ uni.navigateTo({
+ url: '/pages_order/auth/wxUserInfo'
+ })
+ }
+ }
+ })
+ }
}
})
},