任务修改；

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

@@ -0,0 +1,8 @@
+{ 
+    "enum": {
+        "BuyOrSell": {
+            "Buy": "提料",
+            "Sell": "交料"
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+   "enum": {
+        "BuyOrSell": {
+            "Buy": "提料",
+            "Sell": "交料"
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "enum": {
+        "BuyOrSell": {
+            "Buy": "提料",
+            "Sell": "交料"
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+    "enum": {
+        "BuyOrSell": {
+            "Buy": "提料",
+            "Sell": "交料"
+        }
+    }
+}

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

@@ -5,6 +5,11 @@
             "Sell": "卖料"
         }
     },
+    "user": {
+        "register": {
+            "registercode": "推荐编码"
+        }
+    },
     "mine": {
         "cashin": "付款",
         "cashout": "提现"

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

@@ -5,6 +5,11 @@
             "Sell": "卖料"
         }
     },
+    "user": {
+        "register": {
+            "registercode": "推荐编码"
+        }
+    },
     "mine": {
         "cashin": "付款",
         "cashout": "提现"

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

@@ -5,6 +5,11 @@
             "Sell": "卖料"
         }
     },
+    "user": {
+        "register": {
+            "registercode": "推荐编码"
+        }
+    },
     "mine": {
         "cashin": "付款",
         "cashout": "提现"

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

@@ -5,6 +5,11 @@
             "Sell": "卖料"
         }
     },
+    "user": {
+        "register": {
+            "registercode": "推荐编码"
+        }
+    },
     "mine": {
         "cashin": "付款",
         "cashout": "提现"

src/packages/mobile/router/section.ts

@@ -59,8 +59,13 @@ const pageRoutes: RouteRecordRaw[] = [
             },
             {
                 path: 'trade',
-                name: 'pricing-trade',
+                name: 'pricing-trade-v2',
                 component: () => import('@mobile/views/pricing/trade/v2/Index.vue'),
+            },
+            {
+                path: 'trade',
+                name: 'pricing-trade',
+                component: () => import('@mobile/views/pricing/trade/Index.vue'),
             }
         ]
     },

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

@@ -144,7 +144,7 @@
             </template>
         </Tabs>
         <template #footer>
-            <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ goodsCode, goodsid, selectedRow }"
+            <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ goodsCode, goodsid, selectedRow, quote }"
             @closed="closeComponent" v-if="componentId" />
         </template> 
     </app-view>
@@ -251,7 +251,7 @@ const components = [
 }]
     
 const componentMap = new Map<string, unknown>([
-    ['detail', defineAsyncComponent(() => import('./components/detail/Index.vue'))],
+    ['detail', defineAsyncComponent(() => import('./components/detail/Index2.vue'))],
     ['transfer', defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/components/transfer/Index.vue'))],
 ])
 

src/packages/mobile/views/pricing/trade/components/detail/Index2.vue

@@ -0,0 +1,37 @@
+<template>
+    <app-view class="market-detail">
+        <template v-if="isShow">
+            <component :is="Price" v-bind="{ goodsCode }" />
+            <component :is="Chart" v-bind="{ goodsCode }" />
+            <component :is="Tik" v-bind="{ goodsCode }" />
+        </template>
+    </app-view>
+</template>
+
+<script lang="ts" setup>
+import { defineAsyncComponent, PropType, shallowRef, watch,nextTick } from 'vue'
+
+const props = defineProps({
+    quote: {
+        type: Object as PropType<Model.GoodsQuote>,
+        required: true
+    }
+})
+
+const Price = defineAsyncComponent(() => import('@mobile/components/modules/quote/price/index.vue'))
+const Chart = defineAsyncComponent(() => import('@mobile/components/modules/hqchart/index.vue'))
+const Tik = defineAsyncComponent(() => import('@mobile/components/modules/quote/tik/index.vue'))
+
+const isShow = shallowRef(true)
+
+const goodsCode = shallowRef(props.quote.goodscode) 
+
+watch(() => props.quote, (val) => {
+    isShow.value=false
+    goodsCode.value = val.goodscode
+    nextTick(()=>{
+        isShow.value=true
+     })
+});
+
+</script>

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

@@ -82,7 +82,7 @@
                 </Button>
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)"
-                v-bind="{ goodsid, collectionid, orderType, orderQty, }" @closed="closeComponent" v-if="componentId" />
+                v-bind="{ goodsid, collectionid, orderType, orderQty }" @closed="closeComponent" v-if="componentId" />
         </template>
     </app-view>
 </template>

