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 0000000..45f3145
Binary files /dev/null and b/static/pagesB/fanhui.png differ
diff --git a/static/pagesB/sousuo.png b/static/pagesB/sousuo.png
index 17074ab..fe3d92b 100644
Binary files a/static/pagesB/sousuo.png and b/static/pagesB/sousuo.png differ