diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..10b731c --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ diff --git a/.idea/UniappTool.xml b/.idea/UniappTool.xml new file mode 100644 index 0000000..911cc61 --- /dev/null +++ b/.idea/UniappTool.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..c27af06 --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a23a34f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/云商会.iml b/.idea/云商会.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/云商会.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/index/apply_in.vue b/pages/index/apply_in.vue index b8e6a83..4e527bb 100644 --- a/pages/index/apply_in.vue +++ b/pages/index/apply_in.vue @@ -1,1189 +1,1238 @@ + /* 标签内容 end*/ + \ No newline at end of file diff --git a/pages/index/discovery.vue b/pages/index/discovery.vue index 3e19f7a..fc994a1 100644 --- a/pages/index/discovery.vue +++ b/pages/index/discovery.vue @@ -1,236 +1,240 @@ + .tn-flex-row-around { + position: relative; + + } + \ No newline at end of file diff --git a/pages/index/home.vue b/pages/index/home.vue index 414d397..97d4ed6 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -31,20 +31,17 @@ - - - - + + + - + @@ -167,7 +164,8 @@ newsGoryList, activityList, newsList, - associationIndex + associationIndex, + carouselIndex } from '@/util/api.js'; import store from '@/store/index.js' @@ -182,17 +180,10 @@ ], cardCur: 0, isAndroid: true, - swiperList: [{ - url: '/static/1fcf0b1ee9e590f5253841bf25ba60cd.mp4', - video: true, - }, { - url: '/static/banner.jpg', - }, { - url: '/static/banner2.jpg', - }, ], goryList: [], news_list: [], actList: [], + carousel_list: [], current: 0, page: 1, size: 10, @@ -209,6 +200,7 @@ this.getNewsGoryList(); this.getActivityList(); this.getAssociationIndex(); + this.getCarouselIndex(); }, methods: { confirm(d) { @@ -222,10 +214,11 @@ this.goryList = []; this.news_list = []; this.actList = []; + this.carousel_list = []; this.getNewsGoryList(); this.getActivityList(); this.getAssociationIndex(); - + this.getCarouselIndex(); //this.$emit('childEvent', '修改后的数据'); }, getAssociationIndex() { @@ -260,6 +253,24 @@ }); }) }, + getCarouselIndex() { + carouselIndex({ + association_id: store.state.Gid, + }) + .then(res => { + console.log(res); + if (res.code == 1) { + this.carousel_list = res.data; + } + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, getActivityList() { activityList({ association_id: store.state.Gid, diff --git a/pages/index/my_card.vue b/pages/index/my_card.vue index 5c15faf..b018651 100644 --- a/pages/index/my_card.vue +++ b/pages/index/my_card.vue @@ -24,7 +24,9 @@ {{ userThisInfo.nikename }} {{ userThisInfo.enterprise_name }} -