miniprogram / school · 提交

转到一个项目

作者 lihongjuan
提交 a42458b0f0d377a2908b092b14e4c019a95e2745 1 个父辈 bcbf2c0c

1

内嵌 并排对比
正在显示 22 个修改的文件 包含 365 行增加 和 105 行删除
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
8 <view v-for="(item,index) in cardlist" :key="index"> 8 <view v-for="(item,index) in cardlist" :key="index">
9 <swiper-item> 9 <swiper-item>
10 10
11 - <view class="title">城市畅读卡</view> 11 + <view class="title">{{item.name}}</view>
12 <view class="money">{{item.money}}/月</view> 12 <view class="money">{{item.money}}/月</view>
13 <view class="time" v-if="item.vip_endtime">到期日期：{{item.vip_endtime}}</view> 13 <view class="time" v-if="item.vip_endtime">到期日期：{{item.vip_endtime}}</view>
14 - <view class="btn" v-if="item.vip_endtime==''" @click="buycard" :data-id="item.vip_level">立即购买<image class="icon" src="../../static/dizhi_btn@2x2.png"></image></view> 14 + <view class="btn" @click="buycard" :data-id="item.id">立即购买<image class="icon" src="../../static/dizhi_btn@2x2.png"></image></view>
15 <!-- <image class="big" src="../../static/juxing.png"></image> 15 <!-- <image class="big" src="../../static/juxing.png"></image>
16 <image class="small" src="../../static/tuoyuan.png"></image> --> 16 <image class="small" src="../../static/tuoyuan.png"></image> -->
17 17
@@ -111,9 +111,10 @@ export default { @@ -111,9 +111,10 @@ export default {
111 paySign: res.paySign, 111 paySign: res.paySign,
112 success: function(res) { 112 success: function(res) {
113 console.log(res) 113 console.log(res)
114 - wx.navigateTo({  
115 - url: '/pages/orderbox/orderbox?index=' + 0  
116 - }) 114 + that.getcardmsg()
  115 + // wx.navigateTo({
  116 + // url: '/pages/orderbox/orderbox?index=' + 0
  117 + // })
117 }, 118 },
118 fail: function(res) { 119 fail: function(res) {
119 console.log(123); 120 console.log(123);
@@ -150,7 +151,7 @@ export default { @@ -150,7 +151,7 @@ export default {
150 top: 26rpx; 151 top: 26rpx;
151 left: 50%; 152 left: 50%;
152 transform: translate(-50%); 153 transform: translate(-50%);
153 - padding: 62rpx 40rpx; 154 + padding: 30rpx 40rpx;
154 box-sizing: border-box; 155 box-sizing: border-box;
155 z-index: 777; 156 z-index: 777;
156 .title{ 157 .title{
@@ -166,6 +167,9 @@ export default { @@ -166,6 +167,9 @@ export default {
166 color:rgba(130,75,59,1); 167 color:rgba(130,75,59,1);
167 font-size: 24rpx; 168 font-size: 24rpx;
168 margin-top: 70rpx; 169 margin-top: 70rpx;
  170 + position: absolute;
  171 + left:26rpx;
  172 + bottom:68rpx
169 } 173 }
170 .btn{ 174 .btn{
171 width:206rpx; 175 width:206rpx;
@@ -188,7 +192,7 @@ export default { @@ -188,7 +192,7 @@ export default {
188 } 192 }
189 .dots{ 193 .dots{
190 position: absolute; 194 position: absolute;
191 - bottom: 10rpx; 195 + bottom: 36rpx;
192 left: 50%; 196 left: 50%;
193 transform: translate(-50%); 197 transform: translate(-50%);
194 width: 50rpx; 198 width: 50rpx;
@@ -136,7 +136,7 @@ export default { @@ -136,7 +136,7 @@ export default {
136 136
137 <style lang="less"> 137 <style lang="less">
138 .content{ 138 .content{
139 - background-color: #F9F9F9; 139 + // background-color: #F9F9F9;
140 .nodata{ 140 .nodata{
141 font-size: 28rpx; 141 font-size: 28rpx;
142 text-align: center; 142 text-align: center;
@@ -60,7 +60,8 @@ data(){ @@ -60,7 +60,8 @@ data(){
60 footersel:3, 60 footersel:3,
61 type:"", 61 type:"",
62 userinfolist:{}, 62 userinfolist:{},
63 - token:'' 63 + token:'',
  64 + user_id:""
64 } 65 }
65 }, 66 },
66 methods:{ 67 methods:{
@@ -78,7 +79,8 @@ methods:{ @@ -78,7 +79,8 @@ methods:{
78 } 79 }
79 app.post(url,params,"get").then((res)=>{ 80 app.post(url,params,"get").then((res)=>{
80 console.log(res) 81 console.log(res)
81 - that.userinfolist=res 82 + that.userinfolist=res;
  83 + that.user_id=res.user_id
82 }).catch((err)=>{ 84 }).catch((err)=>{
83 console.log(err) 85 console.log(err)
84 }) 86 })
@@ -173,7 +175,7 @@ methods:{ @@ -173,7 +175,7 @@ methods:{
173 }, 1500); 175 }, 1500);
174 }else{ 176 }else{
175 wx.navigateTo({ 177 wx.navigateTo({
176 - url:'./mycomment' 178 + url:'./mycomment?user_id='+this.user_id
177 }) 179 })
178 } 180 }
179 } 181 }
@@ -206,6 +208,7 @@ onLoad(options){ @@ -206,6 +208,7 @@ onLoad(options){
206 top: 52rpx; 208 top: 52rpx;
207 left: 50%; 209 left: 50%;
208 transform: translate(-50%); 210 transform: translate(-50%);
  211 + border-radius: 50%;
209 } 212 }
210 .title{ 213 .title{
211 margin-top: 66rpx; 214 margin-top: 66rpx;
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 23 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
24 <view class="cont"> 24 <view class="cont">
25 {{userinfolist.school_info.name}} 25 {{userinfolist.school_info.name}}
26 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 26 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
27 </view> 27 </view>
28 </view> 28 </view>
29 <view class="item"> 29 <view class="item">
@@ -31,23 +31,24 @@ @@ -31,23 +31,24 @@
31 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 31 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
32 <view class="cont"> 32 <view class="cont">
33 {{userinfolist.endtime}} 33 {{userinfolist.endtime}}
34 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 34 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
35 </view> 35 </view>
36 </view> 36 </view>
37 - <view class="item"> 37 + <!-- <view class="item">
38 <view class="name">高考学科</view> 38 <view class="name">高考学科</view>
39 - <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 39 + <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx">
40 <view class="cont"> 40 <view class="cont">
41 语数外 41 语数外
42 <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 42 <image class="icon" src="../../static/dizhi_btn@2x2.png"></image>
43 </view> 43 </view>
44 - </view> 44 + </view> -->
45 <view class="item"> 45 <view class="item">
46 <view class="name">选考科目</view> 46 <view class="name">选考科目</view>
47 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 47 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
48 - <view class="cont">  
49 - {{userinfolist.subject_list[0].name}}  
50 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 48 + <view class="cont" >
  49 + <text v-for="(item,index) in userinfolist.subject_list" :key="index">{{item.name}}</text>
  50 + <!-- {{userinfolist.subject_list[0].name}} -->
  51 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
51 </view> 52 </view>
52 </view> 53 </view>
53 <view class="item"> 54 <view class="item">
@@ -55,7 +56,7 @@ @@ -55,7 +56,7 @@
55 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 56 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
56 <view class="cont"> 57 <view class="cont">
57 {{userinfolist.up_info.name}} 58 {{userinfolist.up_info.name}}
58 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 59 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
59 </view> 60 </view>
60 </view> 61 </view>
61 </view> 62 </view>
@@ -66,7 +67,7 @@ @@ -66,7 +67,7 @@
66 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 67 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
67 <view class="cont"> 68 <view class="cont">
68 {{userinfolist.university_info.name}} 69 {{userinfolist.university_info.name}}
69 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 70 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
70 </view> 71 </view>
71 </view> 72 </view>
72 <view class="item"> 73 <view class="item">
@@ -74,7 +75,7 @@ @@ -74,7 +75,7 @@
74 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 75 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
75 <view class="cont"> 76 <view class="cont">
76 {{userinfolist.college_info.name}} 77 {{userinfolist.college_info.name}}
77 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 78 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
78 </view> 79 </view>
79 </view> 80 </view>
80 <view class="item"> 81 <view class="item">
@@ -82,7 +83,7 @@ @@ -82,7 +83,7 @@
82 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> --> 83 <!-- <input type="text" class="cont" placeholder="爱学习的王笑笑" placeholder-style="text-align: right;font-size:28rpx;color:#BDC4CE" style="width:200rpx"> -->
83 <view class="cont"> 84 <view class="cont">
84 {{userinfolist.graduated_info.name}} 85 {{userinfolist.graduated_info.name}}
85 - <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> 86 + <!-- <image class="icon" src="../../static/dizhi_btn@2x2.png"></image> -->
86 </view> 87 </view>
87 </view> 88 </view>
88 89
1 <template> 1 <template>
2 <view class="content"> 2 <view class="content">
3 <view class="title"> 3 <view class="title">
4 - <image class="photo" :src="image"></image> 4 + <image class="photo" :src="image" style="border-radius: 50%;"></image>
5 <view class="name">{{nickname}}</view> 5 <view class="name">{{nickname}}</view>
6 </view> 6 </view>
7 - <view class="contentBox">  
8 - <view class="comment" :style="{'margin-left:246rpx;': user_id==item.usera_id}" v-for="(item,index) in meslist" :key="index"> 7 + <scroll-view class="contentBox" :scroll-anchoring="true" :scroll-y="true" style="height: 81vh;" @scrolltoupper="end_fn" :scroll-top="top" :scroll-into-view="top" @scroll="scroll">
  8 + <view class="contentbox" v-for="(item,index) in meslist" :key="index">
  9 + <view class="comment" v-if="item.userb_id==user_id">
9 <span>{{item.des_content}}</span> 10 <span>{{item.des_content}}</span>
10 <view class="time">{{item.createtime}}</view> 11 <view class="time">{{item.createtime}}</view>
11 </view> 12 </view>
12 13
13 14
  15 + <view class="comment" :style="{'margin-left:246rpx;': user_id==item.usera_id}" v-if="item.usera_id==user_id">
  16 + <span>{{item.des_content}}</span>
  17 + <view class="time">{{item.createtime}}</view>
14 </view> 18 </view>
  19 + </view>
  20 +
  21 +
  22 +
  23 +
  24 + </scroll-view>
15 <view class="inputBox"> 25 <view class="inputBox">
16 <input type="text" class="input" v-model="des_content"> 26 <input type="text" class="input" v-model="des_content">
17 <view class="btn" @click="sendmsg">发送</view> 27 <view class="btn" @click="sendmsg">发送</view>
@@ -22,6 +32,7 @@ @@ -22,6 +32,7 @@
22 <script> 32 <script>
23 import app from "../../App.vue"; 33 import app from "../../App.vue";
24 export default { 34 export default {
  35 +
25 data(){ 36 data(){
26 return{ 37 return{
27 des_content:'', 38 des_content:'',
@@ -31,21 +42,93 @@ export default { @@ -31,21 +42,93 @@ export default {
31 meslist:[], 42 meslist:[],
32 image:'', 43 image:'',
33 nickname:'', 44 nickname:'',
34 - user_id:'' 45 + user_id:'',
  46 + usera_id:'',
  47 + chuanuserid:'',
  48 + top:200
35 } 49 }
36 }, 50 },
37 methods:{ 51 methods:{
  52 +
  53 + // 触底事件
  54 + end_fn(){
  55 + console.log(34734478)
  56 + let newpage=this.page;
  57 + newpage++;
  58 + this.page=newpage;
  59 + this.getmeslist()
  60 + },
  61 + scroll(e){
  62 + console.log(e);
  63 + this.top=e.detail.scrollTop;
  64 + },
  65 +
  66 + // 获取个人信息
  67 + getmyinfo(){
  68 + let that=this;
  69 + var url = "student/getMyInfo"
  70 + var params={
  71 + token:uni.getStorageSync('token')
  72 + }
  73 + app.post(url,params,"get").then((res)=>{
  74 + console.log(res)
  75 + // this.user_id
  76 + }).catch((err)=>{
  77 + console.log(err)
  78 + })
  79 + },
38 sendmsg(){ 80 sendmsg(){
39 var that = this 81 var that = this
40 var url = "mes/sendMes" 82 var url = "mes/sendMes"
41 var params = { 83 var params = {
42 token:uni.getStorageSync('token'), 84 token:uni.getStorageSync('token'),
43 - userb_id:that.userb_id, 85 + userb_id:that.chuanuserid,
44 des_content:that.des_content 86 des_content:that.des_content
45 } 87 }
46 app.post(url,params,"post").then((res)=>{ 88 app.post(url,params,"post").then((res)=>{
47 console.log(res) 89 console.log(res)
48 - that.des_content='' 90 + var date=new Date();
  91 + var year=date.getFullYear();
  92 + var month=date.getMonth()+1;
  93 + var day=date.getDate();
  94 + var datek=year+'-'+month+'-'+day
  95 + let obj={}
  96 + if(that.user_id==that.usera_id){
  97 + console.log(43839438489)
  98 + obj={
  99 + usera_id:that.usera_id,
  100 + userb_id:that.userb_id,
  101 + des_content:that.des_content,
  102 + createtime:datek
  103 + }
  104 + }else{
  105 + console.log(2222888888)
  106 + obj={
  107 + usera_id:that.userb_id,
  108 + userb_id:that.usera_id,
  109 + des_content:that.des_content,
  110 + createtime:datek
  111 + }
  112 + }
  113 +
  114 +
  115 + that.meslist.push(obj);
  116 + that.meslist=that.meslist;
  117 + console.log(that.meslist)
  118 + that.des_content='';
  119 + wx.getSystemInfo({
  120 + success: function (res) {
  121 + wx.createSelectorQuery().select('.contentbox').boundingClientRect(function (rect) {
  122 + console.log('777666554432',rect)
  123 + var is_1_height = Number(rect.height) // 节点的宽度
  124 + that.top=that.top+is_1_height*2;
  125 + console.log(that.top)
  126 +
  127 + }).exec();
  128 + }
  129 + });
  130 +
  131 +
49 }).catch((err)=>{ 132 }).catch((err)=>{
50 console.log(err) 133 console.log(err)
51 }) 134 })
@@ -57,11 +140,39 @@ export default { @@ -57,11 +140,39 @@ export default {
57 token:uni.getStorageSync('token'), 140 token:uni.getStorageSync('token'),
58 page:that.page, 141 page:that.page,
59 size:that.size, 142 size:that.size,
60 - userb_id:that.userb_id 143 + userb_id:that.chuanuserid
61 } 144 }
62 app.post(url,params,"get").then((res)=>{ 145 app.post(url,params,"get").then((res)=>{
63 console.log(res) 146 console.log(res)
64 - that.meslist=res 147 +
  148 + // res.forEach(function(value,index,array){
  149 + // arr.unshift(value)
  150 + // })
  151 +
  152 + let new_arr = [];
  153 + new_arr = res.concat(that.meslist);
  154 + that.meslist = new_arr;
  155 + // that.meslist=that.meslist.concat(res);
  156 + // that.meslist=that.meslist.reverse();
  157 + // that.meslist=that.meslist
  158 + console.log('3478834984',that.meslist)
  159 + if(that.page==1){
  160 + setTimeout(function(){
  161 + wx.getSystemInfo({
  162 + success: function (res) {
  163 + wx.createSelectorQuery().select('.contentbox').boundingClientRect(function (rect) {
  164 + console.log('777666554432kkkkkk',rect)
  165 + var is_1_height =that.meslist.length*Number(rect.height) // 节点的宽度
  166 + that.top=is_1_height;
  167 +
  168 +
  169 + }).exec();
  170 + }
  171 + });
  172 + },500)
  173 + }
  174 +
  175 +
65 }).catch((err)=>{ 176 }).catch((err)=>{
66 console.log(err) 177 console.log(err)
67 }) 178 })
@@ -69,25 +180,46 @@ export default { @@ -69,25 +180,46 @@ export default {
69 180
70 }, 181 },
71 onLoad(options){ 182 onLoad(options){
  183 +
72 console.log(options) 184 console.log(options)
73 this.userb_id=options.userb_id 185 this.userb_id=options.userb_id
74 this.user_id=options.user_id 186 this.user_id=options.user_id
75 this.nickname=options.nickname 187 this.nickname=options.nickname
76 this.image=options.head_image 188 this.image=options.head_image
77 - this.getmeslist() 189 + this.usera_id=options.usera_id;
  190 + if(this.user_id==this.usera_id){
  191 + this.chuanuserid=this.userb_id
  192 + }else{
  193 + this.chuanuserid=this.usera_id
  194 + }
  195 +
  196 + console.log('11222',this.userb_id,this.user_id)
  197 + this.getmeslist();
  198 + // 获取个人信息
  199 + this.getmyinfo();
  200 +
  201 + },
  202 + onReachBottom(){
  203 +
78 } 204 }
79 205
80 } 206 }
81 </script> 207 </script>
82 208
83 <style lang="less"> 209 <style lang="less">
84 -.content{ 210 + page{
85 background-color: #F9F9F9; 211 background-color: #F9F9F9;
  212 + height:100%;
  213 + }
  214 +.content{
  215 + height:100%;
  216 + // background-color: #F9F9F9;
86 .title{ 217 .title{
87 display: flex; 218 display: flex;
88 align-items: center; 219 align-items: center;
89 background-color: #fff; 220 background-color: #fff;
90 padding: 16rpx 32rpx; 221 padding: 16rpx 32rpx;
  222 + margin-bottom:20rpx;
91 .photo{ 223 .photo{
92 width: 68rpx; 224 width: 68rpx;
93 height: 68rpx; 225 height: 68rpx;
@@ -100,6 +232,7 @@ export default { @@ -100,6 +232,7 @@ export default {
100 .contentBox{ 232 .contentBox{
101 // height: 100vh; 233 // height: 100vh;
102 background-color: #F9F9F9; 234 background-color: #F9F9F9;
  235 + margin-bottom:120rpx;
103 .right{ 236 .right{
104 margin-left:246rpx; 237 margin-left:246rpx;
105 } 238 }
@@ -132,6 +265,10 @@ export default { @@ -132,6 +265,10 @@ export default {
132 background:rgba(238,238,238,1); 265 background:rgba(238,238,238,1);
133 opacity:1; 266 opacity:1;
134 border-radius:8rpx; 267 border-radius:8rpx;
  268 + padding:0 20rpx;
  269 + box-sizing: border-box;
  270 + color:#8C9198;
  271 + font-size: 28rpx;
135 } 272 }
136 .btn{ 273 .btn{
137 width:150rpx; 274 width:150rpx;
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <view class="content"> 2 <view class="content">
3 <view class="item" v-for="(item,index) in mingxilist" :key="index"> 3 <view class="item" v-for="(item,index) in mingxilist" :key="index">
4 <view class="left"> 4 <view class="left">
5 - <view class="title">xx收益</view>  
6 - <view class="time">2020-2-19</view> 5 + <view class="title">{{item.memo}}</view>
  6 + <view class="time">{{item.createtime}}</view>
7 </view> 7 </view>
8 - <view class="right">¥800.00</view> 8 + <view class="right">{{item.money}}</view>
9 </view> 9 </view>
10 <!-- <view class="item"> 10 <!-- <view class="item">
11 <view class="left"> 11 <view class="left">
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <view class="item"> 14 <view class="item">
15 <view class="name">高中</view> 15 <view class="name">高中</view>
16 <view class="cont">{{userinfolist.school_info.name}} 16 <view class="cont">{{userinfolist.school_info.name}}
17 - <image class="icon" src="../../static/dizhi_btn@2x.png"></image> 17 + <!-- <image class="icon" src="../../static/dizhi_btn@2x.png"></image> -->
18 </view> 18 </view>
19 </view> 19 </view>
20 <!-- <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange"> 20 <!-- <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <view class="item" style="border-bottom:none"> 23 <view class="item" style="border-bottom:none">
24 <view class="name">入学年份</view> 24 <view class="name">入学年份</view>
25 <view class="cont">{{userinfolist.starttime}} 25 <view class="cont">{{userinfolist.starttime}}
26 - <image class="icon" src="../../static/dizhi_btn@2x.png"></image> 26 + <!-- <image class="icon" src="../../static/dizhi_btn@2x.png"></image> -->
27 </view> 27 </view>
28 </view> 28 </view>
29 </view> 29 </view>
1 <template> 1 <template>
2 <view class="content"> 2 <view class="content">
3 <image class="bg" src="../../static/bg_img2.png"></image> 3 <image class="bg" src="../../static/bg_img2.png"></image>
4 - <image class="photo" :src="token=='' ? '../../static/touxiang_img@2x.png' :head_image"></image> 4 + <image class="photo" :src="token=='' ? '../../static/touxiang_img@2x.png' :head_image" style="border-radius:50%;"></image>
5 <view class="title">{{userinfolist.nickname}}</view> 5 <view class="title">{{userinfolist.nickname}}</view>
6 <image class="banner" src="../../static/banner_img@2x.png" @click="toBuyCard"></image> 6 <image class="banner" src="../../static/banner_img@2x.png" @click="toBuyCard"></image>
7 <view class="item" @click="togeren"> 7 <view class="item" @click="togeren">
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">  
5 - <image class="photo" src="../../static/logo_img@2x.png"></image> 4 + <view class="toprow" style="display:flex;justify-content: space-between;">
  5 + <view style="display:flex;">
  6 + <image class="photo" :src="item.head_image" style="border-radius: 50%;"></image>
6 <view class="msg"> 7 <view class="msg">
7 <view class="name">{{item.nickname}}</view> 8 <view class="name">{{item.nickname}}</view>
8 <view class="time">{{item.createtime}}</view> 9 <view class="time">{{item.createtime}}</view>
9 </view> 10 </view>
  11 + </view>
  12 +
10 <view class="right" v-if="item.readtime==null">未读</view> 13 <view class="right" v-if="item.readtime==null">未读</view>
11 <view class="right" style="color:#BDC4CE" v-else>已读</view> 14 <view class="right" style="color:#BDC4CE" v-else>已读</view>
12 </view> 15 </view>
@@ -43,21 +46,30 @@ export default { @@ -43,21 +46,30 @@ export default {
43 } 46 }
44 app.post(url,params,"get").then((res)=>{ 47 app.post(url,params,"get").then((res)=>{
45 console.log(res) 48 console.log(res)
46 - that.commentlist=res 49 + res.forEach(function(value,index,array){
  50 + value.head_image=app.globalData.imageBaseUrl+value.head_image
  51 + })
  52 + that.commentlist=that.commentlist.concat(res)
47 }).catch((err)=>{ 53 }).catch((err)=>{
48 console.log(err) 54 console.log(err)
49 }) 55 })
50 }, 56 },
51 tocommentlist(item){ 57 tocommentlist(item){
52 uni.navigateTo({ 58 uni.navigateTo({
53 - url:'./commentContent?userb_id='+item.userb_id+"&nickname="+item.nickname+"&head_image="+item.head_image+"&user_id="+this.user_id 59 + url:'./commentContent?userb_id='+item.userb_id+"&nickname="+item.nickname+"&head_image="+item.head_image+"&user_id="+this.user_id+'&usera_id='+item.usera_id
54 }) 60 })
  61 + let chuanid='';
  62 + if(this.user_id==item.userb_id){
  63 + chuanid=item.usera_id
  64 + }else{
  65 + chuanid=item.userb_id
  66 + }
55 var that = this 67 var that = this
56 var url = "mes/isReadMes" 68 var url = "mes/isReadMes"
57 var token = uni.getStorageSync('token') 69 var token = uni.getStorageSync('token')
58 var params = { 70 var params = {
59 token:token, 71 token:token,
60 - usera_id:item.userb_id 72 + usera_id:chuanid
61 } 73 }
62 app.post(url,params,"post").then((res)=>{ 74 app.post(url,params,"post").then((res)=>{
63 console.log(res) 75 console.log(res)
@@ -67,7 +79,19 @@ export default { @@ -67,7 +79,19 @@ export default {
67 } 79 }
68 }, 80 },
69 onLoad(options){ 81 onLoad(options){
  82 + console.log(options)
70 this.user_id=options.user_id 83 this.user_id=options.user_id
  84 +
  85 + },
  86 + onShow(){
  87 + this.page=1;
  88 + this.commentlist=[];
  89 + this.getcommentlist()
  90 + },
  91 + onReachBottom(){
  92 + let newpage=this.page;
  93 + newpage++;
  94 + this.page=newpage;
71 this.getcommentlist() 95 this.getcommentlist()
72 } 96 }
73 97
@@ -87,7 +111,7 @@ export default { @@ -87,7 +111,7 @@ export default {
87 width: 686rpx; 111 width: 686rpx;
88 margin: 0 auto; 112 margin: 0 auto;
89 background-color: #fff; 113 background-color: #fff;
90 - padding: 32rpx; 114 + padding: 32rpx 0;
91 box-sizing: border-box; 115 box-sizing: border-box;
92 margin-bottom: 28rpx; 116 margin-bottom: 28rpx;
93 } 117 }
@@ -112,7 +136,7 @@ export default { @@ -112,7 +136,7 @@ export default {
112 .right{ 136 .right{
113 color:rgba(235,128,121,1); 137 color:rgba(235,128,121,1);
114 font-size: 24rpx; 138 font-size: 24rpx;
115 - margin-left: 324rpx; 139 + // margin-left: 324rpx;
116 // float: right; 140 // float: right;
117 width: 60rpx; 141 width: 60rpx;
118 } 142 }
@@ -109,12 +109,11 @@ export default { @@ -109,12 +109,11 @@ export default {
109 app.upload('image',res.tempFilePaths[0],"post").then((res)=>{ 109 app.upload('image',res.tempFilePaths[0],"post").then((res)=>{
110 console.log(res) 110 console.log(res)
111 // let newimage=that.image 111 // let newimage=that.image
112 - var url= res.url 112 + var url= app.globalData.imageBaseUrl+res.kurl
113 // that.image=app.globalData.imageBaseUrl+res.url 113 // that.image=app.globalData.imageBaseUrl+res.url
114 console.log(res) 114 console.log(res)
115 console.log(res.url) 115 console.log(res.url)
116 console.log(that.image) 116 console.log(that.image)
117 -  
118 that.image.push(url) 117 that.image.push(url)
119 that.image2.push(res.kurl) 118 that.image2.push(res.kurl)
120 console.log(that.image) 119 console.log(that.image)
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <view class="title">提现到微信余额（元）</view> 5 <view class="title">提现到微信余额（元）</view>
6 <!-- <view class="money">100.00</view> --> 6 <!-- <view class="money">100.00</view> -->
7 <input type="text" v-model="money" class="money" placeholder="100.00" placeholder-style="padding-bottom: 10rpx;color:rgba(189,196,206,1);font-size: 80rpx;margin-top: 16rpx;border-bottom: 1rpx solid rgba(112,112,112,1);"> 7 <input type="text" v-model="money" class="money" placeholder="100.00" placeholder-style="padding-bottom: 10rpx;color:rgba(189,196,206,1);font-size: 80rpx;margin-top: 16rpx;border-bottom: 1rpx solid rgba(112,112,112,1);">
8 - <view class="text">最多可提100.00元，<text>全部提现</text></view> 8 + <view class="text">最多可提{{yue}}元，<text>全部提现</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">
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 20
21 </view> 21 </view>
22 <view class="colum" style="overflow: auto;height: 540rpx;"> 22 <view class="colum" style="overflow: auto;height: 540rpx;">
23 - <view class="title" @click="selectcity" :data-id="''">全部市</view> 23 + <!-- <view class="title" @click="selectcity" :data-id="''">全部市</view> -->
24 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code" :data-city="item.name">{{item.name}}</view> 24 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code" :data-city="item.name">{{item.name}}</view>
25 25
26 </view> 26 </view>
@@ -106,12 +106,12 @@ export default { @@ -106,12 +106,12 @@ export default {
106 var url ="city/getAllProvince" 106 var url ="city/getAllProvince"
107 var params ={} 107 var params ={}
108 app.post(url,params,"get").then((res)=>{ 108 app.post(url,params,"get").then((res)=>{
109 - var nullData = {  
110 - code:'',  
111 - name:"全部省"  
112 - }  
113 - res.unshift(nullData)  
114 - console.log(res) 109 + // var nullData = {
  110 + // code:'',
  111 + // name:"全部省"
  112 + // }
  113 + // res.unshift(nullData)
  114 + // console.log(res)
115 this.provinceList=res 115 this.provinceList=res
116 }).catch((err)=>{ 116 }).catch((err)=>{
117 console.log(err) 117 console.log(err)
@@ -44,11 +44,10 @@ @@ -44,11 +44,10 @@
44 url:'../school/school' 44 url:'../school/school'
45 }) 45 })
46 } 46 }
47 -  
48 this.get_code() 47 this.get_code()
49 }, 48 },
50 methods: { 49 methods: {
51 - 50 + // 获取个人信息
52 getusermsg(){ 51 getusermsg(){
53 52
54 var url = "student/getMyInfo" 53 var url = "student/getMyInfo"
@@ -67,6 +66,9 @@ @@ -67,6 +66,9 @@
67 } 66 }
68 }).catch((err)=>{ 67 }).catch((err)=>{
69 console.log(err) 68 console.log(err)
  69 + wx.redirectTo({
  70 + url:'../school/school'
  71 + })
70 }) 72 })
71 }, 73 },
72 74
@@ -134,7 +136,7 @@ @@ -134,7 +136,7 @@
134 } 136 }
135 app.post(url, param, "get").then(r => { 137 app.post(url, param, "get").then(r => {
136 uni.setStorageSync('token', r.userInfo.token); 138 uni.setStorageSync('token', r.userInfo.token);
137 - 139 + // 判断是否注册过
138 this.isuserlogin() 140 this.isuserlogin()
139 141
140 }).catch(err => { 142 }).catch(err => {
@@ -109,7 +109,10 @@ export default { @@ -109,7 +109,10 @@ export default {
109 .item{ 109 .item{
110 width:220rpx; 110 width:220rpx;
111 height:112rpx; 111 height:112rpx;
112 - line-height: 112rpx; 112 + display:flex;
  113 + align-items: center;
  114 + justify-content: center;
  115 + // line-height: 112rpx;
113 background:rgba(255,255,255,1); 116 background:rgba(255,255,255,1);
114 box-shadow:0rpx 2rpx 4rpx rgba(0,0,0,0.06); 117 box-shadow:0rpx 2rpx 4rpx rgba(0,0,0,0.06);
115 opacity:1; 118 opacity:1;
@@ -121,9 +124,9 @@ export default { @@ -121,9 +124,9 @@ export default {
121 text-align: center; 124 text-align: center;
122 margin-right: 14rpx; 125 margin-right: 14rpx;
123 margin-bottom: 16rpx; 126 margin-bottom: 16rpx;
124 - overflow: hidden;  
125 - white-space: nowrap;  
126 - text-overflow: ellipsis; 127 + // overflow: hidden;
  128 + // white-space: nowrap;
  129 + // text-overflow: ellipsis;
127 } 130 }
128 } 131 }
129 } 132 }
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 </view> 18 </view>
19 <view class="colum" style="overflow: auto;height: 600rpx;"> 19 <view class="colum" style="overflow: auto;height: 600rpx;">
20 - <view class="title" @click="selectcity" :data-id="''">全部市</view> 20 + <!-- <view class="title" @click="selectcity" :data-id='""'>全部市</view> -->
21 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code">{{item.name}}</view> 21 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code">{{item.name}}</view>
22 22
23 </view> 23 </view>
@@ -92,11 +92,11 @@ export default { @@ -92,11 +92,11 @@ export default {
92 var url ="city/getAllProvince" 92 var url ="city/getAllProvince"
93 var params ={} 93 var params ={}
94 app.post(url,params,"get").then((res)=>{ 94 app.post(url,params,"get").then((res)=>{
95 - var nullData = {  
96 - code:'',  
97 - name:"全部省"  
98 - }  
99 - res.unshift(nullData) 95 + // var nullData = {
  96 + // code:'',
  97 + // name:"全部省"
  98 + // }
  99 + // res.unshift(nullData)
100 console.log(res) 100 console.log(res)
101 this.provinceList=res 101 this.provinceList=res
102 }).catch((err)=>{ 102 }).catch((err)=>{
@@ -112,6 +112,8 @@ export default { @@ -112,6 +112,8 @@ export default {
112 } 112 }
113 app.post(url,params,"get").then((res)=>{ 113 app.post(url,params,"get").then((res)=>{
114 console.log(res) 114 console.log(res)
  115 +
  116 +
115 this.cityList=res 117 this.cityList=res
116 }).catch((err)=>{ 118 }).catch((err)=>{
117 console.log(err) 119 console.log(err)
@@ -143,7 +145,8 @@ export default { @@ -143,7 +145,8 @@ export default {
143 }, 145 },
144 //点击选中的市 146 //点击选中的市
145 selectcity(e){ 147 selectcity(e){
146 - this.city_id=e.currentTarget.dataset.id 148 + this.city_id=e.currentTarget.dataset.id;
  149 + console.log(this.city_id,'我是城市ID')
147 this.getAllSchool() 150 this.getAllSchool()
148 this.isDiquShow=false 151 this.isDiquShow=false
149 }, 152 },
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 </view> 18 </view>
19 <view class="colum" style="overflow: auto;height: 600rpx;"> 19 <view class="colum" style="overflow: auto;height: 600rpx;">
20 - <view class="title" @click="selectcity" :data-id="''">全部市</view> 20 + <!-- <view class="title" @click="selectcity" :data-id="''">全部市</view> -->
21 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code">{{item.name}}</view> 21 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code">{{item.name}}</view>
22 22
23 </view> 23 </view>
@@ -92,11 +92,11 @@ export default { @@ -92,11 +92,11 @@ export default {
92 var url ="city/getAllProvince" 92 var url ="city/getAllProvince"
93 var params ={} 93 var params ={}
94 app.post(url,params,"get").then((res)=>{ 94 app.post(url,params,"get").then((res)=>{
95 - var nullData = {  
96 - code:'',  
97 - name:"全部省"  
98 - }  
99 - res.unshift(nullData) 95 + // var nullData = {
  96 + // code:'',
  97 + // name:"全部省"
  98 + // }
  99 + // res.unshift(nullData)
100 console.log(res) 100 console.log(res)
101 this.provinceList=res 101 this.provinceList=res
102 }).catch((err)=>{ 102 }).catch((err)=>{
@@ -39,7 +39,7 @@ methods:{ @@ -39,7 +39,7 @@ methods:{
39 }) 39 })
40 }, 40 },
41 tocollegepage(item){ 41 tocollegepage(item){
42 - let id = item.id 42 + let id = item.university_id
43 let name = item.name 43 let name = item.name
44 uni.navigateTo({ 44 uni.navigateTo({
45 url:'./academyDetails?university_id='+id+'&name='+name 45 url:'./academyDetails?university_id='+id+'&name='+name
@@ -55,8 +55,11 @@ onLoad(options){ @@ -55,8 +55,11 @@ onLoad(options){
55 </script> 55 </script>
56 56
57 <style lang="less"> 57 <style lang="less">
58 -.content{ 58 + page{
59 background-color: rgba(249,249,249,1); 59 background-color: rgba(249,249,249,1);
  60 + }
  61 +.content{
  62 +
60 font-size: 28rpx; 63 font-size: 28rpx;
61 .top{ 64 .top{
62 padding: 18rpx 32rpx; 65 padding: 18rpx 32rpx;
1 <template> 1 <template>
2 <view class="content"> 2 <view class="content">
3 - <image class="background" :src="university.des_image"></image> 3 + <image class="background" :src="university.des_image=='http://school.t.brotop.cn'?'../../static/bg_img@2x.png':university.des_image"></image>
4 4
5 <view class="titleBox"> 5 <view class="titleBox">
6 <view class="title">{{university.name}}</view> 6 <view class="title">{{university.name}}</view>
@@ -34,7 +34,8 @@ @@ -34,7 +34,8 @@
34 </view> 34 </view>
35 35
36 </view> 36 </view>
37 - <view class="articl"> 37 + <view class="nodata" v-if="articleList.length==0">暂无数据</view>
  38 + <view class="articl" v-else>
38 <block v-for="(item,index) in articleList" :key="index"> 39 <block v-for="(item,index) in articleList" :key="index">
39 <view class="articltitle"> 40 <view class="articltitle">
40 <image class="photo" :src="item.head_image"></image> 41 <image class="photo" :src="item.head_image"></image>
@@ -50,7 +51,7 @@ @@ -50,7 +51,7 @@
50 <!-- <image src="../../static/bg_img@2x.png"></image> --> 51 <!-- <image src="../../static/bg_img@2x.png"></image> -->
51 </view> 52 </view>
52 </block> 53 </block>
53 - <view class="nodata" v-if="articleList.length==0">暂无数据</view> 54 +
54 55
55 </view> 56 </view>
56 57
@@ -135,7 +136,7 @@ export default { @@ -135,7 +136,7 @@ export default {
135 var that=this 136 var that=this
136 var url="article/getArticleList" 137 var url="article/getArticleList"
137 var params = { 138 var params = {
138 - university_id:that.uni_id, 139 + university_id:that.university_id,
139 page:that.page, 140 page:that.page,
140 size:that.size, 141 size:that.size,
141 type_id:that.type_id, 142 type_id:that.type_id,
@@ -204,7 +205,7 @@ export default { @@ -204,7 +205,7 @@ export default {
204 font-size: 32rpx; 205 font-size: 32rpx;
205 text-align: center; 206 text-align: center;
206 color:rgba(45,85,117,1); 207 color:rgba(45,85,117,1);
207 - border-right: 1rpx solid rgba(213,234,227,1); 208 + // border-right: 1rpx solid rgba(213,234,227,1);
208 209
209 .num{ 210 .num{
210 } 211 }
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
26 <image class="icon" src="../../static/xuexiao_icon@2x.png"></image> 26 <image class="icon" src="../../static/xuexiao_icon@2x.png"></image>
27 </view> --> 27 </view> -->
28 </view> 28 </view>
29 -  
30 <view class="weiguanzhu" v-if="isnulldata==true||token==''"> 29 <view class="weiguanzhu" v-if="isnulldata==true||token==''">
31 <view class="title">请关注更多学校</view> 30 <view class="title">请关注更多学校</view>
32 <view class="btn" @click="tosearchpage">立即关注</view> 31 <view class="btn" @click="tosearchpage">立即关注</view>
@@ -215,7 +214,7 @@ @@ -215,7 +214,7 @@
215 let newpage=this.page; 214 let newpage=this.page;
216 newpage++; 215 newpage++;
217 this. page=newpage 216 this. page=newpage
218 - this.getschoollist() 217 + this.getlikeschool()
219 }, 218 },
220 219
221 // isuserlogin(){ 220 // isuserlogin(){
1 <template> 1 <template>
2 <view class="content"> 2 <view class="content">
3 - <image class="background" :src="university.des_image"></image> 3 +
  4 + <image class="background" :src="university.des_image=='http://school.t.brotop.cn'?'../../static/bg_img@2x.png':university.des_image"></image>
4 <view class="contentBox"> 5 <view class="contentBox">
5 - <image class="photo" :src="university.icon_image"></image> 6 + <image class="photo" :src="university.icon_image=='http://school.t.brotop.cn'?'../../static/logo_img@2x.png':university.icon_image"></image>
6 <view class="title">{{university.name}}</view> 7 <view class="title">{{university.name}}</view>
7 <view class="cellectBtn" @click="cellectScool" v-if="university.is_like==0"> 8 <view class="cellectBtn" @click="cellectScool" v-if="university.is_like==0">
8 <image class="icon" src="../../static/shoucang_icon@2x.png"></image> 9 <image class="icon" src="../../static/shoucang_icon@2x.png"></image>
@@ -12,7 +13,8 @@ @@ -12,7 +13,8 @@
12 <view class="text" style="text-align: center;">已收藏</view> 13 <view class="text" style="text-align: center;">已收藏</view>
13 </view> 14 </view>
14 <view class="msg" @click="tomsgpage"> 15 <view class="msg" @click="tomsgpage">
15 - {{university.des_content}} 16 + <text v-if="university.des_content!=undefined">{{university.des_content==''?'暂无简介':university.des_content}}</text>
  17 +
16 <text style="color:#81C3BF">[更多]</text> 18 <text style="color:#81C3BF">[更多]</text>
17 </view> 19 </view>
18 20
@@ -51,7 +53,7 @@ @@ -51,7 +53,7 @@
51 </view> 53 </view>
52 <view class="card"> 54 <view class="card">
53 55
54 - <view class="item" style="width: 188rpx;" v-for="(item,index) in collegeList" :key="index"><view class="bor">{{item.name}}</view></view> 56 + <view class="item" style="width: 188rpx;" v-for="(item,index) in collegeList" :key="index" @click="tocollegepage(item)"><view class="bor">{{item.name}}</view></view>
55 57
56 58
57 </view> 59 </view>
@@ -147,6 +149,13 @@ export default { @@ -147,6 +149,13 @@ export default {
147 149
148 }, 150 },
149 methods:{ 151 methods:{
  152 + tocollegepage(item){
  153 + let id = item.university_id
  154 + let name = item.name
  155 + uni.navigateTo({
  156 + url:'./academyDetails?university_id='+id+'&name='+name
  157 + })
  158 + },
150 popupShow(){ 159 popupShow(){
151 this.isPopupShow=true 160 this.isPopupShow=true
152 161
@@ -326,7 +335,7 @@ export default { @@ -326,7 +335,7 @@ export default {
326 opacity:1; 335 opacity:1;
327 border-radius:28rpx; 336 border-radius:28rpx;
328 position: absolute; 337 position: absolute;
329 - top: -66rpx; 338 + top: -130rpx;
330 right: 32rpx; 339 right: 32rpx;
331 padding:0 30rpx; 340 padding:0 30rpx;
332 box-sizing: border-box; 341 box-sizing: border-box;
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </view> 24 </view>
25 <view class="nodata" v-if="articleList.length==0">暂无数据</view> 25 <view class="nodata" v-if="articleList.length==0">暂无数据</view>
26 <view class="articl" v-else> 26 <view class="articl" v-else>
27 - <block v-for="(item,index) in articleList" :key="index" @click="toarticlemsg(item)"> 27 + <view v-for="(item,index) in articleList" :key="index" @click="toarticlemsg(item)">
28 <view class="articltitle"> 28 <view class="articltitle">
29 <image class="photo" :src="item.head_image"></image> 29 <image class="photo" :src="item.head_image"></image>
30 <view class="msg"> 30 <view class="msg">
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <image :src="item" v-for="(item,index) in item.des_images" :key="index"></image> 38 <image :src="item" v-for="(item,index) in item.des_images" :key="index"></image>
39 <!-- <image src="../../static/bg_img@2x.png"></image> --> 39 <!-- <image src="../../static/bg_img@2x.png"></image> -->
40 </view> 40 </view>
41 - </block> 41 + </view>
42 42
43 43
44 </view> 44 </view>
@@ -69,8 +69,8 @@ @@ -69,8 +69,8 @@
69 </view> 69 </view>
70 <view class="popup2" v-if="isdaxieBoxShow"> 70 <view class="popup2" v-if="isdaxieBoxShow">
71 <view class="card"> 71 <view class="card">
72 - <view class="title">我要答谢</view>  
73 - <view v-if="money"> 72 + <view class="title">我要答谢{{moneyshow}}</view>
  73 + <view v-if="moneyshow">
74 <view class="box" :class="{'active':isactive==1}" @click="picked" data-id=1 data-money=1>¥1</view> 74 <view class="box" :class="{'active':isactive==1}" @click="picked" data-id=1 data-money=1>¥1</view>
75 <view class="box" :class="{'active':isactive==2}" @click="picked" data-id=2 data-money=6>¥6</view> 75 <view class="box" :class="{'active':isactive==2}" @click="picked" data-id=2 data-money=6>¥6</view>
76 <view class="box" :class="{'active':isactive==3}" @click="picked" data-id=3 data-money=10>¥10</view> 76 <view class="box" :class="{'active':isactive==3}" @click="picked" data-id=3 data-money=10>¥10</view>
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 <view v-else> 82 <view v-else>
83 <view class="input"> 83 <view class="input">
84 <view class="txt">¥</view> 84 <view class="txt">¥</view>
85 - <input type="text" placeholder="请输入答谢金额" placeholder-style="color:rgba(189,196,206,1);font-size:28rpx;"> 85 + <input type="text" placeholder="请输入答谢金额" placeholder-style="color:rgba(189,196,206,1);font-size:28rpx;" @input="entermoney">
86 </view> 86 </view>
87 <view class="btn" @click="moneyHide">确定</view> 87 <view class="btn" @click="moneyHide">确定</view>
88 </view> 88 </view>
@@ -102,7 +102,7 @@ data(){ @@ -102,7 +102,7 @@ data(){
102 return{ 102 return{
103 isliuyanBoxShow:false, 103 isliuyanBoxShow:false,
104 isdaxieBoxShow:false, 104 isdaxieBoxShow:false,
105 - money:true, 105 + moneyshow:true,
106 id:'', 106 id:'',
107 matemsg:{}, 107 matemsg:{},
108 articletypelist:[], 108 articletypelist:[],
@@ -131,6 +131,13 @@ onLoad(options){ @@ -131,6 +131,13 @@ onLoad(options){
131 131
132 }, 132 },
133 methods:{ 133 methods:{
  134 + // 进入文章详情
  135 + toarticl(e) {
  136 + var id = e.currentTarget.dataset.id
  137 + uni.navigateTo({
  138 + url: '../school/article?article_id=' + id
  139 + })
  140 + },
134 liuyanBoxShow(){ 141 liuyanBoxShow(){
135 this.isliuyanBoxShow=true 142 this.isliuyanBoxShow=true
136 }, 143 },
@@ -138,19 +145,58 @@ methods:{ @@ -138,19 +145,58 @@ methods:{
138 this.isliuyanBoxShow=false 145 this.isliuyanBoxShow=false
139 }, 146 },
140 daxieShow(){ 147 daxieShow(){
141 - this.isdaxieBoxShow=true 148 + this.isdaxieBoxShow=true;
  149 +
142 }, 150 },
143 daxieHide(){ 151 daxieHide(){
144 this.isdaxieBoxShow=false 152 this.isdaxieBoxShow=false
145 - this.money=true 153 + this.moneyshow=true
146 this.isactive=1 154 this.isactive=1
147 }, 155 },
148 moneyShow(){ 156 moneyShow(){
149 - this.money=false 157 + this.moneyshow=false
150 this.isactive=7 158 this.isactive=7
151 }, 159 },
  160 + //输入其他金额
  161 + entermoney(e){
  162 + this.money=e.detail.value
  163 + },
152 moneyHide(){ 164 moneyHide(){
153 - this.money=true 165 + // this.isactive=e.currentTarget.dataset.id
  166 + // this.money=e.currentTarget.dataset.money
  167 + var that = this
  168 + var url = "thank/pay"
  169 + var token = uni.getStorageSync('token')
  170 + var params = {
  171 + token:token,
  172 + money:that.money,
  173 + userb_id:that.user_id
  174 + }
  175 + app.post(url,params,"post").then((res)=>{
  176 + console.log(res)
  177 + var timeStamp = res.timeStamp.toString();
  178 + // console.log(timeStamp);
  179 + wx.requestPayment({
  180 + timeStamp: timeStamp,
  181 + nonceStr: res.nonceStr,
  182 + package: res.package,
  183 + signType: res.signType,
  184 + paySign: res.paySign,
  185 + success: function(res) {
  186 + console.log(res)
  187 + wx.navigateTo({
  188 + url: '/pages/orderbox/orderbox?index=' + 0
  189 + })
  190 + },
  191 + fail: function(res) {
  192 + console.log(123);
  193 + console.log(res);
  194 + }
  195 + })
  196 + }).catch((err)=>{
  197 + console.log(err)
  198 + })
  199 + // this.moneyshow=true
154 }, 200 },
155 getmatemsg(){ 201 getmatemsg(){
156 let token = uni.getStorageSync('token') 202 let token = uni.getStorageSync('token')
@@ -259,6 +305,7 @@ methods:{ @@ -259,6 +305,7 @@ methods:{
259 }) 305 })
260 }, 306 },
261 toarticlemsg(item){ 307 toarticlemsg(item){
  308 + console.log('文章详情',item)
262 uni.navigateTo({ 309 uni.navigateTo({
263 url:'../school/article?article_id='+item.id 310 url:'../school/article?article_id='+item.id
264 }) 311 })
@@ -520,6 +567,7 @@ methods:{ @@ -520,6 +567,7 @@ methods:{
520 width: 136rpx; 567 width: 136rpx;
521 height: 136rpx; 568 height: 136rpx;
522 margin-top: 50rpx; 569 margin-top: 50rpx;
  570 + border-radius: 50%;
523 } 571 }
524 .title{ 572 .title{
525 font-size: 32rpx; 573 font-size: 32rpx;
@@ -18,17 +18,17 @@ @@ -18,17 +18,17 @@
18 18
19 <view class="cont"> 19 <view class="cont">
20 <view class="colum" style="overflow: auto;height: 600rpx;"> 20 <view class="colum" style="overflow: auto;height: 600rpx;">
21 - <view class="title" @click="selectallprovince" :data-id="null">全部省</view> 21 + <view class="title" @click="selectallprovince">全部</view>
22 <view class="item" @click="selectprovince" v-for="(item,index) in provinceList" :key="index" :data-id="item.code">{{item.name}}</view> 22 <view class="item" @click="selectprovince" v-for="(item,index) in provinceList" :key="index" :data-id="item.code">{{item.name}}</view>
23 23
24 </view> 24 </view>
25 <view class="colum" style="overflow: auto;height: 600rpx;"> 25 <view class="colum" style="overflow: auto;height: 600rpx;">
26 - <view class="title" @click="selectallcity" :data-id="null">这个省的市</view> 26 + <!-- <view class="title" @click="selectallcity" :data-id="null">这个省的市</view> -->
27 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code">{{item.name}}</view> 27 <view class="item" @click="selectcity" v-for="(item,index) in cityList" :key="index" :data-id="item.code">{{item.name}}</view>
28 28
29 </view> 29 </view>
30 <view class="colum" style="overflow: auto;height: 600rpx;"> 30 <view class="colum" style="overflow: auto;height: 600rpx;">
31 - <view class="title" @click="selectschool" :data-id="null">全部学校</view> 31 + <!-- <view class="title" @click="selectschool" :data-id="null">全部学校</view> -->
32 <view class="item" @click="selectschool" v-for="(item,index) in schoolList" :key="index" :data-id="item.id">{{item.name}}</view> 32 <view class="item" @click="selectschool" v-for="(item,index) in schoolList" :key="index" :data-id="item.id">{{item.name}}</view>
33 </view> 33 </view>
34 34
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </view> --> 45 </view> -->
46 <view class="majorPopup" v-if="isMajorShow"> 46 <view class="majorPopup" v-if="isMajorShow">
47 <view class="cont" style="display:flex;flex-direction: column;overflow: auto;height: 600rpx;"> 47 <view class="cont" style="display:flex;flex-direction: column;overflow: auto;height: 600rpx;">
48 - <view class="title" @click="selectgraduated" :data-id="null">全部</view> 48 + <!-- <view class="title" @click="selectgraduated" :data-id="null">全部</view> -->
49 <view class="item" style="width:330rpx" @click="selectgraduated" v-for="(item,index) in graduatedList" :key="index" 49 <view class="item" style="width:330rpx" @click="selectgraduated" v-for="(item,index) in graduatedList" :key="index"
50 :data-id="item.id">{{item.name}}</view> 50 :data-id="item.id">{{item.name}}</view>
51 </view> 51 </view>
@@ -328,6 +328,11 @@ @@ -328,6 +328,11 @@
328 var url = "city/getAllProvince" 328 var url = "city/getAllProvince"
329 var params = {} 329 var params = {}
330 app.post(url, params, "get").then((res) => { 330 app.post(url, params, "get").then((res) => {
  331 + // let obj={
  332 + // code:'',
  333 + // name:'全部省'
  334 + // }
  335 + // res.unshift(obj)
331 this.provinceList = res 336 this.provinceList = res
332 }).catch((err) => { 337 }).catch((err) => {
333 console.log(err) 338 console.log(err)
@@ -342,6 +347,12 @@ @@ -342,6 +347,12 @@
342 } 347 }
343 app.post(url, params, "get").then((res) => { 348 app.post(url, params, "get").then((res) => {
344 console.log(res) 349 console.log(res)
  350 +
  351 + // let obj={
  352 + // code:'',
  353 + // name:'全部市'
  354 + // }
  355 + // res.unshift(obj)
345 this.cityList = res 356 this.cityList = res
346 }).catch((err) => { 357 }).catch((err) => {
347 console.log(err) 358 console.log(err)
@@ -356,6 +367,11 @@ @@ -356,6 +367,11 @@
356 } 367 }
357 app.post(url, params, "get").then((res) => { 368 app.post(url, params, "get").then((res) => {
358 console.log(res) 369 console.log(res)
  370 + // let obj={
  371 + // id:'',
  372 + // name:'全部学校'
  373 + // }
  374 + // res.unshift(obj)
359 this.schoolList = res 375 this.schoolList = res
360 }).catch((err) => { 376 }).catch((err) => {
361 console.log(err) 377 console.log(err)
@@ -372,7 +388,8 @@ @@ -372,7 +388,8 @@
372 388
373 //点击选中的专业 389 //点击选中的专业
374 selectgraduated(e) { 390 selectgraduated(e) {
375 - this.schoolmate.graduated_id = e.currentTarget.dataset.id 391 + this.schoolmate.graduated_id = e.currentTarget.dataset.id;
  392 + console.log('选择的id',this.schoolmate.graduated_id)
376 this.isMajorShow = false 393 this.isMajorShow = false
377 this.getmatelist() 394 this.getmatelist()
378 395
@@ -398,6 +415,12 @@ @@ -398,6 +415,12 @@
398 }, 415 },
399 //点击全部省 416 //点击全部省
400 selectallprovince() { 417 selectallprovince() {
  418 + this.schoolmate.page=1,
  419 + this.schoolmate.university_id=''
  420 + this.schoolmate.graduated_id=''
  421 + this.schoolmate.up_id=''
  422 + this.word=''
  423 +
401 this.getmatelist() 424 this.getmatelist()
402 this.isDiquShow = false 425 this.isDiquShow = false
403 }, 426 },
@@ -577,6 +600,7 @@ @@ -577,6 +600,7 @@
577 height: 112rpx; 600 height: 112rpx;
578 margin-right: 26rpx; 601 margin-right: 26rpx;
579 margin-top: 6rpx; 602 margin-top: 6rpx;
  603 + border-radius: 50%;
580 604
581 } 605 }
582 606