浏览代码

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 年之前
父节点
当前提交
97e9bdf541
共有 2 个文件被更改,包括 3 次插入0 次删除
  1. 1 0
      pages/order/order.vue
  2. 2 0
      pages/order/orderDetail.vue

+ 1 - 0
pages/order/order.vue

@@ -311,6 +311,7 @@
 			// 支付 判断用户是否设置过支付密码
 			toPay(item) {
 				this.orderId = item.id
+				this.totalPrice = item.originalGold
 				// 判断用户是否设置过支付密码
 				existPayPwd().then(res=>{
 					console.log(res,'rrrrrr')

+ 2 - 0
pages/order/orderDetail.vue

@@ -175,6 +175,7 @@
 			},
 			// 支付 判断用户是否设置过支付密码
 			toPay() {
+				this.totalPrice = this.orderInfo.originalGold
 				// 判断用户是否设置过支付密码
 				existPayPwd().then(res=>{
 					console.log(res,'rrrrrr')
@@ -296,6 +297,7 @@
 					&:last-child {
 						flex: 1;
 						margin-left: 20upx;
+						padding: 10upx 0;
 						display: flex;
 						flex-direction: column;
 						justify-content: space-between;