fixed 修改细节

This commit is contained in:
AERWEN\26795 2023-10-19 20:50:24 +08:00
parent 562cfad803
commit 34a8f40953
6 changed files with 26 additions and 22 deletions

View File

@ -127,6 +127,7 @@ export async function genSettleDetail(params) {
storeName: "", storeName: "",
goodsCount: 0, goodsCount: 0,
deliveryFee: 0, deliveryFee: 0,
storeTotalPayAmount: 0,
storeTotalAmount: 0, storeTotalAmount: 0,
storeTotalDiscountAmount: 0, storeTotalDiscountAmount: 0,
storeTotalCouponAmount: 0, storeTotalCouponAmount: 0,
@ -149,12 +150,12 @@ export async function genSettleDetail(params) {
GoodsRequestList: storeGoodsRequestList, GoodsRequestList: storeGoodsRequestList,
CustomerAddressGuid: userAddressReq.customerAddressGuid CustomerAddressGuid: userAddressReq.customerAddressGuid
} }
getGoodsFreight(data).then((res) => { getGoodsFreight(data).then((res) => {
if (res.code === 0) { if (res.code === 0) {
resp.data.abnormalDeliveryGoodsList = storeGoodsRequestList resp.data.abnormalDeliveryGoodsList = storeGoodsRequestList
} }
storeGoods.deliveryFee = res.data storeGoods.deliveryFee = res.data
}) })
} }
// 计算优惠券价格 // 计算优惠券价格
@ -172,7 +173,8 @@ export async function genSettleDetail(params) {
}); });
} }
storeGoods.storeTotalCouponAmount = storeTotalCouponAmount; 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;
} }
}); });

View File

@ -42,13 +42,13 @@
/> />
</view> </view>
<view class="anonymous-box"> <!-- <view class="anonymous-box">
<t-checkbox bind:change="onAnonymousChange" checked="{{isAnonymous}}" color="#FA4126" /> <t-checkbox bind:change="onAnonymousChange" checked="{{isAnonymous}}" color="#FA4126" />
<view class="name">匿名评价</view> <view class="name">匿名评价</view>
</view> </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="convey-comment-title">物流服务评价</view>
<view class="rate-container"> <view class="rate-container">
<text class="rate-title">物流评价</text> <text class="rate-title">物流评价</text>
@ -77,7 +77,7 @@
/> />
</view> </view>
</view> </view>
</view> </view> -->
<view class="submit-button-container"> <view class="submit-button-container">
<t-button <t-button
content="提交" content="提交"

View File

@ -5,13 +5,13 @@
<view class="select-coupons"> <view class="select-coupons">
<view class="title">选择优惠券</view> <view class="title">选择优惠券</view>
<block wx:if="{{couponsList && couponsList.length > 0}}"> <block wx:if="{{couponsList && couponsList.length > 0}}">
<view class="info"> <!-- <view class="info">
<block wx:if="{{!selectedNum}}">你有{{couponsList.length}}张可用优惠券</block> <block wx:if="{{!selectedNum}}">你有{{couponsList.length}}张可用优惠券</block>
<block wx:else> <block wx:else>
已选中{{selectedNum}}张推荐优惠券, 共抵扣 已选中{{selectedNum}}张推荐优惠券, 共抵扣
<wr-price fill="{{false}}" price="{{reduce || 0}}" /> <wr-price fill="{{false}}" price="{{reduce || 0}}" />
</block> </block>
</view> </view> -->
<scroll-view class="coupons-list" scroll-y="true"> <scroll-view class="coupons-list" scroll-y="true">
<view class="coupons-wrap"> <view class="coupons-wrap">
<block wx:for="{{couponsList}}" wx:key="index" wx:for-item="coupon"> <block wx:for="{{couponsList}}" wx:key="index" wx:for-item="coupon">

View File

@ -435,7 +435,8 @@ Page({
invoiceData, invoiceData,
storeInfoList, storeInfoList,
submitCouponList, submitCouponList,
resSubmitCouponList resSubmitCouponList,
noteInfo
} = this.data; } = this.data;
const { const {
goodsRequestList goodsRequestList

View File

@ -87,7 +87,7 @@
<text class="order-num">共{{stores.goodsCount}}件</text> <text class="order-num">共{{stores.goodsCount}}件</text>
<text>小计</text> <text>小计</text>
<!-- <price priceUnit="yuan" class="total-price" price="{{settleDetailData.totalPayAmount}}" fill="{{false}}" decimalSmaller /> --> <!-- <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>
</view> </view>

View File

@ -7,13 +7,14 @@ import {
import Toast from 'tdesign-miniprogram/toast/index'; import Toast from 'tdesign-miniprogram/toast/index';
const menuData = [ const menuData = [
[{ [
title: '申请开店', // {
tit: '', // title: '申请开店',
url: '', // tit: '',
status: 0, // url: '',
type: 'apply-shop', // status: 0,
}, // type: 'apply-shop',
// },
{ {
title: '收货地址', title: '收货地址',
tit: '', tit: '',