任务修改

oem/tss/locales/extras/en-US.json

@@ -133,6 +133,8 @@
             "subtitle3": "Cancellation information",
             "tips3": "Are you sure you want to cancel?",
             "tips4": "Cancellation successful",
+            "pricemove": "Acceptance Fees",
+            "expressfees": "Express Fees",
             "holddetail": {
                 "holderqty": "Order quantity",
                 "freezeqty": "Locked amount",

oem/tss/locales/extras/th-TH.json

@@ -133,6 +133,8 @@
             "subtitle3": "ข้อมูลการยกเลิกการจอง",
             "tips3": "ยืนยันว่าต้องการยกเลิกการจองหรือไม่?",
             "tips4": "ยกเลิกการจองสำเร็จ",
+            "pricemove": "ตรวจสอบค่าใช้จ่าย",
+            "expressfees": "ค่าภาษี",
             "holddetail": {
                 "holderqty": "จำนวนคำสั่งซื้อ",
                 "freezeqty": "ปริมาณที่ถูกล็อคไว้",

oem/tss/locales/extras/zh-CN.json

@@ -133,6 +133,8 @@
             "subtitle3": "退订信息",
             "tips3": "确认要退订吗？",
             "tips4": "退订成功",
+            "pricemove": "验收费",
+            "expressfees": "税费",
             "holddetail": {
                 "holderqty": "订单数量",
                 "freezeqty": "锁定量",

oem/tss/locales/extras/zh-TW.json

@@ -133,6 +133,8 @@
             "subtitle3": "退訂信息",
             "tips3": "确认要退訂吗？",
             "tips4": "退訂成功",
+            "pricemove": "驗收費",
+            "expressfees": "稅費",
             "holddetail": {
                 "holderqty": "訂單數量",
                 "freezeqty": "鎖定量",

public/locales/en-US.json

@@ -1740,6 +1740,8 @@
         "payAmount": "PayAmount",
         "price": "Price",
         "qty": "Qty",
+        "pricemove": "Acceptance Fees",
+        "expressfees": "Express Fees",
         "spec": "Spec"
     },
     "enum": {

public/locales/th-TH.json

@@ -1740,6 +1740,8 @@
         "payAmount": "ยอดที่ต้องชำระ",
         "price": "ราคาต่อหน่วย",
         "qty": "จำนวน",
+        "pricemove": "ตรวจสอบค่าใช้จ่าย",
+        "expressfees": "ค่าภาษี",
         "spec": "คุณลักษณะ"
     },
     "enum": {

public/locales/zh-CN.json

@@ -1740,7 +1740,9 @@
         "payAmount": "应付",
         "price": "单价",
         "qty": "数量",
-        "spec": "规格"
+        "spec": "规格",
+        "pricemove": "验收费",
+        "expressfees": "税费"
     },
     "enum": {
         "auth": {

public/locales/zh-TW.json

@@ -1740,6 +1740,8 @@
         "payAmount": "應付",
         "price": "單價",
         "qty": "數量",
+        "pricemove": "驗收費",
+        "expressfees": "稅費",
         "spec": "規格"
     },
     "enum": {

src/packages/mobile/views/order/position/components/pricing/detail2/components/delivery/Index.vue

@@ -24,13 +24,13 @@
                         :value="formatDecimal(usedMargin, selectedRow.decimalPlace)" />
                     <Cell v-if="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy"
                         :title="$t('position.goods.deposit')" :value="formatDecimal(deposit)" />
-                    <Cell v-if="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy" :title="$t('position.goods.fees1')"
+                    <!-- <Cell v-if="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy" :title="$t('position.goods.fees1')"
                         :value="formatDecimal(serivcefee)" />
                     <Cell v-if="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Sell" :title="$t('position.goods.fees2')"
-                        :value="formatDecimal(serivcefee)" />
+                        :value="formatDecimal(serivcefee)" /> -->
                     <Cell :title="$t('position.goods.pricemove')" :value="formatDecimal(pricemove)" />
                     <Cell :title="$t('position.goods.expressfees')" :value="formatDecimal(shipping)" />
-                    <Cell :title="$t('position.goods.otherfees')" :value="formatDecimal(otherfees)" />
+                    <!-- <Cell :title="$t('position.goods.otherfees')" :value="formatDecimal(otherfees)" /> -->
                     <Cell v-if="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy"
                         :title="$t('position.goods.deposit1')"
                         :value="formatDecimal(deposit + serivcefee + pricemove + shipping + otherfees)" />
@@ -98,7 +98,7 @@ const showContact = shallowRef(false) // 显示联系人选择列表
 const { formSubmit, formData } = useOfflineDelivery()
 const futuresStore = useFuturesStore()
 const goods = futuresStore.getGoods(props.selectedRow.goodsCode)
-const quote = futuresStore.getGoodsQuote(props.selectedRow.goodsCode)
+// const quote = futuresStore.getGoodsQuote(props.selectedRow.goodsCode)
 const { mindeliverylot = 0 } = goods ?? {}
 
 const goodsname = computed(() => {
@@ -137,36 +137,53 @@ const formRules: { [key: string]: FieldRule[] } = {
 // 升贴水
 const pricemove = computed(() => {
     const { buypricemovealgorithm, buypricemovevalue = 0.0, sellpricemovevalue = 0.0, sellpricemovealgorithm } = goods ?? {}
-    const { buyOrSell } = props.selectedRow.tHDetailEx
+    const { buyOrSell, holderAmount } = props.selectedRow.tHDetailEx
     const { agreeUnit } = props.selectedRow
     if (buyOrSell === BuyOrSell.Buy) {
-        return buypricemovealgorithm === 1 ? 0.0 : buypricemovevalue * agreeUnit * enableqty.value
+        return buypricemovealgorithm === 1 ? holderAmount * buypricemovevalue : buypricemovevalue * agreeUnit * enableqty.value
     } else {
-        return sellpricemovealgorithm === 1 ? 0.0 : sellpricemovevalue * agreeUnit * enableqty.value
+        return sellpricemovealgorithm === 1 ? holderAmount * sellpricemovevalue : sellpricemovevalue * agreeUnit * enableqty.value
     }
 })
 
+// 提货费 = 取交易费用配置 105
+// 固定: 可用量*合约单位*配置值
+// 比率：订单金额*配置值
+const serivcefee = computed(() => {
+    // const { buyOrSell } = props.selectedRow.tHDetailEx
+    // const { tradefees = [], agreeunit = 0 } = quote.value ?? {}
+    // const { FeeAlgorithm = 1, ExchangeValue = 0.0, MemberDefaultValue = 0.0 } = tradefees.find((e) => e.FeeID === (buyOrSell === BuyOrSell.Buy ? 105 : 106)) ?? {}
+    // // 固定
+    // if (FeeAlgorithm === 2) {
+    //     return enableqty.value * agreeunit * (ExchangeValue+MemberDefaultValue)
+    // }
+    // // 比例
+    // return props.selectedRow.tHDetailEx.holderAmount * (ExchangeValue+MemberDefaultValue)
+    return 0.0
+})
+
 // 其他费用
 const otherfees = computed(() => {
-    const { buyotherfeealgorithm, buyotherfeevalue = 0.0, sellotherfeevalue = 0.0, sellotherfeealgorithm } = goods ?? {}
-    const { buyOrSell } = props.selectedRow.tHDetailEx
-    const { agreeUnit } = props.selectedRow
-    if (buyOrSell === BuyOrSell.Buy) {
-        return buyotherfeealgorithm === 1 ? 0.0 : buyotherfeevalue * agreeUnit * enableqty.value
-    } else {
-        return sellotherfeealgorithm === 1 ? 0.0 : sellotherfeevalue * agreeUnit * enableqty.value
-    }
+    // const { buyotherfeealgorithm, buyotherfeevalue = 0.0, sellotherfeevalue = 0.0, sellotherfeealgorithm } = goods ?? {}
+    // const { buyOrSell } = props.selectedRow.tHDetailEx
+    // const { agreeUnit } = props.selectedRow
+    // if (buyOrSell === BuyOrSell.Buy) {
+    //     return buyotherfeealgorithm === 1 ? 0.0 : buyotherfeevalue * agreeUnit * enableqty.value
+    // } else {
+    //     return sellotherfeealgorithm === 1 ? 0.0 : sellotherfeevalue * agreeUnit * enableqty.value
+    // }
+    return 0.0
 })
 
 // 运费
 const shipping = computed(() => {
     const { buyshippingfeealgorithm, buyshippingfeevalue = 0.0, sellshippingfeevalue = 0.0, sellshippingfeealgorithm } = goods ?? {}
-    const { buyOrSell } = props.selectedRow.tHDetailEx
+    const { buyOrSell, holderAmount } = props.selectedRow.tHDetailEx
     const { agreeUnit } = props.selectedRow
     if (buyOrSell === BuyOrSell.Buy) {
-        return buyshippingfeealgorithm === 1 ? 0.0 : buyshippingfeevalue * agreeUnit * enableqty.value
+        return buyshippingfeealgorithm === 1 ? holderAmount * buyshippingfeevalue : buyshippingfeevalue * agreeUnit * enableqty.value
     } else {
-        return sellshippingfeealgorithm === 1 ? 0.0 : sellshippingfeevalue * agreeUnit * enableqty.value
+        return sellshippingfeealgorithm === 1 ? holderAmount * sellshippingfeevalue : sellshippingfeevalue * agreeUnit * enableqty.value
     }
 })
 
@@ -186,21 +203,6 @@ const usedMargin = computed(() => {
     return props.selectedRow.tHDetailEx.payedDeposit + props.selectedRow.tHDetailEx.restockDeposit
 })
 
-// 提货费 = 取交易费用配置 105
-// 固定: 可用量*合约单位*配置值
-// 比率：订单金额*配置值
-const serivcefee = computed(() => {
-    const { buyOrSell } = props.selectedRow.tHDetailEx
-    const { tradefees = [], agreeunit = 0 } = quote.value ?? {}
-    const { FeeAlgorithm = 1, ExchangeValue = 0.0, MemberDefaultValue = 0.0 } = tradefees.find((e) => e.FeeID === (buyOrSell === BuyOrSell.Buy ? 105 : 106)) ?? {}
-    // 固定
-    if (FeeAlgorithm === 2) {
-        return enableqty.value * agreeunit * (ExchangeValue+MemberDefaultValue)
-    }
-    // 比例
-    return props.selectedRow.tHDetailEx.holderAmount * (ExchangeValue+MemberDefaultValue)
-})
-
 // 选择联系信息
 const contactChange = (item: Model.UserReceiveInfoRsp) => {
     const contact = `${item.receivername} ${item.phonenum}`

src/packages/mobile/views/pricing/trade/fullpayment/Index.vue

@@ -56,15 +56,23 @@
                         <span>{{ $t('tss.serivcefee') }}：</span>
                         <span>{{ formatDecimal(serivcefee) }}</span>
                     </li>
+                    <li>
+                        <span>{{ $t('tss.pricemove') }}：</span>
+                        <span>{{ formatDecimal(pricemove) }}</span>
+                    </li>
+                    <li>
+                        <span>{{ $t('tss.expressfees') }}：</span>
+                        <span>{{ formatDecimal(shipping) }}</span>
+                    </li>
                 </ul>
                 <ul class="order-total__bottom">
                     <li>
                         <span>{{ $t('tss.totalAmount') }}：</span>
-                        <span>{{ formatDecimal(totalAmount + serivcefee) }}</span>
+                        <span>{{ formatDecimal(totalAmount + serivcefee + pricemove + shipping) }}</span>
                     </li>
                     <li>
                         <span>{{ $t('tss.payAmount') }}：</span>
-                        <span>{{ formatDecimal(totalAmount + serivcefee) }}</span>
+                        <span>{{ formatDecimal(totalAmount + serivcefee + pricemove + shipping) }}</span>
                     </li>
                 </ul>
             </div>
@@ -119,6 +127,8 @@ const futuresStore = useFuturesStore()
 const goodsCollectionStore = useGoodsCollectionStore()
 const quote = futuresStore.getGoodsQuote(props.goodsid)
 const collection = goodsCollectionStore.getGoodsById(props.collectionid)
+const goods = futuresStore.getGoods(props.goodsid)
+
 const { global: { t } } = i18n
 // 显示联系人选择列表
 const showContact = shallowRef(false)
@@ -152,6 +162,22 @@ const serivcefee = computed(() => {
     return totalAmount.value * (ExchangeValue+MemberDefaultValue)
 })
 
+// 验收费
+// 固定: 可用量*合约单位*配置值
+// 比率：订单金额*配置值
+const pricemove = computed(() => {
+    const { buypricemovealgorithm, buypricemovevalue = 0.0, agreeunit = 0.0 } = goods ?? {}
+    return buypricemovealgorithm === 1 ? totalAmount.value * buypricemovevalue : buypricemovevalue * agreeunit * props.orderQty
+})
+
+// 税费
+// 固定: 可用量*合约单位*配置值
+// 比率：订单金额*配置值
+const shipping = computed(() => {
+    const { buyshippingfeealgorithm, buyshippingfeevalue = 0.0, agreeunit = 0.0 } = goods ?? {}
+    return buyshippingfeealgorithm === 1 ? totalAmount.value * buyshippingfeevalue : buyshippingfeevalue * agreeunit * props.orderQty
+})
+
 // 委托下单
 const onSubmit = () => {
     const { goodsid, marketid } = quote.value ?? {}