Merge branch 'master' of https://git.hshuishang.com/qiaojiale/fuxisheng

assets/css/info.css

@@ -242,7 +242,7 @@
 
 #hukouCounty,#nation,#graduateProvince,#graduateCity,#graduateCounty
 ,#special_i,#special_ii,#special_iii,#gaokaoEnrollProvince,
-#gaokaoEnrollCity,#gaokaoEnrollCounty,#preGroupId{
+#gaokaoEnrollCity,#gaokaoEnrollCounty,#preGroupId, #baomingSchoolProvince, #baomingSchoolCity, #baomingSchoolCounty{
     display: block;
     height: 38px;
     width: 100%;
@@ -261,6 +261,72 @@
 .df .layui-input-inline{
     flex: 1;
 }
+#upload1, #materialsUpload, #airlineUpload {
+    display: none;
+}
+.userImg, .materialsUserImg, .uploadAirlineUserImg {
+    padding: 30px 50px;
+    width: 150px;
+    height: 150px;
+    display: none;
+    position: relative;
+}
+.userImg img, .materialsUserImg img, .uploadAirlineUserImg img{
+    width: 100%;
+    height: 100%;
+}
+
+#close, #materialsClose, #uploadAirlineClose {
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 0px;
+    top: 0px;
+    z-index: 999;
+}
+.personPic{
+    display: flex;
+}
+.materials {
+
+}
+
+.specialContent, .gaokaoEnrollCity {
+    display: flex;
+}
+
+
+.captcha-container {
+    margin: 20px;
+    font-family: Arial, sans-serif;
+}
+.captcha-box {
+    display: inline-block;
+    padding: 10px;
+    background: #f0f0f0;
+    letter-spacing: 5px;
+    font-weight: bold;
+    user-select: none;
+}
+
+.yzmBox{
+    display: flex;
+    align-items: center;
+}
+.captcha-box{
+    /* flex: 1; */
+    margin-left: 20px;
+}
+
+
+.no-bottom {
+    margin-bottom: 0 !important;
+    flex: none !important;
+}
+
+
+
+
 
 @media (max-width:1000px) {
     .layui-header {
@@ -281,7 +347,13 @@
         overflow-y: auto;
     }
 
-   
+   .pic {
+    padding: 0 !important;
+    display: flex !important;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+   }
 
     .pic .layui-field-box{
         padding: 0 !important;
@@ -311,4 +383,37 @@
         width: 80px;
         height: 80px;
     }
+    .specialContent, .gaokaoEnrollCity {
+        display: block
+    }
+    .move {
+        display: flex !important;
+    }
+
+    .captcha-container {
+        margin: 20px;
+        font-family: Arial, sans-serif;
+    }
+    .captcha-box {
+        display: inline-flex;
+        padding: 10px;
+        align-items: center;
+        background: #f0f0f0;
+        letter-spacing: 5px;
+        font-weight: bold;
+        user-select: none;
+    }
+    
+    .yzmBox{
+        display: flex;
+        align-items: center;
+    }
+    .no-bottom {
+        margin-bottom: 0 !important;
+        width: 190px;
+        flex: none !important;
+    }
+    /* .captcha-box{
+        flex: 1;
+    } */
 }

assets/js/common.js

@@ -150,4 +150,4 @@ function getAgeByIdentity(identity) {
         age--;
     }
     return age;
-}
+}

assets/layui/css/layui.css

@@ -5401,4 +5401,4 @@ body .layui-util-face .layui-layer-content {
 .layui-anim-fadeout {
     -webkit-animation-name: layui-fadeout;
     animation-name: layui-fadeout
-}
+}

assets/layui/lay/modules/element.js

@@ -4446,4 +4446,4 @@
         e("jquery", pe)
     }),
     pe
-});
+});

assets/layui/lay/modules/form.js

@@ -400,4 +400,4 @@
     }),
     v.on("submit", r, d).on("click", "*[lay-submit]", d),
     e(l, f)
-});
+});

assets/layui/lay/modules/jquery.js

@@ -4446,4 +4446,4 @@
         e("jquery", pe)
     }),
     pe
-});
+});

assets/layui/lay/modules/layer.js

@@ -938,4 +938,4 @@
         o.run(e.jQuery),
         r.ready()
     }()
-}(window);
+}(window);

assets/layui/lay/modules/upload.js

@@ -380,4 +380,4 @@
     }
     ,
     e(r, a)
-});
+});

assets/layui/lay/modules/util.js

@@ -156,4 +156,4 @@
         }
     }(t, window),
     e("util", i)
-});
+});

assets/layui/layui.js

@@ -363,4 +363,4 @@
     }
     ,
     e.layui = new o
-}(window);
+}(window);

newCSS/finalExamScore.css

