commit -m 楼层广告图无链接处理

components/cm-module/pageFloorTemplate/templateA.vue

@@ -3,7 +3,12 @@
 		<view class="floor-item ad_02">
 			<image class="item-img-gg" 
 				   :src="floorData.floorContent.appletsAdsImage1" 
-				   @click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 				   mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageFloorTemplate/templateB.vue

@@ -3,14 +3,24 @@
 		<view class="floor-item ad_02">
 			<image  class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage2" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType2,
+						floorData.floorContent.linkParam2.id ? floorData.floorContent.linkParam2.id : '',
+						floorData.floorContent.adsLink2,
+						floorData.floorContent.linkParam2.keyword ? floorData.floorContent.linkParam2.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageFloorTemplate/templateC.vue

@@ -3,14 +3,24 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage2" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType2,
+						floorData.floorContent.linkParam2.id ? floorData.floorContent.linkParam2.id : '',
+						floorData.floorContent.adsLink2,
+						floorData.floorContent.linkParam2.keyword ? floorData.floorContent.linkParam2.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageFloorTemplate/templateD.vue

@@ -3,21 +3,36 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage2" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType2,
+						floorData.floorContent.linkParam2.id ? floorData.floorContent.linkParam2.id : '',
+						floorData.floorContent.adsLink2,
+						floorData.floorContent.linkParam2.keyword ? floorData.floorContent.linkParam2.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_03">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage3" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType3,floorData.floorContent.linkParam3.id,floorData.floorContent.adsLink3,floorData.floorContent.linkParam3.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType3,
+						floorData.floorContent.linkParam3.id ? floorData.floorContent.linkParam3.id : '',
+						floorData.floorContent.adsLink3,
+						floorData.floorContent.linkParam3.keyword ? floorData.floorContent.linkParam3.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageFloorTemplate/templateE.vue

@@ -3,7 +3,12 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageTemplate/templateA.vue

@@ -3,7 +3,12 @@
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill" >
 			</image>
 		</view>

components/cm-module/pageTemplate/templateB.vue

@@ -3,14 +3,24 @@
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage2" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType2,
+						floorData.floorContent.linkParam2.id ? floorData.floorContent.linkParam2.id : '',
+						floorData.floorContent.adsLink2,
+						floorData.floorContent.linkParam2.keyword ? floorData.floorContent.linkParam2.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageTemplate/templateC.vue

@@ -3,14 +3,24 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage2" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType2,
+						floorData.floorContent.linkParam2.id ? floorData.floorContent.linkParam2.id : '',
+						floorData.floorContent.adsLink2,
+						floorData.floorContent.linkParam2.keyword ? floorData.floorContent.linkParam2.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageTemplate/templateD.vue

@@ -3,21 +3,36 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_02">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage2" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType2,floorData.floorContent.linkParam2.id,floorData.floorContent.adsLink2,floorData.floorContent.linkParam2.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType2,
+						floorData.floorContent.linkParam2.id ? floorData.floorContent.linkParam2.id : '',
+						floorData.floorContent.adsLink2,
+						floorData.floorContent.linkParam2.keyword ? floorData.floorContent.linkParam2.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>
 		<view class="floor-item ad_03">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage3" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType3,floorData.floorContent.linkParam3.id,floorData.floorContent.adsLink3,floorData.floorContent.linkParam3.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType3,
+						floorData.floorContent.linkParam3.id ? floorData.floorContent.linkParam3.id : '',
+						floorData.floorContent.adsLink3,
+						floorData.floorContent.linkParam3.keyword ? floorData.floorContent.linkParam3.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageTemplate/templateE.vue

@@ -3,7 +3,12 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

components/cm-module/pageTemplate/templateF.vue

@@ -109,7 +109,12 @@
 		<view class="floor-item ad_01">
 			<image 	class="item-img-gg" 
 					:src="floorData.floorContent.appletsAdsImage1" 
-					@click="BannerNavigateTo(floorData.floorContent.linkType1,floorData.floorContent.linkParam1.id,floorData.floorContent.adsLink1,floorData.floorContent.linkParam1.keyword)"
+					@click="BannerNavigateTo(
+						floorData.floorContent.linkType1,
+						floorData.floorContent.linkParam1.id ? floorData.floorContent.linkParam1.id : '',
+						floorData.floorContent.adsLink1,
+						floorData.floorContent.linkParam1.keyword ? floorData.floorContent.linkParam1.keyword : ''
+					)"
 					mode="aspectFill">
 			</image>
 		</view>

pages/login/register-supplier.vue

@@ -290,7 +290,8 @@
 					secondShopType: '',
 					mainpro:'',
 					isAgreed:0,
-					whichStep:3
+					whichStep:3,
+					source:1,
 				},
 				addressText:'请选择公司所在地区',
 				isDisabled:true,

pages/login/register.vue

@@ -124,6 +124,7 @@
 				wx.getUserInfo({
 					success: res => {
 						let params ={
+								source:1,
 								userName:this.userName,
 								bindMobile:this.bindMobile,
 								activationCode:this.mobileCode,

seller/pages/login/register.vue

@@ -373,6 +373,7 @@
 						return
 					}
 					params ={
+						source:1,
 						email:this.registerEmail,
 						name:this.clubName,
 						linkMan1:this.clubContact,
@@ -411,6 +412,7 @@
 						return
 					}
 					params ={
+						source:1,
 						linkMan1:this.clubContact,
 						bindMobile:this.registerMobile,
 						isAgreed:this.isAgreed,				//是否勾选协议	

services/ajax.env.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'