正在显示
21 个修改的文件
包含
719 行增加
和
406 行删除
@@ -3,6 +3,8 @@ | @@ -3,6 +3,8 @@ | ||
3 | onLaunch: function() { | 3 | onLaunch: function() { |
4 | console.log('App Launch') | 4 | console.log('App Launch') |
5 | 5 | ||
6 | + | ||
7 | + | ||
6 | }, | 8 | }, |
7 | onShow: function() { | 9 | onShow: function() { |
8 | uni.hideTabBar({ | 10 | uni.hideTabBar({ |
@@ -19,7 +21,8 @@ | @@ -19,7 +21,8 @@ | ||
19 | let that = this, | 21 | let that = this, |
20 | token = uni.getStorageSync('token'), | 22 | token = uni.getStorageSync('token'), |
21 | header = { | 23 | header = { |
22 | - 'token': token || '' | 24 | + 'token': token || '', |
25 | + 'Content-Type':'application/x-www-form-urlencoded' | ||
23 | }, | 26 | }, |
24 | postData; | 27 | postData; |
25 | //网络请求 | 28 | //网络请求 |
1 | <template> | 1 | <template> |
2 | <view class="content"> | 2 | <view class="content"> |
3 | + <!-- {{chosetypename}} --> | ||
3 | 4 | ||
4 | <view class="teacherfooter"> | 5 | <view class="teacherfooter"> |
5 | <view class="teacherfootitem" @click="gotab(item,index)" v-for="(item,index) in list" :key="index"> | 6 | <view class="teacherfootitem" @click="gotab(item,index)" v-for="(item,index) in list" :key="index"> |
@@ -16,50 +17,21 @@ | @@ -16,50 +17,21 @@ | ||
16 | </template> | 17 | </template> |
17 | 18 | ||
18 | <script> | 19 | <script> |
19 | - let chosetype=uni.getStorageSync("chosetype"); | 20 | + // let chosetype=uni.getStorageSync("chosetype"); |
20 | export default { | 21 | export default { |
21 | data() { | 22 | data() { |
22 | return { | 23 | return { |
23 | - list:chosetype==1? [{ | ||
24 | - "pagePath": "/pages/school/school", | ||
25 | - "iconPath": "/static/xuexiao_icon@2x3.png", | ||
26 | - "selectedIconPath": "/static/xuexiao_icon@2x.png", | ||
27 | - "text": "学校", | ||
28 | - | ||
29 | - }, { | ||
30 | - "pagePath": "/pages/schoolmate/schoolmate", | ||
31 | - "iconPath": "/static/zhaoxiaoyou_icon@2x.png", | ||
32 | - "selectedIconPath": "/static/zhaoxiaoyou_icon@2x2.png", | ||
33 | - "text": "找校友" | ||
34 | - }, | ||
35 | - { | ||
36 | - "pagePath": "/pages/homePage/homePage", | ||
37 | - "iconPath": "/static/wodezhuye_icon@2x.png", | ||
38 | - "selectedIconPath": "/static/wodezhuye_icon@2x2.png", | ||
39 | - "text": "我的主页" | ||
40 | - } | ||
41 | - | ||
42 | - ]:[{ | ||
43 | - "pagePath": "/pages/schoolmate/schoolmate", | ||
44 | - "iconPath": "/static/zhaoxiaoyou_icon@2x.png", | ||
45 | - "selectedIconPath": "/static/zhaoxiaoyou_icon@2x2.png", | ||
46 | - "text": "找校友" | ||
47 | - }, | ||
48 | - { | ||
49 | - "pagePath": "/pages/homePage/collegeHome", | ||
50 | - "iconPath": "/static/wodezhuye_icon@2x.png", | ||
51 | - "selectedIconPath": "/static/wodezhuye_icon@2x2.png", | ||
52 | - "text": "我的主页" | ||
53 | - } | ||
54 | - | ||
55 | - ], | 24 | + list:[], |
56 | 25 | ||
57 | - currentTabIndex: this.current | 26 | + // currentTabIndex: this.current, |
27 | + currentTabIndex:"", | ||
28 | + choosecanshu:'' | ||
58 | } | 29 | } |
59 | }, | 30 | }, |
60 | // props: ["current"], | 31 | // props: ["current"], |
61 | props: { | 32 | props: { |
62 | current: { type: [Number, String],default: 0 }, | 33 | current: { type: [Number, String],default: 0 }, |
34 | + chosetypename:Number | ||
63 | 35 | ||
64 | }, | 36 | }, |
65 | onLoad() { | 37 | onLoad() { |
@@ -113,15 +85,76 @@ | @@ -113,15 +85,76 @@ | ||
113 | let url=item.pagePath; | 85 | let url=item.pagePath; |
114 | 86 | ||
115 | uni.switchTab({url}) | 87 | uni.switchTab({url}) |
88 | + | ||
116 | // uni.switchTab({ | 89 | // uni.switchTab({ |
117 | // url:"/pages/nearshop/nearshop" | 90 | // url:"/pages/nearshop/nearshop" |
118 | // }) | 91 | // }) |
119 | } | 92 | } |
120 | 93 | ||
121 | }, | 94 | }, |
122 | - onShow(){ | 95 | + created() { |
96 | + let that=this | ||
97 | + this.choosecanshu=this.chosetypename | ||
98 | + console.log('我是底部菜单',this.chosetypename,this.choosecanshu) | ||
99 | + let chosetype=uni.getStorageSync("chosetype"); | ||
100 | + console.log(chosetype) | ||
101 | + uni.$on('update',function(data){ | ||
102 | + console.log('监听到事件来自 update ,携带参数 msg 为:' ,data); | ||
103 | + that.currentTabIndex=data.currentTabIndex | ||
104 | + if(data.chosenum==1){ | ||
105 | + console.log(449898) | ||
106 | + that.list=[{ | ||
107 | + "pagePath": "/pages/school/school", | ||
108 | + "iconPath": "/static/xuexiao_icon@2x3.png", | ||
109 | + "selectedIconPath": "/static/xuexiao_icon@2x.png", | ||
110 | + "text": "学校", | ||
111 | + | ||
112 | + }, { | ||
113 | + "pagePath": "/pages/schoolmate/schoolmate", | ||
114 | + "iconPath": "/static/zhaoxiaoyou_icon@2x.png", | ||
115 | + "selectedIconPath": "/static/zhaoxiaoyou_icon@2x2.png", | ||
116 | + "text": "找校友" | ||
117 | + }, | ||
118 | + { | ||
119 | + "pagePath": "/pages/homePage/homePage", | ||
120 | + "iconPath": "/static/wodezhuye_icon@2x.png", | ||
121 | + "selectedIconPath": "/static/wodezhuye_icon@2x2.png", | ||
122 | + "text": "我的主页" | ||
123 | + } | ||
124 | + | ||
125 | + ] | ||
126 | + }else{ | ||
127 | + that.list=[{ | ||
128 | + "pagePath": "/pages/schoolmate/schoolmate", | ||
129 | + "iconPath": "/static/zhaoxiaoyou_icon@2x.png", | ||
130 | + "selectedIconPath": "/static/zhaoxiaoyou_icon@2x2.png", | ||
131 | + "text": "找校友" | ||
132 | + }, | ||
133 | + { | ||
134 | + "pagePath": "/pages/homePage/collegeHome", | ||
135 | + "iconPath": "/static/wodezhuye_icon@2x.png", | ||
136 | + "selectedIconPath": "/static/wodezhuye_icon@2x2.png", | ||
137 | + "text": "我的主页" | ||
138 | + } | ||
139 | + | ||
140 | + ] | ||
141 | + } | ||
142 | + | ||
143 | + }) | ||
144 | + | ||
145 | + console.log(that.list) | ||
146 | + }, | ||
147 | + watch: { | ||
123 | 148 | ||
124 | - } | 149 | + paramsDate: { |
150 | + handler(newValue, oldValue) { | ||
151 | + console.log(newValue,console.log(oldValue)) | ||
152 | + this.init(); | ||
153 | + }, | ||
154 | + deep: true | ||
155 | + } | ||
156 | + } | ||
157 | + | ||
125 | 158 | ||
126 | } | 159 | } |
127 | </script> | 160 | </script> |
1 | { | 1 | { |
2 | "pages": [ | 2 | "pages": [ |
3 | + | ||
3 | { | 4 | { |
4 | "path": "pages/register/register", | 5 | "path": "pages/register/register", |
5 | "style": { | 6 | "style": { |
@@ -10,7 +11,7 @@ | @@ -10,7 +11,7 @@ | ||
10 | } | 11 | } |
11 | }, | 12 | }, |
12 | { | 13 | { |
13 | - "path": "pages/school/school", | 14 | + "path": "pages/register/highRegister", |
14 | "style": { | 15 | "style": { |
15 | "navigationBarTitleText": "学长说", | 16 | "navigationBarTitleText": "学长说", |
16 | "navigationBarBackgroundColor": "#2D5575", | 17 | "navigationBarBackgroundColor": "#2D5575", |
@@ -19,15 +20,16 @@ | @@ -19,15 +20,16 @@ | ||
19 | } | 20 | } |
20 | }, | 21 | }, |
21 | { | 22 | { |
22 | - "path": "pages/register/highRegister", | 23 | + "path": "pages/school/school", |
23 | "style": { | 24 | "style": { |
24 | "navigationBarTitleText": "学长说", | 25 | "navigationBarTitleText": "学长说", |
25 | "navigationBarBackgroundColor": "#2D5575", | 26 | "navigationBarBackgroundColor": "#2D5575", |
26 | "navigationBarTextStyle": "white" | 27 | "navigationBarTextStyle": "white" |
27 | - | 28 | + |
28 | } | 29 | } |
29 | }, | 30 | }, |
30 | 31 | ||
32 | + | ||
31 | { | 33 | { |
32 | "path": "pages/register/selectSchool", | 34 | "path": "pages/register/selectSchool", |
33 | "style": { | 35 | "style": { |
@@ -68,15 +68,15 @@ | @@ -68,15 +68,15 @@ | ||
68 | --> | 68 | --> |
69 | 69 | ||
70 | 70 | ||
71 | - <view class="textBox"> | ||
72 | - YHA青年旅舍会员卡(一年)是国际青年旅舍联盟会员身份证明,全球通用,也是旅行者入住青年旅舍的凭证。拥有会员卡,可以享受国内外国际青年旅舍住宿价格的优惠,同时部分海外青年旅舍只允许会员入住。 | ||
73 | - 成为YHA青年旅舍会员的好处: | ||
74 | - <view>1)入住青年旅舍享受房价上的优惠;</view> | 71 | + <!-- <view class="textBox"> |
72 | + YHA会员卡(一年)是会员身份证明,全球通用。拥有会员卡,可以享受价格优惠。 | ||
73 | + 成为YHA会员的好处: | ||
74 | + <view>1)入住旅舍享受房价上的优惠;</view> | ||
75 | <view>2)在世界各地享有食、住、行、游、购、娱等逾3,000项优惠,如:在全球多个国际机场和车船站,凭会员卡兑换外币可免收手续费;观光、租车、购物、参团、购买车船票等均可能有折扣,折扣率高达50%。单是在澳大利亚,优惠项目便接近800种;</view> | 75 | <view>2)在世界各地享有食、住、行、游、购、娱等逾3,000项优惠,如:在全球多个国际机场和车船站,凭会员卡兑换外币可免收手续费;观光、租车、购物、参团、购买车船票等均可能有折扣,折扣率高达50%。单是在澳大利亚,优惠项目便接近800种;</view> |
76 | - <view>3)以优惠价格参与多项由青年旅舍举办的各类文化、旅游等方面的交流活动;</view> | ||
77 | - <view>4)优先参与青年旅舍组织的国际交流活动。</view> | 76 | + <view>3)以优惠价格参与各类文化、旅游等方面的交流活动;</view> |
77 | + <view>4)优先参与国际交流活动。</view> | ||
78 | 78 | ||
79 | - </view> | 79 | + </view> --> |
80 | </view> | 80 | </view> |
81 | </template> | 81 | </template> |
82 | 82 |
@@ -21,7 +21,12 @@ | @@ -21,7 +21,12 @@ | ||
21 | <view class="cont"> | 21 | <view class="cont"> |
22 | <view class="title">{{item.nickname}}</view> | 22 | <view class="title">{{item.nickname}}</view> |
23 | <view class="fen">{{item.title}}</view> | 23 | <view class="fen">{{item.title}}</view> |
24 | - <view class="txt">{{item.content}}</view> | 24 | + <view class="txt textcontent"> |
25 | + <rich-text :nodes="item.content"></rich-text> | ||
26 | + | ||
27 | + | ||
28 | + </view> | ||
29 | + | ||
25 | </view> | 30 | </view> |
26 | <view class="right" :class="item.is_like_user==0?'like':''"> | 31 | <view class="right" :class="item.is_like_user==0?'like':''"> |
27 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> | 32 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> |
@@ -60,7 +65,10 @@ | @@ -60,7 +65,10 @@ | ||
60 | <view class="cont"> | 65 | <view class="cont"> |
61 | <view class="title">{{item.nickname}}</view> | 66 | <view class="title">{{item.nickname}}</view> |
62 | <view class="fen">{{item.title}}</view> | 67 | <view class="fen">{{item.title}}</view> |
63 | - <view class="txt">{{item.content}}</view> | 68 | + <view class="txt textcontent"> |
69 | + <rich-text :nodes="item.content"></rich-text> | ||
70 | + | ||
71 | + </view> | ||
64 | </view> | 72 | </view> |
65 | <view class="right" :class="item.is_like_user==0?'like':''"> | 73 | <view class="right" :class="item.is_like_user==0?'like':''"> |
66 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> | 74 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> |
@@ -316,6 +324,12 @@ | @@ -316,6 +324,12 @@ | ||
316 | font-size: 28rpx; | 324 | font-size: 28rpx; |
317 | text-align: center; | 325 | text-align: center; |
318 | } | 326 | } |
327 | + .textcontent{ | ||
328 | + display: -webkit-box; | ||
329 | + -webkit-box-orient: vertical; | ||
330 | + -webkit-line-clamp: 3; | ||
331 | + overflow: hidden; | ||
332 | + } | ||
319 | 333 | ||
320 | .title { | 334 | .title { |
321 | background-color: #fff; | 335 | background-color: #fff; |
@@ -21,7 +21,10 @@ | @@ -21,7 +21,10 @@ | ||
21 | <view class="cont" :style="{width:width}" @click="toarticl" :data-id="item.id"> | 21 | <view class="cont" :style="{width:width}" @click="toarticl" :data-id="item.id"> |
22 | <view class="rowOne">{{item.nickname}}</view> | 22 | <view class="rowOne">{{item.nickname}}</view> |
23 | <view class="rowTwo">{{item.title}}</view> | 23 | <view class="rowTwo">{{item.title}}</view> |
24 | - <view class="rowThree">{{item.des_content}}</view> | 24 | + <!-- <view class="rowThree">{{item.des_content}}</view> --> |
25 | + <view style="rowThree textcontent"> | ||
26 | + <rich-text :nodes="item.des_content"></rich-text> | ||
27 | + </view> | ||
25 | </view> | 28 | </view> |
26 | </view> | 29 | </view> |
27 | </view> | 30 | </view> |
@@ -48,7 +51,11 @@ | @@ -48,7 +51,11 @@ | ||
48 | <view class="title">{{item.nickname}}</view> | 51 | <view class="title">{{item.nickname}}</view> |
49 | 52 | ||
50 | <view class="fen">{{item.title}}</view> | 53 | <view class="fen">{{item.title}}</view> |
51 | - <view class="txt">{{item.des_content}}</view> | 54 | + <view style="textcontent"> |
55 | + <rich-text :nodes="item.des_content"></rich-text> | ||
56 | + </view> | ||
57 | + | ||
58 | + <!-- <view class="txt">{{item.des_content}}</view> --> | ||
52 | </view> | 59 | </view> |
53 | <view class="right" :class="item.is_like_user==0?'like':''"> | 60 | <view class="right" :class="item.is_like_user==0?'like':''"> |
54 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> | 61 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> |
@@ -67,7 +74,9 @@ | @@ -67,7 +74,9 @@ | ||
67 | </view> | 74 | </view> |
68 | 75 | ||
69 | 76 | ||
70 | - | 77 | + <!-- <view> |
78 | + | ||
79 | + </view> --> | ||
71 | <view class="nodata" v-if="cellectlist.length==0">暂无数据</view> | 80 | <view class="nodata" v-if="cellectlist.length==0">暂无数据</view> |
72 | <view v-else> | 81 | <view v-else> |
73 | <view class="cellcetBox" v-if="isHistoryShow==false&&isMineShow==false"> | 82 | <view class="cellcetBox" v-if="isHistoryShow==false&&isMineShow==false"> |
@@ -84,7 +93,10 @@ | @@ -84,7 +93,10 @@ | ||
84 | <view class="title">{{item.nickname}}</view> | 93 | <view class="title">{{item.nickname}}</view> |
85 | 94 | ||
86 | <view class="fen">{{item.title}}</view> | 95 | <view class="fen">{{item.title}}</view> |
87 | - <view class="txt">{{item.des_content}}</view> | 96 | + <!-- <view class="txt">{{item.des_content}}</view> --> |
97 | + <view style="txt textcontent"> | ||
98 | + <rich-text :nodes="item.des_content"></rich-text> | ||
99 | + </view> | ||
88 | </view> | 100 | </view> |
89 | <view class="right"> | 101 | <view class="right"> |
90 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> | 102 | <view class="text" @click.stop="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;"> |
@@ -377,6 +389,12 @@ | @@ -377,6 +389,12 @@ | ||
377 | text-align: center; | 389 | text-align: center; |
378 | font-size: 28rpx; | 390 | font-size: 28rpx; |
379 | } | 391 | } |
392 | + .textcontent{ | ||
393 | + display: -webkit-box; | ||
394 | + -webkit-box-orient: vertical; | ||
395 | + -webkit-line-clamp: 3; | ||
396 | + overflow: hidden; | ||
397 | + } | ||
380 | 398 | ||
381 | .title { | 399 | .title { |
382 | background-color: #fff; | 400 | background-color: #fff; |
@@ -47,13 +47,17 @@ | @@ -47,13 +47,17 @@ | ||
47 | <view class="teacherfootname" :class="footersel==3?'selactive':''">我的主页</view> | 47 | <view class="teacherfootname" :class="footersel==3?'selactive':''">我的主页</view> |
48 | </view> | 48 | </view> |
49 | </view> --> | 49 | </view> --> |
50 | - <tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | 50 | + <!-- :chosetypename="chosetypenumber" --> |
51 | + <!-- :current="currentTabIndex" --> | ||
52 | + <tabBar backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | ||
51 | </view> | 53 | </view> |
52 | </template> | 54 | </template> |
53 | 55 | ||
54 | <script> | 56 | <script> |
55 | import app from "../../App.vue"; | 57 | import app from "../../App.vue"; |
56 | import tabBar from '../../components/tabvue/tabvue.vue' | 58 | import tabBar from '../../components/tabvue/tabvue.vue' |
59 | +let chosetype=uni.getStorageSync("chosetype"); | ||
60 | +console.log('344',chosetype) | ||
57 | export default { | 61 | export default { |
58 | components: { | 62 | components: { |
59 | tabBar, | 63 | tabBar, |
@@ -66,7 +70,8 @@ data(){ | @@ -66,7 +70,8 @@ data(){ | ||
66 | type:"", | 70 | type:"", |
67 | userinfolist:{}, | 71 | userinfolist:{}, |
68 | token:'', | 72 | token:'', |
69 | - user_id:"" | 73 | + user_id:"", |
74 | + chosetypenumber:chosetype, | ||
70 | } | 75 | } |
71 | }, | 76 | }, |
72 | methods:{ | 77 | methods:{ |
@@ -78,7 +83,9 @@ methods:{ | @@ -78,7 +83,9 @@ methods:{ | ||
78 | icon:'none' | 83 | icon:'none' |
79 | }) | 84 | }) |
80 | }else{ | 85 | }else{ |
81 | - | 86 | + uni.navigateTo({ |
87 | + url:'/pages/homePage/pubArticle' | ||
88 | + }) | ||
82 | } | 89 | } |
83 | 90 | ||
84 | }, | 91 | }, |
@@ -201,6 +208,9 @@ onLoad(options){ | @@ -201,6 +208,9 @@ onLoad(options){ | ||
201 | this.token=uni.getStorageSync('token') | 208 | this.token=uni.getStorageSync('token') |
202 | }, | 209 | }, |
203 | onShow(){ | 210 | onShow(){ |
211 | + let chosetype=uni.getStorageSync("chosetype"); | ||
212 | + this.chosetypenumber=chosetype; | ||
213 | + uni.$emit('update',{chosenum:chosetype,currentTabIndex:1}) | ||
204 | this.getuserinfo() | 214 | this.getuserinfo() |
205 | } | 215 | } |
206 | } | 216 | } |
@@ -85,14 +85,17 @@ | @@ -85,14 +85,17 @@ | ||
85 | </view> | 85 | </view> |
86 | 86 | ||
87 | --> | 87 | --> |
88 | - | ||
89 | - <tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | 88 | + <!-- :chosetypename="chosetypenumber" --> |
89 | + <!-- :current="currentTabIndex" --> | ||
90 | + <tabBar backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | ||
90 | </view> | 91 | </view> |
91 | </template> | 92 | </template> |
92 | 93 | ||
93 | <script> | 94 | <script> |
94 | import app from "../../App.vue"; | 95 | import app from "../../App.vue"; |
95 | import tabBar from '../../components/tabvue/tabvue.vue' | 96 | import tabBar from '../../components/tabvue/tabvue.vue' |
97 | + let chosetype=uni.getStorageSync("chosetype"); | ||
98 | + console.log('437489',chosetype) | ||
96 | 99 | ||
97 | export default { | 100 | export default { |
98 | components: { | 101 | components: { |
@@ -108,6 +111,7 @@ | @@ -108,6 +111,7 @@ | ||
108 | head_image:'', | 111 | head_image:'', |
109 | jumpschool:true, | 112 | jumpschool:true, |
110 | jumpschoolk:true, | 113 | jumpschoolk:true, |
114 | + chosetypenumber:chosetype, | ||
111 | 115 | ||
112 | } | 116 | } |
113 | }, | 117 | }, |
@@ -254,6 +258,12 @@ | @@ -254,6 +258,12 @@ | ||
254 | this.type=type | 258 | this.type=type |
255 | this.getuserinfo() | 259 | this.getuserinfo() |
256 | }, | 260 | }, |
261 | + onShow() { | ||
262 | + let chosetype=uni.getStorageSync("chosetype"); | ||
263 | + this.chosetypenumber=chosetype; | ||
264 | + uni.$emit('update',{chosenum:chosetype,currentTabIndex:2}) | ||
265 | + console.log(this.chosetypenumber) | ||
266 | + } | ||
257 | } | 267 | } |
258 | </script> | 268 | </script> |
259 | 269 |
1 | <template> | 1 | <template> |
2 | <view class="content"> | 2 | <view class="content"> |
3 | - <view class="item" @click="tocommentlist(item)" v-for="(item,index) in commentlist" :key="index"> | 3 | + <view class="item" @click="tocommentlist(item)" v-for="(item,index) in commentlist" :key="index"> |
4 | <view class="toprow" style="display:flex;justify-content: space-between;"> | 4 | <view class="toprow" style="display:flex;justify-content: space-between;"> |
5 | <view style="display:flex;"> | 5 | <view style="display:flex;"> |
6 | <image class="photo" :src="item.head_image" style="border-radius: 50%;"></image> | 6 | <image class="photo" :src="item.head_image" style="border-radius: 50%;"></image> |
@@ -11,15 +11,17 @@ | @@ -11,15 +11,17 @@ | ||
11 | </view> | 11 | </view> |
12 | <view v-if="item.usera_id==user_id"> | 12 | <view v-if="item.usera_id==user_id"> |
13 | <view class="right" style="color:#BDC4CE">已读</view> | 13 | <view class="right" style="color:#BDC4CE">已读</view> |
14 | + <view class="delname" @click.stop="del(item)">删除</view> | ||
14 | </view> | 15 | </view> |
15 | <view v-else> | 16 | <view v-else> |
16 | <view class="right" v-if="item.readtime==null">未读</view> | 17 | <view class="right" v-if="item.readtime==null">未读</view> |
17 | <view class="right" style="color:#BDC4CE" v-else>已读</view> | 18 | <view class="right" style="color:#BDC4CE" v-else>已读</view> |
19 | + <view class="delname" @click.stop="del(item)">删除</view> | ||
18 | </view> | 20 | </view> |
19 | 21 | ||
20 | 22 | ||
21 | </view> | 23 | </view> |
22 | - <view class="bottomrow"> | 24 | + <view class="bottomrow" @click.stop="hide"> |
23 | {{item.des_content}} | 25 | {{item.des_content}} |
24 | </view> | 26 | </view> |
25 | </view> | 27 | </view> |
@@ -82,7 +84,38 @@ export default { | @@ -82,7 +84,38 @@ export default { | ||
82 | }).catch((err)=>{ | 84 | }).catch((err)=>{ |
83 | console.log(err) | 85 | console.log(err) |
84 | }) | 86 | }) |
85 | - } | 87 | + }, |
88 | + del(item){ | ||
89 | + var that = this | ||
90 | + uni.showModal({ | ||
91 | + title: '提示', | ||
92 | + content: '是否删除该留言', | ||
93 | + success: function (res) { | ||
94 | + if (res.confirm) { | ||
95 | + | ||
96 | + var url = "mes/delMes" | ||
97 | + var token = uni.getStorageSync('token') | ||
98 | + var params = { | ||
99 | + mes_id:item.id | ||
100 | + | ||
101 | + | ||
102 | + } | ||
103 | + app.post(url,params,"get").then((res)=>{ | ||
104 | + console.log(res) | ||
105 | + that.commentlist=[]; | ||
106 | + that.page=1; | ||
107 | + that.getcommentlist() | ||
108 | + | ||
109 | + }).catch((err)=>{ | ||
110 | + console.log(err) | ||
111 | + }) | ||
112 | + } else if (res.cancel) { | ||
113 | + console.log('用户点击取消'); | ||
114 | + } | ||
115 | + } | ||
116 | + }); | ||
117 | + | ||
118 | + } | ||
86 | }, | 119 | }, |
87 | onLoad(options){ | 120 | onLoad(options){ |
88 | console.log(options) | 121 | console.log(options) |
@@ -114,6 +147,12 @@ export default { | @@ -114,6 +147,12 @@ export default { | ||
114 | text-align: center; | 147 | text-align: center; |
115 | padding: 20rpx 0; | 148 | padding: 20rpx 0; |
116 | } | 149 | } |
150 | + .delname{ | ||
151 | + color:#FF0E0E; | ||
152 | + font-size: 26rpx; | ||
153 | + margin-top:10rpx | ||
154 | + } | ||
155 | + | ||
117 | .item{ | 156 | .item{ |
118 | width: 686rpx; | 157 | width: 686rpx; |
119 | margin: 0 auto; | 158 | margin: 0 auto; |
@@ -28,8 +28,9 @@ | @@ -28,8 +28,9 @@ | ||
28 | </view> | 28 | </view> |
29 | </view> | 29 | </view> |
30 | <view class="item2"> | 30 | <view class="item2"> |
31 | - <textarea v-model="articlecontent" name="" id="" cols="30" rows="10" class="textarea" placeholder="请输入文章内容" placeholder-style="color:rgba(189,196,206,1);font-size:28rpx" maxlength="1000"></textarea> | ||
32 | - <view class="tips">可输入1000字</view> | 31 | + <editor id="editor" class="ql-container" :placeholder="placeholder" @input="onEditorReady"></editor> |
32 | + <!-- <textarea v-model="articlecontent" name="" id="" cols="30" rows="10" class="textarea" placeholder="请输入文章内容" placeholder-style="color:rgba(189,196,206,1);font-size:28rpx" maxlength="1000"></textarea> --> | ||
33 | + <view class="tips">可输入3000字</view> | ||
33 | </view> | 34 | </view> |
34 | <view class="picBox"> | 35 | <view class="picBox"> |
35 | <!-- <view class="boxitem"> | 36 | <!-- <view class="boxitem"> |
@@ -79,6 +80,7 @@ export default { | @@ -79,6 +80,7 @@ export default { | ||
79 | isUpload:false, | 80 | isUpload:false, |
80 | article_type_id:'', | 81 | article_type_id:'', |
81 | show_type:1, | 82 | show_type:1, |
83 | + placeholder: '请输入文章内容' | ||
82 | 84 | ||
83 | } | 85 | } |
84 | }, | 86 | }, |
@@ -87,6 +89,11 @@ export default { | @@ -87,6 +89,11 @@ export default { | ||
87 | this.show_type=e.currentTarget.dataset.id | 89 | this.show_type=e.currentTarget.dataset.id |
88 | 90 | ||
89 | }, | 91 | }, |
92 | + onEditorReady(e) { | ||
93 | + console.log(e) | ||
94 | + this.articlecontent = e.detail.html; | ||
95 | + console.log(this.articlecontent) | ||
96 | + }, | ||
90 | seltype(){ | 97 | seltype(){ |
91 | this.istypeshow=true | 98 | this.istypeshow=true |
92 | }, | 99 | }, |
@@ -274,6 +281,9 @@ export default { | @@ -274,6 +281,9 @@ export default { | ||
274 | .item2{ | 281 | .item2{ |
275 | padding: 32rpx; | 282 | padding: 32rpx; |
276 | width: 686rpx; | 283 | width: 686rpx; |
284 | + .ql-container{ | ||
285 | + width:615rpx; | ||
286 | + } | ||
277 | .textarea{ | 287 | .textarea{ |
278 | width: 622rpx; | 288 | width: 622rpx; |
279 | font-size: 28rpx; | 289 | font-size: 28rpx; |
@@ -282,6 +292,7 @@ export default { | @@ -282,6 +292,7 @@ export default { | ||
282 | font-size: 24rpx; | 292 | font-size: 24rpx; |
283 | text-align: right; | 293 | text-align: right; |
284 | width: 622rpx; | 294 | width: 622rpx; |
295 | + margin-top:10rpx; | ||
285 | } | 296 | } |
286 | } | 297 | } |
287 | .picBox{ | 298 | .picBox{ |
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | <view class="text">最多可提{{yue}}元,<text @click="tixianall">全部提现</text></view> | 8 | <view class="text">最多可提{{yue}}元,<text @click="tixianall">全部提现</text></view> |
9 | <view class="btn" @click="tixian">提现</view> | 9 | <view class="btn" @click="tixian">提现</view> |
10 | </view> | 10 | </view> |
11 | - <view class="textBox"> | 11 | + <!-- <view class="textBox"> |
12 | YHA青年旅舍会员卡(一年)是国际青年旅舍联盟会员身份证明,全球通用,也是旅行者入住青年旅舍的凭证。拥有会员卡,可以享受国内外国际青年旅舍住宿价格的优惠,同时部分海外青年旅舍只允许会员入住。 | 12 | YHA青年旅舍会员卡(一年)是国际青年旅舍联盟会员身份证明,全球通用,也是旅行者入住青年旅舍的凭证。拥有会员卡,可以享受国内外国际青年旅舍住宿价格的优惠,同时部分海外青年旅舍只允许会员入住。 |
13 | 成为YHA青年旅舍会员的好处: | 13 | 成为YHA青年旅舍会员的好处: |
14 | <view>1)入住青年旅舍享受房价上的优惠;</view> | 14 | <view>1)入住青年旅舍享受房价上的优惠;</view> |
@@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
16 | <view>3)以优惠价格参与多项由青年旅舍举办的各类文化、旅游等方面的交流活动;</view> | 16 | <view>3)以优惠价格参与多项由青年旅舍举办的各类文化、旅游等方面的交流活动;</view> |
17 | <view>4)优先参与青年旅舍组织的国际交流活动。</view> | 17 | <view>4)优先参与青年旅舍组织的国际交流活动。</view> |
18 | 18 | ||
19 | - </view> | 19 | + </view> --> |
20 | </view> | 20 | </view> |
21 | </template> | 21 | </template> |
22 | 22 |
@@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
27 | <view class="title">毕业年份</view> | 27 | <view class="title">毕业年份</view> |
28 | <!-- <view class="selectBtn">请选择毕业年份<image class="icon" src="../../static/zhuandao_icon@2x.png"></image></view> --> | 28 | <!-- <view class="selectBtn">请选择毕业年份<image class="icon" src="../../static/zhuandao_icon@2x.png"></image></view> --> |
29 | <view @click="selDate" style="display: flex;justify-content: space-between;align-items: center;"> | 29 | <view @click="selDate" style="display: flex;justify-content: space-between;align-items: center;"> |
30 | - <picker mode="date" :value="date" start="2000-01-01" @change="bindTimeChange"> | 30 | + <picker fields="year" mode ="date" :value="date" :start="startDate" :end="endDate" @change="bindTimeChange"> |
31 | <view class="selectBtn">{{ isDateShow ? date : '请选择毕业年份' }}</view> | 31 | <view class="selectBtn">{{ isDateShow ? date : '请选择毕业年份' }}</view> |
32 | </picker> | 32 | </picker> |
33 | <image class="icon" src="../../static/zhuandao_icon@2x.png"></image> | 33 | <image class="icon" src="../../static/zhuandao_icon@2x.png"></image> |
@@ -123,13 +123,16 @@ import app from '../../App.vue'; | @@ -123,13 +123,16 @@ import app from '../../App.vue'; | ||
123 | 123 | ||
124 | export default { | 124 | export default { |
125 | data() { | 125 | data() { |
126 | + const currentDate = this.getDate({ | ||
127 | + format: true, | ||
128 | + }) | ||
126 | return { | 129 | return { |
127 | isSubPopupShow: false, | 130 | isSubPopupShow: false, |
128 | isStylePopupShow: false, | 131 | isStylePopupShow: false, |
129 | username: '', | 132 | username: '', |
130 | image: '', | 133 | image: '', |
131 | isUpload: false, | 134 | isUpload: false, |
132 | - date: '请选择毕业年份', | 135 | + date: currentDate, |
133 | isDateShow: false, | 136 | isDateShow: false, |
134 | uplist: [], | 137 | uplist: [], |
135 | upid: '', | 138 | upid: '', |
@@ -154,10 +157,34 @@ export default { | @@ -154,10 +157,34 @@ export default { | ||
154 | academyid: '', | 157 | academyid: '', |
155 | chuanimg: '', | 158 | chuanimg: '', |
156 | baseUrl: app.globalData.imageBaseUrl, | 159 | baseUrl: app.globalData.imageBaseUrl, |
157 | - uploadImg: '' | 160 | + uploadImg: '', |
161 | + start:'' | ||
158 | }; | 162 | }; |
159 | }, | 163 | }, |
164 | + computed: { | ||
165 | + startDate() { | ||
166 | + return this.getDate('start'); | ||
167 | + }, | ||
168 | + endDate() { | ||
169 | + return this.getDate('end'); | ||
170 | + } | ||
171 | + }, | ||
160 | methods: { | 172 | methods: { |
173 | + getDate(type) { | ||
174 | + const date = new Date(); | ||
175 | + let year = date.getFullYear(); | ||
176 | + let month = date.getMonth() + 1; | ||
177 | + let day = date.getDate(); | ||
178 | + | ||
179 | + if (type === 'start') { | ||
180 | + year = year - 60; | ||
181 | + } else if (type === 'end') { | ||
182 | + year = year + 20; | ||
183 | + } | ||
184 | + month = month > 9 ? month : '0' + month;; | ||
185 | + day = day > 9 ? day : '0' + day; | ||
186 | + return `${year}`; | ||
187 | + }, | ||
161 | selDate() { | 188 | selDate() { |
162 | this.isDateShow = true; | 189 | this.isDateShow = true; |
163 | }, | 190 | }, |
@@ -396,6 +423,10 @@ export default { | @@ -396,6 +423,10 @@ export default { | ||
396 | onLoad() { | 423 | onLoad() { |
397 | this.getUpType(); | 424 | this.getUpType(); |
398 | this.getAllSub(); | 425 | this.getAllSub(); |
426 | + }, | ||
427 | + onShow() { | ||
428 | + var date=new Date() | ||
429 | + this.start=date.getFullYear() | ||
399 | } | 430 | } |
400 | }; | 431 | }; |
401 | </script> | 432 | </script> |
@@ -529,7 +560,7 @@ export default { | @@ -529,7 +560,7 @@ export default { | ||
529 | z-index: 999; | 560 | z-index: 999; |
530 | .styleCard { | 561 | .styleCard { |
531 | width: 750rpx; | 562 | width: 750rpx; |
532 | - height: 228rpx; | 563 | + // height: 228rpx; |
533 | background: rgba(255, 255, 255, 1); | 564 | background: rgba(255, 255, 255, 1); |
534 | // opacity:1; | 565 | // opacity:1; |
535 | border-radius: 20px 20px 0px 0px; | 566 | border-radius: 20px 20px 0px 0px; |
@@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
24 | <view class="title">入学年份</view> | 24 | <view class="title">入学年份</view> |
25 | 25 | ||
26 | <view class="select" @click="selDate"> | 26 | <view class="select" @click="selDate"> |
27 | - <picker mode="date" :value="date" start="2000-01-01" @change="bindTimeChange"> | 27 | + <picker fields="year" mode ="date" :value="date" :start="startDate" :end="endDate" @change="bindTimeChange"> |
28 | <view class="uni-input">{{isDateShow? date : '请选择入学年份'}}</view> | 28 | <view class="uni-input">{{isDateShow? date : '请选择入学年份'}}</view> |
29 | </picker> | 29 | </picker> |
30 | <image class="icon" src="../../static/zhuandao_icon@2x.png"></image> | 30 | <image class="icon" src="../../static/zhuandao_icon@2x.png"></image> |
@@ -39,9 +39,13 @@ | @@ -39,9 +39,13 @@ | ||
39 | 39 | ||
40 | <script> | 40 | <script> |
41 | import app from "../../App.vue"; | 41 | import app from "../../App.vue"; |
42 | + | ||
42 | export default { | 43 | export default { |
43 | 44 | ||
44 | data(){ | 45 | data(){ |
46 | + const currentDate = this.getDate({ | ||
47 | + format: true | ||
48 | + }) | ||
45 | return{ | 49 | return{ |
46 | level:'1', | 50 | level:'1', |
47 | nickname:'', | 51 | nickname:'', |
@@ -50,17 +54,54 @@ export default { | @@ -50,17 +54,54 @@ export default { | ||
50 | school_id:'', | 54 | school_id:'', |
51 | email:'', | 55 | email:'', |
52 | isUpload:false, | 56 | isUpload:false, |
53 | - date: '请选择入学年份', | 57 | + date: currentDate, |
54 | isDateShow: false, | 58 | isDateShow: false, |
55 | isNameShow:false, | 59 | isNameShow:false, |
56 | - chuanimg:'' | 60 | + chuanimg:'', |
61 | + startdate:'', | ||
62 | + endate:'' | ||
57 | } | 63 | } |
58 | }, | 64 | }, |
59 | onLoad(options) { | 65 | onLoad(options) { |
60 | console.log(options) | 66 | console.log(options) |
61 | // this.school_id=options.school_id | 67 | // this.school_id=options.school_id |
62 | }, | 68 | }, |
69 | + onShow(){ | ||
70 | + var date=new Date(); | ||
71 | + console.log(date) | ||
72 | + | ||
73 | + this.startdate=date.getFullYear(); | ||
74 | + this.date=date.getFullYear(); | ||
75 | + console.log(this.date,'我是年份') | ||
76 | + this.endate=Number(this.startdate)+20 | ||
77 | + console.log(this.startdate,1234567890,this.endate); | ||
78 | + | ||
79 | + }, | ||
80 | + computed: { | ||
81 | + startDate() { | ||
82 | + return this.getDate('start'); | ||
83 | + }, | ||
84 | + endDate() { | ||
85 | + return this.getDate('end'); | ||
86 | + } | ||
87 | + }, | ||
63 | methods:{ | 88 | methods:{ |
89 | + getDate(type) { | ||
90 | + const date = new Date(); | ||
91 | + let year = date.getFullYear(); | ||
92 | + let month = date.getMonth() + 1; | ||
93 | + let day = date.getDate(); | ||
94 | + | ||
95 | + if (type === 'start') { | ||
96 | + year = year - 60; | ||
97 | + } else if (type === 'end') { | ||
98 | + year = year + 20; | ||
99 | + } | ||
100 | + month = month > 9 ? month : '0' + month;; | ||
101 | + day = day > 9 ? day : '0' + day; | ||
102 | + return `${year}`; | ||
103 | + }, | ||
104 | + | ||
64 | selDate(){ | 105 | selDate(){ |
65 | this.isDateShow=true | 106 | this.isDateShow=true |
66 | }, | 107 | }, |
@@ -184,6 +225,8 @@ export default { | @@ -184,6 +225,8 @@ export default { | ||
184 | }); | 225 | }); |
185 | }, | 226 | }, |
186 | } | 227 | } |
228 | + | ||
229 | + | ||
187 | } | 230 | } |
188 | </script> | 231 | </script> |
189 | 232 |
@@ -30,7 +30,8 @@ | @@ -30,7 +30,8 @@ | ||
30 | session_key: '', | 30 | session_key: '', |
31 | openid: '', | 31 | openid: '', |
32 | type:'', | 32 | type:'', |
33 | - istoken:'' | 33 | + istoken:'', |
34 | + date:'' | ||
34 | } | 35 | } |
35 | }, | 36 | }, |
36 | onLoad(options) { | 37 | onLoad(options) { |
@@ -51,6 +52,10 @@ | @@ -51,6 +52,10 @@ | ||
51 | this.get_code(); | 52 | this.get_code(); |
52 | 53 | ||
53 | }, | 54 | }, |
55 | + onShow() { | ||
56 | + var date=new Date() | ||
57 | + this.start=date.getFullYear() | ||
58 | + }, | ||
54 | methods: { | 59 | methods: { |
55 | // 用code 换token | 60 | // 用code 换token |
56 | code2Token(){ | 61 | code2Token(){ |
@@ -94,7 +99,7 @@ | @@ -94,7 +99,7 @@ | ||
94 | } | 99 | } |
95 | }).catch((err)=>{ | 100 | }).catch((err)=>{ |
96 | console.log(err) | 101 | console.log(err) |
97 | - uni.setStorageSync("chosetype",1) | 102 | + // uni.setStorageSync("chosetype",1) |
98 | wx.switchTab({ | 103 | wx.switchTab({ |
99 | url:'../school/school' | 104 | url:'../school/school' |
100 | }) | 105 | }) |
@@ -46,7 +46,10 @@ | @@ -46,7 +46,10 @@ | ||
46 | </view> | 46 | </view> |
47 | <view class="articleBox"> | 47 | <view class="articleBox"> |
48 | <view class="title">{{item.title}}</view> | 48 | <view class="title">{{item.title}}</view> |
49 | - <view class="txt">{{item.des_content}}</view> | 49 | + <view class="txt textcontent"> |
50 | + <rich-text :nodes="item.des_content"></rich-text> | ||
51 | + <!-- {{item.des_content}} --> | ||
52 | + </view> | ||
50 | <image :src="item" v-for="(item,index) in item.des_images" :key="index"></image> | 53 | <image :src="item" v-for="(item,index) in item.des_images" :key="index"></image> |
51 | <!-- <image src="../../static/bg_img@2x.png"></image> --> | 54 | <!-- <image src="../../static/bg_img@2x.png"></image> --> |
52 | </view> | 55 | </view> |
@@ -215,6 +218,12 @@ export default { | @@ -215,6 +218,12 @@ export default { | ||
215 | top: 0; | 218 | top: 0; |
216 | z-index: -1; | 219 | z-index: -1; |
217 | } | 220 | } |
221 | + .textcontent{ | ||
222 | + display: -webkit-box; | ||
223 | + -webkit-box-orient: vertical; | ||
224 | + -webkit-line-clamp: 3; | ||
225 | + overflow: hidden; | ||
226 | + } | ||
218 | // background: url('../../static/bg_img@2x.png') no-repeat; | 227 | // background: url('../../static/bg_img@2x.png') no-repeat; |
219 | // background-size: 750rpx 334rpx; | 228 | // background-size: 750rpx 334rpx; |
220 | // height: 100vh; | 229 | // height: 100vh; |
@@ -20,8 +20,9 @@ | @@ -20,8 +20,9 @@ | ||
20 | <view class="txt" style="color: #BDC4CE;">已收藏</view> | 20 | <view class="txt" style="color: #BDC4CE;">已收藏</view> |
21 | </view> | 21 | </view> |
22 | </view> | 22 | </view> |
23 | - <view class="text"> | ||
24 | - {{articlelist.des_content==undefined?'':articlelist.des_content}} | 23 | + <view class="text" v-if="articlelist.des_content!=undefined"> |
24 | + <rich-text :nodes="articlelist.des_content"></rich-text> | ||
25 | + <!-- {{articlelist.des_content==undefined?'':articlelist.des_content}} --> | ||
25 | </view> | 26 | </view> |
26 | <view style="display:flex;"> | 27 | <view style="display:flex;"> |
27 | <image :src="item" v-for="(item,index) in articlelist.des_images" :key="indexk" @click.stop="preimg(index)" style="margin-right:10rpx;margin-bottom:10rpx;width:128rpx; | 28 | <image :src="item" v-for="(item,index) in articlelist.des_images" :key="indexk" @click.stop="preimg(index)" style="margin-right:10rpx;margin-bottom:10rpx;width:128rpx; |
@@ -51,19 +51,22 @@ | @@ -51,19 +51,22 @@ | ||
51 | <view class="teacherfootname" :class="footersel==3?'selactive':''">我的主页</view> | 51 | <view class="teacherfootname" :class="footersel==3?'selactive':''">我的主页</view> |
52 | </view> | 52 | </view> |
53 | </view> --> | 53 | </view> --> |
54 | - <tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | ||
55 | - | ||
56 | - | 54 | + <tabBar backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> |
55 | +<!-- :current="currentTabIndex" --> | ||
56 | + <!-- <tabBar v-else :current="currentTabIndex" :chosetypename="2" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> --> | ||
57 | </view> | 57 | </view> |
58 | </template> | 58 | </template> |
59 | 59 | ||
60 | <script> | 60 | <script> |
61 | import app from "../../App.vue"; | 61 | import app from "../../App.vue"; |
62 | import tabBar from '../../components/tabvue/tabvue.vue' | 62 | import tabBar from '../../components/tabvue/tabvue.vue' |
63 | + let chosetype=uni.getStorageSync("chosetype"); | ||
64 | + console.log(chosetype,'11111111') | ||
63 | 65 | ||
64 | export default { | 66 | export default { |
65 | components: { | 67 | components: { |
66 | tabBar, | 68 | tabBar, |
69 | + | ||
67 | }, | 70 | }, |
68 | data() { | 71 | data() { |
69 | return { | 72 | return { |
@@ -75,7 +78,8 @@ | @@ -75,7 +78,8 @@ | ||
75 | isnulldata:false, | 78 | isnulldata:false, |
76 | token:'', | 79 | token:'', |
77 | isRegister: 0, | 80 | isRegister: 0, |
78 | - jumpshchool:true | 81 | + jumpshchool:true, |
82 | + chosetypenumber:chosetype | ||
79 | } | 83 | } |
80 | }, | 84 | }, |
81 | onLoad(options){ | 85 | onLoad(options){ |
@@ -88,11 +92,16 @@ | @@ -88,11 +92,16 @@ | ||
88 | 92 | ||
89 | }, | 93 | }, |
90 | onShow() { | 94 | onShow() { |
91 | - this.code2Token(); | 95 | + this.code2Token(); |
92 | this.token=uni.getStorageSync('token') | 96 | this.token=uni.getStorageSync('token') |
93 | uni.hideTabBar({ | 97 | uni.hideTabBar({ |
94 | 98 | ||
95 | }) | 99 | }) |
100 | + let chosetype=uni.getStorageSync("chosetype"); | ||
101 | + this.chosetypenumber=chosetype; | ||
102 | + console.log('3489438438',this.chosetypenumber) | ||
103 | + uni.$emit('update',{chosenum:chosetype,currentTabIndex:0}) | ||
104 | + | ||
96 | this.page=1; | 105 | this.page=1; |
97 | this.schoollist=[]; | 106 | this.schoollist=[]; |
98 | this.getlikeschool(); | 107 | this.getlikeschool(); |
@@ -14,15 +14,11 @@ | @@ -14,15 +14,11 @@ | ||
14 | </view> | 14 | </view> |
15 | <view class="msg" @click="tomsgpage" style="display:flex"> | 15 | <view class="msg" @click="tomsgpage" style="display:flex"> |
16 | <view class="magboxitem"> | 16 | <view class="magboxitem"> |
17 | - <text v-if="university.des_content==''">暂无简介</text> | 17 | + <view v-if="university.des_content==''" style="height:100rpx">暂无简介</view> |
18 | 18 | ||
19 | <rich-text :nodes="university.des_content" v-else></rich-text> | 19 | <rich-text :nodes="university.des_content" v-else></rich-text> |
20 | </view> | 20 | </view> |
21 | - | ||
22 | - | ||
23 | - | ||
24 | - | ||
25 | - <text style="color:#81C3BF;width:520rpx" v-if="university.des_content!=''">[更多]</text> | 21 | + <view style="color:#81C3BF;width:520rpx;heihgt:40rpx;display:flex;align-items: flex-end;" v-if="university.des_content!=''">[更多]</view> |
26 | </view> | 22 | </view> |
27 | 23 | ||
28 | </view> | 24 | </view> |
@@ -90,7 +86,11 @@ | @@ -90,7 +86,11 @@ | ||
90 | </view> | 86 | </view> |
91 | <view class="articleBox"> | 87 | <view class="articleBox"> |
92 | <view class="title">{{item.title}}</view> | 88 | <view class="title">{{item.title}}</view> |
93 | - <view class="txt">{{item.des_content}}</view> | 89 | + <view class="txt textcontent"> |
90 | + <rich-text :nodes="item.des_content"></rich-text> | ||
91 | + <!-- {{item.des_content}} --> | ||
92 | + </view> | ||
93 | + | ||
94 | <image :src="item" v-for="(item,indexk) in item.des_images" :key="indexk" @click.stop="preimg(index,indexk)"></image> | 94 | <image :src="item" v-for="(item,indexk) in item.des_images" :key="indexk" @click.stop="preimg(index,indexk)"></image> |
95 | </view> | 95 | </view> |
96 | </view> | 96 | </view> |
@@ -397,6 +397,13 @@ export default { | @@ -397,6 +397,13 @@ export default { | ||
397 | // top: 0; | 397 | // top: 0; |
398 | // z-index: 999; | 398 | // z-index: 999; |
399 | } | 399 | } |
400 | + .textcontent{ | ||
401 | + display: -webkit-box; | ||
402 | + -webkit-box-orient: vertical; | ||
403 | + -webkit-line-clamp: 3; | ||
404 | + overflow: hidden; | ||
405 | + } | ||
406 | + | ||
400 | .contentBox{ | 407 | .contentBox{ |
401 | position: relative; | 408 | position: relative; |
402 | display: flex; | 409 | display: flex; |
@@ -472,6 +479,7 @@ export default { | @@ -472,6 +479,7 @@ export default { | ||
472 | color:#06121E; | 479 | color:#06121E; |
473 | font-size: 24rpx; | 480 | font-size: 24rpx; |
474 | width: 500rpx; | 481 | width: 500rpx; |
482 | + justify-content: flex-end; | ||
475 | 483 | ||
476 | // height: 118rpx;sss | 484 | // height: 118rpx;sss |
477 | 485 |
@@ -41,7 +41,8 @@ | @@ -41,7 +41,8 @@ | ||
41 | <view class="title">{{item.title}}</view> | 41 | <view class="title">{{item.title}}</view> |
42 | <view class="txt"> | 42 | <view class="txt"> |
43 | <view class="textblock"> | 43 | <view class="textblock"> |
44 | - {{item.des_content}} | 44 | + <rich-text :nodes="item.des_content"></rich-text> |
45 | + | ||
45 | </view> | 46 | </view> |
46 | 47 | ||
47 | <!-- <text class="alltext" style="color:#2D5575;font-size:24rpx;font-weight:bold;" @click="toarticlemsg(item)" v-if="item.des_content.length>150">全部</text> --> | 48 | <!-- <text class="alltext" style="color:#2D5575;font-size:24rpx;font-weight:bold;" @click="toarticlemsg(item)" v-if="item.des_content.length>150">全部</text> --> |
@@ -4,15 +4,8 @@ | @@ -4,15 +4,8 @@ | ||
4 | <view class="top"> | 4 | <view class="top"> |
5 | <view class="search"> | 5 | <view class="search"> |
6 | <image class="icon" src="../../static/sousuo_icon@2x.png"></image> | 6 | <image class="icon" src="../../static/sousuo_icon@2x.png"></image> |
7 | - <input | ||
8 | - type="text" | ||
9 | - placeholder="请输入搜索内容" | ||
10 | - class="input" | ||
11 | - placeholder-style="color:rgba(189,196,206,1);font-size:28rpx;" | ||
12 | - style="font-size:28rpx;" | ||
13 | - v-model="word" | ||
14 | - @confirm="getschoollistk" | ||
15 | - /> | 7 | + <input type="text" placeholder="请输入搜索内容" class="input" placeholder-style="color:rgba(189,196,206,1);font-size:28rpx;" |
8 | + style="font-size:28rpx;" v-model="word" @confirm="getschoollistk" /> | ||
16 | </view> | 9 | </view> |
17 | <view class="searchBtn" @click="getschoollistk">搜索</view> | 10 | <view class="searchBtn" @click="getschoollistk">搜索</view> |
18 | </view> | 11 | </view> |
@@ -21,352 +14,413 @@ | @@ -21,352 +14,413 @@ | ||
21 | <view class="diqu" :class="{ active: active2 }" @click="diquShow">地区</view> | 14 | <view class="diqu" :class="{ active: active2 }" @click="diquShow">地区</view> |
22 | <view class="paimingPopup" v-if="isPaimingShow"> | 15 | <view class="paimingPopup" v-if="isPaimingShow"> |
23 | <view class="title" @click="selectalllevel" :class="levelindex==-2?'selactive':''">全部</view> | 16 | <view class="title" @click="selectalllevel" :class="levelindex==-2?'selactive':''">全部</view> |
24 | - <view class="item" @click="paimingHide" :class="levelindex==index?'selactive':''" :data-id="item.id" :data-index="index" v-for="(item, index) in levelList" :key="index">{{ item.name }}</view> | 17 | + <view class="item" @click="paimingHide" :class="levelindex==index?'selactive':''" :data-id="item.id" :data-index="index" |
18 | + v-for="(item, index) in levelList" :key="index">{{ item.name }}</view> | ||
25 | <!-- <view class="item" @click="paimingHide">{{item.name}}</view> --> | 19 | <!-- <view class="item" @click="paimingHide">{{item.name}}</view> --> |
26 | </view> | 20 | </view> |
27 | <view class="diquPopup" v-if="isDiquShow"> | 21 | <view class="diquPopup" v-if="isDiquShow"> |
28 | <view class="title" @click="selectallprovince" :class="selpro==-1?'selactive':''" :data-index="-2">全部地区</view> | 22 | <view class="title" @click="selectallprovince" :class="selpro==-1?'selactive':''" :data-index="-2">全部地区</view> |
29 | <view class="cont"> | 23 | <view class="cont"> |
30 | <view class="colum"> | 24 | <view class="colum"> |
31 | - <view class="item" :class="selpro==index?'selactive':''" @click="selectprovince" v-for="(item, index) in provinceList" :key="index" :data-index="index" :data-id="item.code">{{ item.name }}</view> | 25 | + <view class="item" :class="selpro==index?'selactive':''" @click="selectprovince" v-for="(item, index) in provinceList" |
26 | + :key="index" :data-index="index" :data-id="item.code">{{ item.name }}</view> | ||
32 | </view> | 27 | </view> |
33 | <view class="colum"> | 28 | <view class="colum"> |
34 | - <view class="item" :class="selcity==index?'selactive':''" @click="selectcity" v-for="(item, index) in cityList" :key="index" :data-index="index" :data-id="item.code">{{ item.name }}</view> | 29 | + <view class="item" :class="selcity==index?'selactive':''" @click="selectcity" v-for="(item, index) in cityList" |
30 | + :key="index" :data-index="index" :data-id="item.code">{{ item.name }}</view> | ||
35 | </view> | 31 | </view> |
36 | </view> | 32 | </view> |
37 | </view> | 33 | </view> |
38 | </view> | 34 | </view> |
39 | </view> | 35 | </view> |
40 | - | ||
41 | - <view class="nodata" v-if="schoolList.length==0">暂无数据</view> | ||
42 | 36 | ||
43 | - <view class="contentBox" v-else> | ||
44 | - <view class="item" v-for="(item, index) in schoolList" :key="index" @click="godetail(item)"> | ||
45 | - <view class="title">{{ item.name }}</view> | ||
46 | - <image class="icon" :src="item.icon_image"></image> | ||
47 | - </view> | 37 | + <view class="nodata" v-if="schoolList.length==0">暂无数据</view> |
38 | +<!-- <scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltolower="lower" v-else> --> | ||
39 | + <scroll-view class="contentBox" :scroll-top="scrollTop" scroll-y="true" @scrolltolower="lower" v-else> | ||
40 | + <view class="item" v-for="(item, index) in schoolList" :key="index" @click="godetail(item)"> | ||
41 | + <view class="title">{{ item.name }}</view> | ||
42 | + <image class="icon" :src="item.icon_image"></image> | ||
48 | </view> | 43 | </view> |
44 | + </scroll-view> | ||
45 | + | ||
46 | +<!-- </scroll-view> --> | ||
47 | + | ||
49 | </view> | 48 | </view> |
50 | </template> | 49 | </template> |
51 | 50 | ||
52 | <script> | 51 | <script> |
53 | -import app from '../../App.vue'; | 52 | + import app from '../../App.vue'; |
54 | 53 | ||
55 | -export default { | ||
56 | - data() { | ||
57 | - return { | ||
58 | - selpro:-1, | ||
59 | - selcity:-1, | ||
60 | - levelindex:-1, | ||
61 | - isPaimingShow: false, | ||
62 | - isDiquShow: false, | ||
63 | - active1: false, | ||
64 | - // isDiquShow:false, | ||
65 | - active2: false, | ||
66 | - province_id: '', | ||
67 | - city_id: '', | ||
68 | - level_id: '', | ||
69 | - provinceList: [], | ||
70 | - cityList: [], | ||
71 | - schoolList: [], | ||
72 | - word: '', | ||
73 | - page: '1', | ||
74 | - levelList: [] | ||
75 | - }; | ||
76 | - }, | ||
77 | - methods: { | ||
78 | - paimingShow(event) { | ||
79 | - this.isPaimingShow = true; | ||
80 | - this.isDiquShow = false; | ||
81 | - (this.active1 = true), (this.active2 = false); | ||
82 | - }, | ||
83 | - paimingHide(e) { | ||
84 | - let id=e.currentTarget.dataset.id; | ||
85 | - let index=e.currentTarget.dataset.index; | ||
86 | - | ||
87 | - this.levelindex=index; | ||
88 | - this.city_id=''; | ||
89 | - this.level_id=id; | ||
90 | - this.page=1; | ||
91 | - this.schoolList=[]; | ||
92 | - this.getschoollist(); | ||
93 | - this.isPaimingShow = false; | ||
94 | - (this.active1 = false), (this.active2 = false); | ||
95 | - }, | ||
96 | - diquShow() { | ||
97 | - this.isDiquShow = true; | ||
98 | - this.isPaimingShow = false; | ||
99 | - (this.active2 = true), (this.active1 = false); | ||
100 | - }, | ||
101 | - diquHide() { | ||
102 | - (this.isDiquShow = false), (this.active1 = false), (this.active2 = false); | ||
103 | - }, | ||
104 | - //获取全部地区(省) | ||
105 | - getAllProvince() { | ||
106 | - var url = 'city/getAllProvince'; | ||
107 | - var params = {}; | ||
108 | - app.post(url, params, 'get') | ||
109 | - .then(res => { | ||
110 | - this.provinceList = res; | ||
111 | - console.log(res); | ||
112 | - }) | ||
113 | - .catch(err => { | ||
114 | - console.log(err); | ||
115 | - }); | 54 | + export default { |
55 | + data() { | ||
56 | + return { | ||
57 | + selpro: -1, | ||
58 | + selcity: -1, | ||
59 | + levelindex: -1, | ||
60 | + isPaimingShow: false, | ||
61 | + isDiquShow: false, | ||
62 | + active1: false, | ||
63 | + // isDiquShow:false, | ||
64 | + active2: false, | ||
65 | + province_id: '', | ||
66 | + city_id: '', | ||
67 | + level_id: '', | ||
68 | + provinceList: [], | ||
69 | + cityList: [], | ||
70 | + schoolList: [], | ||
71 | + word: '', | ||
72 | + page: '1', | ||
73 | + levelList: [], | ||
74 | + scrollTop:0, | ||
75 | + nomore:false | ||
76 | + }; | ||
116 | }, | 77 | }, |
78 | + methods: { | ||
79 | + paimingShow(event) { | ||
80 | + this.isPaimingShow = true; | ||
81 | + this.isDiquShow = false; | ||
82 | + (this.active1 = true), (this.active2 = false); | ||
83 | + }, | ||
84 | + paimingHide(e) { | ||
85 | + let id = e.currentTarget.dataset.id; | ||
86 | + let index = e.currentTarget.dataset.index; | ||
117 | 87 | ||
118 | - //市 | ||
119 | - getAllCity() { | ||
120 | - var url = 'city/getCity'; | ||
121 | - var params = { | ||
122 | - province_id: this.province_id | ||
123 | - }; | ||
124 | - app.post(url, params, 'get') | ||
125 | - .then(res => { | ||
126 | - console.log(res); | ||
127 | - this.cityList = res; | ||
128 | - }) | ||
129 | - .catch(err => { | ||
130 | - console.log(err); | 88 | + this.levelindex = index; |
89 | + this.city_id = ''; | ||
90 | + this.level_id = id; | ||
91 | + this.page = 1; | ||
92 | + this.schoolList = []; | ||
93 | + this.getschoollist(); | ||
94 | + this.isPaimingShow = false; | ||
95 | + (this.active1 = false), (this.active2 = false); | ||
96 | + }, | ||
97 | + diquShow() { | ||
98 | + this.isDiquShow = true; | ||
99 | + this.isPaimingShow = false; | ||
100 | + (this.active2 = true), (this.active1 = false); | ||
101 | + }, | ||
102 | + diquHide() { | ||
103 | + (this.isDiquShow = false), (this.active1 = false), (this.active2 = false); | ||
104 | + }, | ||
105 | + //获取全部地区(省) | ||
106 | + getAllProvince() { | ||
107 | + var url = 'city/getAllProvince'; | ||
108 | + var params = {}; | ||
109 | + app.post(url, params, 'get') | ||
110 | + .then(res => { | ||
111 | + this.provinceList = res; | ||
112 | + console.log(res); | ||
113 | + }) | ||
114 | + .catch(err => { | ||
115 | + console.log(err); | ||
116 | + }); | ||
117 | + }, | ||
118 | + | ||
119 | + //市 | ||
120 | + getAllCity() { | ||
121 | + var url = 'city/getCity'; | ||
122 | + var params = { | ||
123 | + province_id: this.province_id | ||
124 | + }; | ||
125 | + app.post(url, params, 'get') | ||
126 | + .then(res => { | ||
127 | + console.log(res); | ||
128 | + this.cityList = res; | ||
129 | + }) | ||
130 | + .catch(err => { | ||
131 | + console.log(err); | ||
132 | + }); | ||
133 | + }, | ||
134 | + //点击选中的省 | ||
135 | + selectprovince(e) { | ||
136 | + this.province_id = e.currentTarget.dataset.id; | ||
137 | + this.selpro = e.currentTarget.dataset.index; | ||
138 | + this.selcity = -1; | ||
139 | + this.getAllCity(); | ||
140 | + }, | ||
141 | + //点击全部省 | ||
142 | + selectallprovince() { | ||
143 | + this.selpro = -2; | ||
144 | + this.selcity = -1; | ||
145 | + this.city_id = ''; | ||
146 | + this.city_id = ''; | ||
147 | + this.level_id = ''; | ||
148 | + this.page = 1; | ||
149 | + this.schoolList = []; | ||
150 | + this.getschoollist(); | ||
151 | + | ||
152 | + this.isDiquShow = false; | ||
153 | + }, | ||
154 | + getschoollistk() { | ||
155 | + this.page = 1; | ||
156 | + this.schoolList = []; | ||
157 | + | ||
158 | + this.getschoollist(); | ||
159 | + }, | ||
160 | + //点击选中全部市 | ||
161 | + selectallcity() { | ||
162 | + this.level_id = ''; | ||
163 | + this.page = 1; | ||
164 | + this.schoolList = []; | ||
165 | + this.isDiquShow = false; | ||
166 | + this.getschoollist(); | ||
167 | + }, | ||
168 | + //点击选中的市 | ||
169 | + selectcity(e) { | ||
170 | + this.city_id = e.currentTarget.dataset.id; | ||
171 | + this.selcity = e.currentTarget.dataset.index; | ||
172 | + this.level_id = ''; | ||
173 | + this.page = 1; | ||
174 | + this.schoolList = []; | ||
175 | + this.getschoollist(); | ||
176 | + this.isDiquShow = false; | ||
177 | + }, | ||
178 | + // getAllSchool(){ | ||
179 | + // var url="city/getUniversityByCity" | ||
180 | + // var params ={ | ||
181 | + // city_id:this.city_id | ||
182 | + // } | ||
183 | + // app.post(url,params,"get").then((res)=>{ | ||
184 | + // console.log(res) | ||
185 | + // this.schoolList=res | ||
186 | + // }).catch((err)=>{ | ||
187 | + // console.log(err) | ||
188 | + // }) | ||
189 | + // }, | ||
190 | + // 获取大学列表 | ||
191 | + getschoollist() { | ||
192 | + let that = this; | ||
193 | + var url = 'university/getUniversityList'; | ||
194 | + var params = { | ||
195 | + page: that.page, | ||
196 | + size: 10, | ||
197 | + word: that.word, | ||
198 | + level_id: that.level_id, | ||
199 | + city_id: that.city_id | ||
200 | + }; | ||
201 | + app.post(url, params, 'post') | ||
202 | + .then(res => { | ||
203 | + console.log(res); | ||
204 | + that.schoolList = that.schoolList.concat(res); | ||
205 | + if(that.page>1){ | ||
206 | + if(res.length==0){ | ||
207 | + that.nomore=true | ||
208 | + uni.showToast({ | ||
209 | + title:'没有更多了~', | ||
210 | + icon:'none' | ||
211 | + }) | ||
212 | + } | ||
213 | + } | ||
214 | + }) | ||
215 | + .catch(err => {}); | ||
216 | + }, | ||
217 | + //获取全部排名 | ||
218 | + getAllLevel() { | ||
219 | + let that = this; | ||
220 | + var url = 'university/getUniversityLevel'; | ||
221 | + var params = {}; | ||
222 | + app.post(url, params, 'get') | ||
223 | + .then(res => { | ||
224 | + that.levelList = res; | ||
225 | + }) | ||
226 | + .catch(err => { | ||
227 | + console.log(err); | ||
228 | + }); | ||
229 | + }, | ||
230 | + //点击全部排名 | ||
231 | + selectalllevel() { | ||
232 | + this.isPaimingShow = false; | ||
233 | + this.levelindex = -2; | ||
234 | + this.level_id = ''; | ||
235 | + this.province_id = ''; | ||
236 | + this.page = 1; | ||
237 | + this.schoolList = []; | ||
238 | + this.getschoollist(); | ||
239 | + }, | ||
240 | + // 进入学校详情页 | ||
241 | + godetail(item) { | ||
242 | + let id = item.id; | ||
243 | + uni.navigateTo({ | ||
244 | + url: './schoolDetails?id=' + id | ||
131 | }); | 245 | }); |
246 | + }, | ||
247 | + // 触底事件 | ||
248 | + lower(){ | ||
249 | + if(this.nomore==false){ | ||
250 | + console.log(34389349889) | ||
251 | + let newpage = this.page; | ||
252 | + | ||
253 | + newpage++; | ||
254 | + this.page = newpage; | ||
255 | + this.getschoollist(); | ||
256 | + } | ||
257 | + | ||
258 | + } | ||
132 | }, | 259 | }, |
133 | - //点击选中的省 | ||
134 | - selectprovince(e) { | ||
135 | - this.province_id = e.currentTarget.dataset.id; | ||
136 | - this.selpro=e.currentTarget.dataset.index; | ||
137 | - this.selcity=-1; | ||
138 | - this.getAllCity(); | ||
139 | - }, | ||
140 | - //点击全部省 | ||
141 | - selectallprovince() { | ||
142 | - this.selpro=-2; | ||
143 | - this.selcity=-1; | ||
144 | - this.city_id=''; | ||
145 | - this.city_id=''; | ||
146 | - this.level_id=''; | ||
147 | - this.page=1; | ||
148 | - this.schoolList=[]; | 260 | + onLoad() { |
261 | + this.getAllProvince(); | ||
149 | this.getschoollist(); | 262 | this.getschoollist(); |
150 | - | ||
151 | - this.isDiquShow = false; | 263 | + this.getAllLevel(); |
152 | }, | 264 | }, |
153 | - getschoollistk(){ | ||
154 | - this.page=1; | ||
155 | - this.schoolList=[]; | 265 | + onReachBottom() { |
266 | + // console.log(34348493989) | ||
267 | + // let newpage = this.page; | ||
156 | 268 | ||
157 | - this.getschoollist(); | ||
158 | - }, | ||
159 | - //点击选中全部市 | ||
160 | - selectallcity() { | ||
161 | - this.level_id=''; | ||
162 | - this.page=1; | ||
163 | - this.schoolList=[]; | ||
164 | - this.isDiquShow = false; | ||
165 | - this.getschoollist(); | ||
166 | - }, | ||
167 | - //点击选中的市 | ||
168 | - selectcity(e) { | ||
169 | - this.city_id = e.currentTarget.dataset.id; | ||
170 | - this.selcity=e.currentTarget.dataset.index; | ||
171 | - this.level_id=''; | ||
172 | - this.page=1; | ||
173 | - this.schoolList=[]; | ||
174 | - this.getschoollist(); | ||
175 | - this.isDiquShow = false; | ||
176 | - }, | ||
177 | - // getAllSchool(){ | ||
178 | - // var url="city/getUniversityByCity" | ||
179 | - // var params ={ | ||
180 | - // city_id:this.city_id | ||
181 | - // } | ||
182 | - // app.post(url,params,"get").then((res)=>{ | ||
183 | - // console.log(res) | ||
184 | - // this.schoolList=res | ||
185 | - // }).catch((err)=>{ | ||
186 | - // console.log(err) | ||
187 | - // }) | ||
188 | - // }, | ||
189 | - // 获取大学列表 | ||
190 | - getschoollist() { | ||
191 | - let that = this; | ||
192 | - var url = 'university/getUniversityList'; | ||
193 | - var params = { | ||
194 | - page: that.page, | ||
195 | - size: 10, | ||
196 | - word: that.word, | ||
197 | - level_id: that.level_id, | ||
198 | - city_id: that.city_id | ||
199 | - }; | ||
200 | - app.post(url, params,'post') | ||
201 | - .then(res => { | ||
202 | - console.log(res); | ||
203 | - that.schoolList =that.schoolList.concat(res) ; | ||
204 | - }) | ||
205 | - .catch(err => {}); | ||
206 | - }, | ||
207 | - //获取全部排名 | ||
208 | - getAllLevel() { | ||
209 | - let that = this; | ||
210 | - var url = 'university/getUniversityLevel'; | ||
211 | - var params = {}; | ||
212 | - app.post(url, params, 'get') | ||
213 | - .then(res => { | ||
214 | - that.levelList = res; | ||
215 | - }) | ||
216 | - .catch(err => { | ||
217 | - console.log(err); | ||
218 | - }); | ||
219 | - }, | ||
220 | - //点击全部排名 | ||
221 | - selectalllevel() { | ||
222 | - this.isPaimingShow = false; | ||
223 | - this.levelindex=-2; | ||
224 | - this.level_id=''; | ||
225 | - this.province_id=''; | ||
226 | - this.page=1; | ||
227 | - this.schoolList=[]; | ||
228 | - this.getschoollist(); | ||
229 | - }, | ||
230 | - // 进入学校详情页 | ||
231 | - godetail(item) { | ||
232 | - let id = item.id; | ||
233 | - uni.navigateTo({ | ||
234 | - url: './schoolDetails?id=' + id | ||
235 | - }); | ||
236 | - } | ||
237 | - }, | ||
238 | - onLoad() { | ||
239 | - this.getAllProvince(); | ||
240 | - this.getschoollist(); | ||
241 | - this.getAllLevel(); | ||
242 | - }, | ||
243 | - onReachBottom() { | ||
244 | - let newpage=this.page; | ||
245 | - newpage++; | ||
246 | - this.page=newpage; | ||
247 | - this.getschoollist(); | 269 | + // newpage++; |
270 | + // this.page = newpage; | ||
271 | + // this.getschoollist(); | ||
248 | 272 | ||
249 | - } | ||
250 | -}; | 273 | + |
274 | + | ||
275 | + } | ||
276 | + // onReachBottom: function() { | ||
277 | + | ||
278 | + // } | ||
279 | + }; | ||
251 | </script> | 280 | </script> |
252 | 281 | ||
253 | <style lang="less"> | 282 | <style lang="less"> |
254 | -page{ | ||
255 | - height: 100%; | ||
256 | - width: 100%; | ||
257 | -} | ||
258 | -.content { | ||
259 | - background-color: rgba(249, 249, 249, 1); | ||
260 | - height: 100%; | ||
261 | - display: flex; | ||
262 | - flex-direction: column; | ||
263 | - .top { | ||
264 | - padding: 18rpx 32rpx; | ||
265 | - display: flex; | ||
266 | - background-color: #fff; | 283 | + page { |
284 | + height: 100%; | ||
285 | + width: 100%; | ||
267 | } | 286 | } |
268 | - .search { | 287 | + |
288 | + .content { | ||
289 | + background-color: rgba(249, 249, 249, 1); | ||
290 | + height: 100%; | ||
269 | display: flex; | 291 | display: flex; |
270 | - align-items: center; | ||
271 | - width: 596rpx; | ||
272 | - height: 64rpx; | ||
273 | - background: rgba(238, 238, 238, 1); | ||
274 | - opacity: 1; | ||
275 | - border-radius: 40rpx; | ||
276 | - padding: 0 28rpx; | ||
277 | - box-sizing: border-box; | ||
278 | - .icon { | ||
279 | - width: 30rpx; | ||
280 | - height: 30rpx; | 292 | + flex-direction: column; |
293 | + | ||
294 | + .top { | ||
295 | + padding: 18rpx 32rpx; | ||
296 | + // display: flex; | ||
297 | + background-color: #fff; | ||
281 | } | 298 | } |
282 | - .input { | 299 | + .conet_top{ |
300 | + position: fixed; | ||
301 | + top:0; | ||
302 | + left:0; | ||
303 | + width:750rpx; | ||
304 | + } | ||
305 | + | ||
306 | + .search { | ||
307 | + display: flex; | ||
308 | + align-items: center; | ||
309 | + width: 596rpx; | ||
283 | height: 64rpx; | 310 | height: 64rpx; |
284 | - width: 500rpx; | ||
285 | - text-align: center; | 311 | + background: rgba(238, 238, 238, 1); |
312 | + opacity: 1; | ||
313 | + border-radius: 40rpx; | ||
314 | + padding: 0 28rpx; | ||
315 | + box-sizing: border-box; | ||
316 | + | ||
317 | + .icon { | ||
318 | + width: 30rpx; | ||
319 | + height: 30rpx; | ||
320 | + } | ||
321 | + | ||
322 | + .input { | ||
323 | + height: 64rpx; | ||
324 | + width: 500rpx; | ||
325 | + text-align: center; | ||
326 | + } | ||
286 | } | 327 | } |
287 | - } | ||
288 | - .searchBtn { | ||
289 | - color: rgba(6, 18, 30, 1); | ||
290 | - font-size: 28rpx; | ||
291 | - line-height: 64rpx; | ||
292 | - margin-left: 20rpx; | ||
293 | - } | ||
294 | - .type { | ||
295 | - display: flex; | ||
296 | - color: rgba(6, 18, 30, 1); | ||
297 | - font-size: 24rpx; | ||
298 | - background-color: #fff; | ||
299 | - padding: 24rpx 32rpx; | ||
300 | - margin-top: 2rpx; | ||
301 | - .paiming, | ||
302 | - .diqu { | ||
303 | - margin-right: 72rpx; | 328 | + |
329 | + .searchBtn { | ||
330 | + color: rgba(6, 18, 30, 1); | ||
331 | + font-size: 28rpx; | ||
332 | + line-height: 64rpx; | ||
333 | + margin-left: 20rpx; | ||
304 | } | 334 | } |
305 | - .paimingPopup, | ||
306 | - .diquPopup { | ||
307 | - width: 750rpx; | ||
308 | - height: 600rpx; | ||
309 | - position: absolute; | ||
310 | - top: 184rpx; | ||
311 | - left: 0; | 335 | + |
336 | + .type { | ||
337 | + display: flex; | ||
338 | + color: rgba(6, 18, 30, 1); | ||
339 | + font-size: 24rpx; | ||
312 | background-color: #fff; | 340 | background-color: #fff; |
313 | - padding: 22rpx 32rpx; | ||
314 | - box-sizing: border-box; | ||
315 | - z-index: 999; | ||
316 | - box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.06); | ||
317 | - border-top: 1rpx solid rgba(249, 249, 249, 1); | ||
318 | - .item { | ||
319 | - margin-bottom: 22rpx; | ||
320 | - // height: 74rpx; | ||
321 | - width: 170rpx; | ||
322 | - } | ||
323 | - .title { | ||
324 | - margin-bottom: 20rpx; | 341 | + padding: 24rpx 32rpx; |
342 | + margin-top: 2rpx; | ||
343 | + | ||
344 | + .paiming, | ||
345 | + .diqu { | ||
346 | + margin-right: 72rpx; | ||
325 | } | 347 | } |
326 | - .cont { | ||
327 | - display: flex; | ||
328 | - // flex-direction: column; | ||
329 | - flex-wrap: wrap; | ||
330 | - justify-content: start; | ||
331 | - .colum { | ||
332 | - overflow: auto; | ||
333 | - height: 500rpx; | ||
334 | - width: 30%; | 348 | + |
349 | + .paimingPopup, | ||
350 | + .diquPopup { | ||
351 | + width: 750rpx; | ||
352 | + height: 600rpx; | ||
353 | + position: absolute; | ||
354 | + top: 184rpx; | ||
355 | + left: 0; | ||
356 | + background-color: #fff; | ||
357 | + padding: 22rpx 32rpx; | ||
358 | + box-sizing: border-box; | ||
359 | + z-index: 999; | ||
360 | + box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.06); | ||
361 | + border-top: 1rpx solid rgba(249, 249, 249, 1); | ||
362 | + | ||
363 | + .item { | ||
364 | + margin-bottom: 22rpx; | ||
365 | + // height: 74rpx; | ||
366 | + width: 170rpx; | ||
367 | + } | ||
368 | + | ||
369 | + .title { | ||
370 | + margin-bottom: 20rpx; | ||
371 | + } | ||
372 | + | ||
373 | + .cont { | ||
374 | + display: flex; | ||
375 | + // flex-direction: column; | ||
376 | + flex-wrap: wrap; | ||
377 | + justify-content: start; | ||
378 | + | ||
379 | + .colum { | ||
380 | + overflow: auto; | ||
381 | + height: 500rpx; | ||
382 | + width: 30%; | ||
383 | + } | ||
335 | } | 384 | } |
336 | } | 385 | } |
386 | + | ||
387 | + .active { | ||
388 | + color: #05849d; | ||
389 | + } | ||
337 | } | 390 | } |
338 | - .active { | ||
339 | - color: #05849d; | ||
340 | - } | ||
341 | - } | ||
342 | - .contentBox { | ||
343 | - padding: 24rpx 32rpx; | ||
344 | - box-sizing: border-box; | ||
345 | - flex: 1; | ||
346 | - overflow-y: scroll; | ||
347 | - .item { | ||
348 | - width: 686rpx; | ||
349 | - height: 160rpx; | ||
350 | - background: rgba(255, 255, 255, 1); | ||
351 | - opacity: 1; | ||
352 | - border-radius: 8rpx; | ||
353 | - display: flex; | ||
354 | - font-size: 28rpx; | ||
355 | - color: rgba(61, 68, 77, 1); | ||
356 | - justify-content: space-between; | ||
357 | - padding: 0 40rpx; | 391 | + |
392 | + .contentBox { | ||
393 | + padding: 24rpx 32rpx 0; | ||
358 | box-sizing: border-box; | 394 | box-sizing: border-box; |
359 | - margin-bottom: 24rpx; | ||
360 | - .title { | ||
361 | - line-height: 160rpx; | ||
362 | - } | ||
363 | - .icon { | ||
364 | - width: 120rpx; | ||
365 | - height: 120rpx; | ||
366 | - border-radius: 50%; | ||
367 | - margin-top: 20rpx; | 395 | + // flex: 1; |
396 | + overflow-y: scroll; | ||
397 | + margin-top:276rpx; | ||
398 | + | ||
399 | + .item { | ||
400 | + width: 686rpx; | ||
401 | + height: 160rpx; | ||
402 | + background: rgba(255, 255, 255, 1); | ||
403 | + opacity: 1; | ||
404 | + border-radius: 8rpx; | ||
405 | + display: flex; | ||
406 | + font-size: 28rpx; | ||
407 | + color: rgba(61, 68, 77, 1); | ||
408 | + justify-content: space-between; | ||
409 | + padding: 0 40rpx; | ||
410 | + box-sizing: border-box; | ||
411 | + margin-bottom: 24rpx; | ||
412 | + | ||
413 | + .title { | ||
414 | + line-height: 160rpx; | ||
415 | + } | ||
416 | + | ||
417 | + .icon { | ||
418 | + width: 120rpx; | ||
419 | + height: 120rpx; | ||
420 | + border-radius: 50%; | ||
421 | + margin-top: 20rpx; | ||
422 | + } | ||
368 | } | 423 | } |
369 | } | 424 | } |
370 | } | 425 | } |
371 | -} | ||
372 | </style> | 426 | </style> |
@@ -85,8 +85,9 @@ | @@ -85,8 +85,9 @@ | ||
85 | <view class="text"><text @click="tobuy">购买畅读卡</text>可以额外找到888人</view> | 85 | <view class="text"><text @click="tobuy">购买畅读卡</text>可以额外找到888人</view> |
86 | </view> --> | 86 | </view> --> |
87 | <!-- <tab :current="currentTabIndex" @getData="tabClick"></tab> --> | 87 | <!-- <tab :current="currentTabIndex" @getData="tabClick"></tab> --> |
88 | - | ||
89 | - <tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | 88 | + <!-- :chosetypename="chosetypenumber" --> |
89 | + <!-- :current="currentTabIndex" --> | ||
90 | + <tabBar backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar> | ||
90 | <!-- <view class="teacherfooter" v-if="type == 1"> | 91 | <!-- <view class="teacherfooter" v-if="type == 1"> |
91 | 92 | ||
92 | <view class="teacherfootitem" @click="jumpschool==true?footerselChange(1,'/pages/school/school?type=1'):''" :data-id="1" :data-url="'/pages/school/school?type='+1"> | 93 | <view class="teacherfootitem" @click="jumpschool==true?footerselChange(1,'/pages/school/school?type=1'):''" :data-id="1" :data-url="'/pages/school/school?type='+1"> |
@@ -139,6 +140,7 @@ | @@ -139,6 +140,7 @@ | ||
139 | data() { | 140 | data() { |
140 | return { | 141 | return { |
141 | selpro:-1, | 142 | selpro:-1, |
143 | + chosetypenumber:chosetype, | ||
142 | selty:-1, | 144 | selty:-1, |
143 | selstuent:-1, | 145 | selstuent:-1, |
144 | major:-1, | 146 | major:-1, |
@@ -179,8 +181,10 @@ | @@ -179,8 +181,10 @@ | ||
179 | word: "", | 181 | word: "", |
180 | vip_level:'', | 182 | vip_level:'', |
181 | jumpschool:true, | 183 | jumpschool:true, |
182 | - jumpschoolk:true | 184 | + jumpschoolk:true, |
185 | + | ||
183 | } | 186 | } |
187 | + | ||
184 | }, | 188 | }, |
185 | methods: { | 189 | methods: { |
186 | hidekk() { | 190 | hidekk() { |
@@ -541,11 +545,13 @@ | @@ -541,11 +545,13 @@ | ||
541 | url: '../register/register?istoken=' + 1 | 545 | url: '../register/register?istoken=' + 1 |
542 | }) | 546 | }) |
543 | } else { | 547 | } else { |
548 | + | ||
544 | var type = this.type | 549 | var type = this.type |
550 | + let chosetype=uni.getStorageSync("chosetype") | ||
545 | var id = e.currentTarget.dataset.id.user_id | 551 | var id = e.currentTarget.dataset.id.user_id |
546 | console.log(e.currentTarget.dataset.id) | 552 | console.log(e.currentTarget.dataset.id) |
547 | uni.navigateTo({ | 553 | uni.navigateTo({ |
548 | - url: "../school/schoolmateMsg?user_id=" + id + "&type=" + type | 554 | + url: "../school/schoolmateMsg?user_id=" + id + "&type=" + chosetype |
549 | }) | 555 | }) |
550 | } | 556 | } |
551 | 557 | ||
@@ -567,6 +573,12 @@ | @@ -567,6 +573,12 @@ | ||
567 | uni.hideTabBar({ | 573 | uni.hideTabBar({ |
568 | 574 | ||
569 | }) | 575 | }) |
576 | + let chosetype=uni.getStorageSync("chosetype"); | ||
577 | + this.chosetypenumber=chosetype; | ||
578 | + console.log('12345678',this.chosetypenumber) | ||
579 | + | ||
580 | + let num=chosetype==1?1:0; | ||
581 | + uni.$emit('update',{chosenum:chosetype,currentTabIndex:num}) | ||
570 | this.page = 1; | 582 | this.page = 1; |
571 | this.schoolmateList = [] | 583 | this.schoolmateList = [] |
572 | 584 |
-
请 注册 或 登录 后发表评论