guhongwei 2 years ago
parent
commit
2011dca283
60 changed files with 111 additions and 108 deletions
  1. 12 11
      app.json
  2. 60 41
      pages/school/index.less
  3. 14 1
      pages/school/index.wxml
  4. 10 40
      pages/school/index.wxss
  5. 1 1
      pages/sthrfiles/list.js
  6. 0 0
      pages/stuAdmin/archives/list.json
  7. 0 0
      pages/stuAdmin/archives/list.less
  8. 0 0
      pages/stuAdmin/archives/list.wxml
  9. 0 0
      pages/stuAdmin/archives/list.wxss
  10. 0 0
      pages/stuAdmin/coach/info.js
  11. 0 0
      pages/stuAdmin/coach/info.json
  12. 0 0
      pages/stuAdmin/coach/info.less
  13. 0 0
      pages/stuAdmin/coach/info.wxml
  14. 0 0
      pages/stuAdmin/coach/info.wxss
  15. 1 1
      pages/sthrcoach/list.js
  16. 0 0
      pages/stuAdmin/coach/list.json
  17. 0 0
      pages/stuAdmin/coach/list.less
  18. 0 0
      pages/stuAdmin/coach/list.wxml
  19. 0 0
      pages/stuAdmin/coach/list.wxss
  20. 0 0
      pages/stuAdmin/fee/list.js
  21. 0 0
      pages/stuAdmin/fee/list.json
  22. 0 0
      pages/stuAdmin/fee/list.less
  23. 0 0
      pages/stuAdmin/fee/list.wxml
  24. 0 0
      pages/stuAdmin/fee/list.wxss
  25. 0 0
      pages/stuAdmin/open/info.js
  26. 0 0
      pages/stuAdmin/open/info.json
  27. 0 0
      pages/stuAdmin/open/info.less
  28. 0 0
      pages/stuAdmin/open/info.wxml
  29. 0 0
      pages/stuAdmin/open/info.wxss
  30. 1 1
      pages/sthropen/list.js
  31. 0 0
      pages/stuAdmin/open/list.json
  32. 0 0
      pages/stuAdmin/open/list.less
  33. 0 0
      pages/stuAdmin/open/list.wxml
  34. 0 0
      pages/stuAdmin/open/list.wxss
  35. 0 0
      pages/stuAdmin/private/info.js
  36. 0 0
      pages/stuAdmin/private/info.json
  37. 0 0
      pages/stuAdmin/private/info.less
  38. 0 0
      pages/stuAdmin/private/info.wxml
  39. 0 0
      pages/stuAdmin/private/info.wxss
  40. 1 1
      pages/sthrprivate/list.js
  41. 0 0
      pages/stuAdmin/private/list.json
  42. 0 0
      pages/stuAdmin/private/list.less
  43. 0 0
      pages/stuAdmin/private/list.wxml
  44. 0 0
      pages/stuAdmin/private/list.wxss
  45. 0 0
      pages/stuAdmin/school/info.js
  46. 0 0
      pages/stuAdmin/school/info.json
  47. 1 1
      pages/sthrschool/info.less
  48. 0 0
      pages/stuAdmin/school/info.wxml
  49. 1 1
      pages/sthrschool/info.wxss
  50. 1 1
      pages/sthrschool/list.js
  51. 0 0
      pages/stuAdmin/school/list.json
  52. 0 0
      pages/stuAdmin/school/list.less
  53. 0 0
      pages/stuAdmin/school/list.wxml
  54. 0 0
      pages/stuAdmin/school/list.wxss
  55. 0 0
      pages/stuAdmin/study/list.js
  56. 0 0
      pages/stuAdmin/study/list.json
  57. 0 0
      pages/stuAdmin/study/list.less
  58. 0 0
      pages/stuAdmin/study/list.wxml
  59. 0 0
      pages/stuAdmin/study/list.wxss
  60. 8 8
      utils/dict.js

+ 12 - 11
app.json

@@ -37,17 +37,18 @@
         "pages/soneincome/list",
         "pages/sonestustat/list",
         "pages/sonecoachstat/list",
