From 5ce6dd0e9e5a75d75e862da39eeae8236732da78 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Sat, 15 Jul 2023 17:27:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=B4=A7=E5=90=8E=E6=AC=BE,=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/orderGoods/index.vue | 2 +- manifest.json | 2 +- pages/admin/order/index.vue | 66 +++++----- pages/admin/order/monitor.vue | 60 +++++----- pages/admin/orderDetail/index.vue | 28 ++--- pages/admin/orderList/index.vue | 5 +- pages/nongKe/supply_chain/merchant.vue | 113 +++++++++++++----- .../nongKe/supply_chain/shopping_trolley.vue | 2 +- pages/order_details/index.vue | 3 +- pages/order_details/stay.vue | 14 ++- pages/order_pay_status/index.vue | 10 +- pages/product/list/index.vue | 48 +++++--- pages/users/online_warehousing/index.vue | 106 ++++++++++------ pages/users/order_confirm/index.vue | 24 ++-- pages/users/order_list/index.vue | 77 ++++++------ pages/users/payment/payment.vue | 8 +- pages/users/supply_procurement/index.vue | 2 +- pages/users/trading_hall/index.vue | 99 ++++++++------- 18 files changed, 401 insertions(+), 268 deletions(-) diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index 2537e0e..4ef5347 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -73,7 +73,7 @@ 退款中 x {{item.product_num - item.refund_num}} 已退款 x {{item.product_num - item.refund_num}} - 申请退款 + 申请退款 去评价 已评价 diff --git a/manifest.json b/manifest.json index df8306c..ed85b52 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__3A527D1", "description" : "", "versionName" : "1.0.18", - "versionCode" : 141, + "versionCode" : 142, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue index 9ead2ea..a5f3a59 100644 --- a/pages/admin/order/index.vue +++ b/pages/admin/order/index.vue @@ -83,41 +83,43 @@ 订单监控 - - - - - - - - {{ val.cart_info.product.store_name }} + + + + + + + + + {{ val.cart_info.product.store_name }} + + + ￥{{ val.total_price }} + - - ￥{{ val.total_price }} + + 订单号: {{ item.order_sn }} - - 订单号: {{ item.order_sn }} - - - - - 采购数量 - - {{ val.product_num }} + + + 采购数量 + + {{ val.product_num }} + - - - 已售数量 - - {{ val.sales_volume }} + + 已售数量 + + {{ val.sales_volume }} + - - - 库存数量 - - {{ val.product_num - val.sales_volume }} + + 库存数量 + + {{ val.product_num - val.sales_volume }} + @@ -434,7 +436,7 @@ } .public_footer { - width: 90%; + width: 90vw; margin: auto; .footer_top { @@ -474,14 +476,14 @@ margin: 3px 0 3px 3px; .text { - width: 180px; + width: 140px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } .monry { - margin-left: 20px; + margin-left: 10px; color: #F84221; } } diff --git a/pages/admin/order/monitor.vue b/pages/admin/order/monitor.vue index b86a7ca..8b37c4d 100644 --- a/pages/admin/order/monitor.vue +++ b/pages/admin/order/monitor.vue @@ -11,41 +11,43 @@ - - - - - - - - {{ val.cart_info.product.store_name }} + + + + + + + + + {{ val.cart_info.product.store_name }} + + + ￥{{ val.total_price }} + - - ￥{{ val.total_price }} + + 订单号: {{ item.order_sn }} - - 订单号: {{ item.order_sn }} - - - - - 采购数量 - - {{ val.product_num }} + + + 采购数量 + + {{ val.product_num }} + - - - 已售数量 - - {{ val.sales_volume }} + + 已售数量 + + {{ val.sales_volume }} + - - - 库存数量 - - {{ val.product_num - val.sales_volume }} + + 库存数量 + + {{ val.product_num - val.sales_volume }} + diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index 0dd003f..148701b 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -148,10 +148,10 @@ - + 同意 - + 拒绝 @@ -191,7 +191,8 @@ setAdminOrderRemark, setOfflinePay, setOrderRefund, - orderCancellation + orderCancellation, + postconfirm } from "@/api/admin"; import { isMoney } from '@/utils/validate.js' import { HTTP_REQUEST_URL } from '@/config/app'; @@ -231,12 +232,12 @@ }, onLoad: function(option) { let self = this - this.order_id = option.id - this.mer_id = option.mer_id - this.goname = option.goname - this.getIndex(); + self.order_id = option.id + self.mer_id = option.mer_id + self.goname = option.goname + self.getIndex(); // #ifdef H5 - this.$nextTick(function() { + self.$nextTick(function() { var clipboard = new ClipboardJS('.copy-data'); // var copybtn = document.getElementsByClassName("copy-data"); // var clipboard = new Clipboard(copybtn); @@ -263,17 +264,16 @@ } if(number == 1){ this.$nextTick(()=>{ - this.where.status = 2; - delete this.where.is_verify; - this.init(); + uni.navigateTo({ + url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}` + }) }) }else if(number == 2){ uni.navigateTo({ - url:`/pages/admin/orderList/index?types=1&merId=${this.merId}` + url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}` }) } - postconfirm(this.merId,data).then(res=>{ - console.log(res); + postconfirm(this.mer_id,data).then(res=>{ }) }, more: function() { diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index 73daefd..e0fcb9c 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -142,10 +142,10 @@ 应 已 支付 - ￥{{ item.pay_price }} (邮费 ¥{{ item.pay_postage}}) + ￥0.00 (邮费 ¥{{ item.pay_postage}}) - 共1件商品，结算周期到期后付款￥{{ item.pay_price }} + 共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }} @@ -317,6 +317,7 @@ that.loaded = res.data.list.length < that.where.limit; that.list.push.apply(that.list, res.data.list); that.where.page = that.where.page + 1; + console.log(that.list); }, err => { that.$util.Tips({ title: err }); diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue index ea3b095..3d77bc4 100644 --- a/pages/nongKe/supply_chain/merchant.vue +++ b/pages/nongKe/supply_chain/merchant.vue @@ -67,7 +67,7 @@ - + @@ -270,36 +270,21 @@ }, //购物车增加 addCart(item, index) { - this.goods[index].cart_num = this.goods[index].cart_num + 1 - this.goods.numAdd = true - this.goodsLite = item - this.goodsindexL = index - }, - subCart(item, index){ - if( this.goods[index].cart_num == 0){ - return - }else{ - this.goods[index].cart_num = this.goods[index].cart_num - 1 - this.goods.numAdd = true - this.goodsLite = item - this.goodsindexL = index - } - }, - addshopcart() { - console.log(this.goodsLite); - console.log(this.goodsindexL); let that = this + that.goods[index].cart_num = that.goods[index].cart_num + 1 + that.goods.numAdd = true + that.goodsLite = item + that.goodsindexL = index let q = { is_new: 0, product_id: that.goodsLite.product_id, cart_num: that.goods[that.goodsindexL].cart_num, - product_attr_unique: that.goodsLite.unique, + product_attr_unique: that.goodsLite.unique, // source: this.source, product_type: 98, spread_id: '' }; postCartAdd(q).then(res => { - this.show = false that.$util.Tips({ title: "添加购物车成功", }); @@ -310,6 +295,65 @@ title: res }); }); + + }, + subCart(item, index) { + let that = this + if (that.goods[index].cart_num == 0) { + return + } else { + that.goods[index].cart_num = that.goods[index].cart_num - 1 + that.goods.numAdd = true + that.goodsLite = item + that.goodsindexL = index + let q = { + is_new: 0, + product_id: that.goodsLite.product_id, + cart_num: that.goods[that.goodsindexL].cart_num, + product_attr_unique: that.goodsLite.unique, + // source: this.source, + product_type: 98, + spread_id: '' + }; + postCartAdd(q).then(res => { + that.$util.Tips({ + title: "添加购物车成功", + }); + }) + .catch(res => { + this.show = false + return that.$util.Tips({ + title: res + }); + }); + } + }, + addshopcart() { + console.log(this.goodsLite); + console.log(this.goodsindexL); + this.show = false + // let that = this + // let q = { + // is_new: 0, + // product_id: that.goodsLite.product_id, + // cart_num: that.goods[that.goodsindexL].cart_num, + // product_attr_unique: that.goodsLite.unique, + // // source: this.source, + // product_type: 98, + // spread_id: '' + // }; + // postCartAdd(q).then(res => { + // this.show = false + // that.$util.Tips({ + // title: "添加购物车成功", + // }); + // }) + // .catch(res => { + // this.show = false + // return that.$util.Tips({ + // title: res + // }); + // }); } }, onReachBottom() { @@ -487,7 +531,7 @@ } .scroll-Y { - height: 50vh; + height: 50vh; width: 90%; margin: auto; @@ -510,12 +554,15 @@ } .text { - width: 300px; + width: 200px; height: 60px; float: left; view { height: 30px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; text { color: #F84221; @@ -552,19 +599,21 @@ color: #FFFFFF; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); } + .on { background-color: #e3e3e3; color: #dedede; } - + } } - .btn{ - width: 100%; - height: 50px; - background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); - border-radius: 24px 24px 24px 24px; - line-height: 50px; - color: white; - } + + .btn { + width: 100%; + height: 50px; + background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); + border-radius: 24px 24px 24px 24px; + line-height: 50px; + color: white; + } \ No newline at end of file diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue index 6223186..2e22ce0 100644 --- a/pages/nongKe/supply_chain/shopping_trolley.vue +++ b/pages/nongKe/supply_chain/shopping_trolley.vue @@ -569,7 +569,7 @@ }) if (selectValue.length > 0) { uni.navigateTo({ - url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=${this.type_id}` + url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=12` }); } else { return this.$util.Tips({ diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 6b67399..533ec76 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -313,8 +313,7 @@ 删除订单 - 批量退款 + 批量退款 再次购买 diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index a4c088d..9aa4863 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -13,7 +13,7 @@ {{orderInfo.add_time_y}}{{orderInfo.create_time}} - 已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快前往完成支付! + 已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快完成支付! {{orderInfo.add_time_y}}{{orderInfo.create_time}} @@ -195,8 +195,8 @@ - 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 - 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}% + 结算周期:{{orderInfo.interest.settle_cycle}}天 + 日利率:{{orderInfo.interest.rate}}% @@ -216,10 +216,14 @@ - + 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在{{this.be_overdue}}天后计息。 + + 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。现已逾期{{this.be_overdue}}天,请及时完成支付 + + @@ -1153,7 +1157,7 @@ .warp { position: absolute; - top: 30vh; + top: 29vh; left: 60px; width: 70%; image{ diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue index 8e59471..52a7b35 100644 --- a/pages/order_pay_status/index.vue +++ b/pages/order_pay_status/index.vue @@ -135,15 +135,14 @@ 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 { this.isAuto = true; this.isShowAuth = true } + console.log(options); }, methods: { refreshData(){ @@ -204,14 +203,15 @@ * 去订单详情页面 */ goOrderDetails: function(e) { + console.log(this.product_type); let that = this; if (this.product_type == 98) { - uni.redirectTo({ + uni.navigateTo({ url: `/pages/users/order_list/index?status=1&product_type=${this.product_type}` }) } else { - uni.redirectTo({ - url: '/pages/users/order_list/index?status=1' + uni.navigateTo({ + url: '/pages/users/order_list/index?status=1&product_type=0' }) } diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 93b361f..5a904c8 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -122,15 +122,18 @@

