diff --git a/components/cwsj-view/cwsj-view.vue b/components/cwsj-view/cwsj-view.vue
deleted file mode 100644
index 41de852..0000000
--- a/components/cwsj-view/cwsj-view.vue
+++ /dev/null
@@ -1,548 +0,0 @@
-
-
-
-
-
-
- 资产负债表
-
-
-
-
-
- {{item}}
-
-
-
- 查看详细数据
-
- 单季度
-
-
- 全部
-
-
-
-
-
-
-
-
- 资产总计
- {{getNumStr(financialBalanceList[0].assets.total)}}
-
-
- 负债合计
- {{getNumStr(financialBalanceList[0].liabilities.total)}}
-
-
- 所有者权益
- {{getNumStr(financialBalanceList[0].equity.total)}}
-
-
- 货币资金
- {{getNumStr(financialBalanceList[0].assets.current_assets.cash)}}
-
-
- 资本公积金
- {{getNumStr(financialBalanceList[0].equity.capital_reserve)}}
-
-
- 盈余公积金
- {{getNumStr(financialBalanceList[0].equity.surplus_reserve)}}
-
-
- 未分配利润
- {{getNumStr(financialBalanceList[0].equity.undistributed_profit)}}
-
-
-
-
-
-
-
- 现金流量表
-
-
-
-
- {{item}}
-
-
-
- 查看详细数据
-
- 单季度
-
-
- 全部
-
-
-
-
-
-
-
-
- 经营性现金流
- {{getNumStr(cashFlowList[0].operating_activities.net_flow)}}
-
-
- 经营性现金流增长率
- {{caculateOperatingFlowRatio()}}%
-
-
- 投资性现金流
- {{getNumStr(cashFlowList[0].investment_activities.net_flow)}}
-
-
- 筹资性现金流
- {{getNumStr(cashFlowList[0].financing_activities.net_flow)}}
-
-
- 合计现金流
- {{getNumStr(cashFlowList[0].cash_changes.net_increase)}}
-
-
- 合计现金流增长率
- {{caculateNetIncreaseRatio()}}%
-
-
-
-
-
-
-
- 利润表
-
-
-
-
- {{item}}
-
-
-
-
- 查看详细数据
-
- 单季度
-
-
- 全部
-
-
-
-
- 汇总
-
-
-
-
-
-
-
-
-
- 净利润
- {{getNumStr(incomeStatementList[0].comprehensive_income.total_comprehensive_income)}}
-
-
- 净利润增长率
- -1600.69%
-
-
- 营业总收入
- {{getNumStr(incomeStatementList[0].revenue.total_operating_revenue)}}
-
-
- 营业总收入增长率
- -26.28%
-
-
- 营业利润
- {{getNumStr(incomeStatementList[0].profit.operating_profit)}}
-
-
- 营业利润增长率
- -201.00%
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 8824bb3..f645c51 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "JiaZhiQianYan",
- "appid" : "__UNI__C546BDE",
+ "appid" : "__UNI__1836EC9",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pages.json b/pages.json
index a64609b..7ceb469 100644
--- a/pages.json
+++ b/pages.json
@@ -198,7 +198,21 @@
"path": "stockCenterDetails/stockCenterDetails",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationBarTitleText" : "",
+ "usingComponents": {
+ "cwfx-view":"../components/cwfx-view/cwfx-view",
+ "cwsj-view":"../components/cwsj-view/cwsj-view",
+ "cyl-view":"../components/cyl-view/cyl-view",
+ "fzjg-view":"../components/fzjg-view/fzjg-view",
+ "fzlc-view":"../components/fzlc-view/fzlc-view",
+ "gltd-view":"../components/gltd-view/gltd-view",
+ "gqjg-view":"../components/gqjg-view/gqjg-view",
+ "gsxx-view":"../components/gsxx-view/gsxx-view",
+ "news-view":"../components/news-view/news-view",
+ "ywjg-view":"../components/ywjg-view/ywjg-view",
+ "zlfx-view":"../components/zlfx-view/zlfx-view",
+ "zysj-view":"../components/zysj-view/zysj-view"
+ }
}
},
{
@@ -224,6 +238,42 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "components/cwfx-view/cwfx-view"
+ },
+ {
+ "path": "components/cwsj-view/cwsj-view"
+ },
+ {
+ "path": "components/cyl-view/cyl-view"
+ },
+ {
+ "path": "components/fzjg-view/fzjg-view"
+ },
+ {
+ "path": "components/fzlc-view/fzlc-view"
+ },
+ {
+ "path": "components/gltd-view/gltd-view"
+ },
+ {
+ "path": "components/gqjg-view/gqjg-view"
+ },
+ {
+ "path": "components/gsxx-view/gsxx-view"
+ },
+ {
+ "path": "components/news-view/news-view"
+ },
+ {
+ "path": "components/ywjg-view/ywjg-view"
+ },
+ {
+ "path": "components/zlfx-view/zlfx-view"
+ },
+ {
+ "path": "components/zysj-view/zysj-view"
}
]
}
diff --git a/pages/concept/concept.vue b/pages/concept/concept.vue
index ea73fef..12f47ea 100644
--- a/pages/concept/concept.vue
+++ b/pages/concept/concept.vue
@@ -36,14 +36,14 @@
{{item.description}}
热门个股
-
+
{{sitem.name}}
+{{item.stock_count-3}}更多
-
+
交易时间:{{item.price_info?item.price_info.trade_date:''}}
diff --git a/pages/concept/hotStock/hotStock.vue b/pages/concept/hotStock/hotStock.vue
index b07e320..fe3f7ef 100644
--- a/pages/concept/hotStock/hotStock.vue
+++ b/pages/concept/hotStock/hotStock.vue
@@ -13,7 +13,7 @@
-
+
{{item.name}}
{{item.code}}
@@ -21,7 +21,7 @@
-
- REASON/项目
+ REASON
REASON:
{{item.reason}}
-
+
@@ -364,6 +364,16 @@
this.selectDateStr = monthAgoYear + '-' + (monthAgoMonth > 9 ? monthAgoMonth : ('0' + monthAgoMonth)) +
'-' + (monthAgoDay > 9 ? monthAgoDay : ('0' + monthAgoDay))
}
+ },
+ /**
+ * 点击股票名称查看个股详情
+ * @param {Object} code
+ */
+ clickStockName(code)
+ {
+ uni.navigateTo({
+ url:'/pagesStock/stockCenterDetails/stockCenterDetails?code='+code
+ })
},
/**
* 获取概念相关个股数据
@@ -380,7 +390,6 @@
if (item.code != null) return item.code
return ''
});
- console.log(codes);
conceptOtherDetails(this.conceptId, {
days: 1,
diff --git a/pages/index/eventDetails/eventDetails.vue b/pages/index/eventDetails/eventDetails.vue
index 3d72da6..74e8637 100644
--- a/pages/index/eventDetails/eventDetails.vue
+++ b/pages/index/eventDetails/eventDetails.vue
@@ -30,7 +30,7 @@
-
+
{{item.stock_name}}
{{item.stock_code}}
@@ -56,7 +56,7 @@
{{item.description}}
热门个股
-
+
{{sitem.name}}
+{{item.stock_count-3}}更多
@@ -397,7 +397,9 @@
this.getEventCommentListData()
}
},
-
+ onShow() {
+ this.getMemberStatusData()
+ },
methods: {
/**
* 复制标题
@@ -488,6 +490,20 @@
}
}
},
+ /**
+ * 点击股票名称查看个股详情
+ * @param {Object} code
+ */
+ clickStockName(code)
+ {
+ if(code.indexOf('.')>-1)
+ {
+ code = code.split('.')[0]
+ }
+ uni.navigateTo({
+ url:'/pagesStock/stockCenterDetails/stockCenterDetails?code='+code
+ })
+ },
/**
* 点击查看股票详情
*/
@@ -757,7 +773,28 @@
}).catch(error=>{
})
- }
+ },
+ /**
+ * 获取会员状态
+ */
+ getMemberStatusData()
+ {
+ let token = uni.getStorageSync('token')
+ if (!token) {
+ return
+ }
+ membershipStatus().then(res=>{
+ if (res.code==200) {
+ this.memberInfo = res.data
+ } else
+ uni.showToast({
+ title:res.message,
+ icon:'none'
+ })
+ }).catch(error=>{
+
+ })
+ },
}
}
diff --git a/pages/index/stockDetails/stockDetails.vue b/pages/index/stockDetails/stockDetails.vue
index 2402a0d..87cfc0a 100644
--- a/pages/index/stockDetails/stockDetails.vue
+++ b/pages/index/stockDetails/stockDetails.vue
@@ -106,8 +106,6 @@
boundaryGap: false,
axisLine: { onZero: false },
splitLine: { show: false },
- min: 'dataMin',
- max: ''
},
yAxis: {
scale: true,
@@ -115,20 +113,6 @@
show: true
}
},
- dataZoom: [
- {
- type: 'inside',
- start: 50,
- end: 100
- },
- {
- show: true,
- type: 'slider',
- top: '90%',
- start: 50,
- end: 100
- }
- ],
series: [
{
name: '日K',
@@ -173,7 +157,8 @@
type:'category',
scale:true,
axisLabel: {
- customValues:['09:30','10:00','10:30','11:00','11:30','13:00','13:30','14:00','14:30','15:00',]
+ customValues:['09:30','10:00','10:30','11:00','11:30','13:00','13:30','14:00','14:30','15:00'],
+ fontSize:9
},
},
yAxis: {
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index d9429cb..b35335c 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -11,7 +11,6 @@
-
{{userInfo.statistics.total_comments}}
@@ -26,8 +25,10 @@
我的点赞
-
+
+ {{memberInfo.subscription_type}}会员,有效期至{{memberInfo.member_expire_date}}
+ 成为会员,可以获取更多价值资讯