From 49fe88623426a1f91d09dda55a3b62f9fa7dd72e Mon Sep 17 00:00:00 2001 From: Gdpao <1341331954@qq.com> Date: Sat, 19 Sep 2020 20:02:43 +0800 Subject: [PATCH] gdpao --- components/order-item/index.vue | 1 + pages.json | 1 - pages/index/details.vue | 72 +++++++++++++++++++++++++++++++++ pages/index/index.vue | 22 ++++++++-- pages/login/login.vue | 11 +++-- pages/release/video.vue | 14 ++++++- pages/user/index.vue | 16 ++++---- pages/user/info.vue | 3 +- pages/user/myinfo.vue | 12 +++--- 9 files changed, 127 insertions(+), 25 deletions(-) diff --git a/components/order-item/index.vue b/components/order-item/index.vue index ba2b481..c7c2960 100644 --- a/components/order-item/index.vue +++ b/components/order-item/index.vue @@ -14,6 +14,7 @@ 已退款订单 商家同意 商家拒绝 + 待支付 {{info.extend_order_goods[0].goods_name}} diff --git a/pages.json b/pages.json index 5aa458a..8e46e37 100644 --- a/pages.json +++ b/pages.json @@ -313,6 +313,5 @@ "text": "我的", "selectedColor": "#FBFBFB" }] - } } diff --git a/pages/index/details.vue b/pages/index/details.vue index 0f2ab8c..f2a5cc3 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -146,6 +146,38 @@ 退款状态:同意退款，请注意查收！ 退款状态:商家同意退款，等待后台处理！ 退款状态:商家拒绝退款，请等待客服联系！ + + + + 姓名 + {{ info.extend_order_common.reciver_name }} + + + + 手机号 + {{ info.extend_order_common.reciver_info.mob_phone }} + + + 收货地址 + {{ info.extend_order_common.reciver_info.address }} + + + 派送方式 + {{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }} + + + 订单备注 + {{ info.extend_order_common.order_message }} + + + 开具发票 + + {{ is_invoice ? "是" : "否" }} + + + + + 骑手信息 @@ -813,6 +845,46 @@ export default { } } } + .pain-box { + .info-container { + padding: 0 30rpx; + background-color: #ffffff; + margin-bottom: 20rpx; + .remark { + padding: 10rpx 0; + height: 100%; + min-height: 88rpx; + } + > view { + display: flex; + align-items: center; + height: 88rpx; + padding: 10rpx 0; + color: rgba(51, 51, 51, 1); + &:not(:last-child) { + border-bottom: 2rpx solid #ececec; + } + .title { + width: 150rpx; + font-size: 30rpx; + margin-right: 10rpx; + } + .value { + font-size: 26rpx; + flex: 1; + } + .invoice { + margin-left: auto; + font-size: 26rpx; + color: #333; + } + image{ + width: 40rpx; + height: 40rpx; + } + } + } + } .delivery { flex: 1; background-color: #ffffff; diff --git a/pages/index/index.vue b/pages/index/index.vue index 0d610ae..1bd19aa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -56,6 +56,12 @@ + + + + + + 发布 @@ -124,7 +130,10 @@ export default { }, { name: '退货订单' - } + }, + { + name: '待支付订单' + } ], imageList: [], showSelect: false, @@ -142,6 +151,7 @@ export default { finshlist: [], //已完成列表 badlist: [], //退货列表 carlist: [], //可投诉订单列表 + paidList: [], // 待支付订单 reportinfo: null, //投诉信息 reportcontent: '', //投诉内容 del_id: 0, // 删除id @@ -178,6 +188,7 @@ export default { this.badlist = []; this.badlist = []; this.testlist = []; + this.paidList = []; }, // 根据current请求不同的接口 reset() { @@ -202,7 +213,10 @@ export default { } else if (current == 6) { // 退货订单 this.getallorder(4); - } + } else if (current == 7) { + // 待支付订单 + this.getallorder(10); + } }, // 关闭发布弹窗 close() { @@ -332,7 +346,9 @@ export default { this.badlist.push(arr[index]); } else if (type == 5) { this.badlist.push(arr[index]); - } + } else if (type == 10) { + this.paidList.push(arr[index]); + } } } }); diff --git a/pages/login/login.vue b/pages/login/login.vue index d3f616d..b2a36ea 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -217,10 +217,13 @@ export default { uni.setStorageSync('token', res.data.token); uni.setStorageSync('userinfo', res.data); uni.setStorageSync('rongyun', res.data.rongcloud_token); - this.$u.route({ - url: '/pages/index/index', - type: 'switchTab' - }); + // this.$u.route({ + // url: '/pages/index/index', + // type: 'switchTab' + // }); + uni.switchTab({ + url: '/pages/index/index', + }) } }); } diff --git a/pages/release/video.vue b/pages/release/video.vue index 7e76b63..036969a 100644 --- a/pages/release/video.vue +++ b/pages/release/video.vue @@ -42,7 +42,7 @@ 正文 - + 选择商品 @@ -61,7 +61,7 @@ 确定 - + 选择商品 @@ -146,6 +146,7 @@ const cImage = _this => { count: 1, sourceType: ['camera', 'album'], success: function(res) { + // _this.is_video = true; uni.showLoading({ title: '上传中' }); @@ -286,6 +287,15 @@ export default { this.selectarr.push(this.fileListes[num].id); } }, + // 选择商品 + selectGoods() { + this.show_two = true; + this.is_video = true; + }, + // 选择商品弹窗关闭 + closeGood() { + this.is_video = false; + }, // 创建标签 addLiveSpec() { this.$u.api.createLivesp({ diff --git a/pages/user/index.vue b/pages/user/index.vue index 7ee0285..c80bfd3 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -50,13 +50,13 @@ export default { watch: { isLoginOut() { // console.log(this.isLoginOut); - if (this.isLoginOut) { - uni.hideTabBar(); - } else { - setTimeout(function() { - uni.showTabBar(); - },200) - } + // if (this.isLoginOut) { + // uni.hideTabBar(); + // } else { + // setTimeout(function() { + // uni.showTabBar(); + // },200) + // } } }, onLoad() { @@ -101,8 +101,8 @@ export default { plus.cache.clear(function(e) { console.log(e); }) + this.getCache(); } - this.getCache(); } }) // #endif diff --git a/pages/user/info.vue b/pages/user/info.vue index 731624e..a4447eb 100644 --- a/pages/user/info.vue +++ b/pages/user/info.vue @@ -5,7 +5,7 @@ 更换头像 - 用户名 + 店铺名称 @@ -37,6 +37,7 @@ export default { this.role = userinfo.role; // console.log(this.role); }, + // 保存信息 onNavigationBarButtonTap() { let that = this; let obj ={ diff --git a/pages/user/myinfo.vue b/pages/user/myinfo.vue index 89162c2..5266b52 100644 --- a/pages/user/myinfo.vue +++ b/pages/user/myinfo.vue @@ -111,12 +111,12 @@ export default { confirmColor: "#f00", success: (res) => { // console.log(res); - if (res.confirm) { - plus.cache.clear(function(e) { - console.log(e); - }) - } - this.getCache(); + if (res.confirm) { + plus.cache.clear(function(e) { + console.log(e); + }) + this.getCache(); + } } }) // #endif