Merge branch 'developer' into developerB

pages/goods/product.vue

@@ -98,7 +98,7 @@
 						<text class="name">品牌  起订量  分类...</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
-					<view class="product-parameter" @click="showPopup(1)" v-if='product.commodityType == 2'>
+					<view class="product-parameter" @click="showPopup(1)" v-if='product.commodityType == 2 && product.trainingMethod'>
 						<text class="title">培训方案：</text>
 						<text class="name">{{ product.trainingMethod == 1 ? '线上培训' : '线下培训' }}</text>
 						<text class="iconfont icon-xiayibu"></text>

seller/pages/club/stayClub-list.vue

@@ -238,7 +238,7 @@
 			let path = `pages/login/binding?bindId=${this.shareClubUseId}&Identity=${this.shareIdentity}`
 			console.log(path)
 			return {
-			  title: '您已注册采美365网，请点击登录',
+			  title: '请确认资料完成注册~',
 			  path: path,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}

seller/pages/login/register-general.vue

@@ -159,7 +159,7 @@
 		      // 来自页面内转发按钮
 		    }
 			return {
-			  title: '您已注册采美365网，请点击登录',
+			  title: '请确认资料完成注册~ ',
 			  path: `/pages/login/binding?bindId=${this.bindId}&Identity=4`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}

seller/pages/login/register-member.vue

@@ -618,7 +618,7 @@
 			if (res.from === 'button') { // 来自页面内转发按钮
 		    }
 			return {
-			  title: '您已注册采美365网，请点击登录',
+			  title: '请确认资料完成注册~',
 			  path: `/pages/login/binding?bindId=${this.bindId}&Identity=2`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}