Showing
5 changed files
with
38 additions
and
10 deletions
app/models/common.js
0 → 100644
1 | import ensureModel from '../../../models/cart/ensure'; | 1 | import ensureModel from '../../../models/cart/ensure'; |
2 | import addressModel from '../../../models/home/address'; | 2 | import addressModel from '../../../models/home/address'; |
3 | -import payModel from '../../../models/pay/pay'; | 3 | +import commonModel from '../../../models/common'; |
4 | import wechatAddressUtil from '../../../utils/wechat-address'; | 4 | import wechatAddressUtil from '../../../utils/wechat-address'; |
5 | import { wechatPay } from '../../../utils/wechat-pay'; | 5 | import { wechatPay } from '../../../utils/wechat-pay'; |
6 | import Yas from '../../../common/yas'; | 6 | import Yas from '../../../common/yas'; |
@@ -356,8 +356,9 @@ Page({ | @@ -356,8 +356,9 @@ Page({ | ||
356 | ORDER_TYPE: 102 // 101购物车下单,102立即购买下单 | 356 | ORDER_TYPE: 102 // 101购物车下单,102立即购买下单 |
357 | }); | 357 | }); |
358 | 358 | ||
359 | + | ||
359 | //上报formID | 360 | //上报formID |
360 | - payModel.paySuccessConfirm({ | 361 | + commonModel.addWechatFormId({ |
361 | order_code: data.order_code, | 362 | order_code: data.order_code, |
362 | openId: app.getOpenID(), | 363 | openId: app.getOpenID(), |
363 | miniapp_type: app.getMiniappType(), | 364 | miniapp_type: app.getMiniappType(), |
@@ -47,6 +47,7 @@ Page({ | @@ -47,6 +47,7 @@ Page({ | ||
47 | goodsList: data.order_goods || [], | 47 | goodsList: data.order_goods || [], |
48 | promotionList: data.promotion_formulas || [], | 48 | promotionList: data.promotion_formulas || [], |
49 | paymentAmount: data.payment_amount, | 49 | paymentAmount: data.payment_amount, |
50 | + attribute: data.attribute, | ||
50 | links: data.links | 51 | links: data.links |
51 | }); | 52 | }); |
52 | } | 53 | } |
@@ -31,14 +31,17 @@ | @@ -31,14 +31,17 @@ | ||
31 | <text>剩余 {{payLeftTime}}</text> | 31 | <text>剩余 {{payLeftTime}}</text> |
32 | </view> | 32 | </view> |
33 | <view class="right-block"> | 33 | <view class="right-block"> |
34 | - <block wx:for="{{links}}" wx:for-item="link" wx:key="unique"> | ||
35 | - <view wx:if="{{link === 'closeOrder'}}" class="option-btn" catchtap="cancelOrder">取消订单</view> | ||
36 | - <view wx:if="{{link === 'buyNow'}}" class="option-btn red-btn" catchtap="payNow">立即付款</view> | ||
37 | - <view wx:if="{{link === 'delOrder'}}" class="option-btn" catchtap="deleteOrder">删除订单</view> | ||
38 | - <view wx:if="{{link === 'getExpress'}}" class="option-btn" catchtap="viewExpress">查看物流</view> | ||
39 | - <view wx:if="{{link === 'confirm'}}" class="option-btn red-btn" catchtap="confirmOrder">确认收货</view> | ||
40 | - <view wx:if="{{link === 'refundApply'}}" class="option-btn" catchtap="refundNow">申请退款</view> | ||
41 | - </block> | 34 | + <view wx:if="{{attribute == 9}}" class="only-app-tips">*此订单只能在APP端操作</view> |
35 | + <form bindsubmit="submitFormId" report-submit='true'> | ||
36 | + <block wx:for="{{links}}" wx:for-item="link" wx:key="unique"> | ||
37 | + <button wx:if="{{link === 'closeOrder'}}" formType="submit" class="option-btn" catchtap="cancelOrder">取消订单</button> | ||
38 | + <view wx:if="{{link === 'buyNow'}}" class="option-btn red-btn" catchtap="payNow">立即付款</view> | ||
39 | + <view wx:if="{{link === 'delOrder'}}" class="option-btn" catchtap="deleteOrder">删除订单</view> | ||
40 | + <view wx:if="{{link === 'getExpress'}}" class="option-btn" catchtap="viewExpress">查看物流</view> | ||
41 | + <button wx:if="{{link === 'confirm'}}" formType="submit" class="option-btn red-btn" catchtap="confirmOrder">确认收货</button> | ||
42 | + <button wx:if="{{link === 'refundApply'}}" formType="submit" class="option-btn" catchtap="refundNow">申请退款</button> | ||
43 | + </block> | ||
44 | + </form> | ||
42 | </view> | 45 | </view> |
43 | </view> | 46 | </view> |
44 | </view> | 47 | </view> |
@@ -72,6 +72,12 @@ page { | @@ -72,6 +72,12 @@ page { | ||
72 | float: right; | 72 | float: right; |
73 | } | 73 | } |
74 | 74 | ||
75 | +.bottom-options .only-app-tips { | ||
76 | + line-height: 60rpx; | ||
77 | + font-size: 28rpx; | ||
78 | + color: #444; | ||
79 | +} | ||
80 | + | ||
75 | .bottom-options .option-btn { | 81 | .bottom-options .option-btn { |
76 | width: 140rpx; | 82 | width: 140rpx; |
77 | height: 60rpx; | 83 | height: 60rpx; |
-
Please register or login to post a comment