Commit 157f8015 authored by 潘永坪's avatar 潘永坪

扫码支付页面修改

parent 806c7a6f
This diff is collapsed.
...@@ -29,5 +29,6 @@ ...@@ -29,5 +29,6 @@
"uniStatistics": { "uniStatistics": {
"enable": true "enable": true
}, },
"usingComponents": {} "usingComponents": {},
"sitemapLocation": "sitemap.json"
} }
\ No newline at end of file
(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/index"],{"065f":function(n,t,e){"use strict";e.r(t);var o=e("737f"),u=e.n(o);for(var c in o)"default"!==c&&function(n){e.d(t,n,(function(){return o[n]}))}(c);t["default"]=u.a},"2bba":function(n,t,e){"use strict";(function(n){e("6909"),e("921b");o(e("66fd"));var t=o(e("c545"));function o(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("543d")["createPage"])},"737f":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{showBottom:!1}},onLoad:function(){n.getStorageSync("openid")&&(this.showBottom=!0)},onReady:function(){},methods:{getUserInfo:function(){n.getUserProfile({lang:"zh_CN",desc:"登录",success:function(n){console.log(n)},fail:function(n){}})}}};t.default=e}).call(this,e("543d")["default"])},c545:function(n,t,e){"use strict";e.r(t);var o=e("c69a"),u=e("065f");for(var c in u)"default"!==c&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("d9b5");var a,f=e("f0c5"),r=Object(f["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);t["default"]=r.exports},c69a:function(n,t,e){"use strict";var o;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return o}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=[]},d9b5:function(n,t,e){"use strict";var o=e("e90d"),u=e.n(o);u.a},e90d:function(n,t,e){}},[["2bba","common/runtime","common/vendor"]]]); (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/index"],{"065f":function(n,t,e){"use strict";e.r(t);var o=e("737f"),u=e.n(o);for(var c in o)"default"!==c&&function(n){e.d(t,n,(function(){return o[n]}))}(c);t["default"]=u.a},"2bba":function(n,t,e){"use strict";(function(n){e("6909"),e("921b");o(e("66fd"));var t=o(e("c545"));function o(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("543d")["createPage"])},6980:function(n,t,e){"use strict";var o;e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return o}));var u=function(){var n=this,t=n.$createElement;n._self._c},c=[]},"737f":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{showBottom:!1}},onLoad:function(){n.getStorageSync("openid")&&(this.showBottom=!0)},onReady:function(){},methods:{getUserInfo:function(){n.getUserProfile({lang:"zh_CN",desc:"登录",success:function(n){console.log(n)},fail:function(n){}})}}};t.default=e}).call(this,e("543d")["default"])},c545:function(n,t,e){"use strict";e.r(t);var o=e("6980"),u=e("065f");for(var c in u)"default"!==c&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("d9b5");var f,a=e("f0c5"),r=Object(a["a"])(u["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],f);t["default"]=r.exports},d9b5:function(n,t,e){"use strict";var o=e("e90d"),u=e.n(o);u.a},e90d:function(n,t,e){}},[["2bba","common/runtime","common/vendor"]]]);
\ No newline at end of file \ No newline at end of file
<view class="bigBox"><view class="top"><view class="topName"><text class="topIcon"><text class="iconfont icon-tubiaolunkuo-"></text></text><text>{{name}}</text></view><view class="topMoney"><text class="moneyText">支付金额</text><view class="moneyNumber"><text class="iconfont icon-fl-renminbi" style="font-size:56rpx;"></text><text>{{buyMoney}}</text><text></text></view></view><block wx:if="{{couponData.usableCouponList&&couponData.usableCouponList.length>0&&chooseCouponObj==''}}"><view data-event-opts="{{[['tap',[['showCoupon']]]]}}" class="topCoupon" bindtap="__e"><view class="couponLeft"><text>券</text><text>{{couponData.usableCouponList[0].couponName}}</text></view><view class="couponRight"><text>未选优惠券</text><text class="iconfont icon-you" style="font-size:32rpx;"></text></view></view></block><block wx:if="{{chooseCouponObj!=''}}"><view data-event-opts="{{[['tap',[['showCoupon']]]]}}" class="topCoupon" bindtap="__e"><view class="couponLeft"><text>券</text><text>{{chooseCouponObj.couponName}}</text></view><view class="couponRight"><text>-</text><text>{{$root.g0}}</text><text class="iconfont icon-you" style="font-size:32rpx;"></text></view></view></block><block wx:if="{{ableConpon!=''}}"><view data-event-opts="{{[['tap',[['showCoupon']]]]}}" class="topCoupon" bindtap="__e"><view class="couponLeft"><text>券</text><text>{{ableConpon.couponName}}</text></view><view class="couponRight"><text>{{ableConpon.couponRule}}</text><text class="iconfont icon-you" style="font-size:32rpx;"></text></view></view></block></view><view class="middle">友情提示:请核对以上付款金额、付款商户等信息与交易一致。经您确认支付的金额,商家不会退回亦无赔偿义务。</view><view class="bottom"><view class="botLeft"><view><text data-ref="1" data-event-opts="{{[['tap',[['clickNum',[1]]]]]}}" class="vue-ref" bindtap="__e">1</text><text data-ref="2" data-event-opts="{{[['tap',[['clickNum',[2]]]]]}}" class="vue-ref" bindtap="__e">2</text><text data-ref="3" data-event-opts="{{[['tap',[['clickNum',[3]]]]]}}" class="vue-ref" bindtap="__e">3</text></view><view><text data-ref="4" data-event-opts="{{[['tap',[['clickNum',[4]]]]]}}" class="vue-ref" bindtap="__e">4</text><text data-ref="5" data-event-opts="{{[['tap',[['clickNum',[5]]]]]}}" class="vue-ref" bindtap="__e">5</text><text data-ref="6" data-event-opts="{{[['tap',[['clickNum',[6]]]]]}}" class="vue-ref" bindtap="__e">6</text></view><view><text data-ref="7" data-event-opts="{{[['tap',[['clickNum',[7]]]]]}}" class="vue-ref" bindtap="__e">7</text><text data-ref="8" data-event-opts="{{[['tap',[['clickNum',[8]]]]]}}" class="vue-ref" bindtap="__e">8</text><text data-ref="9" data-event-opts="{{[['tap',[['clickNum',[9]]]]]}}" class="vue-ref" bindtap="__e">9</text></view><view><text data-ref="0" data-event-opts="{{[['tap',[['clickNum',[0]]]]]}}" class="vue-ref" style="width:66.7%;" bindtap="__e">0</text><text data-ref="." data-event-opts="{{[['tap',[['clickNum',['.']]]]]}}" class="vue-ref" style="width:33.3%;" bindtap="__e">.</text></view></view><view class="botRight"><view data-ref="enter" data-event-opts="{{[['tap',[['clickEnter']]]]}}" class="rightOne vue-ref" bindtap="__e"><text class="iconfont icon-im_huige" style="font-size:70rpx;"></text></view><view data-ref="pay" data-event-opts="{{[['tap',[['clickPay']]]]}}" class="rightTwo vue-ref" bindtap="__e"><view>立即</view><view>支付</view></view></view></view><order-coupon class="vue-ref" vue-id="ed07b280-1" couponData="{{couponData}}" chooseCouponObj="{{chooseCouponObj}}" data-ref="orderCoupon" data-event-opts="{{[['^couponChoose',[['couponChoose']]]]}}" bind:couponChoose="__e" bind:__l="__l"></order-coupon></view> <view class="bigBox"><view class="top"><view class="topName"><text class="topIcon"><text class="iconfont icon-tubiaolunkuo-"></text></text><text>{{name}}</text></view><view class="topMoney"><text class="moneyText">支付金额</text><view class="moneyNumber"><text class="iconfont icon-fl-renminbi" style="font-size:56rpx;"></text><text>{{buyMoney}}</text><text></text></view></view><block wx:if="{{chooseCouponObj}}"><view class="topCoupon"><view class="couponLeft"><text>券</text><text>{{chooseCouponObj.couponName}}</text></view><view class="couponRight"><text style="font-weight:bold;"><text style="font-size:26rpx;font-weight:400;">-¥</text>{{''+$root.m0+''}}</text></view></view></block></view><view class="middle">友情提示:请核对以上付款金额、付款商户等信息与交易一致。经您确认支付的金额,商家不会退回亦无赔偿义务。</view><view class="bottom"><view class="botLeft"><block wx:for="{{leftList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:for="{{item.child}}" wx:for-item="items" wx:for-index="a" wx:key="a"><text data-event-opts="{{[['tap',[['clickNum',['$0',index,a],[[['leftList','',index],['child','',a,'text']]]]]]]}}" style="{{'background:'+(items.background)+';'}}" bindtap="__e">{{items.text}}</text></block></view></block></view><view class="botRight"><view data-event-opts="{{[['tap',[['clickEnter']]]]}}" class="rightOne" style="{{'background:'+(spaceBackground)+';'}}" bindtap="__e"><text class="iconfont icon-im_huige" style="font-size:70rpx;"></text></view><view data-ref="pay" data-event-opts="{{[['tap',[['clickPay']]]]}}" class="rightTwo vue-ref" style="{{'background:'+(payBackground)+';'}}" bindtap="__e"><view>立即</view><view>支付</view></view></view></view></view>
\ No newline at end of file \ No newline at end of file
.bigBox{background:#f5f5f5;height:100%}.top{background:#fff}.topName{font-size:28rpx;font-weight:700;padding-top:50rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.topIcon{display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;margin-right:10rpx;width:50rpx;height:50rpx;border-radius:50%;background:#ff8b57;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.icon-tubiaolunkuo-{font-size:36rpx;color:#fff;font-weight:400}.topMoney{padding:80rpx 24rpx 35rpx 24rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.moneyText{color:#ff3c00;font-size:28rpx;font-weight:700}.moneyNumber text:nth-child(2){font-size:58rpx;font-weight:700;position:relative;left:-6rpx}.moneyNumber text:last-child{-webkit-animation:dis 1.5s infinite;animation:dis 1.5s infinite;-webkit-transition:1s;transition:1s;width:1px;height:56rpx;display:inline-block;background:#333;position:relative;top:8rpx}.topCoupon{display:-webkit-box;display:-webkit-flex;display:flex;height:90rpx;border-top:1px solid #dbdbdb;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:0 24rpx;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.couponLeft{font-size:24rpx}.couponLeft text:first-child{margin-right:10rpx;display:inline-block;width:30rpx;height:30rpx;background:#f9690e;color:#fff;text-align:center;line-height:28rpx;border-radius:4rpx}.couponRight{position:relative;left:8rpx}.couponRight text:first-child{font-size:32rpx;color:#f9690e}.couponRight text:nth-child(2){font-size:32rpx;color:#f9690e;font-weight:700}.middle{padding:60rpx 24rpx 0 24rpx;font-size:22rpx;color:#999;line-height:40rpx}.bottom{position:absolute;bottom:0;height:40%;background:#fff;width:100%;display:-webkit-box;display:-webkit-flex;display:flex;border-top:1px solid #ddd;font-size:50rpx}.botLeft{width:75%}.botLeft view{height:25%;display:-webkit-box;display:-webkit-flex;display:flex;border-bottom:1px solid #ddd}.botLeft view:last-child{border:none}.botLeft view text{-webkit-box-flex:1;-webkit-flex:1;flex:1;height:100%;display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;border-right:1px solid #ddd}.botLeft view:last-child text{-webkit-box-flex:initial;-webkit-flex:initial;flex:initial}.botRight{width:25%}.rightOne{height:25%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;border-bottom:1px solid #ddd}.rightTwo{height:75%;border:none;color:#fff;background:#1dce2e;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}@-webkit-keyframes dis{from{opacity:0}to{opacity:1}}@keyframes dis{from{opacity:0}to{opacity:1}} .bigBox{background:#f5f5f5;height:100%}.top{background:#fff}.topName{font-size:30rpx;font-weight:700;padding-top:50rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.topIcon{display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;margin-right:10rpx;width:50rpx;height:50rpx;border-radius:50%;background:#ff8b57;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.icon-tubiaolunkuo-{font-size:36rpx;color:#fff;font-weight:400}.topMoney{padding:80rpx 24rpx 35rpx 24rpx;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.moneyText{color:#ff3c00;font-size:28rpx;font-weight:700}.moneyNumber text:nth-child(2){font-size:58rpx;font-weight:700;position:relative;left:-6rpx}.moneyNumber text:last-child{-webkit-animation:dis 1.5s infinite;animation:dis 1.5s infinite;-webkit-transition:1s;transition:1s;width:1px;height:56rpx;display:inline-block;background:#333;position:relative;top:8rpx}.topCoupon{display:-webkit-box;display:-webkit-flex;display:flex;height:90rpx;border-top:1px solid #dbdbdb;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:0 24rpx;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between}.couponLeft{font-size:24rpx}.couponLeft text:first-child{margin-right:10rpx;display:inline-block;width:30rpx;height:30rpx;background:#f9690e;color:#fff;text-align:center;line-height:28rpx;border-radius:4rpx}.couponRight{position:relative;left:8rpx}.couponRight text:first-child{font-size:32rpx;color:#f9690e}.couponRight text:nth-child(2){font-size:32rpx;color:#f9690e;font-weight:700}.middle{padding:50rpx 24rpx 0 24rpx;font-size:24rpx;color:#999;line-height:40rpx}.bottom{position:absolute;bottom:0;height:40%;background:#fff;width:100%;display:-webkit-box;display:-webkit-flex;display:flex;border-top:1px solid #ddd;font-size:50rpx}.botLeft{width:75%}.botLeft view{height:25%;display:-webkit-box;display:-webkit-flex;display:flex;border-bottom:1px solid #ddd}.botLeft view:last-child{border:none}.botLeft view:last-child text:first-child{width:66.7%}.botLeft view:last-child text:last-child{width:33.3%}.botLeft view text{-webkit-box-flex:1;-webkit-flex:1;flex:1;height:100%;display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;border-right:1px solid #ddd}.botLeft view:last-child text{-webkit-box-flex:initial;-webkit-flex:initial;flex:initial}.botRight{width:25%}.rightOne{height:25%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;border-bottom:1px solid #ddd}.rightTwo{height:75%;border:none;color:#fff;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}@-webkit-keyframes dis{from{opacity:0}to{opacity:1}}@keyframes dis{from{opacity:0}to{opacity:1}}
\ No newline at end of file \ No newline at end of file
{
"condition": {
"plugin": {
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": [
{
"name": "pages/ourPayment/ourPayment",
"pathName": "pages/ourPayment/ourPayment",
"query": "",
"scene": null
}
]
}
}
}
\ No newline at end of file
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
...@@ -211,7 +211,6 @@ __webpack_require__.r(__webpack_exports__); ...@@ -211,7 +211,6 @@ __webpack_require__.r(__webpack_exports__);
// //
// //
// //
//
var _default = var _default =
{ {
data: function data() { data: function data() {
......
...@@ -97,13 +97,12 @@ var render = function() { ...@@ -97,13 +97,12 @@ var render = function() {
var _vm = this var _vm = this
var _h = _vm.$createElement var _h = _vm.$createElement
var _c = _vm._self._c || _h var _c = _vm._self._c || _h
var g0 = var m0 = _vm.chooseCouponObj ? parseFloat(_vm.savedMoney.toFixed(2)) : null
_vm.chooseCouponObj != "" ? _vm.chooseCouponObj.savedMoney.toFixed(2) : null
_vm.$mp.data = Object.assign( _vm.$mp.data = Object.assign(
{}, {},
{ {
$root: { $root: {
g0: g0 m0: m0
} }
} }
) )
...@@ -218,8 +217,6 @@ __webpack_require__.r(__webpack_exports__); ...@@ -218,8 +217,6 @@ __webpack_require__.r(__webpack_exports__);
...@@ -251,6 +248,7 @@ __webpack_require__.r(__webpack_exports__); ...@@ -251,6 +248,7 @@ __webpack_require__.r(__webpack_exports__);
companyId: "", //公司Id companyId: "", //公司Id
merchantId: "", //商户Id merchantId: "", //商户Id
name: "", //商家名称 name: "", //商家名称
payType: 42, //支付类型,微信小程序支付
paySign: "", //签名 paySign: "", //签名
signType: "", //签名方式 signType: "", //签名方式
timeStamp: "", //时间戳 timeStamp: "", //时间戳
...@@ -259,16 +257,46 @@ __webpack_require__.r(__webpack_exports__); ...@@ -259,16 +257,46 @@ __webpack_require__.r(__webpack_exports__);
flag: "", //setTimeout函数 flag: "", //setTimeout函数
couponData: "", //所有劵数据 couponData: "", //所有劵数据
chooseCouponObj: "", //默认选中最优价格优惠券 chooseCouponObj: "", //默认选中最优价格优惠券
savedMoney: 0, //优惠金额
ableConpon: "", //没有可用优惠券时,达到一定条件可用,显示达到的条件 ableConpon: "", //没有可用优惠券时,达到一定条件可用,显示达到的条件
orderSource: 8, //1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口、7平台快捷买单、8扫码支付 orderSource: 8, //1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口、7平台快捷买单、8扫码支付
background: "", //普通按钮背景颜色 background: "", //普通按钮背景颜色
payBackground: "#1dce2e" //支付背景颜色 spaceBackground: "", //回格按钮背景颜色
}; payBackground: "#1dce2e", //支付背景颜色
leftList: [//左侧按钮数据
{
child: [
{ text: 1, background: "" },
{ text: 2, background: "" },
{ text: 3, background: "" }] },
{
child: [
{ text: 4, background: "" },
{ text: 5, background: "" },
{ text: 6, background: "" }] },
{
child: [
{ text: 7, background: "" },
{ text: 8, background: "" },
{ text: 9, background: "" }] },
{
child: [
{ text: 0, background: "" },
{ text: '.', background: "" }] }] };
}, },
onLoad: function onLoad(option) { onLoad: function onLoad(option) {
this.option = decodeURIComponent(option.q); this.companyId = (new RegExp('[?|&]companyId=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(option.q)) || [, ""])[1].replace(/\+/g, '%20') || "";
// this.companyId=option.companyId this.merchantId = (new RegExp('[?|&]merchantId=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(option.q)) || [, ""])[1].replace(/\+/g, '%20') || "";
// this.merchantId=option.merchantId
if (this.merchantId) {//大商家的有merchantId if (this.merchantId) {//大商家的有merchantId
this.init(); this.init();
} else {//小商家没有merchantId } else {//小商家没有merchantId
...@@ -277,14 +305,12 @@ __webpack_require__.r(__webpack_exports__); ...@@ -277,14 +305,12 @@ __webpack_require__.r(__webpack_exports__);
this.initCoupon(); this.initCoupon();
}, },
methods: { methods: {
clickNum: function clickNum(i) {var _this = this; //---------------------------------------------------------------------输入数字 clickNum: function clickNum(i, index, a) {var _this = this; //---------------------------------------------------------------------输入数字
this.buyMoney += i; this.buyMoney += i;
this.leftList[index].child[a].background = "#dddddd";
setTimeout(function () {
_this.leftList[index].child[a].background = "";
}, 200);
clearTimeout(this.flag); clearTimeout(this.flag);
this.flag = setTimeout(function () { this.flag = setTimeout(function () {
_this.initCoupon(); _this.initCoupon();
...@@ -292,12 +318,10 @@ __webpack_require__.r(__webpack_exports__); ...@@ -292,12 +318,10 @@ __webpack_require__.r(__webpack_exports__);
}, },
clickEnter: function clickEnter() {var _this2 = this; //---------------------------------------------------------------------退格 clickEnter: function clickEnter() {var _this2 = this; //---------------------------------------------------------------------退格
this.buyMoney = this.buyMoney.substr(0, this.buyMoney.length - 1); this.buyMoney = this.buyMoney.substr(0, this.buyMoney.length - 1);
this.spaceBackground = "#dddddd";
setTimeout(function () {
_this2.spaceBackground = "";
}, 200);
clearTimeout(this.flag); clearTimeout(this.flag);
this.flag = setTimeout(function () { this.flag = setTimeout(function () {
_this2.initCoupon(); _this2.initCoupon();
...@@ -353,27 +377,33 @@ __webpack_require__.r(__webpack_exports__); ...@@ -353,27 +377,33 @@ __webpack_require__.r(__webpack_exports__);
this.$request("wechatUser/myPage/usableCouponList", data).then(function (res) { this.$request("wechatUser/myPage/usableCouponList", data).then(function (res) {
if (res.code == "00") { if (res.code == "00") {
_this5.couponData = res.data; _this5.chooseCouponObj = res.data.masterSlaveCouponList[0];
if (res.data.usableCouponList.length > 0) { if (_this5.chooseCouponObj.slaveList.length > 0) {
res.data.usableCouponList.forEach(function (item) {//获取最优券 _this5.savedMoney = _this5.chooseCouponObj.slaveList[0].savedMoney;
savedMoneyList.push(item.savedMoney);
});
var maxMoney = Math.max.apply(null, savedMoneyList);
var index = res.data.usableCouponList.findIndex(function (item) {
return maxMoney == item.savedMoney;
});
if (index > -1) {
_this5.chooseCouponObj = res.data.usableCouponList[index];
}
} else { } else {
if (res.data.unusableCouponList.length > 0) { _this5.savedMoney = _this5.chooseCouponObj.savedMoney;
res.data.unusableCouponList.forEach(function (item, i) {//没有可用优惠券,有达到条件可以用的优惠券,先显示条件,达到条件时显示可用优惠券
if (item.isProduct == 1) {
_this5.ableConpon = item;
}
});
}
} }
// this.couponData = res.data
// if (res.data.usableCouponList.length > 0) {
// res.data.usableCouponList.forEach((item) => { //获取最优券
// savedMoneyList.push(item.savedMoney)
// })
// let maxMoney = Math.max.apply(null, savedMoneyList)
// let index = res.data.usableCouponList.findIndex((item) => {
// return maxMoney == item.savedMoney
// })
// if(index>-1){
// this.chooseCouponObj = res.data.usableCouponList[index]
// }
// } else {
// if (res.data.unusableCouponList.length > 0) {
// res.data.unusableCouponList.forEach((item, i) => { //没有可用优惠券,有达到条件可以用的优惠券,先显示条件,达到条件时显示可用优惠券
// if (item.isProduct == 1) {
// this.ableConpon = item
// }
// })
// }
// }
} }
}); });
}, },
......
<view class="bigBox"><view class="top"><view class="topName"><text class="topIcon"><text class="iconfont icon-tubiaolunkuo-"></text></text><text>{{name}}</text></view><view class="topMoney"><text class="moneyText">支付金额</text><view class="moneyNumber"><text class="iconfont icon-fl-renminbi" style="font-size:56rpx;"></text><text>{{buyMoney}}</text><text></text></view></view><block wx:if="{{couponData.usableCouponList&&couponData.usableCouponList.length>0&&chooseCouponObj==''}}"><view data-event-opts="{{[['tap',[['showCoupon']]]]}}" class="topCoupon" bindtap="__e"><view class="couponLeft"><text>券</text><text>{{couponData.usableCouponList[0].couponName}}</text></view><view class="couponRight"><text>未选优惠券</text><text class="iconfont icon-you" style="font-size:32rpx;"></text></view></view></block><block wx:if="{{chooseCouponObj!=''}}"><view data-event-opts="{{[['tap',[['showCoupon']]]]}}" class="topCoupon" bindtap="__e"><view class="couponLeft"><text>券</text><text>{{chooseCouponObj.couponName}}</text></view><view class="couponRight"><text>-</text><text>{{$root.g0}}</text><text class="iconfont icon-you" style="font-size:32rpx;"></text></view></view></block><block wx:if="{{ableConpon!=''}}"><view data-event-opts="{{[['tap',[['showCoupon']]]]}}" class="topCoupon" bindtap="__e"><view class="couponLeft"><text>券</text><text>{{ableConpon.couponName}}</text></view><view class="couponRight"><text>{{ableConpon.couponRule}}</text><text class="iconfont icon-you" style="font-size:32rpx;"></text></view></view></block></view><view class="middle">友情提示:请核对以上付款金额、付款商户等信息与交易一致。经您确认支付的金额,商家不会退回亦无赔偿义务。</view><view class="bottom"><view class="botLeft"><view><text data-ref="1" data-event-opts="{{[['tap',[['clickNum',[1]]]]]}}" class="vue-ref" bindtap="__e">1</text><text data-ref="2" data-event-opts="{{[['tap',[['clickNum',[2]]]]]}}" class="vue-ref" bindtap="__e">2</text><text data-ref="3" data-event-opts="{{[['tap',[['clickNum',[3]]]]]}}" class="vue-ref" bindtap="__e">3</text></view><view><text data-ref="4" data-event-opts="{{[['tap',[['clickNum',[4]]]]]}}" class="vue-ref" bindtap="__e">4</text><text data-ref="5" data-event-opts="{{[['tap',[['clickNum',[5]]]]]}}" class="vue-ref" bindtap="__e">5</text><text data-ref="6" data-event-opts="{{[['tap',[['clickNum',[6]]]]]}}" class="vue-ref" bindtap="__e">6</text></view><view><text data-ref="7" data-event-opts="{{[['tap',[['clickNum',[7]]]]]}}" class="vue-ref" bindtap="__e">7</text><text data-ref="8" data-event-opts="{{[['tap',[['clickNum',[8]]]]]}}" class="vue-ref" bindtap="__e">8</text><text data-ref="9" data-event-opts="{{[['tap',[['clickNum',[9]]]]]}}" class="vue-ref" bindtap="__e">9</text></view><view><text data-ref="0" data-event-opts="{{[['tap',[['clickNum',[0]]]]]}}" class="vue-ref" style="width:66.7%;" bindtap="__e">0</text><text data-ref="." data-event-opts="{{[['tap',[['clickNum',['.']]]]]}}" class="vue-ref" style="width:33.3%;" bindtap="__e">.</text></view></view><view class="botRight"><view data-ref="enter" data-event-opts="{{[['tap',[['clickEnter']]]]}}" class="rightOne vue-ref" bindtap="__e"><text class="iconfont icon-im_huige" style="font-size:70rpx;"></text></view><view data-ref="pay" data-event-opts="{{[['tap',[['clickPay']]]]}}" class="rightTwo vue-ref" style="{{'background:'+(payBackground)+';'}}" bindtap="__e"><view>立即</view><view>支付</view></view></view></view><order-coupon class="vue-ref" vue-id="ed07b280-1" couponData="{{couponData}}" chooseCouponObj="{{chooseCouponObj}}" data-ref="orderCoupon" data-event-opts="{{[['^couponChoose',[['couponChoose']]]]}}" bind:couponChoose="__e" bind:__l="__l"></order-coupon></view> <view class="bigBox"><view class="top"><view class="topName"><text class="topIcon"><text class="iconfont icon-tubiaolunkuo-"></text></text><text>{{name}}</text></view><view class="topMoney"><text class="moneyText">支付金额</text><view class="moneyNumber"><text class="iconfont icon-fl-renminbi" style="font-size:56rpx;"></text><text>{{buyMoney}}</text><text></text></view></view><block wx:if="{{chooseCouponObj}}"><view class="topCoupon"><view class="couponLeft"><text>券</text><text>{{chooseCouponObj.couponName}}</text></view><view class="couponRight"><text style="font-weight:bold;"><text style="font-size:26rpx;font-weight:400;">-¥</text>{{''+$root.m0+''}}</text></view></view></block></view><view class="middle">友情提示:请核对以上付款金额、付款商户等信息与交易一致。经您确认支付的金额,商家不会退回亦无赔偿义务。</view><view class="bottom"><view class="botLeft"><block wx:for="{{leftList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><block wx:for="{{item.child}}" wx:for-item="items" wx:for-index="a" wx:key="a"><text data-event-opts="{{[['tap',[['clickNum',['$0',index,a],[[['leftList','',index],['child','',a,'text']]]]]]]}}" style="{{'background:'+(items.background)+';'}}" bindtap="__e">{{items.text}}</text></block></view></block></view><view class="botRight"><view data-event-opts="{{[['tap',[['clickEnter']]]]}}" class="rightOne" style="{{'background:'+(spaceBackground)+';'}}" bindtap="__e"><text class="iconfont icon-im_huige" style="font-size:70rpx;"></text></view><view data-ref="pay" data-event-opts="{{[['tap',[['clickPay']]]]}}" class="rightTwo vue-ref" style="{{'background:'+(payBackground)+';'}}" bindtap="__e"><view>立即</view><view>支付</view></view></view></view></view>
\ No newline at end of file \ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
background: #FFFFFF; background: #FFFFFF;
} }
.topName { .topName {
font-size: 28rpx; font-size: 30rpx;
font-weight: bold; font-weight: bold;
padding-top: 50rpx; padding-top: 50rpx;
display: -webkit-box; display: -webkit-box;
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
font-weight: 400; font-weight: 400;
} }
.topMoney { .topMoney {
padding: 80rpx 24rpx 35rpx 24rpx; padding: 80rpx 24rpx 24rpx 24rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
font-weight: bold; font-weight: bold;
} }
.moneyNumber text:nth-child(2) { .moneyNumber text:nth-child(2) {
font-size: 58rpx; font-size: 62rpx;
font-weight: bold; font-weight: bold;
position: relative; position: relative;
left: -6rpx; left: -6rpx;
...@@ -147,8 +147,8 @@ ...@@ -147,8 +147,8 @@
} }
/*中间部分*/ /*中间部分*/
.middle { .middle {
padding: 60rpx 24rpx 0 24rpx; padding: 50rpx 24rpx 0 24rpx;
font-size: 22rpx; font-size: 24rpx;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
...@@ -178,6 +178,12 @@ ...@@ -178,6 +178,12 @@
.botLeft view:last-child { .botLeft view:last-child {
border: none; border: none;
} }
.botLeft view:last-child text:first-child {
width: 66.7%;
}
.botLeft view:last-child text:last-child {
width: 33.3%;
}
.botLeft view text { .botLeft view text {
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
......
...@@ -4,39 +4,10 @@ ...@@ -4,39 +4,10 @@
"ignore": [] "ignore": []
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": true,
"es6": true, "es6": true,
"enhance": false,
"postcss": true, "postcss": true,
"preloadBackgroundData": false, "minified": true
"minified": true,
"newFeature": false,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"enableEngineNative": false,
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "", "libVersion": "",
...@@ -44,15 +15,19 @@ ...@@ -44,15 +15,19 @@
"projectname": "uni-pdtravel", "projectname": "uni-pdtravel",
"condition": { "condition": {
"search": { "search": {
"current": -1,
"list": [] "list": []
}, },
"conversation": { "conversation": {
"current": -1,
"list": [] "list": []
}, },
"game": { "game": {
"current": -1,
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 0,
"list": [ "list": [
{ {
"name": "", "name": "",
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
{ {
"name": "pages/ourPayment/ourPayment", "name": "pages/ourPayment/ourPayment",
"pathName": "pages/ourPayment/ourPayment", "pathName": "pages/ourPayment/ourPayment",
"query": "", "query": "companyId=10001",
"scene": null "scene": null
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment