Просмотр исходного кода

课程类型,需要在具体的页面展现出来区分

tanxue 9 часов назад
Родитель
Сommit
bc6c6c310e
3 измененных файлов с 27 добавлено и 7 удалено
  1. 13 5
      common/styles/global/pages.scss
  2. 6 0
      pages/admin/Jiazheng/kechengBind.vue
  3. 8 2
      pages/admin/Kecheng/list.vue

+ 13 - 5
common/styles/global/pages.scss

@@ -264,7 +264,12 @@
 			.kc-totalTm{margin-left: 0;}
 			.kc-totalTm{margin-left: 0;}
 			.kc-fenlei{width: 360rpx;margin-left: 0;@include single-line-ellipsis();}
 			.kc-fenlei{width: 360rpx;margin-left: 0;@include single-line-ellipsis();}
 			.kc-name{width: 360rpx;@include single-line-ellipsis();}
 			.kc-name{width: 360rpx;@include single-line-ellipsis();}
-			img{width: 300rpx;height: 210rpx;margin-right: 32rpx;border-radius: 8rpx;flex-shrink: 0;}
+			img{width: 300rpx;height: 210rpx;margin-right: 24rpx;border-radius: 8rpx;flex-shrink: 0;}
+			.lx-sj-row{
+				display: flex;
+				.kc-fenlei{width: 160rpx;}
+				.kc-totalTm{max-width: 224rpx;@include single-line-ellipsis();}
+			}
 		}
 		}
 	}
 	}
 	
 	
@@ -280,7 +285,8 @@
 		.ks-totalTm-row{display: flex;align-items: center;}
 		.ks-totalTm-row{display: flex;align-items: center;}
 		.ks-totalTm {font-size: 26rpx;color: #333;margin-bottom: 20rpx;line-height: 1;margin-left: 40rpx;}
 		.ks-totalTm {font-size: 26rpx;color: #333;margin-bottom: 20rpx;line-height: 1;margin-left: 40rpx;}
 		.phone-time-icon,.phone-cishu-icon,.phone-zongfen-icon,.phone-jigefen-icon,
 		.phone-time-icon,.phone-cishu-icon,.phone-zongfen-icon,.phone-jigefen-icon,
-		.phone-defen-icon,.phone-tel-icon,.phone-user-icon,.phone-fenlei-icon{width: 24rpx;height: 24rpx;@include ezy-no-repeat-cover();
+		.phone-defen-icon,.phone-tel-icon,.phone-user-icon,.phone-fenlei-icon,
+		.phone-leixing-icon{width: 24rpx;height: 24rpx;@include ezy-no-repeat-contain();
 		vertical-align: top;margin-right: 10rpx;flex-shrink: 0;}
 		vertical-align: top;margin-right: 10rpx;flex-shrink: 0;}
 		.phone-time-icon{background-image: url("@/static/images/common/time-icon.png");}
 		.phone-time-icon{background-image: url("@/static/images/common/time-icon.png");}
 		.phone-fenlei-icon{background-image: url("@/static/images/common/fenlei-icon.svg");}
 		.phone-fenlei-icon{background-image: url("@/static/images/common/fenlei-icon.svg");}
@@ -290,6 +296,7 @@
 		.phone-zongfen-icon{background-image: url("@/static/images/common/zongfen-icon.png");vertical-align: unset;}
 		.phone-zongfen-icon{background-image: url("@/static/images/common/zongfen-icon.png");vertical-align: unset;}
 		.phone-jigefen-icon{background-image: url("@/static/images/common/jigefen-icon.png");vertical-align: unset;}
 		.phone-jigefen-icon{background-image: url("@/static/images/common/jigefen-icon.png");vertical-align: unset;}
 		.phone-defen-icon{background-image: url("@/static/images/common/defen-icon.png");vertical-align: unset;}
 		.phone-defen-icon{background-image: url("@/static/images/common/defen-icon.png");vertical-align: unset;}
+		.phone-leixing-icon{background-image: url("@/static/images/common/leixing-icon.svg");}
 		.ks-score-content{
 		.ks-score-content{
 			width: 100%;font-size: 26rpx;margin-bottom: 20rpx;line-height: 1;
 			width: 100%;font-size: 26rpx;margin-bottom: 20rpx;line-height: 1;
 			display: flex;flex-direction: row;flex-wrap: nowrap;
 			display: flex;flex-direction: row;flex-wrap: nowrap;
@@ -1086,9 +1093,9 @@
 	.kc-notbind-scroll-view{height: calc(100vh - 158rpx - var(--status-bar-height));overflow-y: auto;}
 	.kc-notbind-scroll-view{height: calc(100vh - 158rpx - var(--status-bar-height));overflow-y: auto;}
 	.admin-list-box{
 	.admin-list-box{
 		.kecheng-list-card{
 		.kecheng-list-card{
-			.item-card-row {display: flex;flex-direction: column;justify-content: space-between;box-sizing: border-box;padding: 12rpx 0;}
+			.item-card-row {display: flex;flex-direction: column;justify-content: space-between;box-sizing: border-box;padding: 0;}
 			.bind-btn-row{display: flex;align-items:center;}
 			.bind-btn-row{display: flex;align-items:center;}
-			.kc-bind-btn {width: 160rpx;font-size: 26rpx;margin:0;line-height: 2.4;}
+			.kc-bind-btn {width: 160rpx;font-size: 26rpx;margin:0;line-height: 2.2;}
 			.kc-bind-btn + .kc-bind-btn{margin-left: 24rpx;}
 			.kc-bind-btn + .kc-bind-btn{margin-left: 24rpx;}
 		}
 		}
 	}
 	}
@@ -1725,12 +1732,13 @@
 			display: flex;flex-direction: column;justify-content: space-evenly;border: 1rpx solid #42c99c;
 			display: flex;flex-direction: column;justify-content: space-evenly;border: 1rpx solid #42c99c;
 			background-color: #fff;border-radius: 16rpx;margin-top: 24rpx;padding: 12rpx 0;
 			background-color: #fff;border-radius: 16rpx;margin-top: 24rpx;padding: 12rpx 0;
 			.kscx-card-row{display: flex;align-items: center;padding: 12rpx 24rpx;box-sizing: border-box;}
 			.kscx-card-row{display: flex;align-items: center;padding: 12rpx 24rpx;box-sizing: border-box;}
-			.user-icon,.tel-icon,.idcard-icon,.zy-icon,.data-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();margin-right: 20rpx;}
+			.user-icon,.tel-icon,.idcard-icon,.zy-icon,.data-icon,.bzjg-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();margin-right: 20rpx;}
 			.user-icon{background-image: url("@/static/images/common/user-green-icon.png");}
 			.user-icon{background-image: url("@/static/images/common/user-green-icon.png");}
 			.tel-icon{background-image: url("@/static/images/common/tel-green-icon.png");}
 			.tel-icon{background-image: url("@/static/images/common/tel-green-icon.png");}
 			.idcard-icon{background-image: url("@/static/images/common/zymc-icon.png");}
 			.idcard-icon{background-image: url("@/static/images/common/zymc-icon.png");}
 			.zy-icon{background-image: url("@/static/images/common/zy-icon.png");}
 			.zy-icon{background-image: url("@/static/images/common/zy-icon.png");}
 			.data-icon{background-image: url("@/static/images/common/date-icon.png");}
 			.data-icon{background-image: url("@/static/images/common/date-icon.png");}
+			.bzjg-icon{background-image: url("@/static/images/common/bzjg-icon.png");}
 		}
 		}
 	}
 	}
 }
 }

