From 34a8f409530656f88f52cd6b96030a059b1e96ae Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Thu, 19 Oct 2023 20:50:24 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/order/orderConfirm.js                      | 16 +++++++++-------
 pages/goods/comments/create/index.wxml           |  8 ++++----
 .../components/selectCoupons/selectCoupons.wxml  |  4 ++--
 pages/order/order-confirm/index.js               |  3 ++-
 pages/order/order-confirm/index.wxml             |  2 +-
 pages/usercenter/index.js                        | 15 ++++++++-------
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/model/order/orderConfirm.js b/model/order/orderConfirm.js
index 230707d..5923678 100644
--- a/model/order/orderConfirm.js
+++ b/model/order/orderConfirm.js
@@ -127,6 +127,7 @@ export async function genSettleDetail(params) {
       storeName: "",
       goodsCount: 0,
       deliveryFee: 0,
+      storeTotalPayAmount: 0,
       storeTotalAmount: 0,
       storeTotalDiscountAmount: 0,
       storeTotalCouponAmount: 0,
@@ -149,12 +150,12 @@ export async function genSettleDetail(params) {
             GoodsRequestList: storeGoodsRequestList,
             CustomerAddressGuid: userAddressReq.customerAddressGuid
           }
-            getGoodsFreight(data).then((res) => {
-              if (res.code === 0) {
-                resp.data.abnormalDeliveryGoodsList = storeGoodsRequestList
-              }
-              storeGoods.deliveryFee = res.data
-            })
+          getGoodsFreight(data).then((res) => {
+            if (res.code === 0) {
+              resp.data.abnormalDeliveryGoodsList = storeGoodsRequestList
+            }
+            storeGoods.deliveryFee = res.data
+          })
         }
 
         // 计算优惠券价格
@@ -172,7 +173,8 @@ export async function genSettleDetail(params) {
           });
         }
         storeGoods.storeTotalCouponAmount = storeTotalCouponAmount;
-        storeGoods.storeTotalAmount += item.quantity * item.price + storeGoods.deliveryFee - storeTotalCouponAmount;
+        storeGoods.storeTotalAmount += item.quantity * item.price;
+        storeGoods.storeTotalPayAmount += item.quantity * item.price + storeGoods.deliveryFee - storeTotalCouponAmount;
 
       }
     });
diff --git a/pages/goods/comments/create/index.wxml b/pages/goods/comments/create/index.wxml
index 52cb6d8..5009beb 100644
--- a/pages/goods/comments/create/index.wxml
+++ b/pages/goods/comments/create/index.wxml
@@ -42,13 +42,13 @@
       />
     </view>
 
-    <view class="anonymous-box">
+    <!-- <view class="anonymous-box">
       <t-checkbox bind:change="onAnonymousChange" checked="{{isAnonymous}}" color="#FA4126" />
       <view class="name">匿名评价</view>
-    </view>
+    </view> -->
   </view>
 </view>
-<view class="comment-card convey-card">
+<!-- <view class="comment-card convey-card">
   <view class="convey-comment-title">物流服务评价</view>
   <view class="rate-container">
     <text class="rate-title">物流评价</text>
@@ -77,7 +77,7 @@
       />
     </view>
   </view>
-</view>
+</view> -->
 <view class="submit-button-container">
   <t-button
     content="提交"
diff --git a/pages/order/components/selectCoupons/selectCoupons.wxml b/pages/order/components/selectCoupons/selectCoupons.wxml
index 10b8898..999e6f7 100644
--- a/pages/order/components/selectCoupons/selectCoupons.wxml
+++ b/pages/order/components/selectCoupons/selectCoupons.wxml
@@ -5,13 +5,13 @@
 	<view class="select-coupons">
 		<view class="title">选择优惠券</view>
 		<block wx:if="{{couponsList && couponsList.length > 0}}">
-			<view class="info">
+			<!-- <view class="info">
 				<block wx:if="{{!selectedNum}}">你有{{couponsList.length}}张可用优惠券</block>
 				<block wx:else>
 					已选中{{selectedNum}}张推荐优惠券, 共抵扣
 					<wr-price fill="{{false}}" price="{{reduce || 0}}" />
 				</block>
-			</view>
+			</view> -->
 			<scroll-view class="coupons-list" scroll-y="true">
 				<view class="coupons-wrap">
 					<block wx:for="{{couponsList}}" wx:key="index" wx:for-item="coupon">
diff --git a/pages/order/order-confirm/index.js b/pages/order/order-confirm/index.js
index 5804f7a..7206d14 100644
--- a/pages/order/order-confirm/index.js
+++ b/pages/order/order-confirm/index.js
@@ -435,7 +435,8 @@ Page({
       invoiceData,
       storeInfoList,
       submitCouponList,
-      resSubmitCouponList
+      resSubmitCouponList,
+      noteInfo
     } = this.data;
     const {
       goodsRequestList
diff --git a/pages/order/order-confirm/index.wxml b/pages/order/order-confirm/index.wxml
index 67edfaa..b729704 100644
--- a/pages/order/order-confirm/index.wxml
+++ b/pages/order/order-confirm/index.wxml
@@ -87,7 +87,7 @@
         <text class="order-num">共{{stores.goodsCount}}件</text>
         <text>小计</text>
         <!-- <price priceUnit="yuan" class="total-price" price="{{settleDetailData.totalPayAmount}}" fill="{{false}}" decimalSmaller /> -->
-        <price priceUnit="yuan" class="total-price" price="{{stores.storeTotalAmount}}" fill="{{false}}" decimalSmaller />
+        <price priceUnit="yuan" class="total-price" price="{{stores.storeTotalPayAmount}}" fill="{{false}}" decimalSmaller />
 
       </view>
     </view>
diff --git a/pages/usercenter/index.js b/pages/usercenter/index.js
index c6cf16d..81bb51a 100644
--- a/pages/usercenter/index.js
+++ b/pages/usercenter/index.js
@@ -7,13 +7,14 @@ import {
 import Toast from 'tdesign-miniprogram/toast/index';
 
 const menuData = [
-  [{
-      title: '申请开店',
-      tit: '',
-      url: '',
-      status: 0,
-      type: 'apply-shop',
-    },
+  [
+    // {
+    //   title: '申请开店',
+    //   tit: '',
+    //   url: '',
+    //   status: 0,
+    //   type: 'apply-shop',
+    // },
     {
       title: '收货地址',
       tit: '',