diff --git a/index.html b/index.html
index d5ea3bb7..1eb8ae81 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
- 农燊高科
+ COMPANY
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index 578bed68..79f6c204 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -7,21 +7,48 @@
placeholder
@click-left="onClickLeft"
/>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -35,8 +62,14 @@ export default {
loading: false,
//是否滚动到底部
finished: false,
+ //是否显示加载
+ secondLoading: false,
+ //是否滚动到底部
+ secondFinished: false,
//新闻集合
newList:[],
+ //交易规则集合
+ secondList:[],
//查询参数
queryParams: {
pageNum: 1,
@@ -44,6 +77,13 @@ export default {
deptId:100,
number:2
},
+ //交易规则查询参数
+ querySecondParams: {
+ deptId:100,
+ pageNum:1,
+ pageSize:10,
+ number:9
+ },
};
},
created() {},
@@ -70,6 +110,28 @@ export default {
this.loading = false;
});
},
+ getSecondList(){
+ this.loading = true;
+ newList(this.querySecondParams).then(response => {
+ console.log(response);
+ for (var i = 0; i < response.rows.length; i++) {
+ this.secondList.push(response.rows[i]);
+ var imgStrs = response.rows[i].content.match(/![](\"([^\"]*?)\")
/gi)
+ if (imgStrs != null && imgStrs != '') {
+ console.log(imgStrs[0].length-2)
+ console.log(imgStrs[0])
+ this.secondList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12));
+ }
+ }
+ console.log(this.secondList)
+ if(this.secondList.length >= response.total){
+ this.secondFinished = true;
+ return;
+ }
+ this.querySecondParams.pageNum += 1 ;
+ this.secondLoading = false;
+ });
+ },
},
};
diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue
index b281a83d..c9a5d380 100644
--- a/src/views/sunVillage_info/index.vue
+++ b/src/views/sunVillage_info/index.vue
@@ -50,7 +50,7 @@
diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue
index 58fbd4cc..05d71f98 100644
--- a/src/views/sunVillage_info/index_code.vue
+++ b/src/views/sunVillage_info/index_code.vue
@@ -59,7 +59,7 @@
- {{configValue == ""?'技术支持：北京农燊高科信息技术有限公司':configValue}}
+ {{configValue == ""?'技术支持：公司':configValue}}
diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue
index a4aadf17..694057b0 100644
--- a/src/views/sunVillage_info/index_code_rights.vue
+++ b/src/views/sunVillage_info/index_code_rights.vue
@@ -31,7 +31,7 @@
diff --git a/src/views/yinnongLogin.vue b/src/views/yinnongLogin.vue
index da4442e4..7036e924 100644
--- a/src/views/yinnongLogin.vue
+++ b/src/views/yinnongLogin.vue
@@ -5,7 +5,7 @@
-
+
-
+