diff --git a/src/pages.json b/src/pages.json
index 10ba51b..35b09b5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -132,6 +132,30 @@
}
},
{
+ "path": "pages/mine_trainee/mine_trainee",
+ "style": {
+ "navigationBarTitleText": "我的学员"
+ }
+ },
+ {
+ "path": "pages/site/manage/manage",
+ "style": {
+ "navigationBarTitleText": "选择场次"
+ }
+ },
+ {
+ "path": "pages/site/confirm/confirm",
+ "style": {
+ "navigationBarTitleText": "确认订单"
+ }
+ },
+ {
+ "path": "pages/time/select/select",
+ "style": {
+ "navigationBarTitleText": "确认订单"
+ }
+ },
+ {
"path": "pages/login/login",
"style": {
}
diff --git a/src/pages/mine_trainee/mine_trainee.vue b/src/pages/mine_trainee/mine_trainee.vue
new file mode 100644
index 0000000..abdbf58
--- /dev/null
+++ b/src/pages/mine_trainee/mine_trainee.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+ #Adjoin
+
+
+
+ 00000000000
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
new file mode 100644
index 0000000..deccc8f
--- /dev/null
+++ b/src/pages/site/confirm/confirm.vue
@@ -0,0 +1,261 @@
+
+
+
+
+
+
+ {{occupyInfo.storeInfo.name || '-'}}
+
+
+ 地址：
+ {{occupyInfo.storeInfo.venue_addr || '-'}}
+
+
+
+
+ 预定项目：
+ {{occupyInfo.typeInfo.name || '-'}}
+
+
+ 预定日期：
+ {{occupyInfo.dateInfo.dayStr || '-'}}({{occupyInfo.dateInfo.showDateStr || '-'}})
+
+
+ 预定场次：
+
+
+ {{e.parentObj.name || '-'}} {{e.time || '-'}} (¥{{e.price || '-'}})
+
+
+
+
+
+
+ 收取金额
+
+
+
+ 占用原因
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue
new file mode 100644
index 0000000..c973341
--- /dev/null
+++ b/src/pages/site/manage/manage.vue
@@ -0,0 +1,706 @@
+
+
+
+
+
+
+ {{e.dayStr || '-'}}
+ {{e.showDateStr || '-'}}
+
+
+
+
+
+
+ {{e.duration || '-'}}
+
+
+
+ {{e.name || '-'}}
+
+
+ {{
+ k.is_take_up?'已占用':
+ !k.is_valid?'已售':`¥${k.price || 0}`
+ }}
+
+
+
+
+
+
+
+
+
+
+ 已选择场次4
+ 清空
+
+
+
+ {{e.time || '-'}}
+ {{e.parentObj.name || '-'}}
+
+
+
+
+
+
+
+ {{e}}
+
+
+
+ ¥{{totalPrice || '0.00'}}
+
+ {{selectedVenueList.length?'提交订单':'请选择场地'}}
+
+
+
+
+ {{occupyTip || '-'}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/time/select/select.vue b/src/pages/time/select/select.vue
new file mode 100644
index 0000000..e768a80
--- /dev/null
+++ b/src/pages/time/select/select.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+ 日期
+ 时间
+
+
+
+ 周四
+ 6月11日
+
+
+
+
+
+ 10:00
+
+
+
+
+
+
+
+
+
+
+ 可直接点击上方白色/灰色区域切换状态。
+
+
+
+ 空闲
+
+
+
+ 不可选
+
+
+
+ 课程/预约
+
+
+ 快速预约时间
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/store/actions.js b/src/store/actions.js
index 73e1a6d..8ce589f 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -2,15 +2,15 @@
import { servers } from '../js/server';
import { API } from '../js/api';
export default {
- getBrandInfo({commit, state}){
- return servers.get({
- url: API.calc,
- data: {},
- failMsg: '加载数据失败！'
- })
- .then(res=>{
- commit('setBrandInfo',res);
- return res;
- })
- }
+ // getBrandInfo({commit, state}){
+ // return servers.get({
+ // url: API.calc,
+ // data: {},
+ // failMsg: '加载数据失败！'
+ // })
+ // .then(res=>{
+ // commit('setBrandInfo',res);
+ // return res;
+ // })
+ // }
}
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index a776071..cb15e5f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,53 +2,53 @@ import Vue from 'vue';
import Vuex from 'vuex';
import mutations from './mutations';
import actions from './actions';
-import device from './device';
+// import device from './device';
Vue.use(Vuex);
export default new Vuex.Store({
modules: {
- device
+ // device
},
state: {
- // #ifdef H5
- APPID: uni.getAccountInfoSync().miniProgram.appId,
- // #endif
- brandInfo: {
- brand: {}
- },
- permissionObj: { // 权限代号对应
- '1001': '营业额',
- '1002': '收款记录',
- '1003': '经营分析',
- '1004': '预约订单',
- '1005': '会员卡订单',
- '1006': '积分订单',
- '1007': '员工管理',
- '1008': '查询核销',
- '1009': '场地管理',
- '1010': '设备管理',
- },
+ // // #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: [], // 选择场地列表
- }
+ // // 场地占用提交页面信息
+ // occupyInfo: {
+ // storeInfo: {}, // 店铺信息
+ // dateInfo: {}, // 时间信息
+ // typeInfo: {}, // 球场类型
+ // venueList: [], // 选择场地列表
+ // }
},
mutations,
actions,
getters: {
- permissionArr: state=>{
- let _arr = [], _obj = state.permissionObj;
- for(let key in _obj){
- _arr.push({
- key,
- name: _obj[key],
- })
- }
- return _arr;
- }
+ // permissionArr: state=>{
+ // let _arr = [], _obj = state.permissionObj;
+ // for(let key in _obj){
+ // _arr.push({
+ // key,
+ // name: _obj[key],
+ // })
+ // }
+ // return _arr;
+ // }
}
});
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 99d4083..8c34132 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -2,14 +2,14 @@
export default {
- // 设置品牌信息
- setBrandInfo(state, brandInfo){
- // console.log(storeInfo,'-----')
- state.brandInfo = brandInfo
- },
+ // // 设置品牌信息
+ // setBrandInfo(state, brandInfo){
+ // // console.log(storeInfo,'-----')
+ // state.brandInfo = brandInfo
+ // },
- // 场地占用信息
- setOccupyInfo(state, _occupyInfo){
- state.occupyInfo = _occupyInfo;
- }
+ // // 场地占用信息
+ // setOccupyInfo(state, _occupyInfo){
+ // state.occupyInfo = _occupyInfo;
+ // }
}
\ No newline at end of file