修复问题

common/config/common.js

@@ -54,6 +54,16 @@ const utils = {
 		bankNum = num.replace(/\D/g, '').replace(/(....)(?=.)/g, '$1 ');
 		return bankNum
 	},
+	checkData:function(value){
+		console.log(value)
+		let data;
+		if(value == null || value ==""){
+			data = ''
+		}else{
+			data = value
+		}
+		return data
+	},
 	formatDate: function(formatStr, fdate) {
 		//日期格式化
 		if (fdate) {
@@ -109,5 +119,6 @@ module.exports = {
 	formatNum:utils.formatNum,
 	rmoney: utils.rmoney,
 	formatDate: utils.formatDate,
-	bankRegex: utils.bankRegex
+	bankRegex: utils.bankRegex,
+	checkData:utils.checkData
 }

common/config/config.js

@@ -1,10 +1,10 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

market/pages/cart/cart.vue

@@ -8,10 +8,9 @@
 						<view v-for="(item, index) in goodsList" :key="index" class="goods-item">
 							<view class="shoptitle">
 								<!--选择商店的全部商品 :disabled="isNnder"-->
-								<view class="checkbox-box">
+								<view class="checkbox-box" @click.stop="checkShop(item)">
 									<button class="checkbox iconfont" 
-											:class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']" 									
-											@click.stop="checkShop(item)">
+											:class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']">
 									</button>
 								</view>
 								<view class="text">{{item.name}}</view> 
@@ -23,10 +22,9 @@
 								>
 									<view class="goods-pros-t">
 										<!--选择商品-->
-										<view class="checkbox-box">
+										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)">
 											<button class="checkbox iconfont" 
-													:class="[pros.productsChecked ?'icon-gouxuanl':'icon-weigouxuan']" 
-													@click.stop="ischeck(item,pros,idx)">
+													:class="[pros.productsChecked ?'icon-gouxuanl':'icon-weigouxuan']">
 											</button>
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)"><image :src="pros.mainImage ? pros.mainImage :''" alt="" /></view>
@@ -602,6 +600,7 @@
 			line-height: 80rpx;
 			.checkbox-box{
 				margin-left: 18rpx;
+				padding: 10rpx;
 			}
 			.text{
 				margin-left: 37rpx;
@@ -623,6 +622,7 @@
 			padding:0 0 26rpx 0;
 			.checkbox-box{
 				margin-left: 22rpx;
+				padding: 10rpx
 			}
 			.pros-img{
 				width: 210rpx;

pages/login/apply.vue

@@ -363,7 +363,7 @@ import { mapMutations } from 'vuex';
 						}else{
 							this.addressData.townID = organizationClub.townID
 						}
-						this.addressData.address = organizationClub.provincialAddress
+						this.addressData.address = organizationClub.provincialAddress?organizationClub.provincialAddress:''
 						this.addressData.addressDetail = organizationClub.address
 						this.socialCreditCode = organizationClub.socialCreditCode
 						this.firstClubType = organizationClub.firstClubType
@@ -454,7 +454,7 @@ import { mapMutations } from 'vuex';
 						info : this.companyPprofile
 				}
 				organizationModifyUpdate(params).then(response =>{
-					this.$util.msg(response.msg,2000);
+					this.$util.msg('修改成功',2000,true,'success')
 					setTimeout(()=>{
 						this.$api.switchTabTo('/pages/tabBar/home/home')
 					},2000)
@@ -693,6 +693,11 @@ import { mapMutations } from 'vuex';
 			showCheckPhone(){//控制修改手机显隐
 				this.isShowCheckPhone = !this.isShowCheckPhone
 			},
+			checkDataNullFn(res){
+				let data;
+				data = res ? res :''
+				return data
+			},
 			steps(index) {//$attrstab切换
 				this.tabCurrentIndex = index;
 			}

pages/login/information.vue

@@ -388,10 +388,10 @@
 						this.socialCreditCode = organizationClub.socialCreditCode
 						this.firstClubType = organizationClub.firstClubType
 						this.secondClubType = organizationClub.secondClubType
-						this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
-						this.uploadBusinessImage = organizationClub.businessLicenseImage
-						this.uploadMedicalImage = organizationClub.medicalPracticeLicenseImg
-						this.uploadMentuzImage = organizationClub.headpic
+						this.addressData.address =  organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
+						this.uploadBusinessImage = organizationClub.businessLicenseImage ? organizationClub.businessLicenseImage :''
+						this.uploadMedicalImage = organizationClub.medicalPracticeLicenseImg ? organizationClub.medicalPracticeLicenseImg : ''
+						this.uploadMentuzImage = organizationClub.headpic ? organizationClub.headpic :''
 						this.department = organizationClub.department						
 						this.clubTelePhone = organizationClub.contractPhone ? organizationClub.contractPhone : ''
 						this.clubFax = organizationClub.fax ? organizationClub.fax : ''
@@ -475,7 +475,7 @@
 						info : this.companyPprofile
 				}
 				organizationUpdate(params).then(response =>{
-					this.$util.msg(response.msg,2000);
+					this.$util.msg('修改成功',2000,true,'success')
 					setTimeout(()=>{
 						this.$api.switchTabTo('/pages/tabBar/user/user')
 					},2000)

pages/tabBar/cart/cart.vue

@@ -8,10 +8,10 @@
 						<view v-for="(item, index) in goodsList" :key="index" class="goods-item">
 							<view class="shoptitle">
 								<!--选择商店的全部商品 :disabled="isNnder"-->
-								<view class="checkbox-box">
+								<view class="checkbox-box" @click.stop="checkShop(item)">
 									<button class="checkbox iconfont" 
 											:class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']" 									
-											@click.stop="checkShop(item)" :disabled="item.isDisabled && !isshowDelbtn">
+											:disabled="item.isDisabled && !isshowDelbtn">
 									</button>
 								</view>
 								<view class="text">{{item.name}}</view> 
@@ -23,11 +23,10 @@
 								>
 									<view class="goods-pros-t">
 										<!--选择商品-->
-										<view class="checkbox-box" :class="[pros.validFlag == '3' && !isshowDelbtn ?'disabled' : '']">
+										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)" :class="[pros.validFlag == '3' && !isshowDelbtn ?'disabled' : '']">
 											<button class="checkbox iconfont" 
 													:disabled="pros.validFlag == '3' && !isshowDelbtn"
-													:class="[pros.productsChecked ?'icon-gouxuanl':'icon-weigouxuan']" 
-													@click.stop="ischeck(item,pros,idx)">
+													:class="[pros.productsChecked ?'icon-gouxuanl':'icon-weigouxuan']">
 											</button>
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)"	><image :src="pros.mainImage ? pros.mainImage:''" alt="" /></view>
@@ -670,6 +669,7 @@
 			line-height: 80rpx;
 			.checkbox-box{
 				margin-left: 18rpx;
+				padding: 10rpx;
 			}
 			.text{
 				margin-left: 37rpx;
@@ -691,6 +691,7 @@
 			padding:0 0 26rpx 0;
 			.checkbox-box{
 				margin-left: 22rpx;
+				padding: 10rpx;
 			}
 			.pros-img{
 				width: 210rpx;