Merge branch 'master' of http://git.cc-lotus.info/ball-court/ball-applet

pagesSchool/schAdmin/coach/add.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
   background-color: var(--mainColor);
 

pagesSchool/schAdmin/coach/list.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/coachexam/list.less

@@ -1,3 +1,5 @@
+@import (css) "/app.wxss";
+
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/coachexam/list.wxss

@@ -1,130 +1,109 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    display: flex;
-    flex-direction: row;
-    padding: 2vw;
-    border-bottom: 1px solid var(--f1Color);
+  display: flex;
+  flex-direction: row;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f1Color);
 }
-
 .main .one .one_1 {
-    flex-grow: 1;
+  flex-grow: 1;
 }
-
 .main .one .one_1 input {
-    padding: 1vw 0 2vw 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 1vw 0 2vw 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .one .one_2 {
-    width: 20vw;
+  width: 20vw;
 }
-
 .main .one .one_2 button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
+  flex-grow: 1;
+  position: relative;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 2vw 2vw 0;
-    border-radius: 10px;
-    border: 1px dashed var(--blackColor);
-}
-
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 2vw 2vw 0;
+  border-radius: 10px;
+  border: 1px dashed var(--blackColor);
+}
 .main .two .list .list_1 {
-    display: flex;
-    flex-direction: row;
-    margin: 0 0 2vw 0;
-    border: 2px dashed var(--blackColor);
-    border-radius: 10px;
+  display: flex;
+  flex-direction: row;
+  margin: 0 0 2vw 0;
+  border: 2px dashed var(--blackColor);
+  border-radius: 10px;
 }
-
 .main .two .list .list_1 .icon {
-    width: 18vw;
-    height: 18vw;
-    margin-top: 2vw;
-    margin-left: 2vw;
+  width: 18vw;
+  height: 18vw;
+  margin-top: 2vw;
+  margin-left: 2vw;
 }
-
 .main .two .list .list_1 .icon image {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: var(--f85Color);
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background-color: var(--f85Color);
 }
-
 .main .two .list .list_1 .content {
-    display: flex;
-    flex-direction: column;
-    margin: 0 0 0 3vw;
+  display: flex;
+  flex-direction: column;
+  margin: 0 0 0 3vw;
 }
-
 .main .two .list .list_1 .content .name {
-    font-weight: 700;
-    font-size: var(--font18Szie);
-    color: var(--blackColor);
-    margin: 1vw 0;
+  font-weight: 700;
+  font-size: var(--font18Szie);
+  color: var(--blackColor);
+  margin: 1vw 0;
 }
-
 .main .two .list .list_1 .content .other {
-    font-size: var(--font15Size);
-    color: var(--f85Color);
-    margin: 0.5vw 0 1vw 0;
+  font-size: var(--font15Size);
+  color: var(--f85Color);
+  margin: 0.5vw 0 1vw 0;
 }
-
 .main .two .list .list_1 .content .other text {
-    color: var(--redColor);
+  color: var(--redColor);
 }
-
 .main .two .list .btn {
-    display: flex;
-    flex-direction: row;
+  display: flex;
+  flex-direction: row;
 }
-
 .main .two .list .btn button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
-    color: var(--whiteColor);
-    border-radius: 50px;
-    margin: 0 2vw;
-    background-color: #35d4bd;
-    box-sizing: content-box;
-    border: 2px dashed var(--whiteColor);
-}
-
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
+  color: var(--whiteColor);
+  border-radius: 50px;
+  margin: 0 2vw;
+  background-color: #35d4bd;
+  box-sizing: content-box;
+  border: 2px dashed var(--whiteColor);
+}
 .main .two .list .btn button:nth-child(2n) {
-    background-color: #f860df;
+  background-color: #f860df;
 }
-
 .main .two .list .btn button:last-child {
-    background-color: #FF7F50;
+  background-color: #FF7F50;
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/schAdmin/coachprofit/list.less

@@ -0,0 +1 @@
+@import (css) "/app.wxss";

pagesSchool/schAdmin/coachprofit/list.wxss

@@ -0,0 +1 @@
+@import "/app.wxss";

pagesSchool/schAdmin/course/add.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/course/coachadd.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/course/coachlist.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/course/info.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/course/list.less

@@ -1,7 +1,10 @@
+
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);
 
+
     .one {
         display: flex;
         flex-direction: column;

pagesSchool/schAdmin/courseexam/info.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/courseexam/info.wxss

@@ -1,57 +1,47 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
-    height: var(--twoHeight);
+  background-color: var(--mainColor);
+  height: var(--twoHeight);
 }
-
 .main .two {
-    position: relative;
-    flex-grow: 1;
+  position: relative;
+  flex-grow: 1;
 }
-
 .main .two .a {
-    height: 83vh;
+  height: 83vh;
 }
-
 .main .two .a .one {
-    flex-grow: 1;
-    position: relative;
-    height: 81vh;
+  flex-grow: 1;
+  position: relative;
+  height: 81vh;
 }
-
 .main .two .a .one .content {
-    display: flex;
-    flex-direction: row;
-    border-bottom: 1px dashed var(--f1Color);
-    padding: 2vw 0;
-    margin: 0 2vw 2vw 2vw;
+  display: flex;
+  flex-direction: row;
+  border-bottom: 1px dashed var(--f1Color);
+  padding: 2vw 0;
+  margin: 0 2vw 2vw 2vw;
 }
-
 .main .two .a .one .content .value {
-    flex-grow: 1;
-    color: var(--blackColor);
+  flex-grow: 1;
+  color: var(--blackColor);
 }
-
 .main .two .a .one .content .value textarea {
-    position: static;
-    width: 73vw;
+  position: static;
+  width: 73vw;
 }
-
 .main .two .a .one .content .value image {
-    width: 100px;
-    height: 100px;
+  width: 100px;
+  height: 100px;
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/schAdmin/courseexam/list.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/courseexam/list.wxss

@@ -1,155 +1,130 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    display: flex;
-    flex-direction: row;
-    padding: 2vw;
-    border-bottom: 1px solid var(--f1Color);
+  display: flex;
+  flex-direction: row;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f1Color);
 }
-
 .main .one .one_1 {
-    flex-grow: 1;
+  flex-grow: 1;
 }
-
 .main .one .one_1 input {
-    padding: 1vw 0 2vw 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 1vw 0 2vw 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .one .one_2 {
-    width: 20vw;
+  width: 20vw;
 }
-
 .main .one .one_2 button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
+  flex-grow: 1;
+  position: relative;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 2vw 2vw 0;
-    border-radius: 10px;
-    border: 1px dashed var(--blackColor);
-}
-
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 2vw 2vw 0;
+  border-radius: 10px;
+  border: 1px dashed var(--blackColor);
+}
 .main .two .list .list_1 {
-    display: flex;
-    flex-direction: row;
-    margin: 0 0 2vw 0;
-    border: 2px dashed var(--blackColor);
-    border-radius: 10px;
+  display: flex;
+  flex-direction: row;
+  margin: 0 0 2vw 0;
+  border: 2px dashed var(--blackColor);
+  border-radius: 10px;
 }
-
 .main .two .list .list_1 .icon {
-    width: 18vw;
-    height: 18vw;
-    margin-top: 2vw;
-    margin-left: 2vw;
+  width: 18vw;
+  height: 18vw;
+  margin-top: 2vw;
+  margin-left: 2vw;
 }
-
 .main .two .list .list_1 .icon image {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: var(--f85Color);
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background-color: var(--f85Color);
 }
-
 .main .two .list .list_1 .content {
-    display: flex;
-    flex-direction: column;
-    margin: 0 0 0 3vw;
+  display: flex;
+  flex-direction: column;
+  margin: 0 0 0 3vw;
 }
-
 .main .two .list .list_1 .content .name {
-    font-weight: 700;
-    font-size: var(--font18Szie);
-    color: var(--blackColor);
-    margin: 1vw 0;
+  font-weight: 700;
+  font-size: var(--font18Szie);
+  color: var(--blackColor);
+  margin: 1vw 0;
 }
-
 .main .two .list .list_1 .content .other {
-    font-size: var(--font15Size);
-    color: var(--f85Color);
-    margin: 0.5vw 0 1vw 0;
+  font-size: var(--font15Size);
+  color: var(--f85Color);
+  margin: 0.5vw 0 1vw 0;
 }
