From 45d3e88c4340f32d04317448694d0417e2384ec2 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 20 Oct 2022 19:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/baseurl.js                                |   2 +-
 api/modifyAddress/modifyAddress.js            |  27 +-
 pages.json                                    | 135 ++++---
 pages/CommodityDetails/CommodityDetails.vue   |  36 +-
 .../InformationFilling/InformationFilling.vue |   4 -
 pages/ProductList/ProductList.vue             |  44 +--
 pages/modifyAddress/modifyAddress.vue         | 340 ++++++++++++++++++
 pages/shopping/shopping.vue                   |   5 +-
 8 files changed, 507 insertions(+), 86 deletions(-)
 create mode 100644 pages/modifyAddress/modifyAddress.vue

diff --git a/api/baseurl.js b/api/baseurl.js
index ff0cce3..22ea003 100644
--- a/api/baseurl.js
+++ b/api/baseurl.js
@@ -1,2 +1,2 @@
-var baseurl = "http://192.168.16.94:8081";
+var baseurl = "http://192.168.16.81:8080";
 export default baseurl
diff --git a/api/modifyAddress/modifyAddress.js b/api/modifyAddress/modifyAddress.js
index 3d204f7..36a0739 100644
--- a/api/modifyAddress/modifyAddress.js
+++ b/api/modifyAddress/modifyAddress.js
@@ -6,11 +6,36 @@ export function goodPatientInfo(patientId){
 		method: 'GET'
 	})
 }
