소스 검색

pay修复

junyuanz 3 년 전
부모
커밋
55621ca18a
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 2
      pages/pay/pay.wxml
  2. 2 2
      utils/request.js

+ 3 - 2
pages/pay/pay.wxml

@@ -313,9 +313,10 @@
 		<input type="text" class="nameText" placeholder="选填,请输入给商家的留言" placeholder-class="text-placeholder" bindinput="bindremark"/>
 	</view>
 	
+	
   </view>
   
- 
+ <view style="height:60px"></view>
 
   <view class="pay-footer">
     <view class="pay-footer-bar">
@@ -329,7 +330,7 @@
         	<text class="red">{{(minusTotal+yunfei) / 100}}积分</text>
         </view>
         <view wx:else style="display: inline;">
-        	<currency wx:if="{{useBalance}}" symbol="¥" value="{{afterdec - payData.dis_amount - pay_cash}}" class="red"></currency>
+        	<currency wx:if="{{useBalance}}" symbol="¥" value="{{afterdec - (payData.dis_amount>0?payData.dis_amount: pay_cash)}}" class="red"></currency>
 	        <!-- <currency wx:else symbol="¥" value="{{payData.pay_way == '' ? total+yunfei : payData.paied_price}}" class="red"></currency> -->
 	        <currency wx:else symbol="¥" value="{{payData.pay_way == '' ? minusTotal+yunfei : minusTotal+yunfei-payData.coupon_price-payData.paied_cash}}" class="red"></currency>
 	        

+ 2 - 2
utils/request.js

@@ -1,7 +1,7 @@
 // 新正式(未审批)
-// const apiHost = 'https://fohowapi.hiwavo.com/' 
+const apiHost = 'https://fohowapi.hiwavo.com/' 
 // 测试
-const apiHost = 'https://tfohowapi.hiwavo.com/'
+// const apiHost = 'https://tfohowapi.hiwavo.com/'
 
 
 function $get (url, params, success, fail) {