diff --git a/components/addressWindow/index.vue b/components/addressWindow/index.vue index 32a34a4..84300c4 100644 --- a/components/addressWindow/index.vue +++ b/components/addressWindow/index.vue @@ -8,7 +8,7 @@ {{item.real_name}}{{item.phone}} - {{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}} + {{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.brigade}}{{item.detail}} diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index 54e5f63..4ef7d9f 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -169,10 +169,10 @@ 一键改价 订单备注 - 去发货 - 收件码 - + - + - - + + @@ -74,151 +74,7 @@ - - - - - - - - - {{item.title}} - - - - ￥ {{item.discount_price}} - - - 结算价:￥{{item.discount_price}} - - - - 类型:调货 - - - 类型:打折 - - - - - - 编辑 - - - - - - - - - 删除 - - - 编辑 - - - - - - 删除 - - - 编辑 - - - - - - 拒绝 - - - - 同意 - - - - - - - - - - - - - - - - {{item.title}} - - - - - 类型:调货 - - - 类型:打折 - - - - - - - - - - 编辑 - - - - - - - - - 删除 - - - 编辑 - - - - - - 删除 - - - 编辑 - - - - - - 拒绝 - - - - 同意 - - - - - @@ -252,7 +108,7 @@ activeItem: "tabOne", tabTitle: "", orderList: [], - glist: [], + where: { page: 1, limit: 10, @@ -287,23 +143,21 @@ } }, onLoad(num) { - this.tabTitle = this.tabs[0].name - if (num.key == '2') { this.activeItem = 'tabThree' } this.list() - //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: - // console.log(this.tabs[0]) }, methods: { tabClick(e) { //点击获取当前标签数据 - this.orderList = [] + this.activeItem = e.name; //当前class类名 this.tabTitle = e.name; //当前选的标签名 this.where.status = e.value + this.orderList = [] this.list() + }, list() { getResale(this.where).then(res => { @@ -327,7 +181,7 @@ } }, - //待审核 删除 + //审核未通过 删除 pendingDeletion(item) { getResaledelete(item.community_id).then(res => { @@ -430,7 +284,7 @@ padding-top: 28rpx; - border-radius: 14rpx 14rpx 14rpx 14rpx; + opacity: 1; position: relative; diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue index 7df3dca..f67bb82 100644 --- a/pages/trading_hall/adddiscounts/index.vue +++ b/pages/trading_hall/adddiscounts/index.vue @@ -322,6 +322,9 @@ this.type = options.gtype if (this.type) { this.list() + uni.setNavigationBarTitle({ + title: '编辑打折' + }) } this.tabActive = options.type || 1; if (this.community_app_switch.length == 1) { diff --git a/pages/trading_hall/transfer_goods/index.vue b/pages/trading_hall/transfer_goods/index.vue index 300db1b..2640224 100644 --- a/pages/trading_hall/transfer_goods/index.vue +++ b/pages/trading_hall/transfer_goods/index.vue @@ -321,7 +321,7 @@ // uni.hideTabBar() this.id = options.id; this.type = options.gtype - + this.tabActive = options.type || 1; if (this.community_app_switch.length == 1) { this.tabActive = this.community_app_switch[0] @@ -335,6 +335,9 @@ } if (this.type) { this.list() + uni.setNavigationBarTitle({ + title: '编辑调货' + }) } this.videoContext = uni.createVideoContext("myvideo", this); }, diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 1b9fa7a..38d480c 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -8,8 +8,10 @@ {{addressInfo.phone}} + [默认]{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}}{{addressInfo.brigade}} + v-if="addressInfo.is_default">[默认]{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}} + { res.data.is_default = parseInt(res.data.is_default); + that.addressInfo = res.data || {}; that.addressId = res.data.address_id || 0; that.address.addressId = res.data.address_id || 0; @@ -1127,6 +1130,7 @@ this.getConfirm(that.addressId); }) }) + } else { getAddressList().then(res => { that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {}; diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 0afdb64..989d922 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -27,15 +27,15 @@ 待付款 {{orderData.noPay || 0}} - + 待发货 {{orderData.noPostage || 0}} - + 待收货 {{orderData.noDeliver || 0}} - + 待评价 {{orderData.noComment || 0}} @@ -160,18 +160,19 @@ {{item.merchant.mer_name}} - + + {{item.takeOrderCount > 0 ? '部分核销' : '待核销'}} - 待发货 - 待付款 - 待收货 - 待评价 - 已完成 - 已退款 - 待结算 + 待发货 + 待付款 + 待收货 + 待评价 + 已完成 + 已退款 + 待结算 @@ -261,10 +262,12 @@ 取件码 - - - 发布种草 - + + + 发布种草 + 去评价 @@ -416,7 +419,7 @@ this.getOrderData(); this.getOrderList(); this.getUserInfo(); - this.getpreSellOrderList(); + // this.getpreSellOrderList(); } else { this.isAuto = true; this.isShowAuth = true @@ -493,7 +496,9 @@ */ getOrderData: function() { let that = this; - orderData({product_type:0}).then(res => { + orderData({ + product_type: 0 + }).then(res => { that.$set(that, 'orderData', res.data); }) }, @@ -598,9 +603,9 @@ // uni.navigateTo({ // url: '/pages/order_details/index?order_id=' + order_id // }) - uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id - }) + uni.navigateTo({ + url: '/pages/order_details/index?order_id=' + order_id + }) } else { uni.navigateTo({ url: '/pages/order_details/index?order_id=' + order_id @@ -644,6 +649,7 @@ */ statusClick: function(status) { if (status == this.orderStatus) return; + this.orderStatus = status; this.loadend = false; this.loading = false; @@ -683,8 +689,14 @@ that.page = that.page + 1 }) } else { + let arr; + if (that.orderStatus > -1) { + arr = that.orderStatus + } else { + arr = '' + } getOrderList({ - status: that.orderStatus - 1, + status: arr, page: that.page, limit: that.limit, product_type: 0 @@ -760,17 +772,17 @@ }, // 确认收货 confirmOrder: function(item, index) { - uni.showModal({ - title: '取件码', - content: item.logistics_code, - success: function(res) { - if (res.confirm) { - // console.log('用户点击确定'); - } else if (res.cancel) { - // console.log('用户点击取消'); - } - } - }) + uni.showModal({ + title: '取件码', + content: item.logistics_code, + success: function(res) { + if (res.confirm) { + // console.log('用户点击确定'); + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } + }) // let that = this; // uni.showModal({ // title: '确认收货', @@ -782,7 +794,7 @@ // title: '操作成功', // icon: 'success' // }, function() { - + // that.orderList.splice(index, 1); // that.getOrderData(); // }); diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue index d563918..9362f79 100644 --- a/pages/users/order_list/indexCopy.vue +++ b/pages/users/order_list/indexCopy.vue @@ -23,19 +23,19 @@ 全部 {{orderData.orderCount || 0}} - + 待付款 {{orderData.noPay || 0}} - + 待发货 {{orderData.noPostage || 0}} - + 待收货 {{orderData.noDeliver || 0}} - + 待评价 {{orderData.noComment || 0}} @@ -160,19 +160,21 @@ {{item.merchant.mer_name}} - + {{item.takeOrderCount > 0 ? '部分核销' : '待核销'}} - 待发货 - 待付款 - 待收货 - 待评价 - 已完成 - 已退款 - 待结算 - + + 待发货 + 待付款 + 待收货 + 待评价 + + 已完成 + 已退款 + 待结算 + { // console.log(res.data) that.$set(that, 'orderData', res.data); @@ -653,7 +655,7 @@ groupOrderList({ page: that.page, limit: that.limit, - product_type:98 + product_type: 98 }).then(res => { that.isReady = true; let list = res.data.list || []; @@ -670,11 +672,17 @@ that.page = that.page + 1 }) } else { + let arr; + if (that.orderStatus > -1) { + arr = that.orderStatus + } else { + arr = '' + } getOrderList({ - status: that.orderStatus - 1, + status: arr, page: that.page, limit: that.limit, - product_type:98 + product_type: 98 }).then(res => { let list = res.data.list || []; let loadend = list.length < that.limit; diff --git a/pages/users/trading_hall/index.vue b/pages/users/trading_hall/index.vue index 05cd6e8..dbfe411 100644 --- a/pages/users/trading_hall/index.vue +++ b/pages/users/trading_hall/index.vue @@ -76,7 +76,7 @@ - +