优化：商品及订单优惠价格；支付说明；

api/modules/order.ts

@@ -8,7 +8,8 @@ import type {
   IOrderGoods,
   ICoupon,
   ICourseOrderCreateParams,
-  IOrderInitData
+  IOrderInitData,
+  IGoodsDiscountParams
 } from '@/types/order'
 import type { IUserInfo } from '@/types/user'
 
@@ -108,7 +109,7 @@ export const orderApi = {
    * 获取地区优惠金额
    * @param productList 商品列表
    */
-  async getDistrictAmount(productList: Array<{ productId: number; quantity: number }>) {
+  async getDistrictAmount(productList: IGoodsDiscountParams[]) {
     const res = await mainClient.request<IApiResponse<{ districtAmount: number }>>({
       url: 'book/buyOrder/getDistrictAmount',
       method: 'POST',

components/order/Confirm.vue

@@ -26,53 +26,47 @@
       <!-- 商品总价 -->
       <view class="price-item">
         <text class="label">{{ $t('order.totalPrice') }}</text>
-        <text class="value">{{ totalPrice.toFixed(2) }} 天医币</text>
+        <text class="value">{{ totalAmount.toFixed(2) }} {{ t('global.coin') }}</text>
       </view>
       
       <!-- 优惠券 -->
       <!-- <coupon v-model="selectedCoupon" /> -->
       
       <!-- 活动立减 -->
-      <view v-if="hasActivityDiscount" class="price-item">
+      <view v-if="promotionDiscounted > 0" class="price-item">
-        <text class="label">{{ $t('order.activityDiscount') }}</text>
+        <text class="label">{{ $t('order.promotionDiscounted') }}</text>
-        <text class="discount-value">-￥{{ activityDiscountAmount.toFixed(2) }}</text>
+        <text class="discount-value">-{{ promotionDiscounted.toFixed(2) }} {{ t('global.coin') }}</text>
       </view>
       
       <!-- VIP专享立减 -->
-      <view v-if="vipPrice > 0" class="price-item">
+      <view v-if="vipDiscounted > 0" class="price-item">
         <view class="label-row">
           <text class="vip-icon">VIP</text>
           <text class="label">{{ $t('order.vipDiscount') }}</text>
         </view>
-        <text class="discount-value">-￥{{ vipPrice.toFixed(2) }}</text>
+        <text class="discount-value">-{{ vipDiscounted.toFixed(2) }} {{ t('global.coin') }}</text>
-      </view>
-      
-      <!-- 地区优惠 -->
-      <view v-if="districtAmount > 0" class="price-item">
-        <text class="label">{{ $t('order.districtDiscount') }}</text>
-        <text class="discount-value">-￥{{ districtAmount.toFixed(2) }}</text>
       </view>
       
       <!-- 积分 -->
-      <view v-if="allowPointPay && userInfo.jf > 0" class="price-item">
+      <view v-if="allowPointPay && userInfo?.jf > 0" class="price-item">
         <view class="label-row">
           <image src="/static/icon/jifen.png" class="icon-img" />
           <text class="label">{{ $t('order.points') }}</text>
           <text class="points-total">
-            ({{ $t('order.allPoints') }}：{{ userInfo.jf }})
+            ({{ $t('order.allPoints') }}：{{ userInfo?.jf || 0 }})
           </text>
         </view>
-        <text class="discount-value">-{{ jfNumber.toFixed(2) }}</text>
+        <text class="discount-value">-{{ pointsDiscounted.toFixed(2) }}</text>
       </view>
       
       <!-- 积分输入 -->
-      <view v-if="allowPointPay && userInfo.jf > 0" class="points-input-section">
+      <view v-if="allowPointPay && userInfo?.jf > 0" class="points-input-section">
         <text class="points-label">
-          {{ $t('order.maxPoints', { max: jfNumberMax }) }}
+          {{ $t('order.maxPoints', { max: pointsUsableMax }) }}
         </text>
         <view class="points-input-box">
           <input
-            v-model="jfNumber"
+            v-model="pointsDiscounted"
             type="number"
             clearable
             :placeholder="$t('order.pointsPlaceholder')"
@@ -94,7 +88,7 @@
     <view class="bottom-bar">
       <view class="total-info">
         <text class="label">{{ $t('order.total') }}：</text>
-        <text class="amount">{{ actualPayment.toFixed(2) }} 天医币</text>
+        <text class="amount">{{ finalAmount }} {{ t('global.coin') }}</text>
       </view>
       <wd-button type="primary" :loading="submitting" @click="handleSubmit">
         {{ $t('order.submit') }}
@@ -120,7 +114,7 @@
         </view>
         
         <view class="popup-footer">
-          <wd-button type="primary" block @click="handleRemarkConfirm">{{ $t('global.ok') }}</wd-button>
+          <wd-button type="primary" block @click="showRemarkPopup = false">{{ $t('global.ok') }}</wd-button>
         </view>
       </view>
     </wd-popup>
@@ -128,93 +122,66 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { orderApi } from '@/api/modules/order'
 import { t } from '@/utils/i18n'
-import type { IOrderGoods } from '@/types/order'
+import type { IGoods, IGoodsDiscountParams } from '@/types/order'
 import PayWay from '@/components/order/PayWay.vue'
 
 // 使用页面传参
 interface Props {
-  goodsList: IOrderGoods[],
+  goodsList: IGoods[],
   userInfo: object,
   allowPointPay: boolean,
+  orderType: string,
 }
 const props = withDefaults(defineProps<Props>(), {
   goodsList: () => [],
   userInfo: () => ({}),
-  allowPointPay: () => true
+  allowPointPay: () => true,
+  orderType: () => 'order',
 })
 
-// 价格相关
-const totalPrice = ref(0)
-const vipPrice = ref(0)
-const districtAmount = ref(0)
-const actualPayment = ref(0)
-
-// 积分相关
-const jfNumber = ref(0)
-const jfNumberMax = ref(0)
-
-// 优惠券相关
-
-
 // 订单备注
 const remark = ref('')
 const showRemarkPopup = ref(false)
 
+// 价格相关
+const totalAmount = ref(0) // 商品总价
+const vipDiscounted = ref(0) // VIP专享立减
+const promotionDiscounted = ref(0) // 活动优惠金额
+const couponDiscounted = ref(0) // 优惠券优惠金额
+const finalAmount = ref<string | number>('--') // 最终支付金额
+
+// 积分相关
+const pointsDiscounted = ref(0) // 积分支付金额
+const pointsUsableMax = ref(0) // 最大可用积分
+
+// 优惠券相关
+
+/**
+ * 优惠价格的请求参数
+ */
+const goodsListParams = ref<IGoodsDiscountParams[]>([])
+const getDiscountParams = (goodsList: IGoods[]) => {
+  goodsListParams.value = goodsList.map(item => ({
+    productId: item.productId,
+    quantity: item.productAmount || 1
+  }))
+}
+
+
 // 支付相关
 
 // UI状态
 const submitting = ref(false)
 
 watch(() => props.goodsList, () => {
+  getDiscountParams(props.goodsList)
   // 初始化价格
   calculateAllPrices()
 })
 
-/**
- * 是否有活动优惠
- */
-const hasActivityDiscount = computed(() => {
-  return props.goodsList.some(item => item.activityPrice && item.activityPrice > 0)
-})
-
-/**
- * 活动优惠金额
- */
-const activityDiscountAmount = computed(() => {
-  return props.goodsList.reduce((sum, item) => {
-    if (item.activityPrice && item.activityPrice > 0) {
-      return sum + (item.price - item.activityPrice) * item.productAmount
-    }
-    return sum
-  }, 0)
-})
-
-/**
- * 处理商品数量变化
- */
-const handleQuantityChange = async (item: IOrderGoods, value: number) => {
-  try {
-    // 更新购物车
-    await orderApi.updateCart({
-      productId: item.productId,
-      productAmount: value,
-      price: item.price
-    })
-    
-    // 重新获取商品列表和计算价格
-    // await getGoodsList()
-  } catch (error) {
-    console.error('更新数量失败:', error)
-    uni.showToast({
-      title: '更新失败',
-      icon: 'none'
-    })
-  }
-}
-
 /**
  * 计算所有价格
  */
@@ -223,15 +190,17 @@ const calculateAllPrices = async () => {
     // 计算商品总价
     calculateTotalPrice()
     
-    // 获取VIP优惠
+    await Promise.all([
-    // await calculateVipDiscount()
+      // 获取VIP优惠
-    
+      calculateVipDiscounted(),
-    // 获取地区优惠
+      
-    // await calculateDistrictDiscount()
+      // 获取活动优惠
-    
+      calculatePromotionDiscounted()
-    // 获取优惠券列表
+
-    // await getAvailableCoupons()
+      // 获取优惠券列表
-    
+      // await getAvailableCoupons()
+    ])
+
     // 计算最终价格
     calculateFinalPrice()
   } catch (error) {
@@ -243,8 +212,7 @@ const calculateAllPrices = async () => {
  * 计算商品总价
  */
 const calculateTotalPrice = () => {
-  console.log('商品列表:', props.goodsList)
+  totalAmount.value = props.goodsList.reduce((sum: number, item: IGoods) => {
-  totalPrice.value = props.goodsList.reduce((sum, item) => {
     // return sum + (item.price * item.productAmount)
     return sum + (item.price * 1)
   }, 0)
@@ -253,17 +221,10 @@ const calculateTotalPrice = () => {
 /**
  * 计算VIP优惠
  */
-const calculateVipDiscount = async () => {
+const calculateVipDiscounted = async () => {
-  try {
+  try {    
-    const productList = props.goodsList.map(item => ({
+    const res = await orderApi.getVipDiscountAmount(goodsListParams.value)
-      productId: item.productId,
+    vipDiscounted.value = res.discountAmount
-      quantity: item.productAmount
-    }))
-    
-    const res = await orderApi.getVipDiscountAmount(productList)
-    if (res.code === 0 && res.data) {
-      vipPrice.value = res.data.discountAmount
-    }
   } catch (error) {
     console.error('获取VIP优惠失败:', error)
   }
@@ -272,17 +233,10 @@ const calculateVipDiscount = async () => {
 /**
  * 计算活动优惠
  */
-const calculateDistrictDiscount = async () => {
+const calculatePromotionDiscounted = async () => {
-  try {
+  try {  
-    const productList = props.goodsList.map(item => ({
+    const res = await orderApi.getDistrictAmount(goodsListParams.value)
-      productId: item.productId,
+    promotionDiscounted.value = res.districtAmount
-      quantity: item.productAmount
-    }))
-    
-    const res = await orderApi.getDistrictAmount(productList)
-    if (res.code === 0 && res.data) {
-      districtAmount.value = res.data.districtAmount
-    }
   } catch (error) {
     console.error('获取地区优惠失败:', error)
   }
@@ -291,57 +245,31 @@ const calculateDistrictDiscount = async () => {
 /**
  * 获取可用优惠券
  */
-const getAvailableCoupons = async () => {
+// const getAvailableCoupons = async () => {
-  try {
+//   try {
-    const shopProductInfos = props.goodsList.map(item => {
+//     const shopProductInfos = props.goodsList.map(item => {
-      const price = item.activityPrice && item.activityPrice > 0 ? item.activityPrice : item.price
+//       const price = item.activityPrice && item.activityPrice > 0 ? item.activityPrice : item.price
-      return `${item.productId}:${price}:${item.productAmount}`
+//       return `${item.productId}:${price}:${item.productAmount}`
-    }).join(',')
+//     }).join(',')
     
-    const res = await orderApi.getCouponListPayment(shopProductInfos)
+//     const res = await orderApi.getCouponListPayment(shopProductInfos)
-    if (res.code === 0 && res.data) {
+//     if (res.code === 0 && res.data) {
-      couponList.value = res.data.couponHistoryList || []
+//       couponList.value = res.data.couponHistoryList || []
       
-      // 如果当前选中的优惠券不可用，清除选择
+//       // 如果当前选中的优惠券不可用，清除选择
-      if (selectedCoupon.value) {
+//       if (selectedCoupon.value) {
-        const stillAvailable = couponList.value.find(
+//         const stillAvailable = couponList.value.find(
-          c => c.couponId === selectedCoupon.value?.couponId && c.canUse === 1
+//           c => c.couponId === selectedCoupon.value?.couponId && c.canUse === 1
-        )
+//         )
-        if (!stillAvailable) {
+//         if (!stillAvailable) {
-          selectedCoupon.value = null
+//           selectedCoupon.value = null
-        }
+//         }
-      }
+//       }
-    }
+//     }
-  } catch (error) {
+//   } catch (error) {
-    console.error('获取优惠券失败:', error)
+//     console.error('获取优惠券失败:', error)
-  }
+//   }
-}
+// }
-
-/**
- * 计算最终价格
- */
-const calculateFinalPrice = () => {
-  // const couponAmount = selectedCoupon.value?.couponEntity.couponAmount || 0
-  const couponAmount = 0
-  
-  // 计算最大可用积分
-  const orderAmountAfterDiscount = totalPrice.value - districtAmount.value - vipPrice.value
-  jfNumberMax.value = Math.min(
-    props.userInfo.jf || 0,
-    Math.floor(orderAmountAfterDiscount - couponAmount)
-  )
-  
-  // 限制当前积分不超过最大值
-  if (jfNumber.value > jfNumberMax.value) {
-    jfNumber.value = jfNumberMax.value
-  }
-  
-  // 计算实付款
-  actualPayment.value = Math.max(
-    0,
-    totalPrice.value - couponAmount - jfNumber.value - districtAmount.value - vipPrice.value
-  )
-}
 
 /**
  * 处理积分输入
@@ -353,7 +281,7 @@ const handlePointsInput = (value: any) => {
   val = val.replace(/[^0-9]/g, '')
   
   if (val === '0' || val === '') {
-    jfNumber.value = 0
+    pointsDiscounted.value = 0
   } else {
     let numericValue = parseInt(val, 10)
     if (numericValue < 0 || isNaN(numericValue)) {
@@ -361,11 +289,11 @@ const handlePointsInput = (value: any) => {
     }
     
     // 确保不超过最大值
-    if (numericValue >= jfNumberMax.value) {
+    if (numericValue >= pointsUsableMax.value) {
-      numericValue = jfNumberMax.value
+      numericValue = pointsUsableMax.value
     }
     
-    jfNumber.value = numericValue
+    pointsDiscounted.value = numericValue
   }
   
   // 重新计算实付款
@@ -376,32 +304,52 @@ const handlePointsInput = (value: any) => {
  * 清除积分输入
  */
 const handlePointsClear = () => {
-  jfNumber.value = 0
+  pointsDiscounted.value = 0
   calculateFinalPrice()
 }
 
 /**
- * 跳转到充值页面
+ * 计算最终价格
  */
-const goToRecharge = () => {
+const calculateFinalPrice = () => {
-  uni.navigateTo({
+  // const couponAmount = selectedCoupon.value?.couponEntity.couponAmount || 0
-    url: '/pages/user/wallet/recharge/index?source=order'
+  const couponAmount = 0
-  })
+  
-}
+  // 计算最大可用积分
-
+  const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value
-/**
+  pointsUsableMax.value = Math.min(
- * 确认备注
+    props?.userInfo?.jf || 0,
- */
+    Math.floor(orderAmountAfterDiscount - couponAmount)
-const handleRemarkConfirm = () => {
+  )
-  showRemarkPopup.value = false
+  
+  // 限制当前积分不超过最大值
+  if (pointsDiscounted.value > pointsUsableMax.value) {
+    pointsDiscounted.value = pointsUsableMax.value
+  }
+  
+  // 计算实付款
+  const result = Math.max(
+    0,
+    totalAmount.value - couponAmount - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value
+  )
+  finalAmount.value = result.toFixed(2)
 }
 
 /**
  * 验证订单
  */
 const validateOrder = (): boolean => {
+  // 验证实付金额是否计算完成
+  if (typeof finalAmount.value != 'number') {
+    uni.showToast({
+      title: t('order.invalidPaymentAmount'),
+      icon: 'none'
+    })
+    return false
+  }
+
   // 验证天医币余额
-  if (actualPayment.value > props.userInfo.peanutCoin) {
+  if (finalAmount.value > props.userInfo.peanutCoin) {
     uni.showToast({
       title: t('order.insufficientBalance'),
       icon: 'none'
@@ -425,9 +373,7 @@ const handleSubmit = async () => {
   }
   
   // 验证订单
-  if (!validateOrder()) {
+  if (!validateOrder()) return
-    return
-  }
   
   try {
     submitting.value = true
@@ -459,31 +405,27 @@ const createOrder = async (): Promise<string | null> => {
     const orderParams = {
       userId: props.userInfo.id,
       paymentMethod: 4, // 天医币
-      orderMoney: totalPrice.value,
+      orderMoney: totalAmount.value,
-      realMoney: actualPayment.value,
+      realMoney: finalAmount.value,
-      jfDeduction: jfNumber.value,
+      pointsDeduction: pointsDiscounted.value,
       // couponId: selectedCoupon.value?.id,
       // couponName: selectedCoupon.value?.couponEntity.couponName,
-      // vipDiscountAmount: vipPrice.value,
+      vipDiscountAmount: vipDiscounted.value,
-      // districtMoney: districtAmount.value,
+      districtMoney: promotionDiscounted.value,
       remark: remark.value,
-      productList: props.goodsList.map(item => ({
+      productList: goodsListParams.value,
-        productId: item.productId,
+      orderType: props.orderType,
-        quantity: item.productAmount || 1
-      })),
-      orderType: 'order',
       come: 10
     }
     
     const res = await orderApi.placeCourseOrder(orderParams)
     
-    if (res.code === 0 && res.orderSn) {
+    if (res.orderSn) {
       return res.orderSn
     }
-    
     return null
   } catch (error) {
-    console.error('创建订单失败:', error)
+    console.error('下单失败:', error)
     throw error
   }
 }

components/order/GoodsPrice.vue

@@ -0,0 +1,72 @@
+<template>
+  <view class="price-info">
+    <text class="price">{{ goodsPrice.lowestPrice }} {{ t('global.coin') }}</text>
+    <text class="price-label">{{ goodsPrice.priceLabel }}</text>
+    <text v-if="goodsPrice.priceLabel" class="original-price">{{ props.goods.price }} {{ t('global.coin') }}</text>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { useUserStore } from '@/stores/user'
+import { calculateLowestPrice } from '@/utils/index'
+import { t } from '@/utils/i18n'
+import type { IGoods } from '@/types/order'
+
+const userStore = useUserStore()
+
+interface Props {
+  goods: IGoods
+}
+const props = defineProps<Props>()
+
+// 计算商品价格
+const goodsPrice = computed(() => {
+  const { activityPrice, vipPrice, price } = props.goods
+  const isVipUser = userStore.userVips && userStore.userVips.length > 0
+  const priceLabel = {
+    vipPrice: 'VIP优惠价',
+    activityPrice: '活动价',
+    price: ''
+  }
+  
+  let priceData = null
+  if (isVipUser) {
+    priceData = { activityPrice, vipPrice, price }
+  } else {
+    priceData = { activityPrice, price }
+  }
+  const lowestPrice = calculateLowestPrice(priceData)
+  
+  return {
+    lowestPrice: parseFloat(lowestPrice.value).toFixed(2),
+    priceLabel: priceLabel[lowestPrice.key as keyof typeof priceLabel]
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.price-info {
+  display: flex;
+  align-items: baseline;
+  gap: 10rpx;
+  color: #e97512;
+  
+  .price {
+    font-size: 16px;
+    font-weight: bold;
+    color: #e97512;
+  }
+  
+  .price-label {
+    font-size: 12px;
+    color: #e97512;
+  }
+  
+  .original-price {
+    font-size: 12px;
+    color: #8a8a8a;
+    text-decoration: line-through;
+  }
+}
+</style>

components/order/GoodsSelector.vue

@@ -2,18 +2,14 @@
   <wd-popup 
     v-model="visible" 
     position="bottom"
-    @close="handleClose"
   >
     <view class="goods-selector">
       <view v-if="selectedIndex !== -1" class="goods-info-mini">
         <image :src="goods[selectedIndex].productImages" mode="aspectFit" class="goods-cover" />
         <view class="info">
           <view class="name">{{ goods[selectedIndex].productName }}</view>
-          <view class="price-info">
+          <!-- 商品价格组件 -->
-            <text class="price">{{ selectedGoodsPrice.lowestPrice }} 天医币</text>
+          <GoodsPrice :goods="goods[selectedIndex]" />
-            <text class="price-label">{{ selectedGoodsPrice.priceLabel }}</text>
-            <text v-if="selectedGoodsPrice.priceLabel" class="original-price">{{ goods[selectedIndex].price }} 天医币</text>
-          </view>
         </view>
       </view>
       
@@ -32,11 +28,8 @@
           <view class="goods-info">
             <text class="goods-name">{{ item.productName }}</text>
 
-            <view class="price-info">
+            <!-- 商品价格组件 -->
-              <text class="price">{{ calculatePrice(item).lowestPrice }} 天医币</text>
+            <GoodsPrice :goods="item" />
-              <text class="price-label">{{ calculatePrice(item).priceLabel }}</text>
-              <text v-if="calculatePrice(item).priceLabel" class="original-price">{{ item.price }} 天医币</text>
-            </view>
           </view>
         </view>
       </view>
@@ -52,12 +45,10 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useUserStore } from '@/stores/user'
-import { calculateLowestPrice } from '@/utils/index'
 import type { IGoods } from '@/types/order'
+import GoodsPrice from '@/components/order/GoodsPrice.vue';
 
 const { t } = useI18n()
-const userStore = useUserStore()
 
 interface Props {
   show: boolean
@@ -80,38 +71,8 @@ const visible = computed({
   }
 })
 
-// 计算商品价格
+// 选中商品的索引
-const calculatePrice = (goods: IGoods) => {
-  const { activityPrice, vipPrice, price } = goods
-  const isVipUser = userStore.userVips && userStore.userVips.length > 0
-  const priceLabel = {
-    vipPrice: 'VIP优惠价',
-    activityPrice: '活动价',
-    price: ''
-  }
-  
-  let priceData = null
-  if (isVipUser) {
-    priceData = { activityPrice, vipPrice, price }
-  } else {
-    priceData = { activityPrice, price }
-  }
-  const lowestPrice = calculateLowestPrice(priceData)
-  
-  return {
-    lowestPrice: parseFloat(lowestPrice.value).toFixed(2),
-    priceLabel: priceLabel[lowestPrice.key as keyof typeof priceLabel]
-  }
-}
-
 const selectedIndex = ref(-1)
-// 选中商品的价格
-const selectedGoodsPrice = computed(() => {
-  if (selectedIndex.value === -1) return 0
-  const selectedGoods = props.goods[selectedIndex.value]
-  return calculatePrice(selectedGoods)
-})
-
 /**
  * 选择商品
  */
@@ -135,13 +96,6 @@ const handleConfirm = () => {
   emit('confirm', props.goods[selectedIndex.value])
 }
 
-/**
- * 关闭选择器
- */
-const handleClose = () => {
-  emit('close')
-}
-
 // 监听显示状态，重置选择
 watch(() => props.show, (newVal: boolean) => {
   if (newVal && props.goods.length > 0) {
@@ -175,30 +129,6 @@ watch(() => props.show, (newVal: boolean) => {
   }
 }
 
-.price-info {
-  display: flex;
-  align-items: baseline;
-  gap: 10rpx;
-  color: #e97512;
-  
-  .price {
-    font-size: 16px;
-    font-weight: bold;
-    color: #e97512;
-  }
-  
-  .price-label {
-    font-size: 12px;
-    color: #e97512;
-  }
-  
-  .original-price {
-    font-size: 12px;
-    color: #8a8a8a;
-    text-decoration: line-through;
-  }
-}
-
 .goods-info-mini {
   display: flex;
   align-items: center;
@@ -226,10 +156,10 @@ watch(() => props.show, (newVal: boolean) => {
 
     .price-info {
       padding-top: 20rpx;
-    }
+
-    
+      :deep(.price) {
-    .price {
+        font-size: 36rpx;
-      font-size: 36rpx;
+      }
     }
   }
 }

components/order/PayWay.vue

@@ -4,7 +4,7 @@
     <view class="payment-item">
       <view class="payment-left">
         <image src="/static/icon/pay_3.png" class="payment-icon" />
-        <text class="">{{ $t('order.virtualCoin') }}</text>
+        <text class="">{{ $t('global.coin') }}</text>
         <text class="text-[#7dc1f0]">
           ({{ $t('order.balance') }}：{{ peanutCoin || 0 }})
         </text>
@@ -25,19 +25,12 @@
         <view class="tip-title">{{ $t('order.paymentTipTitle') }}</view>
         <view class="tip-item">{{ $t('order.paymentTip1') }}</view>
         <view class="tip-item">
-          {{ $t('order.paymentTip2') }}
+          {{ $t('order.paymentTip2-1') }}
-          <text class="link-text" @click="makePhoneCall('022-24142321')">022-24142321</text>
+          <text class="link-text" @click="copyToClipboard('yilujiankangkefu')">yilujiankangkefu</text>
-        </view>
+          {{ $t('order.paymentTip2-2') }}
-        <view class="tip-item">
+          <text class="link-text" @click="copyToClipboard('AmazingLimited@163.com')">
-          {{ $t('order.paymentTip3') }}
+            AmazingLimited@163.com
-          <text class="link-text" @click="copyToClipboard('publisher@tmrjournals.com')">
-            publisher@tmrjournals.com
           </text>
-          {{ $t('order.paymentTip3_1') }}
-          <text class="link-text" @click="copyToClipboard('yilujiankangkefu')">
-            yilujiankangkefu
-          </text>
-          {{ $t('order.paymentTip3_2') }}
         </view>
       </view>
     </view>
@@ -53,6 +46,15 @@ const props = defineProps({
     default: 0
   }
 })
+
+/**
+ * 跳转到充值页面
+ */
+const goToRecharge = () => {
+  uni.navigateTo({
+    url: '/pages/user/wallet/recharge/index?source=order'
+  })
+}
 </script>
 
 <style lang="scss" scoped>

components/order/ProductInfo.vue

@@ -9,7 +9,7 @@
       <view class="order-item-product-name" v-html="title"></view>
     </view>
     <view class="order-item-product-price">
-      <view class="price">{{ price }} 天医币</view>
+      <view class="price">{{ price }} {{ t('global.coin') }}</view>
       <view class="count">x {{ 1 }}</view>
     </view>
   </view>

locale/en.json

@@ -16,7 +16,8 @@
     "dataNull": "No data available",
     "networkConnectionError": "Network connection error.",
     "loginExpired": "Login expired. Please log in again.",
-    "requestException": "Request exception"
+    "requestException": "Request exception",
+    "coin": "Coin"
   },
   "tabar.course": "COURSE",
   "tabar.book": "EBOOK",
@@ -237,7 +238,6 @@
     "amount": "Amount",
     "paymentMethod": "Payment Method",
     "googlePay": "Google Pay",
-    "virtualCoin": "Virtual Coin",
     "balance": "Balance",
     "confirm": "Confirm Order",
     "creating": "Creating order...",
@@ -246,6 +246,7 @@
     "paymentFailed": "Payment failed",
     "paymentCancelled": "Payment cancelled",
     "insufficientBalance": "Insufficient virtual coin balance",
+    "invalidPaymentAmount": "Final amount calculation incomplete",
     "googlePayNotAvailable": "Google Pay not available",
     "productNotFound": "Product not found",
     "orderCreateFailed": "Failed to create order",
@@ -420,11 +421,9 @@
     "coupon": "Coupon",
     "points": "Points",
     "vipDiscount": "VIP Exclusive Discount",
-    "activityDiscount": "Activity Discount",
+    "promotionDiscounted": "Promotion Discount",
-    "districtDiscount": "Regional Discount",
     "actualPayment": "Total",
     "paymentMethod": "Payment Method",
-    "virtualCoin": "Virtual Coin",
     "balance": "Balance",
     "recharge": "Recharge Now",
     "remark": "Order Remark",
@@ -451,14 +450,11 @@
     "duplicateConfirm": "Continue",
     "duplicateCancel": "Cancel",
     "customerService": "Customer Service",
-    "paymentTip": "1 Virtual Coin = 1 CNY",
     "paymentTipTitle": "Notes",
-    "paymentTip1": "1. 1 Virtual Coin = 1 CNY",
+    "paymentTip1": "1.1 points = 1 Tianyi coin",
-    "paymentTip2": "2. For questions, please call customer service",
+    "paymentTip2-1": "2.1 For assistance, please contact our customer service on WeChat",
-    "paymentTip3": "3. Non-mainland China users can pay by credit card. Simple and fast, recommended! Credit cards with Visa or MasterCard logos are accepted. Please send payment request to email",
+    "paymentTip2-2": "or by email at",
-    "paymentTip3_1": "(click to copy) with course name, amount, registered name and phone number, or add WeChat customer service (",
+    "ensureBalance": "Ensure sufficient Tianyi coin balance",
-    "paymentTip3_2": ") (click to copy). We will send payment link within 24 hours.",
-    "ensureBalance": "Ensure sufficient virtual coin balance",
     "vipLabel": "VIP Discount",
     "activityLabel": "Activity Price",
     "vipPriceLabel": "VIP Price",

locale/zh-Hans.json

@@ -16,7 +16,8 @@
     "dataNull": "暂无数据",
     "networkConnectionError": "网络连接错误。",
     "loginExpired": "登录失效，请重新登录。",
-    "requestException": "请求异常"
+    "requestException": "请求异常",
+    "coin": "天医币"
   },
   "tabar.course": "课程",
   "tabar.book": "图书",
@@ -264,7 +265,6 @@
     "amount": "金额",
     "paymentMethod": "支付方式",
     "googlePay": "Google Pay",
-    "virtualCoin": "虚拟币",
     "balance": "余额",
     "confirm": "确认下单",
     "creating": "创建订单中...",
@@ -421,11 +421,9 @@
     "coupon": "优惠券",
     "points": "积分",
     "vipDiscount": "VIP专享立减",
-    "activityDiscount": "活动立减",
+    "promotionDiscounted": "活动立减",
-    "districtDiscount": "地区优惠",
     "actualPayment": "实付款",
     "paymentMethod": "支付方式",
-    "virtualCoin": "天医币",
     "balance": "余额",
     "recharge": "立即充值",
     "remark": "订单备注",
@@ -444,6 +442,7 @@
     "pointsPlaceholder": "请输入积分",
     "allPoints": "全部积分",
     "insufficientBalance": "天医币余额不足",
+    "invalidPaymentAmount": "实付金额计算未完成",
     "orderCreating": "正在请求订单",
     "orderSuccess": "购买成功",
     "orderFailed": "失败,请重新下单",
@@ -452,13 +451,10 @@
     "duplicateConfirm": "继续操作",
     "duplicateCancel": "点错了",
     "customerService": "客服",
-    "paymentTip": "1天医币 = 1元人民币",
     "paymentTipTitle": "说明",
-    "paymentTip1": "1. 1天医币 = 1元人民币",
+    "paymentTip1": "1. 1积分=1天医币",
-    "paymentTip2": "2.若有疑问或意见请致电客服",
+    "paymentTip2-1": "2. 若有疑问请加客服微信：{ customerServiceWechat }  { customerServiceEmail }",
-    "paymentTip3": "3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱",
+    "paymentTip2-2": "或邮箱联系",
-    "paymentTip3_1": "（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（",
-    "paymentTip3_2": "）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。",
     "ensureBalance": "确保您的天医币足够支付",
     "vipLabel": "VIP优惠",
     "activityLabel": "活动价",

pages/book/index.vue

@@ -162,7 +162,7 @@
           >
             <image :src="item.images" />
             <text class="book-text">{{ item.name }}</text>
-            <text class="book-price">{{ item.minPrice }} 天医币</text>
+            <text class="book-price">{{ item.minPrice }} {{ t('global.coin') }}</text>
             <text v-if="formatStats(item)" class="book-flag">{{
               formatStats(item)
             }}</text>

pages/order/goodsConfirm.vue

@@ -26,28 +26,8 @@
           <!-- 商品信息 -->
           <view class="goods-info">
             <text class="goods-name">{{ item.productName }}</text>
-            
+            <!-- 商品价格组件 -->
-            <!-- 价格信息 -->
+            <GoodsPrice :goods="item" />
-            <view class="price-info">
-              <!-- VIP优惠价 -->
-              <!-- <view v-if="item.isVipPrice === 1 && item.vipPrice" class="price-row">
-                <text class="vip-price">￥{{ item.vipPrice.toFixed(2) }}</text>
-                <text class="vip-label">{{ $t('order.vipPriceLabel') }}</text>
-                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
-              </view> -->
-              
-              <!-- 活动价 -->
-              <!-- <view v-else-if="item.activityPrice && item.activityPrice > 0" class="price-row">
-                <text class="activity-price">￥{{ item.activityPrice.toFixed(2) }}</text>
-                <text class="activity-label">{{ $t('order.activityLabel') }}</text>
-                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
-              </view> -->
-              
-              <!-- 普通价格 -->
-              <view class="price-row">
-                <text class="normal-price">{{ item.price.toFixed(2) }} 天医币</text>
-              </view>
-            </view>
             
             <!-- 数量 -->
             <!-- <view class="quantity-row">
@@ -69,16 +49,17 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { orderApi } from '@/api/modules/order'
-import Confirm from '@/components/order/Confirm.vue';
 import type { IOrderGoods } from '@/types/order'
+import Confirm from '@/components/order/Confirm.vue';
+import GoodsPrice from '@/components/order/GoodsPrice.vue';
 
 /**
  * 获取用户信息
  */
-const userInfo = ref(null)
+const userInfo = ref({})
 const getUserInfo = async () => {
   try {
     const res = await orderApi.getUserInfo()
@@ -181,43 +162,6 @@ onLoad(async (options: any) => {
       overflow: hidden;
     }
     
-    .price-info {
-      .price-row {
-        display: flex;
-        align-items: baseline;
-        gap: 10rpx;
-        
-        .vip-price,
-        .activity-price {
-          font-size: 32rpx;
-          font-weight: bold;
-          color: #e97512;
-        }
-        
-        .normal-price {
-          font-size: 32rpx;
-          font-weight: bold;
-          color: #333;
-        }
-        
-        .vip-label {
-          font-size: 22rpx;
-          color: #fa2d12;
-        }
-        
-        .activity-label {
-          font-size: 22rpx;
-          color: #613804;
-        }
-        
-        .original-price {
-          font-size: 24rpx;
-          color: #999;
-          text-decoration: line-through;
-        }
-      }
-    }
-    
     .quantity-row {
       display: flex;
       align-items: center;

pages/user/index.vue

@@ -44,7 +44,7 @@
 			<view class="vip-card wallet_l">
 				<view class="assets">
 					<view @click="goVirtualList">
-						<view class="assets_row">天医币</view>
+						<view class="assets_row">{{ t('global.coin') }}</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
 					<view>

pages/user/order/index.vue

@@ -27,7 +27,7 @@
         <ProductInfo v-if="order.orderType === 'abroadBook'" :data="order.bookEntity" :type="order.orderType" />
         <ProductInfo v-if="order.orderType === 'vip'" :data="order.vipBuyConfigEntity" :type="order.orderType" />
         <!-- 三种订单类型商品信息 end -->
-        <view class="order-item-total-price">实付款：{{ order.orderMoney }} 天医币</view>
+        <view class="order-item-total-price">实付款：{{ order.orderMoney }} {{ t('global.coin') }}</view>
 
         <template #footer>
           <view>

pages/user/recharge/index.vue

@@ -9,7 +9,7 @@
 					:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
 					v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
 					<view class="recharge_money">￥{{item.money}}</view>
-					<view>{{item.realMoney}}天医币</view>
+					<view>{{item.realMoney}}{{ t('global.coin') }}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
 					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>

types/order.d.ts

@@ -13,6 +13,14 @@ export interface IGoods {
   delFlag?: number                 // 删除标记 -1-已下架
 }
 
+/**
+ * 获取优惠价格参数
+ **/
+export interface IGoodsDiscountParams {
+  productId: number
+  quantity: number
+}
+
 /**
  * 订单接口
  */