@@ -1,229 +1,117 @@
+
+
 @media (max-width:1000px) {
-    .layui-header {
+    .layui-header{
         display: none;
     }
-
-    .layui-side {
+    .layui-side{
         display: none;
     }
-
-    .layui-body {
+    .layui-body{
         position: relative !important;
         top: 0 !important;
         left: 0 !important;
     }
 
-    .layui-form-select .layui-input {
+    .layui-form-select .layui-input{
         border: none;
     }
 
-    .layui-inline .layui-form-label {
-        width: 112px !important;
+    .layui-inline .layui-form-label{
+        width: 110px !important;
         white-space: pre-line !important;
     }
-
-    .layui-inline {
+    .layui-inline{
         display: flex !important;
     }
-
-    .layui-input-inline {
+    .layui-input-inline{
         margin-left: 0 !important;
     }
 
-    .ml-30 img {
+    .ml-30 img{
         width: 90% !important;
-        height: 90% !important;
+        height: 90% !important; 
     }
 
-    .layui-field-box {
+    .layui-field-box{
         display: flex;
         align-items: center;
         justify-content: center;
     }
 
-    .df2 {
+    .df2{
         display: flex;
         justify-content: center;
     }
-
-    .layui-input,
-    .layui-textarea {
+    .layui-input, .layui-textarea{
         width: 100% !important;
         border: none !important;
     }
-
-    .layui-inline {
-        border-bottom: 0;
+    .layui-inline{
+        border-bottom: 1px solid #DDD;
+        width: 90% !important;
         margin: 0 auto !important;
     }
-
-    .layui-form-item .layui-form-label {
+    .layui-form-item .layui-form-label{
         text-align-last: left;
     }
-
-    .layui-form-item .layui-input-inline {
+    .layui-form-item .layui-input-inline{
         margin-bottom: 0;
-        flex: 1;
     }
 
-    #checkScoreType1 {
+    #checkScoreType1{
         border: 1px solid #ddd !important;
         width: 100% !important;
     }
 
     .df {
         display: flex !important;
+        width: 90%;
         margin: 0 auto;
         margin-bottom: 15px;
     }
-
-    .layui-inline {
-        width: 100% !important;
-        display: flex !important;
-        align-items: center;
-    }
-
-    .layui-field-title .layui-field-box {
-        padding: 0 !important;
-    }
-
-    .layui-input-block {
-        display: flex;
-        justify-content: center;
-    }
+    
 }
 
-.pd-20 {
+.pd-20{
     padding: 0;
 }
-
-.layui-header {
+.layui-header{
     border-bottom: 1px solid #1E9FFF;
 }
-
-img {
+img{
     width: 100%;
     height: 100%;
     display: block;
 }
 
-.ml-30 img {
+.ml-30 img{
     width: 400px;
     height: 400px;
 }
 
-.layui-form-label {
-    width: 85px !important;
+.layui-form-label{
+    width: 85px  !important;
 }
 
-.layui-input-block {
+.layui-input-block{
     margin-left: 0;
 }
 
-.df {
+.df{
     display: flex !important;
 }
 
-.flex1 {
+.flex1{
     flex: 1;
 }
 
-#upload {
+#upload{
     width: 50px;
     height: 50px;
     margin: 0 auto;
 }
 
-.layui-input,
-.layui-textarea {
+.layui-input, .layui-textarea{
     width: 100%;
-}
-
-.personPic {
-    display: flex;
-}
-
-#upload1 {
-    display: none;
-}
-
-.userImg {
-    padding: 30px 50px;
-    width: 150px;
-    height: 150px;
-    display: none;
-    position: relative;
-}
-
-.userImg img {
-    width: 100%;
-    height: 100%;
-}
-
-#close {
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    right: 0px;
-    top: 0px;
-    z-index: 999;
-}
-
-.layui-form input[type=checkbox],
-.layui-form input[type=radio],
-.layui-form select {
-    display: block;
-    display: block;
-    height: 38px;
-    width: 100%;
-    box-shadow: none;
-    border: 1px solid #e6e6e6;
-    margin-top: 10px;
-}
-
-.layui-form-select .layui-input {
-    display: none !important;
-}
-
-.layui-edge {
-    display: none !important;
-}
-
-.score-content {
-    display: none;
-}
-
-.layui-input-inline input {
-    width: 100%;
-}
-
-
-#upload2 {
-    display: none;
-}
-
-.userImg2 {
-    padding: 30px 50px;
-    width: 150px;
-    height: 150px;
-    display: none;
-    position: relative;
-}
-
-.userImg2 img {
-    width: 100%;
-    height: 100%;
-}
-
-#close2 {
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    right: 0px;
-    top: 0px;
-    z-index: 999;
-}
-
-.layui-nav-item {
-    cursor: pointer;
 }