Commit d93a796888d34a8c553dccde89b45d679353ea4d
1 parent
22d80482
OA116709小程序提交订单页添加保障服务
Showing
19 changed files
with
212 additions
and
3 deletions
app.wxss
| ... | ... | @@ -1219,3 +1219,72 @@ background: #ffe3e2; |
| 1219 | 1219 | |
| 1220 | 1220 | |
| 1221 | 1221 | |
| 1222 | +/* 保障服务样式,多使用 */ | |
| 1223 | +.bz_view { | |
| 1224 | + /* height:100rpx; padding: 0 34rpx 0 13rpx; */ | |
| 1225 | + color: #333; | |
| 1226 | + font-size: 28rpx; | |
| 1227 | + padding: 20rpx 20rpx 20rpx 10rpx; | |
| 1228 | + background-color: #fff; | |
| 1229 | + border-radius: 14rpx; | |
| 1230 | + /* border-bottom: 3rpx solid #eee; */ | |
| 1231 | + /* border-top: 3rpx solid #eee; */ | |
| 1232 | +} | |
| 1233 | +.bzfu_img { | |
| 1234 | + width: 164rpx; | |
| 1235 | + height: 34rpx; | |
| 1236 | + /* margin-right: 18rpx; margin-left: 12rpx */ | |
| 1237 | +} | |
| 1238 | +.bz-content { | |
| 1239 | + padding: 0 0 0 20rpx; | |
| 1240 | + text-align: right; | |
| 1241 | + width: 100%; | |
| 1242 | +} | |
| 1243 | + | |
| 1244 | +.bg_jj { | |
| 1245 | + width: 14rpx; | |
| 1246 | + height: 14rpx; | |
| 1247 | + border-top: 2rpx solid #d70026; | |
| 1248 | + border-right: 2rpx solid #d70026; | |
| 1249 | + transform: rotateZ(45deg); | |
| 1250 | + display: inline-block; | |
| 1251 | + margin-bottom: 3rpx; | |
| 1252 | +} | |
| 1253 | +.bg_jj.down { | |
| 1254 | + transform: rotateZ(135deg); | |
| 1255 | +} | |
| 1256 | +.cx-obtain-coupon { | |
| 1257 | + /* width: 65rpx; | |
| 1258 | + height: 100%; | |
| 1259 | + padding-left:15rpx; */ | |
| 1260 | + color: #d70025; | |
| 1261 | + display: flex; | |
| 1262 | + align-items: center; | |
| 1263 | + /* position: absolute; | |
| 1264 | + right: 5rpx; */ | |
| 1265 | +} | |
| 1266 | +.wsize { | |
| 1267 | + font-size: 32rpx | |
| 1268 | +} | |
| 1269 | +.arrow { | |
| 1270 | + width: auto !important; | |
| 1271 | + position: absolute; | |
| 1272 | + right: 0; | |
| 1273 | + top: 50%; | |
| 1274 | + transform: translateY(-50%); | |
| 1275 | +} | |
| 1276 | +.xc-coupon-frame .rel:not(:first-child) { | |
| 1277 | + margin-top: 20rpx; | |
| 1278 | +} | |
| 1279 | + | |
| 1280 | +.xc-coupon-frame .coupon { | |
| 1281 | + width: 100%; | |
| 1282 | + height: 168rpx; | |
| 1283 | + border-radius: 25rpx; | |
| 1284 | + border: 2rpx solid #ffdcdc; | |
| 1285 | + overflow: hidden; | |
| 1286 | + /* margin-top:16rpx; */ | |
| 1287 | + box-sizing: border-box; | |
| 1288 | + | |
| 1289 | +} | |
| 1290 | + | ... | ... |
packageA/pages/serviceCard_pd/cart/cart.js
| ... | ... | @@ -63,11 +63,17 @@ Page({ |
| 63 | 63 | show_card: null, //显示的等级卡 |
| 64 | 64 | card_name: '', //显示的卡的名称 |
| 65 | 65 | card_cut_price: null,//减价多少钱 |
| 66 | + bconfig: null, | |
| 66 | 67 | }, |
| 67 | 68 | onLoad: function (t) { |
| 68 | 69 | console.log("onLoad_pt_cart"); |
| 69 | 70 | var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, }); |
| 70 | 71 | var appD = getApp().get_b_now(); |
| 72 | + getApp().getConfig2(function (e) { | |
| 73 | + th.setData({ | |
| 74 | + bconfig: e | |
| 75 | + }); | |
| 76 | + }, 1); | |
| 71 | 77 | |
| 72 | 78 | th.data.postdata = appD; |
| 73 | 79 | //如果期号有值 | ... | ... |
packageA/pages/serviceCard_pd/cart/cart.wxml
| ... | ... | @@ -112,7 +112,13 @@ |
| 112 | 112 | </block>--> |
| 113 | 113 | |
| 114 | 114 | </view> |
| 115 | - | |
| 115 | +<!-- 保障服务 --> | |
| 116 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 117 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 118 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 119 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 120 | + </view> | |
| 121 | + </view> | |
| 116 | 122 | |
| 117 | 123 | <view class="coupon-mes flex-vertical"> |
| 118 | 124 | <view>留言</view> | ... | ... |
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
| ... | ... | @@ -125,6 +125,7 @@ Page({ |
| 125 | 125 | hid_inp: 1, |
| 126 | 126 | user_note: {}, |
| 127 | 127 | zuhe_map_good: {}, |
| 128 | + bconfig:null | |
| 128 | 129 | }, |
| 129 | 130 | |
| 130 | 131 | onLoad: function (t) { |
| ... | ... | @@ -142,6 +143,12 @@ Page({ |
| 142 | 143 | } |
| 143 | 144 | }); |
| 144 | 145 | |
| 146 | + getApp().getConfig2(function (e) { | |
| 147 | + th.setData({ | |
| 148 | + bconfig: e | |
| 149 | + }); | |
| 150 | + }, 1); | |
| 151 | + | |
| 145 | 152 | |
| 146 | 153 | }, |
| 147 | 154 | onUnload: function () { | ... | ... |
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
| ... | ... | @@ -373,6 +373,14 @@ |
| 373 | 373 | </view> |
| 374 | 374 | </view> |
| 375 | 375 | </view> |
| 376 | + | |
| 377 | +<!-- 保障服务 --> | |
| 378 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 379 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 380 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 381 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 382 | + </view> | |
| 383 | + </view> | |
| 376 | 384 | <!-- 留言 --> |
| 377 | 385 | <view class="coupon-mes flex-vertical"> |
| 378 | 386 | <view>留言</view> | ... | ... |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| ... | ... | @@ -78,6 +78,7 @@ Page({ |
| 78 | 78 | act:null, //幸运购的活动 |
| 79 | 79 | |
| 80 | 80 | same_ok:1, //同城配送的控制,默认ok |
| 81 | + bconfig:null | |
| 81 | 82 | }, |
| 82 | 83 | |
| 83 | 84 | onLoad: function (t) { |
| ... | ... | @@ -96,6 +97,12 @@ Page({ |
| 96 | 97 | |
| 97 | 98 | this.data.postdata = appD; |
| 98 | 99 | |
| 100 | + getApp().getConfig2(function (e) { | |
| 101 | + self.setData({ | |
| 102 | + bconfig: e | |
| 103 | + }); | |
| 104 | + }, 1); | |
| 105 | + | |
| 99 | 106 | |
| 100 | 107 | // 获取幸运购活动团team_id |
| 101 | 108 | // this.get_teamId({ | ... | ... |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
| ... | ... | @@ -122,7 +122,14 @@ |
| 122 | 122 | </block>--> |
| 123 | 123 | |
| 124 | 124 | </view> |
| 125 | - | |
| 125 | + | |
| 126 | + <!-- 保障服务 --> | |
| 127 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 128 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 129 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 130 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 131 | + </view> | |
| 132 | + </view> | |
| 126 | 133 | |
| 127 | 134 | <view class="coupon-mes flex-vertical"> |
| 128 | 135 | <view>留言</view> | ... | ... |
packageC/pages/presell/cart/cart.js
| ... | ... | @@ -119,7 +119,8 @@ Page({ |
| 119 | 119 | order_prom_amount:0, |
| 120 | 120 | paying:0, |
| 121 | 121 | |
| 122 | - same_ok:1 //同城配送按钮控制 | |
| 122 | + same_ok:1 , //同城配送按钮控制 | |
| 123 | + bconfig:null | |
| 123 | 124 | }, |
| 124 | 125 | onLoad: function (t) { |
| 125 | 126 | |
| ... | ... | @@ -142,6 +143,12 @@ Page({ |
| 142 | 143 | getApp().goto("/packageE/pages/togoin/togoin"); |
| 143 | 144 | } |
| 144 | 145 | |
| 146 | + getApp().getConfig2(function (e) { | |
| 147 | + th.setData({ | |
| 148 | + bconfig: e | |
| 149 | + }); | |
| 150 | + }, 1); | |
| 151 | + | |
| 145 | 152 | //判断是不是佣金抵扣 |
| 146 | 153 | getApp().is_distribut(this); |
| 147 | 154 | ... | ... |
packageC/pages/presell/cart/cart.wxml
| ... | ... | @@ -263,6 +263,14 @@ |
| 263 | 263 | </view> |
| 264 | 264 | </view> |
| 265 | 265 | </view> |
| 266 | + | |
| 267 | + <!-- 保障服务 --> | |
| 268 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 269 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 270 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 271 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 272 | + </view> | |
| 273 | + </view> | |
| 266 | 274 | <!-- 留言 --> |
| 267 | 275 | <view class="coupon-mes flex-vertical"> |
| 268 | 276 | <view>留言</view> | ... | ... |
packageC/pages/presell/cart/cart2.js
| ... | ... | @@ -131,6 +131,8 @@ Page({ |
| 131 | 131 | same_ok:1, |
| 132 | 132 | appoint_pick_keyid: '', |
| 133 | 133 | |
| 134 | + bconfig:null | |
| 135 | + | |
| 134 | 136 | }, |
| 135 | 137 | onLoad: function (t) { |
| 136 | 138 | wx.setNavigationBarTitle({ title: "填写订单", }) |
| ... | ... | @@ -144,6 +146,12 @@ Page({ |
| 144 | 146 | } |
| 145 | 147 | }); |
| 146 | 148 | |
| 149 | + getApp().getConfig2(function (e) { | |
| 150 | + th.setData({ | |
| 151 | + bconfig: e | |
| 152 | + }); | |
| 153 | + }, 1); | |
| 154 | + | |
| 147 | 155 | //判断是不是佣金抵扣 |
| 148 | 156 | getApp().is_distribut(this); |
| 149 | 157 | ... | ... |
packageC/pages/presell/cart/cart2.wxml
| ... | ... | @@ -176,6 +176,14 @@ |
| 176 | 176 | </view> |
| 177 | 177 | </view> |
| 178 | 178 | </view> |
| 179 | + | |
| 180 | + <!-- 保障服务 --> | |
| 181 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 182 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 183 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 184 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 185 | + </view> | |
| 186 | + </view> | |
| 179 | 187 | <!-- 留言 --> |
| 180 | 188 | <view class="coupon-mes flex-vertical"> |
| 181 | 189 | <view>留言</view> | ... | ... |
packageC/pages/presell/cart/cart2_pre.js
| ... | ... | @@ -55,6 +55,7 @@ Page({ |
| 55 | 55 | yuer: 0, |
| 56 | 56 | agree_no_ref: 0, |
| 57 | 57 | is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 |
| 58 | + bconfig:null | |
| 58 | 59 | }, |
| 59 | 60 | onLoad: function (t) { |
| 60 | 61 | wx.setNavigationBarTitle({ |
| ... | ... | @@ -63,6 +64,11 @@ Page({ |
| 63 | 64 | var th = this; this.setData({ is_b_now: 1 }); |
| 64 | 65 | th.data.postdata = getApp().get_b_now(); |
| 65 | 66 | th.data.param = t; |
| 67 | + getApp().getConfig2(function (e) { | |
| 68 | + th.setData({ | |
| 69 | + bconfig: e | |
| 70 | + }); | |
| 71 | + }, 1); | |
| 66 | 72 | |
| 67 | 73 | }, |
| 68 | 74 | onUnload: function () { this.setData({ isclose: 1 }) }, | ... | ... |
packageC/pages/presell/cart/cart2_pre.wxml
| ... | ... | @@ -111,6 +111,13 @@ |
| 111 | 111 | </block>--> |
| 112 | 112 | </view> |
| 113 | 113 | |
| 114 | + <!-- 保障服务 --> | |
| 115 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 116 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 117 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 118 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 119 | + </view> | |
| 120 | + </view> | |
| 114 | 121 | |
| 115 | 122 | <view class="coupon-mes flex-vertical"> |
| 116 | 123 | <view>留言</view> | ... | ... |
packageE/pages/cart/cart2/cart2.js
| ... | ... | @@ -153,6 +153,8 @@ Page({ |
| 153 | 153 | |
| 154 | 154 | same_ok:1, //同城配送的控制,默认ok |
| 155 | 155 | |
| 156 | + bconfig:null | |
| 157 | + | |
| 156 | 158 | }, |
| 157 | 159 | onLoad: function (t) { |
| 158 | 160 | |
| ... | ... | @@ -169,6 +171,12 @@ Page({ |
| 169 | 171 | } |
| 170 | 172 | }); |
| 171 | 173 | |
| 174 | + getApp().getConfig2(function (e) { | |
| 175 | + th.setData({ | |
| 176 | + bconfig: e | |
| 177 | + }); | |
| 178 | + }, 1); | |
| 179 | + | |
| 172 | 180 | //阶梯购 或者 组合购的立即购买 |
| 173 | 181 | if (t.state) { |
| 174 | 182 | th.data.state = 1; | ... | ... |
packageE/pages/cart/cart2/cart2.wxml
| ... | ... | @@ -267,6 +267,14 @@ |
| 267 | 267 | </view> |
| 268 | 268 | </view> |
| 269 | 269 | |
| 270 | + <!-- 保障服务 --> | |
| 271 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 272 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 273 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 274 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 275 | + </view> | |
| 276 | + </view> | |
| 277 | + | |
| 270 | 278 | |
| 271 | 279 | |
| 272 | 280 | <!-- 留言 --> |
| ... | ... | @@ -520,6 +528,14 @@ |
| 520 | 528 | </view> |
| 521 | 529 | </view> |
| 522 | 530 | |
| 531 | + <!-- 保障服务 --> | |
| 532 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 533 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 534 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 535 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 536 | + </view> | |
| 537 | + </view> | |
| 538 | + | |
| 523 | 539 | <!-- 留言 --> |
| 524 | 540 | <view class="coupon-mes flex-vertical"> |
| 525 | 541 | <view>留言</view> | ... | ... |
packageE/pages/cart/cart2_inte/cart2_inte.js
| ... | ... | @@ -83,6 +83,7 @@ Page({ |
| 83 | 83 | is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 |
| 84 | 84 | |
| 85 | 85 | same_ok:1, //同城配送的控制,默认ok |
| 86 | + bconfig:null | |
| 86 | 87 | }, |
| 87 | 88 | onLoad: function (t) { |
| 88 | 89 | wx.setNavigationBarTitle({ title: "填写订单", }) |
| ... | ... | @@ -95,6 +96,12 @@ Page({ |
| 95 | 96 | } |
| 96 | 97 | }); |
| 97 | 98 | |
| 99 | + getApp().getConfig2(function (e) { | |
| 100 | + th.setData({ | |
| 101 | + bconfig: e | |
| 102 | + }); | |
| 103 | + }, 1); | |
| 104 | + | |
| 98 | 105 | //先获取是否有关闭使用优惠券 |
| 99 | 106 | getApp().getConfig2(function (ee) { |
| 100 | 107 | var json_d = JSON.parse(ee.switch_list); | ... | ... |
packageE/pages/cart/cart2_inte/cart2_inte.wxml
| ... | ... | @@ -123,6 +123,14 @@ |
| 123 | 123 | </block> |
| 124 | 124 | |
| 125 | 125 | </view> |
| 126 | + | |
| 127 | + <!-- 保障服务 --> | |
| 128 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 129 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 130 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 131 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 132 | + </view> | |
| 133 | + </view> | |
| 126 | 134 | |
| 127 | 135 | <view class="coupon-mes flex-vertical"> |
| 128 | 136 | <view>留言</view> | ... | ... |
pages/cart/cart2_pt/cart2_pt.js
| ... | ... | @@ -74,6 +74,8 @@ Page({ |
| 74 | 74 | bn_is_post_temp:1, //是不是进行计算包邮模板 |
| 75 | 75 | |
| 76 | 76 | same_ok:1, //同城配送的控制,默认ok |
| 77 | + | |
| 78 | + bconfig:null | |
| 77 | 79 | }, |
| 78 | 80 | onLoad: function (t) { |
| 79 | 81 | console.log("onLoad_pt_cart"); |
| ... | ... | @@ -81,6 +83,12 @@ Page({ |
| 81 | 83 | this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, }); |
| 82 | 84 | var appD = getApp().get_b_now(); |
| 83 | 85 | |
| 86 | + getApp().getConfig2(function (e) { | |
| 87 | + th.setData({ | |
| 88 | + bconfig: e | |
| 89 | + }); | |
| 90 | + }, 1); | |
| 91 | + | |
| 84 | 92 | th.data.postdata = appD; |
| 85 | 93 | //如果期号有值 |
| 86 | 94 | if (appD.qh) { | ... | ... |
pages/cart/cart2_pt/cart2_pt.wxml
| ... | ... | @@ -124,6 +124,14 @@ |
| 124 | 124 | |
| 125 | 125 | </view> |
| 126 | 126 | |
| 127 | + <!-- 保障服务 --> | |
| 128 | + <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}"> | |
| 129 | + <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image> | |
| 130 | + <view class="flex f1 rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}"> | |
| 131 | + <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view> | |
| 132 | + </view> | |
| 133 | + </view> | |
| 134 | + | |
| 127 | 135 | |
| 128 | 136 | <view class="coupon-mes flex-vertical"> |
| 129 | 137 | <view>留言</view> | ... | ... |