xxxxx

oem/tss/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "TCE",
   "version": "1.0.27",
   "versionCode": "100027",
-  "apiUrl": "http://192.168.31.210:8080/cfg?key=test_210",
+  "apiUrl": "http://192.168.31.158:16240/cfg?key=dev_104",
   "tradeChannel": "ws",
   "showLoginAlert": true,
   "modules": [

src/packages/mobile/views/notice/list/index.vue

@@ -1,15 +1,12 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar :title="$t('notices.title')">
-                <template #footer>
-                    <Tabs v-model:active="active" @change="onTabChange">
-                        <Tab :title="$t('notices.notice')" :name="1" />
-                        <Tab :title="$t('notices.announcement')" :name="2" />
-                    </Tabs>
-                </template>
-            </app-navbar>
+            <app-navbar :title="$t('notices.title')" />
         </template>
+        <Tabs v-model:active="active" @change="onTabChange">
+            <Tab :title="$t('notices.notice')" :name="1" />
+            <Tab :title="$t('notices.announcement')" :name="2" />
+        </Tabs>
         <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
             <CellGroup class="article" style="background-color: transparent;padding-top: 10px;" v-if="dataList.length">

src/packages/mobile/views/order/position/Index.vue

@@ -16,7 +16,7 @@
                 </Tab>
             </template>
         </Tabs>
-        <component ref="componentRef" :is="selectedComponent.detail" @closed="closeComponent"
+        <component ref="componentRef" v-bind="{ onlyDelivery }" :is="selectedComponent.detail" @closed="closeComponent"
             v-if="componentId && selectedComponent.detail" />
     </app-view>
 </template>
@@ -28,6 +28,7 @@ import { useComponent } from '@/hooks/component'
 import { i18n } from '@/stores'
 
 const { global: { t } } = i18n
+const onlyDelivery = shallowRef(true)
 
 const components = [
     {

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

@@ -31,7 +31,7 @@
             </div>
             <div class="g-form" style="margin-top: 5px;">
                 <Form ref="formRef" class="g-form__container" @submit="onSubmit">
-                    <Field v-if="quote?.trademode != 10" name="Receive" :label="$t('performance.address')"
+                    <Field class="g-form__addressinfo" v-if="quote?.trademode != 10" name="Receive" :label="$t('performance.address')"
                         type="textarea" autosize v-model="formData.AddrInfo" :rules="formRules.AddrInfo"
                         :placeholder="$t('performance.pleaseentertheaddress')" left-icon="location" label-align="top"
                         right-icon="add-o" @click-right-icon="showContact = true" />

src/packages/mobile/views/pricing/trade/fullpayment/index.less

@@ -25,6 +25,13 @@
         }
     }
 
+    .g-form { 
+        &__addressinfo {
+            --van-field-input-text-color: #5D5D5D;
+            font-size: 12px;
+        }
+    }
+
     .order-total {
         font-size: 12px;
         color: #5D5D5D;

src/packages/tss/views/home/main/components/benefits/Index.vue

@@ -0,0 +1,27 @@
+<!-- 首页 - 新人福利 -->
+<template>
+    <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
+       <app-view class="g-form">
+           <template #header>
+               <app-navbar title="新人福利" @back="closed" />
+           </template>
+       </app-view>
+    </app-modal>
+   
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import AppModal from '@/components/base/modal/index.vue'
+
+const showModal = shallowRef(true)
+// 是否刷新父组件数据
+const refresh = shallowRef(false)
+
+// 关闭弹窗
+const closed = (isRefresh = false) => {
+   refresh.value = isRefresh
+   showModal.value = false
+}
+
+</script>

src/packages/tss/views/home/main/components/logistics/Index.vue

@@ -0,0 +1,27 @@
+<!-- 首页 - 物流服务 -->
+<template>
+    <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
+       <app-view class="g-form">
+           <template #header>
+               <app-navbar title="物流服务 " @back="closed" />
+           </template>
+       </app-view>
+    </app-modal>
+   
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import AppModal from '@/components/base/modal/index.vue'
+
+const showModal = shallowRef(true)
+// 是否刷新父组件数据
+const refresh = shallowRef(false)
+
+// 关闭弹窗
+const closed = (isRefresh = false) => {
+   refresh.value = isRefresh
+   showModal.value = false
+}
+
+</script>

src/packages/tss/views/home/main/components/malls/Index.vue

@@ -0,0 +1,27 @@
+<!-- 首页 - 了解商城 -->
+<template>
+     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
+        <app-view class="g-form">
+            <template #header>
+                <app-navbar title="了解商城" @back="closed" />
+            </template>
+        </app-view>
+     </app-modal>
+    
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import AppModal from '@/components/base/modal/index.vue'
+
+const showModal = shallowRef(true)
+// 是否刷新父组件数据
+const refresh = shallowRef(false)
+
+// 关闭弹窗
+const closed = (isRefresh = false) => {
+    refresh.value = isRefresh
+    showModal.value = false
+}
+
+</script>

src/packages/tss/views/home/main/index.vue

@@ -21,13 +21,13 @@
       </app-block>
       <app-block class="home-main__iconbar">
         <ul>
-          <li>
+          <li @click="openComponent('benefits')">
             <span>新人福利</span>
           </li>
-          <li>
+          <li @click="openComponent('malls')">
             <span>了解商城</span>
           </li>
-          <li>
+          <li @click="openComponent('logistics')">
             <span>物流服务</span>
           </li>
         </ul>
@@ -48,17 +48,19 @@
         </CellGroup>
       </app-block>
       <ProductList :data-list="goodsCollectionStore.collections" />
+      <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
     </PullRefresh>
   </app-view>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, onMounted } from 'vue'
+import { shallowRef, onMounted, defineAsyncComponent } from 'vue'
 import { Cell, CellGroup, PullRefresh, Search, Icon } from 'vant'
 import { getFileUrl } from '@/filters'
 import { queryImageConfigs } from '@/services/api/common'
 import { queryNewTitles } from '@/services/api/news'
 import { useNoticeStore, useGoodsCollectionStore } from '@/stores'
+import { useComponent } from '@/hooks/component'
 import ProductList from '../../product/list/components/waterfall-list/index.vue'
 
 const noticeStore = useNoticeStore()
@@ -100,6 +102,14 @@ onMounted(() => {
   })
 })
 