src/packages/pc/views/footer/pricing/detail2/index.vue

@@ -18,7 +18,6 @@ import { shallowRef, defineAsyncComponent } from 'vue'
 import { Column, TableV2FixedDir } from 'element-plus'
 import { getBuyOrSellName } from '@/constants/order'
 import { formatDecimal, formatDate, handlePriceColor } from '@/filters'
-import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'
 import { useSBYJOrderStore, useFuturesStore, i18n } from '@/stores'
 import AppTableV2 from '@pc/components/base/table-v2/index.vue'

src/packages/sbyj/views/inventory/components/inOut/index.vue

@@ -26,6 +26,9 @@
                     </Field>
                     <Field type="textarea" maxlength="250" autosize show-word-limit name="Remark" label="备注"
                         v-model.trim="formData.Remark" placeholder="请输入" />
+                    <div style="padding: 10px; color: #666; font-size: 14px;">
+                        {{ inOutType === 1 ? '*请备注详细货品品类及克重信息' : '*自提/快递/送货请详细备注收货人姓名、电话、身份证号、详细地址'}}
+                    </div>
                 </CellGroup>
             </Form>
             <template #footer>

src/packages/sbyj/views/market/detail/index.vue

@@ -144,7 +144,6 @@
                                 <span>滞纳金</span>
                                 <span>{{ handleNumberValue(selectedRow.tHDetailEx.callAteFee) }}</span>
                             </li>
-
                             <!-- <li>
                                 <span>订单金额</span>
                                 <span>{{ item.tHDetailEx.holderAmount }}</span>
@@ -157,8 +156,7 @@
                             v-if="riskType === 1 && selectedRow.tHDetailEx.holderQty">补充</Button>
                         <template v-if="enableqty(selectedRow)">
                             <Button size="small" @click="showComponent('delivery')" round>
-                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? $t('enum.BuyOrSell.Buy') :
-                                    $t('enum.BuyOrSell.Sell') }}
+                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '提料' : '交料' }}
                             </Button>
                             <Button v-if="canClose" size="small" @click="showComponent('closeholder')" round>终止</Button>
                         </template>
@@ -203,9 +201,9 @@ const goodscode = getQueryString('goodscode') ?? ''
 const quote = futuresStore.getGoodsQuote(goodscode)
 const goods = futuresStore.getGoods(goodscode)
 const qtyStep = shallowRef(1) // 数量步长
+const orderQty = shallowRef(1) // 数量
 const subscribe = quoteSocket.createSubscribe()
 const selectedRow = shallowRef<Model.SBYJMyOrderRsp>()
-const orderQty = shallowRef(1) // 数量
 const show = shallowRef(false)
 /// 能否下单交易
 const canBankSign = shallowRef(false)
@@ -374,8 +372,9 @@ onActivated(() => {
 
 onMounted(() => {
     subscribe.start(goodscode)
-    orderQty.value = qtyStepList.value[0]
-    qtyStep.value = qtyStepList.value[0]
+    formData.IsAutoAddDeposit = 1
+    orderQty.value = qtyStepList.value.at(-1) ?? 1
+    qtyStep.value = qtyStepList.value.at(-1) ?? 1
     getSBYJMyOrders()
 })
 

src/packages/tss/views/product/list/components/waterfall-list/index.vue

@@ -60,7 +60,7 @@ const getColor = (item: Model.TCEGoodsCollectionRsp) => {
 
 const rowClick = (row: Model.TCEGoodsCollectionRsp) => {
     router.push({
-        name: 'pricing-trade',
+        name: 'pricing-trade-v2',
         query: {
             collectionid: row.collectionid,
             buyOrSell: BuyOrSell.Buy,