From 2ec9370a36fa25b67f6d2bce8f5f5f91010813a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 22 Sep 2023 14:50:49 +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.json | 1 +
pages/myinformation/myinformation.vue | 14 ++--
pagesB/CommodityOrder/CommodityOrder.scss | 85 ++++++++++++++--------
pagesB/CommodityOrder/CommodityOrder.vue | 71 ++++++++++++------
static/pagesB/fanhui.png | Bin 0 -> 368 bytes
static/pagesB/sousuo.png | Bin 1512 -> 1229 bytes
6 files changed, 111 insertions(+), 60 deletions(-)
create mode 100644 static/pagesB/fanhui.png
diff --git a/pages.json b/pages.json
index 467542d..df67051 100644
--- a/pages.json
+++ b/pages.json
@@ -176,6 +176,7 @@
}, {
"path": "CommodityOrder/CommodityOrder",
"style": {
+ "navigationStyle": "custom", // 隐藏系统导航栏
"navigationBarTitleText": "商品订单",
"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index 72adb9e..b3d91bd 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -54,30 +54,30 @@
我的订单
-
+
查看全部
-
+
待付款
-
+
待收货
-
+
待评价
-
+
已完成
@@ -156,12 +156,12 @@
},
methods: {
//全部订单
- goorder() {
+ goorder(index, item) {
const value = uni.getStorageSync('openid');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
uni.navigateTo({
- url: '/pagesB/CommodityOrder/CommodityOrder'
+ url: `/pagesB/CommodityOrder/CommodityOrder?toindex=${index}&&orderStatus=${item}`
})
} else {
this.gologin();
diff --git a/pagesB/CommodityOrder/CommodityOrder.scss b/pagesB/CommodityOrder/CommodityOrder.scss
index beae6f0..fd75565 100644
--- a/pagesB/CommodityOrder/CommodityOrder.scss
+++ b/pagesB/CommodityOrder/CommodityOrder.scss
@@ -1,10 +1,62 @@
+page{
+ background-color: #F7F5F5;
+}
.app {
width: 100%;
padding: 3%;
- padding: 3%;
+ ::v-deep .u-tabs{
+ background-color: #F7F5F5 !important;
+ }
.noorder{
margin-top: 20%;
}
+ .u-navbar{
+ image{
+ margin:0 4% 0 4%;
+ width: 20rpx;
+ height: 30rpx;
+ }
+ .title{
+ width: 31%;
+ font-size: 34rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ .inputs {
+ position: relative;
+ margin-left: 4%;
+ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ width: 60%;
+ height: 65rpx;
+ border-radius: 20rpx;
+ z-index: 999;
+ background: #65c0a9;
+ color: #FFFFFF;
+ .placeholder{
+ color: #FFFFFF;
+ }
+ .input {
+ margin: 0 auto;
+ position: absolute;
+ height: 65rpx;
+ // top: 8%;
+ left: 18%;
+ width: 80%;
+ font-size: 26rpx;
+ color: #FFFFFF;
+ }
+
+ .icon {
+ background: url(@/static/pagesB/sousuo.png) no-repeat;
+ width: 30rpx;
+ height: 28rpx;
+ background-size: cover;
+ position: absolute;
+ top: 28%;
+ left: 4%;
+ }
+ }
+ }
.submits {
width: 501rpx;
height: 71rpx;
@@ -210,36 +262,5 @@
}
}
- .inputs {
- box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
- border: 1px solid #f0f0f0;
- width: 100%;
- 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/pagesB/sousuo.png) no-repeat;
- width: 30rpx;
- height: 28rpx;
- background-size: cover;
- position: absolute;
- top: 30%;
- left: 3%;
- }
- }
}
diff --git a/pagesB/CommodityOrder/CommodityOrder.vue b/pagesB/CommodityOrder/CommodityOrder.vue
index b74a26f..912da7f 100644
--- a/pagesB/CommodityOrder/CommodityOrder.vue
+++ b/pagesB/CommodityOrder/CommodityOrder.vue
@@ -1,9 +1,18 @@
-
-
-
-
+
+
+
+ 商品订单
+
+
+
+
+
+
+
店铺名称
@@ -120,10 +129,29 @@
export default {
data() {
return {
+ tabslist: [{
+ name: '全部',
+ orderStatus: '',
+ }, {
+ name: '待付款',
+ orderStatus: 'WAIT_PAY',
+ }, {
+ name: '待收货',
+ orderStatus: 'WAIT_RECEIVED_GOODS',
+ }, {
+ name: '待评价',
+ orderStatus: 'RECEIVED_GOODS',
+ }, {
+ name: '已完成',
+ orderStatus: 'EVALUATED',
+ }],
+ tabscurrent: 0,
+ background: {
+ backgroundColor: '#26A888',
+ },
orderNoitem: null,
patientId: '',
openid: '',
- title: '商品订单', //导航标题
baseurl: '', //url
orderlist: [], //商品订单list
total: 0, //list长度
@@ -138,6 +166,18 @@
}
},
methods: {
+ //点击tabs
+ tabschange(index) {
+ this.tabscurrent = index;
+ this.orderStatus = this.tabslist[index].orderStatus
+ this.goodsOrderinfo();
+ },
+ //返回上一页
+ goprevious() {
+ uni.navigateBack({
+ delta: 1
+ })
+ },
//查看评价
golookrate(item) {
uni.navigateTo({
@@ -274,9 +314,9 @@
},
},
onReady() { //更改导航栏文字
- uni.setNavigationBarTitle({
- title: this.title,
- });
+ // uni.setNavigationBarTitle({
+ // title: this.title,
+ // });
},
onShow() {
this.pageNum = 1;
@@ -295,20 +335,9 @@
that.patientId = value
that.openid = value2
if (options.orderStatus) {
+ that.tabscurrent = options.toindex
that.orderStatus = options.orderStatus
- if (options.orderStatus == 'WAIT_PAY') {
- that.title = '待付款'
- that.goodsOrderinfo();
- } else if (options.orderStatus == 'WAIT_RECEIVED_GOODS') {
- that.title = '待收货'
- that.goodsOrderinfo();
- } else if (options.orderStatus == 'RECEIVED_GOODS') {
- that.title = '待评价'
- that.goodsOrderinfo();
- } else if (options.orderStatus == 'EVALUATED') {
- that.title = '已完成'
- that.goodsOrderinfo();
- }
+ that.goodsOrderinfo();
} else {
that.goodsOrderinfo();
}
diff --git a/static/pagesB/fanhui.png b/static/pagesB/fanhui.png
new file mode 100644
index 0000000000000000000000000000000000000000..45f314529fc2a8f327aad537abbe897ed2c41401
GIT binary patch
literal 368
zcmV-$0gwKPP)Rwz0003uNkl+L-S!iz)hc;c3M+yKBCe^;F1oVTmeFeF7x2;yg*;Z(zv8fM{V
zN)7X6FdrIbu3_H1$OBgzW-VX+bkK7nc;borqeMd~wWX4{m#UBOJ=3Y~c#f&u7
zra1&2*H1
zUQvR5gr2N4T0Qg>)LXa#R8&ou|*Qop-5WvyxFO3V9@WD~uuqmYg
O000045;hWi~B%y
z2B`SOgEQ~$?!SNk{QdhUpWKC+b05e!0aEke^o#q)9zTYf0JaXu2AgveV$1304^9EC
z14_NPfBNZzV~%xj<@A3%ZvXcR;*kO8s_q#nosdH?iFkaa+G8fYfOF<@Ds
z%G1y8gIx|J@1A@HGzy47x`2vLLR=0t>VEypO)9_$s4EHb3ufT+>D+hc%ZHm=YaCeT
zzIoiIAFyYQjqclL@1}Fbtjjl7$2kA~ff;9i)%kB&i@SIO${@H+ZHQ&z9eeVtSJDi+k8+R<@
zMbqu`x&oyarS`NKKHc>D*t5=6Gn{L8xQ7?5>DE;eF>zm)bmaK1Tc&Gv=KV0gu>Yh@
z4(IA;rQ+4kr->h)CfK!gFIQEie@AHH<}jbzwYO(KyuJ0*)+_wK`WTKV1zMo~aqD?~NdOuh6|9KK6@?P>2syMVX*%I%so7{Bv_6?Ed
z8iw47O_`!qDr~vTUv}_n`X5=K=HT!7@WRBS3V&9WdAK^Z9$g^B=NM$YU|y$Va=HcWSdv`7_3PSSwyRjDG+kqwyT9ACensCl
zgVvj~K1cP)zAIDuS~hvt+M^MAVJ3{y(VLg)6)aEi=Ig6F_WEo5e((B}?6%;#YqJZz
u3iu*dhV%;rHpVH2{g^$qy6xZXe~d~$l{;ozrP=|r1%s!npUXO@geCyx1l92X
literal 1512
zcmeAS@N?(olHy`uVBq!ia0vp^Hb88_!3-p)ZO#s3U|`Y+@Ck7Ra{vGT-_Y=X)vBx8
zwr$(LfB&&#$BrC1vU~S#Ap7v)!#j2y+p}j6kbUUTp`AOA0@*;uu3blfA_os1+`aqo
z-o1Mv>^*x>*!%YFgNYx4vymBl_8i!|_YhDGP!P;M2$4l*@7;S4s9^8j1N-(tWx;Ha
z$ryq_l@J6p5Xu0m0Skf@0~tVLc_wNW8&fy5|dL>(=#%&vUBqb3X4n1$}6j?YwH>so0?l%
z+dDeDdM8YrG-c}a88c_inLB^M!bMA#E?c>3&AJU6w{F|MW9P2D`wtvEboj{8W5-XP
zI(_cqm790&-h24?$+PD#UcP$$=I#3rA3uHm^7Y&IA3uNn{`2?bjCU7-$$p2Yi(`m{
zY!9M61^p&Y4ej8Xc~g7wB%?{m`J9SQZa1x6-4rhd89BfF_uc0G@7mI1
z<$llqmc|xz+^qU;ym!mJ)7`Bzr@Y?(;zFe|>q1}6bOCd9<(6jKH<#~z`IsCm{`-rJ
zQ~j}P7sBc-^-c9`baDz}UQP3s&!{%!b3FUsYwdCySv#@me;0qNWo$aJU}=ht%(2)7
zsk}^4u50u7m}bR#=c+P!EDdW~a4yKZ)j5P+)cn`R$)~nw{HXR)W&e9>X%MUZ&X6)?
z7W1iZKM3A*4Q!mSF0h2Zb-PfPo5T;7LczF2E6=ny?hHwKP}uWGu*YVJ1!I3&*Gq#*
z9v8*h;xa`{4MIFOO6)xsm~uEk?P%ogBG_I~l1GDBwJUZJo)ehbW>Ds*E&N7ddjVxVB
z5vMdJCF;z4WTN9Layl_b@~B+IC(Szs)BHCwPAlm$lF(l2(RB2x<0i&quRP0I4u5M=
zVr*L$VB?@~e$-RK$}g}Xu24kR;EIPKTWyv`Q9_FGQR9j=i!$0KrgcsI@TqeV2b*8O
zmBZ0&Q)hBys!e_RA<+AxP@}-1XpOi7*Il&M3p(*0?Kk|ex%<>(gD=kwr^*)WaD6(J
z+i_=H&}uo(_Uj>b>m3BVqcgJ$4#vC4Ztd1%G1${0$E){4I>`6!>4z3SBuke}y;Yqh
zpY*U`>NI=N*Rd~*liv3FMRjeQA9dQrBImdB?enWH)y}@2n(|(E?LWWU+jSUPuk1T=
zSn(fUvz9#X(g{)3Hgl$h7%gc3oM7#>ww8%0qGD-p-7K%?2a?6Nev{--Df0a|d;ONJ
zd#(0bG1=X@Qm3xik$Cx%@#kWrX(}#