Browse Source

Merge branch 'developerC' into developerA

# Conflicts:
#	pages/supplier/deliver/qualifications-details.vue
zhengjinyi 3 năm trước cách đây
mục cha
commit
4e984d2643

+ 17 - 17
pages/login/bindwechat.vue

@@ -71,7 +71,7 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
-	import wxLogin from "@/common/config/wxLogin.js"
+	import wxLogin from '@/common/config/wxLogin.js'
 	export default{
 		data() {
 			return{
@@ -122,7 +122,7 @@
 					this.$util.msg('验证码格式不正确',2000)
 					return
 				}
-				this.isUserInfo = false;
+				this.isUserInfo = false
 				this.GetUserProfile()
 			},
 			GetUserProfile(){//获取用户微信个人信息
@@ -159,14 +159,14 @@
 					}else{
 						switch(this.isLoginType){
 							case 9:
-								this.$api.navigateTo(`/pages/h5/activity/activity_mid`)
-								break;
+								this.$api.navigateTo('/pages/h5/activity/activity_mid')
+								break
 							case 8:
 								this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-								break;
+								break
 							case 7:
-								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-								break;
+								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.isLoginOrderId}`)
+								break
 							default:
 								this.$api.switchTabTo('/pages/tabBar/user/user')
 						}
@@ -184,15 +184,15 @@
 			},
 			getMobileCodeFn(){//获取手机验证码
 				if( this.bindLinkPhone == ''){
-					this.$util.msg('请输入手机号',2000);
+					this.$util.msg('请输入手机号',2000)
 					return
 				}
 				if(!this.$reg.isMobile(this.bindLinkPhone)){
-					this.$util.msg('请输入正确的手机号',2000);
+					this.$util.msg('请输入正确的手机号',2000)
 					return
 				}
 				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
+					this.$util.msg('请输入图形验证码',2000)
 					return
 				}
 				let params = {
@@ -203,20 +203,20 @@
 						imgCode:this.imageCode,
 						token:this.imageCodetoken,
 				}
-				this.isMobileDisabled = true;
+				this.isMobileDisabled = true
 				this.PublicService.GetBindMobileCode(params)
 					.then(res =>{
-						const TIME_COUNT = 60;
+						const TIME_COUNT = 60
 						this.$util.msg('验证短信已发送',2000)
 				     	if (!this.codeTime) {
-				       		this.count = TIME_COUNT;
-							this.isMobileDisabled = true;
+				       		this.count = TIME_COUNT
+							this.isMobileDisabled = true
 				       		this.codeTime = setInterval(() => {
 				       			if (this.count > 1 && this.count <= TIME_COUNT) {
 				         			this.count--
 				         			this.mobileCodeText = this.count +'s重新发送'
 				        		} else {
-					         		this.isMobileDisabled = false;
+					         		this.isMobileDisabled = false
 					         		clearInterval(this.codeTime)
 					         		this.codeTime = null
 									this.mobileCodeText = '获取验证码'
@@ -226,12 +226,12 @@
 					})
 					.catch( error =>{
 						this.$util.msg(error.msg,2000)
-						this.isMobileDisabled = false;
+						this.isMobileDisabled = false
 					})
 			},
 			//关闭未授权用户授权提示弹窗
 			hideModel(){
-				this.isUserInfo = false;
+				this.isUserInfo = false
 			}
 		},
 		onShow() {

+ 1 - 1
pages/supplier/deliver/qualifications-add.vue

@@ -57,7 +57,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="qualifications-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0'}">
+		<view class="qualifications-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '24rpx'}">
 			<view class="edit-button-canel" @click="editButtonCanel">暂不填写</view>
 			<view class="edit-button" @click="editButtonConfim">确定</view>
 		</view>

+ 1 - 1
pages/supplier/deliver/qualifications-details.vue

@@ -24,7 +24,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="qualifications-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0' }">
+			<view class="qualifications-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '24rpx' }">
 				<view class="edit-button" @click="editSubmitFn('edit')">编辑</view>
 			</view>
 		</view>