-        "pages/sthrfiles/list",
-        "pages/sthrcoach/list",
-        "pages/sthrcoach/info",
-        "pages/sthrschool/list",
-        "pages/sthrschool/info",
-        "pages/sthropen/list",
-        "pages/sthropen/info",
-        "pages/sthrprivate/list",
-        "pages/sthrprivate/info",
-        "pages/sthrstudystat/list",
-        "pages/sthrfeestat/list"
+
+        "pages/stuAdmin/archives/list",
+        "pages/stuAdmin/coach/list",
+        "pages/stuAdmin/coach/info",
+        "pages/stuAdmin/school/list",
+        "pages/stuAdmin/school/info",
+        "pages/stuAdmin/open/list",
+        "pages/stuAdmin/open/info",
+        "pages/stuAdmin/private/list",
+        "pages/stuAdmin/private/info",
+        "pages/stuAdmin/study/list",
+        "pages/stuAdmin/fee/list"
     ],
     "usingComponents": {
         "van-sidebar": "@vant/weapp/sidebar/index",

+ 60 - 41
pages/school/index.less

@@ -42,8 +42,15 @@
             padding: 2vw;
             margin: 0 2vw 2vw 2vw;
             border-radius: 5px;
+            display: flex;
+            flex-direction: row;
 
             .list_1 {
+                width: 10vw;
+            }
+
+            .list_2 {
+                width: 10vw;
                 .swiper {
                     height: 30vh;
 
@@ -55,47 +62,59 @@
                 }
             }
 
-            .list_2 {
-                position: absolute;
-                top: 2vw;
-                width: 92vw;
-                color: var(--whiteColor);
-
-                .name {
-                    text-align: center;
-                    font-size: var(--font20Szie);
-                    font-weight: bold;
-                    margin: 3vw 0 1vw 0;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    -webkit-line-clamp: 2;
-                    word-break: break-all;
-                    display: -webkit-box;
-                    -webkit-box-orient: vertical;
-                    -webkit-text-stroke: 1px var(--redColor);
-                }
-
-                .address {
-                    text-align: center;
-                    font-size: var(--font18Szie);
-                    margin: 0 0 2vw 0;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    -webkit-line-clamp: 2;
-                    word-break: break-all;
-                    display: -webkit-box;
-                    -webkit-box-orient: vertical;
-                    -webkit-text-stroke: 1px var(--blueColor);
-                }
-
-                .other {
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: space-around;
-                    font-size: var(--font18Szie);
-                    -webkit-text-stroke: 1px var(--blueColor);
-                }
-            }
+            // .list_1 {
+            //     .swiper {
+            //         height: 30vh;
+
+            //     }
+
+            //     .image {
+            //         width: 100%;
+            //         height: 100%;
+            //     }
+            // }
+
+            // .list_2 {
+            //     position: absolute;
+            //     top: 2vw;
+            //     width: 92vw;
+            //     color: var(--whiteColor);
+
+            //     .name {
+            //         text-align: center;
+            //         font-size: var(--font20Szie);
+            //         font-weight: bold;
+            //         margin: 3vw 0 1vw 0;
+            //         overflow: hidden;
+            //         text-overflow: ellipsis;
+            //         -webkit-line-clamp: 2;
+            //         word-break: break-all;
+            //         display: -webkit-box;
+            //         -webkit-box-orient: vertical;
+            //         -webkit-text-stroke: 1px var(--redColor);
+            //     }
+
+            //     .address {
+            //         text-align: center;
+            //         font-size: var(--font18Szie);
+            //         margin: 0 0 2vw 0;
+            //         overflow: hidden;
+            //         text-overflow: ellipsis;
+            //         -webkit-line-clamp: 2;
+            //         word-break: break-all;
+            //         display: -webkit-box;
+            //         -webkit-box-orient: vertical;
+            //         -webkit-text-stroke: 1px var(--blueColor);
+            //     }
+
+            //     .other {
+            //         display: flex;
+            //         flex-direction: row;
+            //         justify-content: space-around;
+            //         font-size: var(--font18Szie);
+            //         -webkit-text-stroke: 1px var(--blueColor);
+            //     }
+            // }
         }
     }
 }

