修改药品订单页面，首页跳转页面

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://b656b9ad.natappfree.cc"
+		// var path = "http://uae9caec.natappfree.cc"
 		// var path = "http://192.168.10.126:8113"
 		let token="";
 		let type = 0

pages/index/content.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		 <view v-html="content"></view>
+		<u-parse :content="content" :tagStyle="tagStyle"></u-parse>
 	</view>
 </template>
 
@@ -9,6 +9,9 @@
  	data() {
  		return {
 			content:"",
+			tagStyle: {
+				img: 'display: block;'
+			}
  		}
  	},
 	onLoad(val) {

pages/index/index.vue

@@ -51,9 +51,9 @@
 						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/consultation_complaints_icon.png" mode="aspectFill"></image>
 						<view>咨询投诉</view>
 					</view>
-					<view class="menu-item" @click="navTo('/pages_order/inquirySelect?inquiryType=3')">
+					<view class="menu-item" @click="loginNavTo('/pages_user/shopping/storeOrder')">
 						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/consultant_pharmacist_icon.png" mode="aspectFill"></image>
-						<view>咨询药师</view>
+						<view>药品订单</view>
 					</view>
 					<view class="menu-item" @click="navTo('/pages_shopping/registerMerchant')">
 						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/index/merchants_settle_in_icon.png" mode="aspectFill"></image>
@@ -418,6 +418,24 @@
 			},
 		},
 		methods: {
+			loginNavTo(url){
+				this.$isLogin().then(
+					res => {
+						console.log(res)
+						if(res){
+							uni.navigateTo({
+								url: url
+							})
+						}
+						else{
+							uni.navigateTo({
+								url:'/pages/auth/login'
+							})
+						}
+					}
+				);
+				 
+			},
 			dev(){
 				uni.showToast({
 					icon:"none",

pages_index/healthy/detail.vue

@@ -8,7 +8,7 @@
 			</view>
 			<!-- 正文 -->
 			<view class="full-text">
-				<view v-html="item.contents"></view>
+				<u-parse :content="item.contents" :tagStyle="tagStyle"></u-parse>
 			</view>
 		</view>
 		<!-- 最近阅读 -->
@@ -49,6 +49,9 @@
 				articleId:null,
 				item:{},
 				views:[],
+				tagStyle: {
+					img: 'display: block;'
+				}
 			};
 		},
 		onLoad(option) {
@@ -136,6 +139,7 @@
 			// font-weight: 500;
 			color: #222222;
 			line-height: 60upx;
+			display: block;
 		}
 	}
 	.recent-reads{

pages_order/prescribeDetails.vue

@@ -32,8 +32,8 @@
 			<view class="other-info "  >
 				<view class="item">
 					<view class="left">
-						<text class="label">处方单号：</text>
-						<text class="text">{{prescribe.pid || '--'}}</text>
+						<text class="label">处方编号：</text>
+						<text class="text">{{prescribe.serialNo || '--'}}</text>
 					</view>
 				</view>
 				<view class="item">

pages_order/prescribeList.vue

@@ -12,7 +12,7 @@
 		<view class="prescribe-list">
 			<view v-for="(item,index) in dataList" :key="index" class="item" @click="navTo('/pages_order/prescribeDetails?prescribeId='+item.preId)">
 					<view class="ordersn-box">
-						<view class="num">处方单号：{{item.pid||''}}</view>
+						<view class="num">处方编号：{{item.serialNo||''}}</view>
 						<view class="status-box">
 							<text   class="text black" v-if="item.prescriptionStatusByOrderStatus==1">待生效</text>
 							<text   class="text success" v-if="item.prescriptionStatusByOrderStatus==2">已生效</text>

pages_user/shopping/refundOrderList.vue

@@ -32,38 +32,40 @@
 					</view>
 					<!-- 药品列表 -->
 					<view class="drug-list">
-						<view v-if="item!=null&&item.isPackage!=1" v-for="(subitem,j) in item.items" :key="j" class="drug-item">
-							<view class="img-box">
-								<image :src="JSON.parse(subitem.jsonInfo).image" mode="aspectFill"></image>
-							</view>
-							<view class="drug-info">
-								<view>
-									<view class="name-box ellipsis2">
-										<!-- <view class="tag">处方药</view> -->
-										{{JSON.parse(subitem.jsonInfo).productName}}
-									</view>
-									<view class="spec">规格：{{JSON.parse(subitem.jsonInfo).sku}}</view>
+						<view v-for="(subitem,j) in item.items" :key="j">
+							<view v-if="item!=null&&item.isPackage!=1" class="drug-item">
+								<view class="img-box">
+									<image :src="JSON.parse(subitem.jsonInfo).image" mode="aspectFill"></image>
 								</view>
-								<view class="num-box">
-									<view class="price">
-										<text class="unit">¥</text>
-										<text class="num">{{JSON.parse(subitem.jsonInfo).price.toFixed(2)}}</text>
+								<view class="drug-info">
+									<view>
+										<view class="name-box ellipsis2">
+											<!-- <view class="tag">处方药</view> -->
+											{{JSON.parse(subitem.jsonInfo).productName}}
+										</view>
+										<view class="spec">规格：{{JSON.parse(subitem.jsonInfo).sku}}</view>
+									</view>
+									<view class="num-box">
+										<view class="price">
+											<text class="unit">¥</text>
+											<text class="num">{{JSON.parse(subitem.jsonInfo).price.toFixed(2)}}</text>
+										</view>
+										<view class="amount">x{{JSON.parse(subitem.jsonInfo).num}}</view>
 									</view>
-									<view class="amount">x{{JSON.parse(subitem.jsonInfo).num}}</view>
 								</view>
 							</view>
-						</view>
-						<view v-if="item!=null&&item.isPackage==1"  class="drug-item">
-							<view class="img-box">
-								<image :src="JSON.parse(item.packageJson).imgUrl" mode="aspectFill"></image>
-							</view>
-							<view class="drug-info">
-								<view>
-									<view class="name-box ellipsis2">
-										<!-- <view class="tag">处方药</view> -->
-										<view class="tag">套餐</view>{{JSON.parse(item.packageJson).title}}
+							<view v-if="item!=null&&item.isPackage==1"  class="drug-item">
+								<view class="img-box">
+									<image :src="JSON.parse(item.packageJson).imgUrl" mode="aspectFill"></image>
+								</view>
+								<view class="drug-info">
+									<view>
+										<view class="name-box ellipsis2">
+											<!-- <view class="tag">处方药</view> -->
+											<view class="tag">套餐</view>{{JSON.parse(item.packageJson).title}}
+										</view>
+										<view class="spec">{{JSON.parse(item.packageJson).descs}}</view>
 									</view>
-									<view class="spec">{{JSON.parse(item.packageJson).descs}}</view>
 								</view>
 							</view>
 						</view>

pages_user/shopping/storeOrder.vue

@@ -40,13 +40,14 @@
 							</text>
 						</view>
 					</view>
+					<view class="storeName">所属店铺：{{item.storeName?item.storeName:'暂无'}}</view>
 					<!-- 药品列表 -->
 					<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">
+							<view class="img-box" @click="shoppingGoods(subItem)">
 								<image :src="JSON.parse(subItem.jsonInfo).image" mode="aspectFill"></image>
 							</view>
-							<view class="drug-info"  >
+							<view class="drug-info"  @click="shoppingGoods(subItem)">
 								<view>
 									<view class="name-box ellipsis2">
 										<view v-if="subItem.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(subItem.jsonInfo).productName}}
@@ -155,6 +156,11 @@
 			uni.$off('refreshOrder')
 		},
 		methods: {
+			shoppingGoods(items){
+				uni.navigateTo({
+					url: '/pages_shopping/productDetails?productId='+items.productId+'&storeId='+items.orderId
+				})	
+			},
 			goSearch(e) {
 				this.searchKey=e.detail.value;
 				this.mescroll.resetUpScroll()
@@ -285,6 +291,10 @@
 </script>
 
 <style lang="scss">
+	.storeName{
+		color: #666;
+		font-size: 28rpx;
+	}
 	.top-fixed{
 		width: 100%;
 		position: fixed;

pages_user/shopping/storeOrderDetail.vue

@@ -107,41 +107,42 @@
 				<view class="content">
 					<!-- 药品列表 -->
 					<view class="goods-list">
-						<view v-if="order.isPackage!=1" v-for="(item,index) in items" :key="index" class="item">
-							<view class="img-box">
-								<image :src="JSON.parse(item.jsonInfo).image" mode="aspectFill"></image>
-							</view>
-							<view class="info-box">
-								<view>
-									<view class="name-box ellipsis2">
-										<view v-if="item.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(item.jsonInfo).productName}}
-									</view>
-									<view class="spec ellipsis2">{{JSON.parse(item.jsonInfo).sku}}</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">
+									<image :src="JSON.parse(item.jsonInfo).image" mode="aspectFill"></image>
 								</view>
-								<view class="price-num">
-									<view class="price">
-										<text class="unit">¥</text>
-										<text class="num">{{JSON.parse(item.jsonInfo).price.toFixed(2)}}</text>
+								<view class="info-box">
+									<view>
+										<view class="name-box ellipsis2">
+											<view v-if="item.isPrescribe==1" class="tag">处方药</view>{{JSON.parse(item.jsonInfo).productName}}
+										</view>
+										<view class="spec ellipsis2">{{JSON.parse(item.jsonInfo).sku}}</view>
+									</view>
+									<view class="price-num">
+										<view class="price">
+											<text class="unit">¥</text>
+											<text class="num">{{JSON.parse(item.jsonInfo).price.toFixed(2)}}</text>
+										</view>
+										<view class="num">x{{JSON.parse(item.jsonInfo).num}}</view>
 									</view>
-									<view class="num">x{{JSON.parse(item.jsonInfo).num}}</view>
 								</view>
 							</view>
-						</view>
-						<view  v-if="order.isPackage==1&&order.packageJson!=null"   class="item"  >
-							<view class="img-box">
-								<image :src="JSON.parse(order.packageJson).imgUrl" mode="aspectFill"></image>
-							</view>
-							<view class="info-box">
-								<view>
-									<view class="name-box ellipsis2">
-										<view class="tag">套餐</view>{{JSON.parse(order.packageJson).title}}
+							<view  v-if="order.isPackage==1&&order.packageJson!=null" class="item" @click="openDetails(item)">
+								<view class="img-box">
+									<image :src="JSON.parse(order.packageJson).imgUrl" mode="aspectFill"></image>
+								</view>
+								<view class="info-box">
+									<view>
+										<view class="name-box ellipsis2">
+											<view class="tag">套餐</view>{{JSON.parse(order.packageJson).title}}
+										</view>
+										<view class="spec ellipsis2">{{JSON.parse(order.packageJson).descs}}</view>
 									</view>
-									<view class="spec ellipsis2">{{JSON.parse(order.packageJson).descs}}</view>
+									 
 								</view>
-								 
 							</view>
-						</view>
-					 
+						 </view>
 						<!-- 已优惠、小计 -->
 						<view class="sub-total">
 							<view class="discount">
@@ -216,8 +217,8 @@
 					<view class="order-info" v-if="order.isPrescribe&&prescribe!=null">
 						<view class="title">处方信息</view>
 						<view class="item">
-							<text class="label">处方单号</text>
-							<text class="text">{{prescribe.rpId}}</text>
+							<text class="label">处方编号</text>
+							<text class="text">{{prescribe.serialNo}}</text>
 						</view>
 						<view class="item" v-if="prescribe.doctorName!=null">
 							<text class="label">开方医生</text>