From 5b34e689d660947cb63591c861d6c76caf51c7ec Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Sun, 31 Jan 2021 18:03:17 +0800
Subject: [PATCH] add all

---
 src/App.vue                         |   5 ++
 src/js/api.js                       |   4 +-
 src/js/server.js                    |  16 +++++-
 src/main.js                         |   6 +-
 src/pages/course/list/list.vue      |  47 +++++++++++----
 src/pages/index/index.vue           |  48 +++++++++++++---
 src/pages/login/login.vue           | 112 +++++++++++++++++++-----------------
 src/pages/store_list/store_list.vue |  43 +++++++++++---
 src/static/images/arrow_cff.png     | Bin 0 -> 333 bytes
 src/store/index.js                  |  28 +--------
 src/store/mutations.js              |   9 ++-
 11 files changed, 199 insertions(+), 119 deletions(-)
 create mode 100644 src/static/images/arrow_cff.png

diff --git a/src/App.vue b/src/App.vue
index 40fdd98..8284ccd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,11 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
+		},
+		methods: {
+			isLogin(){
+				return !!uni.getStorageSync('loginInfo');
+			}
 		}
 	}
 </script>
diff --git a/src/js/api.js b/src/js/api.js
index b433f72..1433d24 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -5,6 +5,9 @@ export const ORIGIN = `http://kahing.local:9090`;  //  本地测试
 export const API = {
   coachLogin: `${ORIGIN}/stadium/coach/login`,  // 小程序-账号登录
   getCoachCourseTimes: `${ORIGIN}/stadium/coach/getCoachCourseTimes`,  // 小程序-账号登录
+
+  getHomeData: `${ORIGIN}/stadium/coach/getHomeData`,  // 小程序-获取教练主页的数据
+
   saveFeedback: `${ORIGIN}/stadium/coach/saveFeedback`,   // 小程序-保存教练反馈
 
   coach_feedback: `${ORIGIN}/upload/file/coach_feedback`,   // 上传文件 
@@ -15,7 +18,6 @@ API['course'] = {
   courseList: `${ORIGIN}/stadium/coach/courseList`,  // 小程序-课程列表
   getClassList: `${ORIGIN}/stadium/coach/getClassList`,  // 小程序-班级列表
   getCourseStudentList: `${ORIGIN}/stadium/coach/getCourseStudentList`,  // 小程序-学员列表
-  getCourseStudentList: `${ORIGIN}/stadium/coach/getCourseStudentList`,  // 小程序-学员列表
   SaveStudentComment: `${ORIGIN}/stadium/coach/SaveStudentComment`,  // 小程序-学员点评保存
   courseList: `${ORIGIN}/stadium/coach/courseList`,  // 小程序-课程列表
 }
diff --git a/src/js/server.js b/src/js/server.js
index 76456ae..c14b2bc 100644
--- a/src/js/server.js
+++ b/src/js/server.js
@@ -1,6 +1,6 @@
 import util from '../utils/util';
 // import { app as vm } from '../main';
-const islog = true;
+const islog = false;
 
 export class Server {
   request(url,data,method,header,isDefaultGet,failMsg){
@@ -9,8 +9,12 @@ export class Server {
           // let storeInfo = _store.state.storeInfo || null;
           // if(storeInfo)data['brand_id'] = storeInfo.brand_id;
           const _loginInfo = uni.getStorageSync('loginInfo');
-         
-          if(_loginInfo || true){
+          if(!_loginInfo&&!data.isSkipCheck){
+            
+            setTimeout(_=>util.routeTo(`/pages/login/login`, 'rL'), 10)
+            return Promise.reject('not logged in')
+          }
+          if(_loginInfo){
             data = Object.assign({ 
               coach_token: _loginInfo.coach_token || '7a04dc20-62c0-11eb-8979-00e04c0166b9',
               brand_id: _loginInfo.brand_id || '63',
@@ -24,6 +28,12 @@ export class Server {
               method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
               header: {...header}, // 设置请求的 header // {'custom-header': 'application/json'}
               success: res=>{
+                if(res.data.code == 10001){
+                  util.showNone(res.data.message || '校验失败！')
+                  setTimeout(_=>util.routeTo(`/pages/login/login`, 'rL'), 1200);
+                  console.warn('校验失败---->', res);
+                  return Promise.reject(res)
+                }
                 if(islog)console.log('req success---->',{
                     link: url,
                     query: data,
diff --git a/src/main.js b/src/main.js
index 7f88dd0..95c7132 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,11 +1,11 @@
 import Vue from 'vue'
 import App from './App'
-
+import store from './store/index.js';
 Vue.config.productionTip = false
-
 App.mpType = 'app'
 
 const app = new Vue({
-  ...App
+  ...App,
+  store
 })
 app.$mount()
diff --git a/src/pages/course/list/list.vue b/src/pages/course/list/list.vue
index e08fe4f..57d48ef 100644
--- a/src/pages/course/list/list.vue
+++ b/src/pages/course/list/list.vue
@@ -11,15 +11,18 @@
                         <view>{{e.name || '-'}}</view>
                         <view>{{e.kind || '-'}}</view>
                     </view>
-                    <view class="ci-lines">
+                    <view class="ci-lines" v-if="getCourseType(e.kind) === 0">
                         <text>班级数: </text>{{e.class_number || 0}}
                     </view>
                     <view class="ci-lines">
                         <text>学员人数: </text>{{e.join_person_number || 0}}
                     </view>
                     <view class="cl-btns">
-                        <view>预约上课</view>
-                        <view>班级</view>
+                        <block v-if="getCourseType(e.kind) === 0">
+                            <view hover-class="hover-active" @click="orderCourseBtn">预约上课</view>
+                            <view hover-class="hover-active" @click="toClass(e)">班级</view>
+                        </block>
+                        <view hover-class="hover-active" v-if="getCourseType(e.kind) === 1">详情</view>
                     </view>
                 </view>
                 <view class="cl-ex-item" v-if="curTabIdx == 1">
@@ -35,14 +38,14 @@
             </block>
             
         </view>
-        <view class="cl-mask" v-if="false">
+        <view class="cl-mask" v-if="isOrderCourseModal">
             <view class="cl-modal">
                 <view class="cm-line">
                     <view>选择班级</view>
                     <picker>
                         <view class="cl-frame">
                             <input disabled placeholder="请选择班级" />
-                            <image></image>
+                            <image mode="aspectFit" src="/static/images/arrow_cb2.png"></image>
                         </view>
                     </picker>
                 </view>
@@ -51,7 +54,7 @@
                     <picker mode="date">
                         <view class="cl-frame">
                             <input disabled placeholder="请选择日期" />
-                            <image></image>
+                            <image mode="aspectFit" src="/static/images/arrow_cb2.png"></image>
                         </view>
                     </picker>
                 </view>
@@ -61,21 +64,21 @@
                         <picker mode="time">
                             <view class="cc-frame">
                                 <input disabled placeholder="请选择时间"/>
-                                <image></image>
+                                <image mode="aspectFit" src="/static/images/arrow_cb2.png"></image>
                             </view>
                         </picker>
                         <view>-</view>
                         <picker mode="time">
                             <view class="cc-frame">
                                 <input disabled placeholder="请选择时间"/>
-                                <image></image>
+                                <image mode="aspectFit" src="/static/images/arrow_cb2.png"></image>
                             </view>
                         </picker>
                     </view>
                 </view>
                 <view class="cm-btns">
-                    <view hover-class="hover-active">取消</view>
-                    <view hover-class="hover-active">确定</view>
+                    <view hover-class="hover-active" @click="isOrderCourseModal = false">取消</view>
+                    <view hover-class="hover-active" @click="isOrderCourseModal = false">确定</view>
                 </view>
             </view>
         </view>
@@ -87,17 +90,37 @@
 import { API } from '../../../js/api'
 import { servers } from '../../../js/server'
 import util from '../../../utils/util'
+import { mapState } from 'vuex';
 export default {
+    computed: {
+        ...mapState([ 'storeInfo' ]),
+    },
     data(){
         return {
             curTabIdx: 0,
             courseList: [],
+            isOrderCourseModal: false,
         }
     },
     onLoad(){
         this.getCourseList({});
     },
     methods: {
+        toClass(e){
+            console.warn(e);
+            let _query = {
+                course_id: e.id,
+                course_name: e.name,
+            }
+            util.routeTo(`/pages/course/class_list/class_list?query=${util.jsonStr(_query)}`, 'nT');
+        },
+        orderCourseBtn(){
+            this.isOrderCourseModal = true; 
+        },
+        // 课程类型映射 成班课(0)/私教课(1);
+        getCourseType(type = ''){
+            return ['成班课', '私教课'].findIndex(e=>e===type);
+        },  
         tabChange: util.debounce(function(i){
             this.curTabIdx = i;
             this.courseList = [];
@@ -109,10 +132,12 @@ export default {
             is_experience_class = 0,
             kind = '',
         }){
+            let { storeInfo } = this;
             util.showLoad();
             servers.get({
                 url: API.course.courseList,
                 data: {
+                    stadium_id: storeInfo.id,
                     is_experience_class,
                     kind,
                 },
@@ -311,7 +336,6 @@ export default {
                     flex-shrink: 0;
                     width: 28upx;
                     height: 28upx;
-                    background-color: skyblue;
                 }
             }
             .cl-content{
@@ -340,7 +364,6 @@ export default {
                         flex-shrink: 0;
                         width: 28upx;
                         height: 28upx;
-                        background-color: skyblue;
                     }
                 }
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 9dee164..0596de6 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,11 +1,16 @@
 <template>
 	<view class="index-container">
 		<view class="ic-header">
-			<button hover-class="hover-active" @click="toLogin">前往登录</button>
-			<!-- <view class="ih-store-name">
-				<view>广州欧轩智能场馆(共6家)</view>
-				<image></image>
-			</view> -->
+			<button v-if="!isLogin" hover-class="hover-acti ve" @click="toLogin">前往登录</button>
+			<view v-else class="ih-store-name">
+				<view 
+					@click="toStoreList"
+				>
+					{{storeInfo.name || '-'}}
+					<text v-if="indexData.stadium_data">共({{indexData.stadium_data.length}}家)</text>
+				</view>
+				<image mode="aspectFit" src="/static/images/arrow_cff.png"></image>
+			</view>
 			<view class="ih-tip">本月课时</view>
 			<view class="ih-num">{{ course_times || 0 }}</view>
 		</view>
@@ -37,9 +42,11 @@
 </template>
 <script>
 	import authorize_modal from '../../components/authorize_modal/authorize_modal';
-import { API } from '../../js/api';
-import { servers } from '../../js/server';
-import util from '../../utils/util';
+	import { API } from '../../js/api';
+	import { servers } from '../../js/server';
+	import util from '../../utils/util';
+	const app = getApp();
+	import { mapState } from 'vuex';
 	const tabInfoArr = [
 		{
 			id: '1',
@@ -83,16 +90,25 @@ import util from '../../utils/util';
 		components: {
 			'authorize-modal': authorize_modal
 		},
+		computed: {
+			...mapState([ 'storeInfo' ]),
+		},
 		data(){
 			return {
+				isLogin: app.isLogin(),
 				tabInfoArr,
 				course_times: 0, // 本月课时
+				indexData: {},
 			}
 		},
 		onLoad(){
 			this.getCoachCourseTimes();
+			this.getHomeData();
 		},
 		methods: {
+			toStoreList(){
+				util.routeTo('/pages/store_list/store_list', 'nT');
+			},
 			getCoachCourseTimes(){
 				servers.get({
 					url: API.getCoachCourseTimes,
@@ -104,10 +120,24 @@ import util from '../../utils/util';
 					this.course_times = res.course_times
 				})
 			},
+			getHomeData(){
+				util.showLoad();
+				servers.get({
+					url: API.getHomeData,
+					data: {},
+					failMsg: '加载失败！'
+				})
+				.then(res=>{
+					util.hideLoad();
+					this.indexData = res;
+					let _storeList = res.stadium_data || [];
+					// return console.warn(this.$store)
+					if(_storeList.length)this.$store.commit('setStoreInfo', _storeList[0])
+				})
+			},
 			tabClick(e){
 				if(e.path === '')return util.showNone('开发中');
 				util.routeTo(e.path, 'nT');
-				console.warn(e);
 			},
 			toLogin(){
 				util.routeTo(`/pages/login/login`, 'nT');
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 8c2a27c..8287fa0 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -57,74 +57,80 @@ export default {
                     account,
                     password,
                     brand_id,
+                    isSkipCheck: true
                 },
                 isDefaultGet: false
             })
             .then(res=>{
                 if(res.data.code == 0){
+                    util.showNone('登陆成功！');
+                    uni.setStorageSync('loginInfo', res.data.data || {});
+                    setTimeout(_=>{
+                        util.routeTo(`/pages/index/index`, 'rL');
+                    }, 1200)
                     console.warn(res);
                 }else{
                     util.showNone(res.data.message || '操作失败！');
                 }
-                console.log(res);
             })
+            .catch(util.hideLoad)
         },
         
-        async submitBtn(userRes){
-            try{
-                util.showLoad();
-                if(!userRes.detail.userInfo){
-                    util.hideLoad();
-                    return util.showNone('获取用户信息失败！请稍后重试');
-                }
+        // async submitBtn(userRes){
+        //     try{
+        //         util.showLoad();
+        //         if(!userRes.detail.userInfo){
+        //             util.hideLoad();
+        //             return util.showNone('获取用户信息失败！请稍后重试');
+        //         }
 
-                let loginRes = await uniLogin();
+        //         let loginRes = await uniLogin();
 
-                if(!loginRes.code){
-                    util.hideLoad();
-                    return util.showNone('获取登陆凭证失败！稍后重试');
-                }
-                let userInfo = userRes.detail || {};
-                console.log(userRes)
-                let { formData } = this;
-                servers.post({
-                    url: API.WechatMiniApplogin,
-                    data: {
-                        appid: APPID,
-                        code: loginRes.code,
-                        encryptedData: userInfo.encryptedData,
-                        // is_details: 1,
-                        // 后端解密错误，直接传用户信息
-                        user_info: userInfo.userInfo,
-                        user_raw_data: userInfo.rawData,
-                        ...userInfo.userInfo,
-                        username: formData.account,
-                        password: formData.password,
-                        brand_id: formData.brand_id,
-                    },
-                    isDefaultGet: false,
-                })
-                .then(res=>{
-                    util.hideLoad();
-                    let _data = res.data || {};
-                    if(_data.code == 0){
-                        util.showNone(_data.message || '操作成功！');
-                        
-                        uni.setStorageSync('token',_data.data);
-                        setTimeout(_=>{
-                            util.routeTo(`/pages/index/index`, 'rL');
-                        }, 1200);
-                    }else{
-                        util.showNone(_data.message || '操作失败！');
-                    }
+        //         if(!loginRes.code){
+        //             util.hideLoad();
+        //             return util.showNone('获取登陆凭证失败！稍后重试');
+        //         }
+        //         let userInfo = userRes.detail || {};
+        //         console.log(userRes)
+        //         let { formData } = this;
+        //         servers.post({
+        //             url: API.WechatMiniApplogin,
+        //             data: {
+        //                 appid: APPID,
+        //                 code: loginRes.code,
+        //                 encryptedData: userInfo.encryptedData,
+        //                 // is_details: 1,
+        //                 // 后端解密错误，直接传用户信息
+        //                 user_info: userInfo.userInfo,
+        //                 user_raw_data: userInfo.rawData,
+        //                 ...userInfo.userInfo,
+        //                 username: formData.account,
+        //                 password: formData.password,
+        //                 brand_id: formData.brand_id,
+        //             },
+        //             isDefaultGet: false,
+        //         })
+        //         .then(res=>{
+        //             util.hideLoad();
+        //             let _data = res.data || {};
+        //             if(_data.code == 0){
+        //                 util.showNone(_data.message || '操作成功！');
+        //                 console.warn(_data)
+        //                 uni.setStorageSync('loginInfo', _data.data);
+        //                 setTimeout(_=>{
+        //                     util.routeTo(`/pages/index/index`, 'rL');
+        //                 }, 1200);
+        //             }else{
+        //                 util.showNone(_data.message || '操作失败！');
+        //             }
                     
-                })
-                .catch(util.hideLoad)
-            }catch(err){
-                util.hideLoad();
-                console.warn('login err', err);
-            }
-        },
+        //         })
+        //         .catch(util.hideLoad)
+        //     }catch(err){
+        //         util.hideLoad();
+        //         console.warn('login err', err);
+        //     }
+        // },
         toWebView(){
             util.routeTo(`/pages/web_view/web_view`,'rL');
         }
diff --git a/src/pages/store_list/store_list.vue b/src/pages/store_list/store_list.vue
index 8a70e0e..0a006a0 100644
--- a/src/pages/store_list/store_list.vue
+++ b/src/pages/store_list/store_list.vue
@@ -1,22 +1,53 @@
 <template>
     <view class="store-list">
-        <view class="sl-item" v-for="i in 10" :key="i">
-            <image class="si-logo"></image>
+        <view class="sl-item" v-for="(e, i) in courseList" :key="i">
+            <image class="si-logo" mode="aspectFit" :src="e.logo || ''"></image>
             <view class="si-content">
                 <view class="sc-top">
-                    <view>欧轩智能场馆(羽毛球永泰店)</view>
-                    <image></image>
+                    <view>{{e.name || '-'}}</view>
+                    <image mode="aspectFit" src="/static/images/arrow_cb2.png"></image>
+                </view>
+                <!-- 20210131 pm: 去掉 营业状态-->
+                <!-- 0否/1是 -->
+                <view :class="['sc-tag', e.is_business == 1?'':'active']">
+                    <text>
+                        {{ e.is_business == 1 ?'正常营业':'暂停营业' }}
+                    </text>
                 </view>
-                <view :class="['sc-tag', i==2?'active':'']"><text>正常营业</text></view>
             </view>
         </view>
     </view>
 </template>
 
 <script>
+import { API } from '../../js/api'
+import { servers } from '../../js/server'
+import util from '../../utils/util'
 
 export default {
+    data(){
+        return {
+            courseList: [],
+        }
+    },
+    onLoad(){
+        this.getHomeData();
+    },
+    methods: {
 
+        getHomeData(){
+            servers.get({
+                url: API.getHomeData,
+                data: {},
+                failMsg: '加载失败！'
+            })
+            .then(res=>{
+                let _list = res.stadium_data || [];
+                this.courseList = _list;
+                console.warn(res, 1231321321321321313)
+            })
+        },
+    }
 }
 </script>
 
@@ -41,7 +72,6 @@ export default {
             height: 100upx;
             border-radius: 50%;
             border: 2upx solid #D8D8D8;
-            background-color: skyblue;
         }
         .si-content{
             flex-grow: 1;
@@ -66,7 +96,6 @@ export default {
                     flex-grow: 0;
                     height: 32upx;
                     width: 32upx;
-                    background-color: skyblue;
                 }
             }
             .sc-tag{
diff --git a/src/static/images/arrow_cff.png b/src/static/images/arrow_cff.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a6505ef77a390f19d3329806b7e3cabd8d36bb8
GIT binary patch
literal 333
zcmV-T0kZyyP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5_en%SR9Hvt*gXybVGzdg4T%egN~cjcfD^cZ8#si{
z8MI2JR_7E*G%A%sR8GJ%@?@ge^^puSlKC~8ecvhm+07<zwur9I>sy8}h9<0m%Q5uf
z`d|v&ieUt7Q=uYTa00feP?0^zNDCQhB_pk5q?L@cl95(2(n?k21UTYPA}_$UJGtk!
zzZtMgZGhXp%Hrge%TwiupR%|kgov91o0P<Lfg^tYGOhz0@v{InsRLx(D`DdrP!-n(
zj`@(dC9p~DA>*D2AGZQFsnBsdkl%A0^AkEw{!g<>$$9SEaW!5)wuJ$lflL165Fp2N
f`GSA*T8rWab8<8rEloUA00000NkvXXu0mjfRiuiq

literal 0
HcmV?d00001

diff --git a/src/store/index.js b/src/store/index.js
index cb15e5f..cde16fc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,32 +10,8 @@ export default new Vuex.Store({
         // device
     },
     state: {
-        // // #ifdef H5
-        // APPID: uni.getAccountInfoSync().miniProgram.appId,
-        // // #endif
-        // brandInfo: {
-        //     brand: {} 
-        // },
-        // permissionObj: { // 权限代号对应
-        //     '1001': '营业额',
-        //     '1002': '收款记录',
-        //     '1003': '经营分析',
-        //     '1004': '预约订单',
-        //     '1005': '会员卡订单',
-        //     '1006': '积分订单',
-        //     '1007': '员工管理',
-        //     '1008': '查询核销',
-        //     '1009': '场地管理',
-        //     '1010': '设备管理',
-        // },
-
-        // // 场地占用提交页面信息
-        // occupyInfo: {
-        //     storeInfo: {},  // 店铺信息
-        //     dateInfo: {},   // 时间信息 
-        //     typeInfo: {},   // 球场类型
-        //     venueList: [],  // 选择场地列表
-        // }
+        // 当前小程序店铺信息
+        storeInfo: {},
     },
     mutations,
     actions,
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 8c34132..74555f3 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -2,11 +2,10 @@
 
 
 export default {
-    // // 设置品牌信息
-    // setBrandInfo(state, brandInfo){
-    //     // console.log(storeInfo,'-----')
-    //     state.brandInfo = brandInfo
-    // },
+    // 设置店铺信息
+    setStoreInfo(state, storeInfo){
+        state.storeInfo = storeInfo
+    },
 
     // // 场地占用信息
     // setOccupyInfo(state, _occupyInfo){