修改

pages/CommodityDetails/CommodityDetails.vue

@@ -165,17 +165,10 @@
 	import {
 		goodsDetails
 	} from '@/api/CommodityDetails/CommodityDetails.js'
-	import {
-		AppIdentification
-	} from '@/api/AppIdentification/index.js'
 	import {
 		goodPatientInfo
 	} from '@/api/modifyAddress/modifyAddress.js';
 	import baseurl from '@/api/baseurl.js'
-	import {
-		addStationGoodsOrder,
-		appletGoodsOrderPay
-	} from '@/api/confirmOrder/index.js'
 	export default {
 		data() {
 			return {
@@ -236,7 +229,7 @@
 			},
 			//立即购买跳转确认订单页面
 			tapbuy() {
-				console.log(this.updata)
+
 			},
 			//选择商品
 			isActivegoods(item) {
@@ -271,22 +264,23 @@
 				let that = this
 				goodsDetails(goodsInfoId).then(res => {
 					uni.removeStorageSync('Refresh');
-					if (res.data[0].goodsRemark) {
+					if (res.data.goodsRemark) {
-						res.data[0].goodsRemark = res.data[0].goodsRemark.replace(/\<img/gi,
+						res.data.goodsRemark = res.data.goodsRemark.replace(/\<img/gi,
 							"<br/> <img class='richPic'")
 					}
-					res.data[0].goodsPictureUrl = this.baseurl + res.data[0].goodsPictureUrl
+					this.goodsPrice = res.data.minGoodsPrice //页面价格
-					this.image = res.data[0].goodsPictureUrl
+					res.data.goodsPictureUrl = this.baseurl + res.data.goodsPictureUrl
+					this.image = res.data.goodsPictureUrl
 					var obj = {
-						image: res.data[0].goodsPictureUrl,
+						image: res.data.goodsPictureUrl,
 					}
 					this.info.push(obj)
-					if (res.data[0].goodDetailsLists == null) {
+					if (res.data.goodAttributeDetailsLists == null) {
 						this.goodshow = false
-					} else if (res.data[0].goodDetailsLists.length == 0) {
+					} else if (res.data.goodAttributeDetailsLists.length == 0) {
 						this.goodshow = false
 					} else {
-						res.data[0].goodDetailsLists.forEach(e => {
+						res.data.goodAttributeDetailsLists.forEach(e => {
 							e.attributePitureUrl = this.baseurl + e.attributePitureUrl
 							e.isActive = false
 							var objs = {
@@ -294,25 +288,25 @@
 							}
 							this.info.push(objs)
 						})
-						this.goodDetailsLists = res.data[0].goodDetailsLists
+						this.goodDetailsLists = res.data.goodAttributeDetailsLists
 						this.goodshow = true
 					}
-					this.goodsDetailslist = res.data[0]
+					this.goodsDetailslist = res.data
 					this.updata.goodsName = this.goodsDetailslist.goodsName
 					this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
 					if (this.goodDetailsLists.length == 1) {
-						this.goodDetailsLists[0].isActive = true
+						this.goodDetailsLists.isActive = true
-						this.updata.img = this.goodDetailsLists[0].attributePitureUrl
+						this.updata.img = this.goodDetailsLists.attributePitureUrl
-						this.updata.goodsAttributeName = this.goodDetailsLists[0].attributeDetailsName
+						this.updata.goodsAttributeName = this.goodDetailsLists.attributeDetailsName
-						this.updata.goodsPrice = this.goodDetailsLists[0].goodsPrice
+						this.updata.goodsPrice = this.goodDetailsLists.goodsPrice
 						this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2)
-						this.updata.attributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
+						this.updata.attributeDetailsId = this.goodDetailsLists.attributeDetailsId
-						this.updata.goodsStock = this.goodDetailsLists[0].goodsStock
+						this.updata.goodsStock = this.goodDetailsLists.goodsStock
-						this.updata.goodsAttributeId = this.goodDetailsLists[0].goodsAttributeId
+						this.updata.goodsAttributeId = this.goodDetailsLists.goodsAttributeId
-						this.updata.goodsAttributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
+						this.updata.goodsAttributeDetailsId = this.goodDetailsLists.attributeDetailsId
 					} else {
 						var list = {}
-						this.goodsDetailslist.goodDetailsLists.forEach(e => {
+						this.goodsDetailslist.goodAttributeDetailsLists.forEach(e => {
 							if (e.goodsAttributeId == this.goodsAttributeId) {
 								list = e
 								e.isActive = true
@@ -328,7 +322,7 @@
 						this.updata.img = list.attributePitureUrl
 					}
 					// this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
-					// this.updata.img = res.data[0].goodsPictureUrl
+					// this.updata.img = res.data.goodsPictureUrl
 					// this.updata.goodsAttributeName = ''
 					// this.updata.goodsPrice = 0
 					// this.updata.attributeDetailsId = ''
@@ -360,11 +354,6 @@
 			var that = this
 			this.goodsAttributeId = options.goodsAttributeId
 			this.updata.buySource = options.buySource
-			if (options.goodsPrice == 'null' || !options.goodsPrice) {
-				this.goodsPrice = 0 //页面价格
-			} else {
-				this.goodsPrice = options.goodsPrice //页面价格
-			}
 			this.goodsInfoId = options.goodsInfoId
 			try {
 				const value = uni.getStorageSync('patientId');

pages/nursestation/nursestation.scss

@@ -118,6 +118,7 @@
 					top:14%;
 					left:32%;
 					font-size: 28rpx;
+					overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
 				}
 				.huanyao {
 					color: #000000;

pages/nursestation/nursestation.vue

@@ -63,8 +63,11 @@
 					<view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index">
 						<image :src="item.goodsPictureUrl"></image>
 						<view class="product">{{item.goodsName}}</view>
+						<view class="product" style="top:38%;font-size: 24rpx;color: #999999;">
+							{{item.attributeDetailsName}}
+						</view>
 						<view class="buy appointment" @tap="goCommodityDetails(item)">购买</view>
-						<view class="price">￥{{item.goodsPrice==null?'0':item.goodsPrice}}起</view>
+						<view class="price" style="left:32%">￥{{item.goodsPrice==null?'0':item.goodsPrice}}</view>
 					</view>
 				</view>
 				<view class="noorder" v-if="productlist.length==0&&choicetab">
@@ -196,7 +199,7 @@
 			//跳转商品详情页
 			goCommodityDetails(item) {
 				uni.navigateTo({
-					url: `/pages/CommodityDetails/CommodityDetails?goodsPrice=${item.goodsPrice}&goodsInfoId=${item.goodsInfoId}&buySource=${'NURSE_STATION'}`
+					url: `/pages/CommodityDetails/CommodityDetails?goodsPrice=${item.goodsPrice}&goodsInfoId=${item.goodsInfoId}&buySource=${'NURSE_STATION'}&goodsAttributeId=${item.goodsAttributeId}`
 				})
 			},
 			//跳转完善页面
@@ -228,8 +231,7 @@
 										});
 									}
 								},
-								fail: function(res) {
+								fail: function(res) {}
-								}
 							});
 						}
 					}