1

lihongjuan
src/pages/homePage/collegeCellect.vue
src/pages/school/schoolDetails.vue
src/pages/school/schoolMsg.vue
--- a/src/pages/homePage/collegeCellect.vue
查看文件 @a3496ec
+++ b/src/pages/homePage/collegeCellect.vue
查看文件 @a3496ec
@@ -13,7 +13,7 @@
 				<!-- <view class="del">完成</view> -->
 			</view>
 			<view class="item" v-for="(item,index) in articlelist" :key="index">
-				<image class="icon" src="../../static/shanchu_icon@2x.png" v-if="isedit" @click="delarcial(item,index)"></image>
+				<image class="icon" src="../../static/shanchu_icon@2x.png" v-if="isedit" @click.stop="delarcial(item,index)"></image>
 				<view class="cont" :style="{width:width}" @click="toarticl" :data-id="item.id">
 					<view class="rowOne">{{item.nickname}}</view>
 					<view class="rowTwo">{{item.title}}</view>
@@ -38,7 +38,7 @@
 						<view class="txt">{{item.des_content}}</view>
 					</view>
 					<view class="right" :class="item.is_like_user==0?'like':''">
-						<view class="text" @click="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;">
+						<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;">
 							<view class='xin' style="width:28rpx;height:28rpx;font-size: 0;">
 								<image src="../../static/xin.png" mode=""></image>
 							</view>
@@ -59,7 +59,7 @@
 				<view class="del" @click="change" v-else>编辑</view>
 			</view>
 			<view class="mateitem" v-for="(item,index) in cellectlist" :key="index" @click="toarticl" :data-id="item.id">
-				<image class="delBtn" src="../../static/shanchu_icon@2x.png" v-if="isdel"></image>
+				<image class="delBtn" src="../../static/shanchu_icon@2x.png" v-if="isdel" @click.stop="delarcial(item,index)"></image>
 				<view class="contentBox" :style="{width:width2}">
 					<image class="photo" :src="item.head_image"></image>
 					<view class="cont">
@@ -69,7 +69,7 @@
 						<view class="txt">{{item.des_content}}</view>
 					</view>
 					<view class="right">
-						<view class="text" @click="attention(item,index)" v-if="item.is_like_user==0" style="display:flex;justify-content: center;align-items: center;color:#81C3BF;">
+						<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;">
 							<view class='xin' style="width:28rpx;height:28rpx;font-size: 0;">
 								<image src="../../static/xin.png" mode=""></image>
 							</view>
@@ -302,7 +302,12 @@
 				           }
 				           app.post(url, params, "post").then((res) => {
 				           	console.log(res)
-				           	that.articlelist.splice(index, 1)
+							console.log(that.active3)
+							if(that.active3==true){
+								that.articlelist.splice(index, 1)	
+							}else if(that.active2==true){
+								that.cellectlist.splice(index, 1)
+							}
 				           	uni.showToast({
 				           		title: '删除成功',
 				           		icon: 'none'
--- a/src/pages/school/schoolDetails.vue
查看文件 @a3496ec
+++ b/src/pages/school/schoolDetails.vue
查看文件 @a3496ec
@@ -12,10 +12,14 @@
           <view class="cellectedbtn" @click="qxcellectScool"  v-else>
               <view class="text" style="text-align: center;">已收藏</view>
           </view>
-          <view class="msg" @click="tomsgpage">
-			  <text v-if="university.des_content!=undefined">{{university.des_content==''?'暂无简介':university.des_content}}</text>
+          <view class="msg" @click="tomsgpage" style="display:flex">
+			  
+			  <text v-if="university.des_content==''">暂无简介</text>
+			  
+				  <rich-text :nodes="university.des_content" v-else></rich-text>
+			 
-            <text style="color:#81C3BF">[更多]</text>
+            <text style="color:#81C3BF" v-if="university.des_content!=''">[更多]</text>
           </view>
       </view>
@@ -37,7 +41,7 @@
                     <view class="num">{{university.same_city_total_num}}</view>
                     <view class="title">同城学长</view>
                 </view>
-                <view class="colum" @click="popupShow">
+                <view class="colum" @click="popupShow" style="border-right:none">
                     <view class="num">{{university.same_province_total_num}}</view>
                     <view class="title">同省学长</view>
                 </view>
@@ -72,9 +76,9 @@
           <view class="articl" v-else>
-              <block  v-for="(item,index) in articleList" :key="index" @click="toarticle(item)">
+              <view  v-for="(item,index) in articleList"  :key="index" @click="toarticlemsg(item)">
                 <view class="articltitle">
-                    <image class="photo" :src="baceurl+item.head_image"></image>
+                    <image class="photo" :src="item.head_image" style="border-radius: 50%;"></image>
                     <view class="msg">
                         <view class="name">{{item.nickname}}</view>
                         <view class="tips">{{item.article_type_name}}</view>
@@ -83,9 +87,9 @@
                 <view class="articleBox">
                     <view class="title">{{item.title}}</view>
                     <view class="txt">{{item.des_content}}</view>
-                    <image :src="baceurl+item.des_images"></image>
+                    <image :src="item" v-for="(item,indexk) in item.des_images" :kry="index" @click.stop="preimg(index,indexk)"></image>
                 </view>
-              </block>
+              </view>
           </view>
@@ -230,6 +234,22 @@ export default {
                 console.log(err)
             })
         },
+		preimg(index,indexk){
+			let that=this;
+			uni.previewImage({
+			current: that.articleList[index].des_images[indexk],
+			urls: that.articleList[index].des_images,
+			success: function (res) { },
+			fail: function (res) { },
+			complete: function (res) { },
+			})
+		},
+		toarticlemsg(item){
+			console.log('文章详情',item)
+		    uni.navigateTo({
+		        url:'../school/article?article_id='+item.id
+		    })
+		},
         selecttype(item,index){
             this.sel=index
             this.type_id=item.id
@@ -421,8 +441,10 @@ export default {
                 font-size: 32rpx;
                 text-align: center;
                 color:rgba(45,85,117,1);
-                border-right: 1rpx solid rgba(213,234,227,1);
-
+                border-right: 1rpx solid rgba(213,234,227,1);	
+				.colum:last-child{
+					border-right:none
+				}
                 .title{
                     font-size: 22rpx;
--- a/src/pages/school/schoolMsg.vue
查看文件 @a3496ec
+++ b/src/pages/school/schoolMsg.vue
查看文件 @a3496ec
@@ -10,9 +10,12 @@
             <image class="icon" :src="universitylist.icon_image"></image>
             <view class="txt">学校介绍</view>
         </view>
-        <view class="text">
+		<view class="text">
+			<rich-text :nodes="universitylist.des_content"></rich-text>
+		</view>
+       <!-- <view 
             {{universitylist.des_content}}
-        </view>
+        </view> -->
       </view>