From 6a482f5138f13c412172dbd208608fb6d3f4c75d Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Sat, 20 May 2023 09:46:49 +0800 Subject: [PATCH] OA单优化 --- packageA/pages/distribution/shop/shop.js | 4 ++-- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js | 15 ++++++++++----- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml | 4 +++- packageC/pages/presell/cart/cart.js | 6 +++++- packageC/pages/presell/cart/cart.wxml | 4 +++- packageD/pages/AI-test-skin/fail_result/fail_result.js | 6 +++--- packageE/pages/cart/cart2_inte/c_filter.wxs | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/cart/cart2_inte/cart2_inte.js | 1639 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/cart/cart2_inte/cart2_inte.json | 7 +++++++ packageE/pages/cart/cart2_inte/cart2_inte.wxml | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/cart/cart2_inte/cart2_inte.wxss | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/cart/cart2_inte/filter.wxs | 11 +++++++++++ pages/cart/cart2_inte/c_filter.wxs | 67 ------------------------------------------------------------------- pages/cart/cart2_inte/cart2_inte.js | 1639 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/cart/cart2_inte/cart2_inte.json | 7 ------- pages/cart/cart2_inte/cart2_inte.wxml | 248 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/cart/cart2_inte/cart2_inte.wxss | 987 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/cart/cart2_inte/filter.wxs | 11 ----------- pages/goods/goodsInfo/goodsInfo.js | 2 +- pages/test/test.js | 53 ----------------------------------------------------- pages/test/test.json | 1 - pages/test/test.wxml | 0 pages/test/test.wxss | 26 -------------------------- pages/user/order_detail/order_detail.js | 8 ++++++++ pages/user/order_detail/order_detail.wxml | 4 +++- pages/user/order_list/order_list.js | 6 ++++++ pages/user/order_list/order_list.wxml | 7 +++++-- 27 files changed, 3008 insertions(+), 3056 deletions(-) create mode 100644 packageE/pages/cart/cart2_inte/c_filter.wxs create mode 100644 packageE/pages/cart/cart2_inte/cart2_inte.js create mode 100644 packageE/pages/cart/cart2_inte/cart2_inte.json create mode 100644 packageE/pages/cart/cart2_inte/cart2_inte.wxml create mode 100644 packageE/pages/cart/cart2_inte/cart2_inte.wxss create mode 100644 packageE/pages/cart/cart2_inte/filter.wxs delete mode 100644 pages/cart/cart2_inte/c_filter.wxs delete mode 100644 pages/cart/cart2_inte/cart2_inte.js delete mode 100644 pages/cart/cart2_inte/cart2_inte.json delete mode 100644 pages/cart/cart2_inte/cart2_inte.wxml delete mode 100644 pages/cart/cart2_inte/cart2_inte.wxss delete mode 100644 pages/cart/cart2_inte/filter.wxs delete mode 100644 pages/test/test.js delete mode 100644 pages/test/test.json delete mode 100644 pages/test/test.wxml delete mode 100644 pages/test/test.wxss diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js index a3693b0..3c79dc1 100644 --- a/packageA/pages/distribution/shop/shop.js +++ b/packageA/pages/distribution/shop/shop.js @@ -79,14 +79,14 @@ Page({ } - if (options?.brand_id) { + if (options && options.brand_id) { this.setData({ brand_id: options.brand_id, is_router:true }) // this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery); } - if (options?.nation_id) { + if (options && options.nation_id) { this.setData({ nation_id: options.nation_id, is_router:true diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index 75e4396..31cd6c0 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -1105,12 +1105,17 @@ Page({ click_contact:function () { getApp().globalData.no_clear=1; + }, + + //-- 查看物流 -- + go_wuliu:function (e) { + getApp().go_wuliu(e); } - - - - - + + + + + diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 5d11ee4..f831071 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -185,7 +185,9 @@ 删除订单 - + + + + + + + + + + + + + + + + + + + + {{bn_pickname}} + + + + + + + + {{bn_goods.goods_name}} + + + + {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} + + + + + + + {{bn_goods.integral}}积分 + + + ￥{{filters.toFix(bn_goods.shop_price,2)}} + + 佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} + + x{{bn_goods.buynum}} + + + + + + + + {{order.store_prom}} + + + + + + 优惠券 {{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用 + + + 不使用 + + ￥{{using_quan[bn_pick].money}}元优惠券 + 包邮券 + + + + + + + + + + + 选择物流 + + {{wu_arr[index].name}} + + + + + + + + + 留言 + + + + + + + + + + 使用预存 + + ￥{{filters.toFix(bn_goods.yck,2)}} + + + + + + + + 使用佣金 :￥{{bn_goods.use_commission}} + + + + + + + + 使用余额 :￥{{yuer}} + + + + + + + + + + 商品金额 + ￥ {{formData.all_price}}元 + + + 可用积分{{integral_can}} + {{formData.integral}}积分 + + + 配送费用 + ￥ {{formData.shipping_price}}元 + + + + + 订单优惠 + - ￥ {{filters.toFix(formData.order_prom_amount,2)}}元 + + + + 使用预存 + - ￥ {{filters.toFix(formData.prestore,2)}}元 + + + 使用余额 + - ￥ {{formData.user_money}}元 + + + + + + + 应付金额：￥{{formData.order_amount}} + 应付积分：{{formData.integral}}积分 + + + + + + + + + + + + + + 选择物流名字 + + + × + + + + + + + + Γ + + + + + {{express_list.name}} + + + + + + + 确定 + + + 设为默认 + + + + + + + diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.wxss b/packageE/pages/cart/cart2_inte/cart2_inte.wxss new file mode 100644 index 0000000..03c2154 --- /dev/null +++ b/packageE/pages/cart/cart2_inte/cart2_inte.wxss @@ -0,0 +1,987 @@ +.bdr_t-14 { + border-top-left-radius: 14rpx; + border-top-right-radius: 14rpx; +} +.bdr_b-14 { + border-bottom-left-radius: 14rpx; + border-bottom-right-radius: 14rpx; +} +.bdr14 { + border-radius: 14rpx; +} +.mgt20 { + margin-top: 20rpx; +} +.shadow { + box-shadow: 0 4rpx 12px #e7e9eb; +} +.shadow-1 { + box-shadow: 16rpx 0px 12px #e7e9eb; +} + + +page { + /* background-color: #FAFAFA; */ + background-color: #F0F0F0; + padding: 0 22rpx; + box-sizing: border-box; +} +.container { + background-color: #F0F0F0; + /* padding-top: 28rpx; */ + padding-bottom: 120rpx; +} +.user-mes { + position: relative; + background-color: #fff; + font-size: 32rpx; + color: #444; + /* margin-top: 28rpx; */ + border-radius: 14rpx; +} +.user-contact { + padding: 24rpx 26rpx; + font-weight: 600; +} + +.location { + position: relative; + padding: 0 70rpx 24rpx; +} + +.pos-icon { + position: absolute; + left: 28rpx; + top: 6rpx; + width: 30rpx; + height: 36rpx; +} + +.border-img { + width: 100%; + height: 12rpx; +} + +.update-logistics { + position: absolute; + right: 0; + top: 0; + width: 80rpx; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.arrow-rigth { + width: 32rpx; + height: 32rpx; +} + +.order-meg { + margin-bottom: 20rpx; + font-size: 28rpx; + +} + +.order-detail { + padding: 30rpx 0; + border-bottom: 2rpx solid #eee; + color: #777; + min-height: 190rpx; + background-color: #fff; + +} + +.goods-img { + float: left; + width: 200rpx; + height: 200rpx; + margin: 0 20rpx; +} + +.order-cont { + float: left; + width: 438rpx; +} + +.goods-name { + height: 74rpx; + line-height: 40rpx; + overflow: hidden; + margin-bottom: 16rpx; + font-size: 28rpx; + color: #333; + +} + +.goods-color { + font-size: 24rpx; +} + +.order-num { + margin-top: 25rpx; + font-size: 24rpx; + line-height: 42rpx; +} + +.set-mes{ + background-color: #fff; + /* margin-top: 20rpx; */ +} +.use-item{ + display: flex; + align-items: center; + height: 80rpx; + /* border-bottom: 1px solid #ddd; */ + font-size: 30rpx; + /* width:95%; +margin:auto; */ + padding: 0 26rpx; +} +.use-item>view{ + display: flex; + align-items: center; + /* margin-right: 12rpx; */ +} +.use-item.bfff{ + background-color: #fff; +} +.use-item .dp{ + display: block; + width: 50rpx; + height: 50rpx; + margin-left: -6rpx; +} + +.set-item { + justify-content: space-between; + background-color: #fff; +} + +.set-btn { + display: flex; + font-size: 24rpx; +} + +.set-mes input { + width: 380rpx; + height: 50rpx; + line-height: 50rpx; + border: 1px solid #ddd; +} + +.use-btn { + width: 100rpx; + height: 50rpx; + margin-left: 20rpx; + line-height: 50rpx; + text-align: center; + background-color: #f23030; + color: #fff; +} + +.coupon-mes { + /* box-sizing: border-box; */ + height:95rpx; + padding: 0 26rpx; + background-color: #fff; + font-size: 30rpx; + color: #444; + /* width: 100%; */ + border-radius: 14rpx; + margin-top: 20rpx; + margin-bottom: 20rpx; +} + +.coupon-title { + display: flex; + justify-content: space-between; + align-items: center; + height: 92rpx; +} + +.coupon-title>view { + display: flex; +} + +.coupon-num { + height: 36rpx; + margin-left: 20rpx; + padding: 0 16rpx; + line-height: 36rpx; + text-align: center; + background-color: #f23030; + color: #fff; + font-size: 24rpx; +} + +.leave-word { + position: relative; + font-size: 24rpx; + margin-left: 20rpx; + flex-grow: 1; +} + +.word-box { + font-size: 26rpx; + /* width: 600rpx; */ + padding: 10rpx; + height: 28rpx; + line-height: 40rpx; +} + +.max-word { + position: absolute; + right: 0; + bottom: 0; +} + +.information { + padding: 0 26rpx; + background-color: #fff; + /* margin-bottom: 120rpx; */ +} + +.information .item { + display: flex; + justify-content: space-between; + height: 60rpx; + line-height: 60rpx; + font-size: 26rpx; + color: #777; +} + +.btn-wrap { + height: 100rpx; + box-sizing: border-box; + display: flex; + justify-content: space-between; + background-color: white; + align-items: center; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + padding: 0 30rpx; + font-size: 30rpx; +} + +.tips-btn { + /* float: right; + width: 200rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 30rpx; + color: #fff; + background-color: #f23030; */ + color: white; + background-color: #FE4445; + height: 72rpx; + line-height: 72rpx; + padding: 0 42rpx; + border-radius: 36rpx; + margin-left: 0; + margin-right: 0; +} + +.pay-amount { + /* float: right; + display: flex; + align-items: center; + height: 100rpx; + font-size: 26rpx; + margin-right: 40rpx; */ +} + +.payable { + color: #444; + /* margin-right: 20rpx; */ +} + +.shipping-modal { + z-index: 20; + position: fixed; + bottom: 0; + left: 0; + right: 0; + overflow-y: hidden; + color: #666666; + background-color: white; +} + +.shipping-nav { + text-align: center; + font-size: 35rpx; + padding-top: 30rpx; +} + +.shipping-list { + padding: 20rpx 30rpx 40rpx; + font-size: 28rpx; +} + +.shipping-item { + display: block; + padding: 20rpx 0; +} + +.shipping-btn { + width: 100%; + color: white; + background-color: #f23030; + line-height: 90rpx; + text-align: center; + font-size: 40rpx; +} + +/*----------nyf新增，地址---------*/ +.add_new{ + height: 90rpx; + display: flex; + align-items: center; + padding: 0 26rpx; +} +.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; + margin-right: 15rpx;vertical-align: middle;} +.yu_er{ + margin-left: 10rpx; + /* margin-right: 60rpx; */ +} +.wuliu{margin-left: 20rpx;} + + +/*---- 优惠券列表 -----*/ +.xc-coupon-frame{ + width: 100%; + height: 92rpx; + +} +.xc-coupon-frame .work-frame{ + width: 100%; + height: 100%; + border-bottom:3rpx solid #eee; + padding: 0 26rpx; + background-color: white; +} +.xc-right{ + width:20rpx; + height:20rpx; + border-top:2rpx solid #000; + border-right:2rpx solid #000; + transform:rotate(45deg); + display:inline-block; +} + +.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } +.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } + +/* 自定义弹出窗口 */ +.cx-popup{ + width:100%; + height:880rpx; + background: #fff; + z-index: 35; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + position:fixed; + bottom:0; + left: 0; + /* padding-bottom: 25rpx; */ +} + +.cx-popup .top{ + width:95%; + height:100rpx; + border-bottom:3rpx solid #ddd; + margin: auto; + margin-top: 30rpx; + +} +.xc-top-content{ + width: 93%; + height:85rpx; + padding-top: 30rpx; + font-size: 34rpx; + font-weight: 600; + +} + + +.xc-valid-coupon{ + width: 90%; + height:40rpx; + padding-top: 24rpx; + overflow: hidden; +} +.xc-frame{ + width: 100%; + height:60%; +} + +.xc-frame .list-frame{ + width: 95%; + height: 100%; + overflow-y:scroll; + +} +.xc-close-frame{ + margin-top:-10rpx; + +} + +.xc-close{ + width: 37rpx; +height: 37rpx; +border-radius: 50%; +border: 3rpx solid #333; +text-align: center; +line-height: 34rpx; +font-size: 29rpx; +color: #333; + +} +.xc-money{ + color: #af2346; + font-size: 35rpx; +} + +.xc-money-frame{ + margin-left:35rpx; + +} +.xc-coupon-effect{ + width: 99%; + min-height: 100rpx; + border-bottom:3rpx solid #ddd; + + +} +.xc-goods-coupon{ + width: 85%; + height:100%; + +} +.xc-title{ + width:50%; + margin-left:222rpx; + +} +.xc-coupon-money0{ + color: #c91e31; + font-size: 35rpx; + line-height: 40rpx; + +} +.xc-coupon-money{ + color: #c91e31; + font-size: 35rpx; + line-height: 40rpx; + padding-top: 10px; + +} +.xc-coupon-money1{ + color: #444; + font-size: 28rpx; + line-height: 60rpx; + + +} +.xc-coupon-time{ + height: 50rpx; + font-size: 27rpx; + color: #a4a4a4; +} +.xc-coupon-time .time{ + margin-left: 15rpx; + font-size: 27rpx; +} +.xc-coupon-selection{ + height:100%; +} + +.xc-confirm { + width: 50%; + border-radius: 50rpx; + height: 80rpx; + margin:0 auto; + background:#d60021; + color:#fff; + font-size:28rpx; + margin-top: 28rpx; +} + +.up{ animation: up .7s; } +.down{ animation: down 1s; } +@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } } +@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } } + +.xc-not-Selection{ + width: 40rpx; +height: 40rpx; + background: #eeeeee; +} + + +.xc-close-express{ + width: 40rpx; +height: 40rpx; +border-radius: 50%; +border: 3rpx solid #333; +text-align: center; +font-size:32rpx; +line-height: 38rpx; +color: #333; +margin-top: 5rpx; +} +.cx-popup .tops{ + width: 100%; +height: 145rpx; +border-bottom: 3rpx solid #eee; + +} +.top-content { + width: 82%; +padding-top: 33px; +height: 100%; +padding-left: 40rpx; +} +.close-frame{ + margin-top: 30rpx; + +} + +.xc-hook { +width: 33rpx; +height: 33rpx; +transform: rotate(-135deg); +line-height: 35rpx; +text-align: center; +margin-right: 20rpx + + +} +.xc-hooks { +width: 30rpx; +height: 30rpx; +border: 1rpx solid #999; +margin-right: 20rpx; +} +.express_list_frame{ + display: flex; +height: 80rpx; +align-items: center; +padding-left: 40rpx; +border-bottom: 1rpx solid #eee; + +} +.express_list{ + width: 100%; + height: 65%; + overflow-y: auto; + margin-bottom: 40rpx; + +} +.xc-confirms { + box-sizing: border-box; + width: 40%; + border-radius: 50rpx; + height: 80rpx; + margin:0 auto; + font-size:28rpx; + background: #fff; + color: #333; + border: 2rpx solid #333; +} + + +/* 优惠券的改版样式 */ +.xc-coupon-frame{ + /* width: 710rpx; */ + width: 100%; + height:auto; + margin: 0 auto; + +} +.xc-coupon-frame .coupon-frame{ + width: 100%; + height: 200rpx; + margin-top:10rpx; + border-bottom: 1rpx solid #eee; + +} +.xc-coupon-frame .coupon-frame .coupon-left{ + width: 215rpx; + height:100%; + overflow: hidden; +} +.xc-money-frames{ + width:96%; + margin-top: -10px; +} + +.xc-rmb-symbol{ + font-size:40rpx; + +} + +.xc-rmb-val{ + font-size:60rpx; + +} +.coupon-explain{ + font-size:25rpx; +width:100%; + + +} +.xc-valuer{ + margin-top:39rpx; + margin-left:28rpx; + font-size:25rpx; +} +.coupon-frame .oval{ + width:155rpx; + height:83rpx; + border-radius: 50%; + right:-78rpx; + top:-37rpx; +} +.coupon-right{ + /* width:490rpx; */ + height: 99%; + border-top: 1rpx solid #eaeaea; + /* //border-bottom: 1rpx solid #eaeaea; */ + border-right: 1rpx solid #eaeaea; + flex-grow: 1; +} +.coupon-annotation{ + width: 95%; + height: 100%; + +} +.xc-brand{ + width:100rpx; + height:35rpx; + line-height: 35rpx; + font-size:21rpx; + border-radius:10rpx; position: relative; top:-1px; + margin-right: 8rpx +} +.top-frame{ + width:82%; + height: 75rpx; + margin-top:10rpx; +} +.top-frame .coupon-wode{ + font-size: 25rpx; + margin-left:10rpx; + width:340rpx; + height:88rpx; +} +.coupon-code{ + width:60rpx; + height:60rpx; + margin-top:5rpx; + +} +.frame{ + width: 100% +} +.coupon-time{ + font-size: 23rpx; + line-height:33rpx; + color: #333; +} + +.clik-get{ + width:125rpx; + height:45rpx; + border-radius: 25rpx; + line-height: 45rpx; + font-size:25rpx; + bottom:67rpx; + right:6px; +} + +.code-img{ + margin-left:20rpx; +} +.bottmo-explain{ +top:145rpx; +width:94%; +border-top:1rpx dashed #eee; +padding-top:8rpx; +height:38rpx; +line-height: 51rpx; + +} +.font-word{ + font-size: 22rpx; +} +.circle-size{ + background: #a0a0a0; + width: 27rpx; + height: 27rpx; + margin-top:13rpx; +margin-left:8rpx; +display: flex; + +align-items: center; +} +.xc-jiantou{ + /* width: 9rpx; + height: 9rpx; */ + /* border-top: 2rpx solid #fff; + border-right: 2rpx solid #fff; */ + transform: rotate(-90deg); + color: #fff; + font-size: 15rpx; + /* display:inline-block; + margin-top: 6.5rpx; */ + text-align: center; +width: 24rpx; +} +.xc-buttom{ + box-sizing: border-box; + width:100%; + min-height:76rpx; + height:auto; + line-height:40rpx; + border-left:1rpx solid #eee; + border-right:1rpx solid #eee; + border-bottom:1rpx solid #eee; +/* margin-left: 6rpx; */ +} + +.goods-num{ + font-size: 28rpx; + color: #333; +} + +.explain-coupon{ + font-size:25rpx; + padding: 10rpx 10rpx +} +.circle-frame{ + width: 20rpx; + height: auto; + z-index:1; + left:210rpx; + +} +.circle-sawtooth{ + width: 11rpx; + height: 11rpx; + background: #fff; +} + +.red{background-color: #fe7496;} +.green{ background-color: #22c7c1;} +.blue{background-color:#5e82e3;} +.g_gray{background-color: #aaaaaa} + +.f_text{text-align: center; height:96rpx; } +.xc-hook.sn { + margin-top:12%; +width:45rpx; +height:45rpx; +font-size:28rpx; +line-height:44rpx; + + +} +.xc-hooks.on{ + margin-top:12%; +width:42rpx; +height:42rpx; +} +.may_use_coupon{ + /* width: 95%; */ + /* height: 68rpx; */ + line-height:78rpx; + padding: 0 26rpx; + justify-content: space-between; + align-items: center; +} +.determine-frame{ + width: 100%; + height: 130rpx; + +} +.xc-determine{ + height: 80rpx; + width: 40%; + border-radius: 50rpx; +background: #d60021; +color: #fff; +font-size: 28rpx; +margin: 0 auto; + +} +.click-buttem{ +width: 90%; +margin: auto; +} +.logistics-name{ + margin-right:20rpx; +} +.xc-border{ + border-top:8rpx solid #eee; +width: 100% +} +.main-top{ +margin-top: 20rpx; + +} +.xc-hookts{ +border: 1rpx solid #999; + +} +.xc-hookts.on{ + width:30rpx; +height:30rpx; + +} +.xc-hookt.sn{ + width: 32rpx; +height: 32rpx; +font-size: 28rpx; +line-height: 34rpx; +} +.xc-hookt{ + transform: rotate(-135deg); +text-align: center; + +} +.main-bottom{ + margin-bottom: 20rpx; + +} +.xc-hookst{ + border: 1rpx solid #999; + +} +.xc-hookst.ons{ + width: 42rpx; +height: 42rpx; +margin-left: 20rpx; + +} +.is_use_coupon{ + width: 65%; +justify-content: flex-end; +padding-top: 10rpx; + + +} +.xc-hooka{ + transform: rotate(-135deg); +text-align: center; + +} +.xc-hooka.sn{ + width: 45rpx; +height: 45rpx; +font-size: 28rpx; +line-height: 44rpx; +margin-left: 20rpx; + +} +.color-gray{ + color: #808080; +} +.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } +.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} + +.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;} + +.navigator-hover { + background: none; + opacity: 1; +} + + +.plus_buy{ + background-color: #fff; + margin:15rpx 0; + padding: 20rpx 10rpx; + position: relative; +} + + +.card_bg { + box-sizing: border-box; + padding: 2rpx 10rpx; + height: 28rpx; + border-radius: 26rpx; + font-size: 18rpx; + line-height: 28rpx; + max-width: 210rpx; + background: #333; + color: #fff; + margin-left: 8rpx; + position:relative; + top:7rpx; +} + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; +} + +/* .card_bg .card_name { + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space: nowrap; +} */ + +.card_name { + position: relative; + top: -4rpx; + margin-left: 6px; +} + +.car_tri_up { + width: 0;height: 0; + border-left: 20rpx solid transparent; + border-right: 20rpx solid transparent; + border-bottom: 20rpx solid #fff; + position: absolute; + right: 20rpx; + top:-10rpx +} +.card_op{ + position: absolute; + right: 20rpx; + top:36rpx +} + + +.tab-container { + font-size: 28rpx; + margin-top: 20rpx; + display: flex; +} + +.tab-wrapper { + background-color: #ccc; + display: flex; + border-radius: 40rpx; + overflow: hidden; +} + +.tab { + padding: 20rpx 30rpx; + +} + + +.tab.active { + background-color: white; + border-radius: 40rpx; +} + diff --git a/packageE/pages/cart/cart2_inte/filter.wxs b/packageE/pages/cart/cart2_inte/filter.wxs new file mode 100644 index 0000000..c0e8d13 --- /dev/null +++ b/packageE/pages/cart/cart2_inte/filter.wxs @@ -0,0 +1,11 @@ +var format = function (text) { + if (!text) { + return + } + var reg = getRegExp('\\\\n', 'g') + return text.replace(reg, '\n') +} + +module.exports = { + format: format +} diff --git a/pages/cart/cart2_inte/c_filter.wxs b/pages/cart/cart2_inte/c_filter.wxs deleted file mode 100644 index 7216131..0000000 --- a/pages/cart/cart2_inte/c_filter.wxs +++ /dev/null @@ -1,67 +0,0 @@ -var filters = { - toFix:function(val,count){ - return val.toFixed(count) - }, - format_time:function(ts,isFull) { - var d = getDate(ts*1000) - var fm=[d.getFullYear(), d.getMonth()+1, d.getDate()].join('-'); - if(isFull==1) - fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') - return fm; - }, - setcolor:function(ind){ - if (ind == 0 || ind ==null) return "red"; - if(ind==1 ) return "green"; - if(ind==2) return "blue"; - if(ind==11) return "green"; - if(ind==12) return "blue"; - if(ind==20) return "green"; - return ""; - }, - setbgcolor: function (ind) { - if (ind == 0 || ind == null) return "#ffa1b9"; - if (ind == 1) return "#59e1d2"; - if (ind == 2) return "#a3bcff"; - if (ind == 11) return "#59e1d2"; - if (ind == 12) return "#a3bcff"; - if (ind == 20) return "#6d87cd"; - return ""; - }, - - get_type:function(ind){ - if (ind == 0 || ind == null) return "全场通用"; - if (ind == 1) return "品牌"; - if (ind == 2) return "品类"; - if (ind == 11) return "用途"; - if (ind == 12) return "分类1"; - if (ind == 20) return "指定单品"; - return ""; - }, - get_type_card:function(ind){ - if (ind == 0 || ind == null) return "全场通用"; - if (ind == 1) return "指定品牌"; - if (ind == 2) return "指定品类"; - if (ind == 11) return "指定用途"; - if (ind == 12) return "指定分类1"; - if (ind == 20) return "指定单品"; - return ""; - }, - format_huiche:function (text) { - if (!text) { - return ""; - } - var reg = getRegExp('\\\\n', 'g') - return text.replace(reg, '\n') - } -} - -module.exports = { - toFix: filters.toFix, - format_time:filters.format_time, - setcolor:filters.setcolor, - setbgcolor: filters.setbgcolor, - get_type: filters.get_type, - get_split_name: filters.get_split_name, - get_type_card: filters.get_type_card, - format_huiche: filters.format_huiche, -} \ No newline at end of file diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js deleted file mode 100644 index a0e5362..0000000 --- a/pages/cart/cart2_inte/cart2_inte.js +++ /dev/null @@ -1,1639 +0,0 @@ -var t = getApp(), app = t, a = t.request, e = require("../../../utils/common.js"), - s = require("../../../utils/util.js"), ut = s, o = require("../../../utils/md5.js"), to = getApp(); -var oo = t.globalData.setting, os = oo; -var regeneratorRuntime = require('../../../utils/runtime.js'); -var util_pay = require("../../../utils/pay.js"); - -Page({ - data: { - url: t.globalData.setting.url, - imgUrl: t.globalData.setting.imghost, - goods: null, - order: null, - orderPrices: null, - coupons: null, - coupon: null, - invoiceToggle: !0, - payWithUserMoney: !0, - payWithPoints: !0, - maxWord: 0, - enterAddressPage: !1, - firstEnter: !0, - //页面获取的参数 - param: null, - //提交订单的格式 - formData: { - order_amount: 0,//支付金额 - total_amount: 0,//总价 - all_price: 0,//商品卖的总价 - pay_points: 0,//使用积分 - user_money: 0,//使用余额 - couponCode: "",//使用优惠券(多单就用逗号隔开) - shipping_price: 0,//物流费用 - }, - inv_is_post:0,//积分购是否包邮 - - /*----------------立即购买---------------------*/ - is_b_now: 1, //0是购物车结算 1立即购买 - bn_goods: null, //立即购买时候的调用商品 - bn_use_money: 0,//是否使用余额 - bn_exp_type: 1, //0是物流 1自提 - bn_pick: 0, //选择的门店 - bn_pickname: "", //选择的门店名称 - bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 - - bn_is_order_yh: 1, //是不是订单优惠 - bn_is_post_temp: 1, //是不是进行计算包邮模板 - - bn_plus_cut_price: 0, //显示等级卡会优惠多少钱 - /*------------------------*/ - user_addr: null,//物流 - userinfo: null, //获取会员 - /*----------物流选择--------*/ - wu_arr: null, - index: 0, - w_sele_index: 0, - - //判断页面是返回回来的还是 首次进入的 - isclose: 1, - //申请提现的金额 - txmon: 0, - yuer: 0, - //提交中，不重复提交 - is_summit_ing: 0, - - disabled: 0, - open_express: 0,//控制选择物流名列表 的属性 - - is_express: 0, //选中物流的属性 - expres_name: "", //点击选定 - is_shipping_code: "",//插入用户默认地址 - wu_arr_txt: "", //要更新的物流的字段 - - //如果是全场包邮了，或者是全场不包邮了，就不要选包邮券 - is_no_by: {}, - is_by: {}, - is_quan_by: {}, - //--购买赠送的商品-- - buy_now_gift_goods: null, - //--订单优惠-- - order_prom: {}, - show_submit: 0, //提交按钮变正常显示 - udata: null,//用户预存值，数据 - is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 - - same_ok:1, //同城配送的控制，默认ok - }, - onLoad: function (t) { - wx.setNavigationBarTitle({ title: "填写订单", }) - var th = this; - th.data.param = t; - //清空is_pick_up - getApp().request.put("/api/weshop/useraddress/updatePickUp", { - data: { user_id: getApp().globalData.user_id, is_pickup: 0 }, - success: function (s) { - } - }); - - //先获取是否有关闭使用优惠券 - getApp().getConfig2(function (ee) { - var json_d = JSON.parse(ee.switch_list); - - //测试强行写死，后面一定要删除 - //json_d.pickupway=2; - - th.data.json_d = json_d; - th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 - var is_default_logistics = json_d.is_default_logistics; - var is_same_city = json_d.is_same_city; - th.setData({is_pre_cut:json_d.is_pre_cut, is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, - rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics,is_same_city:is_same_city }); - - var rank_switch = json_d.rank_switch; - var max_price = -1; - var show_card = null; - var name = ""; - //如果有开等级卡的时候, - //因为都是调接口，要返回在计算 - if (rank_switch == 2) { - //-- 获取所有的等级卡, -- - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, - {}).then(res => { - if (res.data.code == 0) { - var plusCard = res.data.data; - //-- 循环判断，拿到最贵的那张卡 -- - for (var ih in plusCard) { - if (plusCard[ih].IsStopBuy == true) { continue; } - if (max_price < 0) { - max_price = plusCard[ih].CardFee; - name = 'card' + plusCard[ih]['CorrPrice']; - show_card = plusCard[ih]; - } else { - if (max_price < plusCard[ih].CardFee) { - max_price = plusCard[ih].CardFee; - name = 'card' + plusCard[ih]['CorrPrice']; - show_card = plusCard[ih]; - } - } - } - - if (show_card) { - name = name.toLowerCase(); - th.setData({ card_name: name, show_card: show_card }) - } - } - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - }) - } else { - //-----先获取物流，再获取用户信息，再展示页面----- - th.get_wuliu(th.get_info(th.show_page)); - } - }, 1); - - - //判断是不是佣金抵扣 - getApp().is_distribut(this); - - - }, - onUnload: function () { this.setData({ isclose: 1 }) }, - onHide: function () { - this.setData({ - is_no_by: {}, - is_by: {} - }) - }, - - //----------子页返回父页触发---------- - onShow: function () { - - var fy=ut.fy_back('',1,function (){ - var cps = getCurrentPages(); - if (cps.length > 1) { - wx.navigateBack({ delta: 1 }) - } else { - getApp().goto("/pages/index/index/index"); - } - }); - - if(fy) return false; - - util_pay.set_fir(); - - var th = this; - th.data.g_cart_q_time = null; - - if (th.data.isclose == 0) { - wx.navigateTo({ - url: "/pages/index/index/index" - }) - - } else { - this.getuser_addr(function (ie) { - - //th.data.prom_goods_map={}; - //更换地址回来要重新调用计算价钱的接口 - if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { - th.setData({ user_addr: ie }); - if (th.data.is_b_now == 1) { - if (th.data.bn_goods) { - th.setData({ add_back: 1 }); - th.calculatePrice2(); - } - } - } else { - th.setData({ user_addr: ie }); - } - var going = 0; - - }); - //--更新默认地址--,看一下是不是跳到地址页面 - if (!getApp().globalData.is_cart_old) { - this.update_code(); - } else { - getApp().globalData.is_cart_old = 0; - } - } - - }, - //获取预存款余额 - async getAdvancesum() { - /*-----获取线下会员的预存款和优惠券的数量-----*/ - let url = "/api/weshop/users/getinfo/" + os.stoid + "/" + getApp().globalData.userInfo.user_id - await getApp().request.promiseGet(url, { - data: { - isShowLoading: 0, - }, - }).then(su => { - if (su.data.code == 0 && su.data.data) { - var data = su.data.data; - if (!data) data = {}; - data.cashcount = parseInt(data.cashcount); - this.setData({ - udata: data, - }); - } - }) - - }, - //购物车预存开启关闭 - prestore(e) { - let ind = e.currentTarget.dataset.ind; - let item = e.currentTarget.dataset.item - let txt = 'cartlist[' + ind + '].yck_off'; - let txt1 = 'old_cartlist[' + ind + '].yck_off'; - if (item.yck_off == 2) { - this.setData({ [txt]: 1, [txt1]: 1 }) - } else if (item.yck_off == 1) { - this.setData({ [txt]: 2, [txt1]: 2 }) - } - this.calculatePrice()//计算金额 - }, - //直接购买预存开启关闭 - prestore2() { - let txt = 'bn_goods.yck_off'; - if (this.data.bn_goods.yck_off == 2) { - this.setData({ [txt]: 1 }) - } else if (this.data.bn_goods.yck_off == 1) { - this.setData({ [txt]: 2 }) - } - this.calculatePrice2()//计算金额 - }, - //计算商品预存款前置方法------------------------------------ - async beforAdvancesum(cartList) { - // let cartList= this.data.cartlist - // let cartList= arr - // let length = cartList.length - if(!this.data.is_pre_cut){ - return {} - } - wx.showLoading({ - title: '加载中', - mask: true - }) - // for (let i = 0; i < length; i++) { - let item = cartList; - let goods = item.goods - let keyid = item.sto.keyid - let listform = [] - goods.map(ite => { - let obj = { - wareno: ite.goods_sn, - price: ite.goods_price, - qty: ite.goods_num - } - listform.push(obj) - }) - let arr = await this.getGoodsAdvancesum(keyid, listform, cartList) - // } - wx.hideLoading() - return arr - }, - //计算商品预存款请求方法------------------------------------ - async getGoodsAdvancesum(storageid, listform, cartList) { - if(!getApp().globalData.config){ - await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{ - }).then(res=>{ - if(res.data.code==0){ - getApp().globalData.config = res.data.data - } - }) - } - if(!getApp().globalData.config) return false; - - let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { - data: { - accdb: getApp().globalData.config.erpid, - ApiName: 'api.pos.shop.advancesum.seek', - usercode: "admin", - vipid: this.data.userinfo.erpvipid, - oddsum: "0", - advancesum: cartList.order_amount, - storageid: storageid, - listform - }, - is_json: 1 - }) - console.log('计算商品的预存款'); - console.log(res); - let yck = 0 - let yckid = "" - let yckIdArr = [] - let pre_json = null - if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { - let resData = res.data.data - resData.map(ite => { - yck += ite.advancesum*1 - yckIdArr.push(ite.advanceitemid) - }) - pre_json = resData - } - yckid = yckIdArr.join() - let obj = {} - if (yck * 1 > 0) { - obj.yck_off = 1 - } else { - obj.yck_off = 0 - } - obj.yck = yck.toFixed(2) - obj.yckid = yckid - obj.pre_json = pre_json - return obj - }, - //-------------------获取物流--------------- - get_wuliu(func) { - var th = this; - to.getwuliu(function (e) { - if (th.data.is_default_logistics) { - //如果第一个不是开启默认，说明要让用户自己选 - if (!e[0].is_default) { - th.setData({ is_default_logistics: 0 }); - } - } - th.setData({ wu_arr: e }) - typeof func == "function" && func(); - }) - }, - //------获取会员信息-----先获取用户信息，在进行下一步--- - get_info: function (func) { - var user_id = t.globalData.user_id; - to.auth.get_u(func); - }, - - //------获取会员收货地址----- - getuser_addr: function (func) { - var th = this; - a.get("/api/weshop/useraddress/page", { - data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600, t: Math.random() }, - success: function (su) { - - var item = null; - if (su.data.code == 0 && su.data.data && su.data.data.pageData) { - var user_addr = su.data.data.pageData; - var def_item = null; - for (var i = 0; i < user_addr.length; i++) { - if (user_addr[i]['is_default'] == 1) { def_item = user_addr[i]; } - if (user_addr[i]['is_pickup'] == 1) { item = user_addr[i]; } - } - - if (item == null) item = def_item; - if (item == null) item = user_addr[0]; - } - - if (item == undefined) item = null; - if (!item) th.setData({ user_addr: null }); //地址为空的时候，要清空，因为返回的时候，有缓存 - func(item); - } - }); - }, - - //----------------展示页面,是再获取用户信息之后-------------- - show_page:async function () { - var th = this, ta = this.data.param; - //th.setData({ userinfo: getApp().globalData.userInfo,}); - //获取用户预存款 - await th.getAdvancesum() - - var user = getApp().globalData.userInfo; - getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, { - data: { r: Math.random() }, - success: function (e) { - - getApp().globalData.userInfo = e.data.data; - th.setData({ userinfo: e.data.data }); - - //选获取地址 - th.getuser_addr(function (addr) { - th.setData({ user_addr: addr }); - //--------------------------立即购买------------------ - if (ta.is_bnow == 1) { - //读取门店 - to.get_allsto(function (e) { - th.setData({ allsto: e }); - //获取立即购买的商品信息 - th.get_buy_goods(ta.goods_id); - }); - } - }); - //获取提现金额 - getApp().request.get("/api/weshop/withdrawals/summoney", { - data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 }, - success: function (su) { - if (su.data.code == 0) { - var yuer = parseFloat(th.data.userinfo.user_money - - (th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(2); - th.setData({ txmon: su.data.data.summoney, yuer: yuer }); - } - } - }); - - }, - }) - - - }, - - //-----获取立即购买的商品信息，入口---- - get_buy_goods: function (e) { - var th = this; - var gg = to.get_b_now(); - //--------如果goods_id一样，就是要立即购买----- - if (e == gg.goods_id) { - a.get("/api/weshop/goods/get/" + oo.stoid + "/" + e, { - success: async function (t) { - var gd = t.data.data; - if (!gd) return false; - - //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- - if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ - - await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{ - if(res.data.code==0){ - var pk=res.data.data; - if(pk && pk.is_same_city){ - th.setData({show_same_city:1}) - } - } - - }) - - } - - - t.data.data.original_img = oo.imghost + t.data.data.original_img; - t.data.data['buynum'] = gg.goods_num; - var distr_t = 0, et = 0 - - if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ - - if(t.data.data.distr_type==1 || gg.pick_dis==1) { - wx.showToast({ - title: "视频号仅支持物流", - icon: 'none', - duration: 2000 - }) - - setTimeout(function(){ - wx.navigateBack({delta: 1}) - },1000) - - - return false - } - - t.data.data.distr_type=2; - th.setData({show_same_city:0}) - - } - - if (t.data.data.distr_type == 0) { - distr_t = gg.pick_dis; - } else { - distr_t = t.data.data.distr_type; - } - switch (distr_t) { - case 0: - et = 1; - //-- 系统后台有设置要默认的 -- - if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) et = 0; - break; - case 1: et = 1; break; - case 2: et = 0; break; - } - - if(th.data.show_same_city==1 && th.data.json_d.pickupway && th.data.json_d.pickupway == 2 ){ - et = 2; - } - - - if (th.data.bn_goods) et = th.data.bn_exp_type - - var m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - if (et == 0 && def_exp_code && !th.data.is_default_logistics) { - for (var k = 0; k < th.data.wu_arr.length; k++) { - var item = th.data.wu_arr[k]; if (def_exp_code == item.code) { m_wind = k; } - } - } - - //---是不是购买等级卡成功的返回---等级卡显示的判断--- - var is_card_back = getApp().globalData.is_card_back; - if (is_card_back) { - th.data.card_name = th.data.userinfo.card_field; - gg.goods_price = gd[th.data.card_name]; - getApp().globalData.is_card_back = 0; - th.setData({ card_cut_price: 0 }); - //如果是秒杀的返回 - if (gd.prom_type == 4) gd.prom_type = 0; - } else { - //--- 商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 - //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 -- - if (!gg.collocation_goods && gd['prom_type'] != 6 && th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo.card_field) { - var cut_p = (gg.goods_price - gd[th.data.card_name]) * gg.goods_num; - th.setData({ card_cut_price: cut_p }); - } - } - - - if(gg.prom_type==4){ - gd.prom_type =4; - gd.prom_id = gg.prom_id; - } - - switch (gd.prom_type) { - case 0: - case 2: - case 3: - case 5: - case 6: - getApp().my_warnning("商品不是积分活动", 0, th); - wx.navigateBack(); - break; - case 4: //-- 积分购 -- - getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { - data: { store_id: os.stoid, goods_id: gg.goods_id, user_id: to.globalData.user_id, }, - success: async function (tt) { - if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) { - var inte_data = tt.data.data.pageData[0]; - t.data.data.shop_price = inte_data.addmoney; - t.data.data.integral = inte_data.integral; - - //-- 计算获得佣金的金额 -- - if (getApp().globalData.userInfo.is_distribut - && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { - var c_num = getApp().get_commission2(th.data.dis_config,inte_data, gg.goods_num); - t.data.data.use_commission = c_num; - - } - - - if (inte_data.is_order_yh) { - th.data.bn_is_order_yh = 1; - } else { - th.data.bn_is_order_yh = 0; - } - - if (inte_data.is_post_temp) { - th.data.bn_is_post_temp = 1; - } else { - th.data.bn_is_post_temp = 0; - } - - - - th.setData({ - bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, index: m_wind, - bn_pick: gg.pick_id, bn_t_exp_t: distr_t, bn_exp_type: et,inv_is_post:inte_data.is_post - }); - //计算价格 - th.calculatePrice2(); - } else { - getApp().my_warnning("商品不是积分活动", 0, th); - wx.navigateBack(); - } - } - }); - break; - } - }, - }); - } - }, - - //---------------检查是否有收货地址------------------- - checkAddressList: function () { - var t = this; - return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({ - title: "请先填写或选择收货地址~", - success: function (a) { - a.confirm ? t.enterAddressPage() : wx.navigateBack(); - }, - fail: function () { - wx.navigateBack(); - } - }), !1); - }, - showInvoice: function () { - this.setData({ - invoiceToggle: !this.data.invoiceToggle - }); - }, - keyUpChangePay1: function (t) { - this.setData({ - payWithUserMoney: !(t.detail.value.length > 0) - }); - }, - keyUpChangePay2: function (t) { - this.setData({ - payWithPoints: !(t.detail.value.length > 0) - }); - }, - keyUpChangeNum: function (t) { - this.setData({ - maxWord: t.detail.value.length - }); - }, - - - //---------计算立即购买---------- - //---------计算立即购买---------- - calculatePrice2:async function () { - var th = this, good = this.data.bn_goods; - - this.setData({submit:1}) - wx.showLoading({ title: "处理中.", mask:true }) - //-----------计算商品总价-------------- - var allpice = good.shop_price * good.buynum; - var all_integral = good.integral * good.buynum; - - var cut_price = 0; - if (good.prom_type == 3 && good.prom_price !== null) { - cut_price = allpice - good.prom_price; - } - allpice = parseFloat(allpice).toFixed(2); - - var txt = "formData.all_price"; - th.setData({ [txt]: allpice, }); - if (cut_price) { - var c_txt = "formData.cut_price"; - th.setData({ [c_txt]: cut_price, }); - } - - - //-- 把订单优惠的判断提前，bn_is_order_yh是确定要不要订单优惠的控制 -- - var condition = parseFloat(allpice-cut_price).toFixed(2); - var ord_prom = null; - var is_ord_prom_post = 0; - - if (condition > 0 && th.data.bn_is_order_yh && !th.data.bn_goods.whsle_id) { - await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { - data: { store_id: os.stoid, orderAmount: condition, user_id: getApp().globalData.user_id } - }).then(res => { - if (res.data.code == 0) { - var data = res.data.data; - ord_prom = data; - } - }) - if (ord_prom && ord_prom.is_post_temp) { - is_ord_prom_post = 1; - } - } - - - - //to.getwuliuprice(async function (rs) { - - var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; - var out_of_weight = null; //超出多少重量 - - //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- - if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past != 1 && !th.data.inv_is_post) { - - var user_addr=th.data.user_addr; - var req_d = { - province: user_addr.province, city: user_addr.city, district: user_addr.district, - wuliu: parseFloat(allpice).toFixed(2), store_id: os.stoid - } - var back_data = null; - //判断是不是包邮模板,bn_is_post_temp 和 订单优惠的包邮模板一起控制 - if (th.data.bn_is_post_temp && (!ord_prom || is_ord_prom_post)) { - await getApp().request.promisePost("/api/weshop/order/areaFreight", { - is_json: 1, data: req_d - }).then(rs => { - if (rs.data.code == 0) back_data = rs.data.data; - }); - } - - var gd_arr_list = []; - gd_arr_list.push(good); - var cut_good_weight = 0; - for (let i in gd_arr_list) { - let item = gd_arr_list[i]; - - if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) { - - if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) { - if (goods_weight < 0) goods_weight = 0; - goods_weight += item['weight'] * item['buynum']; - cut_good_weight += item['weight'] * item['buynum']; - } - if (back_data.weight_free > 0) { - out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; - } - continue; - } - - switch (item['exp_sum_type']) { - case 1: - //统一运费 - o_shipping_price += item['uniform_exp_sum']; - break; - case 2: - if (goods_weight < 0) goods_weight = 0; - //累积商品重量 每种商品的重量 * 数量 - goods_weight += item['weight'] * item['buynum']; - - if (back_data && back_data.is_by_all && !back_data.no_free_goods) { - cut_good_weight += item['weight'] * item['buynum']; - if (back_data.weight_free > 0) { - out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; - } - } - break; - case 3: - if (goods_piece < 0) goods_piece = 0; - //累积商品数量 - goods_piece += item['buynum']; - break; - } - } - - //如果是正值的时候 - if (out_of_weight >= 0) out_of_weight = -cut_good_weight; - else out_of_weight = -back_data.weight_free * 1000; - - var code = ""; - if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; - //--------------开始计算物流------------------ - var shipping_price=0; - // var shipping_price = ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, - // goods_piece, th.data.user_addr, back_data, rs); - - var w_data={ - store_id:os.stoid, code:code, - o_shipping_price:o_shipping_price, - goods_weight:goods_weight, - out_of_weight:out_of_weight,goods_piece:goods_piece, - user_addr_province:th.data.user_addr.province, - user_addr_city:th.data.user_addr.city, - user_addr_district:th.data.user_addr.district, - is_by_all:back_data && back_data.is_by_all?1:0, - no_free_goods:back_data && back_data.no_free_goods && back_data.no_free_goods.length>0?1:0, - } - - var is_ok=0; - await getApp().request.promisePost('/api/weshop/order/getOrderWuLiPrice', {data:w_data,is_json:1}).then(res=>{ - if(res.data.code==0){ - shipping_price=res.data.data; is_ok=1; - } - }) - - if(!is_ok){ - wx.hideLoading(); - wx.showToast({ - title: "计算物流错误", icon: 'none',duration: 2000 - }) - - return false; - } - - - if (shipping_price <= 0) { - th.data.is_by[th.data.bn_pick] = 1; //已经是包邮了，就不要选择包邮券 - } - - shipping_price = parseFloat(shipping_price).toFixed(2); - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: shipping_price, }) - - } else if(th.data.bn_exp_type == 1 ) { - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: 0, }) - } - //---如果有选择优惠券的情况下--- - var quan_price = 0, bn_pick = th.data.bn_pick; - - //-----------------支付价,优惠券不减物流----------------- - var total_m = (parseFloat(allpice)).toFixed(2); - var order_m = (parseFloat(allpice - cut_price) - quan_price).toFixed(2); - var coupon_price = quan_price; //优惠券优惠了多少钱 - if (order_m < 0) { - order_m = 0; coupon_price = parseFloat(order_m).toFixed(2); - } - - //--看一下有没有订单优惠-- - var o_condition = parseFloat(order_m); - if (th.data.bn_goods.whsle_id > 0) { - o_condition = 0; - } - - var order_prom_amount = 0; - var order_prom_id = 0; - if (ord_prom && o_condition > 0) { - //么有使用券，或者活动没有限制使用优惠券 - if (coupon_price <= 0 || !ord_prom.is_xz_yh) { - order_prom_id = ord_prom['id']; - switch (ord_prom['type']) { - case 0: - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 - order_prom_amount = (o_condition - order_m).toFixed(2); - break; - case 1: - //-- 如果有优惠促销倍减的时候 -- - var bs = 1; - if (ord_prom.is_bz) { - bs = Math.floor(o_condition / ord_prom.money); - } - - order_m = o_condition - bs * ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; - } - } - } - //--订单优惠的显示-- - var order_prom_txt1 = "formData.order_prom_id"; - var order_prom_txt2 = "formData.order_prom_amount"; - if (order_prom_id > 0) { - th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) - } else { - th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) - } - - - - //预存金额使用参与计算 - if (th.data.udata && th.data.udata.Balance > 0 && order_m * 1 > 0) { - if (!th.data.bn_goods.keyid) { - //获取门店信息 - await getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { - store_id: os.stoid, - ids: th.data.bn_pick - } - }).then(res => { - if (ut.ajax_ok(res)) { - console.log(res); - if (res.data.code == 0) { - let resData = res.data.data.pageData - if (resData && resData[0]) { - let keyid = resData[0].keyid - let txt = 'bn_goods.keyid' - th.setData({ - [txt]: keyid - }) - } - } - } - }) - } - if (th.data.bn_goods.keyid) { - let cart_yc = await th.beforAdvancesum({ - order_amount: order_m, - goods: [{ - goods_sn: th.data.bn_goods.goods_sn, - goods_price: th.data.bn_goods.shop_price || th.data.bn_goods.goods_price, - goods_num: th.data.bn_goods.buynum || th.data.bn_goods.goods_num, - }], - sto: { - keyid: th.data.bn_goods.keyid - } - }) - - if (!good.yck_off) { - good.yck_off = cart_yc.yck_off - } - good.yck = cart_yc.yck - good.yckid = cart_yc.yckid - good.pre_json = cart_yc.pre_json - let yct1 = 'bn_goods.yck_off'; - let yct2 = 'bn_goods.yck'; - let yct3 = 'bn_goods.yckid'; - let yct4 = 'bn_goods.pre_json'; - th.setData({ - [yct1]: good.yck_off, - [yct2]: good.yck, - [yct3]: good.yckid, - [yct4]: good.pre_json, - }) - - if (good.yck_off && good.yck_off == 2) { - let order_amount = (order_m - good.yck).toFixed(2); - let yck = 0 - if (order_amount * 1 > 0) { - order_m = order_amount; - // all_prestore+=parseFloat(good.yck); - yck = parseFloat(good.yck) - } else { - // all_prestore+=order_m*1 - yck = parseFloat(order_m) - order_m = 0 - } - let atxt10 = "formData.prestore"; //预存金额 - let atxt11 = "formData.pre_json"; //预存json - let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表 - th.setData({ - [atxt10]: yck, - [atxt11]: [good.pre_json], - [atxt12]: [yck], - }) - // formData.prestore - // all_yck_arr.push(yck) //真实预存款抵扣金额 - // all_pre_json.push(good.pre_json) - // all_prestore = parseFloat(all_prestore); //真实预存款抵扣金额总和 - } - } - } else { - let yct1 = 'bn_goods.yck_off'; - let yct2 = 'bn_goods.yck'; - let yct3 = 'bn_goods.yckid'; - let yct4 = 'bn_goods.pre_json'; - let atxt10 = "formData.prestore"; //预存金额 - let atxt11 = "formData.pre_json"; //预存json - let atxt12 = "formData.all_yck_arr"; //预存真实抵扣列表 - th.setData({ - [yct2]: 0, - [yct3]: '', - [yct4]: '', - [atxt10]: 0, - [atxt11]: '', - [atxt12]: [], - }) - } - - //判断是否同城配送,而且没有调用过 - if(th.data.bn_exp_type==2 && th.data.user_addr) { - - var lon=0;var lat=0; - //-- 获取距离 -- - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} - }).then(res=>{ - if(res.data.code==0){ - var data= JSON.parse(res.data.data); - if(data.status==0){ - lon=data.result.location.lng; - lat=data.result.location.lat; - } - } - }) - - - var gd_w = good['weight'] * good['buynum']; - //-- 获取距离 -- - var req_data = { - store_id: os.stoid, - order_amount: order_m, - lon: lon, lat: lat, - pickup_id: bn_pick, - goods_weight: gd_w - } - - var is_next=1; - //获取同城配送参数 - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { - is_json: 1, - data: req_data - }).then(res => { - if (res.data.code == 0) { - var wl_txt = "formData.shipping_price"; - th.setData({ [wl_txt]: res.data.data, }) - }else{ - is_next=0; - wx.showToast({ - title: res.data.msg, icon: 'none', duration: 2000 - }) - } - }) - if(!is_next){ - th.setData({show_submit:1, submit: 0,same_ok:0 }) - return false - } - - th.data.lon=lon; - th.data.lat=lat; - th.data.bn_gd_w=gd_w; - th.data.bn_samecity_order_amount=req_data.order_amount; - - } - - - - //--看一下有没有订单优惠--0 - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); - var atxt = "formData.total_amount"; - th.setData({ [atxt]: total_m, }) - - var txt = "formData.user_money"; - var txt2 = "formData.order_amount"; - var txt4 = "formData.integral"; - - - //-- 最后的金额小于佣金 -- - if(parseFloat(order_m) parseFloat(order_m)) { - order_m = parseFloat(order_m).toFixed(2); - th.setData({ [txt]: order_m, [txt2]: 0, [txt4]: all_integral, show_submit: 1,submit:0 }) - } else { - order_m = parseFloat(order_m - amoney); - order_m = order_m.toFixed(2); - th.setData({ [txt]: amoney, [txt2]: order_m, [txt4]: all_integral, show_submit: 1,submit:0 }) - } - } else { - th.setData({ [txt]: 0, [txt2]: order_m, [txt4]: all_integral, show_submit: 1,submit:0}) - } - wx.hideLoading(); - - //}); - - }, - - //--------------------提交订单----------------------- - async submitForm(t) { - var sub_value = t; - this.setData({submit:1}) - - if (this.data.is_summit_ing == 1) return false; //--提交中退出-- - this.data.is_summit_ing = 1; - var th = this, pdata = new Array(); - var ff = true; - //------------立即购买------------- - if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) { - - if (th.data.bn_exp_type == 0 && th.data.user_addr == null) { - ff = false; getApp().my_warnning("请选择收货地址", 0, th); - th.data.is_summit_ing = 0; - } - if (!ff) return false; - var addr = th.data.user_addr; - if (th.data.bn_exp_type == 1) addr = null; - - if (th.data.bn_exp_type == 0) - if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { - getApp().my_warnning("读取物流失败", 0, th); - th.data.is_summit_ing = 0; - return false; - } - - - var integrals = 0; - var get_datas = { - user_id: getApp().globalData.user_id, store_id: o.stoid, - }; - await getApp().request.promiseGet("/api/weshop/users/getAllPoints", { - data: get_datas - }).then(res => { - if (res.data.code == 0) { - integrals = res.data.data.Integral; - } - }) - - //判断积分的情况 - if (th.data.formData.integral && parseFloat(th.data.formData.integral) < parseFloat(integrals)) { - getApp().my_warnning("积分不足", 0, th); - th.data.is_summit_ing = 0; - return false; - } - - var item = { - 'user_id': to.globalData.user_id, - 'consignee': addr == null ? "" : addr.consignee, - 'province': addr == null ? 0 : addr.province, - 'city': addr == null ? 0 : addr.city, - 'district': addr == null ? 0 : addr.district, - 'twon': addr == null ? 0 : addr.twon, - 'address': addr == null ? "" : addr.address, - 'more_address': addr == null ? "" : addr.more_address, - //'mobile': th.data.userinfo.mobile, - 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile, - 'email': '', - 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code, - 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name, - 'invoice_title': '', - 'goods_price': th.data.formData.all_price, //商品总价 - 'shipping_price': th.data.formData.shipping_price, //物流金额 - 'user_money': th.data.formData.user_money, //使用余额 - 'total_amount': th.data.formData.total_amount, //订单总价 - 'order_amount': th.data.formData.order_amount, //应付 - 'user_note': t.detail.value.user_note, //用户备注 - 'store_id': oo.stoid, //商家 - 'pickup_id': th.data.bn_pick, //门店 - 'exp_type': th.data.bn_exp_type, //配送方式 - 'order_goods': new Array(), - 'integral': th.data.formData.integral, - }; - //是不是重新提交 - if (th.data.is_continue == 1) item.is_continue = 1; - - //-- 如果有使用佣金抵扣的话 -- - if(th.data.bn_use_commission){ - item.use_commission=th.data.bn_goods.use_commission; - } - var order_prom_list = {}; - //--判断有没有优惠活动-- - if (th.data.formData.order_prom_amount > 0) { - order_prom_list.order_prom_id = th.data.formData.order_prom_id; - order_prom_list.order_prom_amount = th.data.formData.order_prom_amount; - } - item.order_prom_list = order_prom_list; - - if(item.exp_type==2){ - item.lon=th.data.lon?th.data.lon:0; - item.lat=th.data.lat?th.data.lat:0; - item.goods_weight=th.data.bn_gd_w; - item.samecity_order_amount=th.data.bn_samecity_order_amount; - } - - - //获取立即购买的商品的信息 - var gg = to.get_b_now(); - //--商品的房间号-- - if (gg.room_id && gg.room_id > 0) { - item.room_ids = gg.room_id; - } - if(gg.groupchat_id && gg.groupchat_id!='undefined'){ - item.groupchat_ids=gg.groupchat_id - } - - //老会员成为分销下线需要的参数 - if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) { - //判断一下分享人是不是分享商 - await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.first_leader, {}).then(res => { - if (res.data.code == 0) { - var user = res.data.data; - if (user.is_distribut == 1) { - item.first_leader = parseInt(getApp().globalData.first_leader); - } - } - }) - } - - - var goods = { - 'goods_id': gg.goods_id, - 'goods_name': gg.goods_name, - 'goods_sn': gg.goods_sn, - 'goods_num': gg.goods_num, - 'market_price': th.data.bn_goods.market_price, - 'goods_price': th.data.bn_goods.shop_price, - 'member_goods_price': th.data.bn_goods.shop_price, - 'store_id': oo.stoid, - 'prom_type': th.data.bn_goods.prom_type, //促销活动类型 - 'prom_id': th.data.bn_goods.prom_id, //促销活动id - }; - - if(getApp().globalData.skinface_id){ - goods.skinface_id=getApp().globalData.skinface_id; - } - - if(th.data.bn_goods.whsle_id){ - item.is_whsle=1; - goods.is_whsle_goods=1; - } - - - //-- 把导购的信息填入-- - if (gg.guide_id) { - goods.guide_id = gg.guide_id; - goods.guide_type = gg.guide_type; - //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => { - if (res.data.code == 0) { - goods.guide_name = res.data.data.salesman; - goods.guide_sn = res.data.data.salesman_no; - } - }) - } - if(gg.groupchat_id && gg.groupchat_id!='undefined'){ - goods.groupchat_id=gg.groupchat_id - } - //--商品的房间号-- - if (gg.room_id && gg.room_id > 0) { - goods.room_id = gg.room_id; - } - - item.order_goods.push(goods); - pdata.push(item); - } - - - if (pdata.length == 0) return; - //如果有使用预存，要处理 - if (th.data.formData && th.data.formData.prestore * 1 > 0 && th.data.bn_goods.yck_off==2) { - let formData = th.data.formData - let pre_json = formData.pre_json - let all_yck_arr = formData.all_yck_arr - pdata.map((item, i) => { - item.pre_cut = all_yck_arr[i] ? all_yck_arr[i].toFixed(2) : 0 - item.pre_preferential = 0 - item.pre_json = pre_json[i] ? JSON.stringify(pre_json[i]) : '' - }) - } - if (!pdata.keyid && th.data.bn_goods) { - pdata.map(ite => { - ite.keyid = th.data.bn_goods.keyid - }) - // pdata.keyid = th.data.bn_goods.keyid - } - //------------------------------------------ - - var str = JSON.stringify(pdata); - - wx.showLoading({ title: "加载中" }); - wx.request({ - url: oo.url + '/api/weshop/order/createWxdOrder', - data: str, - method: 'POST', - header: { - 'content-type': 'application/json' - },// 设置请求的 header - success: function (res) { - wx.hideLoading(); - if (res.statusCode == 200) { - var data = res.data; - if (data.code == 0) { - - //如果是购物车结算，还要删除购物车 - if (th.data.is_b_now == 0) { - var list = th.data.cartlist_y; - for (var i = 0; i < list.length; i++) { - //删除购物车 - a.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {}); - } - } - var order_amount = 0; - pdata.forEach(function (em, ind) { - order_amount += em.order_amount; - }) - //要进行判断，如果是用微信支付，就要跳转到支付界面 - if (order_amount > 0) { - th.setData({ isclose: 0 }); - //void e.jumpToCart4({ - // order_sn: data.data, - //}, 1); - util_pay.pay(data.data, function () { - //app.my_warnning("支付成功",1,th); - //setTimeout(function () { - wx.redirectTo({ - url: "/pages/payment/pay_success/pay_success?type=2&order_sn=" + data.data - }) - //},1000) - - }, function () { - //支付失败 - setTimeout(function () { - wx.navigateBack({ delta: 1 }) - }, 1000) - }, oo.stoid); - - } else { - var dd = { - parent_sn: data.data, - store_id: oo.stoid, - type: 2, - }; - a.post("/api/weshop/order/pay/createOrder", { - data: dd, - success: function (t) { - //console.log(t); - if (t.data.code == 0) { - //app.my_warnning("支付成功",1,th); - //setTimeout(function () { - th.setData({ isclose: 0 }); - wx.redirectTo({ - url: "/pages/payment/pay_success/pay_success?type=2&order_sn=" + data.data, - }) - //}, 1000) - } - }, - fail: function () { - - } - }); - } - - } - else { - //--内容换行-- - var msg = data.msg; - //赠品活动已经取消，无法赠送，是否继续买单？ - if (msg.indexOf("是否继续买单") > 0) { - wx.showModal({ - title: "提示", - content: data.msg, - cancelText: '取消', - confirmText: '确定', - showCancel: true, - success(res) { - if (res.cancel) { - th.setData({submit:0}) - return; - } else if (res.confirm) { - th.data.is_continue = 1; - th.submitForm(sub_value); - } - } - }) - return; - } - if (msg.length > 13) { - msg = msg.slice(0, 13) + "\r\n" + msg.slice(13); - } - getApp().confirmBox(msg); - th.data.is_summit_ing = 0; //是否提交中 - } - } else { - th.setData({submit:0}) - th.data.is_summit_ing = 0; //是否提交中 - console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); - } - }, - fail: function () { - th.setData({submit:0}) - th.data.is_summit_ing = 0; - wx.hideLoading(); - console.log("index.js wx.request CheckCallUser fail"); - }, - complete: function () { } - }) - - }, - - //---确认线下门店的数量足不足--- - async check_store_num(goods_id, pick, goods_num, func) { - var lock = 0, pick_no, plist, erpwareid; - //先读取门店的lock - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: goods_id, storageId: pick, pageSize: 1000 } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty; - } - }) - //先获取门店的编号 - await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, { - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick } - }).then(res => { - if (res.data.code == 0) { - pick_no = res.data.data.pickup_no; - } - }) - //先获取商品的线下库存 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { - data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick } - }).then(res => { - if (res.data.code == 0) { - erpwareid = res.data.data.erpwareid; - } - }) - //读取线下的门店库存 - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { storageNos: pick_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid } - }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { - plist = res.data.data.pageData[0]; - } - }) - var isok = 1; - if (goods_num > plist.CanOutQty - lock) { - isok = 0; - } - func(isok); - }, - - useCoupon: function () { - if (this.data.order.couponNum <= 0) { - getApp().my_warnning("无可用优惠券", 0, this); - return; - } - - var a = { - lid: this.data.coupon ? this.data.coupon.id : "0" - }; - wx.navigateTo({ - url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a) - }); - }, - enterAddressPage: function () { - getApp().globalData.is_cart_old = 1; - this.data.isget_by_quan = {}; - this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" - }); - }, - - - - //--------立即购买时，选择自提和物流---------- - setexptype: function (t) { - var th = this; - var ty = t.currentTarget.dataset.t, def_exp_code = getApp().globalData.userInfo.def_exp_code; - - th.setData({ bn_exp_type: ty,same_ok:1 }); - //当物流为空的时候。 - if (ty == 0 && th.data.wu_arr == null) { - th.data.isget_by_quan = {}; - return th.get_wuliu(th.calculatePrice2()); - } - - //--自提就要把包邮券清理掉-- - if (ty == 1) { - th.data.isget_by_quan = {}; - if (th.data.using_quan && th.data.using_quan[th.data.bn_pick] && th.data.using_quan[th.data.bn_pick].isby == 1) { - th.setData({ using_quan: {} }); - } - } - - //判断有没有默认的物流地址值 - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { - var wu_arr = this.data.wu_arr; - if (wu_arr != null && wu_arr != "") { - for (var i = 0; i < wu_arr.length; i++) { - if (wu_arr[i].shipping_code == def_exp_code) { - th.setData({ index: i }); - } - } - } - } - th.calculatePrice2() - - }, - - //--------立即购买时，使用余额-------- - set_bn_useyuer: function () { - var th = this; - th.setData({ bn_use_money: !th.data.bn_use_money }); - th.calculatePrice2(); - }, - set_js_useyuer: function () { - var th = this; - th.setData({ js_use_money: !th.data.js_use_money }); - th.calculatePrice(); - }, - - //----------立即购买，选择物流------------- - bindPickerChange: function (e) { - var ind = e.detail.value - this.setData({ index: ind }); - this.calculatePrice2(); - }, - //----------购物车结算，选择物流------------- - bindPickerChange_w: function (e) { - var ind = e.detail.value, txt = e.currentTarget.dataset.txt; - this.setData({ [txt]: ind }); - this.calculatePrice(); - }, - - cart_set_err: function (e) { - var txt = e.currentTarget.dataset.err; - var ob = {}; - ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; - this.setData(ob); - }, - - //// 开启物流的弹窗 - show_wu_arr: function (e) { - var wu_arr_txt = e.currentTarget.dataset.txt; - var w_sele_index = e.currentTarget.dataset.w_sele_index; - var is_express = null; - var ob = { open_express: 1, wu_arr_txt: wu_arr_txt, disabled: 1 }; - - //--如果是多个门店的时候-- - if (w_sele_index != undefined) { - is_express = this.data.cartlist[w_sele_index].wind; - ob['is_express'] = is_express; - } - this.setData(ob); - }, - // 关闭物流的弹窗 - close_express: function () { - this.setData({ open_express: 0, disabled: 0 }); - }, - // 选择物流 - click_express_name: function (e) { - var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode; - var index = e.currentTarget.dataset.idxe; - var ob = { is_express: index, is_shipping_code: shippingcode, disabled: 0 }; - ob[this.data.wu_arr_txt] = index; - this.setData(ob); - }, - - //点击确定物流 - determine_expres: function (e) { - this.setData({ open_express: 0 }); - this.calculatePrice2(); - }, - - //设置默认物流 - select_default_logistics: function () { - var th = this; - var is_shipping_code = this.data.is_shipping_code - getApp().request.put("/api/weshop/users/update", { - data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code }, - success: function (rse) { - if (rse.data.code == 0) { - getApp().globalData.userInfo.def_exp_code = is_shipping_code; - th.setData({ open_express: 0 }); - //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19-------- - //if(th.data.is_b_now==1) th.calculatePrice2(); - //else th.calculatePrice(); - th.calculatePrice2(); - } - } - }) - }, - - //更新下默认，在onshow里面 - update_code() { - var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code; - - - //--定时器，判断wu_arr不未空-- - var uii = setInterval(function () { - if (th.data.wu_arr) { - clearInterval(uii); - if(th.data.is_default_logistics) return false; - for (var k = 0; k < th.data.wu_arr.length; k++) { - var item = th.data.wu_arr[k]; - if (def_exp_code == item.code) { m_wind = k; } - } - //--如果是立即购买-- - th.setData({ index: m_wind, is_express: m_wind }); - - } - }, 500); - }, - - //检查区域是不是包邮 - check_area: function (arr) { - var user_addr = this.data.user_addr; - for (var i in arr) { - var item = arr[i]; - if (user_addr.twon == item || user_addr.district == item - || user_addr.city == item || user_addr.province == item) { - return 0; - } - } - return 1; - }, - - //检查立即购买的商品是不是不包邮 - check_good: function (arr, goods_id) { - if (!goods_id) goods_id = this.data.bn_goods.goods_id; - for (var i in arr) { - var item = arr[i]; - if (goods_id == item) return 0; - } - return 1; - }, - check_by_area: function (region_list) { - var arr = region_list.split(","); - var check = this.check_area(arr); - return !check; - }, - check_by_goods: function (goods_list, goods_id) { - var arr = goods_list.split(","); - var check = this.check_good(arr, goods_id); - return !check; - }, - - - //从优惠的映射中拿出商品从表的item - arr_get_goods: function (goods_id, arr) { - for (var i in arr) { - if (arr[i].goods_id == goods_id) return arr[i]; - } - }, - - //跳转到购买卡 - buycard: function () { - getApp().goto("/pages/user/plus/plus"); - getApp().globalData.plus_buy_back = 1; - }, - - //使用佣金抵扣 - set_bn_commission:function () { - var th = this; - th.setData({bn_use_commission: !th.data.bn_use_commission}); - th.calculatePrice2(); - } - - -}); diff --git a/pages/cart/cart2_inte/cart2_inte.json b/pages/cart/cart2_inte/cart2_inte.json deleted file mode 100644 index 0cfb931..0000000 --- a/pages/cart/cart2_inte/cart2_inte.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "填写订单", - "enablePullDownRefresh": false, - "usingComponents": { - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml deleted file mode 100644 index 59acd10..0000000 --- a/pages/cart/cart2_inte/cart2_inte.wxml +++ /dev/null @@ -1,248 +0,0 @@ - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - {{bn_pickname}} - - - - - - - - {{bn_goods.goods_name}} - - - - {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} - - - - - - - {{bn_goods.integral}}积分 - + - ￥{{filters.toFix(bn_goods.shop_price,2)}} - - 佣金：{{filters.toFix(bn_goods.use_commission/bn_goods.buynum,2)}}*{{bn_goods.buynum}} - - x{{bn_goods.buynum}} - - - - - - - - {{order.store_prom}} - - - - - - 优惠券 {{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用 - - - 不使用 - - ￥{{using_quan[bn_pick].money}}元优惠券 - 包邮券 - - - - - - - - - - - 选择物流 - - {{wu_arr[index].name}} - - - - - - - - - 留言 - - - - - - - - - - 使用预存 - - ￥{{filters.toFix(bn_goods.yck,2)}} - - - - - - - - 使用佣金 :￥{{bn_goods.use_commission}} - - - - - - - - 使用余额 :￥{{yuer}} - - - - - - - - - - 商品金额 - ￥ {{formData.all_price}}元 - - - 可用积分{{integral_can}} - {{formData.integral}}积分 - - - 配送费用 - ￥ {{formData.shipping_price}}元 - - - - - 订单优惠 - - ￥ {{filters.toFix(formData.order_prom_amount,2)}}元 - - - - 使用预存 - - ￥ {{filters.toFix(formData.prestore,2)}}元 - - - 使用余额 - - ￥ {{formData.user_money}}元 - - - - - - - 应付金额：￥{{formData.order_amount}} - 应付积分：{{formData.integral}}积分 - - - -
- - - - - - - - - - 选择物流名字 - - - × - - - - - - - - Γ - - - - - {{express_list.name}} - - - - - - - 确定 - - - 设为默认 - - - - - - - diff --git a/pages/cart/cart2_inte/cart2_inte.wxss b/pages/cart/cart2_inte/cart2_inte.wxss deleted file mode 100644 index 03c2154..0000000 --- a/pages/cart/cart2_inte/cart2_inte.wxss +++ /dev/null @@ -1,987 +0,0 @@ -.bdr_t-14 { - border-top-left-radius: 14rpx; - border-top-right-radius: 14rpx; -} -.bdr_b-14 { - border-bottom-left-radius: 14rpx; - border-bottom-right-radius: 14rpx; -} -.bdr14 { - border-radius: 14rpx; -} -.mgt20 { - margin-top: 20rpx; -} -.shadow { - box-shadow: 0 4rpx 12px #e7e9eb; -} -.shadow-1 { - box-shadow: 16rpx 0px 12px #e7e9eb; -} - - -page { - /* background-color: #FAFAFA; */ - background-color: #F0F0F0; - padding: 0 22rpx; - box-sizing: border-box; -} -.container { - background-color: #F0F0F0; - /* padding-top: 28rpx; */ - padding-bottom: 120rpx; -} -.user-mes { - position: relative; - background-color: #fff; - font-size: 32rpx; - color: #444; - /* margin-top: 28rpx; */ - border-radius: 14rpx; -} -.user-contact { - padding: 24rpx 26rpx; - font-weight: 600; -} - -.location { - position: relative; - padding: 0 70rpx 24rpx; -} - -.pos-icon { - position: absolute; - left: 28rpx; - top: 6rpx; - width: 30rpx; - height: 36rpx; -} - -.border-img { - width: 100%; - height: 12rpx; -} - -.update-logistics { - position: absolute; - right: 0; - top: 0; - width: 80rpx; - height: 100%; - display: flex; - align-items: center; - justify-content: center; -} - -.arrow-rigth { - width: 32rpx; - height: 32rpx; -} - -.order-meg { - margin-bottom: 20rpx; - font-size: 28rpx; - -} - -.order-detail { - padding: 30rpx 0; - border-bottom: 2rpx solid #eee; - color: #777; - min-height: 190rpx; - background-color: #fff; - -} - -.goods-img { - float: left; - width: 200rpx; - height: 200rpx; - margin: 0 20rpx; -} - -.order-cont { - float: left; - width: 438rpx; -} - -.goods-name { - height: 74rpx; - line-height: 40rpx; - overflow: hidden; - margin-bottom: 16rpx; - font-size: 28rpx; - color: #333; - -} - -.goods-color { - font-size: 24rpx; -} - -.order-num { - margin-top: 25rpx; - font-size: 24rpx; - line-height: 42rpx; -} - -.set-mes{ - background-color: #fff; - /* margin-top: 20rpx; */ -} -.use-item{ - display: flex; - align-items: center; - height: 80rpx; - /* border-bottom: 1px solid #ddd; */ - font-size: 30rpx; - /* width:95%; -margin:auto; */ - padding: 0 26rpx; -} -.use-item>view{ - display: flex; - align-items: center; - /* margin-right: 12rpx; */ -} -.use-item.bfff{ - background-color: #fff; -} -.use-item .dp{ - display: block; - width: 50rpx; - height: 50rpx; - margin-left: -6rpx; -} - -.set-item { - justify-content: space-between; - background-color: #fff; -} - -.set-btn { - display: flex; - font-size: 24rpx; -} - -.set-mes input { - width: 380rpx; - height: 50rpx; - line-height: 50rpx; - border: 1px solid #ddd; -} - -.use-btn { - width: 100rpx; - height: 50rpx; - margin-left: 20rpx; - line-height: 50rpx; - text-align: center; - background-color: #f23030; - color: #fff; -} - -.coupon-mes { - /* box-sizing: border-box; */ - height:95rpx; - padding: 0 26rpx; - background-color: #fff; - font-size: 30rpx; - color: #444; - /* width: 100%; */ - border-radius: 14rpx; - margin-top: 20rpx; - margin-bottom: 20rpx; -} - -.coupon-title { - display: flex; - justify-content: space-between; - align-items: center; - height: 92rpx; -} - -.coupon-title>view { - display: flex; -} - -.coupon-num { - height: 36rpx; - margin-left: 20rpx; - padding: 0 16rpx; - line-height: 36rpx; - text-align: center; - background-color: #f23030; - color: #fff; - font-size: 24rpx; -} - -.leave-word { - position: relative; - font-size: 24rpx; - margin-left: 20rpx; - flex-grow: 1; -} - -.word-box { - font-size: 26rpx; - /* width: 600rpx; */ - padding: 10rpx; - height: 28rpx; - line-height: 40rpx; -} - -.max-word { - position: absolute; - right: 0; - bottom: 0; -} - -.information { - padding: 0 26rpx; - background-color: #fff; - /* margin-bottom: 120rpx; */ -} - -.information .item { - display: flex; - justify-content: space-between; - height: 60rpx; - line-height: 60rpx; - font-size: 26rpx; - color: #777; -} - -.btn-wrap { - height: 100rpx; - box-sizing: border-box; - display: flex; - justify-content: space-between; - background-color: white; - align-items: center; - position: fixed; - bottom: 0; - left: 0; - width: 100%; - padding: 0 30rpx; - font-size: 30rpx; -} - -.tips-btn { - /* float: right; - width: 200rpx; - height: 100rpx; - line-height: 100rpx; - text-align: center; - font-size: 30rpx; - color: #fff; - background-color: #f23030; */ - color: white; - background-color: #FE4445; - height: 72rpx; - line-height: 72rpx; - padding: 0 42rpx; - border-radius: 36rpx; - margin-left: 0; - margin-right: 0; -} - -.pay-amount { - /* float: right; - display: flex; - align-items: center; - height: 100rpx; - font-size: 26rpx; - margin-right: 40rpx; */ -} - -.payable { - color: #444; - /* margin-right: 20rpx; */ -} - -.shipping-modal { - z-index: 20; - position: fixed; - bottom: 0; - left: 0; - right: 0; - overflow-y: hidden; - color: #666666; - background-color: white; -} - -.shipping-nav { - text-align: center; - font-size: 35rpx; - padding-top: 30rpx; -} - -.shipping-list { - padding: 20rpx 30rpx 40rpx; - font-size: 28rpx; -} - -.shipping-item { - display: block; - padding: 20rpx 0; -} - -.shipping-btn { - width: 100%; - color: white; - background-color: #f23030; - line-height: 90rpx; - text-align: center; - font-size: 40rpx; -} - -/*----------nyf新增，地址---------*/ -.add_new{ - height: 90rpx; - display: flex; - align-items: center; - padding: 0 26rpx; -} -.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; - margin-right: 15rpx;vertical-align: middle;} -.yu_er{ - margin-left: 10rpx; - /* margin-right: 60rpx; */ -} -.wuliu{margin-left: 20rpx;} - - -/*---- 优惠券列表 -----*/ -.xc-coupon-frame{ - width: 100%; - height: 92rpx; - -} -.xc-coupon-frame .work-frame{ - width: 100%; - height: 100%; - border-bottom:3rpx solid #eee; - padding: 0 26rpx; - background-color: white; -} -.xc-right{ - width:20rpx; - height:20rpx; - border-top:2rpx solid #000; - border-right:2rpx solid #000; - transform:rotate(45deg); - display:inline-block; -} - -.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } -.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } - -/* 自定义弹出窗口 */ -.cx-popup{ - width:100%; - height:880rpx; - background: #fff; - z-index: 35; - border-top-left-radius: 20rpx; - border-top-right-radius: 20rpx; - position:fixed; - bottom:0; - left: 0; - /* padding-bottom: 25rpx; */ -} - -.cx-popup .top{ - width:95%; - height:100rpx; - border-bottom:3rpx solid #ddd; - margin: auto; - margin-top: 30rpx; - -} -.xc-top-content{ - width: 93%; - height:85rpx; - padding-top: 30rpx; - font-size: 34rpx; - font-weight: 600; - -} - - -.xc-valid-coupon{ - width: 90%; - height:40rpx; - padding-top: 24rpx; - overflow: hidden; -} -.xc-frame{ - width: 100%; - height:60%; -} - -.xc-frame .list-frame{ - width: 95%; - height: 100%; - overflow-y:scroll; - -} -.xc-close-frame{ - margin-top:-10rpx; - -} - -.xc-close{ - width: 37rpx; -height: 37rpx; -border-radius: 50%; -border: 3rpx solid #333; -text-align: center; -line-height: 34rpx; -font-size: 29rpx; -color: #333; - -} -.xc-money{ - color: #af2346; - font-size: 35rpx; -} - -.xc-money-frame{ - margin-left:35rpx; - -} -.xc-coupon-effect{ - width: 99%; - min-height: 100rpx; - border-bottom:3rpx solid #ddd; - - -} -.xc-goods-coupon{ - width: 85%; - height:100%; - -} -.xc-title{ - width:50%; - margin-left:222rpx; - -} -.xc-coupon-money0{ - color: #c91e31; - font-size: 35rpx; - line-height: 40rpx; - -} -.xc-coupon-money{ - color: #c91e31; - font-size: 35rpx; - line-height: 40rpx; - padding-top: 10px; - -} -.xc-coupon-money1{ - color: #444; - font-size: 28rpx; - line-height: 60rpx; - - -} -.xc-coupon-time{ - height: 50rpx; - font-size: 27rpx; - color: #a4a4a4; -} -.xc-coupon-time .time{ - margin-left: 15rpx; - font-size: 27rpx; -} -.xc-coupon-selection{ - height:100%; -} - -.xc-confirm { - width: 50%; - border-radius: 50rpx; - height: 80rpx; - margin:0 auto; - background:#d60021; - color:#fff; - font-size:28rpx; - margin-top: 28rpx; -} - -.up{ animation: up .7s; } -.down{ animation: down 1s; } -@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } } -@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } } - -.xc-not-Selection{ - width: 40rpx; -height: 40rpx; - background: #eeeeee; -} - - -.xc-close-express{ - width: 40rpx; -height: 40rpx; -border-radius: 50%; -border: 3rpx solid #333; -text-align: center; -font-size:32rpx; -line-height: 38rpx; -color: #333; -margin-top: 5rpx; -} -.cx-popup .tops{ - width: 100%; -height: 145rpx; -border-bottom: 3rpx solid #eee; - -} -.top-content { - width: 82%; -padding-top: 33px; -height: 100%; -padding-left: 40rpx; -} -.close-frame{ - margin-top: 30rpx; - -} - -.xc-hook { -width: 33rpx; -height: 33rpx; -transform: rotate(-135deg); -line-height: 35rpx; -text-align: center; -margin-right: 20rpx - - -} -.xc-hooks { -width: 30rpx; -height: 30rpx; -border: 1rpx solid #999; -margin-right: 20rpx; -} -.express_list_frame{ - display: flex; -height: 80rpx; -align-items: center; -padding-left: 40rpx; -border-bottom: 1rpx solid #eee; - -} -.express_list{ - width: 100%; - height: 65%; - overflow-y: auto; - margin-bottom: 40rpx; - -} -.xc-confirms { - box-sizing: border-box; - width: 40%; - border-radius: 50rpx; - height: 80rpx; - margin:0 auto; - font-size:28rpx; - background: #fff; - color: #333; - border: 2rpx solid #333; -} - - -/* 优惠券的改版样式 */ -.xc-coupon-frame{ - /* width: 710rpx; */ - width: 100%; - height:auto; - margin: 0 auto; - -} -.xc-coupon-frame .coupon-frame{ - width: 100%; - height: 200rpx; - margin-top:10rpx; - border-bottom: 1rpx solid #eee; - -} -.xc-coupon-frame .coupon-frame .coupon-left{ - width: 215rpx; - height:100%; - overflow: hidden; -} -.xc-money-frames{ - width:96%; - margin-top: -10px; -} - -.xc-rmb-symbol{ - font-size:40rpx; - -} - -.xc-rmb-val{ - font-size:60rpx; - -} -.coupon-explain{ - font-size:25rpx; -width:100%; - - -} -.xc-valuer{ - margin-top:39rpx; - margin-left:28rpx; - font-size:25rpx; -} -.coupon-frame .oval{ - width:155rpx; - height:83rpx; - border-radius: 50%; - right:-78rpx; - top:-37rpx; -} -.coupon-right{ - /* width:490rpx; */ - height: 99%; - border-top: 1rpx solid #eaeaea; - /* //border-bottom: 1rpx solid #eaeaea; */ - border-right: 1rpx solid #eaeaea; - flex-grow: 1; -} -.coupon-annotation{ - width: 95%; - height: 100%; - -} -.xc-brand{ - width:100rpx; - height:35rpx; - line-height: 35rpx; - font-size:21rpx; - border-radius:10rpx; position: relative; top:-1px; - margin-right: 8rpx -} -.top-frame{ - width:82%; - height: 75rpx; - margin-top:10rpx; -} -.top-frame .coupon-wode{ - font-size: 25rpx; - margin-left:10rpx; - width:340rpx; - height:88rpx; -} -.coupon-code{ - width:60rpx; - height:60rpx; - margin-top:5rpx; - -} -.frame{ - width: 100% -} -.coupon-time{ - font-size: 23rpx; - line-height:33rpx; - color: #333; -} - -.clik-get{ - width:125rpx; - height:45rpx; - border-radius: 25rpx; - line-height: 45rpx; - font-size:25rpx; - bottom:67rpx; - right:6px; -} - -.code-img{ - margin-left:20rpx; -} -.bottmo-explain{ -top:145rpx; -width:94%; -border-top:1rpx dashed #eee; -padding-top:8rpx; -height:38rpx; -line-height: 51rpx; - -} -.font-word{ - font-size: 22rpx; -} -.circle-size{ - background: #a0a0a0; - width: 27rpx; - height: 27rpx; - margin-top:13rpx; -margin-left:8rpx; -display: flex; - -align-items: center; -} -.xc-jiantou{ - /* width: 9rpx; - height: 9rpx; */ - /* border-top: 2rpx solid #fff; - border-right: 2rpx solid #fff; */ - transform: rotate(-90deg); - color: #fff; - font-size: 15rpx; - /* display:inline-block; - margin-top: 6.5rpx; */ - text-align: center; -width: 24rpx; -} -.xc-buttom{ - box-sizing: border-box; - width:100%; - min-height:76rpx; - height:auto; - line-height:40rpx; - border-left:1rpx solid #eee; - border-right:1rpx solid #eee; - border-bottom:1rpx solid #eee; -/* margin-left: 6rpx; */ -} - -.goods-num{ - font-size: 28rpx; - color: #333; -} - -.explain-coupon{ - font-size:25rpx; - padding: 10rpx 10rpx -} -.circle-frame{ - width: 20rpx; - height: auto; - z-index:1; - left:210rpx; - -} -.circle-sawtooth{ - width: 11rpx; - height: 11rpx; - background: #fff; -} - -.red{background-color: #fe7496;} -.green{ background-color: #22c7c1;} -.blue{background-color:#5e82e3;} -.g_gray{background-color: #aaaaaa} - -.f_text{text-align: center; height:96rpx; } -.xc-hook.sn { - margin-top:12%; -width:45rpx; -height:45rpx; -font-size:28rpx; -line-height:44rpx; - - -} -.xc-hooks.on{ - margin-top:12%; -width:42rpx; -height:42rpx; -} -.may_use_coupon{ - /* width: 95%; */ - /* height: 68rpx; */ - line-height:78rpx; - padding: 0 26rpx; - justify-content: space-between; - align-items: center; -} -.determine-frame{ - width: 100%; - height: 130rpx; - -} -.xc-determine{ - height: 80rpx; - width: 40%; - border-radius: 50rpx; -background: #d60021; -color: #fff; -font-size: 28rpx; -margin: 0 auto; - -} -.click-buttem{ -width: 90%; -margin: auto; -} -.logistics-name{ - margin-right:20rpx; -} -.xc-border{ - border-top:8rpx solid #eee; -width: 100% -} -.main-top{ -margin-top: 20rpx; - -} -.xc-hookts{ -border: 1rpx solid #999; - -} -.xc-hookts.on{ - width:30rpx; -height:30rpx; - -} -.xc-hookt.sn{ - width: 32rpx; -height: 32rpx; -font-size: 28rpx; -line-height: 34rpx; -} -.xc-hookt{ - transform: rotate(-135deg); -text-align: center; - -} -.main-bottom{ - margin-bottom: 20rpx; - -} -.xc-hookst{ - border: 1rpx solid #999; - -} -.xc-hookst.ons{ - width: 42rpx; -height: 42rpx; -margin-left: 20rpx; - -} -.is_use_coupon{ - width: 65%; -justify-content: flex-end; -padding-top: 10rpx; - - -} -.xc-hooka{ - transform: rotate(-135deg); -text-align: center; - -} -.xc-hooka.sn{ - width: 45rpx; -height: 45rpx; -font-size: 28rpx; -line-height: 44rpx; -margin-left: 20rpx; - -} -.color-gray{ - color: #808080; -} -.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } -.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} - -.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;} - -.navigator-hover { - background: none; - opacity: 1; -} - - -.plus_buy{ - background-color: #fff; - margin:15rpx 0; - padding: 20rpx 10rpx; - position: relative; -} - - -.card_bg { - box-sizing: border-box; - padding: 2rpx 10rpx; - height: 28rpx; - border-radius: 26rpx; - font-size: 18rpx; - line-height: 28rpx; - max-width: 210rpx; - background: #333; - color: #fff; - margin-left: 8rpx; - position:relative; - top:7rpx; -} - -.card_bg image { - width: 19rpx; - height: 19rpx; - margin-right: 8rpx; -} - -/* .card_bg .card_name { - max-width: 76rpx; - width: auto; - overflow: hidden; - white-space: nowrap; -} */ - -.card_name { - position: relative; - top: -4rpx; - margin-left: 6px; -} - -.car_tri_up { - width: 0;height: 0; - border-left: 20rpx solid transparent; - border-right: 20rpx solid transparent; - border-bottom: 20rpx solid #fff; - position: absolute; - right: 20rpx; - top:-10rpx -} -.card_op{ - position: absolute; - right: 20rpx; - top:36rpx -} - - -.tab-container { - font-size: 28rpx; - margin-top: 20rpx; - display: flex; -} - -.tab-wrapper { - background-color: #ccc; - display: flex; - border-radius: 40rpx; - overflow: hidden; -} - -.tab { - padding: 20rpx 30rpx; - -} - - -.tab.active { - background-color: white; - border-radius: 40rpx; -} - diff --git a/pages/cart/cart2_inte/filter.wxs b/pages/cart/cart2_inte/filter.wxs deleted file mode 100644 index c0e8d13..0000000 --- a/pages/cart/cart2_inte/filter.wxs +++ /dev/null @@ -1,11 +0,0 @@ -var format = function (text) { - if (!text) { - return - } - var reg = getRegExp('\\\\n', 'g') - return text.replace(reg, '\n') -} - -module.exports = { - format: format -} diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 89c3d43..b148c9b 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2358,7 +2358,7 @@ Page({ if (e.prom_type == 4) { s.set_b_now(e); - var url = "/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id; + var url = "/packageE/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id; getApp().goto(url); } else { //要判断积分购的普通购买有没有参加优惠活动 diff --git a/pages/test/test.js b/pages/test/test.js deleted file mode 100644 index 2f6f550..0000000 --- a/pages/test/test.js +++ /dev/null @@ -1,53 +0,0 @@ -var ut = require("../../utils/util.js"); -var os=getApp().globalData.setting; - -var regeneratorRuntime = require('../../utils/runtime.js'); - -Page({ - data:{ - store:null, - imghots: os.imghost, - msg:"", - qyid:'wwc96c9375cd8d185a' - }, - - onLoad:function(t){ - - var that=this; - - wx.qy.login({ - success: function (res) { - //var qyid = that.data.qyid; - var req_data = { - js_code: res.code, - //qyid: qyid - }; - - - //调用接口获取userid - getApp().request.promiseGet('/api/weshop/qywechat/getjscode2session', { - data: req_data - }).then(rs => { - if (rs.data.code == 0) { - - - wx.qy.getCurExternalChat ({ - success: function(res) { - var chatId = res.chatId //返回当前外部群的群聊ID - - console.log(chatId); - getApp().confirmBox(chatId+"---"); - - } - }) - - - } - }) - } - }) - }, - - - -}); diff --git a/pages/test/test.json b/pages/test/test.json deleted file mode 100644 index 9e26dfe..0000000 --- a/pages/test/test.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/pages/test/test.wxml b/pages/test/test.wxml deleted file mode 100644 index e69de29..0000000 --- a/pages/test/test.wxml +++ /dev/null diff --git a/pages/test/test.wxss b/pages/test/test.wxss deleted file mode 100644 index f09d0b3..0000000 --- a/pages/test/test.wxss +++ /dev/null @@ -1,26 +0,0 @@ -.all_page{ - position: fixed; - height: 100%; - width: 100%; - background: #fff; - justify-content: center;/*水平居中*/ -} -.all_page .content{ - font-size: 30rpx; - text-align: center; - height: 400px; - width: 100%; - position: absolute; - top: 50%; - margin-top:-200px; -} -.logo{width: 140rpx; height: 140rpx; border-radius:50% } -.all_page .content .title{ - font-size: 36rpx; margin: 20rpx 0 -} - -.all_page .err{ - color:red; - font-size: 36rpx; - margin-top: 300rpx; -} \ No newline at end of file diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 709d5de..76707b0 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1767,9 +1767,17 @@ Page({ click_contact:function () { getApp().globalData.no_clear=1; + }, + + + //-- 查看物流 -- + go_wuliu:function (e) { + getApp().go_wuliu(e); } + + }); \ No newline at end of file diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 33fc66f..e4c5011 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -175,7 +175,9 @@ 删除订单 - + diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index f0c3277..7553b06 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -2836,6 +2836,12 @@ Page({ }, + //-- 查看物流 -- + go_wuliu:function (e) { + getApp().go_wuliu(e); + } + + diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 75c3025..f338b31 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -245,8 +245,11 @@ 重新退款 退款详情 - - + + + 订单详情 订单详情 -- libgit2 0.21.4