diff --git a/App.vue b/App.vue index 06abd02..c7ed182 100644 --- a/App.vue +++ b/App.vue @@ -1,165 +1,165 @@ + /* 注意要写在第一行,同时给style标签加入lang="scss"属性 */ + @import './tuniao-ui/index.scss'; + @import './tuniao-ui/iconfont.css'; + @import './static/css/my.scss'; + \ No newline at end of file diff --git a/pages.json b/pages.json index 3909b59..0dfa786 100644 --- a/pages.json +++ b/pages.json @@ -113,13 +113,6 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/index/enter_in", - "style": { - "navigationBarTitleText": "智慧云商协", - "enablePullDownRefresh": false - } - }, { "path": "pages/index/goods_my", "style": { @@ -217,6 +210,13 @@ "navigationBarTitleText": "智慧云商协", "enablePullDownRefresh": false } + }, + { + "path": "pages/index/directory_back", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/pages/index/apply_in.vue b/pages/index/apply_in.vue index 3eebd47..3f9009a 100644 --- a/pages/index/apply_in.vue +++ b/pages/index/apply_in.vue @@ -34,10 +34,10 @@ - + + @confirm="getTuiJianId"> @@ -815,6 +815,11 @@ radioGroupChange(d) { console.log(d); }, + getTuiJianId(d) { + var info = d[0]; + this.new_info.recommendation_id = info.value; + this.new_info.recommendation_name = info.label; + }, getPositionId(d) { var info = d[0]; this.formData.position_name = info.label; diff --git a/pages/index/directory.vue b/pages/index/directory.vue index 8475f8c..35ec04b 100644 --- a/pages/index/directory.vue +++ b/pages/index/directory.vue @@ -38,7 +38,8 @@ - + @@ -64,7 +65,7 @@ - {{v.enterprise_Introduction}} + {{v.enterprise_name==null?'':v.enterprise_name}} @@ -83,7 +84,8 @@ - + @@ -118,7 +120,8 @@ selectShow: false, HomeTitle: '', selectList: [], - gid: store.state.Gid + gid: store.state.Gid, + top: 0, } }, computed: { @@ -149,6 +152,9 @@ this.getAssociationIndex(); }, methods: { + getScroll(d) { + this.top = d.scrollTop; + }, onload() { this.gid = store.state.Gid; this.getIndustryList(); @@ -193,6 +199,10 @@ console.log(res); if (res.code == 1) { this.industry_list = res.data; + this.industry_list.push({ + id: 0, + industry_name: '其他行业' + }); this.leftId = res.data[0].id; this.getAddressList(); } @@ -228,10 +238,15 @@ this.currentTabbarIndex = index; this.leftId = this.industry_list[index].id; this.list = []; + this.top = this.randomBetween(); this.getAddressList(); //this.handleLeftScrollView(index) //this.switchClassifyContent(); }, + randomBetween() { + let baseRandom = Math.random() * (0.99999 - 0.00001) + 0.00001; + return baseRandom.toFixed(5); // + }, // 点击分类后,处理scrollView滚动到居中位置 handleLeftScrollView(index) { const tabbarItemTop = this.tabbarItemInfo[index].top - this.scrollViewBasicTop @@ -286,7 +301,7 @@ .left-width { - flex-basis: 42%; + flex-basis: 28%; } /* 自定义导航栏内容 end */ diff --git a/pages/index/directory_back.vue b/pages/index/directory_back.vue new file mode 100644 index 0000000..6189b17 --- /dev/null +++ b/pages/index/directory_back.vue @@ -0,0 +1,380 @@ + + + + + + diff --git a/pages/index/enter_in.vue b/pages/index/enter_in.vue deleted file mode 100644 index 3e69e3a..0000000 --- a/pages/index/enter_in.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/index/event_info.vue b/pages/index/event_info.vue index 316caaa..f5e3328 100644 --- a/pages/index/event_info.vue +++ b/pages/index/event_info.vue @@ -38,7 +38,10 @@ 活动介绍 -
+ + + +
@@ -87,6 +90,7 @@ + @@ -308,7 +312,10 @@ } } questionnaireAdd({ - option: JSON.stringify(key) + option: JSON.stringify(key), + activity_id: this.id, + member_id: uid, + association_id: store.state.Gid, }) .then(res => { console.log(res); diff --git a/pages/index/events_my.vue b/pages/index/events_my.vue index 79b1756..0590af7 100644 --- a/pages/index/events_my.vue +++ b/pages/index/events_my.vue @@ -21,7 +21,7 @@ {{item.activity_name}} - {{item.activity_start_time}} + {{item.application_time}} 未开始 @@ -101,4 +101,4 @@ + \ No newline at end of file diff --git a/pages/index/home.vue b/pages/index/home.vue index 4a39a39..92fbc12 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -1,445 +1,479 @@ + .rounded_corner { + border-radius: 16rpx 16rpx 0rpx 0rpx; + padding-top: 20rpx; + } + \ No newline at end of file diff --git a/pages/index/my_card.vue b/pages/index/my_card.vue index 2ff0690..c37f4bc 100644 --- a/pages/index/my_card.vue +++ b/pages/index/my_card.vue @@ -16,23 +16,27 @@ - + {{ userThisInfo.nikename }} - {{ userThisInfo.enterprise_name }} + {{ userThisInfo.enterprise_name==null||userThisInfo.enterprise_name==''?'':userThisInfo.enterprise_name }} 联系方式:申请查看