add

pages/index/index.vue

@@ -8,12 +8,6 @@
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="top-title">
 					<view class="name" :style="{ color: titleColor }">医健宝医药</view>
-					<view class="desc-box" >
-						<image v-if="!isTop" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/dui1.png"></image>
-						<image v-if="isTop" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/dui1.png"></image>
-						
-						<view class="desc" :style="{ color: descColor }">卫健部门权威认证机构，世界各地千万用户健康选择</view>
-					</view>
 				</view>
 			
 				<view class="search">
@@ -262,8 +256,9 @@
 									<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/white_right_arrow_right_icon.png" mode="aspectFill"></image>
 								</view>
 							</view>
-							<view class="text" style="margin-top: 6rpx;">药品交易平台备案：{{qual.ypwljyfwdsfpt}}</view>
-							<view class="text" style="margin-top: 6rpx;">医疗器械交易平台备案：{{qual.ylqxwljyfwdsfptbah}}</view>
+							<view class="text" style="margin-top: 6rpx;">互联网药品信息服务备案：{{qual.hlwypxxfwba||''}}</view>
+							<view class="text" style="margin-top: 6rpx;">药品交易平台备案：{{qual.ypwljyfwdsfpt||''}}</view>
+							<view class="text" style="margin-top: 6rpx;">医疗器械交易平台备案：{{qual.ylqxwljyfwdsfptbah||''}}</view>
 						</view>
 					</view>
 					<view style="padding-left: 14rpx;">

pages/user/index.vue

@@ -172,10 +172,10 @@
 							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/intelligent.png"></image>
 							<view class="title">商家入驻</view>
 						</view>
-						<view class="menu" @click="loginNavTo('/pages_user/registerDoctor?type=1')">
+						<!-- <view class="menu" @click="loginNavTo('/pages_user/registerDoctor?type=1')">
 							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/doctor_entrance.png"></image>
 							<view class="title">医生入驻</view>
-						</view>
+						</view> -->
 						<view class="menu" @click="loginNavTo('/pages_user/registerDoctor?type=2')">
 							<image class="min-image" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/image/userimg/pharmacist_entrance.png"></image>
 							<view class="title">药师入驻</view>

pages_shopping/productDetails.vue

@@ -398,6 +398,14 @@
 				storeDetail(this.storeId).then(res=>{
 					if(res.code==200) {
 						this.storeInfo =res.data || {}
+						this.storeInfo.doctorList = this.storeInfo.doctorList.map(doctor => {
+							return {
+							  ...doctor,
+							  // 假设images字段是逗号分隔的图片字符串
+							  imagesArray: doctor.practiseImages ? 
+								doctor.practiseImages.split(',').map(img => img.trim()).filter(img => img) : []
+							};
+						  });
 						this.$refs.getStoreInfo.getDescHeight()
 					}
 				})

pages_shopping/registerMerchant.vue

@@ -18,14 +18,14 @@
 								:maxCount="1"
 							></u-upload>
 						</u-form-item>
-						<u-form-item required labelWidth="auto"  borderBottom label="企业简称" prop="storeName">
-							<u-input border="none" placeholder="请输入企业简称" v-model="form.storeName" maxlength="60" />
+						<u-form-item required labelWidth="auto"  borderBottom label="店铺名称" prop="storeName">
+							<u-input border="none" placeholder="连锁店/企业简称+店铺名称；单独店铺/企业简称" v-model="form.storeName" maxlength="60" />
 						</u-form-item>
 						<u-form-item required labelWidth="auto" borderBottom label="企业全称" prop="fullName">
 							<u-input border="none" placeholder="请输入企业全称" v-model="form.fullName"  maxlength="60" />
 						</u-form-item>
-						<u-form-item required labelWidth="auto" borderBottom label="电话号码" prop="phone">
-							<u-input  border="none"  placeholder="请输入电话号码;" v-model="form.phone"  maxlength="20" />
+						<u-form-item required labelWidth="auto" borderBottom label="负责人联系电话" prop="phone">
+							<u-input  border="none"  placeholder="请输入负责人联系电话;" v-model="form.phone"  maxlength="20" />
 						</u-form-item>
 						<u-form-item required labelWidth="auto" borderBottom label="所在城市" prop="cityIds" @click="cityShow=true">
 							<!-- <u-input border="none" placeholder="请输入所在城市" v-model="form.cityIds" /> -->
