commit -m 修复

pages/login/login.vue

@@ -76,6 +76,19 @@
 				>忘记密码?</view
 			>
 		</template>
+		<!-- 弹窗提示 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			@cancel="modal = false"
+			:content="modalContent"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
 	</view>
 </template>
 
@@ -112,7 +125,24 @@ export default {
 			mobileCodeText: '获取验证码',
 			mobilTime: null,
 			isDisabled: true,
-			isUnderLogin:false
+			isUnderLogin:false,
+			modal:false,
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '去修改',
+					customStyle: {
+						color: '#fff',
+						bgColor: '#F3B574'
+					},
+					plain: false
+				}
+			],
+			modalContent:''
 		}
 	},
 	onLoad(option) {
@@ -245,10 +275,20 @@ export default {
 				   this.$api.switchTabTo('/pages/tabBar/user/user')
 				}
 				uni.removeStorageSync('LOGIN_REDIRECT_URL')
-			} else {
+			} else if(data.code === -3) {
+				this.modal = true
+				this.modalContent = data.msg
+			}else{
 				this.$util.msg(data.msg, 2000)
 			}
 		},
+		handleClick(e) {
+			//确认删除
+			if (e.index == 1) {
+				this.$api.navigateTo('/pages/login/register-unid')
+			}
+			this.modal = false
+		},
 		navigatorRegirst(url) {
 			this.$api.navigateTo(url)
 		},

pages/tabBar/user/user.vue

@@ -258,7 +258,7 @@ export default {
 			try{
 				const res = await this.UserService.GetClubObtainCenter({ userId: this.userId })
 				let data = res.data
-				this.underInfo = { ...this.underInfo , ...data.user } 
+				this.underInfo = { ...this.underInfo , ...data.club } 
 			}catch(e){
 				this.$util.msg(error.msg, 2000)
 			}

pages/user/pay/card-order.vue

@@ -98,7 +98,7 @@
 								</view>
 							</view>
 						</view> -->
-						<!-- <view class="pay-item" @click="tabClick(1)" v-if="showB2BpayMode">
+						<view class="pay-item" @click="tabClick(1)" v-if="showB2BpayMode">
 							<view class="pay-item-cell">
 								<view class="item-icon"><text class="iconfont icon-qiyewangyinzhifu"></text></view>
 								<view class="item-texts"><text>企业网银支付</text></view>
@@ -121,7 +121,7 @@
 									></text>
 								</view>
 							</view>
-						</view> -->
+						</view>
 					</view>
 					<view class="pay-statustext">
 						<view class="pay-statustext-inner">

pages/user/pay/mixins/cardMixins.js

@@ -84,7 +84,7 @@ const cardMixins = {
             // }else{
             //     this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2 
             // }
-            this.tabClick(3)
+            this.tabClick(1)
         }
     }
 }

services/config.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002' // 陈凯联调
-    // URL_CONFIG = 'https://core-b.caimei365.com'
-    URL_CONFIG = 'https://core.caimei365.com'  
+    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core.caimei365.com'  
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'