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

app.json

@@ -3,16 +3,19 @@
         "pages/index/index",
         "pages/register/index",
         "pages/school/index",
+        "pages/school/info",
         "pages/smy/index",
-        "pages/suser/list",
-        "pages/suser/add",
-        "pages/suser/bind",
-        "pages/sadmin/list",
-        "pages/sadmin/add",
-        "pages/scoach/list",
-        "pages/scoach/add",
-        "pages/sstudent/list",
-        "pages/sstudent/add",
+        "pages/superAdmin/suser/list",
+        "pages/superAdmin/suser/add",
+        "pages/superAdmin/suser/bind",
+        "pages/superAdmin/sadmin/list",
+        "pages/superAdmin/sadmin/add",
+        "pages/superAdmin/scoach/list",
+        "pages/superAdmin/scoach/add",
+        "pages/superAdmin/sstudent/list",
+        "pages/superAdmin/sstudent/add",
+        "pages/superAdmin/system/dictionary",
+        "pages/superAdmin/system/adddictionary",
         "pages/club/index",
         "pages/match/index",
         "pages/other/agree",
@@ -20,8 +23,6 @@
         "pages/test/index",
         "pages/logs/logs",
         "pages/user/basic",
-        "pages/system/dictionary",
-        "pages/system/adddictionary",
         "pages/setting/basic",
         "pages/setting/contact",
         "pages/soneschool/list",

app.wxss

@@ -31,6 +31,8 @@ page {
     /* 底部菜单背景颜色 */
     --footColor: #f1f1f1;
     /* 字体大小 */
+    --font20Szie: 20px;
+    --font19Szie: 19px;
     --font18Szie: 18px;
     --font17Size: 17px;
     --font16Size: 16px;

pages/register/index.js

@@ -71,6 +71,18 @@ Page({
 
         }
     },
+    // 游客登录
+    touristSubmit: async function () {
+        let wxInfo = app.globalData.wxInfo;
+        let params = { openid: wxInfo.openid, type: '10', name: '游客' };
+        const arr = await app.$post('/user', params)
+        if (arr.errcode == '0') {
+            wx.showToast({ title: `游客注册成功`, icon: 'success', duration: 2000 });
+            wx.redirectTo({ url: '/pages/index/index' });
+        } else {
+            wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 })
+        }
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/register/index.wxml

@@ -30,7 +30,7 @@
                 </view>
                 <view class="btn">
                     <button type="primary" size="mini" formType="submit">提交注册</button>
-                    <button type="warn" size="mini">游客登录</button>
+                    <button type="warn" size="mini" bindtap="touristSubmit">游客登录</button>
                 </view>
                 <view class="agree">
                     <label>

pages/school/index.js