+const componentMap = new Map<string, unknown>([
+    ['benefits', defineAsyncComponent(() => import('./components/benefits/Index.vue'))],   // 新人福利
+    ['malls', defineAsyncComponent(() => import('./components/malls/Index.vue'))],   // 了解商城
+    ['logistics', defineAsyncComponent(() => import('./components/logistics/Index.vue'))],   //  物流服务
+])
+
+const { componentRef, componentId, openComponent, closeComponent } = useComponent()
+
 </script>
 
 <style lang="less">

src/packages/tss/views/order/delivery/Index.vue

@@ -31,11 +31,11 @@ const components = [
         title: t('delivery.title2'),
         component: defineAsyncComponent(() => import('./components/online/Index.vue')),
     },
-    // {
-    //     name: 'spot',
-    //     title: t('delivery.title3'),
-    //     component: defineAsyncComponent(() => import('./components/spot/Index.vue')),
-    // },
+    {
+        name: 'spot',
+        title: t('delivery.title3'),
+        component: defineAsyncComponent(() => import('./components/spot/Index.vue')),
+    },
     {
         name: 'aftersale',
         title: t('delivery.title4'),

src/packages/tss/views/order/delivery/components/online/Index.vue

@@ -35,7 +35,11 @@
                                     <span>{{ item.deliveryqty }}</span>
                                 </li>
                                 <li>
-                                    <span>{{ $t('delivery.offline.deliveryinfo1') }}：</span>
+                                    <span>{{ $t('delivery.offline.applydate') }}：</span>
+                                    <span>{{ formatDate(item.reqtime) }}</span>
+                                </li>
+                                <li>
+                                    <span>{{ $t('delivery.offline.deliveryinfo2') }}：</span>
                                     <span>{{ item.deliveryinfo }}</span>
                                 </li>
                             </ul>
@@ -53,8 +57,7 @@
                     </div>
                 </div>
                 <div class="g-product-list__btnbar">
-                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{
-                        $t('operation.cancel2') }}</Button>
+                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
                 </div>
             </div>
         </div>

src/packages/tss/views/order/delivery/components/spot/Index.vue

