diff --git a/src/js/api.js b/src/js/api.js
index 67f4729..ce231ba 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,8 +1,14 @@
-export const ORIGIN = ``; // 测试
-// export const ORIGIN = ``; // 正式
+export const ORIGIN = `https://test.ouxuanzhineng.cn`; // 测试
+// export const ORIGIN = `https://coach.ouxuanzhineng.cn`; // 正式
export const API = {
- ex: `${ORIGIN}/test/test`,
+ coachLogin: `${ORIGIN}/stadium/coach/login`, // 小程序-账号登录
+ saveFeedback: `${ORIGIN}/stadium/coach/saveFeedback`, // 小程序-保存教练反馈
+
+}
+
+API['course'] = {
+ courseList: `${ORIGIN}/stadium/coach/courseList`, // 小程序-课程列表
}
diff --git a/src/js/server.js b/src/js/server.js
index e5cebad..19be11c 100644
--- a/src/js/server.js
+++ b/src/js/server.js
@@ -4,14 +4,20 @@ const islog = true;
export class Server {
request(url,data,method,header,isDefaultGet,failMsg){
- return new Promise(async (rs,rj)=>{
+ return new Promise(async (rs,rj)=>{
// const _store = vm.$store;
// let storeInfo = _store.state.storeInfo || null;
// if(storeInfo)data['brand_id'] = storeInfo.brand_id;
+ const _loginInfo = uni.getStorageSync('loginInfo');
+
+ if(_loginInfo || true){
+ data = Object.assign({
+ coach_token: _loginInfo.coach_token || '0c30100d-5ba8-11eb-9029-5254005df464',
+ brand_id: _loginInfo.brand_id || '63',
+ }, data);
+ }
- const _token = uni.getStorageSync('token') || '';
- if(_token)data['token'] = _token;
- if(method === 'POST'&&_token)url = url + `?token=${_token}`
+ // if(method === 'POST'&&_loginInfo)url = url + `?coach_token=${_loginInfo.coach_token}`
uni.request({
url,
data,
diff --git a/src/pages/course/list/list.vue b/src/pages/course/list/list.vue
index 3b3db47..6630899 100644
--- a/src/pages/course/list/list.vue
+++ b/src/pages/course/list/list.vue
@@ -1,36 +1,39 @@
- 正式课
- 体验课
+ 正式课
+ 体验课
-
-
- 羽毛球课包学会(带体验课)
- 训练课
-
-
- 班级数: 10
-
-
- 班级数: 10
-
-
- 预约上课
- 班级
-
-
-
-
- 羽毛球课包学会(带体验课)
- 预约中
+
+
+
+ {{e.name || '-'}}
+ {{e.kind || '-'}}
+
+
+ 班级数: {{e.class_number || 0}}
+
+
+ 学员人数: {{e.join_person_number || 0}}
+
+
+ 预约上课
+ 班级
+
- 预约人数:20
-
- 查看详情
+
+
+ {{e.name || '-'}}
+ 预约中
+
+ 预约人数:{{e.experience_person_number || 0}}
+
+ 查看详情
+
-
+
+
@@ -81,8 +84,49 @@
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 54ab78c..18a3ffa 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,52 +1,108 @@
@@ -92,7 +148,6 @@
margin-left: 20upx;
width: 28upx;
height: 28upx;
- background-color: skyblue;
}
}
.ih-tip{
@@ -132,7 +187,6 @@
width: 52upx;
height: 52upx;
margin-right: 10upx;
- background-color: skyblue;
}
}
@@ -154,7 +208,6 @@
flex-shrink: 0;
width: 28upx;
height: 28upx;
- background-color: skyblue;
}
}
}
@@ -168,7 +221,6 @@
width: 33.33%;
height: auto;
>image{
- background-color: skyblue;
margin: 0 auto 20upx;
display: block;
width: 52upx;
@@ -199,7 +251,6 @@
margin-right: 16upx;
width: 52upx;
height: 52upx;
- background-color: skyblue;
}
}
>image{
@@ -207,7 +258,6 @@
flex-grow: 0;
width: 28upx;
height: 28upx;
- background-color: skyblue;
}
}
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index db8ff22..8c2a27c 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -1,7 +1,9 @@
@@ -9,14 +11,19 @@
-
+
+
@@ -41,6 +48,28 @@ export default {
}
},
methods: {
+ _submitBtn(){
+ console.log(this.formData);
+ let { brand_id, account, password } = this.formData;
+ servers.post({
+ url: API.coachLogin,
+ data:{
+ account,
+ password,
+ brand_id,
+ },
+ isDefaultGet: false
+ })
+ .then(res=>{
+ if(res.data.code == 0){
+ console.warn(res);
+ }else{
+ util.showNone(res.data.message || '操作失败!');
+ }
+ console.log(res);
+ })
+ },
+
async submitBtn(userRes){
try{
util.showLoad();
diff --git a/src/pages/message_list/message_list.vue b/src/pages/message_list/message_list.vue
index ba2f994..6b5d8a0 100644
--- a/src/pages/message_list/message_list.vue
+++ b/src/pages/message_list/message_list.vue
@@ -1,6 +1,6 @@
-
+
欧轩智能商家助手功能更新
@@ -16,8 +16,13 @@
diff --git a/src/static/images/arrow_cb2.png b/src/static/images/arrow_cb2.png
new file mode 100644
index 0000000..e67be8d
Binary files /dev/null and b/src/static/images/arrow_cb2.png differ
diff --git a/src/static/images/index/feedback_c874.png b/src/static/images/index/feedback_c874.png
new file mode 100644
index 0000000..b148ad2
Binary files /dev/null and b/src/static/images/index/feedback_c874.png differ
diff --git a/src/static/images/index/i_1.png b/src/static/images/index/i_1.png
new file mode 100644
index 0000000..d8bd72d
Binary files /dev/null and b/src/static/images/index/i_1.png differ
diff --git a/src/static/images/index/i_2.png b/src/static/images/index/i_2.png
new file mode 100644
index 0000000..9633d44
Binary files /dev/null and b/src/static/images/index/i_2.png differ
diff --git a/src/static/images/index/i_3.png b/src/static/images/index/i_3.png
new file mode 100644
index 0000000..8d9cfc3
Binary files /dev/null and b/src/static/images/index/i_3.png differ
diff --git a/src/static/images/index/i_4.png b/src/static/images/index/i_4.png
new file mode 100644
index 0000000..5a95db1
Binary files /dev/null and b/src/static/images/index/i_4.png differ
diff --git a/src/static/images/index/i_5.png b/src/static/images/index/i_5.png
new file mode 100644
index 0000000..ad4b3b3
Binary files /dev/null and b/src/static/images/index/i_5.png differ
diff --git a/src/static/images/index/i_6.png b/src/static/images/index/i_6.png
new file mode 100644
index 0000000..66fc81d
Binary files /dev/null and b/src/static/images/index/i_6.png differ
diff --git a/src/static/images/index/i_7.png b/src/static/images/index/i_7.png
new file mode 100644
index 0000000..77ab372
Binary files /dev/null and b/src/static/images/index/i_7.png differ
diff --git a/src/static/images/index/notice_c874.png b/src/static/images/index/notice_c874.png
new file mode 100644
index 0000000..d04ded4
Binary files /dev/null and b/src/static/images/index/notice_c874.png differ
diff --git a/src/static/images/logo.png b/src/static/images/logo.png
new file mode 100644
index 0000000..4d74d6c
Binary files /dev/null and b/src/static/images/logo.png differ