From 970e90b55289c49a30d2365ac721abf7031c71de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 28 Dec 2022 08:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/CommodityDetails/CommodityDetails.vue | 23 ++--
.../CommodityDetailsstyle.scss | 9 +-
pages/CommodityOrder/CommodityOrder.scss | 10 +-
pages/CommodityOrder/CommodityOrder.vue | 8 ++
.../Nursingstationserviceorder.vue | 8 ++
pages/ProductList/ProductList.vue | 31 ++++-
pages/ServiceDetails/ServiceDetails.scss | 6 +-
pages/ServiceDetails/ServiceDetails.vue | 7 +-
pages/confirmOrder/confirmOrder.scss | 3 +
pages/confirmOrder/confirmOrder.vue | 3 +
pages/detail/detail.scss | 115 ------------------
pages/detail/detail.vue | 67 +++++-----
pages/login/login.vue | 8 +-
pages/menttimeorder/menttimeorder.vue | 13 +-
pages/modify/modify.vue | 53 ++++----
pages/orderDetails/orderDetails.scss | 4 +-
pages/payorderDetails/payorderDetails.vue | 6 +-
pages/shopping/shopping.vue | 16 +--
pages/user/user.vue | 9 +-
share.js | 2 +-
20 files changed, 193 insertions(+), 208 deletions(-)
delete mode 100644 pages/detail/detail.scss
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index b84f52c..affaab7 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -64,7 +64,7 @@
- {{goodsDetailslist.goodsName}}
+ {{goodsDetailslist.goodsName}}
￥{{updata.goodsPrice}}
@@ -216,17 +216,21 @@
})
}
} else {
- that.buyshow = false
- uni.navigateTo({
- url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
+ that.$refs.uToast.show({
+ title: '未选择商品',
+ type: 'error'
})
+ // that.buyshow = false
+ // uni.navigateTo({
+ // url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
+ // })
}
} else {
that.buyshow = false
that.usershow = true
}
- } else if(res.code==9999){
-
+ } else if (res.code == 9999) {
+
} else {
that.$refs.uToast.show({
title: res.msg,
@@ -365,8 +369,13 @@
},
},
onLoad(options) { //获取传值
+ console.log(options)
this.updata.buySource = options.buySource
- this.goodsPrice = options.goodsPrice //页面价格
+ if (options.goodsPrice == 'null' || !options.goodsPrice) {
+ this.goodsPrice = 0 //页面价格
+ } else {
+ this.goodsPrice = options.goodsPrice //页面价格
+ }
this.goodsInfoId = options.goodsInfoId
},
onShow() {
diff --git a/pages/CommodityDetails/CommodityDetailsstyle.scss b/pages/CommodityDetails/CommodityDetailsstyle.scss
index 438f3ce..96b13a2 100644
--- a/pages/CommodityDetails/CommodityDetailsstyle.scss
+++ b/pages/CommodityDetails/CommodityDetailsstyle.scss
@@ -90,7 +90,13 @@
left: 38%;
font-weight: 600;
width: 58%;
- height: 85rpx;
+ // height: 85rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 3;
+ word-break: break-all;
}
.image {
@@ -289,6 +295,7 @@
.name,
.number {
+ word-break: break-all;
width: 100%;
display: inline-block;
line-height: 50rpx;
diff --git a/pages/CommodityOrder/CommodityOrder.scss b/pages/CommodityOrder/CommodityOrder.scss
index 5c2fcc9..daa0839 100644
--- a/pages/CommodityOrder/CommodityOrder.scss
+++ b/pages/CommodityOrder/CommodityOrder.scss
@@ -150,6 +150,7 @@
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
+
}
span:nth-child(2) {
@@ -167,12 +168,19 @@
top: 45%;
width: 68%;
- .box {
+ .box:nth-child(1) {
+ width: 70%;
+ display: inline-block;
font-size: 30rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.box:nth-child(2) {
+ width: 30%;
position: absolute;
+ text-align: center;
right: 0%;
}
}
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index 82a0b2a..1dd5968 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -254,6 +254,14 @@
this.pageNum = 1;
this.baseurl = baseurl;
let that = this
+ try {
+ const value = uni.getStorageSync('openid');
+ if (value) {} else {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ }
+ } catch (e) {}
try {
const value3 = uni.getStorageSync('Refresh');
if (value3) {
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index 784970f..2bc8464 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -123,6 +123,14 @@
that.getinfo();
}
} catch (e) {}
+ try {
+ const value = uni.getStorageSync('openid');
+ if (value) {} else {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ }
+ } catch (e) {}
},
onLoad() {
let that = this
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 2aeaeac..2a7f6ad 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -4,7 +4,7 @@
-
+
@@ -17,6 +17,12 @@
+
+
+
+ 暂无商品
+
+
@@ -49,6 +55,14 @@
},
onShow() {
var that = this
+ try {
+ const value = uni.getStorageSync('openid');
+ if (value) {} else {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ }
+ } catch (e) {}
try {
const value3 = uni.getStorageSync('Refresh');
if (value3) {
@@ -117,6 +131,21 @@
.app {
padding: 0;
+ .noorder {
+ view {
+ text-align: center;
+ font-size: 40rpx;
+ color: #BFBFBF;
+ }
+
+ image {
+ display: block;
+ margin: 20% auto 50rpx;
+ width: 160rpx;
+ height: 200rpx;
+ }
+ }
+
.inputs {
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border: 1px solid #f0f0f0;
diff --git a/pages/ServiceDetails/ServiceDetails.scss b/pages/ServiceDetails/ServiceDetails.scss
index 6c9a815..1fd59cb 100644
--- a/pages/ServiceDetails/ServiceDetails.scss
+++ b/pages/ServiceDetails/ServiceDetails.scss
@@ -1,6 +1,6 @@
.app {
height: 100%;
- padding: 2%;
+ padding: 0 2% 2%;
font-size: 36rpx;
padding-top: 10rpx;
font-size: 34rpx;
@@ -10,7 +10,7 @@
text-align: center;
line-height: 80rpx;
background-color: #fff;
- margin: 0 auto 10rpx;
+ margin: 20rpx auto 0rpx;
border-radius: 20rpx;
}
.mask{
@@ -37,7 +37,7 @@
text-align: center;
width: 300rpx;
height: 70rpx;
- margin: 0 auto;
+ margin: 10rpx auto 0;
line-height: 70rpx;
background-color:#4C7BC9 ;
border-radius: 50rpx;
diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue
index 4a286c0..53c5e89 100644
--- a/pages/ServiceDetails/ServiceDetails.vue
+++ b/pages/ServiceDetails/ServiceDetails.vue
@@ -1,5 +1,5 @@
-
+
剩余付款时间：
@@ -112,12 +112,15 @@
baseurl: '',
patientId: '', //id
openid: '', //id
- list: {},
+ list: null,
orderNo: '',
timer: null,
timestamp: 0,
}
},
+ onShow() {
+ this.getlist()
+ },
onLoad(options) {
this.baseurl = baseurl
this.orderNo = options.orderNo
diff --git a/pages/confirmOrder/confirmOrder.scss b/pages/confirmOrder/confirmOrder.scss
index 84e7ad6..39405f1 100644
--- a/pages/confirmOrder/confirmOrder.scss
+++ b/pages/confirmOrder/confirmOrder.scss
@@ -98,6 +98,9 @@
font-size: 33rpx;
color: #969394;
line-height: 67rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue
index 479d73d..9165de0 100644
--- a/pages/confirmOrder/confirmOrder.vue
+++ b/pages/confirmOrder/confirmOrder.vue
@@ -183,6 +183,9 @@
},
onLoad(options) {
this.updata = JSON.parse(options.updata)
+ if (this.updata.totalPrice == 'null' || !this.updata.totalPrice) {
+ this.updata.totalPrice = 0
+ }
},
onShow() {
var that = this
diff --git a/pages/detail/detail.scss b/pages/detail/detail.scss
deleted file mode 100644
index 3b635d2..0000000
--- a/pages/detail/detail.scss
+++ /dev/null
@@ -1,115 +0,0 @@
-.app {
- // font-size: 36rpx;
- padding-top: 10rpx;
-
- .concent {
- width: 701rpx;
- height: 811rpx;
- background: #4C7BC9;
- box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
- border-radius: 20rpx;
- margin-top: 5%;
- // left: 50%;
- // transform: translateX(-50%);
- margin: 0 auto;
- margin-bottom: 20px;
-
- .background {
- position: relative;
- // display: flex;
- width: 657rpx;
- height: 727rpx;
- background: #FFFFFF;
- border-radius: 25rpx;
- background-color: white;
- margin: 0 auto;
- top: 50%;
- transform: translateY(-50%);
-
- image {
- width: 178rpx;
- height: 84rpx;
- background: #FFFFFF;
- border-radius: 25px;
- // float: right;
- margin-left: 68%;
- margin-top: 5%;
- }
-
-
- // text-align:center;
-
-
-
- }
- }
- }
-
- .life {
- // margin: 0 auto;
- width: 162rpx;
- height: 40rpx;
- font-size: 42rpx;
- margin-left: 35%;
- color: #ffffff;
-
-
-
- }
-
-
-
- .lifeserve image {
- width: 639rpx;
- height: 739rpx;
- margin-left: 5%;
-
- padding-bottom: 20rpx;
- // height: rpx;
- // background: #E1AE3C;
- // box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03);
- // border-radius: 20px;
- }
-
- .concenta {
-
- margin: 0 auto;
- margin-bottom: 20px;
- // position: absolute;
- width: 701rpx;
- height: 811rpx;
- background: #E1AE3C;
- // margin-top: 118%;
- // margin-left: 2.55%;
- border-radius: 25rpx;
- // margin-bottom: 30rpx;
- }
-
- .concentb {
- margin: 0 auto;
- margin-bottom: 20px;
- // position: absolute;
- width: 701rpx;
- height: 811rpx;
- background: #00C176;
- // margin-top: 118%;
- // margin-left: 2.55%;
- border-radius: 25rpx;
- // margin-bottom: 30rpx;
- }
-
-
-
-
- .detailed {
- // font-size: 29rpx;
- width: 657rpx;
- height: 727rpx;
- padding: 0 42rpx;
- line-height: 56rpx;
- }
-
- .detailed view {
- // height: 100%;
- text-indent: 2em;
- }
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index bc49181..6078c8b 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -13,16 +13,12 @@
- 生活护理
-
-
-
+ 生活护理
+
- 医疗护理
-
-
-
+ 医疗护理
+
@@ -39,15 +35,14 @@