Handy_Cao 1 gadu atpakaļ
vecāks
revīzija
0e010e2667

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

@@ -250,7 +250,7 @@
         }
     },
     "tss": {
-        "title": "Category",
+        "title": "Orders",
         "tips1": "Please enter search keywords",
         "subtitle1": "Full payment",
         "subtitle2": "Deposit"

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

@@ -241,7 +241,7 @@
             "bottom_swap_position": "สรุปคำสั่งซื้อ"
         },
         "market": {
-            "title": "ตลาดสินค้า",
+            "title": "กำลังถือคำสั่ง",
             "market_trade": "ตลาดสินค้า"
         },
         "query": {

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

@@ -250,7 +250,7 @@
         }
     },
     "tss": {
-        "title": "分类",
+        "title": "持有订单",
         "tips1": "请输入搜索关键词",
         "subtitle1": "全款",
         "subtitle2": "预付款"

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

@@ -250,7 +250,7 @@
         }
     },
     "tss": {
-        "title": "分類",
+        "title": "持有訂單",
         "tips1": "請輸入搜索關鍵詞",
         "subtitle1": "全款",
         "subtitle2": "預付款"

+ 1 - 1
public/locales/en-US.json

@@ -1711,7 +1711,7 @@
         "bankcardno": "Invalid bank cardNo"
     },
     "tss": {
-        "title": "Categorys",
+        "title": "Orders",
         "tips1": "Please enter your search term",
         "subtitle1": "FullPayment",
         "subtitle2": "PrePayment"

+ 1 - 1
public/locales/th-TH.json

@@ -1711,7 +1711,7 @@
         "bankcardno": "หมายเลขบัตรธนาคารไม่ถูกต้องตามข้อกำหนด"
     },
     "tss": {
-        "title": "เรียงลำดับ",
+        "title": "กำลังถือคำสั่ง",
         "tips1": "โปรดป้อนคำค้น",
         "subtitle1": "เงินทั้งหมด",
         "subtitle2": "จ่ายล่วงหน้า"

+ 1 - 1
public/locales/zh-CN.json

@@ -1711,7 +1711,7 @@
         "bankcardno": "银行卡号码不合规"
     },
     "tss": {
-        "title": "分类",
+        "title": "持有订单",
         "tips1": "请输入搜索关键词",
         "subtitle1": "全款",
         "subtitle2": "预付款"

+ 1 - 1
public/locales/zh-TW.json

@@ -1711,7 +1711,7 @@
         "bankcardno": "銀行卡號碼不合規"
     },
     "tss": {
-        "title": "分類",
+        "title": "持有訂單",
         "tips1": "請輸入搜索關鍵詞",
         "subtitle1": "全款",
         "subtitle2": "預付款"

+ 4 - 1
src/packages/tss/router/index.ts

@@ -50,7 +50,7 @@ const routes: Array<RouteRecordRaw> = [
           {
             path: 'group',
             name: 'home-group',
-            component: () => import('../views/product/group/index.vue'),
+            component: () => import('../views/order/position/Index.vue'),
           },
           ...homeRoutes
         ]
@@ -210,6 +210,9 @@ const routes: Array<RouteRecordRaw> = [
         path: 'position',
         name: 'order-position',
         component: () => import('../views/order/position/Index.vue'),
+        props: {
+          showBackButton: true
+        }
       },
       {
         path: 'delivery',

+ 13 - 3
src/packages/tss/views/order/position/Index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar :title="$t('mine.myposition')">
+            <app-navbar :title="$t('mine.myposition')" :show-back-button="showBackButton" >
                 <!-- <template #footer>
                     <Tabs>
                         <Tab title="全款订单" :name="1" />
@@ -84,7 +84,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
-import { Tabs, Tab, Button, Image } from 'vant'
+import { Button, Image } from 'vant'
 import { getFileUrl } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { getBuyOrSellName, BuyOrSell, PriceMode } from '@/constants/order'
@@ -97,6 +97,14 @@ import { EBuildType, EDelistingType, EListingSelectType, EValidType } from '@/co
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import eventBus from '@/services/bus'
 
+defineProps({
+    showBackButton: {
+        type: Boolean,
+        default: false
+    }
+})
+
+
 const { global: { t } } = i18n
 
 const { getSBYJMyOrders, $toRefs } = useSBYJOrderStore()
@@ -128,7 +136,9 @@ const enableqty = (item: Model.SBYJMyOrderRsp) => {
 }
 
 const getImageUrl = (url: string) => {
-    const [firstImg] = url.split(',')
+    // debugger
+    const [firstImg] = url ? url.split(',') : ''
+    
     return firstImg ? getFileUrl(firstImg) : ''
 }
 

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

@@ -32,8 +32,6 @@ defineProps({
     }
 })
 
-
-
 const { router } = useNavigation()
 
 const rowClick = (row: Model.GoodsQuote) => {