diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index e2e01c58b..50e1262ab 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -48,7 +48,13 @@ - + + + + + + + @@ -282,6 +288,7 @@ duration: 0.2 // 下划线动画时长 } }, + computed: mapGetters(['tenantInfo']), watch: { ProductNavindex(newVal) { // 监听当前选中项 this.setTabList() @@ -353,7 +360,21 @@ }) }, methods: { + handleCustomer(value){ + switch (value) { + case '电话客服': + if(this.tenantInfo.serviceMobile){ + window.location.href = `tel:${this.tenantInfo.serviceMobile}` + } + break; + case '微信客服': + if (this.tenantInfo.wxKfUrl) { + location.href = this.tenantInfo.wxKfUrl + } + break; + } + }, goUrl(e) { let url = '' if (this.bannerList[e].url.indexOf('http') >= 0) { @@ -738,7 +759,7 @@ justify-content: space-around; align-items: center; position: absolute; - top: 109rpx; + top: 8%; .left { width: 164rpx; @@ -819,7 +840,7 @@ .header_bottom { position: absolute; margin-left: 43rpx; - bottom: 0; + bottom: 12%; width: 664rpx; height: 238rpx; @@ -834,7 +855,7 @@ } .notice { - margin-top: 30rpx; + margin-top: -6%; margin-left: 48rpx; width: 658rpx; height: 67rpx; @@ -845,6 +866,15 @@ align-items: center; } + .customer{ + width: 663rpx; + margin: 4% 44rpx; + height: 310rpx; + image{ + width: 100%; + height: 100%; + } + } .hot { width: 663rpx; @@ -990,6 +1020,7 @@ .container { width: 663rpx; margin-left: 44rpx; + padding-bottom: 10%; display: flex; flex-wrap: wrap; justify-content: space-between; diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue index f0a8ce744..90a84e55b 100644 --- a/yudao-ui-app/pages/member_others/index.vue +++ b/yudao-ui-app/pages/member_others/index.vue @@ -2,6 +2,9 @@ + + + @@ -81,6 +84,12 @@ confirmPhone: '' }, rules: { + userName: [{ + required: true, + message: '姓名不能为空', + // 触发器可以同时用blur和change + trigger: ['change', 'blur'] + }], userPhone: [{ required: true, message: '手机号不能为空', @@ -163,10 +172,11 @@ const orderInfos = this.activeIndex.map((item) => { return { ...this.memberData[item], - gearId: this.memberData[item].id + gearId: this.memberData[item].id, } }) this.payInfo = { + userName:this.form.userName, userPhone: this.form.userPhone, confirmPhone: this.form.confirmPhone, orderInfos @@ -177,7 +187,7 @@ }) } }).catch(errors => { - uni.$u.toast('请检查手机号输入') + // uni.$u.toast('请检查手机号输入') }) }, /** @@ -418,7 +428,7 @@ color: #5C5C5C; } } - + } .member-prompt { display: flex; diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue index 9d22962f9..913a6bd6d 100644 --- a/yudao-ui-app/pages/member_renew/index.vue +++ b/yudao-ui-app/pages/member_renew/index.vue @@ -2,6 +2,9 @@ + + + @@ -44,7 +47,7 @@ import paymentMember from '@/components/paymentMember'; import store from '@/store/index'; export default { - name: "member_application", + name: "member_renew", components: { paymentMember }, @@ -103,7 +106,9 @@ import store from '@/store/index'; try{ const res = await memberGradeInfo() this.memberData = res.data - this.form.userPhone = store.state.app.userInfo.mobile } finally{ + this.form.userPhone = store.state.app.userInfo.mobile + this.form.userName = store.state.app.userInfo.nickName + } finally{ uni.hideLoading(); } }, diff --git a/yudao-ui-app/static/images/phone.png b/yudao-ui-app/static/images/phone.png new file mode 100644 index 000000000..d52267ca0 Binary files /dev/null and b/yudao-ui-app/static/images/phone.png differ diff --git a/yudao-ui-app/static/images/wecheat.png b/yudao-ui-app/static/images/wecheat.png new file mode 100644 index 000000000..863849e13 Binary files /dev/null and b/yudao-ui-app/static/images/wecheat.png differ