update

mobile-code/src/components/app-coupon-sel.vue

@@ -8,7 +8,8 @@
 						<radio value="1" :checked="memberCheck" />
 						<span class="dis-pormpt">您是{{ shopUser.userAsset.member }}级会员，享{{ shopUser.userAsset.discount }}折优惠</span>
 					</div>
-					<div class="app-price app-size-28">-￥{{ totalDiscountPrice }}</div>
+					<!-- <div class="app-price app-size-28">-￥{{ totalDiscountPrice }}</div> -->
+					<div class="app-price app-size-28"></div>
 				</div>
 				<!-- 优惠券优惠 -->
 				<div class="sel-list" v-if="discountArr.indexOf('coupon') > -1">

mobile-code/src/pages/home/components/login-popup.vue

@@ -18,12 +18,13 @@
 				</div>
 				<!-- #endif -->
 				<!-- #ifdef MP-WEIXIN -->
-				<div class="creat-account-btn" v-if="$util.isEmpty(wxInfo)">
+				<!-- <div class="creat-account-btn" v-if="$util.isEmpty(wxInfo)"> -->
+				<div class="creat-account-btn">
 					<button class="button-com red big mini-btn" open-type="getUserInfo" @getuserinfo="getWxAvatar">点击创建头像</button>
 				</div>
-				<div class="creat-account-btn" v-else>
-					<button class="button-com red big mini-btn" open-type="getPhoneNumber" @getphonenumber="getWxMobile" :plain="true">点击生成手机号</button>
-				</div>
+				<!-- <div class="creat-account-btn" v-else>
+					<button class="button-com red big mini-btn" open-type="getPhoneNumber" @getphonenumber="getWxMobile" :plain="true">点击生成手机号</button> -->
+				<!-- </div> -->
 				<!-- #endif -->
 			</template>
 			<!-- 注册完成 -->
@@ -35,7 +36,8 @@
 					<div class="phone-num font-bold">{{ wxPhoneInfo }}</div>
 				</div>
 				<div class="creat-account-btn">
-					<button class="button-com red big" @click="attentionPublish">点击创建账号</button>
+					<!-- <button class="button-com red big" @click="attentionPublish">点击生成手机号</button> -->
+					<button class="button-com red big mini-btn" open-type="getPhoneNumber" @getphonenumber="getWxMobile" :plain="true">点击生成手机号</button>
 					<!-- <button class="button-com red big mini-btn" open-type="getPhoneNumber" @getphonenumber="getWxMobile" :plain="true">点击创建头像</button> -->
 				</div>
 			</template>
@@ -126,9 +128,15 @@ export default {
 					// this.popupShow = true
 					getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(subRes => {
 						console.log('用户信息', subRes)
-						// this.stepIndex = 1
+						uni.showToast({
+							icon: 'success'
+						})
 						this.wxInfo = subRes.data
-						this.popupShow = true
+						// this.$msg('创建用户信息成功！')
+						// this.popupShow = true
+						setTimeout(() => {
+							this.stepIndex = 1
+						}, 1000)
 					})
 				},
 				fail: () => {
@@ -142,9 +150,15 @@ export default {
 			if (e.detail.errMsg === 'getPhoneNumber:ok') {
 				getWxPhone({ iv: e.detail.iv, encryptedData: e.detail.encryptedData }).then(res => {
 					console.log('用户信息', res)
+					uni.showToast({
+						icon: 'success'
+					})
 					this.wxPhoneInfo = res.data.mobile
-					this.stepIndex = 1
 					wxLoginFn(true)
+					
+					setTimeout(() => {
+						this.stepIndex = 2
+					}, 1000)
 				})
 			} else {
 				this.$msg('获取信息失败！')
@@ -200,7 +214,7 @@ export default {
 				@include disFlex(center, flex-start);
 				width: 600px;
 				// height: 94px;
-				margin: 116px auto 62px;
+				margin: 118px auto 62px;
 				padding-left: 40px;
 				padding-bottom: 40px;
 				border-bottom: 1px solid $borderColor;
@@ -210,6 +224,7 @@ export default {
 					}
 				}
 				.phone-num {
+					height: 80px;
 					font-size: 60px;
 					margin-left: 42px;
 					letter-spacing: 3px;

mobile-code/src/pages/home/user.vue

@@ -46,8 +46,8 @@
 					<div class="my-surplus">{{ shopUser.userAsset.balance || 0.00 }}</div>
 				</div>
 				<div class="surplus-right">
-					<!-- <button class="button-com" @click="showPopup">申请会员</button> -->
-					<button class="button-com" v-if="shopUser.isFull != 1" @click="showPopup">申请会员</button>
+					<button class="button-com" @click="showPopup">申请会员</button>
+					<!-- <button class="button-com" v-if="shopUser.isFull != 1" @click="showPopup">申请会员</button> -->
 					<!-- <button class="button-com mini-btn" open-type="getUserInfo" v-if="loginInfo.isFull != 1" @getuserinfo="getWxAvatar">申请会员</button> -->
 					<button class="button-com" @click="pageToFn({
 					url: '/pages/pay/index',

mobile-code/src/pages/pay/index.vue

@@ -254,7 +254,7 @@
 					if (this.option.store) {
 						params.store = this.option.store
 					}
-					if (!this.$util.isEmpty(discountArr)) {
+					if (!this.$util.isEmpty(this.discountArr)) {
 						params.couponId = this.$refs.couponSel.couponId
 					}
 					host = fastPay