@@ -48,9 +48,9 @@
 						<u-form-item required labelWidth="auto"  borderBottom label="法人姓名" prop="legalPersonName">
 							<u-input border="none" placeholder="请输入法人姓名" v-model="form.legalPersonName"  maxlength="20" />
 						</u-form-item>
-						<u-form-item required labelWidth="auto" borderBottom label="统一社会信用代码" prop="unifiedSocialCreditCode">
+						<!-- <u-form-item required labelWidth="auto" borderBottom label="统一社会信用代码" prop="unifiedSocialCreditCode">
 							<u-input border="none" placeholder="请输入统一社会信用代码" v-model="form.unifiedSocialCreditCode"  maxlength="60" />
-						</u-form-item>
+						</u-form-item> -->
 						<u-form-item required labelWidth="auto"  borderBottom label="营业执照" prop="businessLicense">
 							<u-upload
 								:fileList="fileList2"
@@ -60,8 +60,8 @@
 								:maxCount="1"
 							></u-upload>
 						</u-form-item>
-						<u-form-item required labelWidth="auto" borderBottom label="营业执照编码" prop="businessCode">
-							<u-input border="none" placeholder="请输入营业执照编码" v-model="form.businessCode"  maxlength="100" />
+						<u-form-item required labelWidth="auto" borderBottom label="统一社会信用代码" prop="businessCode">
+							<u-input border="none" placeholder="请输入统一社会信用代码" v-model="form.businessCode"  maxlength="100" />
 						</u-form-item>
 						<u-form-item required labelWidth="auto"  borderBottom label="营业执照是否长期有效" prop="isBusinessLicensePermanent">
 							<u-radio-group placement="row" v-model="form.isBusinessLicensePermanent" >
@@ -100,18 +100,18 @@
 								@afterRead="afterRead"
 								@delete="deletePic"
 								name="3"
-								:maxCount="1"
+								:maxCount="2"
 							></u-upload>
 						</u-form-item>
 						<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="isDrugLicensePermanent">
+					<!-- 	<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>
+						</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" />
@@ -132,7 +132,7 @@
 								</picker>
 							</u-form-item>
 						</template>
-						<u-form-item required labelWidth="auto"  borderBottom label="2类器械经营备案" prop="medicalDevice2">
+						<u-form-item  labelWidth="auto"  borderBottom label="2类器械经营备案" prop="medicalDevice2">
 							<u-upload
 								:fileList="fileList4"
 								@afterRead="afterRead"
@@ -141,17 +141,17 @@
 								:maxCount="1"
 							></u-upload>
 						</u-form-item>
-						<u-form-item required labelWidth="auto" borderBottom label="2类器械经营备案编码" prop="medicalDevice2Code">
+						<u-form-item  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="isMedicalDevice2ExpiryPermanent">
+						<!-- <u-form-item  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>
+						</u-form-item> -->
 						<template v-if="form.isMedicalDevice2ExpiryPermanent==0">
-							<u-form-item :required="form.isMedicalDevice2ExpiryPermanent==0" labelWidth="auto"  borderBottom label="2类器械经营备案有效期开始时间">
+							<u-form-item 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" />
@@ -159,7 +159,7 @@
 									</view>
 								</picker>
 							</u-form-item>
-							<u-form-item :required="form.isMedicalDevice2ExpiryPermanent==0" labelWidth="auto"  borderBottom label="2类器械经营备案有效期结束时间" prop="medicalDevice2ExpiryEnd">
+							<u-form-item 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" />
@@ -168,7 +168,7 @@
 								</picker>
 							</u-form-item>
 						</template>
-						<u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案" prop="medicalDevice1">
+						<!-- <u-form-item labelWidth="auto"  borderBottom label="1类器械生产备案" prop="medicalDevice1">
 							<u-upload
 								:fileList="fileList5"
 								@afterRead="afterRead"
@@ -203,7 +203,7 @@
 									</view>
 								</picker>
 							</u-form-item>
-						</template>
+						</template> -->
 						<u-form-item labelWidth="auto"  borderBottom label="3类器械经营许可证" prop="medicalDevice3">
 							<u-upload
 								:fileList="fileList6"
@@ -216,12 +216,12 @@
 						<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="isMedicalDevice3ExpiryPermanent">
+						<!-- <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>
+						</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')">
@@ -252,12 +252,12 @@
 						<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="isFoodLicenseExpiryPermanent">
