From 5fbafdfa384dcd15651f5cf15e88714aa25d04c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 25 Nov 2022 11:13:41 +0800
Subject: [PATCH 01/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 2 +-
pages/startup/startup.vue | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e144b6e..7df7a29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "NurseStationAppletUI",
+ "name": "nurseWeChatAppletUI",
"lockfileVersion": 2,
"requires": true,
"packages": {
diff --git a/pages/startup/startup.vue b/pages/startup/startup.vue
index 2497d32..4ad751b 100644
--- a/pages/startup/startup.vue
+++ b/pages/startup/startup.vue
@@ -18,7 +18,11 @@
};
},
onShow() {
- this.info()
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/homepage/homepage'
+ });
+ }, 2000);
// const value = uni.getStorageSync('openid');
// if (value) {
// existPatientInfo(value).then(res => {
@@ -30,15 +34,7 @@
// })
// } else {}
},
- methods: {
- info() {
- setTimeout(() => {
- uni.reLaunch({
- url: '/pages/homepage/homepage'
- });
- }, 2000);
- },
- },
+ methods: {},
}
From ffb349cc9f1c237addbe7938af6757bab80965a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 1 Dec 2022 16:59:32 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/ProductList/ProductList.js | 4 +-
api/ProjectDetails/index.js | 8 +
manifest.json | 14 +-
pages.json | 8 +
.../Nursingstationserviceorder.vue | 11 +-
pages/ProductList/ProductList.vue | 59 ++++-
pages/ProjectDetails/ProjectDetails.scss | 171 +++++++++++++
pages/ProjectDetails/ProjectDetails.vue | 160 ++++++++++++
pages/appointmenttime/appointmenttime.scss | 228 ++++++++++--------
pages/appointmenttime/appointmenttime.vue | 28 ++-
pages/information/information.scss | 7 +-
pages/login/login.vue | 6 +
pages/modify/modify.scss | 7 +-
pages/modifyAddress/modifyAddress.vue | 4 +-
pages/nursestation/nursestation.scss | 4 +
pages/nursestation/nursestation.vue | 37 ++-
pages/shopping/shopping.vue | 11 +-
pages/user/user.vue | 16 +-
18 files changed, 631 insertions(+), 152 deletions(-)
create mode 100644 api/ProjectDetails/index.js
create mode 100644 pages/ProjectDetails/ProjectDetails.scss
create mode 100644 pages/ProjectDetails/ProjectDetails.vue
diff --git a/api/ProductList/ProductList.js b/api/ProductList/ProductList.js
index ed4c62a..b750720 100644
--- a/api/ProductList/ProductList.js
+++ b/api/ProductList/ProductList.js
@@ -1,8 +1,8 @@
import request from "../request.js"
-export function goodsList(pageSize,pageNum,goodsCategoryId) {
+export function goodsList(pageSize,pageNum,goodsCategoryId,goodsName) {
return request({
- url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}`,
+ url: `/nurseApplet/nursingStationGoods/goodsList?pageSize=${pageSize}&pageNum=${pageNum}&goodsCategoryId=${goodsCategoryId}&goodsName=${goodsName}`,
method: 'GET'
})
}
\ No newline at end of file
diff --git a/api/ProjectDetails/index.js b/api/ProjectDetails/index.js
new file mode 100644
index 0000000..bf08060
--- /dev/null
+++ b/api/ProjectDetails/index.js
@@ -0,0 +1,8 @@
+import request from "../request.js"
+
+export function getAppStationItemInfo(stationId, stationItemId, stationItemPriceId) {
+ return request({
+ url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
+ method: 'GET'
+ })
+}
diff --git a/manifest.json b/manifest.json
index b0dbda3..3770334 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "NurseStationAppletUI",
+ "name" : "nurseWeChatAppletUI",
"appid" : "__UNI__1200110",
"description" : "",
"versionName" : "1.0.0",
@@ -17,7 +17,9 @@
"delay" : 0
},
/* 模块配置 */
- "modules" : {},
+ "modules" : {
+ "Geolocation" : {}
+ },
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
@@ -43,7 +45,13 @@
/* ios打包配置 */
"ios" : {},
/* SDK配置 */
- "sdkConfigs" : {},
+ "sdkConfigs" : {
+ "geolocation" : {
+ "system" : {
+ "__platform__" : [ "ios", "android" ]
+ }
+ }
+ },
"splashscreen" : {
"androidStyle" : "common"
}
diff --git a/pages.json b/pages.json
index 92408f5..7a64d21 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,14 @@
"navigationBarBackgroundColor": "#ffffff" //背景颜色
}
+ }, {
+ "path": "pages/ProjectDetails/ProjectDetails",
+ "style": {
+ "navigationBarTitleText": "护理项目详情",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#ffffff" //背景颜色
+ }
+
}, {
"path": "pages/goodsorderRate/goodsorderRate",
"style": {
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index d0591ab..a163cb8 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -8,7 +8,7 @@
{{item.orderStatus=='PAY'?'已付款':''}}
{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
{{item.orderStatus=='NOT_FINISH'?'待完成':''}}
- {{item.orderStatus=='COMPLETE'?'未评价':''}}
+ {{item.orderStatus=='COMPLETE'?'待评价':''}}
{{item.orderStatus=='EVALUATED'?'服务完成':''}}
{{item.orderStatus=='WAIT_REFUND'?'退款中':''}}
{{item.orderStatus=='REFUNDED'?'已退款':''}}
@@ -64,7 +64,7 @@
openid: null,
patientId: null,
pageNum: 1,
- total:0,
+ total: 0,
pageSize: 10,
list: [],
}
@@ -87,13 +87,12 @@
}
} catch (e) {}
},
- onLoad() {
- },
+ onLoad() {},
methods: {
//去评价
// gorate(){
// uni.navigateTo({
-
+
// })
// },
//支付
@@ -107,7 +106,7 @@
payType: "WECHAT_PAY",
buySource: "NURSE_STATION",
}
- var that =this
+ var that = this
appletAppointmentOrderPay(obj).then(response => {
if (response.code == 200) {
uni.requestPayment({
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 7dbd560..7f058c7 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -1,5 +1,9 @@
+
+
+
+
@@ -31,18 +35,28 @@
goodsCategoryId: '', //请求值
goodsList: [], //商品列表list
total: 0, //list总长度
+ goodsName: '',
};
},
+ watch: { //监听
+ goodsName() {
+ this.pageNum = 1;
+ goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
+ this.goodsList = res.rows
+ this.total = res.total
+ })
+ },
+ },
onLoad(options) { //获取传值
this.title = options.title //导航栏标题
this.goodsCategoryId = options.goodsCategoryId //请求id
this.baseurl = baseurl;
- this.goodsListinfo(this.pageSize, this.pageNum, options.goodsCategoryId)
+ this.goodsListinfo()
},
methods: {
// 查询商品列表
- goodsListinfo(pageSize, pageNum, goodsCategoryId) {
- goodsList(pageSize, pageNum, goodsCategoryId).then(res => {
+ goodsListinfo() {
+ goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
res.rows.forEach(e => {
this.goodsList.push(e)
})
@@ -64,12 +78,12 @@
onReachBottom() { //下滑加载
if (this.goodsList.length >= this.total) {} else {
this.pageNum++;
- this.goodsListinfo(this.pageSize, this.pageNum, this.goodsCategoryId)
+ this.goodsListinfo(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName)
}
},
onPullDownRefresh() { //下拉刷新
this.pageNum = 1;
- goodsList(this.pageSize, this.pageNum, this.goodsCategoryId).then(res => {
+ goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
this.goodsList = res.rows
this.total = res.total
})
@@ -84,10 +98,43 @@
.app {
padding: 0;
+ .inputs {
+ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border: 1px solid #f0f0f0;
+ width: 90%;
+ height: 65rpx;
+ margin: 10rpx 0 10rpx 50%;
+ transform: translateX(-50%);
+ border-radius: 20rpx;
+ background-color: #Ffffff;
+ z-index: 999;
+
+ .input {
+ margin: 0 auto;
+ position: absolute;
+ height: 65rpx;
+ // top: 8%;
+ left: 10%;
+ width: 90%;
+ font-size: 26rpx;
+ color: #000000;
+ }
+
+ .icon {
+ background: url(@/static/sousuo.png) no-repeat;
+ width: 30rpx;
+ height: 28rpx;
+ background-size: cover;
+ position: absolute;
+ top: 30%;
+ left: 3%;
+ }
+ }
+
.productlist {
width: 100%;
margin: 0 auto;
- padding: 40rpx 0 0 0;
+ padding: 20rpx 0 0 0;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss
new file mode 100644
index 0000000..f2ad8a6
--- /dev/null
+++ b/pages/ProjectDetails/ProjectDetails.scss
@@ -0,0 +1,171 @@
+ .app {
+ height: 100%;
+ padding: 2% 2% 150rpx 2%;
+ padding-top: 10rpx;
+ font-size: 34rpx;
+ .mask {
+ .information {
+ width: 70%;
+ height: 400rpx;
+ margin: 50% auto;
+ background: #FFFFFF;
+ border-radius: 30rpx;
+ text-align: center;
+ color: #FFFFFF;
+ position: relative;
+
+ .determine,
+ .cancel {
+ width: 200rpx;
+ height: 70rpx;
+ border-radius: 26rpx;
+ font-size: 34rpx;
+ line-height: 70rpx;
+ position: absolute;
+ top: 74%;
+ }
+
+ .determine {
+ background: #4C7BC9;
+ right: 36rpx;
+ }
+
+ .cancel {
+ background: #C5BFBF;
+ left: 36rpx;
+ }
+
+ .title {
+ font-size: 42rpx;
+ margin-top: 40rpx;
+ color: #000000;
+ }
+
+ image {
+ width: 100rpx;
+ height: 100rpx;
+ margin: 10% 0 0 0;
+ }
+ }
+ }
+ .appointment {
+ width: 120rpx;
+ height: 70rpx;
+ background: #4C7BC9;
+ border-radius: 26rpx;
+ color: #ffffff;
+ text-align: center;
+ line-height: 70rpx;
+ position: absolute;
+ bottom:20rpx;
+ right:5%;
+ }
+ .detail {
+ position: relative;
+ width: 94%;
+ height: 100%;
+ margin: 0 auto;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ margin-top: 3%;
+ font-size: 31rpx;
+ padding: 3%;
+ padding-bottom: 50rpx;
+ .textInfo {
+ word-break:break-all;
+ font-size: 29rpx;
+ text-indent: 2rem;
+ line-height: 42rpx;
+ color: #666666;
+ padding-top: 30rpx;
+ /deep/ .richPic {
+ width: 100% !important;
+ height: 100% !important;
+ }
+ }
+ .Introduction {
+ font-size: 31rpx;
+ color: #333333;
+ line-height: 12rpx;
+ margin-left: -3%;
+ padding: 3%;
+ }
+ }
+ .item {
+ width: 95%;
+ height: 100%;
+ background: #FFFFFF;
+ box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border-radius: 20rpx;
+ margin: 20rpx auto 0;
+ padding: 3% 3% 40rpx 3%;
+ line-height: 60rpx;
+ position: relative;
+
+ image {
+ width: 170rpx;
+ height: 170rpx;
+ margin-left: 3%;
+ }
+
+ .servicetime {
+ color: #999999;
+ line-height: 37rpx;
+ font-size: 30rpx;
+ position: absolute;
+ top: 35%;
+ left: 35%;
+ }
+
+ .price {
+ color: red;
+ font-size: 32rpx;
+ position: absolute;
+ top: 65%;
+ left: 35%;
+ }
+
+ .product {
+ color: #000000;
+ width: 60%;
+ position: absolute;
+ top: 14%;
+ left: 32%;
+ font-size: 28rpx;
+ }
+
+ .huanyao {
+ color: #000000;
+ position: absolute;
+ top: 10%;
+ left: 35%;
+ width: 60%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+
+ /* 耗材包 */
+ .Consumablespackage {
+ width: 95%;
+ height: 100%;
+ background: #FFFFFF;
+ box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border-radius: 20rpx;
+ margin: 20rpx auto 0;
+ padding: 3% 3% 40rpx 3%;
+ line-height: 60rpx;
+ font-size: 32rpx;
+
+ .detail {
+ font-size: 30rpx;
+ color: #000000;
+ }
+
+ span {
+ color: red;
+ float: right;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue
new file mode 100644
index 0000000..1519212
--- /dev/null
+++ b/pages/ProjectDetails/ProjectDetails.vue
@@ -0,0 +1,160 @@
+
+
+
+
+ {{list.nurseItemName}}
+
+
+ 服务时长:{{list.serveDurationUnit?list.serveDurationUnit:'0'}}
+ ￥{{list.nurseItemPrice==null?'0':list.nurseItemPrice}}
+
+ 耗材包详情:
+ ￥{{list.consumableTotalPrice==null?'0':list.consumableTotalPrice}}
+
+ ·{{item.consumableDetail}}
+
+
+
+ 服务详情:
+
+
+
+ 预约
+
+
+
+
+
+ 请完善个人信息
+
+
+ 取消
+
+
+ 去完善
+
+
+
+
+
+
+
+
diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
index 785e187..ea5525c 100644
--- a/pages/appointmenttime/appointmenttime.scss
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -1,87 +1,95 @@
.app {
- font-size: 34rpx;
- padding-top: 10rpx;
- height: 100%;
- .mask{
- .Agreement{
- width: 100%;
- background-color: #F4F5F7;
- text-align: center;
- height: 1000rpx;
- position: absolute;
- top:5%;
- width:94%;
- left:3%;
- font-size: 30rpx;
- .title{
- height: 100rpx;
- line-height: 100rpx;
- border-bottom: 1px solid #eeeeee;
- font-size: 34rpx;
- margin: 0px auto;
- width: 100%;
- text-align: center;
- }
- .scroll-Y{
- width: 98%;
- margin: 0 auto;
- height:830rpx ;
- overflow-y:scroll;
- text-align: left;
- text-indent: 2em;
- }
- .cancel {
- height:70rpx;
- line-height: 70rpx;
- font-size: 32rpx;
- background-color: #F4F5F7;
- position: absolute;
- border-top: 1rpx solid #000000;
- bottom:0;
- right:0;
- width: 50%;
- color: #000000;
- }
-
- .determine {
- height:70rpx;
- line-height: 70rpx;
- font-size: 32rpx;
- width: 50%;
- color: #F4F5F7;
- background: #4C7BC9;
- position: absolute;
- bottom:0;
- left:0;
- }
- }
- }
- .addressitem{
- width: 97%;
- border-bottom: 1rpx solid #D8D4D4;
- margin-left: 3%;
+ font-size: 34rpx;
+ padding-top: 10rpx;
height: 100%;
- .leftaddress{
- width:15%;
+
+ .mask {
+ .Agreement {
+ width: 100%;
+ background-color: #F4F5F7;
+ text-align: center;
+ height: 1000rpx;
+ position: absolute;
+ top: 5%;
+ width: 94%;
+ left: 3%;
+ font-size: 30rpx;
+
+ .title {
+ height: 100rpx;
+ line-height: 100rpx;
+ border-bottom: 1px solid #eeeeee;
+ font-size: 34rpx;
+ margin: 0px auto;
+ width: 100%;
+ text-align: center;
+ }
+
+ .scroll-Y {
+ width: 98%;
+ margin: 0 auto;
+ height: 830rpx;
+ overflow-y: scroll;
+ text-align: left;
+ text-indent: 2em;
+ }
+
+ .cancel {
+ height: 70rpx;
+ line-height: 70rpx;
+ font-size: 32rpx;
+ background-color: #F4F5F7;
+ position: absolute;
+ border-top: 1rpx solid #000000;
+ bottom: 0;
+ right: 0;
+ width: 50%;
+ color: #000000;
+ }
+
+ .determine {
+ height: 70rpx;
+ line-height: 70rpx;
+ font-size: 32rpx;
+ width: 50%;
+ color: #F4F5F7;
+ background: #4C7BC9;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ }
+ }
+ }
+
+ .addressitem {
+ width: 97%;
+ border-bottom: 1rpx solid #D8D4D4;
+ margin-left: 3%;
height: 100%;
- display: flex;
- display: inline-block;
+
+ .leftaddress {
+ width: 15%;
+ height: 100%;
+ display: flex;
+ display: inline-block;
+ }
+
+ .addition {
+ color: #666666;
+ display: inline-block;
+ line-height: 50rpx;
+ font-size: 28rpx;
+ }
}
- .addition{
- color: #666666;
- display: inline-block;
- line-height: 50rpx;
- font-size: 28rpx;
- }
- }
.money {
font-size: 32rpx;
color: #D43953;
position: absolute;
- right:5%;
- top:20%;
+ right: 5%;
+ top: 20%;
}
+
.user {
background: #FFFFFF;
width: 94%;
@@ -89,39 +97,46 @@
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
line-height: 93rpx;
+
.selecttime {
height: 93rpx;
margin-left: 3%;
position: relative;
+
text {
font-size: 34rpx;
color: #878987;
}
+
image {
width: 18rpx;
height: 27rpx;
position: absolute;
- right:5%;
- top:50%;
+ right: 5%;
+ top: 50%;
transform: translateY(-50%);
}
- .addition{
+
+ .addition {
color: #666666;
line-height: 30rpx;
font-size: 28rpx;
}
}
+
.item {
width: 97%;
border-bottom: 1rpx solid #D8D4D4;
margin-left: 3%;
- .addition{
+
+ .addition {
color: #666666;
line-height: 30rpx;
font-size: 28rpx;
}
}
}
+
.remarks {
width: 94%;
height: 382rpx;
@@ -133,32 +148,37 @@
border-radius: 20rpx;
margin-top: 20rpx;
position: relative;
- span{
+
+ span {
display: inline-block;
width: 20%;
}
+
input {
position: absolute;
- top:50%;
- left:23%;
+ top: 50%;
+ left: 23%;
width: 77%;
transform: translateY(-50%);
}
}
+
.priceback {
width: 99%;
background: #FFFFFF;
height: 100rpx;
- position:fixed;
- bottom:0;
+ position: fixed;
+ bottom: 0;
padding-bottom: 20rpx;
display: flex;
justify-content: space-around;
+
.prices {
font-size: 48rpx;
color: #D43953;
line-height: 100rpx;
}
+
.xiugai {
width: 200rpx;
height: 70rpx;
@@ -170,6 +190,7 @@
text-align: center;
color: #ffffff;
}
+
.queren {
width: 200rpx;
height: 70rpx;
@@ -181,22 +202,26 @@
color: #ffffff;
}
}
+
.radio-content {
margin: 50rpx auto;
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;
width: 100rpx;
+
.radio {
display: inline-block;
width: 35rpx;
@@ -204,21 +229,25 @@
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;
- margin-left: 26%;
- margin-top: 22%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
// margin: 0 auto;
}
}
}
}
+
/* 耗材包 */
.Consumablespackage {
width: 94%;
@@ -230,15 +259,14 @@
margin-top: 20rpx;
position: relative;
padding-bottom: 40rpx;
+
.detail {
- width: 301rpx;
- height: 31rpx;
- font-size: 32rpx;
- color: #666666;
- line-height: 31rpx;
+ width: 100%;
+ line-height: 60rpx;
margin: 20rpx 0 0 40rpx;
}
}
+
/* 套餐 */
.Package {
width: 94%;
@@ -248,18 +276,20 @@
font-size: 34rpx;
background: #FFFFFF;
border-radius: 20rpx;
- margin-top:20rpx;
+ margin-top: 20rpx;
position: relative;
+
.detail {
line-height: 31rpx;
font-size: 32rpx;
color: #666666;
line-height: 31rpx;
position: absolute;
- left:10%;
- top:60%;
+ left: 10%;
+ top: 60%;
}
}
+
.message {
width: 94%;
background: white;
@@ -268,4 +298,4 @@
text-align: center;
line-height: 96rpx;
}
- }
+ }
\ No newline at end of file
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index ac9c005..4f77b09 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -46,8 +46,14 @@
耗材包详情：
￥{{orderlist.consumableTotalPrice}}
-
- ·{{item.consumableDetail}}
+
+
+
+ {{item.consumableDetail}}
+
+
我已阅读并同意《用户协议》
-
￥{{orderlist.totalPrice}}
@@ -214,6 +219,11 @@
getPatientInfo(stationId, stationItemId, stationItemPriceId) {
getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => {
if (res.code == 200) {
+ if (res.data.itemConsumableList) {
+ res.data.itemConsumableList.forEach(e => {
+ e.radio = true
+ })
+ }
this.orderlist = res.data
}
})
@@ -229,7 +239,12 @@
})
} else {
this.orderlist.orderCount = 1;
- this.orderlist.orderConsumableList = this.orderlist.itemConsumableList
+ this.orderlist.orderConsumableList = []
+ this.orderlist.itemConsumableList.forEach(e => {
+ if (e.radio) {
+ this.orderlist.orderConsumableList.push(e)
+ }
+ })
submitAppointment(this.orderlist).then(res => {
if (res.code == 500) {
that.$refs.uToast.show({
@@ -295,6 +310,11 @@
this.radio = 2;
this.maskshow = false
},
+ checkboxChange(e) {},
+ // 选中任一checkbox时，由checkbox-group触发
+ checkboxGroupChange(e) {},
+ // 全选
+ checkedAll() {},
//获取时间
timeconfirm(e) {
this.orderlist.serviceStartTime = e.hour + ":" + e.minute
diff --git a/pages/information/information.scss b/pages/information/information.scss
index 1c384ad..3716c8c 100644
--- a/pages/information/information.scss
+++ b/pages/information/information.scss
@@ -79,9 +79,10 @@
height: 16rpx;
border-radius: 50%;
background-color: #178ffb;
- margin-left: 26%;
- margin-top: 22%;
- // margin: 0 auto;
+ position: absolute;
+ top:50%;
+ left:50%;
+ transform: translate(-50%,-50%);
}
}
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index bc64b0a..8efaf67 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -54,6 +54,12 @@
delta: 1
})
}, 1500)
+ }else{
+ this.$refs.uToast.show({
+ title: '登录失败',
+ type: 'error',
+ duration: '1500'
+ })
}
})
},
diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss
index dda2b3b..01f9cb3 100644
--- a/pages/modify/modify.scss
+++ b/pages/modify/modify.scss
@@ -81,9 +81,10 @@
height: 16rpx;
border-radius: 50%;
background-color: #178ffb;
- margin-left: 26%;
- margin-top: 22%;
- // margin: 0 auto;
+ position: absolute;
+ top:50%;
+ left:50%;
+ transform: translate(-50%,-50%);
}
}
}
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index 7b44277..4edca31 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -22,7 +22,7 @@
- 添加收货地址
+ 添加地址
@@ -161,7 +161,7 @@
},
// 修改按钮
updataxg(item) {
- this.shipAddress = '修改收货地址'
+ this.shipAddress = '修改地址'
this.isedit = false
nursingStationGoodsinfo(item.id).then(res => {
this.infolist = res.data
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index 78c2e03..9ea5a86 100644
--- a/pages/nursestation/nursestation.scss
+++ b/pages/nursestation/nursestation.scss
@@ -208,6 +208,10 @@
line-height: 42rpx;
color: #666666;
padding-top: 30rpx;
+ /deep/ .richPic {
+ width: 94% !important;
+ height: 94% !important;
+ }
}
.Introduction {
font-size: 31rpx;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index 4b2c199..a7cb8fe 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -19,8 +19,7 @@
机构简介
-
- {{list.agencyIntroduce}}
+
@@ -41,7 +40,8 @@
-
+
{{item.nurseItemName}}
@@ -49,7 +49,7 @@
-->
服务时长:{{item.serveDurationUnit?item.serveDurationUnit:'0'}}
- 预约
+ 预约
￥{{item.nurseItemPrice==null?'0':item.nurseItemPrice}}
@@ -106,7 +106,6 @@
export default {
data() {
return {
- patientId: '', //
usershow: false, //完善信息开关
choicetab: false, //切换
list: [], //护理站list
@@ -121,6 +120,7 @@
pageNum: 1,
pageSize: 10,
tabIndex: 0,
+ timer: null,
tabList: [{
name: "服务项目"
}, {
@@ -145,8 +145,7 @@
if (value) {
const value2 = uni.getStorageSync('patientId');
if (value2) {
- that.patientId = value2
- AppIdentification(that.patientId).then(res => {
+ AppIdentification(value2).then(res => {
if (res.code == 200) {
if (res.data.loginFlag) {
that.usershow = false
@@ -161,7 +160,10 @@
title: res.msg,
type: 'error'
})
- setTimeout(e => {
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
@@ -173,7 +175,10 @@
title: '未登录,请先登录',
type: 'error'
})
- setTimeout(e => {
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
@@ -184,7 +189,10 @@
title: '未登录,请先登录',
type: 'error'
})
- setTimeout(e => {
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
@@ -199,6 +207,9 @@
getInfo() {
introductionList(this.nurseStationId).then(res => {
res.data.stationIntroducePcitureUrl = baseurl + res.data.stationIntroducePcitureUrl
+ res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\![]()
![]()
= this.servetotal) {} else {
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index 9047730..b9d7699 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -3,9 +3,8 @@
-
-
+
+
{{item.goodsCategoryName}}
@@ -89,7 +88,9 @@
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 0de26cd..fd5f7aa 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -117,10 +117,9 @@
},
onShow() {
this.baseurl = baseurl
- this.myInfo()
},
onLoad(options) {
- //获取传值
+ this.myInfo()
},
methods: {
remove() {
@@ -129,6 +128,7 @@
title: '提示',
content: '确认要退出此账号吗',
success: function(res) {
+ console.log(res)
if (res.confirm) {
uni.removeStorageSync('patientId');
uni.removeStorageSync('openid');
@@ -142,8 +142,8 @@
clearTimeout(that.timer)
}
that.timer = setTimeout(e => {
- uni.reLaunch({
- url: '/pages/homepage/homepage'
+ uni.navigateBack({
+ delta: 1
})
}, 1000)
} else if (res.cancel) {
@@ -171,8 +171,8 @@
if (Response.code == 200) {
that.appPersonallist = Response.data
} else {
- uni.navigateTo({
- url: '/pages/login/login'
+ uni.navigateBack({
+ delta: 1
})
}
})
@@ -192,8 +192,8 @@
uni.removeStorageSync('patientId');
uni.removeStorageSync('openid');
uni.removeStorageSync('phone');
- uni.navigateTo({
- url: '/pages/login/login'
+ uni.navigateBack({
+ delta: 1
})
},
updatainfo() {
From 7396fbdac8bb578d44cae2842834336250d3fa19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 2 Dec 2022 16:02:53 +0800
Subject: [PATCH 03/21] =?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 | 8 +-
.../CommodityDetailsstyle.scss | 13 +++-
pages/ProjectDetails/ProjectDetails.scss | 2 +-
pages/ProjectDetails/ProjectDetails.vue | 7 +-
pages/ServiceDetails/ServiceDetails.scss | 5 +-
pages/ServiceDetails/ServiceDetails.vue | 1 +
pages/appointmenttime/appointmenttime.scss | 29 +++++--
pages/appointmenttime/appointmenttime.vue | 75 +++++++++++++++++--
pages/modifyAddress/modifyAddress.vue | 34 ++++++---
pages/nursestation/nursestation.vue | 9 ++-
10 files changed, 144 insertions(+), 39 deletions(-)
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 4987e26..0656506 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -43,7 +43,9 @@
图文服务
-
+
+
+
@@ -131,7 +133,7 @@
export default {
data() {
return {
- timer:null,
+ timer: null,
goodsInfoId: null, //商品id
baseurl: '', //url
image: null, //总图片
@@ -296,6 +298,8 @@
// 查询商品详细信息
goodsDetailsinfo(goodsInfoId) {
goodsDetails(goodsInfoId).then(res => {
+ res.data[0].goodsRemark = res.data[0].goodsRemark.replace(/\![]()
![]()
￥{{list.consumableTotalPrice==null?'0':list.consumableTotalPrice}}
·{{item.consumableDetail}}
+ {{item.consumableCount}}{{item.consumableUnit}}/￥{{item.consumablePrice}}
-
+
服务详情:
@@ -144,9 +145,7 @@
getlist(stationId, stationItemId, stationItemPriceId) {
getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => {
res.data.nurseItemContent = res.data.nurseItemContent.replace(/\![]()
![]()
![]()
￥{{list.consumableTotalPrice}}
·{{item.orderConsumableName}}
+
@@ -65,10 +91,15 @@
nursingStationGoodsinfo,
updatenursingStation,
getSubordinateRegions,
- getSubordinate
+ getSubordinate,
+ updateDefaultAddress
} from '@/api/modifyAddress/modifyAddress.js';
import baseurl from '@/api/baseurl.js'
+ import gkcity from "../m-city/m-city.vue";
export default {
+ components: {
+ "m-city": gkcity
+ },
data() {
return {
timer: null,
@@ -76,33 +107,88 @@
delshow: false, //删除弹框
content: '确认要删除信息吗？',
show: false, //弹框
- areashow: false, //经纬度开关
- arealist: [], //区街道list
+ // areashow: false, //经纬度开关
+ // arealist: [], //区街道list
areaCode: '',
shipAddress: '添加地址',
infolist: {
receiveName: '',
receivePhone: '',
receiveAddress: '',
- areaCode: '',
+ areaCode: null,
patientId: '',
- address: '', //页面所属区域
+ address: null, //页面所属区域
+ defaultAddressFlag: false,
},
goodPatient: [], // 查询地址信息
patientId: null,
url: '',
updata: [],
+ list: [{
+ id: "",
+ localName: "请选择",
+ children: [],
+ }, ],
+ cityPickershow: false,
+ addresslength: null,
}
},
onShow() {
this.goodsList()
+ this.areaInfo()
},
onLoad(options) {
let that = this
this.updata = JSON.parse(options.updata)
- this.areaInfo()
},
methods: {
+ change(status) {
+ if (!status.defaultAddressFlag) {
+ status.defaultAddressFlag = true
+ } else {
+ this.goodPatient.forEach(e => {
+ e.defaultAddressFlag = 0
+ })
+ status.defaultAddressFlag = 1
+ updateDefaultAddress(this.goodPatient).then(res => {
+ if (res.code == 200) {
+ this.goodsList();
+ uni.$emit('updata', {
+ updata: JSON.stringify(this.updata),
+ useritem: JSON.stringify(status)
+ })
+ uni.navigateBack({
+ delta: 1
+ });
+ }
+ })
+ }
+ },
+ // 三级地址联动回调
+ getpickerParentValue(e) {
+ this.addresslength = e
+ if (e) {
+ if (e.length == 4) {
+ this.infolist.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3]
+ .localName
+ this.infolist.areaCode = e[3].id
+ } else if (e.length == 3) {
+ this.infolist.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName
+ this.infolist.areaCode = e[2].id
+ } else if (e.length == 2) {
+ this.infolist.address = e[0].localName + '-' + e[1].localName
+ this.infolist.areaCode = e[1].id
+ } else if (e.length == 1) {
+ this.infolist.address = e[0].localName
+ this.infolist.areaCode = e[0].id
+ }
+ }
+ },
+ // 显示三级地址联动
+ showPicker() {
+ this.cityPickershow = true
+ this.$refs.cityPicker.show();
+ },
//将信息携带至订单页面
goorder(item) {
uni.$emit('updata', {
@@ -122,8 +208,12 @@
that.patientId = value
goodPatientInfo(that.patientId).then(res => {
res.data.forEach(e => {
- e.address = e.provinceName + e.cityName + e.regionName + e
- .streetName + e.receiveAddress
+ e.address = e.areaName + e.receiveAddress
+ if (e.defaultAddressFlag == 1) {
+ e.defaultAddressFlag = true
+ } else {
+ e.defaultAddressFlag = false
+ }
})
that.goodPatient = res.data
})
@@ -139,6 +229,7 @@
uni.navigateBack({
delta: 2
})
+
}, 1500)
}
} catch (e) {}
@@ -147,52 +238,110 @@
submit() {
let that = this
if (that.isedit == true) {
- addnursingStation(that.infolist).then(res => {
- if (res.code == 200) {
- that.$refs.uToast.show({
- title: '新增成功',
- type: 'success'
+ if (that.addresslength) {
+ if (that.addresslength.length > 2) {
+ addnursingStation(that.infolist).then(res => {
+ if (res.code == 200) {
+ that.$refs.uToast.show({
+ title: '新增成功',
+ type: 'success'
+ })
+ that.cencel();
+ setTimeout(e => {
+ that.goodsList()
+ }, 1000)
+ } else {
+ that.$refs.uToast.show({
+ title: res.msg,
+ type: 'error'
+ })
+ }
})
- that.show = false;
- setTimeout(e => {
- that.goodsList()
- }, 1000)
- }
- })
- } else {
- updatenursingStation(that.infolist).then(res => {
- if (res.code == 200) {
- that.$refs.uToast.show({
- title: '修改成功',
- type: 'success'
- })
- that.show = false;
- setTimeout(e => {
- that.goodsList()
- }, 1000)
} else {
- that.$refs.uToast.show({
- title: res.msg,
- type: 'error'
- })
+ this.Toast()
}
- })
+ } else {
+ this.Toast()
+ }
+ } else {
+ if (that.addresslength) {
+ if (that.addresslength.length > 2) {
+ this.xgdata();
+ } else {
+ this.Toast()
+ }
+ } else {
+ this.xgdata();
+ }
}
},
+ Toast() {
+ this.$refs.uToast.show({
+ title: '区域应选择所在的区或街道,请重新选择!',
+ type: 'error'
+ })
+ },
+ xgdata() {
+ var that = this
+ updatenursingStation(that.infolist).then(res => {
+ if (res.code == 200) {
+ that.$refs.uToast.show({
+ title: '修改成功',
+ type: 'success'
+ })
+ that.cencel();
+ setTimeout(e => {
+ that.goodsList()
+ }, 1000)
+ } else {
+ that.$refs.uToast.show({
+ title: res.msg,
+ type: 'error'
+ })
+ }
+ })
+ },
+ // submit() {
+ // if (this.addresslength) {
+ // if (this.addresslength.length > 2) {
+ // this.data();
+ // } else {
+ // this.$refs.uToast.show({
+ // title: '所属区域应选择所在的区或街道,请重新选择!',
+ // type: 'error'
+ // })
+ // }
+ // } else {
+ // this.data()
+ // }
+ // },
// 修改按钮
updataxg(item) {
+ this.cityPickershow = true
this.shipAddress = '修改地址'
this.isedit = false
nursingStationGoodsinfo(item.id).then(res => {
this.infolist = res.data
getSubordinate(res.data.areaCode).then(res => {
- this.infolist.address = res.data.regionName + '-' + res.data.streetName
+ if (res.data.streetName) {
+ this.infolist.address = res.data.provinceName + '-' + res.data.cityName +
+ '-' +
+ res
+ .data.regionName + '-' + res.data.streetName
+ } else {
+ this.infolist.address = res.data.provinceName + '-' + res.data.cityName +
+ '-' +
+ res
+ .data.regionName
+ }
this.show = true
})
})
},
// 新增
add() {
+ this.shipAddress = '添加地址'
+ this.cityPickershow = true
this.infolist = {
receiveName: '',
receivePhone: '',
@@ -211,16 +360,23 @@
content: '确认要删除信息吗',
success: function(res) {
if (res.confirm) {
- delnursingStation(item.id).then(res => {
- uni.showToast({
- title: '删除成功',
- duration: 1000,
- });
- setTimeout(e => {
- that.goodsList()
- }, 1000)
- that.delshow = false;
- })
+ if (that.goodPatient.length == 1) {
+ that.$refs.uToast.show({
+ title: '最少保留一条地址信息',
+ type: 'error'
+ })
+ } else {
+ delnursingStation(item.id).then(res => {
+ that.$refs.uToast.show({
+ title: '删除成功',
+ type: 'success'
+ })
+ setTimeout(e => {
+ that.goodsList()
+ }, 1000)
+ that.delshow = false;
+ })
+ }
} else if (res.cancel) {}
}
});
@@ -228,31 +384,44 @@
// 取消
cencel() {
this.show = false
- this.infolist = {}
+ this.cityPickershow = false
},
// 选择区街道
areaInfo() {
- getSubordinateRegions(this.areaCode).then(res => {
+ getSubordinateRegions().then(res => {
//区下无街道添加一个空街道
- res.data.forEach(e => {
- if (e.children.length == 0) {
- e.children.push({
- areaCode: "",
- areaName: "暂无街道",
- children: null,
- id: '',
- })
- }
- })
- this.arealist = res.data;
+ this.list = res.data;
})
},
+ // 选择区街道
+ // areaInfo() {
+ // getSubordinateRegions(this.areaCode).then(res => {
+ // //区下无街道添加一个空街道
+ // res.data.forEach(e => {
+ // if (e.children.length == 0) {
+ // e.children.push({
+ // areaCode: "",
+ // areaName: "暂无街道",
+ // children: null,
+ // id: '',
+ // })
+ // }
+ // })
+ // this.arealist = res.data;
+ // })
+ // },
//区街道选择
areaconfirm(e) {
this.infolist.areaCode = e[e.length - 1].value
this.infolist.address = e[0].label + '-' + e[1].label
},
- }
+ },
+ onPullDownRefresh() { //下拉刷新
+ this.goodsList()
+ setTimeout(function() {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
}
diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss
index e42f783..f91a9ac 100644
--- a/pages/nursestation/nursestation.scss
+++ b/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;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index f3bc01d..d528587 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -69,8 +69,9 @@
{{item.goodsName}}
+ {{item.attributeDetailsName}}
购买
- ￥{{item.goodsPrice==null?'0':item.goodsPrice}}起
+ ￥{{item.goodsPrice==null?'0':item.goodsPrice}}
@@ -239,7 +240,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}`
})
},
//跳转完善页面
@@ -300,9 +301,7 @@
})
})
}
-
}
-
},
onPullDownRefresh() { //下拉刷新
this.pageNum = 1;
diff --git a/pages/order/order.vue b/pages/order/order.vue
index d0f0feb..659798a 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -8,18 +8,42 @@
待付款
+
+ {{list.waitPayCount}}
+
+
+ 99+
+
待收货
+
+ {{list.waitReceivedGoodsCount}}
+
+
+ 99+
+
待评价
+
+ {{list.receivedGoodsCount}}
+
+
+ 99+
+
已完成
+
@@ -29,14 +53,34 @@
+
diff --git a/static/fenlei.png b/static/fenlei.png
new file mode 100644
index 0000000000000000000000000000000000000000..3993982986be20c06423b8a196f43b0ada377072
GIT binary patch
literal 2460
zcmd^>>s!(Z7RQ0XiL?|+ODDA-n5o&*inyB!Dlk}HshCiA##`!8KHf70uPIu1ooJ;o
zn6!(bg`;Mecgr*dKFUSYbhK2wk>VwB*%$j}|AU=K|?NQ6s_AVn!U(jf5Y
ztpTAMv)VWGaztey0$Y7}#=AvJ$4fR!SuFhV)cP6!Uf;LIU)7Qjlp%=08rLzgzXp}1i4|E3CK<1n|csfrveOy
zPMKxm&A=0cwWd1H91t_tz(3hPxa8(*^C&6K{GJ9cB+q6*7163a(GGb{x3kwT9%B?T-
z+XLI9<<%s%K%m}_Y%@aH_TP7#Y~{9(y?=kB>}AT$f_xncb)*&ES!zg|9jY>4apYf*
zOe|3aH$Mfa)bxW$`O2|kLvvIdhth)O;JTrC=p~+H`cdZ8eJ_g@EB@ze&-^}KRic>Q
zmBUq$k&&)WP8eBXW=CjU(=`TTvugQbJ`54oc7+zZt(&d9YaW-9(vlb#w^AoJRMuSb
zWSe4Ad32I*(H;D-z21CF#)vA)4LbFf`aU*$Z7z~G``5rx?C-UUt)cpa(89Lt%@pHZ
z`(@zB$yrSA$7MPl?~)yW7kzh1wTs!-!gX(#e-H?ywLjMfqo=g8EUo$D$PlYF;~5iD
z;c6u}&r2jW}g*u{BH-MbGL8w`*>0Y*hVdbs=ASh{)}u
zm5|9~X>g;Nt`=f$F{fjJGqg)iI@#nAPv{p$$HoruDw<7+W7^1i*W{uC{EiAZhs@FQ
z8BP-{Y%Ac?)!uAm=Ld0$2HDyK1XhFNSBK00i0;2YJm~zn{JdPvdZwZ!wY_?kfqO7;
zLl3>`34JCI?9vAnd)702!haZasc-7mdM20;giZAi;^QaCur#vu_c7xCN-goCH`xMJ>|I$aRT>@uSFEv{bZi0kJg7#vDU^KUlS>yz~f6~muKUcP*J
z%(RpneHI^5=O5sR!+jZ1S-EMroxljsq_h6M^$&dqXXkMz2Zv4nrTk>SlNP-{ah?0H
zs49{B!wBBK#K70{sSPOR%8X#Sk+7xwvybxEnuXFezm34UTmXG`f{@l;n8Bm7bqtlp
z;h$BlSl|KSG%#)b^N!kh7g83wdoi9$Rrq;HYwxWvJBm3&OK@9*tpnF|QKHRZ@o7Eq
zfhz&uWW`$Z7rbQc(?wo7FD}#CZ)}XC!x~!gA$DB3TqfJGGq7^gig+ZZ3B4>WEfuvt
z=&>Mq2}#7sM9)tdmRLjilO|wJ($Ls=#b;Qqi;TJnmp*6{xjo!XWtYP{Srrj3BZ<37
zxvRb>df}JjY0ePX<59;vQz*O(TyXJ^=xh!h7crvkxKU-LrO`aeEwk-+mN9#8eoMt*
zgMx!y%Le9Nv+gl0n3t#{YV602J%hC&U}an!w79(NdhC1o2hCvpbWYrrs}CJwEuk)z
zoS4KH-#zll*Ve@2D7>?XC~5L`-EYF@ENv*S?zvFWnmlTyZ7{4t9Ofwdah}%g0rQ4V
z(zaY+_|xZksZ@IVr+)EY%z@|rr)o^h%+&L#9F&IJWv=9xS8pcMeuv#JD~mBTF-bc`
z?{2fXiwN%#m(7~qp@tnFwC~GqsR>?p{z0F>xHh7aJ^Zr8t4Q`8T_
Date: Sun, 29 Jan 2023 13:27:02 +0800
Subject: [PATCH 17/21] =?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.json | 26 ++-
pages/ProductList/ProductList.vue | 6 +-
pages/classification/classification.vue | 297 ++++++++++++++++++++++++
pages/toptabbar/toptabbar.vue | 1 -
4 files changed, 318 insertions(+), 12 deletions(-)
create mode 100644 pages/classification/classification.vue
diff --git a/pages.json b/pages.json
index 3b0b8b2..3845169 100644
--- a/pages.json
+++ b/pages.json
@@ -331,17 +331,23 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
+ }, {
+ "path": "pages/toptabbar/toptabbar",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path": "pages/classification/classification",
+ "style": {
+ "navigationBarTitleText": "分类",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/toptabbar/toptabbar",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index c9bd2e5..d1e19b9 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -96,7 +96,11 @@
methods: {
//点击导航栏标签改变当前索引
toggleTab(index) {
- if (index == 1111111111111) {} else if (index == 0) {
+ if (index == 1111111111111) {
+ uni.navigateTo({
+ url: `/pages/classification/classification?goodsCategoryId=${this.GoodsCategorychildrenid}`
+ })
+ } else if (index == 0) {
this.GoodsCategorychildrenid = this.goodsCategoryId
this.tabIndex = index
this.pageNum = 1
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
new file mode 100644
index 0000000..ae706b6
--- /dev/null
+++ b/pages/classification/classification.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+ {{item.goodsCategoryName}}
+
+
+
+
+
+
+
+
+
+ {{item.goodsName}}
+
+
+ {{item.attributeDetailsName}}
+
+
+ ￥{{item.goodsPrice}}
+
+
+
+
+
+
+
+
+ 暂无商品
+
+
+
+
+
+
+
+
+
diff --git a/pages/toptabbar/toptabbar.vue b/pages/toptabbar/toptabbar.vue
index 7d685dd..8a6d6e3 100644
--- a/pages/toptabbar/toptabbar.vue
+++ b/pages/toptabbar/toptabbar.vue
@@ -91,7 +91,6 @@
methods: {
//点击导航栏标签触发
toggleTab(index) {
- console.log(index)
this.$emit("toggleToptab", index)
}
}
From 6398f999197b7dad675c6b27367ef00a46ca6cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Sun, 29 Jan 2023 13:35:40 +0800
Subject: [PATCH 18/21] =?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/ProductList/ProductList.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index d1e19b9..aa3d93b 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -1,8 +1,10 @@
-
-
+
+
+
+
From 20383f07090f34cfe221d46a8ec0d3335de4f9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Sun, 29 Jan 2023 15:47:31 +0800
Subject: [PATCH 19/21] =?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/ProductList/ProductList.vue | 6 +++---
pages/ServiceDetails/ServiceDetails.vue | 1 -
pages/classification/classification.vue | 21 +++++++++++++++++----
pages/toptabbar/toptabbar.vue | 4 ++--
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index aa3d93b..9df4f55 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -2,7 +2,7 @@
+ selectedBottomColor="#D43953" selectedTextColor="#D43953" textColor="#7d7e80" bgColor="#ffffff">
@@ -100,7 +100,7 @@
toggleTab(index) {
if (index == 1111111111111) {
uni.navigateTo({
- url: `/pages/classification/classification?goodsCategoryId=${this.GoodsCategorychildrenid}`
+ url: `/pages/classification/classification?goodsCategoryId=${this.goodsCategoryId}&index=${this.tabIndex}&GoodsCategorychildrenid=${this.GoodsCategorychildrenid}`
})
} else if (index == 0) {
this.GoodsCategorychildrenid = this.goodsCategoryId
@@ -143,7 +143,7 @@
// 查询商品列表
goodsListinfo() {
this.pageNum = 1;
- goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
+ goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
if (res.code == 200) {
res.rows.forEach(e => {
this.goodsList.push(e)
diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue
index eeba129..52859cc 100644
--- a/pages/ServiceDetails/ServiceDetails.vue
+++ b/pages/ServiceDetails/ServiceDetails.vue
@@ -163,7 +163,6 @@
methods: {
//查看评价
lookrate(item) {
- console.log(item)
this.rateimgtitle.img = item.itemPictureUrl
this.rateimgtitle.title = item.nurseItemName
lookrate(item.orderNo).then(res => {
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index ae706b6..afa0c7b 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -5,7 +5,7 @@
@scrolltolower="lower" @scroll="scroll">
-
+
{{item.goodsCategoryName}}
@@ -81,7 +81,8 @@
},
onLoad(options) { //获取传值
this.goodsCategoryId = options.goodsCategoryId //请求id
- this.GoodsCategorychildrenid = options.goodsCategoryId //请求id
+ this.GoodsCategorychildrenid = options.GoodsCategorychildrenid //请求id
+ this.tabIndex = options.index
this.baseurl = baseurl;
this.goodsListinfo()
this.GoodsCategorychildren(this.goodsCategoryId);
@@ -135,7 +136,7 @@
// 查询商品列表
goodsListinfo() {
this.pageNum = 1;
- goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
+ goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
if (res.code == 200) {
res.rows.forEach(e => {
this.goodsList.push(e)
@@ -204,6 +205,7 @@
height: 100%;
.lefttabbar {
+ position: fixed;
width: 20%;
height: 100%;
display: inline-block;
@@ -212,9 +214,19 @@
height: 100%;
}
- .active {
+
+ .actives {
color: red;
font-size: 34rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .active {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.scroll-view-item {
@@ -223,6 +235,7 @@
line-height: 100rpx;
text-align: center;
font-size: 30rpx;
+ padding: 0 10rpx;
}
}
diff --git a/pages/toptabbar/toptabbar.vue b/pages/toptabbar/toptabbar.vue
index 8a6d6e3..f491825 100644
--- a/pages/toptabbar/toptabbar.vue
+++ b/pages/toptabbar/toptabbar.vue
@@ -64,7 +64,7 @@
//选中时底部横条颜色
selectedBottomColor: {
type: String,
- default: '#30c58d'
+ default: '#D43953'
},
//导航区背景颜色
@@ -76,7 +76,7 @@
//选中时文字颜色
selectedTextColor: {
type: String,
- default: '#343434'
+ default: '#D43953'
},
//默认文本颜色
From e951f9b56b3d5da5487ad5ab95a40fe1cb5c95cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Sun, 29 Jan 2023 15:52:42 +0800
Subject: [PATCH 20/21] =?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/ProductList/ProductList.vue | 2 +-
pages/classification/classification.vue | 47 +++++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 9df4f55..7eef08c 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -64,7 +64,7 @@
watch: { //监听
goodsName() {
this.pageNum = 1;
- goodsList(this.pageSize, this.pageNum, this.goodsCategoryId, this.goodsName).then(res => {
+ goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
this.goodsList = res.rows
this.total = res.total
})
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index afa0c7b..afda6b5 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -1,5 +1,9 @@
+
+
+
+
@@ -64,6 +68,15 @@
}
};
},
+ watch: { //监听
+ goodsName() {
+ this.pageNum = 1;
+ goodsList(this.pageSize, this.pageNum, this.GoodsCategorychildrenid, this.goodsName).then(res => {
+ this.goodsList = res.rows
+ this.total = res.total
+ })
+ },
+ },
onShow() {
var that = this
try {
@@ -204,6 +217,40 @@
width: 100%;
height: 100%;
+ .inputs {
+ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border: 1px solid #f0f0f0;
+ width: 90%;
+ height: 65rpx;
+ margin: 10rpx 0 10rpx 50%;
+ transform: translateX(-50%);
+ border-radius: 20rpx;
+ background-color: #Ffffff;
+ z-index: 999;
+
+ .input {
+ margin: 0 auto;
+ position: absolute;
+ height: 65rpx;
+ // top: 8%;
+ left: 10%;
+ width: 90%;
+ font-size: 26rpx;
+ color: #000000;
+ }
+
+ .icon {
+ background: url(@/static/sousuo.png) no-repeat;
+ width: 30rpx;
+ height: 28rpx;
+ background-size: cover;
+ position: absolute;
+ top: 30%;
+ left: 3%;
+ }
+ }
+
+
.lefttabbar {
position: fixed;
width: 20%;
From b80345c43fd3a49a6f9fc17bd31ec922cb3ef9f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Sun, 29 Jan 2023 16:13:45 +0800
Subject: [PATCH 21/21] =?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/ProductList/ProductList.vue | 5 +++++
pages/classification/classification.vue | 15 +++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 7eef08c..504853e 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -31,6 +31,7 @@
暂无商品
+
@@ -59,6 +60,7 @@
goodsName: '',
GoodsCategorychildrenlist: [], //子分类list
GoodsCategorychildrenid: null,
+ scrollTop: 0,
};
},
watch: { //监听
@@ -96,6 +98,9 @@
this.GoodsCategorychildren(this.goodsCategoryId);
},
methods: {
+ onPageScroll(e) {
+ this.scrollTop = e.scrollTop;
+ },
//点击导航栏标签改变当前索引
toggleTab(index) {
if (index == 1111111111111) {
diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue
index afda6b5..11e14ab 100644
--- a/pages/classification/classification.vue
+++ b/pages/classification/classification.vue
@@ -15,7 +15,7 @@
-
+
@@ -39,6 +39,7 @@
+
@@ -54,7 +55,7 @@
//将选中标签的索引绑定为tabIndex，以便后续的调用
baseurl: '',
pageNum: 1,
- pageSize: 20,
+ pageSize: 10,
goodsCategoryId: '', //请求值
goodsList: [], //商品列表list
total: 0, //list总长度
@@ -63,6 +64,7 @@
GoodsCategorychildrenlist: [], //子分类list
GoodsCategorychildrenid: null,
scrollTop: 0,
+ scrollTop2: 0,
old: {
scrollTop: 0
}
@@ -101,6 +103,9 @@
this.GoodsCategorychildren(this.goodsCategoryId);
},
methods: {
+ onPageScroll(e) {
+ this.scrollTop2 = e.scrollTop;
+ },
tapscroll(item, index) {
this.tabIndex = index
if (index == 0) {
@@ -218,6 +223,7 @@
height: 100%;
.inputs {
+ position: fixed;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border: 1px solid #f0f0f0;
width: 90%;
@@ -254,8 +260,9 @@
.lefttabbar {
position: fixed;
width: 20%;
- height: 100%;
display: inline-block;
+ height: 100%;
+ top: 100rpx;
.scroll-Y {
height: 100%;
@@ -303,7 +310,7 @@
.productlist {
width: 100%;
- margin: 0 auto;
+ margin: 120rpx auto 0;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;