diff --git a/app.json b/app.json
index c402f75..9fbdcf5 100644
--- a/app.json
+++ b/app.json
@@ -51,7 +51,6 @@
},
"usingComponents": {
"page-loading": "/components/page-loading/page-loading",
- "container-loading": "/components/container-loading/container-loading",
- "mp-html": "/components/mp-html/index"
+ "container-loading": "/components/container-loading/container-loading"
}
}
\ No newline at end of file
diff --git a/app.wxss b/app.wxss
index 4341bbf..3d34700 100644
--- a/app.wxss
+++ b/app.wxss
@@ -68,6 +68,22 @@ page::after {
margin-bottom: 20rpx;
}
+.mt-40 {
+ margin-top: 40rpx;
+}
+
+.mr-40 {
+ margin-right: 40rpx;
+}
+
+.ml-40 {
+ margin-left: 40rpx;
+}
+
+.mb-40 {
+ margin-bottom: 40rpx;
+}
+
.mg {
margin: 10rpx;
}
diff --git a/pages/company/company.json b/pages/company/company.json
index 21436c5..2e1ace1 100644
--- a/pages/company/company.json
+++ b/pages/company/company.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "mp-html": "/components/mp-html/index"
+ },
"navigationBarTitleText": "公司详情"
}
\ No newline at end of file
diff --git a/pages/domain/domain.wxml b/pages/domain/domain.wxml
index ecfdecd..3cade5c 100644
--- a/pages/domain/domain.wxml
+++ b/pages/domain/domain.wxml
@@ -7,7 +7,7 @@
-
+
{{isAreaExpand?'收取':'查看全部'}}
@@ -40,24 +40,24 @@
产业图谱
-
-
-
+
+
+
+
-
+
{{item.newsContentTitle}}
-
+
-
-
-
+
+
@@ -67,7 +67,7 @@
重点企业
-
+
@@ -91,7 +91,7 @@
-
+
diff --git a/pages/index/index.js b/pages/index/index.js
index 90c7d57..3b2ef34 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -45,7 +45,8 @@ Page({
investLoading: 'loading',
isLoading: true,
showInvestLoading: 'loading',
- superiorityLoading: 'loading'
+ superiorityLoading: 'loading',
+ statisticsLoading: 'loading'
},
onLoad(e) {
var _self = this
@@ -128,12 +129,17 @@ Page({
//数据统计
getStatistics() {
var _self = this
+ _self.setData({
+ statisticsLoading: 'loading'
+ })
IndexService.doGetStatistics({
year: _self.data.year
})
.then(res => {
+ _self.setData({
+ statisticsLoading: 'success'
+ })
if (res) {
-
res.forEach(item => {
var scale = item.value > 100 ? 100 : 1
item.progress = `${item.value}%`
@@ -146,7 +152,9 @@ Page({
})
}
}, err => {
- console.log(err)
+ _self.setData({
+ statisticsLoading: 'error'
+ })
wx.showToast({
icon: "none",
title: '网络错误(数据统计)',
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9cc0646..e968fbe 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -2,7 +2,7 @@
-
+
达拉特旗
@@ -37,17 +37,19 @@
-
-
-
- {{item.name}}
-
-
- {{item.value}}{{item.unit}}
+
+
+
+
+ {{item.name}}
+
+
+ {{item.value}}{{item.unit}}
+
-
-
-
+
+
+
@@ -72,7 +74,7 @@
-
+
{{isAreaExpand?'收取':'查看全部'}}
@@ -86,7 +88,7 @@
投资优势
-
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3b2ae53..7dc94ee 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -192,7 +192,8 @@
line-height: 40rpx;
text-indent: 2em;
}
-.invest-box{
+
+.invest-box {
display: flex;
flex-direction: column;
flex: content;
@@ -405,7 +406,7 @@
.desc-tag-box {
display: flex;
flex-direction: row;
- justify-content: flex-start;
+ justify-content: space-between;
margin-top: 39rpx;
margin-bottom: 30rpx;
}
@@ -492,6 +493,7 @@
margin-bottom: 20rpx;
border-radius: 10rpx;
padding: 10rpx;
+ width: 96%;
}
.statistics-content-item {
diff --git a/pages/industry-area/industry-area.json b/pages/industry-area/industry-area.json
index aa6e978..835a0c0 100644
--- a/pages/industry-area/industry-area.json
+++ b/pages/industry-area/industry-area.json
@@ -1,4 +1,4 @@
{
- "usingComponents": {},
+ "usingComponents": {"mp-html":"/components/mp-html/index"},
"navigationBarTitleText": "详情"
}
\ No newline at end of file
diff --git a/pages/invest-detail/invest-detail.json b/pages/invest-detail/invest-detail.json
index aa6e978..835a0c0 100644
--- a/pages/invest-detail/invest-detail.json
+++ b/pages/invest-detail/invest-detail.json
@@ -1,4 +1,4 @@
{
- "usingComponents": {},
+ "usingComponents": {"mp-html":"/components/mp-html/index"},
"navigationBarTitleText": "详情"
}
\ No newline at end of file
diff --git a/pages/plates/plates.json b/pages/plates/plates.json
index 8835af0..dd545a5 100644
--- a/pages/plates/plates.json
+++ b/pages/plates/plates.json
@@ -1,3 +1,5 @@
{
- "usingComponents": {}
+ "usingComponents": {
+ "mp-html": "/components/mp-html/index"
+ }
}
\ No newline at end of file
diff --git a/pages/policy-detail/policy-detail.json b/pages/policy-detail/policy-detail.json
index 8835af0..9267374 100644
--- a/pages/policy-detail/policy-detail.json
+++ b/pages/policy-detail/policy-detail.json
@@ -1,3 +1,3 @@
{
- "usingComponents": {}
+ "usingComponents": {"mp-html":"/components/mp-html/index"}
}
\ No newline at end of file
diff --git a/pages/superiority-detail/superiority-detail.json b/pages/superiority-detail/superiority-detail.json
index aa6e978..835a0c0 100644
--- a/pages/superiority-detail/superiority-detail.json
+++ b/pages/superiority-detail/superiority-detail.json
@@ -1,4 +1,4 @@
{
- "usingComponents": {},
+ "usingComponents": {"mp-html":"/components/mp-html/index"},
"navigationBarTitleText": "详情"
}
\ No newline at end of file
diff --git a/pages/unique-detail/unique-detail.json b/pages/unique-detail/unique-detail.json
index aa6e978..835a0c0 100644
--- a/pages/unique-detail/unique-detail.json
+++ b/pages/unique-detail/unique-detail.json
@@ -1,4 +1,4 @@
{
- "usingComponents": {},
+ "usingComponents": {"mp-html":"/components/mp-html/index"},
"navigationBarTitleText": "详情"
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 9266258..11c2a47 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -3,6 +3,7 @@
"projectname": "gov_propagandize",
"setting": {
"compileHotReLoad": true,
- "urlCheck": false
+ "urlCheck": false,
+ "autoAudits": false
}
}
\ No newline at end of file
diff --git a/utils/http.js b/utils/http.js
index 02c0a23..f521858 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -1,7 +1,6 @@
// 定义api服务地址
const baseUrl = 'https://www.xzszwhy.cn/daqi/app';
// const baseUrl = 'http://106.74.34.136:8084/daqi/app';
-// https://8182018kg.goho.co/daqi/app/news-content/listpage?newsDirectoriesId=91a98b33-1133-4935-8c4c-9b37cc5fe63b&rows=1&page=1
/**
* 传入请求参数,返回Promise支持链试调用
* @param url 请求地址