+						<!-- <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>
+						</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')">
@@ -276,7 +276,7 @@
 								</picker>
 							</u-form-item>
 						</template>
-						<u-form-item labelWidth="auto"  borderBottom label="医疗机构执业许可证" prop="medicalLicense">
+						<!-- <u-form-item labelWidth="auto"  borderBottom label="医疗机构执业许可证" prop="medicalLicense">
 							<u-upload
 								:fileList="fileList8"
 								@afterRead="afterRead"
@@ -311,7 +311,7 @@
 									</view>
 								</picker>
 							</u-form-item>
-						</template>
+						</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>
@@ -385,11 +385,11 @@ export default {
 			checked:0,
 			form:{
 				isBusinessLicensePermanent: 1,
-				isDrugLicensePermanent: 1,
+				isDrugLicensePermanent: 0,
 				isMedicalDevice1ExpiryPermanent: 1,
 				isMedicalDevice2ExpiryPermanent: 1,
-				isMedicalDevice3ExpiryPermanent: 1,
-				isFoodLicenseExpiryPermanent: 1,
+				isMedicalDevice3ExpiryPermanent: 0,
+				isFoodLicenseExpiryPermanent: 0,
 				isMedicalLicenseExpiryPermanent: 1,
 				storeName:'',
 				fullName:'',
@@ -439,22 +439,22 @@ export default {
 			},
 			rules: {
 				logoUrl: [{required: true, message: '请上传企业LOGO'}],
-				storeName: [{required: true, message: '请输入企业简称'}],
+				storeName: [{required: true, message: '请输入店铺名称'}],
 				fullName: [{required: true, message: '请输入企业全称'}],
-				phone: [{required: true, message: '请输入电话号码'}],
+				phone: [{required: true, message: '请输入负责人联系电话'}],
 				cityIds: [{required: true, message: '请选择所在城市'}],
 				enterpriseAddress: [{required: true, message: '请输入企业地址'}],
 				legalPersonName: [{required: true, message: '请输入法人姓名'}],
-				unifiedSocialCreditCode: [{required: true, message: '请输入统一社会信用代码'}],
+				// unifiedSocialCreditCode: [{required: true, message: '请输入统一社会信用代码'}],
 				businessLicense: [{required: true, message: '请上传营业执照'}],
-				businessCode: [{required: true, message: '请输入营业执照编码'}],
+				businessCode: [{required: true, message: '请输入统一社会信用代码'}],
 				businessLicenseExpireStart: [],
 				businessLicenseExpireEnd: [],
 				drugLicense: [{required: true, message: '请上传药品经营许可证'}],
 				drugCode: [{required: true, message: '请输入药品经营许可证编码'}],
 				// drugLicenseExpiryStart: [{required: true, message: '请选择药品经营许可证编号有效期'}],
-				medicalDevice2: [{required: true, message: '请上传2类医疗器械备案'}],
-				medicalDevice2Code: [{required: true, message: '请输入2类医疗器械备案编码'}],
+				// medicalDevice2: [{required: true, message: '请上传2类医疗器械备案'}],
+				// medicalDevice2Code: [{required: true, message: '请输入2类医疗器械备案编码'}],
 				// medicalDevice2ExpiryStart: [{required: true, message: '请选择2类医疗器械备案有效期'}],
 				// medicalLicense: [{required: true, message: '请上传医疗机构执业许可证'}],
 				// medicalCode: [{required: true, message: '请输入医疗机构执业许可证编码'}],
@@ -469,7 +469,7 @@ export default {
 				shippingType: [{required: true, message: '请选择配送方式'}],
 				isBusinessLicensePermanent: [{required: true, message: '请选择营业执照是否长期有效'}],
 				isDrugLicensePermanent: [{required: true, message: '请选择药品经营许可证是否长期有效'}],
-				isMedicalDevice2ExpiryPermanent: [{required: true, message: '请选择2类器械经营备案是否长期有效'}],
+				// isMedicalDevice2ExpiryPermanent: [{required: true, message: '请选择2类器械经营备案是否长期有效'}],
 				// isMedicalLicenseExpiryPermanent: [{required: true, message: '请选择医疗机构执业许可证是否长期有效'}],
 			},
 			calendarType: 0,
@@ -800,20 +800,21 @@ export default {
 				})
 				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
-			}
+			// 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.form.unifiedSocialCreditCode = this.form.businessCode
 			this.$refs.uForm.validate().then(res => {
 				if(res) {
 					this.register()