xxxxx

oem/tss/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "TCE",
   "version": "1.0.33",
   "versionCode": "100033",
-  "apiUrl": "http://192.168.31.210:8080/cfg?key=test_210",
+  "apiUrl": "http://47.128.190.111:8280/cfg?key=tss_sp",
   "tradeChannel": "ws",
   "showLoginAlert": true,
   "modules": [

src/packages/mobile/components/modules/quote/price/index.vue

@@ -138,7 +138,6 @@ import { Icon, Divider } from 'vant'
 import { parsePercent, handleNumberValue, changeUnit } from '@/filters'
 import { useFuturesStore } from '@/stores'
 import quoteSocket from '@/services/websocket/quote'
-import { ETradeMode } from '@/constants/client'
 
 const props = defineProps({
     goodsCode: {

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

@@ -1,48 +1,48 @@
 <template>
-    <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
-        <app-view class="pricing-detail g-form">
-            <template #header>
-                <app-navbar :title="quote ? quote.goodscode + '/' + quote.goodsname : $t('quote.listinghall')" @back="closed" />
-            </template>
+    <app-view class="market-detail">
+        <template v-if="isShow">
             <component :is="Price" v-bind="{ goodsCode }" />
             <component :is="Chart" v-bind="{ goodsCode }" />
-        </app-view>
-    </app-modal>
+            <component :is="Tik" v-bind="{ goodsCode }" />
+        </template>
+    </app-view>
 </template>
 
 <script lang="ts" setup>
-import { useFuturesStore } from '@/stores'
-import { shallowRef, defineAsyncComponent } from 'vue'
-import AppModal from '@/components/base/modal/index.vue'
+import { defineAsyncComponent, onMounted, PropType, shallowRef, watch,nextTick } from 'vue'
+import { useNavigation } from '@mobile/router/navigation'
 
 const props = defineProps({
-    goodsCode: {
-        type: String,
+    quote: {
+        type: Object as PropType<Model.GoodsQuote>,
         required: true
     }
 })
 
-// 是否刷新父组件数据
-const refresh = shallowRef(true) 
-const showModal = shallowRef(true)
-const futuresStore = useFuturesStore()
-const quote = futuresStore.getGoodsQuote(props.goodsCode)
-
 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 { getQueryString } = useNavigation()
+const isShow = shallowRef(true)
 
-// 关闭弹窗
-const closed = (isRefresh = false) => {
-    refresh.value = isRefresh
-    showModal.value = false
-}
+const goodsCode = shallowRef('') 
 
-// 暴露组件属性给父组件调用
-defineExpose({
-    closed,
+watch(() => props.quote, (val) => {
+    isShow.value=false
+    goodsCode.value = val.goodscode
+    nextTick(()=>{
+        isShow.value=true
+     })
+});
+
+onMounted(() => {
+    const code = getQueryString('goodscode')
+    if ( code != '' && code != undefined ) {
+        goodsCode.value = code ?? ''
+    } else {
+        goodsCode.value = props.quote.goodscode
+    }
 })
-</script>
 
-<style lang="less">
-@import './index.less';
-</style>
+</script>

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

@@ -58,7 +58,7 @@
         <Tabs class="van-tabs--list" v-model:active="active" style="display: block;">
             <template v-for="(item, index) in components.filter(e => e.show === true)" :key="index">
                 <Tab :title="item.title" :name="item.name">
-                    <component :is="item.component" v-bind="{ record: collection }" />
+                    <component :is="item.component" v-bind="{ record: collection, quote }" />
                 </Tab>
             </template>
         </Tabs>
@@ -70,7 +70,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>
@@ -179,6 +179,7 @@ const onOrderTypeRadioChange = (value: number) => {
     // 默认第一个商品
     if (goodsList.value.length != 0) {
         goodsid.value = goodsList.value[0].goodsid
+        quote.value = futuresStore.getGoodsQuote(goodsid.value).value
     }
     // 订阅商品行情
     subscribe.start(quote.value?.goodscode ?? '')
@@ -244,6 +245,12 @@ const components = [
         component: defineAsyncComponent(() => import('../images/Index.vue')),
         show: pictureurl.value != ''
     },
+    {
+        name: 'chart',
+        title: '图表',
+        component: defineAsyncComponent(() => import('../components/detail/Index.vue')),
+        show: true
+    }
 ]
 
 const componentMap = new Map<string, unknown>([

src/packages/sbyj/views/account/certification/Index.vue

@@ -126,7 +126,6 @@ const h_afterRead = (filePath: string) => {
 const onUpload = (filePath: string) => {
     shopphotos.value.push(filePath)
     formData.shopphotos = shopphotos.value.join(';')
-
 }
 
 const onDelete = (index: number) => {