Handy_Cao 1 year ago
parent
commit
f568298d2e

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

@@ -88,7 +88,7 @@
     "order": {
     "order": {
         "title1": "Historical Orders",
         "title1": "Historical Orders",
         "title2": "Full-Payment Orders",
         "title2": "Full-Payment Orders",
-        "title3": "Deposit )rders",
+        "title3": "Deposit Orders",
         "feeTotal": "Service fee:",
         "feeTotal": "Service fee:",
         "goodsorder": {
         "goodsorder": {
             "buyorsell": "Select"
             "buyorsell": "Select"

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

@@ -192,13 +192,13 @@ const usedMargin = computed(() => {
 const serivcefee = computed(() => {
 const serivcefee = computed(() => {
     const { buyOrSell } = props.selectedRow.tHDetailEx
     const { buyOrSell } = props.selectedRow.tHDetailEx
     const { tradefees = [], agreeunit = 0 } = quote.value ?? {}
     const { tradefees = [], agreeunit = 0 } = quote.value ?? {}
-    const { FeeAlgorithm = 1, ExchangeValue = 0.0 } = tradefees.find((e) => e.FeeID === (buyOrSell === BuyOrSell.Buy ? 101 : 102)) ?? {}
+    const { FeeAlgorithm = 1, ExchangeValue = 0.0, MemberDefaultValue = 0.0 } = tradefees.find((e) => e.FeeID === (buyOrSell === BuyOrSell.Buy ? 101 : 102)) ?? {}
     // 比例
     // 比例
     if (FeeAlgorithm === 1) {
     if (FeeAlgorithm === 1) {
-        return enableqty.value * agreeunit * ExchangeValue
+        return enableqty.value * agreeunit * (ExchangeValue+MemberDefaultValue)
     }
     }
     // 固定
     // 固定
-    return props.selectedRow.tHDetailEx.holderAmount * ExchangeValue
+    return props.selectedRow.tHDetailEx.holderAmount * (ExchangeValue+MemberDefaultValue)
 })
 })
 
 
 // 选择联系信息
 // 选择联系信息

+ 1 - 1
src/packages/tss/views/order/list/fullpayment/Index.vue

@@ -28,7 +28,7 @@
                                 </li>
                                 </li>
                                 <li>
                                 <li>
                                     <label>{{ $t('position.goods.agreeunit') }}:</label>
                                     <label>{{ $t('position.goods.agreeunit') }}:</label>
-                                    <span>{{ item.agreeunit }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                                    <span>{{ item.agreeunit }}{{ getGoodsUnitName(item.goodsunitid) }}</span>
                                 </li>
                                 </li>
                                 <li>
                                 <li>
                                     <label>{{ $t('delivery.offline.deliveryqty') }}:</label>
                                     <label>{{ $t('delivery.offline.deliveryqty') }}:</label>