+ 14 - 1
pages/school/index.wxml

@@ -13,6 +13,19 @@
                 <view class="list-scroll-view">
                     <view class="list" wx:for="{{list}}" wx:key="item" wx:for-item="item" wx:for-index="index" bindtap="toView" data-item="{{item}}">
                         <view class="list_1">
+                            <view class="name">{{item.name}}</view>
+                            <view class="brief">{{item.brief}}</view>
+                        </view>
+                        <view class="list_2">
+                            <swiper autoplay="true" circular="true" interval="3000" duration="1000">
+                                <block wx:for="{{item.img_url}}" wx:key="tag" wx:for-item="tag" wx:for-index="tagindex">
+                                    <swiper-item>
+                                        <image class="image" src="{{tag.url}}"></image>
+                                    </swiper-item>
+                                </block>
+                            </swiper>
+                        </view>
+                        <!-- <view class="list_1">
                             <swiper autoplay="true" circular="true" interval="3000" duration="1000">
                                 <block wx:for="{{item.img_url}}" wx:key="tag" wx:for-item="tag" wx:for-index="tagindex">
                                     <swiper-item>
@@ -28,7 +41,7 @@
                                 <view class="other_1"><text>教练人数:</text><text>{{item.coach_num}}</text></view>
                                 <view class="other_1"><text>学员人数:</text><text>{{item.student_num}}</text></view>
                             </view>
-                        </view>
+                        </view> -->
                     </view>
                 </view>
             </scroll-view>

+ 10 - 40
pages/school/index.wxss

@@ -37,51 +37,21 @@
   padding: 2vw;
   margin: 0 2vw 2vw 2vw;
   border-radius: 5px;
+  display: flex;
+  flex-direction: row;
 }