@@ -2,7 +2,12 @@ const app = getApp()
 Page({
     data: {
         frameStyle: { useTop: true, name: '羽校', leftArrow: false, useBar: true },
-        user: {}
+        user: {},
+        list: [],
+        total: 0,
+        page: 0,
+        skip: 0,
+        limit: 5,
     },
     // 跳转菜单
     tabPath(e) {
@@ -11,8 +16,31 @@ Page({
     },
     // 进入系统
     toJoin: function () {
+        that.setData({ skip: 0, page: 0, list: [] })
         wx.navigateTo({ url: `/pages/smy/index` })
     },
+    // 查看详情
+    toView: function (e) {
+        const that = this;
+        const { item } = e.currentTarget.dataset;
+        that.setData({ skip: 0, page: 0, list: [] })
+        wx.navigateTo({ url: `/pages/school/info?id=${item._id}` })
+    },
+    // 分页
+    toPage: function () {
+        const that = this;
+        let list = that.data.list;
+        let limit = that.data.limit;
+        if (that.data.total > list.length) {
+            wx.showLoading({ title: '加载中', mask: true })
+            let page = that.data.page + 1;
+            that.setData({ page: page })
+            let skip = page * limit;
+            that.setData({ skip: skip })
+            that.watchLogin();
+            wx.hideLoading()
+        } else { wx.showToast({ title: '没有更多数据了', icon: 'none', duration: 2000 }) }
+    },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -36,6 +64,12 @@ Page({
             key: 'user',
             success: async res => {
                 that.setData({ user: res.data })
+                let info = { skip: that.data.skip, limit: that.data.limit };
+                const arr = await app.$get(`/school`, { ...info });
+                if (arr.errcode == '0') {
+                    that.setData({ list: [...that.data.list, ...arr.data] });
+                    that.setData({ total: arr.total })
+                } else { wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 }); }
             },
             fail: async res => {
                 wx.redirectTo({ url: '/pages/index/index' })

pages/school/index.less

@@ -7,6 +7,7 @@
         flex-direction: row;
         padding: 2vw;
         border-bottom: 1px solid var(--f1Color);
+        margin: 0 0 2vw 0;
 
         .one_1 {
             flex-grow: 1;
@@ -30,6 +31,84 @@
     }
 
     .two {
-        background-color: #ffffff;
+        position: relative;
+        flex-grow: 1;
+        background-color: var(--whiteColor);
+        padding: 0 2vw;
+
+        .list {
+            background-color: var(--f9Color);
+            margin: 0 0 2vw 0;
+            padding: 2vw;
+            margin: 0 2vw 2vw 2vw;
+            border-radius: 5px;
+
+            .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);
+                }
+            }
+        }
+    }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
     }
 }

pages/school/index.wxml

@@ -9,7 +9,29 @@
             </view>
         </view>
         <view class="two">
-            学校
+            <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="toPage">
+                <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">
+                            <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_2">
+                            <view class="name">{{item.name}}</view>
+                            <view class="address">{{item.address}}</view>
+                            <view class="other">
+                                <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>
+            </scroll-view>
         </view>
     </view>
 </mobile-main>

pages/school/index.wxss

@@ -7,6 +7,7 @@
   flex-direction: row;
   padding: 2vw;
   border-bottom: 1px solid var(--f1Color);
+  margin: 0 0 2vw 0;
 }
 .main .one .one_1 {
   flex-grow: 1;
@@ -25,5 +26,71 @@
   font-size: var(--font14Size);
 }
 .main .two {
-  background-color: #ffffff;
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--whiteColor);
+  padding: 0 2vw;
+}
+.main .two .list {
+  background-color: var(--f9Color);
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  margin: 0 2vw 2vw 2vw;
+  border-radius: 5px;
+}
+.main .two .list .list_1 .swiper {
+  height: 30vh;
+}
+.main .two .list .list_1 .image {
+  width: 100%;
+  height: 100%;
+}
+.main .two .list .list_2 {
+  position: absolute;
+  top: 2vw;
+  width: 92vw;
+  color: var(--whiteColor);
+}
+.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 .other {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  font-size: var(--font18Szie);
+  -webkit-text-stroke: 1px var(--blueColor);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
 }

pages/school/info.js

@@ -0,0 +1,85 @@
+const app = getApp()
+Page({
+    data: {
+        frameStyle: { useTop: true, name: '羽校信息', leftArrow: true, useBar: false },
+        user: {},
+        id: '',
+        form: {}
+    },
+    // 跳转菜单
+    back(e) {
+        wx.navigateBack({ delta: 1 })
+    },
+
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+        that.setData({ id: options.id || null })
+        // 监听用户是否登录
+        that.watchLogin();
+    },
+    // 监听用户是否登录
+    watchLogin: async function () {
+        const that = this;
+        wx.getStorage({
+            key: 'user',
+            success: async res => {
+                if (that.data.id) {
+                    const arr = await app.$get(`/school/${that.data.id}`)
+                    if (arr.errcode == '0') {
+                        that.setData({ form: arr.data })
+                    } else {
+                        wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 })
+                    }
+                }
+            },
+            fail: async res => {
+                wx.redirectTo({ url: '/pages/index/index' })
+            }
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () { },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/school/info.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        "mobile-main": "/commpents/mobile-frame/index"
+    }
+}

