add

pages_shopping/cart.vue

@@ -13,8 +13,8 @@
 					<label style="margin-right: 30upx;">
 						<checkbox :value="item.checked"  :checked="item.checked" @click="checkChange(item,shop)" style="transform: scale(0.9);" />
 					</label>
-					<image class="goods-img" :src="item.productAttrImage==null||item.productAttrImage==''?item.productImage:item.productAttrImage" mode="aspectFit"></image>
-					<view class="info-box">
+					<image class="goods-img" :src="item.productAttrImage==null||item.productAttrImage==''?item.productImage:item.productAttrImage" mode="aspectFit" @click="handleDetail(item)"></image>
+					<view class="info-box" @click="handleDetail(item)">
 						<view>
 							<view class="title-box">
 								<view class="tag">{{$getDictLabelName("storeProductType",item.productType)}}</view>
@@ -27,7 +27,7 @@
 								<text class="unit">¥</text>
 								<text class="text">{{item.price}}</text>
 							</view>
-							<view class="num-box">
+							<view class="num-box" @click.stop>
 								<view class="img-box" @click="delNum(item)">
 									<image v-if="item.cartNum <= 1" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/jian.png" mode=""></image>
 									<image v-else src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/jian2.png" mode=""></image>
@@ -94,6 +94,11 @@
 			this.getCarts();
 		},
 		methods: {
+			handleDetail(item) {
+				uni.navigateTo({
+					url: '/pages_shopping/productDetails?productId=' + item.productId
+				})
+			},
 			delCart(){			
 				var selectCarts = this.carts.flatMap(item => item.list.filter(listItem => listItem.checked === true)).map(el => el.id);
 				

pages_shopping/registerMerchant.vue

@@ -276,7 +276,7 @@
 								</picker>
 							</u-form-item>
 						</template>
-						<u-form-item required labelWidth="auto"  borderBottom label="医疗机构执业许可证" prop="medicalLicense">
+						<u-form-item labelWidth="auto"  borderBottom label="医疗机构执业许可证" prop="medicalLicense">
 							<u-upload
 								:fileList="fileList8"
 								@afterRead="afterRead"
@@ -285,17 +285,17 @@
 								:maxCount="1"
 							></u-upload>
 						</u-form-item>
-						<u-form-item required labelWidth="auto" borderBottom label="医疗机构执业许可证编码" prop="medicalCode">
+						<u-form-item 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="isMedicalLicenseExpiryPermanent">
+						<u-form-item 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="医疗机构执业许可证有效期开始时间">
+							<u-form-item 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" />
@@ -303,7 +303,7 @@
 									</view>
 								</picker>
 							</u-form-item>
-							<u-form-item :required="form.isMedicalLicenseExpiryPermanent==0" labelWidth="auto"  borderBottom label="医疗机构执业许可证有效期择结束时间" prop="medicalLicenseExpiryEnd">
+							<u-form-item 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" />
@@ -456,8 +456,8 @@ export default {
 				medicalDevice2: [{required: true, message: '请上传2类医疗器械备案'}],
 				medicalDevice2Code: [{required: true, message: '请输入2类医疗器械备案编码'}],
 				// medicalDevice2ExpiryStart: [{required: true, message: '请选择2类医疗器械备案有效期'}],
-				medicalLicense: [{required: true, message: '请上传医疗机构执业许可证'}],
-				medicalCode: [{required: true, message: '请输入医疗机构执业许可证编码'}],
+				// medicalLicense: [{required: true, message: '请上传医疗机构执业许可证'}],
+				// medicalCode: [{required: true, message: '请输入医疗机构执业许可证编码'}],
 				// medicalLicenseExpiryStart: [{required: true, message: '请选择医疗机构执业许可证有效期'}],
 				sendPhone: [{required: true, message: '请输入发货联系电话'}],
 				refundPhone: [{required: true, message: '请输入退货联系电话'}],
@@ -470,7 +470,7 @@ export default {
 				isBusinessLicensePermanent: [{required: true, message: '请选择营业执照是否长期有效'}],
 				isDrugLicensePermanent: [{required: true, message: '请选择药品经营许可证是否长期有效'}],
 				isMedicalDevice2ExpiryPermanent: [{required: true, message: '请选择2类器械经营备案是否长期有效'}],
-				isMedicalLicenseExpiryPermanent: [{required: true, message: '请选择医疗机构执业许可证是否长期有效'}],
+				// isMedicalLicenseExpiryPermanent: [{required: true, message: '请选择医疗机构执业许可证是否长期有效'}],
 			},
 			calendarType: 0,
 			businessLicenseExpire:'',

pages_user/shopping/storeOrder.vue

@@ -215,7 +215,6 @@
 			},
 			// 查看订单详情
 			showDetail(item) {
-				console.log(item)
 				uni.navigateTo({
 					url: './storeOrderDetail?id=' + item.id
 				})