diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue index b80c52c..9ead2ea 100644 --- a/pages/admin/order/index.vue +++ b/pages/admin/order/index.vue @@ -82,49 +82,57 @@ 订单监控 - - - - 订单号：{{ item.order_sn }} - 下单时间：{{ item.create_time }} + + + + - - - - - - - - - - {{ val.cart_info.product.store_name }} - - - {{ val.cart_info.productAttr.sku }} - - - - - ￥{{ val.total_price }} - 采购数量：{{ val.product_num }} - 已售数量：{{ val.sales_volume }} - 库存量{{ val.product_num - val.sales_volume }} - + + + + {{ val.cart_info.product.store_name }} + + ￥{{ val.total_price }} + + + + 订单号: {{ item.order_sn }} + + + + + + 采购数量 + + {{ val.product_num }} + + + + 已售数量 + + {{ val.sales_volume }} + + + + 库存数量 + + {{ val.product_num - val.sales_volume }} - - - - + + @@ -218,9 +226,9 @@ ); }, toDetail(item) { - uni.navigateTo({ - url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` - }) + uni.navigateTo({ + url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` + }) }, navigator() { uni.navigateTo({ @@ -232,6 +240,7 @@ purchaseOrder(this.where, mer_id).then(res => { console.log(res); this.OrderList = res.data + console.log(this.OrderList); }) } }, @@ -440,156 +449,69 @@ } } - .list { - margin-top: 20upx; - margin-bottom: 20px; + .footer_bon { + width: 100%; + border-radius: 8px; + background-color: #fff; + padding-bottom: 10px; + margin-bottom: 10px; - .item { - background-color: #fff; - width: 100%; - position: relative; - margin-top: 20px; + .bon_top { + display: flex; + justify-content: flex-start; + align-items: center; - .item-status { - position: absolute; - top: 14rpx; - right: 20rpx; - - .iconfont { - font-size: 98rpx; - color: #CCCCCC; - - &.on { - color: #FFE3BC; - } - } + .public_img { + width: 60px; + height: 60px; + margin: 12px; } - .order-num { - height: 124upx; - border-bottom: 1px solid #eee; - font-size: 30upx; - font-weight: bold; - color: #282828; - padding: 0 30upx; - position: relative; + .text_top { + display: flex; + justify-content: flex-start; + align-items: center; + margin: 3px 0 3px 3px; - .time { - font-size: 26upx; - font-weight: normal; - color: #999; - margin-top: -40upx; - } - } - - .pos-order-goods { - padding: 0 30upx; - background-color: #fff; - - .goods { - padding-top: 20rpx; + .text { + width: 180px; overflow: hidden; - border-top: 1px dashed #e5e5e5; - - .uncancell { - color: #999999; - } - - .picTxt { - width: 450upx; - - .pictrue { - width: 130upx; - height: 130upx; - - image { - width: 100%; - height: 100%; - border-radius: 6upx; - } - } - - .text { - flex-direction: column; - width: 150px; - - .info { - font-size: 28upx; - color: #282828; - - &.refund-info { - width: 460upx; - } - } - - .refund-y-money { - margin-top: 16rpx; - font-size: 26rpx; - } - - .attr { - margin-top: 5rpx; - font-size: 24upx; - color: #999; - } - } - } - - .money { - width: 164upx; - text-align: right; - font-size: 28upx; - - &.refund-money { - width: auto; - position: relative; - top: -50rpx; - - .num { - color: #999999; - } - - } - - .refund-num { - font-size: 24rpx; - color: #282828; - } - - .num { - color: #ff9600; - margin: 5upx 0; - } - - .x-money { - color: #282828; - } - - .y-money { - color: #999; - text-decoration: line-through; - } - } - - .refund_num { - display: inline-block; - margin-left: 10rpx; - } - + white-space: nowrap; + text-overflow: ellipsis; } - .cancellate { - font-size: 24rpx; - float: right; - margin-top: 10rpx; - - text { - margin-left: 26rpx; - } + .monry { + margin-left: 20px; + color: #F84221; } + } + .text_order{ + width: 200px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + margin-left: 3px; + } + } - .cancelled { - color: #FF9600; + .bon_bon { + width: 90%; + height: 66px; + background: #F5F5F5; + border-radius: 4px 4px 4px 4px; + display: flex; + justify-content: center; + align-items: center; + text-align: center; + margin: auto; + margin-bottom: 10px; + margin-top: 5px; + + .order { + width: 120px; + + .txt { + margin-top: 5px; } } } diff --git a/pages/admin/order/monitor.vue b/pages/admin/order/monitor.vue index 7a72730..b86a7ca 100644 --- a/pages/admin/order/monitor.vue +++ b/pages/admin/order/monitor.vue @@ -1,579 +1,661 @@ \ No newline at end of file diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index 9f947ae..f3d9f57 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -181,15 +181,15 @@ 实付款： - 先货后款 实付: ￥ - {{orderInfo.pay_price}} + 先货后款 实付: ￥ + 0.00 ￥{{orderInfo.pay_price}} - + 结算周期到期后付款 ￥{{orderInfo.interest.total_amount}} - + 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}% diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue index af9c930..8e59471 100644 --- a/pages/order_pay_status/index.vue +++ b/pages/order_pay_status/index.vue @@ -119,7 +119,8 @@ isOpen:false ,//展开 moneyBg: '/static/images/couponBg', text: '展开更多', - timer: null + timer: null, + product_type:'', }; }, computed: mapGetters(['isLogin','viewColor','keyColor']), @@ -134,6 +135,9 @@ this.order_type = options.order_type; this.status = options.status || 0; this.msg = options.msg || ''; + if(options.product_type){ + this.product_type=options.product_type + } if (this.isLogin) { this.refreshData(); } else { @@ -201,9 +205,9 @@ */ goOrderDetails: function(e) { let that = this; - if (this.order_pay_info.paid == 0) { + if (this.product_type == 98) { uni.redirectTo({ - url: '/pages/users/order_list/index' + url: `/pages/users/order_list/index?status=1&product_type=${this.product_type}` }) } else { uni.redirectTo({ diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue index 7b601ae..5417049 100644 --- a/pages/plant_release/index.vue +++ b/pages/plant_release/index.vue @@ -542,8 +542,7 @@ }); } else { uni.redirectTo({ - url: '/pages/plantGrass/plant_detail/index?id=' + res.data.community_id + '&type=' + that - .tabActive + url: '/pages/plantGrass/plant_detail/index?id=' + res.data.community_id + '&type=' + that.tabActive }) } /** diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 20401ef..e257656 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -241,11 +241,8 @@ mer_id: this.mer_id, product_id: this.data.product_id, unique: this.data.unique, - }); }else{ - this.data.product_id = this.checkboxList1[0].product_id - this.data.unique = this.checkboxList1[0].unique this.show = true console.log(this.data); } @@ -256,7 +253,6 @@ }, //导入 creat() { - if (this.on_line == 1) { if(this.data.number <1){ this.show=false @@ -273,7 +269,7 @@ }).catch(err=>{ this.show=false this.$util.Tips({ - title: err.message + title: '请选择规格后再次进行入库' }) }) } @@ -291,11 +287,10 @@ }, //规格 checkboxChange(n) { - console.log('change', n); this.data.unique = n + console.log(n); }, radioChange(n) { - console.log(n); this.data.product_id = n.product_id console.log(this.data); }, diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue index bc41dfa..f91e6f4 100644 --- a/pages/users/online_warehousing/index.vue +++ b/pages/users/online_warehousing/index.vue @@ -1,13 +1,21 @@ @@ -75,6 +87,7 @@ import { getOrderList } from '@/api/order.js' + import Loading from '@/components/Loading/index' export default { data() { return { @@ -86,7 +99,8 @@ page: 1, limit: 10, status: 20, - product_type: 98 + product_type: 98, + keyword: '', }, data: { product_id: '', @@ -96,7 +110,8 @@ order_unique: '' }, show: false, - title:'' + title: '', + loaded: false, } }, onLoad(option) { @@ -107,27 +122,20 @@ this.data.unique = option.unique }, methods: { + handleSearch() { + this.loaded = false; + this.where.page = 1; + this.shopList = []; + this.getList(); + }, getList: function(mer_id) { + if (this.loading || this.loaded) return; + this.loading = true; getOrderList(this.where, this.mer_id).then(res => { console.log(res); this.shopList = res.data.list console.log(this.shopList); }) - // getPreviewProDetail({ - // id:product_id, - // product_type:0, - // }).then( - // res => { - // console.log(res); - - // console.log(this.shopList); - // }, - // error => { - // that.$util.Tips({ - // title: error.msg - // }) - // } - // ); }, importshop(order_id, product_id, unique) { this.data.order_id = order_id @@ -136,7 +144,7 @@ this.show = true postImport(this.mer_id, this.data).then(res => { console.log(res); - this.title=res.message + this.title = res.message this.$util.Tips({ title: res.message }) @@ -145,38 +153,71 @@ close() { this.show = false }, - getback(){ + getback() { uni.navigateBack({ - delta: 1 - }); + delta: 1 + }); } } }