From d4a0be2e6e4d0a3f74f1f89aa29723d232ed58c5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 8 Mar 2024 16:09:51 +0800
Subject: [PATCH] 积分购优化

---
 packageE/pages/cart/cart2_inte/cart2_inte.js   | 2 +-
 packageE/pages/cart/cart2_inte/cart2_inte.wxml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js
index 3fe3185..fa2fd0d 100644
--- a/packageE/pages/cart/cart2_inte/cart2_inte.js
+++ b/packageE/pages/cart/cart2_inte/cart2_inte.js
@@ -1233,7 +1233,7 @@ Page({
 
       var integrals = 0;
       var get_datas = {
-        user_id: getApp().globalData.user_id, store_id: o.stoid,
+        user_id: getApp().globalData.user_id, store_id: os.stoid,
       };
       await getApp().request.promiseGet("/api/weshop/users/getAllPoints", {
         data: get_datas
diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.wxml b/packageE/pages/cart/cart2_inte/cart2_inte.wxml
index b3bce8a..663489e 100644
--- a/packageE/pages/cart/cart2_inte/cart2_inte.wxml
+++ b/packageE/pages/cart/cart2_inte/cart2_inte.wxml
@@ -214,10 +214,11 @@
 		</view>
 	</view>
 
+
 	<view class="btn-wrap shadow-1" wx:if="{{show_submit}}">
 		<view class="pay-amount">
 			<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
-			<view class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view>
+			<view hidden="{{can_use_ord_prom && can_use_ord_prom[bn_pick] }}" class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view>
 		</view>
 		<button disabled="{{submit || !same_ok}}"  class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
 	</view>
--
libgit2 0.21.4