li.shaoyi 1 anno fa
parent
commit
992b35e17b

+ 2 - 1
src/business/bank/index.ts

@@ -190,7 +190,8 @@ export function useDoBankSign() {
             if (bankItem) {
                 formData.ExBankName = bankItem.bankname
             } else {
-                formData.OpenBankAccId = undefined
+                formData.OpenBankAccId = ''
+                formData.ExBankName = ''
             }
         }
     })

+ 23 - 17
src/packages/quote/views/quote/index.vue

@@ -97,24 +97,30 @@ service.onReady().then(() => {
     marketRun()
 
     // 获取游客商品列表
-    queryTouristGoods().then((res) => {
-        futuresStore.goodsList = res.data
-        subscribeData.value = res.data.map((e) => e.goodscode)
-
-        // 获取游客商品盘面
-        queryTouristQuoteDay({
-            data: {
-                goodsCodes: subscribeData.value.join(',')
-            }
-        }).then((res) => {
-            subscribeData.value.forEach((goodscode) => {
-                const item = res.data.find((e) => e.goodscode === goodscode)
-                futuresStore.updateQuotation(item ?? { goodscode })
+    queryTouristGoods({
+        data: {
+            trademodes: '52'
+        }
+    }).then((res) => {
+        if (res.data.length) {
+            futuresStore.goodsList = res.data
+            subscribeData.value = res.data.map((e) => e.goodscode)
+
+            // 获取游客商品盘面
+            queryTouristQuoteDay({
+                data: {
+                    goodsCodes: subscribeData.value.join(',')
+                }
+            }).then((res) => {
+                subscribeData.value.forEach((goodscode) => {
+                    const item = res.data.find((e) => e.goodscode === goodscode)
+                    futuresStore.updateQuotation(item ?? { goodscode })
+                })
+                subscribe.start(...subscribeData.value)
+
+                nextTick(() => autoHeight())
             })
-            subscribe.start(...subscribeData.value)
-
-            nextTick(() => autoHeight())
-        })
+        }
     })
 
     // 校验服务器时间

+ 20 - 14
src/packages/sbyj/views/market/list/index.vue

@@ -125,22 +125,28 @@ if (loginStore.token) {
     })
 } else {
     // 获取游客商品列表
-    queryTouristGoods().then((res) => {
-        futuresStore.goodsList = res.data
-        subscribeData.value = res.data.map((e) => e.goodscode)
+    queryTouristGoods({
+        data: {
+            trademodes: '52'
+        }
+    }).then((res) => {
+        if (res.data.length) {
+            futuresStore.goodsList = res.data
+            subscribeData.value = res.data.map((e) => e.goodscode)
 
-        // 获取游客商品盘面
-        queryTouristQuoteDay({
-            data: {
-                goodsCodes: subscribeData.value.join(',')
-            }
-        }).then((res) => {
-            subscribeData.value.forEach((goodscode) => {
-                const item = res.data.find((e) => e.goodscode === goodscode)
-                futuresStore.updateQuotation(item ?? { goodscode })
+            // 获取游客商品盘面
+            queryTouristQuoteDay({
+                data: {
+                    goodsCodes: subscribeData.value.join(',')
+                }
+            }).then((res) => {
+                subscribeData.value.forEach((goodscode) => {
+                    const item = res.data.find((e) => e.goodscode === goodscode)
+                    futuresStore.updateQuotation(item ?? { goodscode })
+                })
+                subscribe.start(...subscribeData.value)
             })
-            subscribe.start(...subscribeData.value)
-        })
+        }
     })
 }
 

+ 15 - 13
src/packages/tss/views/home/main/index.vue

@@ -81,21 +81,23 @@ onMounted(() => {
         marketids: '53201'
       }
     }).then((res) => {
-      futuresStore.goodsList = res.data
-      const goodsCodes = res.data.map((e) => e.goodscode)
+      if (res.data.length) {
+        futuresStore.goodsList = res.data
+        const goodsCodes = res.data.map((e) => e.goodscode)
 
-      // 获取游客商品盘面
-      queryTouristQuoteDay({
-        data: {
-          goodsCodes: goodsCodes.join(',')
-        }
-      }).then((res) => {
-        goodsCodes.forEach((goodscode) => {
-          const item = res.data.find((e) => e.goodscode === goodscode)
-          futuresStore.updateQuotation(item ?? { goodscode })
+        // 获取游客商品盘面
+        queryTouristQuoteDay({
+          data: {
+            goodsCodes: goodsCodes.join(',')
+          }
+        }).then((res) => {
+          goodsCodes.forEach((goodscode) => {
+            const item = res.data.find((e) => e.goodscode === goodscode)
+            futuresStore.updateQuotation(item ?? { goodscode })
+          })
+          getGoodsList()
         })
-        getGoodsList()
-      })
+      }
     })
   }
 })