chenxiong 3 سال پیش
والد
کامیت
f4d0eb394d
3فایلهای تغییر یافته به همراه93 افزوده شده و 41 حذف شده
  1. 1 1
      pages2/plan/create.vue
  2. 81 32
      pages2/plan/edit.vue
  3. 11 8
      pages2/plan/index.vue

+ 1 - 1
pages2/plan/create.vue

@@ -7,7 +7,7 @@
 					<text >{{ item.goodsName }}</text>
 					<text style="color:#999;margin-left:12rpx;">{{ item.secAllNum }}节</text>
 				</view>
-				<view class="del_icon"><u-icon name="close" color="#fff" size="20" @click="delItem(index)"></u-icon></view>
+				<view class="del_icon"><u-icon  name="minus-circle-fill" color="#EB4D3D" size="40" @click="delItem(index)"></u-icon></view>
 			</view>
 			<view class="item" style="vertical-align: top;">
 				<view class="item_add" @click="openSel"><u-icon name="plus-circle-fill" color="#007AFF" size="32"></u-icon></view>

+ 81 - 32
pages2/plan/edit.vue

@@ -430,7 +430,7 @@ export default {
 	overflow: hidden;
 }
 </style>
-<style scope>
+<style scope lang="scss">
 .dis_ss {
 	display: flex;
 	align-items: center;
@@ -462,34 +462,61 @@ export default {
 }
 .form {
 	padding: 0 16rpx !important;
-	margin-top: 30rpx;
+	margin-top: 16rpx;
 }
 input {
 	text-align: right;
 }
 .popup_item {
 	width: 100%;
-	height: 182rpx;
-	background: #ffffff;
-	box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(145, 156, 178, 0.1);
 	border-radius: 32rpx;
-	margin: 20rpx 0;
-	padding: 10rpx;
+	margin: 10rpx 0;
+	padding: 0 20rpx;
 	display: flex;
+	
+	.course_item {
+		display: flex;
+		align-items: center;
+		width:660rpx;
+		padding:26rpx;
+		
+		&.selected {
+			background:#EBF5FF;
+			border-radius: 24rpx;
+		}
+	}
 }
 .popup_list {
-	height: 500rpx;
+	position:relative;
+	flex:1;
 	padding: 0 20rpx;
+	
+	.list_in {
+		position: absolute;
+		left:0;
+		top:0;
+		width:100%;
+		height:100%;
+		overflow: scroll;
+	}
 }
-.title_l {
-	width: 88rpx;
-	height: 48rpx;
-	background: #32467b;
-	border-radius: 16rpx;
-	font-size: 28rpx;
-	color: #ffffff;
-	text-align: center;
-	line-height: 48rpx;
+.submit_wrap {
+	border-top:1px solid #eee;
+	background:#fff;
+	padding:18rpx 0;
+	
+	
+	.title_l {
+		margin:0 auto;
+		text-align: center;
+		line-height: 64rpx;
+		width: 200rpx;
+		height: 64rpx;
+		background: linear-gradient(0deg, #015EEA, #00C0FA);
+		border-radius: 32rpx;
+		color:#fff;
+		font-size: 30rpx;
+	}
 }
 .title_r {
 	font-size: 30rpx;
@@ -497,50 +524,72 @@ input {
 	font-weight: bold;
 	color: #2f4379;
 }
-.popup_title {
-	width: 100%;
-	margin: 40rpx;
+.grade {
+	font-size: 24rpx;
+	color: #999999;
+	margin: 0 auto;
+	margin: 10rpx 0;
+	text-align: center;
+}
+.line1 {
+	width: 80rpx;
+	height: 8rpx;
+	background: #999999;
+	border-radius: 4rpx;
+	margin: 0 auto;
+	margin-top: 15rpx;
 }
 .popup_box {
-	height: 600rpx;
+	height: 680rpx;
+	display: flex;
+	flex-direction: column;
 }
 .del_icon {
+	border-radius:50%;
+	overflow: hidden;
+	background:rgba(255,54,87,1);
+	width: 30rpx;
+	height: 30rpx;
 	position: absolute;
 	right: -15rpx;
 	top: -15rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	
 }
 .item_add {
 	background: #f9f9f9;
-	border-radius: 32rpx;
+	border-radius: 14rpx;
 	width: 100%;
-	height: 150rpx;
+	height: 134rpx;
 	text-align: center;
-	line-height: 150rpx;
+	line-height: 134rpx;
 }
 .item text {
 	font-size: 24rpx;
 	color: #0c141f;
+	
 }
 .item image {
-	border-radius: 32rpx;
+	border-radius: 14rpx;
 	width: 100%;
-	height: 150rpx;
+	height: 134rpx;
 }
 .item {
-	width: 46%;
+	width:278rpx;
 	display: inline-block;
-	margin: 1% 2%;
 	position: relative;
+	margin-right:16rpx;
 }
 .list_box {
 	width: 100%;
 	background: #ffffff;
-	box-shadow: 0rpx 0rpx 1rpx 4rpx rgba(145, 156, 178, 0.1);
-	border-radius: 32rpx;
-	padding: 20rpx 0;
+	border-radius: 16rpx;
+	padding: 24rpx;
 }
 
 page {
-	background: #ffffff;
+	background:rgba(234,238,241,1)
 }
 </style>

+ 11 - 8
pages2/plan/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding: 30rpx;">
+	<view style="padding: 16rpx;">
 		<view v-if="havePlan">
 			<view class="card" v-if="havePlan">
 				<view class="date_t1">
@@ -327,6 +327,7 @@ export default {
 			console.log(this.calendarStudyVo.miniDayStudyList,789)
 			this.calendarStudyVo.miniDayStudyList = this.calendarStudyVo.dayStudyList.slice(start, start + 7);
 			this.showDayList = this.calendarStudyVo.miniDayStudyList;
+			console.log(this.showDayList)
 		},
 		jumpDetail(item) {
 			this.$navTo.togo('/pages2/wd/course', {
@@ -477,15 +478,16 @@ export default {
 	background: #eb4d3d;
 }
 .operate_img {
-	width: 45rpx;
-	height: 45rpx;
+	width: 64rpx;
+	height: 64rpx;
 	border-radius: 50%;
-	padding: 20rpx;
+	padding:14rpx;
+	box-sizing: border-box;
 	margin: 10rpx 0;
 }
 .operate {
-	height: 418rpx;
-	width: 90rpx;
+	margin-top:16rpx;
+	width: 80rpx;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -538,8 +540,9 @@ export default {
 	min-height: 418rpx;
 	box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(47, 67, 121, 0.05);
 	border-radius: 24rpx;
-	margin-top: 20rpx;
+	margin-top: 16rpx;
 	padding: 15rpx;
+	background:#fff;
 }
 .date_dot {
 	width: 6rpx;
@@ -634,6 +637,6 @@ export default {
 	padding-bottom: 20rpx;
 }
 page {
-	background: #fdfdfd;
+	background: rgba(234,238,241,1);
 }
 </style>