pages/school/info.less

@@ -0,0 +1,7 @@
+.main {
+
+    background-color: var(--mainColor);
+
+  
+}
+

pages/school/info.wxml

@@ -0,0 +1,5 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="container main">
+        {{form.name}}
+    </view>
+</mobile-main>

pages/setting/basic.js

@@ -43,6 +43,10 @@ Page({
             that.setData({ 'form.zhGender': data.label })
         }
     },
+    typeChange: function (e) {
+        const { value } = e.detail;
+        if (value == '0') wx.showToast({ title: `如进行身份切换，请在维护信息成功后退出登录，系统会自动进行身份置换！`, icon: 'none', duration: 2000 })
+    },
     // 提交登录
     onSubmit: async function (e) {
         const that = this;

pages/setting/basic.wxml

@@ -28,6 +28,19 @@
                         <input name="phone" value="{{form.phone}}" placeholder="请输入手机号" />
                     </view>
                 </view>
+                <view class="content" wx:if="{{form.type=='10'}}">
+                    <view class="label">是否成为正式用户：</view>
+                    <view class="value">
+                        <radio-group name="type" bindchange="typeChange">
+                            <label>
+                                <radio value="10" checked="{{form.type=='10'}}" />否
+                            </label>
+                            <label>
+                                <radio value="0" checked="{{form.type=='0'}}" />是
+                            </label>
+                        </radio-group>
+                    </view>
+                </view>
                 <view class="btn">
                     <button type="primary" size="mini" formType="submit">提交保存</button>
                 </view>

pages/sadmin/add.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import WxValidate from '../../utils/wxValidate'
+import WxValidate from '../../../utils/wxValidate'
 Page({
 
     /**

pages/sadmin/list.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import QRCode from '../../utils/weapp-qrcode.js';
+import QRCode from '../../../utils/weapp-qrcode.js';
 Page({
 
     /**
@@ -24,14 +24,14 @@ Page({
     toAdd() {
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: '/pages/sadmin/add' })
+        wx.navigateTo({ url: '/pages/superAdmin/sadmin/add' })
     },
     // 修改
     toEdit: function (e) {
         const that = this;
         let { item } = e.currentTarget.dataset;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: `/pages/sadmin/add?id=${item.id}` })
+        wx.navigateTo({ url: `/pages/superAdmin/sadmin/add?id=${item.id}` })
     },
     // 删除
     toDel: async function (e) {

pages/scoach/add.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import WxValidate from '../../utils/wxValidate'
+import WxValidate from '../../../utils/wxValidate'
 
 Page({
 

pages/scoach/list.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import QRCode from '../../utils/weapp-qrcode.js';
+import QRCode from '../../../utils/weapp-qrcode.js';
 Page({
 
     /**
@@ -26,14 +26,14 @@ Page({
     toAdd() {
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: '/pages/scoach/add' })
+        wx.navigateTo({ url: '/pages/superAdmin/scoach/add' })
     },
     // 修改
     toEdit: function (e) {
         const that = this;
         let { item } = e.currentTarget.dataset;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: `/pages/scoach/add?id=${item.id}` })
+        wx.navigateTo({ url: `/pages/superAdmin/scoach/add?id=${item.id}` })
     },
     // 删除
     toDel: async function (e) {

pages/sstudent/add.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/sstudent/list.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import QRCode from '../../utils/weapp-qrcode.js';
+import QRCode from '../../../utils/weapp-qrcode.js';
 Page({
 
     /**

pages/sstudent/list.wxml

@@ -5,7 +5,7 @@
                 <input type="text" placeholder="请输入关键词" />
             </view>
             <view class="one_2">
-                <button type="primary" bindtap="toCommon" data-route="sstudent/add">添加</button>
+                <button type="primary" bindtap="toCommon" data-route="superAdmin/sstudent/add">添加</button>
             </view>
         </view>
         <view class="two">
@@ -23,7 +23,7 @@
                             </view>
                         </view>
                         <view class="btn">
-                            <button size="mini" type="primary" bindtap="toCommon" data-route="sstudent/add" data-item="{{item}}">信息维护</button>
+                            <button size="mini" type="primary" bindtap="toCommon" data-route="superAdmin/sstudent/add" data-item="{{item}}">信息维护</button>
                             <button size="mini" type="primary" bindtap="toBind" data-item="{{item}}">账号绑定</button>
                             <button size="mini" type="primary" bindtap="toDel" data-item="{{item}}">信息删除</button>
                         </view>

pages/suser/add.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import WxValidate from '../../utils/wxValidate'
+import WxValidate from '../../../utils/wxValidate'
 Page({
 
     /**

pages/superAdmin/suser/bind.wxss

@@ -0,0 +1,3 @@
+.main {
+  background-color: var(--mainColor);
+}

pages/suser/list.js

@@ -20,14 +20,14 @@ Page({
     // 信息添加
     toAdd: function () {
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: `/pages/suser/add` })
+        wx.navigateTo({ url: `/pages/superAdmin/suser/add` })
     },
     // 信息维护
     toEdit: function (e) {
         const that = this;
         const { item } = e.currentTarget.dataset;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: `/pages/suser/add?id=${item.id}` })
+        wx.navigateTo({ url: `/pages/superAdmin/suser/add?id=${item.id}` })
     },
     // 信息删除
     toDel: async function (e) {

pages/system/adddictionary.js

@@ -1,6 +1,6 @@
 const app = getApp()
-import WxValidate from '../../utils/wxValidate'
-const moment = require("../../utils/moment.min")
+import WxValidate from '../../../utils/wxValidate'
+const moment = require("../../../utils/moment.min")
 Page({
 
     /**

pages/system/dictionary.js

@@ -20,14 +20,14 @@ Page({
     toAdd: function () {
         const that = this;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: `/pages/system/adddictionary` })
+        wx.navigateTo({ url: `/pages/superAdmin/system/adddictionary` })
     },
     // 信息维护
     toEdit: function (e) {
         const that = this;
         const { item } = e.currentTarget.dataset;
         that.setData({ skip: 0, page: 0, list: [] })
-        wx.navigateTo({ url: `/pages/system/adddictionary?id=${item.id}` })
+        wx.navigateTo({ url: `/pages/superAdmin/system/adddictionary?id=${item.id}` })
     },
     // 信息删除
     toDel: async function (e) {

utils/dict.js

@@ -26,17 +26,17 @@ export const school_menu = [
                 title: '用户管理',
                 icon: 'icon-yonghu',
                 btn: [
-                    { title: '账号管理', route: 'suser/list', icon: 'icon-putongyonghu' },
-                    { title: '羽校信息', route: 'sadmin/list', icon: 'icon-xitongguanli-yonghuchaxun' },
-                    { title: '教练信息', route: 'scoach/list', icon: 'icon-jiaolian1' },
-                    { title: '学员信息', route: 'sstudent/list', icon: 'icon-zaiduxueyuan' },
+                    { title: '账号管理', route: 'superAdmin/suser/list', icon: 'icon-putongyonghu' },
+                    { title: '羽校信息', route: 'superAdmin/sadmin/list', icon: 'icon-xitongguanli-yonghuchaxun' },
+                    { title: '教练信息', route: 'superAdmin/scoach/list', icon: 'icon-jiaolian1' },
+                    { title: '学员信息', route: 'superAdmin/sstudent/list', icon: 'icon-zaiduxueyuan' },
                 ]
             },
             {
                 title: '系统设置',
                 icon: 'icon-shouye',
                 btn: [
-                    { title: '字典表管理', route: 'system/dictionary', icon: 'icon-zidianbiaoguanli' },
+                    { title: '字典表管理', route: 'superAdmin/system/dictionary', icon: 'icon-zidianbiaoguanli' },
                 ]
             },
         ]