From bb48357df5d13a51a12d7b77d23cc6c6c9fb9dd2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Mon, 1 Apr 2024 13:44:37 +0800
Subject: [PATCH] 1
---
components/payment/index.vue | 2 +-
pages/payment/get_payment.vue | 93 ++++++++--------------
pages/payment/settlement.vue | 130 ++++---------------------------
pages/users/order_list/index.vue | 73 +++++++++--------
4 files changed, 84 insertions(+), 214 deletions(-)
diff --git a/components/payment/index.vue b/components/payment/index.vue
index a680c5b..4ac99b3 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -467,7 +467,7 @@
bottom: 0;
left: 0;
width: 100%;
- max-height: 600rpx;
+ // max-height: 600rpx;
border-radius: 16rpx 16rpx 0 0;
background-color: #fff;
padding-bottom: 60rpx;
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 299e447..b1e559f 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -29,14 +29,15 @@
-
+
+
+
-
+
@@ -204,69 +205,43 @@
// 提交订单
async submitOrder() {
- if (!this.cartForm.total_amount) {
+ if (!this.cartForm.total_amount || this.cartForm.total_amount == 0) {
return this.$util.Tips({
- title: "请输入付款金额！"
+ title: "请输入付款金额"
})
}
this.loading = true;
+ if (that.merchantInfo && that.merchantInfo.length > 0) {
+ // 循环加入购物车
+ for (var i = 0; i < that.merchantInfo.length; i++) {
+ let info = {
+ product_id: that.merchantInfo[i].product_id,
+ product_attr_unique: that.merchantInfo[i].unique,
+ cart_num: that.merchantInfo[i].num,
+ is_new: 1,
+ product_type: 0,
+ source: 999,
+ total_amount: that.cartForm.total_amount
+ };
- // 循环加入购物车
- for (var i = 0; i < that.merchantInfo.length; i++) {
- let info = {
- product_id: that.merchantInfo[i].product_id,
- product_attr_unique: that.merchantInfo[i].unique,
- cart_num: that.merchantInfo[i].num,
- is_new: 1,
- product_type: 0,
- source: 999,
- total_amount: that.cartForm.total_amount
- };
- console.log(that.merchantInfo[i]);
+ try {
+ let res = await addCart(info);
+ that.checkForm.cart_id.push(res.data.cart_id);
+ } catch (err) {
+ that.loading = false;
+ return that.$util.Tips({
+ title: err.message || err.msg || err
+ })
+ }
+ }
- try {
- let res = await addCart(info);
- that.checkForm.cart_id.push(res.data.cart_id);
- } catch (e) {
- return that.$util.Tips({
- title: err.message || err.msg || err
+ if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
+ return uni.navigateTo({
+ url: "/pages/payment/settlement?cartId=" + this.checkForm.cart_id.join(',') +
+ "&money=" + this.cartForm.total_amount,
})
}
}
-
- if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
- // return console.log(this.checkForm);
- return uni.navigateTo({
- url: "/pages/payment/settlement?cartId=" + this.checkForm.cart_id.join(',') +
- "&money=" + this.cartForm.total_amount,
- })
- orderCheck(that.checkForm).then(res1 => {
- that.loading = false;
-
- uni.navigateTo({
- url: "/pages/payment/settlement",
- success: (res) => {
- res.eventChannel.emit('acceptDataFromOpenedPage', {
- platformConsumption: res1.data.platformCoupon || [],
- productData: that.merchantInfo,
- checkForm: that.checkForm,
- merName: that.mer_name,
- money: that.cartForm.total_amount,
- key: res1.data.key,
- order_type: res1.data.order_type,
- enabledPlatformCoupon: res1.data.enabledPlatformCoupon,
- platformCoupon: res1.data.platformCoupon
- })
- },
- fail(err) {
- console.log(err)
- }
- })
- }).catch(err => {
- that.loading = false;
- Toast(err.message || err)
- });
- }
},
// 折叠商品
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 5022476..ede3a7c 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -1,109 +1,6 @@
-
-
-
-
-
- {{item.mer_name}}
-
-
-
-
-
-
-
-
-
- 预售{{goods.productPresell.store_name}}
-
- {{goods.productAttr.sku}}
-
- ￥{{goods.productPresellAttr.presell_price}}
- X{{goods.cart_num}}
-
- 发货时间：
-
- {{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内
-
- {{ goods.productPresell.delivery_type === 1 ? '付尾款后' : '预售结束后' }}{{ goods.productPresell.delivery_day }}天内
-
-
-
- 此商品不支持该区域配送
-
-
-
-
-
-
- 定金
- ￥{{ (goods.productPresellAttr.down_price * goods.cart_num).toFixed(2) }}
-
-
- 尾款
- ￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}
-
-
- {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
-
-
-
-
-
-
-
-
-
-
- {{goods.product.store_name}}
- {{goods.productAttr.sku}}
-
-
-
- ￥{{goods.productAssistAttr.assist_price}}
-
-
- ￥{{goods.activeSku.active_price}}
-
-
- ￥{{goods.productAttr.price}}
-
- X{{goods.cart_num}}
-
-
-
-
-
- 不支持快递
- 不支持到店核销
-
-
-
-
- 此商品不支持该区域配送
-
-
-
-
-
-
-
-
-
-
- {{agrementTtile}}
-
-
-
-
-
支付方式
@@ -205,8 +102,7 @@
优惠明细
- {{'提交订单'}}
+ {{'提交订单'}}
@@ -289,10 +185,10 @@
import addInvoicing from '@/components/addInvoicing';
import parser from "@/components/jyf-parser/jyf-parser";
import payPwd from "@/components/payPwd/index.vue";
- import {
- orderPay,
- orderCheck
- } from "@/api/payment.js";
+ import {
+ orderPay,
+ orderCheck
+ } from "@/api/payment.js";
import {
mapGetters
} from "vuex";
@@ -506,7 +402,7 @@
moneyInfo: {},
orderData: {}, //支付参数
sale_type: 1,
- my_money: 0,
+ my_money: 0,
};
},
computed: {
@@ -525,7 +421,7 @@
mounted: function() {},
onLoad: function(options) {
this.seckillId = options.seckillId
- this.my_money = options.money;
+ this.my_money = options.money;
if (options.sale_type) this.sale_type = options.sale_type;
// #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
@@ -912,11 +808,11 @@
getOrderConfirm({
cart_id: that.cartId.split(","),
address_id: '',
- consumption_id:'',
- product_type: 0,
+ consumption_id: '',
+ product_type: 0,
takes: that.take,
- source: 999,
- money: that.my_money,
+ source: 999,
+ money: that.my_money,
use_coupon: that.subCoupon,
use_integral: that.use_integral
}).then(res => {
@@ -1439,7 +1335,7 @@
SubOrder: async function(e) {
let that = this,
data = {};
-
+
data = {
cart_id: this.cartId.split(","),
address_id: '',
@@ -1449,7 +1345,7 @@
order_type: this.order_type,
key: this.order_key,
takes: this.take,
- source: 999,
+ source: 999,
use_integral: this.use_integral,
receipt_data: this.invoiceData,
extend: this.extend,
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index b473e96..3d9f440 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -346,6 +346,7 @@
+
@@ -381,42 +382,7 @@
-