-
 .main .two .list .list_1 .content .other text {
-    color: var(--redColor);
+  color: var(--redColor);
 }
-
 .main .two .list .btn {
-    display: flex;
-    flex-direction: row;
+  display: flex;
+  flex-direction: row;
 }
-
 .main .two .list .btn button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
-    color: var(--whiteColor);
-    border-radius: 50px;
-    margin: 0 2vw;
-    background-color: #35d4bd;
-    box-sizing: content-box;
-    border: 2px dashed var(--whiteColor);
-}
-
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
+  color: var(--whiteColor);
+  border-radius: 50px;
+  margin: 0 2vw;
+  background-color: #35d4bd;
+  box-sizing: content-box;
+  border: 2px dashed var(--whiteColor);
+}
 .main .two .list .btn button:nth-child(2n) {
-    background-color: #f860df;
+  background-color: #f860df;
 }
-
 .main .two .list .btn button:last-child {
-    background-color: #FF7F50;
+  background-color: #FF7F50;
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
-
 .dialog .dialog_1 .name {
-    text-align: center;
-    font-size: var(--font18Szie);
-    font-weight: bold;
-    margin: 3vw 0;
+  text-align: center;
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 3vw 0;
 }
-
 .dialog .dialog_1 .image {
-    text-align: center;
-    height: 18vh;
-    overflow: hidden;
+  text-align: center;
+  height: 18vh;
+  overflow: hidden;
 }
-
 .dialog .dialog_1 .image .qrcode {
-    height: 22vh;
-    position: absolute;
-    left: 32vw;
+  height: 22vh;
+  position: absolute;
+  left: 32vw;
 }
-
 .dialog .dialog_1 .remark {
-    text-align: center;
-    font-size: 15px;
-    margin: 0 0 4vw 0;
-}
+  text-align: center;
+  font-size: 15px;
+  margin: 0 0 4vw 0;
+}

pagesSchool/schAdmin/coursestu/info.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/coursestu/info.wxss

@@ -1,57 +1,47 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
-    height: var(--twoHeight);
+  background-color: var(--mainColor);
+  height: var(--twoHeight);
 }
-
 .main .two {
-    position: relative;
-    flex-grow: 1;
+  position: relative;
+  flex-grow: 1;
 }
-
 .main .two .a {
-    height: 83vh;
+  height: 83vh;
 }
-
 .main .two .a .one {
-    flex-grow: 1;
-    position: relative;
-    height: 81vh;
+  flex-grow: 1;
+  position: relative;
+  height: 81vh;
 }
-
 .main .two .a .one .content {
-    display: flex;
-    flex-direction: row;
-    border-bottom: 1px dashed var(--f1Color);
-    padding: 2vw 0;
-    margin: 0 2vw 2vw 2vw;
+  display: flex;
+  flex-direction: row;
+  border-bottom: 1px dashed var(--f1Color);
+  padding: 2vw 0;
+  margin: 0 2vw 2vw 2vw;
 }
-
 .main .two .a .one .content .value {
-    flex-grow: 1;
-    color: var(--blackColor);
+  flex-grow: 1;
+  color: var(--blackColor);
 }
-
 .main .two .a .one .content .value textarea {
-    position: static;
-    width: 73vw;
+  position: static;
+  width: 73vw;
 }
-
 .main .two .a .one .content .value image {
-    width: 100px;
-    height: 100px;
+  width: 100px;
+  height: 100px;
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/schAdmin/coursestu/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/coursestu/list.wxss

@@ -1,155 +1,130 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    display: flex;
-    flex-direction: row;
-    padding: 2vw;
-    border-bottom: 1px solid var(--f1Color);
+  display: flex;
+  flex-direction: row;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f1Color);
 }
-
 .main .one .one_1 {
-    flex-grow: 1;
+  flex-grow: 1;
 }
-
 .main .one .one_1 input {
-    padding: 1vw 0 2vw 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 1vw 0 2vw 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .one .one_2 {
-    width: 20vw;
+  width: 20vw;
 }
-
 .main .one .one_2 button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
+  flex-grow: 1;
+  position: relative;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 2vw 2vw 0;
-    border-radius: 10px;
-    border: 1px dashed var(--blackColor);
-}
-
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 2vw 2vw 0;
+  border-radius: 10px;
+  border: 1px dashed var(--blackColor);
+}
 .main .two .list .list_1 {
-    display: flex;
-    flex-direction: row;
-    margin: 0 0 2vw 0;
-    border: 2px dashed var(--blackColor);
-    border-radius: 10px;
+  display: flex;
+  flex-direction: row;
+  margin: 0 0 2vw 0;
+  border: 2px dashed var(--blackColor);
+  border-radius: 10px;
 }
-
 .main .two .list .list_1 .icon {
-    width: 18vw;
-    height: 18vw;
-    margin-top: 2vw;
-    margin-left: 2vw;
+  width: 18vw;
+  height: 18vw;
+  margin-top: 2vw;
+  margin-left: 2vw;
 }
-
 .main .two .list .list_1 .icon image {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: var(--f85Color);
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background-color: var(--f85Color);
 }
-
 .main .two .list .list_1 .content {
-    display: flex;
-    flex-direction: column;
-    margin: 0 0 0 3vw;
+  display: flex;
+  flex-direction: column;
+  margin: 0 0 0 3vw;
 }
-
 .main .two .list .list_1 .content .name {
-    font-weight: 700;
-    font-size: var(--font18Szie);
-    color: var(--blackColor);
-    margin: 1vw 0;
+  font-weight: 700;
+  font-size: var(--font18Szie);
+  color: var(--blackColor);
+  margin: 1vw 0;
 }
-
 .main .two .list .list_1 .content .other {
-    font-size: var(--font15Size);
-    color: var(--f85Color);
-    margin: 0.5vw 0 1vw 0;
+  font-size: var(--font15Size);
+  color: var(--f85Color);
+  margin: 0.5vw 0 1vw 0;
 }
-
 .main .two .list .list_1 .content .other text {
-    color: var(--redColor);
+  color: var(--redColor);
 }
-
 .main .two .list .btn {
-    display: flex;
-    flex-direction: row;
+  display: flex;
+  flex-direction: row;
 }
-
 .main .two .list .btn button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
-    color: var(--whiteColor);
-    border-radius: 50px;
-    margin: 0 2vw;
-    background-color: #35d4bd;
-    box-sizing: content-box;
-    border: 2px dashed var(--whiteColor);
-}
-
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
+  color: var(--whiteColor);
+  border-radius: 50px;
+  margin: 0 2vw;
+  background-color: #35d4bd;
+  box-sizing: content-box;
+  border: 2px dashed var(--whiteColor);
+}
 .main .two .list .btn button:nth-child(2n) {
-    background-color: #f860df;
+  background-color: #f860df;
 }
-
 .main .two .list .btn button:last-child {
-    background-color: #FF7F50;
+  background-color: #FF7F50;
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
-
 .dialog .dialog_1 .name {
-    text-align: center;
-    font-size: var(--font18Szie);
-    font-weight: bold;
-    margin: 3vw 0;
+  text-align: center;
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 3vw 0;
 }
-
 .dialog .dialog_1 .image {
-    text-align: center;
-    height: 18vh;
-    overflow: hidden;
+  text-align: center;
+  height: 18vh;
+  overflow: hidden;
 }
-
 .dialog .dialog_1 .image .qrcode {
-    height: 22vh;
-    position: absolute;
-    left: 32vw;
+  height: 22vh;
+  position: absolute;
+  left: 32vw;
 }
-
 .dialog .dialog_1 .remark {
-    text-align: center;
-    font-size: 15px;
-    margin: 0 0 4vw 0;
-}
+  text-align: center;
+  font-size: 15px;
+  margin: 0 0 4vw 0;
+}

pagesSchool/schAdmin/coursetryexam/info.less

@@ -1,3 +1,5 @@
+@import (css) "/app.wxss";
+
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/coursetryexam/list.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/school/info.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
 

pagesSchool/schAdmin/stat/coach.js

