Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pages.json

common/styles/global/components.scss

@@ -54,461 +54,6 @@ view{box-sizing: border-box;}
 .lli-tl{text-align: left;}
 .lli-tc{text-align: center;}
 .lli-tr{text-align: right;}
-
-/*****describe:考试-单选题-组件 author: TX  date:2024-06-24*****/
-.mta-question-radio {
-  margin: 24px 20px 0 20px;
-  //max-height: calc(100vh - 160px);
-  overflow-y: auto;
-  word-break: break-word;
-  white-space: pre-wrap;
-  font-family: "PingFang SC, element-icons, Helvetica Neue, Helvetica, Hiragino Sans GB, Microsoft YaHei, 微软雅黑, Arial, sans-serif";
-  color: #333;
-  .row1-col-num{
-    flex-shrink: 0;
-  }
-  .row1 {
-    &-col {
-      display: flex;
-      justify-content: flex-start;
-      flex-direction: row;
-
-      &-num {
-        margin-right: 5px;
-      }
-    }
-  }
-
-  &__group {
-    margin: 18px 16px 0 16px;
-    &.showError {
-      .van-radio {
-        .isActive {
-          background-color: red;
-        }
-      }
-    }
-    .van-radio {
-      position: relative;
-      margin-bottom: 24px;
-      color: #666;
-      font-size: 14px;
-
-      .radio-item {
-        background-color: #fff;
-        width: 20px;
-        display: inline-block;
-        border-radius: 50%;
-        font-size: 14px;
-        line-height: 20px;
-        text-align: center;
-        border: 1px solid #ccc;
-        position: absolute;
-        top: 0px;
-        left: 0;
-      }
-
-      .van-radio__label {
-        margin-left: 30px;
-        line-height: 22px;
-
-        .radio-text {
-          text-align: justify;
-        }
-      }
-
-      .isActive {
-        color: #fff;
-        background-color: #0856e6;
-        border: none;
-      }
-    }
-
-  }
-
-  img {
-    max-width: 100%
-  }
-}
-
-/*****describe:考试-多选题-组件 author: TX  date:2024-06-24*****/
-.mta-question-checkbox {
-  margin: 24px 20px 0 20px;
-  //max-height: calc(100vh - 160px);
-  overflow-y: auto;
-  word-break: break-word;
-  color: #333;
-  .row1-col-num{
-    flex-shrink: 0;
-  }
-  .row1 {
-    &-col {
-      display: flex;
-      justify-content: flex-start;
-      flex-direction: row;
-
-      &-num {
-        margin-right: 5px;
-      }
-    }
-  }
-
-  &__group {
-    margin: 18px 16px 0 16px;
-
-    &.showError {
-      .van-checkbox {
-        .isActive {
-          background-color: red;
-        }
-      }
-    }
-
-    .van-checkbox {
-      position: relative;
-      margin-bottom: 24px;
-      color: #666;
-      font-size: 14px;
-
-      .checkbox-item {
-        background-color: #fff;
-        width: 20px;
-        display: inline-block;
-        //border-radius: 50%; //  describe: 修改bug区分单选和多选 author: Wgy date:2019-09-18
-        font-size: 14px;
-        line-height: 20px;
-        text-align: center;
-        border: 1px solid #ccc;
-        position: absolute;
-        top: 0px;
-        left: 0;
-      }
-
-      .van-checkbox__label {
-        margin-left: 30px;
-        line-height: 22px;
-
-        .radio-text {
-          text-align: justify;
-        }
-      }
-
-      .isActive {
-        color: #fff;
-        background-color: #0856e6;
-        border: none;
-      }
-    }
-  }
-
-  img {
-    max-width: 100%
-  }
-}
-
-/*****describe:考试-判断题-组件 author: TX  date:2024-06-24*****/
-.mta-question-panduan {
-  margin: 24px 20px 0 20px;
-  //max-height: calc(100vh - 160px);
-  overflow-y: auto;
-  word-break: break-word;
-  color: #333;
-  .row1-col-num{
-    flex-shrink: 0;
-  }
-
-  .row1 {
-    &-col {
-      display: flex;
-      justify-content: flex-start;
-      flex-direction: row;
-
-      &-num {
-        margin-right: 5px;
-      }
-    }
-  }
-
-  &__group {
-    /*margin-left: 5px;*/
-    margin: 18px 16px 0 16px;
-
-    &.showError {
-      .van-radio {
-        .van-radio__icon--checked .van-icon {
-          background-color: red;
-        }
-      }
-    }
-
-    .van-radio {
-      position: relative;
-      margin-bottom: 24px;
-      color: #666;
-      font-size: 14px;
-
-      .radio-item {
-        background-color: #fff;
-        width: 20px;
-        display: inline-block;
-        border-radius: 50%;
-        font-size: 14px;
-        line-height: 20px;
-        text-align: center;
-        border: 1px solid #ccc;
-        position: absolute;
-        top: 0;
-        left: 0;
-      }
-
-      .van-radio__label {
-        margin-left: 30px;
-
-        .radio-text {
-          text-align: justify;
-        }
-      }
-
-      .van-radio__icon--checked .van-icon {
-        background: #0856e6;
-        border-color:#0856e6;
-      }
-    }
-
-  }
-
-  .van-radio__icon--disabled.van-radio__icon--checked .van-icon {
-    color: #ffffff;
-    background: #0856e6;
-    border-color:#0856e6;
-  }
-
-  img {
-    max-width: 100%
-  }
-}
-
-/*****describe:考试-填空题-组件 author: TX  date:2024-06-24*****/
-.mta-question-tiankong {
-  margin: 24px 20px 0 20px;
-  text-align: justify;
-  //max-height: calc(100vh - 160px);
-  overflow-y: auto;
-  word-break: break-word;
-  color: #333;
-  .row1-col-num{
-    flex-shrink: 0;
-  }
-
-  &-wrap.showError {
-    .van-field__control {
-      color: red;
-    }
-  }
-
-  .row1 {
-    &-col {
-      display: flex;
-      justify-content: flex-start;
-      flex-direction: row;
-
-      &-num {
-        margin-right: 5px;
-      }
-
-    }
-  }
-
-  &-content {
-    line-height: 28px;
-    margin-bottom: 10px;
-  }
-
-  .mta-tiankong-input {
-    line-height: 22px;
-    box-sizing: border-box;
-    min-width: 0;
-    margin: 0;
-    padding: 0;
-    color: #323233;
-    text-align: left;
-    border: 0;
-    resize: none;
-    background: #FFF;
-    border-radius: 4px;
-    padding-left: 8px;
-  }
-
-  .noContent {
-    //background-color: @components-color;
-    border: 1px solid #ccc;
-
-
-    &::-webkit-input-placeholder {
-      color: #FFF;
-
-    }
-
-  }
-
-  img {
-    max-width: 100%
-  }
-
-  .tiankong-box {
-  }
-}
-
-/*****describe:考试-简答题-组件 author: TX  date:2024-06-24*****/
-.mta-question-jianda {
-  margin: 24px 20px 0px 20px;
-  //max-height: calc(100vh - 160px);
-  overflow-y: auto;
-  word-break: break-word;
-  color: #333;
-  .row1-col-num{
-    flex-shrink: 0;
-  }
-
-  .row1 {
-
-    &-col {
-      display: flex;
-      justify-content: flex-start;
-      flex-direction: row;
-
-      &-num {
-        margin-right: 5px;
-      }
-
-    }
-  }
-
-  .row2 {
-    margin: 16px 16px 26px 16px;
-
-    &-col {
-      .van-field {
-        border-radius: 4px;
-      }
-    }
-
-  }
-
-  .noContent {
-    //background-color: @components-color;
-    border: 1px solid #ccc;
-    .van-field__control {
-      &::-webkit-input-placeholder {
-        color: #fff;
-      }
-    }
-  }
-
-  .van-field--disabled .van-field__control, .van-field__right-icon {
-    color: #333;
-  }
-
-  img {
-    max-width: 100%
-  }
-  .upload-image {
-    .my-ul {
-      .van-icon-delete{
-        margin: 0 10px;
-      }
-    }
-    //图片最大数量提示
-    .photo-tip{
-      color: #999;
-      font-size: 10px;
-      margin: 0;
-      padding: 0;
-      width: 100%;
-    }
-    .van-button--normal{
-      margin: 16px 0;
-    }
-  }
-}
-
-/*****describe:考试-阅读题-组件 author: TX  date:2024-06-24*****/
-.mta-question-yuedu {
-  margin: 24px 20px 0px 20px;
-  //max-height: calc(100vh - 160px);
-  overflow-y: auto;
-  word-break: break-word;
-  color: #333;
-
-  // 浮层
-  .button-next-tip{
-    position: absolute;bottom:36px;right:0;pointer-events: none;
-    i{display:inline-block; border-width:10px; border-style:solid dashed dashed; border-color:#646566 transparent transparent ;font-size:0; line-height:0;right: 12px;position: absolute;}
-    p{background: #646566;color: #fff;border-radius: 10px;margin: 0;padding: 16px;width: 130px;text-align: center;}
-  }
-  // 置灰隐藏
-  .swiper-button-disabled .button-next-tip{display: none;}
-  // 关闭按钮
-  .button-next-em{width: 22px;height: 22px;position: absolute;right: 4px;top: -80px;background-image: url("../../assets/images/icons/close.svg");background-repeat: no-repeat;background-position: center;z-index: 9;}
-
-
-  .row1-col-num{
-    flex-shrink: 0;
-  }
-  .yuedu-question-row {
-    max-height: 50%;
-    overflow-y: auto;
-
-    &-num {
-      margin-right: 5px;
-      /*margin-top: 14px;*/
-    }
-
-    &-col {
-      display: flex;
-      justify-content: flex-start;
-      flex-direction: row;
-      word-break: break-all;
-      margin: 24px 20px 0 20px;
-    }
-  }
-
-  .yuedu-content-row {
-    max-height: 50%;
-
-
-    &-main {
-      width: 100%;
-      height: 100%;
-    }
-
-    &-swiper {
-      width: 100%;
-      height: 100%;
-      overflow-y: auto;
-
-      .swiper-button-prev {
-        height: 20px;
-        width: 26px;
-        top: 60%
-      }
-
-      .swiper-button-next {
-        height: 20px;
-        width: 26px;
-        top: 60%
-      }
-      .swiper-button-next,.swiper-button-prev{
-        outline: none;
-        &:active,&:focus-visible,&:hover,&:focus,&:visited,&:focus-within,&:target{outline: none;}
-      }
-    }
-  }
-
-  img {
-    max-width: 100%
-  }
-}
 
 /*****音频播放器 author: TX  date:2024-06-24*****/
 .MtaBusAudioPlayerBox{
@@ -532,8 +77,13 @@ view{box-sizing: border-box;}
 .lli-status-box{
   display: flex;justify-content: space-around;background: #fff;
   border-bottom:1px solid #f2f1f2;padding: 15px 10px;
-  label{text-align: center;color: #333333;position: relative;}
-  label.click:before{content: '';position: absolute;height: 2px;width: 80%;bottom: -15px;font-size: 14px;
+  .status-item{text-align: center;color: #333333;position: relative;}
+  .status-item.click:before{content: '';position: absolute;height: 2px;width: 80%;bottom: -15px;font-size: 14px;
 	background-color: $uni-primary;
     left: 10%;border-radius: 2px;}
+}
+
+/*****开发中，敬请期待 author: TX  date:2024-06-25*****/
+.lli-develop-expect-page{
+	    height: 100vh;display: flex;align-items: center;justify-content: center;font-size: 36rpx;color: #666;
 }

pages.json

@@ -14,24 +14,38 @@
 		},
 		{
 			"path" : "pages/exam/index",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "考试"
 			}
 		},
 		{
 			"path" : "pages/my/index",
-			"style" : 
+			"style" :
 			{
-				"navigationBarTitleText" : ""
+				"navigationBarTitleText" : "我的"
 			}
 		},
 		{
 			"path" : "pages/demo/index",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "demo"
 			}
+		},
+		{
+			"path" : "pages/course/index",
+			"style" :
+			{
+				"navigationBarTitleText" : "课程"
+			}
+		},
+		{
+			"path" : "pages/score/index",
+			"style" :
+			{
+				"navigationBarTitleText" : "成绩"
+			}
 		}
 	],
 	"tabBar": {
@@ -53,12 +67,17 @@
 				"selectedIconPath": "static/images/tabbar/select/exam-sj.png",
 				"text": "考试"
 			}, {
-				"pagePath": "pages/login",
+				"pagePath": "pages/course/index",
 				"iconPath": "static/images/tabbar/unselect/kecheng-sj.png",
 				"selectedIconPath": "static/images/tabbar/select/kecheng-sj.png",
 				"text": "课程"
 			}, {
 				"pagePath": "pages/demo/index",
+				"iconPath": "static/images/tabbar/unselect/score-sj.png",
+				"selectedIconPath": "static/images/tabbar/select/score-sj.png",
+				"text": "成绩"
+			}, {
+				"pagePath": "pages/my/index",
 				"iconPath": "static/images/tabbar/unselect/my-sj.png",
 				"selectedIconPath": "static/images/tabbar/unselect/my-sj.png",
 				"text": "我的"

pages/course/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view class="lli-develop-expect-page">
+		开发中，敬请期侍！
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/demo/index.vue

@@ -2,14 +2,11 @@
 	<view class="lli-demo-page">
 		<uni-search-bar class="uni-mt-10" radius="100" placeholder="请输入考试名称" bgColor="#F3F3F4" clearButton="auto" cancelButton="none" @confirm="search"/>
 		<view class="lli-status-box">
-		    <span class="click">可以考试</span><span>已结束</span>
+		    <text class="status-item click">可以考试</text><text class="status-item">已结束</text>
 		</view>
 		<scroll-view class="demo-scroll-view" scroll-y="true">
 			<view class="content-view">
-				<view class="lli-tc demo-title">------------uni带的primary按钮-------------</view>
-				<button type="primary">页面主操作 Normal</button>
-				<button type="primary" loading="true">页面主操作 Loading</button>
-				<button type="primary" disabled="true">页面主操作 Disabled</button>
+				
 				<view class="lli-tc demo-title">------------咱们要用的默认按钮↓-------------</view>
 				<button class="lli-btn">页面次要操作 Normal</button>
 				<button class="lli-btn" loading="true" >页面主操作 Loading</button>
@@ -27,6 +24,11 @@
 							<checkbox value="cb" />未选中
 						</label>
 					</checkbox-group>
+					<view class="lli-tc demo-title">------------扩展组件-------------</view>
+						
+					<uni-section title="自定义样式" subTitle="使用 styles 属性 ,可以自定义输入框样式" type="line" padding>
+								<uni-easyinput v-model="value" placeholder="请输入内容"@input="input"></uni-easyinput>
+							</uni-section>
 			</view>
 		</scroll-view>
 	</view>
@@ -36,7 +38,7 @@
 	export default {
 		data() {
 			return {
-				
+				value:'',
 			}
 		},
 		methods: {
@@ -54,6 +56,11 @@
 		.content-view{padding: 24px;box-sizing: border-box;}
 		.demo-title{margin: 24px 0 10px;}
 	}
-	
+	/* 小程序UI开发规范 */
+	/*  1.第一版没有UI,用手机单机版的UI开发,尽可能保持一致
+		2.页面中样式第一版都先写到底部style中
+		2.扩展组件:已重置样式,可以直接用
+		3.内置组件:如果是有颜色的,需要添加color="#0550e5"(后期会改成动态的,第一版先这么加),btn也可以用demo写好的
+		4.自己写的样式尽量只用view,text标签,使用类选择器不要使用标签选择器 */
 </style>
 

pages/my/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		我的
+	<view class="lli-develop-expect-page">
+		开发中，敬请期侍！
 	</view>
 </template>
 

pages/score/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view class="lli-develop-expect-page">
+		开发中，敬请期侍！
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>