bug+2

common/http.interceptor.js

@@ -6,8 +6,8 @@
 const install = (Vue, vm) => {
 	Vue.prototype.$u.http.setConfig({
 		// baseUrl: 'http://mt.mentor.site.ximengnaikang.com/api',
-		// baseUrl: '/api',
-		baseUrl:'https://bcsyds.hactcm.edu.cn/api',
+		baseUrl: '/api',
+		// baseUrl:'https://bcsyds.hactcm.edu.cn/api',
 		originalData: true,
 		dataType: 'json',
 		showLoading: true, // 是否显示请求中的loading

pages/activity/index.vue

@@ -43,17 +43,17 @@
 					<view class="text">
 						<text v-if="item.category_id==2"> 报名时间：{{item.data? getTime(item.data.star_time):'--'}}&nbsp;~&nbsp;{{item.data?getTime(item.data.end_time):'--'}}</text>
 					</view>
-					<view class="time">
+					<view class="time" style="width: 100%;justify-content: space-between;">
 						<view class="">
-							<u-icon name="clock-fill"></u-icon>{{getTime(item.published_at)}}
+							<u-icon name="clock-fill"></u-icon>{{getTime(item.created_at)}}
 						</view>
 						<view class="">
 							<u-icon name="eye-fill"></u-icon>{{item.view_count? item.view_count :'--'}}
 						</view>
-						<view class="">
+						<view class="" style="width: 40%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis">
 							<u-icon name="account-fill"></u-icon>{{item.admin_name? item.admin_name :'--'}}
 						</view>
-					</view>
+					</view> 
 				</view>
 			</view>
 
@@ -425,15 +425,15 @@
 
 					.time {
 						display: flex;
-						// margin-top: 3px;
-						
 						font-size: 10px;
 						color: #858585;
 						align-items: center;
-
-
-						view:nth-child(2) {
-							padding: 0 16px;
+						view{
+							display: flex;
+							align-items: center;
+							.u-icon{
+								padding-right: 4rpx;
+							}
 						}
 					}
 				}

pages/index/index.vue

@@ -95,9 +95,10 @@
 						<text>已报名人数：</text> <text
 							class="sign-num">{{item.sign_up_count}}/{{item.max_sign_up_count}}</text>
 					</view>
-					<view class="image" :style="{backgroundImage:'url('+ (item.cover_resource ? item.cover_resource.url : '../../static/images/avator.png') +')'}">
+					<!-- <view class="image" :style="{backgroundImage:'url('+ (item.cover_resource ? item.cover_resource.url : '../../static/images/avator.png') +')'}">
 						
-					</view>
+					</view> -->
+					<image :src="(item.cover_resource ? item.cover_resource.url : '../../static/images/avator.png')" class="image"></image>
 					<!-- <image :src="item.cover_resource ? item.cover_resource.url : '../../static/images/avator.png'"
 						mode="">
 					</image> -->
@@ -108,14 +109,14 @@
 						<view class="text">
 							<text class="tag" v-for="(tag,index) in item.tags" :key='index'>{{tag}}</text>
 						</view>
-						<view class="time">
+						<view class="time" style="width: 100%;">
 							<view class="">
 								<u-icon name="clock-fill"></u-icon>{{getTime(item.created_at)}}
 							</view>
 							<view class="">
 								<u-icon name="eye-fill"></u-icon>{{item.view_count? item.view_count :'--'}}
 							</view>
-							<view class="">
+							<view class="" style="width: 50%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis">
 								<u-icon name="account-fill"></u-icon>{{item.admin_name? item.admin_name :'--'}}
 							</view>
 						</view>
@@ -504,16 +505,19 @@
 			
 				.time {
 					display: flex;
-			
-			
 					font-size: 10px;
 					color: #858585;
 					align-items: center;
-			
-			
+					view{
+						display: flex;
+						align-items: center;
+						.u-icon{
+							padding-right: 4rpx;
+						}
+					}
 					view:nth-child(2) {
-						width:50px;
-						margin-left:20px;
+						width: 50px;
+						margin-left: 20px;
 						margin-right: 10px;
 					}
 				}

pages/index/realname.vue

@@ -532,7 +532,6 @@
 			this.getMe(options.type)
 		},
 		onShow() {
-
 			this.action = '/api/base/common/upload'
 		},
 		methods: {
@@ -683,7 +682,7 @@
 							icon: 'none'
 						})
 						setTimeout(function() {
-							uni.switchTab({
+							uni.reLaunch({
 								url: './index'
 							})
 						}, 1500)
@@ -771,7 +770,7 @@
 							icon: 'none'
 						})
 						setTimeout(function() {
-							uni.switchTab({
+							uni.reLaunch({
 								url: './index'
 							})
 						}, 1500)

pages/mine/record.vue

@@ -181,7 +181,7 @@
 		font-size: 13px;
 		background: rgba(234, 237, 242, .28);
 		border-radius: 7px;
-
+		
 		.tips {
 			position: absolute;
 			width: 57px;
@@ -202,8 +202,8 @@
 		}
 
 		.item-left {
-			margin-right: 20px;
 			text-align: center;
+			width: 30%;
 			.image {
 				height: 42px;
 				width: 42px;
@@ -227,7 +227,7 @@
 		}
 
 		.item-right {
-			flex: 1;
+			width: 47%;
 
 			.text {
 				line-height: 17px;

pages/student/index_new.vue

@@ -14,7 +14,7 @@
 					 </view>
 					 <image src="../../static/more.png" mode=""></image>
 			</view>
-			<u-search @change="changeName" @search="searchBtn" class="list_search" shape="square" placeholder="请输入学生姓名" placeholder-color="#b9b9b9" searchIconColor="#b9b9b9" :showAction="false" bgColor="#F7F7F7"></u-search>
+			<u-search @change="changeName" @search="searchBtn" class="list_search" shape="square" placeholder="请输入学生姓名" placeholder-color="#b9b9b9" searchIconColor="#b9b9b9" :showAction="false" bgColor="#F7F7F7" @clear="clearActive()" v-model="searchName"></u-search>
 			<view class="list_btn" @click="shaixuanBtn">
 				筛选
 			</view>
@@ -146,20 +146,30 @@
 				console.log(e, '********')
 				this.index = e.target.value
 				this.termId = this.termList[this.index].id
+				this.list = []
 				console.log(this.termId, '000000')
+				this.getList()
 			},
 			// 点击筛选俩字
 			shaixuanBtn(){
 				this.list=[]
 				this.page = 1
 				this.last = false
-				this.getList()
+				this.getList() 
 				
 			},
 			// 搜索事件
 			searchBtn(e){
 				this.searchName = e
-				console.log(e, "搜索触发000")
+				console.log(e, "搜索触发000") 
+			},
+			//清空搜索框
+			clearActive() {
+				this.list = []
+				this.page = 1
+				this.searchName = ''
+				this.last = false
+				this.getList()
 			},
 			changeName(e){
 				this.searchName = e