+ 6 - 0
pages/admin/Jiazheng/kechengBind.vue

@@ -31,6 +31,9 @@
 								<view class="ks-totalTm kc-fenlei">
 								<view class="ks-totalTm kc-fenlei">
 									<icon class="phone-fenlei-icon" />分类:{{item.kcClassifyName}}
 									<icon class="phone-fenlei-icon" />分类:{{item.kcClassifyName}}
 								</view>
 								</view>
+								<view class="ks-totalTm kc-fenlei" v-if="item.leixing === 1 || item.leixing === 2">
+									<icon class="phone-leixing-icon" />类型:{{ item.leixing === 1 ? 'A' : 'B' }}
+								</view>
 								<button class="kc-bind-btn phone-green-btn" type="default" size="mini"
 								<button class="kc-bind-btn phone-green-btn" type="default" size="mini"
 									@click.stop="toAdd(item)">绑定</button>
 									@click.stop="toAdd(item)">绑定</button>
 							</view>
 							</view>
@@ -50,6 +53,9 @@
 								<view class="ks-item-top">
 								<view class="ks-item-top">
 									<view class="kc-name">{{item.name}}</view>
 									<view class="kc-name">{{item.name}}</view>
 								</view>
 								</view>
+								<view class="ks-totalTm kc-fenlei" v-if="item.leixing === 1 || item.leixing === 2">
+									<icon class="phone-leixing-icon" />类型:{{ item.leixing === 1 ? 'A' : 'B' }}
+								</view>
 								<!-- <view class="ks-totalTm kc-fenlei">
 								<!-- <view class="ks-totalTm kc-fenlei">
 									<icon class="phone-fenlei-icon" />分类:{{item.kcClassifyName}}
 									<icon class="phone-fenlei-icon" />分类:{{item.kcClassifyName}}
 								</view> -->
 								</view> -->

+ 8 - 2
pages/admin/Kecheng/list.vue

@@ -33,9 +33,15 @@
 								<view class="ks-totalTm kc-fenlei">
 								<view class="ks-totalTm kc-fenlei">
 									<icon class="phone-fenlei-icon" />分类:{{item.kcClassifyName}}
 									<icon class="phone-fenlei-icon" />分类:{{item.kcClassifyName}}
 								</view>
 								</view>
-								<view class="ks-totalTm kc-totalTm">
-									<icon class="phone-time-icon" />时间:{{formatDuration(item.period)}}分钟
+								<view class="lx-sj-row">
+									<view class="ks-totalTm kc-fenlei" v-if="item.leixing === 1 || item.leixing === 2">
+										<icon class="phone-leixing-icon" />类型:{{ item.leixing === 1 ? 'A' : 'B' }}
+									</view>
+									<view class="ks-totalTm kc-totalTm">
+										<icon class="phone-time-icon" />时间:{{formatDuration(item.period)}}分钟
+									</view>
 								</view>
 								</view>
+								
 								<button @click="checkKecheng(item)" type="primary" size="mini"
 								<button @click="checkKecheng(item)" type="primary" size="mini"
 									class="item-view-btn">查看内容</button>
 									class="item-view-btn">查看内容</button>
 							</view>
 							</view>