线下入库

线上入库

- - - - + + + + + + + + - - 数量: + 数量: @@ -239,14 +242,19 @@ this.checkboxList1 = rowId console.log(this.on_line); if (this.checkboxList1.length == 1 && action == 0) { + // this.show = true navigateTo(1, '/pages/users/online_warehousing/index', { mer_id: this.mer_id, product_id: this.data.product_id, unique: this.data.unique, }); + } else if (this.checkboxList1.length == 1 && action == 1) { + this.show = true + this.data.product_id = this.checkboxList1[0].product_id + this.data.unique = this.checkboxList1[0].unique + console.log(this.data); } else { this.show = true - console.log(this.data); } if (action == 2) { uni.navigateTo({ @@ -283,12 +291,20 @@ } if (this.on_line == 0) { console.log('12'); - navigateTo(1, '/pages/users/online_warehousing/index', { - mer_id: this.mer_id, - product_id: this.data.product_id, - unique: this.data.unique, + if (!this.data.product_id) { + this.show = false + this.$util.Tips({ + title: '请选择规格' + }) + } else { + navigateTo(1, '/pages/users/online_warehousing/index', { + mer_id: this.mer_id, + product_id: this.data.product_id, + unique: this.data.unique, + + }); + } - }); } }, @@ -336,10 +352,10 @@ productLstApi(mer_id, that.where).then( res => { that.loading = false; - that.loaded = res.data.list.length < that.where.limit; that.productList.push.apply(that.productList, res.data.list); that.where.page = that.where.page + 1; + }, error => { that.$util.Tips({ @@ -747,6 +763,10 @@ .guige { margin: 10px 0 10px 20px; + + .scroll_y { + max-height: 150px; + } } .guiges { diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue index ca732e7..c491ff9 100644 --- a/pages/users/online_warehousing/index.vue +++ b/pages/users/online_warehousing/index.vue @@ -5,7 +5,7 @@ - @@ -20,7 +20,7 @@ - + {{item.merchant.mer_name}} @@ -29,18 +29,30 @@ - + + 订单号: {{item.order_sn}} + + - + - - + + {{items.cart_info.product.store_name}} + + {{items.cart_info.productAttr.sku}} + - ￥{{items.cart_info.product.price}} - x {{items.product_num}} - + + ￥{{items.cart_info.productAttr.price}} + x {{items.product_num}} + + @@ -48,14 +60,16 @@ 共1件商品，总金额 - ￥{{items.product_price}} - + ￥{{item.pay_price}} + + + + 立即导入 + + + {{item.orderProduct[0].is_imported}} - - - 立即导入 - @@ -65,7 +79,7 @@

{{title}}

- 点击确定，商品管理 + 点击确定，返回商品管理 @@ -100,7 +114,7 @@ limit: 10, status: 20, product_type: 98, - keyword: '', + store_name: '', }, data: { product_id: '', @@ -123,10 +137,15 @@ }, methods: { handleSearch() { - this.loaded = false; - this.where.page = 1; - this.shopList = []; - this.getList(); + let that = this + that.loaded = false; + that.where.page = 1; + that.shopList = []; + getOrderList(that.where, that.mer_id).then(res => { + console.log(res); + that.shopList = res.data.list + console.log(that.shopList); + }) }, getList: function() { if (this.loading || this.loaded) return; @@ -152,9 +171,9 @@ }, close() { this.show = false - + }, - closeasd:function(){ + closeasd: function() { this.show = false getOrderList(this.where, this.mer_id).then(res => { console.log(res); @@ -235,7 +254,8 @@ height: 84rpx; padding: 0 30rpx; border-bottom: 1px solid #CCCCCC; - font-size: 28rpx; + font-size: 32rpx; + font-weight: 700; color: #282828; .left-wrapper { @@ -284,11 +304,21 @@ font-size: 28rpx; color: #999; margin-top: 6rpx; - position: relative; + display: flex; + justify-content: space-between; + + ._left { + width: 300rpx; + color: #282828; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } .name { - width: 320rpx; + width: 100rpx; color: #282828; + } .money { @@ -296,10 +326,8 @@ float: right; } - - } - + } .event_name { @@ -318,26 +346,33 @@ margin-top: 10rpx; } + ._order { + font-size: 28rpx; + margin: 5px 0 0 15px; + } + .totalPrice { font-size: 26rpx; color: #282828; text-align: right; margin: 27rpx 0 0 30rpx; padding: 0 30rpx 30rpx 0; - + .money { font-size: 34rpx; font-weight: bold; color: rgb(233, 51, 35); } - + } - .totalfooter{ + + .totalfooter { width: 100%; height: 50px; position: relative; border-top: 1px solid #CCCCCC; + .bnt { position: absolute; right: 10px; @@ -346,15 +381,16 @@ display: flex; align-items: center; justify-content: center; - border-radius: 50rpx; + border-radius: 50rpx; font-size: 27rpx; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); color: white; margin-left: 70%; margin-top: 5px; - + } } + .bottom { height: 107rpx; padding: 0 30rpx; diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 979cec8..a667459 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -1071,7 +1071,7 @@ that.cartArr[4].title = `结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%` console.log(res.data.order[0]); - if (res.data.order[0].credit_buy == 1 && this.type_id ==12){ + if (res.data.order[0].credit_buy == 1 && this.type_id == 12 ){ this.cartArr[4].payStatus = 1 } else { this.cartArr[4].payStatus = 0 @@ -1202,10 +1202,8 @@ orderId = res.data.result.order_id, callback_key = res.data.result.pay_key, jsConfig = res.data.result.config, - goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +'&product_type=' + that - .product_type, - goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&product_type=' + that - .product_type; + goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +'&product_type=' + that.product_type, + goPagesOrder = '/pages/order_details/stay?order_id=' + orderId + '&credit_buy=1&product_type=' + that.product_type; that.orderPay = true; uni.hideLoading(); switch (status) { @@ -1272,7 +1270,7 @@ orderInfo: jsConfig, success: (e) => { let url = '/pages/order_pay_status/index?order_id=' + orderId + - '&msg=支付成功'; + '&msg=支付成功'+'&product_type=' + that.product_type; return that.$util.Tips({ title: '支付成功', icon: 'success' @@ -1283,7 +1281,7 @@ }, fail: (e) => { let url = '/pages/order_pay_status/index?order_id=' + orderId + - '&msg=取消支付'; + '&msg=取消支付'+'&product_type=' + that.product_type; return that.$util.Tips({ title: '取消支付', }, { @@ -1293,7 +1291,7 @@ }, complete: () => { let url = '/pages/order_pay_status/index?order_id=' + orderId + - '&msg=取消支付'; + '&msg=取消支付'+'&product_type=' + that.product_type; return that.$util.Tips({ title: '取消支付', }, { @@ -1329,7 +1327,7 @@ }, fail: function(e) { let pages = '/pages/order_pay_status/index?order_id=' + - orderId + '&msg=取消支付' + orderId + '&msg=取消支付'+'&product_type=' + that.product_type return that.$util.Tips({ title: '取消支付' }, { @@ -1353,7 +1351,7 @@ case 'h5': let host = window.location.protocol + "//" + window.location.host; let url = - `${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}` + `${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}` let eUrl = encodeURIComponent(url) let jsurl = jsConfig.mweb_url || jsConfig.h5_url let locations = `${jsurl}&redirect_url=${eUrl}` @@ -1378,7 +1376,7 @@ }, fail: (e) => { let pages = '/pages/order_pay_status/index?order_id=' + - orderId + '&msg=支付失败' + orderId + '&msg=支付失败'+'&product_type=' + that.product_type return that.$util.Tips({ title: '支付失败' }, { @@ -1389,7 +1387,7 @@ complete: () => { uni.hideLoading(); let pages = '/pages/order_pay_status/index?order_id=' + - orderId + '&msg=取消支付' + orderId + '&msg=取消支付'+'&product_type=' + that.product_type return that.$util.Tips({ title: '取消支付' }, { @@ -1402,7 +1400,7 @@ // #endif default: let pages = '/pages/order_pay_status/index?order_id=' + - orderId + '&msg=取消支付' + orderId + '&msg=取消支付'+'&product_type=' + that.product_type return that.$util.Tips({ title: '取消支付' }, { diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 18c538e..4eadf91 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -66,8 +66,11 @@ {{item.group_order_sn}} - - {{item.pay_type == 3 ? "待付款" : "去结算" }} + + 待付款 + + + 待结算 @@ -127,41 +130,42 @@ {{goods.cart_info.product.store_name}} - + {{goods.cart_info.productAttr.sku}} + - - ￥{{goods.cart_info.activeSku.active_price}} + + ￥{{goods.cart_info.productAttr.price}} x{{goods.product_num}} - + ￥{{goods.cart_info.productAttr.price}} x{{goods.product_num}} - - + 共{{item.total_num || 0}}件商品，总金额 ￥{{item.pay_price}} - - + + + 取消订单 立即付款 @@ -246,6 +250,9 @@ {{goods.cart_info.product.store_name}} + + {{goods.cart_info.productAttr.sku}} + {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}} @@ -267,33 +274,27 @@ ￥{{goods.cart_info.activeSku.active_price}} x{{goods.product_num}} - - - 先货后款 实付:￥0.00 - - - - 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}} - ￥{{goods.cart_info.productAttr.price}} x{{goods.product_num}} - - - 先货后款 实付:￥0.00 - - - - 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}} - - + - 共{{item.orderNum || 0}}件商品，总金额 + + 共{{item.orderNum || 0}}件商品，总金额 ￥{{item.presell_price}} + + + 先货后款 实付:￥0.00 + + + + + 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.total_price || item.interest.total_amount}} + \ No newline at end of file diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue index 822a45a..2a9699f 100644 --- a/pages/users/payment/payment.vue +++ b/pages/users/payment/payment.vue @@ -43,7 +43,7 @@ - 总价： + 商品总价： ￥ {{couponData.interest.total_price}} @@ -146,6 +146,7 @@ }; }, onLoad(options) { + this.payType='weixin' this.order_id = options.order_id if (options.product_type) { this.product_type = options.product_type } console.log(this.product_type); @@ -160,10 +161,8 @@ let active = e; that.active = active; that.animated = true; + console.log(active); that.payType = that.cartArr[active].value; - if (that.payType == 'weixin') { - that.payType = that.from - } console.log(that.payType); }, getUserInfo() { @@ -200,7 +199,6 @@ }) }, 1000) } - console.log(res); }).catch(err=>{ uni.showToast({ title: err.message diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue index 064a6d9..ab41d09 100644 --- a/pages/users/supply_procurement/index.vue +++ b/pages/users/supply_procurement/index.vue @@ -1,6 +1,6 @@ @@ -80,7 +80,7 @@ text: '打折专区' } ], - recomname:'', + recomname: '', } }, methods: { @@ -89,7 +89,7 @@ // 忽略初始化时的传入的空操作 if (action === '') { this.recomname = this.options[0].text - }else{ + } else { this.recomname = this.options[action].text } }, @@ -101,13 +101,10 @@ .header { width: 100%; display: flex; - justify-content: space-between; + justify-content: flex-start; align-items: center; .top-header { - // position: fixed; - // top: 0; - // left: 0; z-index: 9999; width: 80%; background-color: #fff; @@ -150,28 +147,34 @@ display: flex; justify-content: center; align-items: center; - .recom_bnt{ - - } + + .recom_bnt {} } } - .list{ + + .list { width: 100%; display: flex; - justify-content: space-around; + justify-content: flex-start; align-items: center; - .item{ - width: 40%; - .shopimg{ + flex-wrap: wrap; + + .item { + width: 45%; + margin: 9px; + + .shopimg { width: 100%; } - .item_text{ + + .item_text { width: 100%; padding: 15px 10px 15px 10px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; - span{ + + span { height: 20px; padding: 3px; margin: 2px; @@ -180,12 +183,26 @@ color: white; } } - .item_prices{ + + .item_prices { font-size: 18px; - color:#F84221; + color: #F84221; padding-left: 15px; border-bottom: 1px solid #707070; } + + .item_name { + width: 100%; + height: 50px; + display: flex; + align-items: center; + + .avater { + margin: 5px; + width: 40px; + height: 40px; + } + } } } \ No newline at end of file