diff --git a/api/order/index.js b/api/Personal/Personal.js
similarity index 55%
rename from api/order/index.js
rename to api/Personal/Personal.js
index 7bbe944..6fe4213 100644
--- a/api/order/index.js
+++ b/api/Personal/Personal.js
@@ -1,4 +1,10 @@
import request from "../request.js"
+export function appPersonal(patientId) {
+ return request({
+ url: `/nurseApp/login/appPersonal?patientId=${patientId}`,
+ method: 'GET'
+ })
+}
export function orderCount(patientId) {
return request({
@@ -6,4 +12,3 @@ export function orderCount(patientId) {
method: 'GET'
})
}
-
diff --git a/api/user/user.js b/api/user/user.js
deleted file mode 100644
index 52939d2..0000000
--- a/api/user/user.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import request from "../request.js"
-export function appPersonal(patientId) {
- return request({
- url: `/nurseApp/login/appPersonal?patientId=${patientId}`,
- method: 'GET'
- })
-}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9018b31..2e4509f 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,13 @@
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
+ "path": "pages/coupon/coupon",
+ "style": {
+ "navigationBarTitleText": "优惠卷",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ }, {
"path": "pages/Personal/Personal",
"style": {
"navigationBarTitleText": "个人中心",
@@ -11,7 +18,21 @@
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle": "custom"
}
- },{
+ }, {
+ "path": "pages/integral/integral",
+ "style": {
+ "navigationBarTitleText": "积分",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ }, {
+ "path": "pages/modify/modify",
+ "style": {
+ "navigationBarTitleText": "修改信息",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ }
+ }, {
"path": "pages/startup/startup",
"style": {
"navigationBarTitleText": "",
@@ -62,13 +83,6 @@
}
},
{
- "path": "pages/modify/modify",
- "style": {
- "navigationBarTitleText": "修改信息",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff" //背景颜色
- }
- }, {
"path": "pages/appointmenttime/appointmenttime",
"style": {
"navigationBarTitleText": "预约时间",
@@ -96,7 +110,7 @@
"navigationBarTitleText": "医路优品",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
- "enablePullDownRefresh": true ,//设置参数为true
+ "enablePullDownRefresh": true, //设置参数为true
"navigationStyle": "custom"
}
}, {
@@ -108,15 +122,6 @@
"enablePullDownRefresh": true //设置参数为true
}
},
- {
- "path": "pages/user/user",
- "style": {
- "navigationBarTitleText": "个人信息",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#4C7BC9", //背景颜色
- "navigationBarTextStyle": "white"
- }
- },
{
"path": "pages/orderDetails/orderDetails",
"style": {
@@ -132,7 +137,7 @@
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
- },
+ },
{
"path": "pages/login/login",
"style": {
@@ -191,14 +196,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path": "pages/order/order",
- "style": {
- "navigationBarTitleText": "我的订单",
- "enablePullDownRefresh": false,
- "navigationBarBackgroundColor": "#ffffff"
- }
- },
{
"path": "pages/menttimeorder/menttimeorder",
"style": {
diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index 793c0e9..cd2470b 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -7,7 +7,7 @@
退款原因
请选择
{{dictname}}
-
+
退款金额
￥{{order.totalPrice}}
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 44a11cc..842e96e 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -19,7 +19,7 @@
{{updata.goodsAttributeName}}
-
+
@@ -28,7 +28,7 @@
+ -->
@@ -40,7 +40,7 @@
· 仅工作日发货
-
+
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index 46c5124..a270278 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -7,7 +7,7 @@
店铺名称
-
+
待付款
退款中
已取消
diff --git a/pages/Personal/Personal.scss b/pages/Personal/Personal.scss
index 61a169b..aec3b1b 100644
--- a/pages/Personal/Personal.scss
+++ b/pages/Personal/Personal.scss
@@ -60,18 +60,17 @@
transform: translateX(-50%);
}
.orderCount {
- background-color: red;
- color: #FFFFFF;
- border-radius: 50%;
- // padding: 0 5rpx ;
- line-height: 30rpx;
- width: 30rpx;
- height: 30rpx;
- font-size: 18rpx;
- // display: inline-block;
+ width: 38rpx;
+ height: 38rpx;
+ background: #FFFFFF;
+ border: 3rpx solid #DC222F;
position: absolute;
top: -20rpx;
right: 35rpx;
+ font-size: 22rpx;
+ border-radius: 50%;
+ line-height: 35rpx;
+ color: #DC222F;
}
}
}
diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index 1c10b87..9a1f709 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -23,7 +23,7 @@
健康档案
-
+
积分
@@ -53,7 +53,8 @@
{{list.waitPayCount}}
-
+
99+
@@ -63,7 +64,8 @@
{{list.waitReceivedGoodsCount}}
-
+
99+
@@ -73,7 +75,8 @@
{{list.receivedGoodsCount}}
-
+
99+
@@ -104,13 +107,11 @@
+
+
diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue
new file mode 100644
index 0000000..38861b1
--- /dev/null
+++ b/pages/integral/integral.vue
@@ -0,0 +1,282 @@
+
+
+
+
+
+ 积分余额
+
+
+
+
+ 积分规则
+
+
+
+ 1000
+
+
+ 20积分将于2022.01.01过期
+
+
+ 获取积分
+
+
+
+ 积分兑换
+
+
+
+
+
+ 维生素1盒
+
+
+ 需使用1000积分兑换
+
+
+ 立即兑换
+
+
+
+
+
+
+ 获取方式
+
+
+
+
+
+ 累计签到24天
+
+
+ +30积分
+
+
+ 签到
+
+
+
+
+
+ 每邀请1位好友
+
+
+ ＋20积分
+
+
+ 去完成
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss
index ef09bc7..e44ea48 100644
--- a/pages/modify/modify.scss
+++ b/pages/modify/modify.scss
@@ -2,19 +2,22 @@
background-color: #F4F5F7;
width: 100%;
color: #000000;
- padding-bottom: 50rpx;
- /deep/ .u-drawer{
+ padding: 15rpx 0 50rpx;
+
+ /deep/ .u-drawer {
z-index: 0 !important;
}
- .Agreement{
+
+ .Agreement {
width: 100%;
background-color: #F4F5F7;
text-align: center;
height: 1000rpx;
position: absolute;
- top:5%;
+ top: 5%;
font-size: 30rpx;
- .title{
+
+ .title {
height: 100rpx;
line-height: 100rpx;
border-bottom: 1px solid #eeeeee;
@@ -23,52 +26,58 @@
width: 100%;
text-align: center;
}
- .scroll-Y{
- height:830rpx ;
- overflow-y:scroll;
+
+ .scroll-Y {
+ height: 830rpx;
+ overflow-y: scroll;
text-align: left;
text-indent: 2em;
}
+
.cancel {
- height:70rpx;
+ height: 70rpx;
line-height: 70rpx;
font-size: 32rpx;
background-color: #F4F5F7;
position: absolute;
border-top: 1rpx solid #000000;
- bottom:0;
- right:0;
+ bottom: 0;
+ right: 0;
width: 50%;
color: #000000;
}
+
.determine {
- height:70rpx;
+ height: 70rpx;
line-height: 70rpx;
font-size: 32rpx;
width: 50%;
color: #F4F5F7;
background: #4C7BC9;
position: absolute;
- bottom:0;
- left:0;
+ bottom: 0;
+ left: 0;
}
}
+
.radio-content {
- margin: 50rpx auto;
+ margin: 30rpx auto 0;
width: 70%;
text-align: center;
font-size: 28rpx;
position: relative;
+
.agreement {
position: absolute;
- top:50%;
- left:20%;
+ top: 50%;
+ left: 20%;
transform: translateY(-50%);
color: #878987;
- }
+ }
+
.radio-right {
height: 100rpx;
-
+
.radio {
display: inline-block;
width: 35rpx;
@@ -76,57 +85,82 @@
border-radius: 70%;
border: 2rpx solid #178ffb;
position: absolute;
- top:50%;
- left:5%;
+ top: 50%;
+ left: 5%;
transform: translateY(-50%);
+
.radio-active {
width: 16rpx;
height: 16rpx;
border-radius: 50%;
background-color: #178ffb;
- position: absolute;
- top:50%;
- left:50%;
- transform: translate(-50%,-50%);
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
}
}
}
}
- .finish{
- width: 25%;
- height: 68rpx;
- background: #4C7BC9;
- border-radius: 26rpx;
+
+ .finish {
+ width: 70%;
+ height: 71rpx;
+ background: #557BC2;
+ border-radius: 36rpx;
text-align: center;
- line-height: 68rpx;
+ line-height: 71rpx;
color: #fff;
- margin-top: 50rpx;
- margin-left: 65%;
+ margin: 30rpx auto 0;
+ font-size: 32rpx;
}
+
.userinfo {
width: 96%;
background-color: #fff;
margin: 0 auto;
border-radius: 20rpx;
- .disease{
+
+ .disease {
width: 100%;
margin: 0 auto;
padding: 0 6% 0 3%;
line-height: 80rpx;
border-bottom: 1rpx solid #D8D4D4;
position: relative;
- view{
- display: inline-block;
+
+ .title {
+ font-size: 30rpx;
+ display: block;
+ line-height: 120rpx;
}
+
.pictureA {
width: 18rpx;
height: 27rpx;
position: absolute;
- right:30rpx;
- top:50%;
+ right: 30rpx;
+ top: 50%;
transform: translateY(-50%);
}
}
+
+ .itemimgs {
+ width: 100%;
+ height: 400rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+ position: relative;
+
+ .picture {
+ width: 200rpx;
+ height: 200rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+ }
+
.item {
width: 94%;
margin: 0 auto;
@@ -135,44 +169,22 @@
border-bottom: 1rpx solid #D8D4D4;
position: relative;
font-size: 30rpx;
- .picture {
- vertical-align: middle;
- width: 180rpx;
- height: 180rpx;
- position: absolute;
- top:10rpx;
- right:80rpx;
- }
-
- .pictureA {
- margin-left: 3%;
- width: 18rpx;
- height: 27rpx;
- position: absolute;
- right:20rpx;
- top:50%;
- transform: translateY(-50%);
- }
+
.address {
position: absolute;
- left:25%;
- top:50%;
+ left: 25%;
+ top: 50%;
width: 75%;
transform: translateY(-50%);
display: inline-block;
height: 120rpx;
line-height: 120rpx;
- overflow:hidden;
- text-overflow:ellipsis;
- white-space:nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
- span {
- display: inline-block;
- line-height: 120rpx;
- height: 120rpx;
- width: 25%;
- }
+
::v-deep .u-input__input {
height: 120rpx;
@@ -190,8 +202,8 @@
line-height: 120rpx;
width: 75%;
position: absolute;
- left:25%;
- top:50%;
+ left: 25%;
+ top: 50%;
transform: translateY(-50%);
}
}
diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue
index 0780659..9f7c0cd 100644
--- a/pages/modify/modify.vue
+++ b/pages/modify/modify.vue
@@ -1,10 +1,9 @@
-
- 头像:
-
-
+
+
+
姓名:
@@ -40,24 +39,25 @@
- 疾病类型:
-
-
+ 疾病类型:
+
+
{{item.diseaseName}}
-
+
- 我已阅读并同意我已阅读并同意《用户协议》
- 完成
+ 确认修改
@@ -96,7 +96,7 @@
import baseurl from '@/api/baseurl.js'
import {
appPersonal,
- } from '@/api/user/user.js';
+ } from '@/api/Personal/Personal.js';
import {
getSubordinateRegions,
} from '@/api/modifyAddress/modifyAddress.js';
@@ -148,7 +148,9 @@
that.appPersonallist = Response.data
that.appPersonallist.homeLatitude = Number(that.appPersonallist.homeLatitude)
that.appPersonallist.homeLongitude = Number(that.appPersonallist.homeLongitude)
- that.img = baseurl + that.appPersonallist.headPictureUrl
+ if (that.appPersonallist.headPictureUrl) {
+ that.img = baseurl + that.appPersonallist.headPictureUrl
+ }
if (that.appPersonallist.areaName) {
that.address = that.appPersonallist.areaName
}
@@ -177,7 +179,7 @@
} else if (e.length == 1) {
this.address = e[0].localName
this.appPersonallist.areaCode = e[0].id
- }else {
+ } else {
this.address = ''
this.appPersonallist.areaCode = ''
}
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index b853ad0..adf2cf2 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -53,7 +53,7 @@
-
+
diff --git a/pages/order/order.vue b/pages/order/order.vue
deleted file mode 100644
index 659798a..0000000
--- a/pages/order/order.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
- 商品订单
-
-
-
-
-
- 待付款
-
- {{list.waitPayCount}}
-
-
- 99+
-
-
-
-
- 待收货
-
- {{list.waitReceivedGoodsCount}}
-
-
- 99+
-
-
-
-
- 待评价
-
- {{list.receivedGoodsCount}}
-
-
- 99+
-
-
-
-
- 已完成
-
-
-
-
-
- 护理站服务订单
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index b342ec9..d944efb 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -12,7 +12,7 @@
店铺名称
-
+
diff --git a/pages/payorderDetails/payorderDetails.vue b/pages/payorderDetails/payorderDetails.vue
index ef3957d..14e8932 100644
--- a/pages/payorderDetails/payorderDetails.vue
+++ b/pages/payorderDetails/payorderDetails.vue
@@ -12,7 +12,7 @@
店铺名称
-
+
diff --git a/pages/refundType/refundType.vue b/pages/refundType/refundType.vue
index df7d132..bfc6ce0 100644
--- a/pages/refundType/refundType.vue
+++ b/pages/refundType/refundType.vue
@@ -31,7 +31,7 @@
我要退款(无需退货)
没收到货
-
+
@@ -40,7 +40,7 @@
我要退货退款
已收到货，需要退还收到的货物
-
+
diff --git a/pages/user/user.scss b/pages/user/user.scss
deleted file mode 100644
index ac4fe44..0000000
--- a/pages/user/user.scss
+++ /dev/null
@@ -1,145 +0,0 @@
- .app {
- font-size: 35rpx;
- padding: 0 0 200rpx 0;
- position: relative;
- .signout{
- // position: absolute;
- // bottom: 60rpx;
- // width: 94%;
- background: #FFFFFF;
- margin-top: 50rpx;
- height: 80rpx;
- line-height: 80rpx;
- // left:3%;
- border-radius: 20rpx;
- text-align: center;
- }
- .External {
- width: 94%;
- height: 100rpx;
- line-height: 100rpx;
- margin: 20rpx auto;
- padding-left: 5%;
- background: #FFFFFF;
- box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- border-radius: 20rpx;
- position: relative;
- .righttext {
- position: absolute;
- right: 12%;
- top: 50%;
- color: #969394;
- transform: translateY(-50%);
- }
-
- image {
- width: 18rpx;
- height: 27rpx;
- position: absolute;
- right: 5%;
- top: 50%;
- transform: translateY(-50%);
- }
-
- .lefttext,
- .righttext {
- display: inline-block;
- }
- }
-
- .information {
- width: 94%;
- border-radius: 20rpx;
- position: absolute;
- top: 250rpx;
- left: 3%;
- color: #000000;
- padding:0 0 0 0;
- overflow: hidden;
- font-size: 32rpx;
- .disease{
- box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- line-height: 60rpx;
- padding:0 0 40rpx 5%;
- background: #FFFFFF;
- border-radius: 0 0 20rpx 20rpx;
- }
- .addressitem {
- box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- // height: 110rpx;
- line-height: 80rpx;
- border-bottom: 1rpx solid #D8D4D4;
- background: #FFFFFF;
- .address{
- line-height: 50rpx;font-size: 28rpx;width: 90%;margin: 0 auto;
- }
- }
- .item {
- box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- // height: 110rpx;
- line-height: 110rpx;
- border-bottom: 1rpx solid #D8D4D4;
- padding:0 0 0 5%;
- background: #FFFFFF;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- // .address {
- // position: absolute;
- // top:50%;
- // transform: translateY(-50%);
- // // font-size: 30rpx;
- // display: inline-block;
- // width: 80%;
- // overflow: hidden;
- // text-overflow: ellipsis;
- // white-space: nowrap;
- // }
- }
- }
-
- .user {
- width: 100%;
- height: 500rpx;
- background: #4C7BC9;
- position: relative;
- color: #FFFFFF;
-
- .modify {
- font-size: 32rpx;
- position: absolute;
- right: 3%;
- top: 22%;
- }
-
- .nickname {
- position: absolute;
- top: 26%;
- left: 33%;
- }
-
- .phone {
- position: absolute;
- top: 13%;
- left: 33%;
- }
-
- .img {
- width: 150rpx;
- height: 150rpx;
- border-radius: 50%;
- background: #F6F6F6;
- position: absolute;
- top: 10%;
- left: 8%;
-
- image {
- width: 100rpx;
- margin-left: 50%;
- margin-top: 50%;
- transform: translate(-50%, -50%);
- height: 100rpx;
- }
- }
- }
- }
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
deleted file mode 100644
index 2eb2d9e..0000000
--- a/pages/user/user.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{appPersonallist.patientName}}
-
-
-
-
-
- 修改信息
-
-
-
-
-
- 姓名：{{appPersonallist.patientName}}
-
-
- 姓名：
-
-
- 电话：{{appPersonallist.phone}}
-
-
- 电话：
-
-
- 身份证：{{appPersonallist.cardNo}}
-
-
- 身份证：
-
-
-
- 区域：
-
-
- {{appPersonallist.areaName}}
-
-
-
-
- 区域：
-
-
-
-
-
-
- 地址：
-
-
- {{appPersonallist.address}}
-
-
-
-
- 地址：
-
-
-
-
- 疾病类型:
-
- {{item.diseaseName}}
-
-
- 退出账号
-
-
-
-
-
-
-
-
-
diff --git a/static/jfgz.png b/static/jfgz.png
new file mode 100644
index 0000000..ec3a141
Binary files /dev/null and b/static/jfgz.png differ
diff --git a/static/jiantou.png b/static/jiantou.png
deleted file mode 100644
index 80157cd..0000000
Binary files a/static/jiantou.png and /dev/null differ
diff --git a/static/jifenbeij.png b/static/jifenbeij.png
new file mode 100644
index 0000000..2884b46
Binary files /dev/null and b/static/jifenbeij.png differ
diff --git a/static/pic.png b/static/pic.png
deleted file mode 100644
index bf2e92e..0000000
Binary files a/static/pic.png and /dev/null differ
diff --git a/static/qiandao.png b/static/qiandao.png
new file mode 100644
index 0000000..48544c1
Binary files /dev/null and b/static/qiandao.png differ
diff --git a/static/rowsright.png b/static/rowsright.png
deleted file mode 100644
index dbf914f..0000000
Binary files a/static/rowsright.png and /dev/null differ
diff --git a/static/userl.png b/static/userl.png
new file mode 100644
index 0000000..f7224f5
Binary files /dev/null and b/static/userl.png differ
diff --git a/static/yaoqing.png b/static/yaoqing.png
new file mode 100644
index 0000000..e8870b1
Binary files /dev/null and b/static/yaoqing.png differ