1

@@ -100,8 +100,8 @@
 		},
 		},
 		globalData: {
 		globalData: {
 			userInfo: null,
 			userInfo: null,
-			baseUrl: 'https://school.t.brotop.cn/api/',
-			imageBaseUrl: 'http://school.t.brotop.cn'
+			baseUrl:'https://school.t.brotop.cn/api/',
+			imageBaseUrl:'http://school.t.brotop.cn'
 		},
 		},
 	}
 	}
 </script>
 </script>

@@ -128,4 +128,6 @@
 
 
 <style>
 <style>
 	
 	
+		
+	
 </style>
 </style>

@@ -144,6 +144,7 @@
 				})
 				})
 			},
 			},
 			payment(res) {
 			payment(res) {
+					
 				let that = this;
 				let that = this;
 				var timeStamp = res.timeStamp.toString();
 				var timeStamp = res.timeStamp.toString();
 				// console.log(timeStamp);
 				// console.log(timeStamp);

@@ -72,15 +72,13 @@ data(){
 methods:{
 methods:{
     toPubArticle(){
     toPubArticle(){
 		let token=uni.getStorageSync("token");
 		let token=uni.getStorageSync("token");
-		if(token==''{
+		if(token==''){
 			uni.showToast({
 			uni.showToast({
 				title:'请登录后操作',
 				title:'请登录后操作',
 				icon:'none'
 				icon:'none'
 			})
 			})
 		}else{
 		}else{
-			wx.navigateTo({
-			    url:"./pubArticle"
-			})
+			
 		}
 		}
         
         
     },
     },

@@ -257,7 +257,6 @@
 				font-size: 28rpx;
 				font-size: 28rpx;
 				margin-top: 20rpx;
 				margin-top: 20rpx;
 			}
 			}
-
 			.btn_group {
 			.btn_group {
 				width: 226rpx;
 				width: 226rpx;
 				height: 352rpx;
 				height: 352rpx;
@@ -266,7 +265,8 @@
 				left: 0;
 				left: 0;
 				background: transparent;
 				background: transparent;
 				border: none;
 				border: none;
-				outline: none
+				outline: none;
+			
 			}
 			}
 		}
 		}
 	}
 	}

@@ -19,7 +19,7 @@
 				  <rich-text :nodes="university.des_content" v-else></rich-text>
 				  <rich-text :nodes="university.des_content" v-else></rich-text>
 			 
 			 
            
            
-            <text style="color:#81C3BF" v-if="university.des_content!=''">[更多]</text>
+            <text style="color:#81C3BF;width:400rpx" v-if="university.des_content!=''">[更多]</text>
           </view>
           </view>
           
           
       </view>
       </view>
@@ -469,7 +469,11 @@ export default {
             color:#06121E;
             color:#06121E;
             font-size: 24rpx;
             font-size: 24rpx;
             width: 500rpx;
             width: 500rpx;
-            height: 106rpx;
+            height: 118rpx;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 3;
+			overflow: hidden;
         }
         }
         
         
     }
     }

@@ -3,7 +3,7 @@
       <image class="background" :src="universitylist.des_image=='http://school.t.brotop.cn'?'../../static/bg_img@2x.png':universitylist.des_image"></image>
       <image class="background" :src="universitylist.des_image=='http://school.t.brotop.cn'?'../../static/bg_img@2x.png':universitylist.des_image"></image>
       <view class="titleBox">
       <view class="titleBox">
         <view class="title">{{universitylist.name}}</view>
         <view class="title">{{universitylist.name}}</view>
-        <view class="eng">Hebei University of Technology</view>
+        <view class="eng">{{universitylist.name_en}}</view>
       </view>
       </view>
 	  
 	  
       <view class="schoolMsg">
       <view class="schoolMsg">