diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index f1dfc07..7ef9f55 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,8 +2,9 @@ "version" : "1.0", "configurations" : [ { - "customPlaygroundType" : "local", - "playground" : "standard", + "customPlaygroundType" : "device", + "packageName" : "io.dcloud.HBuilder", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/App.vue b/App.vue index ee288b1..fda3d27 100644 --- a/App.vue +++ b/App.vue @@ -1,16 +1,33 @@ diff --git a/components/deepExploration_header.vue b/components/deepExploration_header.vue index cddab00..095ecf1 100644 --- a/components/deepExploration_header.vue +++ b/components/deepExploration_header.vue @@ -156,13 +156,19 @@ async function itemClick(item) { model: 5, }); if (res.code == 200) { + const message = res.data; const deepExplorationStore = useDeepExplorationStore(); deepExplorationStore.setDeepExplorationInfo(message); + console.log('点击了历史数据',deepExplorationStore.deepExplorationInfo); onDrawerBackClick(); - console.log(deepExplorationStore.deepExplorationInfo); - + setTimeout(() => { + uni.navigateTo({ + url: '/pages/deepExploration/MainForceActions' + }); + }, 200); } + } const historyList = ref([]); diff --git a/manifest.json b/manifest.json index ee97510..83f218b 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,8 @@ "delay" : 0 }, "modules" : { - "OAuth" : {} + "OAuth" : {}, + "Share" : {} }, /* 模块配置 */ "distribute" : { @@ -53,6 +54,12 @@ "google" : { "clientid" : "135" } + }, + "share" : { + "weixin" : { + "appid" : "wx6143d111fc5c9ba3", + "UniversalLinks" : "" + } } } }, diff --git a/pages.json b/pages.json index 8549911..8c0cf25 100644 --- a/pages.json +++ b/pages.json @@ -88,6 +88,13 @@ } }, { + "path" : "pages/morningMarketAnalysis/morningMarketAnalysis", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { "path": "pages/marketSituation/marketSituation", "style": { "navigationStyle": "custom", diff --git a/pages/customerServicePlatform/csPlatformIndex.vue b/pages/customerServicePlatform/csPlatformIndex.vue index d8cd7bc..d0cfd00 100644 --- a/pages/customerServicePlatform/csPlatformIndex.vue +++ b/pages/customerServicePlatform/csPlatformIndex.vue @@ -90,7 +90,6 @@ @@ -738,7 +566,7 @@ } .center { - margin-left: 105rpx; + margin-left: 155rpx; display: flex; align-items: center; @@ -758,21 +586,11 @@ line-height: 18px; } - .last { - width: 15rpx; - height: 20rpx; - margin-right: 30rpx; - } - .next { - width: 15rpx; - height: 20rpx; - margin-left: 30rpx; - } } .right { - margin-left: 50rpx; + margin-left: 60rpx; color: #6a6a6a; font-family: "PingFang SC"; font-size: 13px; @@ -804,6 +622,8 @@ } .graph_content { + min-height: 500rpx; + .charts-box { width: 100%; height: 100%; diff --git a/pages/deepExploration/deepExploration.vue b/pages/deepExploration/deepExploration.vue index 57bd1aa..fc96cd7 100644 --- a/pages/deepExploration/deepExploration.vue +++ b/pages/deepExploration/deepExploration.vue @@ -96,9 +96,9 @@ - {{ item.name }} + {{ item.tscode }} {{ item.close }} - {{ item.select }} + {{ item.preClose }} @@ -113,7 +113,7 @@ src="/static/deepExploration-images/plus.png" mode="aspectFill" > - 抄底卖顶 + 波段行情 选股价格 - - {{ item.name }} + + {{ item.tscode }} {{ item.close }} - {{ item.select }} + {{ item.preClose }} @@ -145,9 +145,13 @@ \ No newline at end of file + diff --git a/static/my/share/KakaoTalk.png b/static/my/share/KakaoTalk.png new file mode 100644 index 0000000..91f9f8f Binary files /dev/null and b/static/my/share/KakaoTalk.png differ diff --git a/static/my/share/Line.png b/static/my/share/Line.png new file mode 100644 index 0000000..e899f1f Binary files /dev/null and b/static/my/share/Line.png differ diff --git a/static/my/share/WeChat.png b/static/my/share/WeChat.png new file mode 100644 index 0000000..27069da Binary files /dev/null and b/static/my/share/WeChat.png differ diff --git a/static/my/share/WhatsApp.png b/static/my/share/WhatsApp.png new file mode 100644 index 0000000..3133f75 Binary files /dev/null and b/static/my/share/WhatsApp.png differ diff --git a/static/my/share/share.png b/static/my/share/share.png new file mode 100644 index 0000000..c947750 Binary files /dev/null and b/static/my/share/share.png differ diff --git a/static/my/share/success.png b/static/my/share/success.png new file mode 100644 index 0000000..aa4754c Binary files /dev/null and b/static/my/share/success.png differ diff --git a/utils/http.js b/utils/http.js index b85b36c..dcae7e5 100644 --- a/utils/http.js +++ b/utils/http.js @@ -2,8 +2,8 @@ import { useUserStore } from "../stores/modules/userInfo" import { useDeviceStore } from "../stores/modules/deviceInfo" import { useLoginStore } from "../stores/modules/login" -// const baseURL = "https://dbqb.nfdxy.net/testApi" -const baseURL = "http://192.168.40.8:9000" +const baseURL = "https://dbqb.nfdxy.net/testApi" + const httpInterceptor = { // 拦截前触发 diff --git a/vue.config.js b/vue.config.js index 0345309..5f02fc9 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,6 @@ module.exports = { devServer: { - /* proxy: { + proxy: { '/api': { // 你的目标服务器的请求路径前缀 target: 'https://hwjb.homilychart.com', // 目标服务器的地址 changeOrigin: true, // 是否跨域 @@ -9,16 +9,16 @@ module.exports = { '^/api': '' // 将 /api 替换为 /testApi,以便正确请求目标服务器的资源 } } - } */ - proxy: { - '/api': { // 你的目标服务器的请求路径前缀 - target: 'http://192.168.40.8:9000', // 目标服务器的地址 - changeOrigin: true, // 是否跨域 - secure: false, // 如果是https接口,需要配置这个参数 - pathRewrite: { - '^/api': '' // 将 /api 替换为 /testApi,以便正确请求目标服务器的资源 - } - } - } + } + // proxy: { + // '/api': { // 你的目标服务器的请求路径前缀 + // target: 'http://192.168.40.8:9000', // 目标服务器的地址 + // changeOrigin: true, // 是否跨域 + // secure: false, // 如果是https接口,需要配置这个参数 + // pathRewrite: { + // '^/api': '' // 将 /api 替换为 /testApi,以便正确请求目标服务器的资源 + // } + // } + // } } } \ No newline at end of file