Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

pages/login/apply.vue

@@ -292,17 +292,17 @@
 						this.clubID = organizationUser.clubID
 						this.clubName = this.$reg.checkData(organizationClub.name)
 						this.abbreviation = this.$reg.checkData(organizationClub.sname)
-						if( organizationClub.provinceID){
+						if( organizationClub.provinceID==''||organizationClub.provinceID==null){
 							this.addressData.provinceID = ''
 						}else{
 							this.addressData.provinceID = organizationClub.provinceID
 						}
-						if( organizationClub.cityID){
+						if( organizationClub.cityID==''||organizationClub.cityID===null){
 							this.addressData.cityID = ''
 						}else{
 							this.addressData.cityID = organizationClub.cityID
 						}
-						if( organizationClub.townID){
+						if( organizationClub.townID==''||organizationClub.townID==null){
 							this.addressData.townID = ''
 						}else{
 							this.addressData.townID = organizationClub.townID

pages/search/search-second.vue

@@ -21,9 +21,9 @@
 				            {{item.name}}
 				        </view>
 				        <view class="targetprice" >
-				            <text v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</text>
-				            <text v-else-if="!hasLogin" class="priceparam">登录查看价格</text>
-				            <text v-else-if="hasLogin && item.detailTalkFlag==2">价格详聊</text>
+				            <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
+				            <text v-else-if="!hasLogin" class="priceparam" @click.stop="this.$api.navigateTo('/pages/login/login')">登录查看价格></text>
+				            <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
 				            <text v-else>￥{{item.price1Str}}</text>
 				        </view>
 						<view class="shijian">

second/pages/form/introduce.vue

@@ -88,7 +88,8 @@
 	                <view class="button" @click="gotorepair">去维修</view>
 	                <view class="button" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">去首页</view>
 	            <view class="foot_font">
-	                <span style="color: #ADADAD"> 业务咨询/合作请联系：</span><span style="color: #666666;margin-right: 10rpx"> 0755-22907771  </span><span style="color: #ADADAD;">手机：</span><span style="color: #666666">15817465281</span>
+	                <view style="color: #ADADAD"> 业务咨询/合作请联系：<label style="color: #666666;margin-right: 10rpx"> 0755-22907771  </label></view>
+					<view style="color: #ADADAD;">手机：<label style="color: #666666">15817465281</label></view>
 	            </view>
 	        </view>
 	    </view>

supplier/pages/user/information.vue

@@ -787,7 +787,7 @@
 	 .secondTyperadio{
 		 overflow: hidden;
 		 height: auto;
-		 padding: 0 24rpx;
+		 padding: 20rpx 24rpx;
 		 margin-bottom: 20rpx;
 		 color: #999999;
 		 .radio{