add

common/request.js

@@ -7,7 +7,7 @@ export default class Request {
 
 		var path = 'https://storeuserapp.bjyjbao.com'; //正式
 		// var path = "https://userapp.bjyjbao.com/prod-api"
-		// var path = "http://uae9caec.natappfree.cc"
+		// var path = "http://p4d899e5.natappfree.cc"
 		// var path = "http://192.168.10.126:8113"
 		let token="";
 		let type = 0

pages_shopping/registerMerchant.vue

@@ -106,24 +106,32 @@
 						<u-form-item required labelWidth="auto" borderBottom label="药品经营许可证编码" prop="drugCode">
 							<u-input border="none" placeholder="请输入药品经营许可证编码" v-model="form.drugCode"  maxlength="100" />
 						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="药品经营许可证编号有效期开始时间" prop="drugLicenseExpiryStart">
-							<!-- <u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择药品经营许可证编号有效期" v-model="drugLicenseExpiry" />
-							<template #right> <u-icon name="arrow-right"></u-icon> </template> -->
-							<picker :value="form.drugLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'drugLicenseExpiryStart')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.drugLicenseExpiryStart" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
-						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="药品经营许可证编号有效期结束时间" prop="drugLicenseExpiryEnd">
-							<picker :value="form.drugLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'drugLicenseExpiryEnd')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.drugLicenseExpiryEnd" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
+						<u-form-item required labelWidth="auto"  borderBottom label="药品经营许可证是否长期有效" prop="isDrugLicensePermanent">
+							<u-radio-group placement="row" v-model="form.isDrugLicensePermanent" >
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="1" label="是" :name="1" > </u-radio>
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="0" label="否" :name="0" > </u-radio>
+							 </u-radio-group>
 						</u-form-item>
+						<template v-if="form.isDrugLicensePermanent==0">
+							<u-form-item :required="form.isDrugLicensePermanent==0" labelWidth="auto"  borderBottom label="药品经营许可证编号有效期开始时间">
+								<!-- <u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择药品经营许可证编号有效期" v-model="drugLicenseExpiry" />
+								<template #right> <u-icon name="arrow-right"></u-icon> </template> -->
+								<picker :value="form.drugLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'drugLicenseExpiryStart')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.drugLicenseExpiryStart" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+							<u-form-item :required="form.isDrugLicensePermanent==0" labelWidth="auto"  borderBottom label="药品经营许可证编号有效期结束时间" prop="drugLicenseExpiryEnd">
+								<picker :value="form.drugLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'drugLicenseExpiryEnd')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.drugLicenseExpiryEnd" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+						</template>
 						<u-form-item required labelWidth="auto"  borderBottom label="2类器械经营备案" prop="medicalDevice2">
 							<u-upload
 								:fileList="fileList4"
@@ -136,22 +144,30 @@
 						<u-form-item required labelWidth="auto" borderBottom label="2类器械经营备案编码" prop="medicalDevice2Code">
 							<u-input border="none" placeholder="请输入2类器械经营备案编码" v-model="form.medicalDevice2Code"  maxlength="100" />
 						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="2类器械经营备案有效期开始时间" prop="medicalDevice2ExpiryStart">
-							<picker :value="form.medicalDevice2ExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalDevice2ExpiryStart')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.medicalDevice2ExpiryStart" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
-						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="2类器械经营备案有效期结束时间" prop="medicalDevice2ExpiryEnd">
-							<picker :value="form.medicalDevice2ExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalDevice2ExpiryEnd')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalDevice2ExpiryEnd" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
+						<u-form-item required labelWidth="auto"  borderBottom label="2类器械经营备案是否长期有效" prop="isMedicalDevice2ExpiryPermanent">
+							<u-radio-group placement="row" v-model="form.isMedicalDevice2ExpiryPermanent" >
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="1" label="是" :name="1" > </u-radio>
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="0" label="否" :name="0" > </u-radio>
+							 </u-radio-group>
 						</u-form-item>
+						<template v-if="form.isMedicalDevice2ExpiryPermanent==0">
+							<u-form-item :required="form.isMedicalDevice2ExpiryPermanent==0" labelWidth="auto"  borderBottom label="2类器械经营备案有效期开始时间">
+								<picker :value="form.medicalDevice2ExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalDevice2ExpiryStart')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.medicalDevice2ExpiryStart" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+							<u-form-item :required="form.isMedicalDevice2ExpiryPermanent==0" labelWidth="auto"  borderBottom label="2类器械经营备案有效期结束时间" prop="medicalDevice2ExpiryEnd">
+								<picker :value="form.medicalDevice2ExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalDevice2ExpiryEnd')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalDevice2ExpiryEnd" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+						</template>
 						<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案" prop="medicalDevice1">
 							<u-upload
 								:fileList="fileList5"
@@ -164,22 +180,30 @@
 						<u-form-item labelWidth="auto" borderBottom label="1类器械生产备案编码" prop="medicalDevice1Code">
 							<u-input border="none" placeholder="请输入1类器械生产备案编码" v-model="form.medicalDevice1Code"  maxlength="100" />
 						</u-form-item>
-						<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案有效期开始时间" prop="medicalDevice1ExpiryStart">
-							<picker :value="form.medicalDevice1ExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalDevice1ExpiryStart')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.medicalDevice1ExpiryStart" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
-						</u-form-item>
-						<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案有效期结束时间" prop="medicalDevice1ExpiryEnd">
-							<picker :value="form.medicalDevice1ExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalDevice1ExpiryEnd')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalDevice1ExpiryEnd" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
+						<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案是否长期有效" prop="isMedicalDevice1ExpiryPermanent">
+							<u-radio-group placement="row" v-model="form.isMedicalDevice1ExpiryPermanent" >
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="1" label="是" :name="1" > </u-radio>
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="0" label="否" :name="0" > </u-radio>
+							 </u-radio-group>
 						</u-form-item>
+						<template v-if="form.isMedicalDevice1ExpiryPermanent==0">
+							<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案有效期开始时间" prop="medicalDevice1ExpiryStart">
+								<picker :value="form.medicalDevice1ExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalDevice1ExpiryStart')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.medicalDevice1ExpiryStart" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+							<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案有效期结束时间" prop="medicalDevice1ExpiryEnd">
+								<picker :value="form.medicalDevice1ExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalDevice1ExpiryEnd')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalDevice1ExpiryEnd" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+						</template>
 						<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证" prop="medicalDevice3">
 							<u-upload
 								:fileList="fileList6"
@@ -192,22 +216,30 @@
 						<u-form-item labelWidth="auto" borderBottom label="3类器械生产备案编码" prop="medicalDevice3Code">
 							<u-input border="none" placeholder="请输入3类器械生产备案编码" v-model="form.medicalDevice3Code"  maxlength="100" />
 						</u-form-item>
-						<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证有效期开始时间" prop="medicalDevice3ExpiryStart">
-							<picker :value="form.medicalDevice3ExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalDevice3ExpiryStart')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.medicalDevice3ExpiryStart" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
-						</u-form-item>
-						<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证有效期结束时间" prop="medicalDevice3ExpiryEnd">
-							<picker :value="form.medicalDevice3ExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalDevice3ExpiryEnd')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalDevice3ExpiryEnd" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
+						<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证是否长期有效" prop="isMedicalDevice3ExpiryPermanent">
+							<u-radio-group placement="row" v-model="form.isMedicalDevice3ExpiryPermanent" >
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="1" label="是" :name="1" > </u-radio>
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="0" label="否" :name="0" > </u-radio>
+							 </u-radio-group>
 						</u-form-item>
+						<template v-if="form.isMedicalDevice3ExpiryPermanent==0">
+							<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证有效期开始时间" prop="medicalDevice3ExpiryStart">
+								<picker :value="form.medicalDevice3ExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalDevice3ExpiryStart')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.medicalDevice3ExpiryStart" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+							<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证有效期结束时间" prop="medicalDevice3ExpiryEnd">
+								<picker :value="form.medicalDevice3ExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalDevice3ExpiryEnd')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalDevice3ExpiryEnd" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+						</template>
 						<u-form-item labelWidth="auto"  borderBottom label="食品经营许可证" prop="foodLicense">
 							<u-upload
 								:fileList="fileList7"
@@ -220,22 +252,30 @@
 						<u-form-item labelWidth="auto" borderBottom label="食品经营许可证编码" prop="foodCode">
 							<u-input border="none" placeholder="请输入食品经营许可证编码" v-model="form.foodCode"  maxlength="100" />
 						</u-form-item>
-						<u-form-item labelWidth="auto"  borderBottom label="食品经营许可证有效期开始时间" prop="foodLicenseExpiryStart">
-							<picker :value="form.foodLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'foodLicenseExpiryStart')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.foodLicenseExpiryStart" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
-						</u-form-item>
-						<u-form-item labelWidth="auto"  borderBottom label="食品经营许可证有效期结束时间" prop="foodLicenseExpiryEnd">
-							<picker :value="form.foodLicenseExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'foodLicenseExpiryEnd')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.foodLicenseExpiryEnd" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
+						<u-form-item labelWidth="auto"  borderBottom label="食品经营许可证是否长期有效" prop="isFoodLicenseExpiryPermanent">
+							<u-radio-group placement="row" v-model="form.isFoodLicenseExpiryPermanent" >
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="1" label="是" :name="1" > </u-radio>
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="0" label="否" :name="0" > </u-radio>
+							 </u-radio-group>
 						</u-form-item>
+						<template v-if="form.isFoodLicenseExpiryPermanent==0">
+							<u-form-item labelWidth="auto"  borderBottom label="食品经营许可证有效期开始时间" prop="foodLicenseExpiryStart">
+								<picker :value="form.foodLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'foodLicenseExpiryStart')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择开始时间" v-model="form.foodLicenseExpiryStart" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+							<u-form-item labelWidth="auto"  borderBottom label="食品经营许可证有效期结束时间" prop="foodLicenseExpiryEnd">
+								<picker :value="form.foodLicenseExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'foodLicenseExpiryEnd')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.foodLicenseExpiryEnd" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+						</template>
 						<u-form-item required labelWidth="auto"  borderBottom label="医疗机构执业许可证" prop="medicalLicense">
 							<u-upload
 								:fileList="fileList8"
@@ -248,22 +288,30 @@
 						<u-form-item required labelWidth="auto" borderBottom label="医疗机构执业许可证编码" prop="medicalCode">
 							<u-input border="none" placeholder="请输入医疗机构执业许可证编码" v-model="form.medicalCode"  maxlength="100" />
 						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="医疗机构执业许可证有效期开始时间" prop="medicalLicenseExpiryStart">
-							<picker :value="form.medicalLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalLicenseExpiryStart')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选开始时间" v-model="form.medicalLicenseExpiryStart" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
-						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="医疗机构执业许可证有效期择结束时间" prop="medicalLicenseExpiryEnd">
-							<picker :value="form.medicalLicenseExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalLicenseExpiryEnd')">
-								<view class="x-f" style="justify-content: space-between;">
-									<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalLicenseExpiryEnd" />
-									<u-icon name="arrow-right"></u-icon>
-								</view>
-							</picker>
+						<u-form-item required labelWidth="auto"  borderBottom label="医疗机构执业许可证是否长期有效" prop="isMedicalLicenseExpiryPermanent">
+							<u-radio-group placement="row" v-model="form.isMedicalLicenseExpiryPermanent" >
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="1" label="是" :name="1" > </u-radio>
+								<u-radio activeColor="#2583EB" :customStyle="{marginRight: '8px'}" key="0" label="否" :name="0" > </u-radio>
+							 </u-radio-group>
 						</u-form-item>
+						<template v-if="form.isMedicalLicenseExpiryPermanent==0">
+							<u-form-item :required="form.isMedicalLicenseExpiryPermanent==0" labelWidth="auto"  borderBottom label="医疗机构执业许可证有效期开始时间">
+								<picker :value="form.medicalLicenseExpiryStart" mode="date" fields="day" @change="pickerChange($event,'medicalLicenseExpiryStart')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选开始时间" v-model="form.medicalLicenseExpiryStart" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+							<u-form-item :required="form.isMedicalLicenseExpiryPermanent==0" labelWidth="auto"  borderBottom label="医疗机构执业许可证有效期择结束时间" prop="medicalLicenseExpiryEnd">
+								<picker :value="form.medicalLicenseExpiryEnd" mode="date" fields="day" @change="pickerChange($event,'medicalLicenseExpiryEnd')">
+									<view class="x-f" style="justify-content: space-between;">
+										<u-input disabled disabledColor="#ffffff" border="none" placeholder="请选择结束时间" v-model="form.medicalLicenseExpiryEnd" />
+										<u-icon name="arrow-right"></u-icon>
+									</view>
+								</picker>
+							</u-form-item>
+						</template>
 						<u-form-item required labelWidth="auto"  borderBottom label="发货联系电话" prop="sendPhone">
 							<u-input border="none" placeholder="请输入发货联系电话" v-model="form.sendPhone"  maxlength="20" />
 						</u-form-item>
@@ -337,6 +385,12 @@ export default {
 			checked:0,
 			form:{
 				isBusinessLicensePermanent: 1,
+				isDrugLicensePermanent: 1,
+				isMedicalDevice1ExpiryPermanent: 1,
+				isMedicalDevice2ExpiryPermanent: 1,
+				isMedicalDevice3ExpiryPermanent: 1,
+				isFoodLicenseExpiryPermanent: 1,
+				isMedicalLicenseExpiryPermanent: 1,
 				storeName:'',
 				fullName:'',
 				phone:'',
@@ -398,13 +452,14 @@ export default {
 				businessLicenseExpireEnd: [],
 				drugLicense: [{required: true, message: '请上传药品经营许可证'}],
 				drugCode: [{required: true, message: '请输入药品经营许可证编码'}],
-				drugLicenseExpiryStart: [{required: true, message: '请选择药品经营许可证编号有效期'}],
+				// drugLicenseExpiryStart: [{required: true, message: '请选择药品经营许可证编号有效期'}],
 				medicalDevice2: [{required: true, message: '请上传2类医疗器械备案'}],
 				medicalDevice2Code: [{required: true, message: '请输入2类医疗器械备案编码'}],
-				medicalDevice2ExpiryStart: [{required: true, message: '请选择2类医疗器械备案有效期'}],
+				// medicalDevice2ExpiryStart: [{required: true, message: '请选择2类医疗器械备案有效期'}],
 				medicalLicense: [{required: true, message: '请上传医疗机构执业许可证'}],
 				medicalCode: [{required: true, message: '请输入医疗机构执业许可证编码'}],
-				medicalLicenseExpiryStart: [{required: true, message: '请选择医疗机构执业许可证有效期'}],
+				// medicalLicenseExpiryStart: [{required: true, message: '请选择医疗机构执业许可证有效期'}],
+				sendPhone: [{required: true, message: '请输入发货联系电话'}],
 				refundPhone: [{required: true, message: '请输入退货联系电话'}],
 				businessScope: [{required: true, message: '请输入经营范围'}],
 				refundAddress: [{required: true, message: '请输入退货地址'}],
@@ -413,6 +468,9 @@ export default {
 				account: [{required: true, message: '请输入登录帐号'}],
 				shippingType: [{required: true, message: '请选择配送方式'}],
 				isBusinessLicensePermanent: [{required: true, message: '请选择营业执照是否长期有效'}],
+				isDrugLicensePermanent: [{required: true, message: '请选择药品经营许可证是否长期有效'}],
+				isMedicalDevice2ExpiryPermanent: [{required: true, message: '请选择2类器械经营备案是否长期有效'}],
+				isMedicalLicenseExpiryPermanent: [{required: true, message: '请选择医疗机构执业许可证是否长期有效'}],
 			},
 			calendarType: 0,
 			businessLicenseExpire:'',
@@ -700,39 +758,67 @@ export default {
 				this.form.medicalLicense=this.fileList8[0].url
 			}
 			console.log(this.form)
-			const requiredFlag = this.form.isBusinessLicensePermanent == 0
-			if(requiredFlag==2&&!this.form.businessLicenseExpireStart) {
+			if(this.form.isBusinessLicensePermanent == 0&&!this.form.businessLicenseExpireStart) {
 				uni.showToast({
 					title: '请选择营业执照有效期开始时间',
 					icon: 'none'
 				})
 				return
 			}
-			if(requiredFlag==2&&!this.form.businessLicenseExpireEnd) {
+			if(this.form.isBusinessLicensePermanent == 0&&!this.form.businessLicenseExpireEnd) {
 				uni.showToast({
-					title: '请选择营业执照有效期开始时间',
+					title: '请选择营业执照有效期结束时间',
 					icon: 'none'
 				})
 				return
 			}
-			/* 关键：改的是原来就存在的数组，保证响应式 */
-			// this.rules.businessLicenseExpireStart = requiredFlag
-			//   ? [{ required: true, message: '请选择营业执照有效期开始时间' }]
-			//   : []
-			
-			// this.rules.businessLicenseExpireEnd = requiredFlag
-			//   ? [{ required: true, message: '请选择营业执照有效期结束时间' }]
-			//   : []
-
-			// this.$refs.uForm.setRules(this.rules);
-			console.log("下发")
-			// this.$nextTick(() => {
- 			this.$refs.uForm.validate().then(res => {
- 				if(res) {
+			if(this.form.isDrugLicensePermanent == 0&&!this.form.drugLicenseExpiryStart) {
+				uni.showToast({
+					title: '请选择药品经营许可证编号有效期开始时间',
+					icon: 'none'
+				})
+				return
+			}
+			if(this.form.isDrugLicensePermanent == 0&&!this.form.drugLicenseExpiryEnd) {
+				uni.showToast({
+					title: '请选择药品经营许可证编号有效期结束时间',
+					icon: 'none'
+				})
+				return
+			}
+			if(this.form.isMedicalDevice2ExpiryPermanent == 0&&!this.form.medicalDevice2ExpiryStart) {
+				uni.showToast({
+					title: '请选择2类器械经营备案有效期开始时间',
+					icon: 'none'
+				})
+				return
+			}
+			if(this.form.isMedicalDevice2ExpiryPermanent == 0&&!this.form.medicalDevice2ExpiryEnd) {
+				uni.showToast({
+					title: '请选择2类器械经营备案有效期结束时间',
+					icon: 'none'
+				})
+				return
+			}
+			if(this.form.isMedicalLicenseExpiryPermanent == 0&&!this.form.medicalLicenseExpiryStart) {
+				uni.showToast({
+					title: '请选择医疗机构执业许可证有效期开始时间',
+					icon: 'none'
+				})
+				return
+			}
+			if(this.form.isMedicalLicenseExpiryPermanent == 0&&!this.form.medicalLicenseExpiryEnd) {
+				uni.showToast({
+					title: '请选择医疗机构执业许可证有效期结束时间',
+					icon: 'none'
+				})
+				return
+			}
+			this.$refs.uForm.validate().then(res => {
+				if(res) {
 					this.register()
 				}
- 			})
-			// })
+			})
  		},
  	}
 }

pages_user/shopping/storeOrder.vue

@@ -44,10 +44,10 @@
 					<!-- 药品列表 -->
 					<view  class="drug-list"  >
 						<view @click="showDetail(item)"  v-if="item.isPackage!=1" v-for="(subItem,subIndex) in item.items" :key="subIndex" class="drug-item" >
-							<view class="img-box" @click="shoppingGoods(subItem)">
+							<view class="img-box">
 								<image :src="JSON.parse(subItem.jsonInfo).image" mode="aspectFill"></image>
 							</view>
-							<view class="drug-info"  @click="shoppingGoods(subItem)">
+							<view class="drug-info" >
 								<view>
 									<view class="name-box ellipsis2">
 										<view v-if="subItem.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(subItem.jsonInfo).productName}}

pages_user/shopping/storeOrderDetail.vue

@@ -107,6 +107,7 @@
 				<view class="content">
 					<!-- 药品列表 -->
 					<view class="goods-list">
+						<view class="title">{{storeName}}</view>
 						<view v-for="(item,index) in items" :key="index">
 							<view v-if="order.isPackage!=1" class="item" @click="openDetails(item)">
 								<view class="img-box">
@@ -271,7 +272,7 @@
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
 				prescriptionAuditStatus: null,
-		 
+				storeName: ''
 			};
 		},
 		onLoad(option) {
@@ -335,6 +336,7 @@
 						 this.payLimitTime=res.payLimitTime;
 						 this.prescribe=res.prescribe;
 						 this.isAfterSales=res.isAfterSales;
+						 this.storeName = res.storeName || ''
 					}else{
 						uni.showToast({
 							icon:'none',
@@ -591,6 +593,13 @@
 			padding: 0 30upx;
 			background-color: #FFFFFF;
 			border-radius: 16upx;
+			.title{
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #222222;
+				padding-top: 24rpx;
+			}
 			.item{
 				padding: 30upx 0;
 				border-bottom: 1px solid #EDEEEF;