@@ -1,5 +1,6 @@
 const app = getApp()
 import * as echarts from '../../../commpents/ec-canvas/echarts'
+let chart;
 Page({
     data: {
         frameStyle: { useTop: true, name: '教练统计', leftArrow: true, useBar: false },
@@ -11,8 +12,11 @@ Page({
                 { title: '教练收入情况', active: '1' },
             ]
         },
+        // 教练
+        zhcoach: '',
+        coach_id: '',
         coachList: [],
-        percentage: [],
+        value: [],
         date: [],
         money: [],
     },
@@ -25,20 +29,28 @@ Page({
         const that = this;
         let data = e.detail;
         that.setData({ 'tabs.active': data.active })
+        console.log(data.active);
     },
     // 选择教练
     coachChange: function (e) {
         const that = this;
         let data = that.data.coachList[e.detail.value];
         if (data) {
-            that.setData({ 'form.coach_id': data.coach_id });
-            that.setData({ 'form.zhcoach': data.coach_id_name });
+            that.setData({ coach_id: data.coach_id });
+            that.setData({ zhcoach: data.coach_id_name });
         }
+        that.watchLogin();
+
     },
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad: function (options) {
+    onLoad: async function (options) {
+        const that = this;
+        // 监听用户是否登录
+        await that.watchLogin();
+        that.setData({ ec: { onInit: that.initChart } })
+
     },
     // 监听用户是否登录
     watchLogin: async function () {
@@ -47,22 +59,35 @@ Page({
             key: 'user',
             success: async res => {
                 // 教练
-                // const abb = await app.$get(`/rcs`, { school_id: res.data.info.id });
-                // if (abb.errcode == '0' && abb.total > 0) {
-                //     that.setData({ coachList: abb.data })
-                // }
-                const arr = await app.$get(`/statistics/schoolTotalIn`, { school_id: res.data.info.id, time: 'm' });
-                if (arr.errcode == '0') {
-                    console.log(arr.data);
-                    // that.setData({ coachList: arr.data })
+                const abb = await app.$get(`/rcs`, { school_id: res.data.info.id });
+                if (abb.errcode == '0' && abb.total > 0) {
+                    that.setData({ coachList: abb.data })
+                }
+                if (that.data.coach_id) {
+                    if (that.data.tabs.activa == 0) {
+                        const arr = await app.$get(`/statistics/schoolSignCoach`, { school_id: res.data.info.id, coach_id: that.data.coach_id });
+                        if (arr.errcode == '0') {
+                            var date = []
+                            var value = []
+                            arr.data.map(function (item) {
+                                var m = ''; m = item.m; date.push(m)
+                                var sevm = '';
+                                sevm = item.value.split('%').join('')
+                                value.push(sevm)
+                            })
+                            that.setData({ date: date })
+                            that.setData({ value: value })
+                            console.log(date);
+                            console.log(value);
+                            const option = {
+                                series: [{ data: date }],
+                                yAxis: [{ data: value }]
+                            }
+                            if (chart) chart.setOption(option)
+                        }
+                    }
                 }
-                let date = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
-                let percentage = [18, 36, 65, 30, 78, 40, 33, 99, 80, 67, 55, 79];
-                let money = [11218, 5316, 6165, 8810, 3178, 5140, 2133, 6199, 4180, 6167, 7115, 1719];
-                that.setData({ money: money })
-                that.setData({ date: date })
-                that.setData({ percentage: percentage })
-                that.setData({ ec: { onInit: that.initChart } })
+
             },
             fail: async res => {
                 wx.redirectTo({ url: '/pages/index/index' })
@@ -73,109 +98,57 @@ Page({
     initChart(canvas, width, height, dpr) {
         let that = this;
         var date = that.data.date;
-        var percentage = that.data.percentage;
-        var money = that.data.money;
-        var active = that.data.tabs.activa
+        var value = that.data.value;
         const chart = echarts.init(canvas, null, {
             width: width,
             height: height,
             devicePixelRatio: dpr
         });
         canvas.setChart(chart);
-        if (active == 0) {
-            var option = {
-                grid: {
-                    left: 20,
-                    right: 20,
-                    bottom: 145,
-                    top: 60,
-                    containLabel: true
-                },
-                tooltip: {
-                    show: true,
-                    trigger: 'axis',
-                    formatter: '{b}:{c}%' // 格式化数值百分比输出
-                },
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    data: date,
-                    // 设置x轴线的属性
-                    //使x轴文字显示全
-                    axisLabel: { show: true, interval: 0, },
-                },
-                yAxis: {
-                    x: 'center',
-                    type: 'value',
-                    splitLine: {
-                        lineStyle: { type: 'dashed' }
-                    }
-                },
-                series: [
-                    {
-                        type: 'line',
-                        smooth: true,
-                        if() { },
-                        data: percentage,
-                        itemStyle: {
-                            normal: {
-                                color: '#ff7f50',
-                                lineStyle: {
-                                    color: '#5470C6'
-                                }
-                            }
-                        },
-                    }
-                ]
-            };
-        } else {
-            var option = {
-                grid: {
-                    left: 20,
-                    right: 20,
-                    bottom: 145,
-                    top: 60,
-                    containLabel: true
-                },
-                tooltip: {
-                    show: true,
-                    trigger: 'axis',
-                    // trigger: 'item',
-                    formatter: '{b}:{c}元' // 格式化数值百分比输出
-                },
-                xAxis: {
-                    type: 'category',
-                    boundaryGap: false,
-                    data: date,
-                    // 设置x轴线的属性
-                    //使x轴文字显示全
-                    axisLabel: { show: true, interval: 0, },
-                },
-                yAxis: {
-                    x: 'center',
-                    type: 'value',
-                    splitLine: {
-                        lineStyle: { type: 'dashed' }
-                    }
-                },
-                series: [
-                    {
-                        type: 'line',
-                        smooth: true,
-                        data: money,
-                        itemStyle: {
-                            normal: {
-                                color: '#ff7f50',
-                                lineStyle: {
-                                    color: '#5470C6'
-                                }
+        var option = {
+            grid: {
+                left: 20,
+                right: 20,
+                bottom: 145,
+                top: 60,
+                containLabel: true
+            },
+            tooltip: {
+                show: true,
+                trigger: 'axis',
+                formatter: '{b}:{c}%' // 格式化数值百分比输出
+            },
+            xAxis: {
+                type: 'category',
+                boundaryGap: false,
+                data: date,
+                // 设置x轴线的属性
+                //使x轴文字显示全
+                axisLabel: { show: true, interval: 0, },
+            },
+            yAxis: {
+                x: 'center',
+                type: 'value',
+                splitLine: {
+                    lineStyle: { type: 'dashed' }
+                }
+            },
+            series: [
+                {
+                    type: 'line',
+                    smooth: true,
+                    data: value,
+                    itemStyle: {
+                        normal: {
+                            color: '#ff7f50',
+                            lineStyle: {
+                                color: '#5470C6'
                             }
-                        },
-
-                    }
-                ]
-            };
-        }
+                        }
+                    },
+                }
+            ]
+        };
         chart.setOption(option, true);
         return chart;
     },
@@ -187,9 +160,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-        const that = this;
-        // 监听用户是否登录
-        that.watchLogin();
+
     },
     /**
      * 页面上拉触底事件的处理函数

pagesSchool/schAdmin/stat/coach.less

@@ -1,49 +1,47 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);
-  
+
     .top {
-      margin: 2vw 10vw;
-      background-color: rgb(79, 165, 112);
-      padding: 2vw;
-      text-align: center;
-      color: var(--mainColor);
+        margin: 2vw 10vw;
+        background-color: rgb(79, 165, 112);
+        padding: 2vw;
+        text-align: center;
+        color: var(--mainColor);
     }
-  
+
     .two {
-      position: relative;
-      flex-grow: 1;
-  
-      .a {
+        position: relative;
+        flex-grow: 1;
         height: 83vh;
-  
-        .one {
-          flex-grow: 1;
-          position: relative;
-          height: 81vh;
-  
-          .container {
+
+        .container {
             position: absolute;
-  
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+
             ec-canvas {
-              width: 100%;
-              height: 100%;
+                width: 100%;
+                height: 100%;
             }
-          }
         }
-      }
+
+
     }
-  }
-  
-  .scroll-view {
+}
+
+.scroll-view {
     position: absolute;
     top: 0;
     left: 0;
     right: 0;
     bottom: 0;
-  
+
     .list-scroll-view {
-      display: flex;
-      flex-direction: column;
+        display: flex;
+        flex-direction: column;
     }
-  }
+}

pagesSchool/schAdmin/stat/coach.wxml

@@ -1,44 +1,23 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
-  <view slot="info" class="container main">
-    <view class="one">
-      <s-tab tabs="{{tabs}}" bind:tabsChange="tabsChange"></s-tab>
-      <view class="top">
-        <picker mode="selector" bindchange="coachChange" name="coach_id" value="{{form.coach_id}}" range="{{coachList}}" range-key="coach_id_name">
-          <view class="picker">{{form.zhcoach||'请选择教练'}}</view>
-        </picker>
-      </view>
-    </view>
-    <view class="two">
-      <view wx:if="{{tabs.active=='0'}}" class="a">
-        <scroll-view scroll-y="true" class="scroll-view">
-          <view class="list-scroll-view">
-            <view class="one">
-              <scroll-view scroll-y="true" class="scroll-view">
-                <view class="list-scroll-view">
-                  <view class="container">
-                    <ec-canvas id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
-                  </view>
-                </view>
-              </scroll-view>
+    <view slot="info" class="container main">
+        <view class="one">
+            <view class="top">
+                <picker mode="selector" bindchange="coachChange" name="coach_id" value="{{coach_id}}" range="{{coachList}}" range-key="coach_id_name">
+                    <view class="picker">{{zhcoach||'请选择教练'}}</view>
+                </picker>
             </view>
-          </view>
-        </scroll-view>
-      </view>
-      <view wx:elif="{{tabs.active=='1'}}" class="a">
-        <scroll-view scroll-y="true" class="scroll-view">
-          <view class="list-scroll-view">
-            <view class="one">
-              <scroll-view scroll-y="true" class="scroll-view">
+            <view class="foot">
+                <s-tab tabs="{{tabs}}" bind:tabsChange="tabsChange"></s-tab>
+            </view>
+        </view>
+        <view class="two">
+            <scroll-view scroll-y="true" class="scroll-view">
                 <view class="list-scroll-view">
-                  <view class="container">
-                    <ec-canvas id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
-                  </view>
+                    <view class="container">
+                        <ec-canvas id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
+                    </view>
                 </view>
-              </scroll-view>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
+            </scroll-view>
+        </view>
     </view>
-  </view>
 </mobile-main>

pagesSchool/schAdmin/stat/coach.wxss

@@ -1,51 +1,39 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
-    height: var(--twoHeight);
+  background-color: var(--mainColor);
+  height: var(--twoHeight);
 }
-
 .main .top {
-    margin: 2vw 10vw;
-    background-color: #4fa570;
-    padding: 2vw;
-    text-align: center;
-    color: var(--mainColor);
+  margin: 2vw 10vw;
+  background-color: #4fa570;
+  padding: 2vw;
+  text-align: center;
+  color: var(--mainColor);
 }
-
 .main .two {
-    position: relative;
-    flex-grow: 1;
+  position: relative;
+  flex-grow: 1;
+  height: 83vh;
 }
-
-.main .two .a {
-    height: 83vh;
+.main .two .container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
-.main .two .a .one {
-    flex-grow: 1;
-    position: relative;
-    height: 81vh;
+.main .two .container ec-canvas {
+  width: 100%;
+  height: 100%;
 }
-
-.main .two .a .one .container {
-    position: absolute;
-}
-
-.main .two .a .one .container ec-canvas {
-    width: 100%;
-    height: 100%;
-}
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/schAdmin/stat/income.js

@@ -7,17 +7,28 @@ Page({
         ec: {},
         date: [],
         money: [],
+        time: 'm',
     },
     // 返回
     back(e) {
         wx.navigateBack({ delta: 1 })
     },
+    toDate: function (e) {
+        const that = this;
+        let { time } = e.currentTarget.dataset
+        that.setData({ time: time })
+        that.watchLogin();
+    },
 
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad: function (options) {
-        this.setData({ ec: { onInit: this.initChart } })
+    onLoad: async function (options) {
+        const that = this;
+        // 监听用户是否登录
+        await that.watchLogin();
+        
+        that.setData({ ec: { onInit: that.initChart } })
     },
     // 监听用户是否登录
     watchLogin: async function () {
@@ -25,7 +36,7 @@ Page({
         wx.getStorage({
             key: 'user',
             success: async res => {
-                const arr = await app.$get(`/statistics/schoolTotalIn`, { school_id: res.data.info.id, time: 'm' });
+                const arr = await app.$get(`/statistics/schoolTotalIn`, { school_id: res.data.info.id, time: that.data.time });
                 if (arr.errcode == '0') {
                     that.setData({ date: arr.data.x })
                     that.setData({ money: arr.data.y })
@@ -33,7 +44,7 @@ Page({
                         series: [{ data: arr.data.y }],
                         yAxis: [{ data: arr.data.x }]
                     }
-                    chart.setOption(option)
+                    if (chart) chart.setOption(option)
                 }
             },
             fail: async res => {
@@ -43,7 +54,7 @@ Page({
     },
     // 柱状图
     initChart(canvas, width, height, dpr) {
-        let that = this;
+        const that = this;
         var date = that.data.date;
         var money = that.data.money;
         chart = echarts.init(canvas, null, {
@@ -54,9 +65,10 @@ Page({
         canvas.setChart(chart);
         var option = {
             tooltip: {
-                trigger: 'axis',
+                trigger: 'item',
                 axisPointer: { type: 'shadow' },
-                confine: true
+                confine: true,
+                formatter: '{b}:收入{c}元' // 格式化数值百分比输出
             },
             legend: { data: [] },
             grid: {
@@ -71,29 +83,27 @@ Page({
                     type: 'value',
                     name: '金额',
                     axisLine: { lineStyle: { color: '#999' } },
-                    axisLabel: { color: '#666' }
-                }
-            ],
-            yAxis: [
-                {
-                    type: 'category',
-                    name: '日期',
-                    axisTick: { show: false },
-                    data: date,
-                    axisLine: { lineStyle: { color: '#999' } },
-                    axisLabel: {
-                        color: '#666',
-                        formatter: '{value} 日'
-                    },
+                    axisLabel: { color: '#666', formatter: '{value} 元' }
+
                 }
             ],
+            yAxis:
+            {
+                type: 'category',
+                name: '日期',
+                axisTick: { show: false },
+                data: date,
+                axisLine: { lineStyle: { color: '#999' } },
+                axisLabel: {
+                    color: '#666',
+                },
+            },
             series: [
                 {
                     name: '收入',
                     type: 'bar',
                     label: { normal: { show: true, position: 'inside' } },
                     data: money,
-                    itemStyle: {}
                 },
             ],
 
@@ -109,9 +119,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-        const that = this;
-        // 监听用户是否登录
-        that.watchLogin();
+
     },
     /**
      * 页面上拉触底事件的处理函数

pagesSchool/schAdmin/stat/income.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/stat/income.wxml

@@ -1,13 +1,13 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
-  <view slot="info" class="container main">
-    <view class="top">
-      <button type="primary" size="mini">本月</button>
-      <button type="primary" size="mini">近三月</button>
-      <button type="primary" size="mini">半年内</button>
-      <button type="primary" size="mini">一年内</button>
+    <view slot="info" class="container main">
+        <view class="top">
+            <button type="primary" size="mini" bindtap="toDate" data-time="m">本月</button>
+            <button type="primary" size="mini" bindtap="toDate" data-time="3m">近三月</button>
+            <button type="primary" size="mini" bindtap="toDate" data-time="6m">半年内</button>
+            <button type="primary" size="mini" bindtap="toDate" data-time="1y">一年内</button>
+        </view>
+        <view class="container">
+            <ec-canvas id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
+        </view>
     </view>
-    <view class="container">
-      <ec-canvas id="mychart" canvas-id="mychart" ec="{{ ec }}"></ec-canvas>
-    </view>
-  </view>
 </mobile-main>

pagesSchool/schAdmin/stat/income.wxss

@@ -1,20 +1,16 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
-    height: var(--twoHeight);
+  background-color: var(--mainColor);
+  height: var(--twoHeight);
 }
-
 .main .top {
-    text-align: center;
+  text-align: center;
 }
-
 .main .top button {
-    margin: 0 1vw;
-    width: 20vw;
+  margin: 0 1vw;
+  width: 20vw;
 }
-
 .main ec-canvas {
-    width: 100%;
-    height: 100%;
-}
+  width: 100%;
+  height: 100%;
+}

pagesSchool/schAdmin/stat/student.js

@@ -1,116 +1,122 @@
 const app = getApp()
 import * as echarts from '../../../commpents/ec-canvas/echarts'
+let chart;
 Page({
-  data: {
-    frameStyle: { useTop: true, name: '学员统计', leftArrow: true, useBar: false },
-    piedata: []
-  },
-  // 返回
-  back(e) {
-    wx.navigateBack({ delta: 1 })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) { },
-  // 监听用户是否登录
-  watchLogin: async function () {
-    const that = this;
-    wx.getStorage({
-      key: 'user',
-      success: async res => {
-        let piedata = [
-          { value: 55, name: '7-10岁' },
-          { value: 20, name: '10-13岁' },
-          { value: 10, name: '13-16岁' },
-          { value: 20, name: '16-18岁' },
-          { value: 38, name: '18-26岁' }];
-        that.setData({ piedata: piedata })
-        that.setData({ ec: { onInit: that.initChart } })
+    data: {
+        frameStyle: { useTop: true, name: '学员统计', leftArrow: true, useBar: false },
+        piedata: []
+    },
+    // 返回
+    back(e) {
+        wx.navigateBack({ delta: 1 })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
 
-      },
-      fail: async res => {
-        wx.redirectTo({ url: '/pages/index/index' })
-      }
-    })
-  },
-  // 折线图
-  initChart(canvas, width, height, dpr) {
-    let that = this;
-    var piedata = that.data.piedata;
-    const chart = echarts.init(canvas, null, {
-      width: width,
-      height: height,
-      devicePixelRatio: dpr
-    });
-    canvas.setChart(chart);
-    var option = {
-      backgroundColor: "#ffffff",
-      legend: {
-        orient: 'vertical',
-        height: 40,
-        padding: 50
-      },
-      series: [{
-        label: {
-          normal: {
-            fontSize: 16,
-          }
-        },
-        type: 'pie',
-        center: ['50%', '50%'],
-        radius: ['20%', '40%'],
-        data: piedata
-      }],
-      tooltip: {
-        trigger: 'item',
-        formatter: '{b}:{c}人' + '\n\r' + '({d}%)' // 格式化数值百分比输出
-      },
-    };
-    chart.setOption(option, true);
-    return chart;
-  },
-  /**
- * 生命周期函数--监听页面初次渲染完成
- */
-  onReady: function () { },
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    const that = this;
+    onLoad: async function (options) {
+        const that = this;
+        // 监听用户是否登录
+        await that.watchLogin();
+        that.setData({ ec: { onInit: that.initChart } })
+    },
     // 监听用户是否登录
-    that.watchLogin();
-  },
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    watchLogin: async function () {
+        const that = this;
+        wx.getStorage({
+            key: 'user',
+            success: async res => {
+                const arr = await app.$get(`/statistics/schoolStudentAge`, { school_id: res.data.info.id });
+                if (arr.errcode == '0') {
 
-  },
+                    that.setData({ piedata: arr.data })
+                    const option = {
+                        series: [{ data: arr.data }],
+                    }
+                    if (chart) chart.setOption(option)
+                }
 
-  /**
-   * 生命周期函数--监听页面卸载
+            },
+            fail: async res => {
+                wx.redirectTo({ url: '/pages/index/index' })
+            }
+        })
+    },
+    // 饼图
+    initChart(canvas, width, height, dpr) {
+        let that = this;
+        var piedata = that.data.piedata;
+        const chart = echarts.init(canvas, null, {
+            width: width,
+            height: height,
+            devicePixelRatio: dpr
+        });
+        canvas.setChart(chart);
+        var option = {
+            backgroundColor: "#ffffff",
+            legend: {
+                orient: 'vertical',
+                height: 40,
+                padding: 50
+            },
+            series: [{
+                label: {
+                    normal: {
+                        fontSize: 16,
+                    }
+                },
+                type: 'pie',
+                center: ['50%', '50%'],
+                radius: ['20%', '40%'],
+                data: piedata
+            }],
+            tooltip: {
+                trigger: 'item',
+                formatter: '{b}:{c}人' + '\n\r' + '({d}%)' // 格式化数值百分比输出
+            },
+        };
+        chart.setOption(option, true);
+        return chart;
+    },
+    /**
+   * 生命周期函数--监听页面初次渲染完成
    */
-  onUnload: function () {
+    onReady: function () { },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
 
-  },
+    },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
 
+    },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function (res) {
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function (res) {
 
-  },
+    },
 })

pagesSchool/schAdmin/stat/student.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/stat/student.wxss

@@ -1,11 +1,9 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
-    height: var(--twoHeight);
+  background-color: var(--mainColor);
+  height: var(--twoHeight);
 }
-
 .main ec-canvas {
-    width: 100%;
-    height: 100%;
-}
+  width: 100%;
+  height: 100%;
+}

pagesSchool/schAdmin/student/add.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
 

pagesSchool/schAdmin/student/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/studentexam/info.less

@@ -1,3 +1,5 @@
+
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/schAdmin/studentexam/list.less

@@ -1,3 +1,5 @@
+@import (css) "/app.wxss";
+
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/schAdmin/studentexam/list.wxss

@@ -1,155 +1,130 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    display: flex;
-    flex-direction: row;
-    padding: 2vw;
-    border-bottom: 1px solid var(--f1Color);
+  display: flex;
+  flex-direction: row;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f1Color);
 }
-
 .main .one .one_1 {
-    flex-grow: 1;
+  flex-grow: 1;
 }
-
 .main .one .one_1 input {
-    padding: 1vw 0 2vw 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 1vw 0 2vw 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .one .one_2 {
-    width: 20vw;
+  width: 20vw;
 }
-
 .main .one .one_2 button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
+  flex-grow: 1;
+  position: relative;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 2vw 2vw 0;
-    border-radius: 10px;
-    border: 1px dashed var(--blackColor);
-}
-
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 2vw 2vw 0;
+  border-radius: 10px;
+  border: 1px dashed var(--blackColor);
+}
 .main .two .list .list_1 {
-    display: flex;
-    flex-direction: row;
-    margin: 0 0 2vw 0;
-    border: 2px dashed var(--blackColor);
-    border-radius: 10px;
+  display: flex;
+  flex-direction: row;
+  margin: 0 0 2vw 0;
+  border: 2px dashed var(--blackColor);
+  border-radius: 10px;
 }
-
 .main .two .list .list_1 .icon {
-    width: 18vw;
-    height: 18vw;
-    margin-top: 2vw;
-    margin-left: 2vw;
+  width: 18vw;
+  height: 18vw;
+  margin-top: 2vw;
+  margin-left: 2vw;
 }
-
 .main .two .list .list_1 .icon image {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: var(--f85Color);
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background-color: var(--f85Color);
 }
-
 .main .two .list .list_1 .content {
-    display: flex;
-    flex-direction: column;
-    margin: 0 0 0 3vw;
+  display: flex;
+  flex-direction: column;
+  margin: 0 0 0 3vw;
 }
-
 .main .two .list .list_1 .content .name {
-    font-weight: 700;
-    font-size: var(--font18Szie);
-    color: var(--blackColor);
-    margin: 1vw 0;
+  font-weight: 700;
+  font-size: var(--font18Szie);
+  color: var(--blackColor);
+  margin: 1vw 0;
 }
-
 .main .two .list .list_1 .content .other {
-    font-size: var(--font15Size);
-    color: var(--f85Color);
-    margin: 0.5vw 0 1vw 0;
+  font-size: var(--font15Size);
+  color: var(--f85Color);
+  margin: 0.5vw 0 1vw 0;
 }
-
 .main .two .list .list_1 .content .other text {
-    color: var(--redColor);
+  color: var(--redColor);
 }
-
 .main .two .list .btn {
-    display: flex;
-    flex-direction: row;
+  display: flex;
+  flex-direction: row;
 }
-
 .main .two .list .btn button {
-    width: 100%;
-    padding: 2vw;
-    font-size: var(--font14Size);
-    color: var(--whiteColor);
-    border-radius: 50px;
-    margin: 0 2vw;
-    background-color: #35d4bd;
-    box-sizing: content-box;
-    border: 2px dashed var(--whiteColor);
-}
-
+  width: 100%;
+  padding: 2vw;
+  font-size: var(--font14Size);
+  color: var(--whiteColor);
+  border-radius: 50px;
+  margin: 0 2vw;
+  background-color: #35d4bd;
+  box-sizing: content-box;
+  border: 2px dashed var(--whiteColor);
+}
 .main .two .list .btn button:nth-child(2n) {
-    background-color: #f860df;
+  background-color: #f860df;
 }
-
 .main .two .list .btn button:last-child {
-    background-color: #FF7F50;
+  background-color: #FF7F50;
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
-
 .dialog .dialog_1 .name {
-    text-align: center;
-    font-size: var(--font18Szie);
-    font-weight: bold;
-    margin: 3vw 0;
+  text-align: center;
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 3vw 0;
 }
-
 .dialog .dialog_1 .image {
-    text-align: center;
-    height: 18vh;
-    overflow: hidden;
+  text-align: center;
+  height: 18vh;
+  overflow: hidden;
 }
-
 .dialog .dialog_1 .image .qrcode {
-    height: 22vh;
-    position: absolute;
-    left: 32vw;
+  height: 22vh;
+  position: absolute;
+  left: 32vw;
 }
-
 .dialog .dialog_1 .remark {
-    text-align: center;
-    font-size: 15px;
-    margin: 0 0 4vw 0;
-}
+  text-align: center;
+  font-size: 15px;
+  margin: 0 0 4vw 0;
+}

pagesSchool/stuAdmin/archives/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
 

pagesSchool/stuAdmin/archives/list.wxss

@@ -1,38 +1,31 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
+  background-color: var(--mainColor);
 }
-
 .main .one .content {
-    display: flex;
-    flex-direction: row;
-    padding: 2vw;
-    border-bottom: 1px dashed var(--f1Color);
+  display: flex;
+  flex-direction: row;
+  padding: 2vw;
+  border-bottom: 1px dashed var(--f1Color);
 }
-
 .main .one .content .label {
-    font-size: 16px;
+  font-size: 16px;
 }
-
 .main .one .content .value {
-    font-size: 16px;
-    width: 70vw;
+  font-size: 16px;
+  width: 70vw;
 }
-
 .main .one .content .value textarea {
-    width: 100%;
-    height: 120px;
+  width: 100%;
+  height: 120px;
 }
-
 .main .one .btn {
-    text-align: center;
-    margin: 5vw 0 0 0;
+  text-align: center;
+  margin: 5vw 0 0 0;
 }
-
 .main .one .btn button {
-    width: 40vw;
-    margin: 0 2vw;
-    padding: 1vw 0;
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
-}
+  width: 40vw;
+  margin: 0 2vw;
+  padding: 1vw 0;
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+}

