Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developerX

pages/search/search.vue

@@ -108,7 +108,7 @@
 				triangleTop="-22rpx"
 				:maskBgColor="maskBgColor"
 			>
-				<view class="tui-menu-item" @tap="selectTabs(1)">产品</view>
+				<view class="tui-menu-item" @tap="selectTabs(1)">商品</view>
 				<view class="tui-menu-item" @tap="selectTabs(2)">供应商</view>
 				<!-- <view class="tui-menu-item" @tap="selectTabs(3)">项目仪器</view> -->
 			</tui-bubble-popup>
@@ -149,7 +149,7 @@
 			<view class="s-block clearfix">
 				<view class="header">热门搜索</view>
 				<view class="list">
-					<view class="list-title">产品</view>
+					<view class="list-title">商品</view>
 					<view class="list-main">
 						<view
 							v-for="(item, index) in productHotSearch"
@@ -502,7 +502,7 @@ export default {
 			isIphoneX: this.$store.state.isIphoneX,
 			shopId: 0,
 			userId: 0,
-			tabValue: '产品',
+			tabValue: '商品',
 			themeClass: 'block',
 			showBubblePopup: false,
 			vipFlag: 0,
@@ -1000,7 +1000,7 @@ export default {
 			this.searchKeyType = index
 			switch (index) {
 				case 1:
-					this.tabValue = '产品'
+					this.tabValue = '商品'
 					break
 				case 2:
 					this.tabValue = '供应商'

pages/seller/login/apply.vue

@@ -626,8 +626,11 @@ export default {
 				this.$util.msg('请上传您的营业执照', 2000)
 				return
 			}
-			console.log(this.isOrganizationType)
 			if (this.isOrganizationType == 1 || this.isOrganizationType == 2) {
+				if (this.medicalPracticeLicense == '') {
+					this.$util.msg('请上传医疗许可证', 2000)
+					return
+				}
 				if (this.mainProduct == '') {
 					this.$util.msg('请选择住机构主营内容', 2000)
 					return
@@ -755,9 +758,11 @@ export default {
 					switch (e.tapIndex) {
 						case 0:
 							this.organizationTypeText = '医美'
+							this.secondClubType = 1
 							break
 						case 1:
 							this.organizationTypeText = '生美'
+							this.secondClubType = 5
 							break
 						case 2:
 							this.organizationTypeText = '项目公司'