-// 新增被护理人基本信息
+// 新增基本信息
 export function addnursingStation(data){
 	return request({
 		url: '/nurseApplet/nursingStationGoods/add',
 		method: 'POST',
 		data,
 	})
+}
+
+// 修改基本信息
+
+export function updatenursingStation(data){
+	return request({
+		url: '/nurseApplet/nursingStationGoods/edit',
+		method: 'POST',
+		data,
+	})
+}
+// 修改反显
+export function nursingStationGoodsinfo(id){
+	return request({
+		url: '/nurseApplet/nursingStationGoods/' + id,
+		method: 'GET'
+	})
+}
+
+// 删除
+export function delnursingStation(id) {
+    return request({
+        url: '/nurseApplet/nursingStationGoods/' + id,
+        method: 'delete'
+    })
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a7e2dc6..50e3da6 100644
--- a/pages.json
+++ b/pages.json
@@ -3,26 +3,52 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-	{
-	    "path" : "pages/nursestation/nursestation",
-	    "style" :
-	    {
-	        "navigationBarTitleText": "护理站详情",
-	        "enablePullDownRefresh": false,
-			"navigationBarBackgroundColor": "#ffffff"
-	    }
-
-	},{
-	    "path" : "pages/appointmenttime/appointmenttime",
-	    "style" :
-	    {
-	        "navigationBarTitleText": "预约时间",
-	        "enablePullDownRefresh": false,
+		{
+			"path": "pages/modifyAddress/modifyAddress",
+			"style": {
+				"navigationBarTitleText": "修改地址",
+				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-	    }
+			}
+		
+		},
+		{
+			"path": "pages/InformationFilling/InformationFilling",
+			"style": {
+				"navigationBarTitleText": "信息填写与确认",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		},
+		
+		{
+			"path": "pages/nursestation/nursestation",
+			"style": {
+				"navigationBarTitleText": "护理站详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 
-	},
-			{
+		},
+		{
+			"path": "pages/appointmenttime/appointmenttime",
+			"style": {
+				"navigationBarTitleText": "预约时间",
+				"enablePullDownRefresh": false
+			}
+		},
+		
+		
+		{
+			"path": "pages/shopping/shopping",
+			"style": {
+				"navigationBarTitleText": "医路优品",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+
+		},
+		{
 			"path": "pages/site/site",
 			"style": {
 				"navigationBarTitleText": "附近护理站",
@@ -32,7 +58,22 @@
 		},
 
 
+		// {
+		// 	"path": "pages/information/information",
+		// 	"style": {
+		// 		"navigationBarTitleText": "请完善个人信息",
+		// 		"enablePullDownRefresh": false,
+		// 		"navigationBarBackgroundColor": "#ffffff"
+		// 	}
+		// },
 		{
+			"path": "pages/Doctordetails/Doctordetails",
+			"style": {
+				"navigationBarTitleText": "医生信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "",
@@ -46,23 +87,28 @@
 				"navigationStyle": "custom"
 			}
 		}, {
-		    "path" : "pages/appointment/appointment",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "选择时间",
-		        "enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#ffffff"
-		    }
-
-		},
-		{
-			"path": "pages/detail/detail",
+			"path": "pages/site/site",
 			"style": {
-				"navigationBarTitleText": "护理站简介",
+				"navigationBarTitleText": "附近护理站",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
 		}, {
+			"path": "pages/doctorslist/doctorslist",
+			"style": {
+				"navigationBarTitleText": "预约医生",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		// {
+		// 	"path": "pages/appointment/appointment",
+		// 	"style": {
+		// 		"navigationBarTitleText": "选择时间",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		{
 			"path": "pages/homepage/homepage",
 			"style": {
 				"navigationBarTitleText": "泉医到家",
@@ -78,14 +124,15 @@
 			}
 		},
 
+		// {
+		// 	"path": "pages/homepage/homepage",
+		// 	"style": {
+		// 		"navigationBarTitleText": "商品详情",
+		// 		"enablePullDownRefresh": false,
+		// 		"navigationBarBackgroundColor": "#ffffff"
+		// 	}
+		// },
 		{
-			"path": "pages/homepage/homepage",
-			"style": {
-				"navigationBarTitleText": "商品详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
 			"path": "pages/startup/startup",
 			"style": {
 				"navigationBarTitleText": "",
@@ -108,7 +155,7 @@
 		}, {
 			"path": "pages/ProductList/ProductList",
 			"style": {
-				"navigationBarTitleText": "医路优品",
+				"navigationBarTitleText": "特医食品",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
@@ -119,10 +166,16 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		},
+		{
+			"path": "pages/medicine/medicine",
+			"style": {
+				"navigationBarTitleText": "就医",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}
-
-
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index b89d76c..1cbe8fb 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -10,18 +10,18 @@
 				</swiper-item>
 			</swiper>
 		</uni-swiper-dot>
-		<view class="Commodity common">
+		<view class="Commodity common" v-for="(item,index) in goodsDetails" :key="index">
 			<view class="name">
-				酒精棉片
+				{{item.goodsName}}
 			</view>
 			<view class="number">
-				200片
+				200{{item.goodsUnit}}
 			</view>
 			<view class="price">
-				￥36.0
+				￥{{item.goodsPrice}}
 			</view>
 		</view>
-		<view class="choice common">
+		<view class="choice common"  v-for="(item,index) in goodsDetails" @tap="buyshow=true">
 			<view class="selected">
 				已选
 			</view>
@@ -102,9 +102,16 @@
 </template>
 
 <script>
+	import {
+		goodsDetails
+	} from '@/api/CommodityDetails/CommodityDetails.js'
+	import baseurl from '@/api/baseurl.js'
+
 	export default {
 		data() {
 			return {
+				goodsDetails:[],
+				goodsInfoId:"1",
 				buyshow: false, //立即购买遮罩层开关
 				//轮播内容
 				info: [{
@@ -116,6 +123,15 @@
 				number: 1, //数量
 			};
 		},
+
+		onLoad(options) {
+			//获取传值
+			console.log(options)
+			this.goodsDetailsinfo()
+			// this.title = options.title
+			this.goodsInfoId = options.goodsInfoId
+			// this.goodsListinfo()
+		},
 		methods: {
 			//滑动轮播切换
 			change(e) {
@@ -125,6 +141,16 @@
 			clickItem(e) {
 				this.swiperDotIndex = e
 			},
+			// 查询商品详细信息
+			goodsDetailsinfo(){
+				goodsDetails(this.goodsInfoId).then(res => {
+					// res.data.forEach(e => {
+					// 	e.goodsCatrgoryPicture = baseurl + e.goodsCatrgoryPicture
+					// })
+					this.goodsDetails = res.data
+					console.log(this.goodsDetails)
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/InformationFilling/InformationFilling.vue b/pages/InformationFilling/InformationFilling.vue
index e67846f..9cd9d5f 100644
--- a/pages/InformationFilling/InformationFilling.vue
+++ b/pages/InformationFilling/InformationFilling.vue
@@ -193,15 +193,11 @@
 		width: 390px;
 		height: 130rpx;
 		font-size: 42rpx;
-		font-family: Adobe Heiti Std;
-		font-weight: normal;
 		color: #000000;
 		line-height: 130rpx;
 		text-align: center;
 		margin: 0 auto;
-		// margin-top: 49rpx;
 		border-bottom: 1rpx solid #D8D4D4;
-
 		image {
 			width: 31rpx;
 			height: 31rpx;
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 004fe2a..efc2607 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -1,43 +1,17 @@
 <template>
 	<view class="app">
 		<view class="productlist">
-			<view class="item" @tap='goCommodityDetails' v-for="(item,index) in goodsList" :key="index">
-				<!-- <image src="../../static/shoppingcs.png" mode=""></image> -->
-				<image :src="baseUrl + item.goodsPictureUrl" mode=""></image>
+			<view class="item" @tap='goCommodityDetails(item)' v-for="(item,index) in goodsList" :key="index">
+
+				<image :src="item.goodsPictureUrl" mode=""></image>
 				<view class="title">
-					{{item.goodsName}}
+					{{item.goodsName}}  1{{item.goodsUnit}}
 				</view>
 				<view class="price">
 					￥{{item.goodsPrice}}
 				</view>
 			</view>
-			<!-- <view class="item">
-				<image src="../../static/shoppingcs.png" mode=""></image>
-				<view class="title">
-					燕麦麸皮 1盒
-				</view>
-				<view class="price">
-					￥42.9
-				</view>
-			</view>
-			<view class="item">
-				<image src="../../static/shoppingcs.png" mode=""></image>
-				<view class="title">
-					燕麦麸皮 1盒
-				</view>
-				<view class="price">
-					￥42.9
-				</view>
-			</view>
-			<view class="item">
-				<image src="../../static/shoppingcs.png" mode=""></image>
-				<view class="title">
-					燕麦麸皮 1盒
-				</view>
-				<view class="price">
-					￥42.9
-				</view>
-			</view> -->
+		
 		</view>
 	</view>
 </template>
@@ -67,15 +41,21 @@
 			//获取传值
 			console.log(options)
 			this.title = options.title
+			this.goodsCategoryId = options.goodsCategoryId
 			this.goodsListinfo()
 		},
 		methods: {
+			// 查询商品列表
 			goodsListinfo(){
-				goodsList(this.pageSize, this.pageNum,this.goodsCategoryId).then(res => {
+				goodsList(this.patientId).then(res => {
+					res.data.forEach(e => {
+						e.goodsPictureUrl = baseurl + e.goodsPictureUrl
+					})
 					this.goodsList = res.data
 					console.log(this.goodsCategoryList)
 				})
 			},
+			
 			//跳转详情页
 			goCommodityDetails() {
 				uni.navigateTo({
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
new file mode 100644
index 0000000..e881132
--- /dev/null
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -0,0 +1,340 @@
+<template>
+	<view class="app">
+		<view class="address" v-for="(item,index) in goodPatient" :key="index">
+			<view class="addressinfo">
+				<view class="item">
+					{{item.receiveName}},{{item.receivePhone}}
+				</view>
+				<view class="item detail">
+					{{item.receiveAddress}}
+				</view>
+				<view class="update">
+					<view class="up ups" @tap='updata(item)'>
+						修改
+					</view>
+					<view class="up" @tap='del(item)'>
+						删除
+					</view>
+
+					<!-- 	<u-modal width="50%" v-model="delshow" style='background-color: rgba(118, 118, 118, 0.6);'
+						@confirm='delconfirm' :content="content" show-cancel-button>
+					</u-modal> -->
+				</view>
+			</view>
+		</view>
+
+		<view class="ADDress" @tap='add()'>
+			<image src="../../static/add.png" mode=""></image>
+			<span class="ADDtext">
+				添加收货地址
+			</span>
+		</view>
+
+		<!-- 弹框 -->
+
+		<u-popup v-model="show" mode="center" width="80%" height="50%" border-radius="30">
+			<view class="payment">
+				添加收货地址
+				<view class="cencel" @tap="cencel()">
+					<image src="../../static/gb.png" mode=""></image>
+				</view>
+				<view class="addinfos">
+					<u-field v-model="list.receiveName" label="收货人" placeholder="姓名" class="items">
+					</u-field>
+					<u-field v-model="list.receivePhone" label="手机号" placeholder="电话" class="items">
+					</u-field>
+					<view class="area">
+						<u-field v-model="list.areaCode" label="地区" placeholder="请选择" class="items">
+						</u-field>
+						<image src="../../static/jiantou.png" mode=""></image>
+					</view>
+
+					<u-field v-model="list.receiveAddress" label-width="170" label="详细地址" placeholder="如街道、门牌号、小区等"
+						class="items">
+					</u-field>
+				</view>
+				<view class="save" @tap='submit()'>
+					保存
+				</view>
+				<u-toast ref="uToast" />
+			</view>
+
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		goodPatientInfo,
+		addnursingStation,
+		delnursingStation,
+		nursingStationGoodsinfo,
+		updatenursingStation,
+	} from '@/api/modifyAddress/modifyAddress.js';
+	import baseurl from '@/api/baseurl.js'
+	export default {
+		data() {
+			return {
+				isedit: true, //标识
+				delshow: false, //删除弹框
+				content: '确认要删除信息吗？',
+				show: false, //弹框
+				list: {
+					receiveName: '',
+					receivePhone: '',
+					receiveAddress: '',
+					areaCode: '',
+					patientId: 2,
+
+				},
+				goodPatient: [], // 查询地址信息
+				patientId: 2,
+				// delId: '',
+
+
+			}
+		},
+		onLoad(options) {
+			//获取传值
+			this.goodsList()
+		},
+		methods: {
+			// 查询地址信息
+			goodsList() {
+				goodPatientInfo(this.patientId).then(res => {
+					this.goodPatient = res.data
+					console.log(this.goodPatient)
+				})
+			},
+			// 保存按钮
+			submit() {
+				let that=this  
+				if (that.isedit == true) {
+					addnursingStation(that.list).then(res => {
+						if (res.code == 200) {
+						that.$refs.uToast.show({
+							title: '新增成功',
+							duration: 20000000
+						});
+						that.show = false;
+						// console.log(res)
+						that.goodsList()
+						that.list = {}
+						}
+					})
+				} else {
+					updatenursingStation(that.list).then(res => {
+						uni.showToast({
+							title: '修改成功',
+							duration: 2000
+						});
+						that.show = false;
+						// console.log(res)
+						that.goodsList()
+						// this.list = {}
+
+					})
+				}
+
+
+			},
+			// 修改按钮
+			updata(item) {
+				this.isedit = false
+				nursingStationGoodsinfo(item.id).then(res => {
+					console.log(item)
+					this.list = res.data
+					this.show = true
+				})
+
+
+			},
+			// 新增
+			add() {
+				this.isedit = true
+				this.show = true
+			},
+			// delconfirm() {
+			// 	// console.log(1111)
+			// 	delnursingStation(this.delId).then(res => {
+			// 		if (res.code == 200) {
+			// 			this.$refs.uToast.show({
+			// 				title: '删除成功',
+			// 				type: 'success',
+			// 				duration: 2000
+			// 			})
+			// 			this.delshow = false;
+			// 			console.log(res)
+			// 			this.goodsList()
+			// 		}
+			// 	})
+			// },
+			// 删除
+			del(item) {
+				let that=this   
+				uni.showModal({
+					title: '提示',
+					content: '确认要删除信息吗',
+					success: function(res) {
+						if (res.confirm) {
+							delnursingStation(item.id).then(res => {
+							
+									uni.showToast({
+										title: '删除成功',
+										duration: 2000,
+										
+									});
+									console.log(111),
+									that.delshow = false;
+									 that.goodsList()	
+									// console.log(this)
+									
+								
+
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+		
+				// this.delId = item.id
+				// this.delshow = true
+			},
+			// 取消
+			cencel() {
+				this.show = false
+				this.list = {}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	::v-deep .u-mask {
+		background-color: rgba(118, 118, 118, 0.6);
+	}
+
+	.app {
+		padding: 4%;
+
+		.address {
+			/* position: absolute; */
+			width: 99%;
+			height: 270rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			margin: 0 auto;
+			margin-bottom: 20rpx;
+
+			.item {
+				width: 90%;
+				height: 101rpx;
+				font-size: 36rpx;
+				color: #000000;
+				line-height: 101rpx;
+				margin: 0 auto;
+			}
+
+			.detail {
+				border-bottom: 5rpx solid #F4F5F7;
+				margin-top: -20rpx;
+			}
+
+			.update {
+				display: flex;
+				margin: 18rpx 18rpx 18rpx 432rpx;
+			}
+
+			.up {
+
+				width: 114rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				background: #FFFFFF;
+				border: 1rpx solid #969394;
+				border-radius: 26px;
+				font-size: 31rpx;
+				color: #969394;
+			}
+
+			.ups {
+				margin-right: 30rpx;
+			}
+		}
+
+		.ADDress {
+			width: 80%;
+			height: 80rpx;
+			line-height: 80rpx;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			font-size: 34rpx;
+			color: #FFFFFF;
+			text-align: center;
+			position: fixed;
+			bottom: 5rpx;
+			left: 10%;
+
+			image {
+				width: 41rpx;
+				height: 41rpx;
+				vertical-align: middle
+			}
+
+			.ADDtext {
+				padding-left: 10rpx;
+			}
+		}
+
+		// 弹框支付
+		.payment {
+			width: 90%;
+			height: 110rpx;
+			font-size: 36rpx;
+			color: #000000;
+			line-height: 110rpx;
+			text-align: center;
+			margin: 0 auto;
+			border-bottom: 1rpx solid #D8D4D4;
+
+			image {
+				width: 31rpx;
+				height: 31rpx;
+				float: right;
+				margin: -60rpx 20rpx 0 0;
+			}
+
+			.save {
+				width: 226rpx;
+				border-radius: 26px;
+				height: 71rpx;
+				line-height: 71rpx;
+				background: #4C7BC9;
+				border-radius: 26rpx;
+				text-align: center;
+				font-size: 34rpx;
+				color: #FFFFFF;
+				margin: 0 auto;
+				margin-top: 10%;
+			}
+		}
+
+		.area {
+			image {
+				width: 18rpx;
+				height: 26rpx;
+			}
+
+		}
+
+		.items {
+			font-size: 32rpx;
+			color: #030001;
+			line-height: 40rpx;
+		}
+
+	}
+</style>
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index 39091d2..1bedb99 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -1,3 +1,4 @@
+
 <template>
 	<view class="app">
 		<view class="cards">
@@ -38,8 +39,8 @@
 				pageNum: 1,
 				pageSize: 999,
 				goodsCategoryList: [],
-				// goodsCategoryId:"",
 				listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#00C176'],
+				// img: '',
 			};
 		},
 		onLoad(options) {
@@ -83,4 +84,4 @@
 
 
 	}
-</style>  
+</style>