-.main .two .list .list_1 .swiper {
-  height: 30vh;
-}
-.main .two .list .list_1 .image {
-  width: 100%;
-  height: 100%;
+.main .two .list .list_1 {
+  width: 10vw;
 }
 .main .two .list .list_2 {
-  position: absolute;
-  top: 2vw;
-  width: 92vw;
-  color: var(--whiteColor);
+  width: 10vw;
 }
-.main .two .list .list_2 .name {
-  text-align: center;
-  font-size: var(--font20Szie);
-  font-weight: bold;
-  margin: 3vw 0 1vw 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-text-stroke: 1px var(--redColor);
-}
-.main .two .list .list_2 .address {
-  text-align: center;
-  font-size: var(--font18Szie);
-  margin: 0 0 2vw 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-text-stroke: 1px var(--blueColor);
+.main .two .list .list_2 .swiper {
+  height: 30vh;
 }
-.main .two .list .list_2 .other {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  font-size: var(--font18Szie);
-  -webkit-text-stroke: 1px var(--blueColor);
+.main .two .list .list_2 .image {
+  width: 100%;
+  height: 100%;
 }
 .scroll-view {
   position: absolute;

+ 1 - 1
pages/sthrfiles/list.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import WxValidate from '../../utils/wxValidate';
+import WxValidate from '../../../utils/wxValidate';
 Page({
     data: {
         frameStyle: { useTop: true, name: '学员信息管理', leftArrow: true, useBar: false },

pages/sthrfiles/list.json → pages/stuAdmin/archives/list.json


pages/sthrfiles/list.less → pages/stuAdmin/archives/list.less


pages/sthrfiles/list.wxml → pages/stuAdmin/archives/list.wxml


pages/sthrfiles/list.wxss → pages/stuAdmin/archives/list.wxss


pages/sthrcoach/info.js → pages/stuAdmin/coach/info.js


pages/sthrcoach/info.json → pages/stuAdmin/coach/info.json


pages/sthrcoach/info.less → pages/stuAdmin/coach/info.less


pages/sthrcoach/info.wxml → pages/stuAdmin/coach/info.wxml


pages/sthrcoach/info.wxss → pages/stuAdmin/coach/info.wxss


+ 1 - 1
pages/sthrcoach/list.js

@@ -24,7 +24,7 @@ Page({
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
         const { item } = e.currentTarget.dataset;
-        wx.navigateTo({ url: `/pages/sthrcoach/info?id=${item.coach_id}` })
+        wx.navigateTo({ url: `/pages/stuAdmin/coach/info?id=${item.coach_id}` })
     },
     // 分页
     toPage: function () {

pages/sthrcoach/list.json → pages/stuAdmin/coach/list.json


pages/sthrcoach/list.less → pages/stuAdmin/coach/list.less


pages/sthrcoach/list.wxml → pages/stuAdmin/coach/list.wxml


pages/sthrcoach/list.wxss → pages/stuAdmin/coach/list.wxss


pages/sthrfeestat/list.js → pages/stuAdmin/fee/list.js


pages/sthrfeestat/list.json → pages/stuAdmin/fee/list.json


pages/sthrfeestat/list.less → pages/stuAdmin/fee/list.less


pages/sthrfeestat/list.wxml → pages/stuAdmin/fee/list.wxml


pages/sthrfeestat/list.wxss → pages/stuAdmin/fee/list.wxss


pages/sthropen/info.js → pages/stuAdmin/open/info.js


pages/sthropen/info.json → pages/stuAdmin/open/info.json


pages/sthropen/info.less → pages/stuAdmin/open/info.less


pages/sthropen/info.wxml → pages/stuAdmin/open/info.wxml


pages/sthropen/info.wxss → pages/stuAdmin/open/info.wxss


+ 1 - 1
pages/sthropen/list.js

@@ -19,7 +19,7 @@ Page({
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
         const { item } = e.currentTarget.dataset;
-        wx.navigateTo({ url: `/pages/sthropen/info?id=${item._id}` })
+        wx.navigateTo({ url: `/pages/stuAdmin/open/info?id=${item._id}` })
     },
     // 分页
     toPage: function () {

pages/sthropen/list.json → pages/stuAdmin/open/list.json


pages/sthropen/list.less → pages/stuAdmin/open/list.less


pages/sthropen/list.wxml → pages/stuAdmin/open/list.wxml


pages/sthropen/list.wxss → pages/stuAdmin/open/list.wxss


pages/sthrprivate/info.js → pages/stuAdmin/private/info.js


pages/sthrprivate/info.json → pages/stuAdmin/private/info.json


pages/sthrprivate/info.less → pages/stuAdmin/private/info.less


pages/sthrprivate/info.wxml → pages/stuAdmin/private/info.wxml


pages/sthrprivate/info.wxss → pages/stuAdmin/private/info.wxss


+ 1 - 1
pages/sthrprivate/list.js

@@ -19,7 +19,7 @@ Page({
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
         const { item } = e.currentTarget.dataset;
-        wx.navigateTo({ url: `/pages/sthrprivate/info?id=${item._id}` })
+        wx.navigateTo({ url: `/pages/stuAdmin/private/info?id=${item._id}` })
     },
     // 分页
     toPage: function () {

pages/sthrprivate/list.json → pages/stuAdmin/private/list.json


pages/sthrprivate/list.less → pages/stuAdmin/private/list.less


pages/sthrprivate/list.wxml → pages/stuAdmin/private/list.wxml


pages/sthrprivate/list.wxss → pages/stuAdmin/private/list.wxss


pages/sthrschool/info.js → pages/stuAdmin/school/info.js


pages/sthrschool/info.json → pages/stuAdmin/school/info.json


+ 1 - 1
pages/sthrschool/info.less

@@ -1,5 +1,5 @@
 .main {
-    height: var(--twoHeight);
+    background-color: var(--mainColor);
 
     .one {
         width: 96vw;

pages/sthrschool/info.wxml → pages/stuAdmin/school/info.wxml


+ 1 - 1
pages/sthrschool/info.wxss

@@ -1,5 +1,5 @@
 .main {
-  height: var(--twoHeight);
+  background-color: var(--mainColor);
 }
 .main .one {
   width: 96vw;

+ 1 - 1
pages/sthrschool/list.js

@@ -19,7 +19,7 @@ Page({
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
         const { item } = e.currentTarget.dataset;
-        wx.navigateTo({ url: `/pages/sthrschool/info?id=${item.school_id}` })
+        wx.navigateTo({ url: `/pages/stuAdmin/school/info?id=${item.school_id}` })
     },
     // 分页
     toPage: function () {

pages/sthrschool/list.json → pages/stuAdmin/school/list.json


pages/sthrschool/list.less → pages/stuAdmin/school/list.less


pages/sthrschool/list.wxml → pages/stuAdmin/school/list.wxml


pages/sthrschool/list.wxss → pages/stuAdmin/school/list.wxss


pages/sthrstudystat/list.js → pages/stuAdmin/study/list.js


pages/sthrstudystat/list.json → pages/stuAdmin/study/list.json


pages/sthrstudystat/list.less → pages/stuAdmin/study/list.less


pages/sthrstudystat/list.wxml → pages/stuAdmin/study/list.wxml


pages/sthrstudystat/list.wxss → pages/stuAdmin/study/list.wxss


+ 8 - 8
utils/dict.js

@@ -52,7 +52,7 @@ export const school_menu = [
                 title: '羽校管理',
                 icon: 'icon-xuexiao',
                 btn: [
-                    { title: '学校信息', route: 'soneschool/list', icon: 'icon-xuexiao_xuexiaoxinxi' },
+                    { title: '学校信息', route: '/soneschool/list', icon: 'icon-xuexiao_xuexiaoxinxi' },
                     { title: '教练信息', route: 'sonecoach/list', icon: 'icon-jiaolian1' },
                     { title: '审批教练费', route: 'sonefee/list', icon: 'icon-tianshenpi' },
                     { title: '学员信息', route: 'sonestudent/list', icon: 'icon-zaiduxueyuan' },
@@ -89,25 +89,25 @@ export const school_menu = [
                 title: '信息管理',
                 icon: 'icon-yonghu',
                 btn: [
-                    { title: '个人档案', route: 'sthrfiles/list', icon: 'icon-weibiaoti1' },
-                    { title: '教练信息', route: 'sthrcoach/list', icon: 'icon-weibiaoti1' },
+                    { title: '个人档案', route: 'stuAdmin/archives/list', icon: 'icon-weibiaoti1' },
+                    { title: '教练信息', route: 'stuAdmin/coach/list', icon: 'icon-weibiaoti1' },
                 ]
             },
             {
                 title: '羽校管理',
                 icon: 'icon-yonghu',
                 btn: [
-                    { title: '羽校信息', route: 'sthrschool/list', icon: 'icon-xuexiao' },
-                    { title: '公开课信息', route: 'sthropen/list', icon: 'icon-gongkaikekaifangke' },
-                    { title: '私教课信息', route: 'sthrprivate/list', icon: 'icon-yewutubiaosi' },
+                    { title: '羽校信息', route: 'stuAdmin/school/list', icon: 'icon-xuexiao' },
+                    { title: '公开课信息', route: 'stuAdmin/open/list', icon: 'icon-gongkaikekaifangke' },
+                    { title: '私教课信息', route: 'stuAdmin/private/list', icon: 'icon-yewutubiaosi' },
                 ]
             },
             {
                 title: '统计分析',
                 icon: 'icon-yonghu',
                 btn: [
-                    { title: '学校学习情况', route: 'sthrstudystat/list', icon: 'icon-xuexi-icon' },
-                    { title: '付费情况', route: 'sthrfeestat/list', icon: 'icon-fufei' },
+                    { title: '学校学习情况', route: 'stuAdmin/study/list', icon: 'icon-xuexi-icon' },
+                    { title: '付费情况', route: 'stuAdmin/fee/list', icon: 'icon-fufei' },
                 ]
             },
         ]