Merge branch 'dev1.4' of http://222.85.201.140:10002//xuyunhui/chain_jje_uniapp into dev1.5

 Conflicts:

	pages/order/index.vue

pages/order/index.vue

@@ -436,7 +436,13 @@
 			payItem(num){
 
 				console.log(this.userInfo.balance*1,this.appointmentOrder.totalAmount*1)
-				if (this.userInfo.balance*1 < this.payAmount*1){
+
+				// if (this.loveCard.totalBalance*1 < this.appointmentOrder.totalAmount*1 && num == 0){
+				// 	uni.$u.toast('余额不足')
+				// 	return
+				// }
+
+				if (this.userInfo.balance*1 < this.payAmount*1 && num == 1){
 					uni.$u.toast('余额不足')
 					return
 				}