Merge remote-tracking branch 'origin/dev' into dev

pagesB/medicine/medicine.vue

@@ -229,7 +229,7 @@
 							if (res.data.loginFlag) {
 								that.usershow = false
 								uni.navigateTo({
-									url: `/pages/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}`
+									url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}`
 								})
 							} else {
 								that.usershow = true
@@ -254,7 +254,7 @@
 			goinformation() {
 				this.usershow = false
 				uni.navigateTo({
-					url: '/pages/information/information'
+					url: '/pagesB/information/information'
 				})
 			},
 			goConsultationDetails() {

pagesB/site/site.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<view class="item" v-if='nurseItemClassifyInfoList.length==7&&lengthlistshow' @tap='lengthlist'>
-				<image src="../../static/gd.png" mode=""></image>
+				<image src="../../static/pagesB/gd.png" mode=""></image>
 				<view class="title">
 					更多
 				</view>