pagesSchool/stuAdmin/coach/info.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
 

pagesSchool/stuAdmin/coach/info.wxss

@@ -1,34 +1,28 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    width: 96vw;
-    padding: 2vw;
+  width: 96vw;
+  padding: 2vw;
 }
-
 .main .one .one_1 {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    border: 1px dashed var(--f85Color);
-    border-radius: 5px;
-    margin: 0 0 10px 0;
-    padding: 10px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px dashed var(--f85Color);
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
 }
-
 .main .one .one_1 .text {
-    color: var(--f85Color);
-    font-size: var(--font16Size);
+  color: var(--f85Color);
+  font-size: var(--font16Size);
 }
-
 .main .one .one_1 .text1 {
-    font-size: var(--font16Size);
+  font-size: var(--font16Size);
 }
-
 .main .one .one_1 .image {
-    width: 15vw;
-    height: 15vw;
-}
+  width: 15vw;
+  height: 15vw;
+}

pagesSchool/stuAdmin/coach/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
 

pagesSchool/stuAdmin/coach/list.wxss

@@ -1,88 +1,73 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
+  height: var(--twoHeight);
 }
-
 .main .one {
-    width: 96vw;
-    padding: 2vw;
+  width: 96vw;
+  padding: 2vw;
 }
-
 .main .one input {
-    padding: 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
-    width: 96vw;
-    margin: 0 2vw 2vw 2vw;
+  flex-grow: 1;
+  position: relative;
+  width: 96vw;
+  margin: 0 2vw 2vw 2vw;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 0 0 2vw 0;
-    background-color: var(--mainColor);
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  background-color: var(--mainColor);
 }
