chenxiong 3 жил өмнө
parent
commit
f07b5fe7e6

+ 2 - 2
pages/course/index.vue

@@ -41,7 +41,7 @@
 					<navigator  hover-class="none" :url="'/pages3/course/detail?id='+item.goodsId" v-for="(item,index) in list1" :key="index" >
 						<view class="itemBox">
 							<image :src="$method.splitImgHost(item.coverUrl, true)" style="height: 316rpx;width: 100%;border-radius: 24rpx;"></image>
-							<view style="display: flex;margin-top: 13rpx;">
+							<view style="display: flex;margin-top: 13rpx;align-items: center;">
 								<view class="yearTag" v-if="item.year">{{item.year}}</view>
 								<view class="titleTag">{{item.goodsName}}</view>
 							</view>
@@ -62,7 +62,7 @@
 					<navigator  hover-class="none" :url="'/pages2/bank/detail?id='+item.goodsId" v-for="(item,index) in list2" :key="index" >
 						<view class="itemBox">
 							<image :src="$method.splitImgHost(item.coverUrl, true)" style="height: 316rpx;width: 100%;border-radius: 24rpx;"></image>
-							<view style="display: flex;margin-top: 13rpx;">
+							<view style="display: flex;margin-top: 13rpx;align-items: center;">
 								<view class="yearTag" v-if="item.year">{{item.year}}</view>
 								<view class="titleTag" style="display: flex;justify-content: space-between;flex:1;">
 									<view>{{item.goodsName}}</view>

+ 1 - 1
pages2/class/questionBank.vue

@@ -1258,7 +1258,7 @@ export default {
 				.then(res => {
 					this.recordId = res.data.data;
 					if(self.needPhoto){
-						self.photoPopup = true; //拍照
+						// self.photoPopup = true; //拍照
 					} else {
 						if(this.lastTime) {
 							this.timer = setInterval(() => {

+ 1 - 1
pages2/msg/index.vue

@@ -6,7 +6,7 @@
 				<view style="display: flex;justify-content: space-between;align-items: center;height: 60rpx;">
 					<view style="color: #333333;font-size: 30rpx;font-weight: bold;display: flex;align-items: center;">
 						<image :src="item.systemStatus === 1 ? img1 : img2" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;"></image>
-						系统通知
+						{{item.systemStatus === 1 ? '系统通知' : '教务通知'}}
 					</view>
 					<view style="color: #999999;font-size: 24rpx;">{{ $method.timestampToTime(item.sendTime, false) }}</view>
 				</view>

+ 6 - 1
pages2/wd/info.vue

@@ -73,7 +73,7 @@
 			<u-input v-model="nickname" type="nickname" placeholder="请输入昵称" />
 		</view>
 	</u-modal>
-	<u-modal v-model="id_show" @confirm="confirmId" :show-cancel-button="true" title="修改关联信息">
+	<u-modal v-model="id_show" ref="uModal" :async-close="true" @confirm="confirmId" :show-cancel-button="true" title="修改关联信息">
 		<view class="slot-content">
 			<u-input v-model="realname" @input="inputName(realname)" type="nickname" placeholder="请输入真实姓名" />
 			<u-input v-model="idCard" type="idcard" placeholder="请输入身份证" />
@@ -309,6 +309,7 @@ export default {
 					content: '真实姓名不能为空',
 					showCancel: false
 				})
+				this.$refs.uModal.clearLoading();
 				return
 			}
 			if(this.idCard==''){
@@ -319,6 +320,7 @@ export default {
 					content: '身份证ID不能为空',
 					showCancel: false
 				})
+				this.$refs.uModal.clearLoading();
 				return
 			}
 			let idCardRe18 = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
@@ -330,6 +332,7 @@ export default {
 					content: '身份证ID不正确',
 					showCancel: false
 				})
+				this.$refs.uModal.clearLoading();
 				return
 			}
 			let data = {realname:this.realname,idCard:this.idCard}
@@ -356,6 +359,7 @@ export default {
 			this.$api.appuserInfo(data).then(res => {
 				if (res.data.code === 200) {
 					setTimeout(()=>{
+						this.id_show = false;
 						uni.showToast({
 							title: '提交成功',
 							icon: 'none'
@@ -425,6 +429,7 @@ export default {
 									showCancel:false,
 									success: function(resst) {
 										this.showPhoneModal = false;
+										this.$api.refreshUserInfo();
 									}
 								});
 							} else {

+ 2 - 2
pages3/course/detail.vue

@@ -21,7 +21,7 @@
 						@statechange="onStateChange"
 					></polyv-player>
 				</view>
-				<view style="padding:20rpx;height: 120rpx;">
+				<view style="padding:20rpx;">
 					<view style="display: flex;">
 						<view class="yearTag" v-if="detail.year">{{detail.year}}</view>
 						<view class="titleTag">{{detail.goodsName}}</view>
@@ -360,7 +360,7 @@ export default {
 		position: fixed;
 		background-color: #FFFFFF;
 		width: 100%;
-		height: 680rpx;
+		/* height: 680rpx; */
 		z-index: 999;
 	}
 	.icon_up{