@@ -6,7 +6,8 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>{{ $t('position.goods.orderid') }}：{{ item.deliveryorderid }}</b>
+                        <b>{{ item.goodsnamedisplay }}</b>
+                        <span>{{ formatDate(item.reqtime) }}</span>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
@@ -15,40 +16,44 @@
                     </div>
                 </div>
                 <div class="g-product-list__content">
-                    <div class="left">
-                        <Image width="100" height="100" radius="8" :src="getImageUrl(item.thumurls)" />
+                    <div class="top">
+                        <div class="top-left">
+                            <Image width="80" height="80" radius="8" :src="getImageUrl(item.thumurls)" />
+                        </div>
+                        <div class="top-right">
+                            <ul>
+                                <li>
+                                    <span>{{ $t('position.goods.orderid') }}：</span>
+                                    <span>{{ item.deliveryorderid }}</span>
+                                </li>
+                                <li>
+                                    <span>{{ $t('position.goods.agreeunit') }}：</span>
+                                    <span>{{ item.agreeunit }}{{ item.goodsunit }}</span>
+                                </li>
+                                <li>
+                                    <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
+                                    <span>{{ item.deliveryqty }}</span>
+                                </li>
+                                <li>
+                                    <span>{{ $t('delivery.offline.applydate') }}：</span>
+                                    <span>{{ formatDate(item.reqtime) }}</span>
+                                </li>
+                                <li>
+                                    <span>{{ $t('delivery.offline.deliveryinfo2') }}：</span>
+                                    <span>{{ item.deliveryinfo }}</span>
+                                </li>
+                            </ul>
+                        </div>
                     </div>
-                    <div class="right">
-                        <ul>
-                            <li>
-                                <span>{{ $t('position.goodscode') }}：</span>
-                                <span>{{ item.goodsnamedisplay }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('position.goods.agreeunit') }}：</span>
-                                <span>{{ item.agreeunit }}{{ item.goodsunit }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
-                                <span>{{ item.deliveryqty }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('delivery.offline.deliveryprice') }}：</span>
-                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('delivery.offline.deliveryamount') }}：</span>
-                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('delivery.offline.applydate') }}：</span>
-                                <span>{{ formatDate(item.reqtime) }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('delivery.offline.deliveryinfo2') }}：</span>
-                                <span>{{ item.deliveryinfo }}</span>
-                            </li>
-                        </ul>
+                    <div class="bottom">
+                        <div class="bottom-left">
+                            <label>{{ $t('delivery.offline.deliveryprice') }}</label>
+                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
+                        </div>
+                        <div class="bottom-right">
+                            <label>{{ $t('delivery.offline.deliveryamount') }}</label>
+                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
+                        </div>
                     </div>
                 </div>
                 <div class="g-product-list__btnbar">

src/packages/tss/views/order/list/prepayment/Index.vue

@@ -27,7 +27,7 @@
                                 </li>
                                 <li>
                                     <span>{{ $t('position.goods.agreeunit') }}：</span>
-                                    <span>{{ item.agreeunit }}{{ item.goodsunit }}</span>
+                                    <span>{{ item.agreeunit }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                                 </li>
                                 <li>
                                     <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
@@ -49,7 +49,7 @@
                         </div>
                         <div class="bottom-right">
                             <label>{{ $t('position.goods.preamounts') }}</label>
-                            <span>{{ formatDecimal(item.payeddeposit + item.restockdeposit, item.decimalplace)}}</span>
+                            <span>{{ formatDecimal(item.oripayeddeposit, item.decimalplace)}}</span>
                         </div>
                     </div>
                 </div>
@@ -67,6 +67,7 @@ import { getBuyOrSellName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryTradeHolderDetailEx } from '@/services/api/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
+import { getGoodsUnitName } from '@/constants/unit'
 
 const error = shallowRef(false)
 const dataList = shallowRef<Model.TradeHolderDetailExRsp[]>([])

src/types/model/order.d.ts

@@ -1807,6 +1807,8 @@ declare namespace Model {
         matchuserid: number; // 对手用户ID
         openprice: number; // 建仓价格
         openqty: number; // 建仓数量
+        oripayeddeposit: number; //
+        orirestockdeposit: number; //
         payeddeposit: number; // 已付定金
         payedlatefee: number; // 已付滞纳金
         promptdepositrate: number; // 提示定金率