From c738befac4838ddaa695340ee9aca266f5b90731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Fri, 18 Apr 2025 17:55:28 +0800
Subject: [PATCH] tijiao
---
.../commonComponents/orderSubmit.vue | 4436 +++++++++--------
pages/goods/order/index.vue | 14 +-
2 files changed, 2286 insertions(+), 2164 deletions(-)
diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue
index 4fa0b1e..8c629e2 100644
--- a/pages/component/commonComponents/orderSubmit.vue
+++ b/pages/component/commonComponents/orderSubmit.vue
@@ -1,1470 +1,1585 @@
-
-
-
-
-
-
-
-
- {{ addressData.address }}
-
- {{ addressData.consigneeName }}
- {{ addressData.consigneePhone }}
-
-
-
-
-
- 请添加收货地址
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+ {{ addressData.address }}
+
+ {{ addressData.consigneeName }}
+ {{ addressData.consigneePhone }}
-
-
-
-
+
+
+ 请添加收货地址
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
- {{ orderNumber }}
+
+
+
+
-
-
+
+
+
+ {{ orderNumber }}
+
+
+
+
+ X {{ orderNumber }}
+
+
+
+
+
+
+
+ {{ v.text }}
-
- X {{ orderNumber }}
+
+
+ {{ remark == "" ? v.placeholder : remark }}
+
+
+
-
+
+
+ 价格明细
+
- {{ v.text }}
-
-
-
- {{ remark == "" ? v.placeholder : remark }}
-
-
-
-
-
-
-
- 价格明细
-
-
-
-
-
-
-
-
-
- VIP
- 专享立减
- {{ v.text }}
-
-
- (全部积分：{{ initData.user.jf }})
-
-
-
-
- ￥{{ Number(totalPrice).toFixed(2) }}
-
-
- ￥{{
- isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
- }}
-
-
-
-
+
+
+
+ VIP
- 不可用
-
- 共 {{ selectcouponList.length }} 张
-
-
-
-
+ 专享立减
+ {{ v.text }}
+
+
+ (全部积分：{{ initData.user.jf }})
+
+
+
+
+ ￥{{ Number(totalPrice).toFixed(2) }}
+
+
+ ￥{{
+ isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
+ }}
+
+
+
+
+ 不可用
+
+ 共 {{ selectcouponList.length }} 张
+
+
+
+
+
+ 暂无可用优惠券
+
+
- 暂无可用优惠券
+ - ￥ {{ curCoupon.couponEntity.couponAmount }}
+ 重新选择
-
- - ￥ {{ curCoupon.couponEntity.couponAmount }}
- 重新选择
+ -￥{{ jfNumberShow }}
+
+
+ - ￥{{ districtAmount.toFixed(2) }}
+
+
+ - ￥{{ vipPrice.toFixed(2) }}
-
-
-
- -￥{{ jfNumberShow }}
-
-
- - ￥{{ districtAmount.toFixed(2) }}
-
-
- - ￥{{ vipPrice.toFixed(2) }}
-
-
-
-
-
-
- 可用积分({{ jfNumberMax }}分)
-
-
-
-
-
-
- 支付方式
-
-
-
-
-
-
-
- {{ v.text }}
-
- (余额：{{
- initData && initData.user ? initData.user.peanutCoin : 0
- }})
-
-
- {{ v.text }}
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- 确保您的天医币足够支付
-
-
- 立即充值
-
-
-
- 说明
- 1. 1天医币 = 1元人民币
-
- 2.若有疑问或意见请致电客服
- 022-24142321
+ 可用积分({{ jfNumberMax }}分)
-
-
- 3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
- 支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
-
- publisher@tmrjournals.com
-
- （点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
-
- yilujiankangkefu ）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 合计:
-
-
-
- ￥{{ Number(actualPayment).toFixed(2) }}
+
+
+ 支付方式
+
+
+
+
+
+
+
+ {{ v.text }}
+
+ (余额：{{
+ initData && initData.user ? initData.user.peanutCoin : 0
+ }})
-
- +
-
-
- {{ jfNumber }} 积分
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 合计:
+
+
+
+ ￥{{ Number(actualPayment).toFixed(2) }}
+
+
+ +
+
+
+ {{ jfNumber }} 积分
+
+
+
+
+
+
+
+
+
+
+
+ * 我已阅读并同意《会员服务协议》
-
-
-
-
-
-
-
-
+
+ .hasRemark {
+ color: #333 !important;
+ font-size: 40rpx !important;
+ }
+
+ .bgGrey {
+ // background-color: #f5f5f5;
+ }
+
+ .minus {
+ width: 22px;
+ height: 22px;
+ border-width: 1px;
+ border-color: #e6e6e6;
+ border-style: solid;
+ border-top-left-radius: 100px;
+ border-top-right-radius: 100px;
+ border-bottom-left-radius: 100px;
+ border-bottom-right-radius: 100px;
+ @include flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .input {
+ padding: 0 10px;
+ }
+
+ .plus {
+ width: 22px;
+ height: 22px;
+ background-color: #ff0000;
+ border-radius: 50%;
+ /* #ifndef APP-NVUE */
+ display: flex;
+ /* #endif */
+ justify-content: center;
+ align-items: center;
+ }
+ .agree_wo {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ color: #aaa;
+ line-height: 30rpx;
+ font-size: 28rpx;
+ padding: 10rpx 10rpx 20rpx 0;
+ }
+ .agreeRadio {
+ zoom: 0.8;
+ }
+ .agree {
+ width: auto !important;
+ }
+ .highlight {
+ color: $uni-color-primary;
+ }
+ .tanchu {
+ padding: 40rpx 30rpx 40rpx 30rpx;
+ position: relative;
+
+ .dp_title {
+ font-size: 32rpx;
+ margin-bottom: 50rpx;
+ color: #555;
+ text-align: center;
+ font-weight: bold;
+ }
+ }
+ .themeColor {
+ color: $themeColor;
+ }
+
+
\ No newline at end of file
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 5266509..4c97963 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -7,6 +7,7 @@
vcb.id === id);
if (vcbItem) {
- return vcbItem; // Return the matching item
+ return {...vcbItem,}; // Return the matching item
}
}
if (item.yanqiList) {
+ this.isHideJf=false
const vcbItem = item.yanqiList.find((vcb) => vcb.id === id);
if (vcbItem) {
- return vcbItem; // Return the matching item
+
+ return {...vcbItem,}; // Return the matching item
}
}
}
@@ -291,6 +295,7 @@ export default {
this.goodsDataList = res.productList.filter(
(e) => this.options.goods[0].productName == e.productName
);
+
});
},
@@ -307,6 +312,9 @@ export default {
.then(async (res) => {
console.log("res at line 846:", res);
var data = await this.findById(this.options.goods[0].id, res.res);
+ if(this.isHideJf){
+ this.initData.user.jf=0;
+ }
console.log("data at line 200:", data);
this.goodsDataList = [
{