zhengjinyi 1 year ago
parent
commit
2f74d8b858

+ 8 - 10
pages/login/apply.vue

@@ -515,22 +515,20 @@ export default {
 				this.$util.msg('请填写机构详细地址', 2000)
 				return
 			}
-			if (this.businessLicense == '') {
-				this.$util.msg('请上传您的营业执照', 2000)
+			// if (this.businessLicense == '') {
+			// 	this.$util.msg('请上传您的营业执照', 2000)
+			// 	return
+			// }
+			if (!this.firstClubType) {
+				this.$util.msg('请选择机构类型', 2000)
 				return
 			}
-			if (this.firstClubType == 1){
-				if (this.medicalPracticeLicense == '') {
+			if (this.firstClubType === 1){
+				if (this.medicalPracticeLicense === '') {
 					this.$util.msg('请上传您的资质许可证', 2000)
 					return
 				}
 			}
-			if (this.firstClubType == 1 || this.firstClubType == 2) {
-				if(this.secondClubType == ''){
-					this.$util.msg('选择机构类型', 2000)
-					return
-				}
-			}
 			if (this.firstClubType == 1 || this.firstClubType == 2) {
 				if (this.mainProduct == '') {
 					this.$util.msg('请选择机构主营内容', 2000)

+ 2 - 1
pages/login/register-invite-club.vue

@@ -148,7 +148,8 @@ export default {
                 unionId: '',
                 isSp: 1,
 				insideFLag:1, //内外部协销标记 0内部协销,1外部协销
-                spId: '', // 协销分享的id
+                spId: '', // 协销分享的id
+                partnerId:0, // 外部来源默认 0 
             },
             imageCode: '', //图形验证码
             imageCodeUrl: '', //图形验证码图片

+ 2 - 1
pages/login/register.vue

@@ -172,7 +172,8 @@ export default {
                 unionId: '',
                 isSp: 1,
 				insideFLag:0, //内外部协销标记 0内部协销,1外部协销
-                spId: '', // 协销分享的id
+                spId: '', // 协销分享的id
+                partnerId:0, // 外部来源默认 0 
             },
             imageCode: '', //图形验证码
             imageCodeUrl: '', //图形验证码图片

+ 4 - 4
pages/seller/login/apply.vue

@@ -622,10 +622,10 @@ export default {
 				this.$util.msg('请填写机构详细地址', 2000)
 				return
 			}
-			if (this.businessLicense == '') {
-				this.$util.msg('请上传您的营业执照', 2000)
-				return
-			}
+			// if (this.businessLicense == '') {
+			// 	this.$util.msg('请上传您的营业执照', 2000)
+			// 	return
+			// }
             if (this.isOrganizationType == 1) {
             	if (this.medicalPracticeLicense == '') {
             		this.$util.msg('请上传医疗许可证', 2000)

+ 6 - 6
pages/seller/login/register-member.vue

@@ -325,7 +325,7 @@
 				<view class="form-input lang">{{ clubInfo.socialCreditCode }}</view>
 			</view>
 			<view class="main-form-item file">
-				<view class="main-form-upload">
+				<view class="main-form-upload" v-if="clubInfo.businessLicense">
 					<view class="label">营业执照</view>
 					<view class="upload-picture">
 						<view class="upload-image"
@@ -333,7 +333,7 @@
 						></view>
 					</view>
 				</view>
-				<view class="main-form-upload">
+				<view class="main-form-upload" v-if="clubInfo.shopPhoto">
 					<view class="label">门头照</view>
 					<view class="upload-picture">
 						<view class="upload-image"
@@ -555,10 +555,10 @@ export default {
 				this.$util.msg('请填写机构详细地址', 2000)
 				return
 			}
-			if (this.params.businessLicense == '') {
-				this.$util.msg('请上传您的营业执照', 2000)
-				return
-			}
+			// if (this.params.businessLicense == '') {
+			// 	this.$util.msg('请上传您的营业执照', 2000)
+			// 	return
+			// }
 			if (this.params.firstClubType == 1) {
 				if (this.params.medicalPracticeLicense == '') {
 					this.$util.msg('请上传您的医疗资质', 2000)

+ 0 - 1
pages/seller/order/create-order.vue

@@ -170,7 +170,6 @@ export default {
 			showModalstauts: 1,
 			isIphoneX: this.$store.state.isIphoneX,
 			confirmParam: {
-				// 提交订单参数
 				cartType: 3, // 购买类型:(1自主下单, 3协销下单)
 				orderMiniType: 0, // 订单提交状态 0初始提交 1 继续提交
 				orderSource: 6, // 订单来源 1WWW 6小程序[采美,星范]

+ 1 - 1
pages/user/order/create-order.vue

@@ -134,7 +134,7 @@ export default {
 			isIphoneX: this.$store.state.isIphoneX,
 			isSubLoading: false,
 			confirmType: 1,
-			confirmParam: {
+			confirmParam: {
 				cartType: 1, // 购买类型:(1自主下单, 3协销下单)
 				orderMiniType: 0, // 订单提交状态 0初始提交 1 继续提交
 				orderSource: 6, // 订单来源 1WWW 6小程序[采美,星范]