Selaa lähdekoodia

修改评价码登录页、选科页的样式内容

lm 2 viikkoa sitten
vanhempi
commit
0312863285

+ 1 - 1
src/components/commonDictConvert.ts

@@ -23,7 +23,7 @@ export const subjectToColor = (subject)=>{
             return { name: '地理', color: '#9A60B4' }
         case '道法':
             return { name: '道法', color: '#FF869D' }
-        case '其他':
+        default:
             return { name: '其他', color: '#C495FA' }
     }
 }

+ 3 - 4
src/layout/components/AppMain.vue

@@ -23,15 +23,14 @@ export default {
 <style scoped lang="scss">
 .container {
     /* border:solid blue 2px; */
-
     flex: 1 1;
+    overflow: auto;
     position: relative;
     box-sizing: border-box;
     max-width: 100vw;
-    width: 100vw;
+    width: 100%;
     display: flex;
     justify-content: flex-start;
-    height: calc(100vh - 60px);
 
   .main_container {
     /* border:solid blue 2px; */
@@ -40,7 +39,7 @@ export default {
     flex: 1 1;
     padding: 20px;
     background: #F0F4FB;
-    height: calc(100vh - 60px);
+    height: 100%;
     overflow:auto;
   }
 }

+ 4 - 3
src/layout/index.vue

@@ -29,9 +29,10 @@ const horizontalNavList = computed(()=>{
 const finalHeader = computed(()=>{
   if(route.path.startsWith('/main')){
     return Header
-  }else if(route.path.startsWith('/app') && 
-           route.path !== '/app' && 
-           route.path !== '/app/' ){
+  }else if(route.path.startsWith('/app') 
+          && route.path !== '/app' 
+          && route.path !== '/app/' 
+        ){
     return AppHeader
   }
 })

+ 1 - 0
src/styles/common.scss

@@ -24,6 +24,7 @@ a{
   display: flex;
   flex-direction: column;
 
+  overflow: auto;
   position: relative;
   box-sizing: border-box;
   width: 100vw;

+ 10 - 10
src/views/appView/QuestionnaireElectiveSubject.vue

@@ -1,5 +1,5 @@
 <template>
-     <div class="app_container">
+     <div class="main_container">
         <!-- 顶部科目选择区域 -->
         <div class="section" v-if="electiveFormItm?.label">
             <div class="section_title">{{electiveFormItm?.label}}:</div>
@@ -282,19 +282,18 @@ onMounted( async()=>{
 
 
 <style lang="scss" scoped>
-.app_container {
+.main_container {
     display: flex;
     flex-direction: column;
     gap:calc(32 * var(--app-rpx));
-    
-    overflow: auto;
-    width: 100%;
-    min-height: 100vh;
-    background-color: #ffffff;
-    
-    // 44px塌陷 ___原因未找到———— 待完善
-    padding:calc(30 * var(--app-rpx)) calc(19 * var(--app-rpx)) calc((84 + 20 + 44) * var(--app-rpx)); /* 为底部按钮留出空间 */
 
+    background-color: #ffffff !important;
+
+    // 浏览器端的底部 工具栏高度   90 * var(--app-rpx))
+    // 手机微信 工具栏高度  不影响 __ 待完善
+    padding:calc(30 * var(--app-rpx)) 
+            calc(19 * var(--app-rpx)) 
+            calc((84 + 90 + 20) * var(--app-rpx)) !important; /* 为底部按钮留出空间 */
     > * {
         flex-shrink: 0;
     }
@@ -372,6 +371,7 @@ onMounted( async()=>{
 /* --- 底部按钮 --- */
 .bottom_action_bar {
     position: fixed;
+    // position: sticky;
     bottom: 0;
     left: 0;
     width: 100%;

+ 0 - 3
src/views/appView/QuestionnaireTaskListPage.vue

@@ -49,14 +49,11 @@ onMounted(()=>{
 
 <style lang="scss" scoped>
 .main_container{
-    flex-shrink: 0;
     align-items: center;
-    overflow: auto;
     background-color: #ffffff !important;
 
     .questionnaire_card{
         margin-top: calc(92 * var(--app-rpx));
-        flex-shrink: 0;
         display: flex;
         flex-direction: column;
         align-items: flex-start;

+ 4 - 5
src/views/appView/StudentEntry.vue

@@ -49,8 +49,6 @@ const handleEnter = async() => {
 <style lang="scss" scoped>
 .main_container {
     padding:0 !important;
-    overflow: auto;
-    height: 100%;
     background-color: #ffffff !important;
     > *{
         flex-shrink: 0;
@@ -71,9 +69,10 @@ const handleEnter = async() => {
       padding:calc(80 * var(--app-rpx)) calc(24 * var(--app-rpx)) calc(40 * var(--app-rpx));
 
       overflow: auto;
-        display: flex;
-        flex-direction: column;
-        gap: calc(80 * var(--app-rpx));
+
+      display: flex;
+      flex-direction: column;
+      gap: calc(80 * var(--app-rpx));
        
         .input-group {
             display: flex;