From d93a796888d34a8c553dccde89b45d679353ea4d Mon Sep 17 00:00:00 2001
From: Cyy <547766613@qq.com>
Date: Wed, 21 Jun 2023 09:22:35 +0800
Subject: [PATCH] OA116709小程序提交订单页添加保障服务
---
app.wxss | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
packageA/pages/serviceCard_pd/cart/cart.js | 6 ++++++
packageA/pages/serviceCard_pd/cart/cart.wxml | 8 +++++++-
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js | 7 +++++++
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml | 8 ++++++++
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js | 7 +++++++
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml | 9 ++++++++-
packageC/pages/presell/cart/cart.js | 9 ++++++++-
packageC/pages/presell/cart/cart.wxml | 8 ++++++++
packageC/pages/presell/cart/cart2.js | 8 ++++++++
packageC/pages/presell/cart/cart2.wxml | 8 ++++++++
packageC/pages/presell/cart/cart2_pre.js | 6 ++++++
packageC/pages/presell/cart/cart2_pre.wxml | 7 +++++++
packageE/pages/cart/cart2/cart2.js | 8 ++++++++
packageE/pages/cart/cart2/cart2.wxml | 16 ++++++++++++++++
packageE/pages/cart/cart2_inte/cart2_inte.js | 7 +++++++
packageE/pages/cart/cart2_inte/cart2_inte.wxml | 8 ++++++++
pages/cart/cart2_pt/cart2_pt.js | 8 ++++++++
pages/cart/cart2_pt/cart2_pt.wxml | 8 ++++++++
19 files changed, 212 insertions(+), 3 deletions(-)
diff --git a/app.wxss b/app.wxss
index 1d50246..e03210c 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1219,3 +1219,72 @@ background: #ffe3e2;
+/* 保障服务样式，多使用 */
+.bz_view {
+ /* height:100rpx; padding: 0 34rpx 0 13rpx; */
+ color: #333;
+ font-size: 28rpx;
+ padding: 20rpx 20rpx 20rpx 10rpx;
+ background-color: #fff;
+ border-radius: 14rpx;
+ /* border-bottom: 3rpx solid #eee; */
+ /* border-top: 3rpx solid #eee; */
+}
+.bzfu_img {
+ width: 164rpx;
+ height: 34rpx;
+ /* margin-right: 18rpx; margin-left: 12rpx */
+}
+.bz-content {
+ padding: 0 0 0 20rpx;
+ text-align: right;
+ width: 100%;
+}
+
+.bg_jj {
+ width: 14rpx;
+ height: 14rpx;
+ border-top: 2rpx solid #d70026;
+ border-right: 2rpx solid #d70026;
+ transform: rotateZ(45deg);
+ display: inline-block;
+ margin-bottom: 3rpx;
+}
+.bg_jj.down {
+ transform: rotateZ(135deg);
+}
+.cx-obtain-coupon {
+ /* width: 65rpx;
+ height: 100%;
+ padding-left:15rpx; */
+ color: #d70025;
+ display: flex;
+ align-items: center;
+ /* position: absolute;
+ right: 5rpx; */
+}
+.wsize {
+ font-size: 32rpx
+}
+.arrow {
+ width: auto !important;
+ position: absolute;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+}
+.xc-coupon-frame .rel:not(:first-child) {
+ margin-top: 20rpx;
+}
+
+.xc-coupon-frame .coupon {
+ width: 100%;
+ height: 168rpx;
+ border-radius: 25rpx;
+ border: 2rpx solid #ffdcdc;
+ overflow: hidden;
+ /* margin-top:16rpx; */
+ box-sizing: border-box;
+
+}
+
diff --git a/packageA/pages/serviceCard_pd/cart/cart.js b/packageA/pages/serviceCard_pd/cart/cart.js
index 35f9333..1a9678a 100644
--- a/packageA/pages/serviceCard_pd/cart/cart.js
+++ b/packageA/pages/serviceCard_pd/cart/cart.js
@@ -63,11 +63,17 @@ Page({
show_card: null, //显示的等级卡
card_name: '', //显示的卡的名称
card_cut_price: null,//减价多少钱
+ bconfig: null,
},
onLoad: function (t) {
console.log("onLoad_pt_cart");
var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, });
var appD = getApp().get_b_now();
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
th.data.postdata = appD;
//如果期号有值
diff --git a/packageA/pages/serviceCard_pd/cart/cart.wxml b/packageA/pages/serviceCard_pd/cart/cart.wxml
index 20e6192..ebd81d2 100644
--- a/packageA/pages/serviceCard_pd/cart/cart.wxml
+++ b/packageA/pages/serviceCard_pd/cart/cart.wxml
@@ -112,7 +112,13 @@
-->
-
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
index 1b1a6d6..1cf9143 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
@@ -125,6 +125,7 @@ Page({
hid_inp: 1,
user_note: {},
zuhe_map_good: {},
+ bconfig:null
},
onLoad: function (t) {
@@ -142,6 +143,12 @@ Page({
}
});
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
+
},
onUnload: function () {
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
index 1350caf..686e31c 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
@@ -373,6 +373,14 @@
+
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
index 9866ddd..8ec7451 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -78,6 +78,7 @@ Page({
act:null, //幸运购的活动
same_ok:1, //同城配送的控制，默认ok
+ bconfig:null
},
onLoad: function (t) {
@@ -96,6 +97,12 @@ Page({
this.data.postdata = appD;
+ getApp().getConfig2(function (e) {
+ self.setData({
+ bconfig: e
+ });
+ }, 1);
+
// 获取幸运购活动团team_id
// this.get_teamId({
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
index f7c9a30..9a4d480 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
@@ -122,7 +122,14 @@
-->
-
+
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index 16f36a7..b64a91f 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -119,7 +119,8 @@ Page({
order_prom_amount:0,
paying:0,
- same_ok:1 //同城配送按钮控制
+ same_ok:1 , //同城配送按钮控制
+ bconfig:null
},
onLoad: function (t) {
@@ -142,6 +143,12 @@ Page({
getApp().goto("/packageE/pages/togoin/togoin");
}
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
+
//判断是不是佣金抵扣
getApp().is_distribut(this);
diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index f8e8735..3c37e8d 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -263,6 +263,14 @@
+
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index a31f25c..392531d 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -131,6 +131,8 @@ Page({
same_ok:1,
appoint_pick_keyid: '',
+ bconfig:null
+
},
onLoad: function (t) {
wx.setNavigationBarTitle({ title: "填写订单", })
@@ -144,6 +146,12 @@ Page({
}
});
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
+
//判断是不是佣金抵扣
getApp().is_distribut(this);
diff --git a/packageC/pages/presell/cart/cart2.wxml b/packageC/pages/presell/cart/cart2.wxml
index 234d0bd..53c44b0 100644
--- a/packageC/pages/presell/cart/cart2.wxml
+++ b/packageC/pages/presell/cart/cart2.wxml
@@ -176,6 +176,14 @@
+
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 1ef4e84..74996a4 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -55,6 +55,7 @@ Page({
yuer: 0,
agree_no_ref: 0,
is_pre_cut:0, //是否可以使用预存 0是不可以1的可以
+ bconfig:null
},
onLoad: function (t) {
wx.setNavigationBarTitle({
@@ -63,6 +64,11 @@ Page({
var th = this; this.setData({ is_b_now: 1 });
th.data.postdata = getApp().get_b_now();
th.data.param = t;
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
},
onUnload: function () { this.setData({ isclose: 1 }) },
diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml
index e5388e1..30b8c8a 100644
--- a/packageC/pages/presell/cart/cart2_pre.wxml
+++ b/packageC/pages/presell/cart/cart2_pre.wxml
@@ -111,6 +111,13 @@
-->
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index b15a1fe..851696a 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -153,6 +153,8 @@ Page({
same_ok:1, //同城配送的控制，默认ok
+ bconfig:null
+
},
onLoad: function (t) {
@@ -169,6 +171,12 @@ Page({
}
});
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
+
//阶梯购 或者 组合购的立即购买
if (t.state) {
th.data.state = 1;
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 4144db3..13457be 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -267,6 +267,14 @@
+
+
+
+
+ {{bconfig.service_bz}}
+
+
+
@@ -520,6 +528,14 @@
+
+
+
+
+ {{bconfig.service_bz}}
+
+
+
留言
diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js
index 48314fc..7bdc786 100644
--- a/packageE/pages/cart/cart2_inte/cart2_inte.js
+++ b/packageE/pages/cart/cart2_inte/cart2_inte.js
@@ -83,6 +83,7 @@ Page({
is_pre_cut:0, //是否可以使用预存 0是不可以1的可以
same_ok:1, //同城配送的控制，默认ok
+ bconfig:null
},
onLoad: function (t) {
wx.setNavigationBarTitle({ title: "填写订单", })
@@ -95,6 +96,12 @@ Page({
}
});
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
+
//先获取是否有关闭使用优惠券
getApp().getConfig2(function (ee) {
var json_d = JSON.parse(ee.switch_list);
diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.wxml b/packageE/pages/cart/cart2_inte/cart2_inte.wxml
index 49e2ddd..04e1222 100644
--- a/packageE/pages/cart/cart2_inte/cart2_inte.wxml
+++ b/packageE/pages/cart/cart2_inte/cart2_inte.wxml
@@ -123,6 +123,14 @@
+
+
+
+
+
+ {{bconfig.service_bz}}
+
+
留言
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 1723251..3ed9a13 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -74,6 +74,8 @@ Page({
bn_is_post_temp:1, //是不是进行计算包邮模板
same_ok:1, //同城配送的控制，默认ok
+
+ bconfig:null
},
onLoad: function (t) {
console.log("onLoad_pt_cart");
@@ -81,6 +83,12 @@ Page({
this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, });
var appD = getApp().get_b_now();
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e
+ });
+ }, 1);
+
th.data.postdata = appD;
//如果期号有值
if (appD.qh) {
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 68aa51e..293a063 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -124,6 +124,14 @@
+
+
+
+
+ {{bconfig.service_bz}}
+
+
+
留言
--
libgit2 0.21.4