From a2041afee92328b304ac7211e32ab0fa8251f16e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 10 Nov 2023 00:24:00 +0800
Subject: [PATCH] 预售的尾款支付成功后的bug优化

---
 packageC/pages/presell/cart/cart.js   | 5 ++++-
 packageC/pages/presell/cart/cart.wxml | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index b9ed5a9..96e81f6 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -488,6 +488,9 @@ Page({
     //-----获取商品------
     async get_buy_goods(ord, o_sn) {
 
+        console.log('is_fwk');
+        console.log(this.data.is_fwk);
+
         if(this.data.is_fwk){
             this.get_buy_card(o_sn,ord);
             return false;
@@ -954,7 +957,7 @@ Page({
         }
         else {
             await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/list", {
-                data: { store_id: os.stoid, goods_id: order_goods.goods_id, presell_id: order_goods.prom_id }
+                data: { store_id: os.stoid, goods_id: order_goods.card_id, presell_id: order_goods.prom_id }
             }).then(re => {
                 if (re.data.code == 0 && re.data.data && re.data.data.length > 0) {
                     pre_arr = re.data.data[0];
diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index d767c8d..74c4737 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -31,11 +31,13 @@
                     <view>等待买家付尾款</view>
                     <view class="fs22">请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消</view>
                 </view>
-                <view wx:if="{{wait_fh && order.order_status!=6}}">
+                <view wx:if="{{wait_fh && order.order_status!=6 && is_fwk==0}}">
                     <view>等待商家发货</view>
                     <view class="fs22">将在{{filters.format_time(send_time,1)}}后发货</view>
                 </view>
-                <view wx:if="{{order.order_status==2}}">
+
+
+                <view wx:if="{{order.order_status==2 || (is_fwk==1 && order.pay_status==1)}}">
                     <view>待评价</view>
                     <view>{{order.order_sn}}</view>
                 </view>
--
libgit2 0.21.4