-
 .main .two .list .list_1 {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
-
 .main .two .list .list_1 .image {
-    width: 90px;
-    height: 90px;
+  width: 90px;
+  height: 90px;
 }
-
 .main .two .list .list_1 .content {
-    width: 65vw;
-    margin: 0 0 0 2vw;
+  width: 65vw;
+  margin: 0 0 0 2vw;
 }
-
 .main .two .list .list_1 .content .name {
-    font-size: var(--font16Size);
-    font-weight: bold;
-    margin: 0 0 1vw 0;
-    text-align: center;
-    border-bottom: 1px dashed var(--f1Color);
+  font-size: var(--font16Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+  text-align: center;
+  border-bottom: 1px dashed var(--f1Color);
 }
-
 .main .two .list .list_1 .content .txt {
-    font-size: var(--font14Size);
-    padding: 0 0 1vw 0;
-    border-bottom: 1px dashed var(--f1Color);
+  font-size: var(--font14Size);
+  padding: 0 0 1vw 0;
+  border-bottom: 1px dashed var(--f1Color);
 }
-
 .main .two .list .list_1 .content .txt text:nth-child(1) {
-    color: #666;
+  color: #666;
 }
-
 .main .two .list .btn {
-    width: 92vw;
-    text-align: center;
-    margin: 2vw 0 0 0;
+  width: 92vw;
+  text-align: center;
+  margin: 2vw 0 0 0;
 }
-
 .main .two .list .btn button {
-    font-size: var(--font14Size);
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+  font-size: var(--font14Size);
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/stuAdmin/course/info.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/stuAdmin/course/info.wxss

@@ -1,108 +1,88 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    width: 100vw;
-    margin: 0 0 2vw 0;
+  width: 100vw;
+  margin: 0 0 2vw 0;
 }
-
 .main .two {
-    position: relative;
-    flex-grow: 1;
+  position: relative;
+  flex-grow: 1;
 }
-
 .main .two .a {
-    height: 83vh;
+  height: 83vh;
 }
-
 .main .two .a .one {
-    width: 96vw;
-    padding: 0 2vw;
+  width: 96vw;
+  padding: 0 2vw;
 }
-
 .main .two .a .one .one_1 {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    border: 1px dashed var(--f85Color);
-    border-radius: 5px;
-    margin: 0 0 10px 0;
-    padding: 10px;
-}
-
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px dashed var(--f85Color);
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
 .main .two .a .one .one_1 .text {
-    color: var(--f85Color);
-    font-size: var(--font16Size);
+  color: var(--f85Color);
+  font-size: var(--font16Size);
 }
-
 .main .two .a .one .one_1 .text1 {
-    font-size: var(--font16Size);
+  font-size: var(--font16Size);
 }
-
 .main .two .a .one .one_1 .image {
-    width: 15vw;
-    height: 15vw;
+  width: 15vw;
+  height: 15vw;
 }
-
 .main .two .a .one .one_1 .name {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
-
 .main .two .b {
-    height: 83vh;
+  height: 83vh;
 }
-
 .main .two .b .list {
-    background-color: var(--f9Color);
-    margin: 0 0 2vw 0;
-    padding: 2vw;
-    margin: 0 2vw 2vw 2vw;
-    border-radius: 5px;
-    border: 1px dashed var(--f85Color);
-}
-
+  background-color: var(--f9Color);
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  margin: 0 2vw 2vw 2vw;
+  border-radius: 5px;
+  border: 1px dashed var(--f85Color);
+}
 .main .two .b .list .name {
-    font-size: var(--font18Szie);
-    font-weight: bold;
-    margin: 0 0 1vw 0;
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
 }
-
 .main .two .b .list .other {
-    margin: 0 0 1vw 0;
+  margin: 0 0 1vw 0;
 }
-
 .main .two .b .list .other .other_1 {
-    margin: 0 0 1vw 0;
-    font-size: var(--font16Size);
+  margin: 0 0 1vw 0;
+  font-size: var(--font16Size);
 }
-
 .main .two .b .list .other .other_1 text:first-child {
-    color: var(--f85Color);
+  color: var(--f85Color);
 }
-
 .main .two .b .list .btn {
-    text-align: center;
+  text-align: center;
 }
-
 .main .two .b .list .btn button {
-    margin: 0 2vw;
-    font-size: var(--font14Size);
+  margin: 0 2vw;
+  font-size: var(--font14Size);
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/stuAdmin/course/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
 

pagesSchool/stuAdmin/course/list.wxss

@@ -1,87 +1,73 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
+  height: var(--twoHeight);
 }
-
 .main .one {
-    width: 96vw;
-    padding: 0 2vw 2vw 2vw;
+  width: 96vw;
+  padding: 0 2vw 2vw 2vw;
 }
-
 .main .one .tab {
-    margin: 0 0 2vw 0;
+  margin: 0 0 2vw 0;
 }
-
 .main .one .input input {
-    padding: 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
-    width: 96vw;
-    margin: 0 2vw 2vw 2vw;
+  flex-grow: 1;
+  position: relative;
+  width: 96vw;
+  margin: 0 2vw 2vw 2vw;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 0 0 2vw 0;
-    background-color: var(--mainColor);
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  background-color: var(--mainColor);
 }
-
 .main .two .list .list_1 .name {
-    font-size: var(--font16Size);
-    font-weight: bold;
-    margin: 0 0 1vw 0;
-    text-align: center;
+  font-size: var(--font16Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+  text-align: center;
 }
-
 .main .two .list .list_1 .other {
-    display: flex;
-    flex-direction: column;
-    width: 90vw;
-    justify-content: space-between;
-    border-top: 1px dashed var(--f1Color);
-    border-bottom: 1px dashed var(--f1Color);
-    padding: 1vw;
-    font-size: var(--font14Size);
-    margin: 0 0 1vw 0;
+  display: flex;
+  flex-direction: column;
+  width: 90vw;
+  justify-content: space-between;
+  border-top: 1px dashed var(--f1Color);
+  border-bottom: 1px dashed var(--f1Color);
+  padding: 1vw;
+  font-size: var(--font14Size);
+  margin: 0 0 1vw 0;
 }
-
 .main .two .list .list_1 .other .other_1 {
-    padding: 0 0 1vw 0;
+  padding: 0 0 1vw 0;
 }
-
 .main .two .list .list_1 .other .other_1 text:nth-child(1) {
-    color: #666;
+  color: #666;
 }
-
 .main .two .list .btn {
-    width: 92vw;
-    text-align: center;
-    margin: 2vw 0 0 0;
+  width: 92vw;
+  text-align: center;
+  margin: 2vw 0 0 0;
 }
-
 .main .two .list .btn button {
-    font-size: var(--font14Size);
-    margin: 0 0 0 2vw;
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+  font-size: var(--font14Size);
+  margin: 0 0 0 2vw;
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/stuAdmin/course/sign.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/stuAdmin/course/sign.wxss

@@ -1,125 +1,102 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    width: 100vw;
-    margin: 0 0 2vw 0;
+  width: 100vw;
+  margin: 0 0 2vw 0;
 }
-
 .main .two {
-    position: relative;
-    flex-grow: 1;
+  position: relative;
+  flex-grow: 1;
 }
-
 .main .two .a {
-    height: 83vh;
+  height: 83vh;
 }
-
 .main .two .a .one {
-    width: 96vw;
-    padding: 0 2vw;
+  width: 96vw;
+  padding: 0 2vw;
 }
-
 .main .two .a .one .one_1 {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    border: 1px dashed var(--f85Color);
-    border-radius: 5px;
-    margin: 0 0 10px 0;
-    padding: 10px;
-}
-
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px dashed var(--f85Color);
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
 .main .two .a .one .one_1 .text {
-    color: var(--f85Color);
-    font-size: var(--font16Size);
+  color: var(--f85Color);
+  font-size: var(--font16Size);
 }
-
 .main .two .a .one .one_1 .text1 {
-    font-size: var(--font16Size);
+  font-size: var(--font16Size);
 }
-
 .main .two .a .one .one_1 .image {
-    width: 15vw;
-    height: 15vw;
+  width: 15vw;
+  height: 15vw;
 }
-
 .main .two .a .one .one_1 .name {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
-
 .main .two .a .one .one_1 button {
-    font-size: var(--font14Size);
-    margin: 0;
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+  font-size: var(--font14Size);
+  margin: 0;
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
 }
-
 .main .two .a .one .btn {
-    width: 92vw;
-    text-align: center;
-    margin: 2vw 0 0 0;
+  width: 92vw;
+  text-align: center;
+  margin: 2vw 0 0 0;
 }
-
 .main .two .a .one .btn button {
-    font-size: var(--font14Size);
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+  font-size: var(--font14Size);
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
 }
-
 .main .two .b {
-    height: 83vh;
+  height: 83vh;
 }
-
 .main .two .b .list {
-    background-color: var(--f9Color);
-    margin: 0 0 2vw 0;
-    padding: 2vw;
-    margin: 0 2vw 2vw 2vw;
-    border-radius: 5px;
-    border: 1px dashed var(--f85Color);
-}
-
+  background-color: var(--f9Color);
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  margin: 0 2vw 2vw 2vw;
+  border-radius: 5px;
+  border: 1px dashed var(--f85Color);
+}
 .main .two .b .list .name {
-    font-size: var(--font18Szie);
-    font-weight: bold;
-    margin: 0 0 1vw 0;
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
 }
-
 .main .two .b .list .other {
-    margin: 0 0 1vw 0;
+  margin: 0 0 1vw 0;
 }
-
 .main .two .b .list .other .other_1 {
-    margin: 0 0 1vw 0;
-    font-size: var(--font16Size);
+  margin: 0 0 1vw 0;
+  font-size: var(--font16Size);
 }
-
 .main .two .b .list .other .other_1 text:first-child {
-    color: var(--f85Color);
+  color: var(--f85Color);
 }
-
 .main .two .b .list .btn {
-    text-align: center;
+  text-align: center;
 }
-
 .main .two .b .list .btn button {
-    margin: 0 2vw;
-    font-size: var(--font14Size);
+  margin: 0 2vw;
+  font-size: var(--font14Size);
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/stuAdmin/money/add.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     .one {
         .content {

pagesSchool/stuAdmin/money/add.wxss

@@ -1,48 +1,40 @@
 @import "/app.wxss";
-
 .main .one .content {
-    display: flex;
-    flex-direction: row;
-    border-bottom: 1px dashed var(--f1Color);
-    padding: 2vw 0;
-    margin: 0 2vw 2vw 2vw;
+  display: flex;
+  flex-direction: row;
+  border-bottom: 1px dashed var(--f1Color);
+  padding: 2vw 0;
+  margin: 0 2vw 2vw 2vw;
 }
-
 .main .one .content .value {
-    flex-grow: 1;
-    color: var(--blackColor);
+  flex-grow: 1;
+  color: var(--blackColor);
 }
-
 .main .one .contentmoney {
-    display: flex;
-    flex-direction: column;
-    background-color: var(--mainColor);
-    width: 96vw;
-    margin: 2vw;
-    border-radius: 10px;
-}
-
+  display: flex;
+  flex-direction: column;
+  background-color: var(--mainColor);
+  width: 96vw;
+  margin: 2vw;
+  border-radius: 10px;
+}
 .main .one .contentmoney .label {
-    padding: 10px 5px;
+  padding: 10px 5px;
 }
-
 .main .one .contentmoney .value {
-    display: flex;
-    padding: 20px 5px;
+  display: flex;
+  padding: 20px 5px;
 }
-
 .main .one .contentmoney .value text {
-    font-size: var(--font18Szie);
+  font-size: var(--font18Szie);
 }
-
 .main .one .btn {
-    text-align: center;
-    margin: 5vw 0 0 0;
+  text-align: center;
+  margin: 5vw 0 0 0;
 }
-
 .main .one .btn button {
-    width: 40vw;
-    margin: 0 2vw;
-    padding: 1vw 0;
-    background: #1E90FF;
-}
+  width: 40vw;
+  margin: 0 2vw;
+  padding: 1vw 0;
+  background: #1E90FF;
+}

pagesSchool/stuAdmin/money/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
     background-color: var(--mainColor);

pagesSchool/stuAdmin/money/list.wxss

@@ -1,78 +1,65 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
-    background-color: var(--mainColor);
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    width: 96vw;
-    padding: 2vw;
+  width: 96vw;
+  padding: 2vw;
 }
-
 .main .one input {
-    padding: 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
-    width: 96vw;
-    margin: 2vw;
-    background-color: var(--mainColor);
+  flex-grow: 1;
+  position: relative;
+  width: 96vw;
+  margin: 2vw;
+  background-color: var(--mainColor);
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    border: 2px dashed var(--f1Color);
-    padding: 2vw;
-    margin: 0 0 2vw 0;
-    border-radius: 10px;
+  display: flex;
+  flex-direction: column;
+  border: 2px dashed var(--f1Color);
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  border-radius: 10px;
 }
-
 .main .two .list .name {
-    font-size: var(--font18Szie);
-    font-weight: bold;
-    margin: 0 0 2vw 0;
-    color: red;
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 0 0 2vw 0;
+  color: red;
 }
-
 .main .two .list .other {
-    margin: 0 0 2vw 0;
+  margin: 0 0 2vw 0;
 }
-
 .main .two .list .other .other_1 {
-    font-size: var(--font14Szie);
-    margin: 0 0 1vw 0;
+  font-size: var(--font14Szie);
+  margin: 0 0 1vw 0;
 }
-
 .main .two .list .other .other_1 text:first-child {
-    color: var(--f85Color);
+  color: var(--f85Color);
 }
-
 .main .two .list .btn {
-    margin: 2vw 0 0 0;
-    text-align: center;
+  margin: 2vw 0 0 0;
+  text-align: center;
 }
-
 .main .two .list .btn button {
-    margin: 0 2vw;
-    font-size: var(--font14Size);
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+  margin: 0 2vw;
+  font-size: var(--font14Size);
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/stuAdmin/school/info.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
 

pagesSchool/stuAdmin/school/info.wxss

@@ -1,44 +1,36 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
+  background-color: var(--mainColor);
 }
-
 .main .one {
-    width: 96vw;
-    padding: 0 2vw;
+  width: 96vw;
+  padding: 0 2vw;
 }
-
 .main .one .one_1 {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    border: 1px dashed var(--f85Color);
-    border-radius: 5px;
-    margin: 0 0 10px 0;
-    padding: 10px;
-}
-
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px dashed var(--f85Color);
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
 .main .one .one_1 .text {
-    color: var(--f85Color);
-    font-size: var(--font16Size);
+  color: var(--f85Color);
+  font-size: var(--font16Size);
 }
-
 .main .one .one_1 .text1 {
-    font-size: var(--font16Size);
+  font-size: var(--font16Size);
 }
-
 .main .one .one_1 .image {
-    width: 90vw;
-    height: 90vw;
+  width: 90vw;
+  height: 90vw;
 }
-
 .main .one .one_1 swiper {
-    width: 90vw;
-    height: 25vh;
+  width: 90vw;
+  height: 25vh;
 }
-
 .main .one .one_1 swiper .image {
-    width: 100%;
-    height: 100%;
-}
+  width: 100%;
+  height: 100%;
+}

pagesSchool/stuAdmin/school/list.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     height: var(--twoHeight);
 

pagesSchool/stuAdmin/school/list.wxss

@@ -1,104 +1,86 @@
 @import "/app.wxss";
-
 .main {
-    height: var(--twoHeight);
+  height: var(--twoHeight);
 }
-
 .main .one {
-    width: 96vw;
-    padding: 2vw;
+  width: 96vw;
+  padding: 2vw;
 }
-
 .main .one input {
-    padding: 2vw;
-    background-color: var(--f1Color);
-    border-radius: 5px;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  border-radius: 5px;
 }
-
 .main .two {
-    flex-grow: 1;
-    position: relative;
-    width: 96vw;
-    margin: 0 2vw 2vw 2vw;
+  flex-grow: 1;
+  position: relative;
+  width: 96vw;
+  margin: 0 2vw 2vw 2vw;
 }
-
 .main .two .list {
-    display: flex;
-    flex-direction: column;
-    padding: 2vw;
-    margin: 0 0 2vw 0;
-    background-color: var(--mainColor);
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  background-color: var(--mainColor);
 }
-
 .main .two .list .list_1 {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
-
 .main .two .list .list_1 .image {
-    width: 90px;
-    height: 90px;
+  width: 90px;
+  height: 90px;
 }
-
 .main .two .list .list_1 .content {
-    width: 65vw;
-    margin: 0 0 0 2vw;
+  width: 65vw;
+  margin: 0 0 0 2vw;
 }
-
 .main .two .list .list_1 .content .name {
-    font-size: var(--font16Size);
-    font-weight: bold;
-    margin: 0 0 1vw 0;
-    text-align: center;
-    border-bottom: 1px dashed var(--f1Color);
+  font-size: var(--font16Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+  text-align: center;
+  border-bottom: 1px dashed var(--f1Color);
 }
-
 .main .two .list .list_1 .content .txt {
-    font-size: var(--font14Size);
-    padding: 0 0 1vw 0;
-    border-bottom: 1px dashed var(--f1Color);
+  font-size: var(--font14Size);
+  padding: 0 0 1vw 0;
+  border-bottom: 1px dashed var(--f1Color);
 }
-
 .main .two .list .list_1 .content .txt text:nth-child(1) {
-    color: #666;
+  color: #666;
 }
-
 .main .two .list .list_1 .content .other {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    font-size: var(--font14Size);
-    border-bottom: 1px dashed var(--f1Color);
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  font-size: var(--font14Size);
+  border-bottom: 1px dashed var(--f1Color);
 }
-
 .main .two .list .list_1 .content .other .other_1 {
-    padding: 0 0 1vw 0;
+  padding: 0 0 1vw 0;
 }
-
 .main .two .list .list_1 .content .other .other_1 text:nth-child(1) {
-    color: var(--f85Color);
+  color: var(--f85Color);
 }
-
 .main .two .list .btn {
-    width: 92vw;
-    text-align: center;
-    margin: 2vw 0 0 0;
+  width: 92vw;
+  text-align: center;
+  margin: 2vw 0 0 0;
 }
-
 .main .two .list .btn button {
-    font-size: var(--font14Size);
-    background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+  font-size: var(--font14Size);
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
 }
-
 .scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-
 .scroll-view .list-scroll-view {
-    display: flex;
-    flex-direction: column;
-}
+  display: flex;
+  flex-direction: column;
+}

pagesSchool/stuAdmin/stat/fee.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/stuAdmin/stat/fee.wxss

@@ -1,11 +1,9 @@
 @import "/app.wxss";
-
 .main {
-    background-color: var(--mainColor);
-    height: var(--twoHeight);
+  background-color: var(--mainColor);
+  height: var(--twoHeight);
 }
-
 .main ec-canvas {
-    width: 100%;
-    height: 100%;
-}
+  width: 100%;
+  height: 100%;
+}

pagesSchool/stuAdmin/stat/study.less

@@ -1,3 +1,5 @@
+@import (css) "/app.wxss";
+
 .main {
     background-color: var(--mainColor);
     height: var(--twoHeight);

pagesSchool/stuAdmin/stat/study.wxss

@@ -1,11 +1,9 @@
 @import "/app.wxss";
-
 .main {
   background-color: var(--mainColor);
   height: var(--twoHeight);
 }
-
 .main ec-canvas {
   width: 100%;
   height: 100%;
-}
+}