Skip to content

W
wandouchengzhang_coach
Commit 99be398a authored by 石盼盼's avatar 石盼盼
Browse files
Options

Merge branch 'shipanpan' into 'master' 

Shipanpan

See merge request !34
parents c8f4cf62 76ab5ff1
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 188 deletions
pages/tabbar/financial/financial.wxss
View file @ 99be398a
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
position: absolute; position: absolute;
top: 46rpx; top: 46rpx;
left: 344rpx; left: 344rpx;
opacity: 0.3;
} }
.question_icon { .question_icon {
......
pages/tabbar/personal/personal.js
View file @ 99be398a
...@@ -47,7 +47,7 @@ Page({ ...@@ -47,7 +47,7 @@ Page({
}, },
callback:(data)=>{ callback:(data)=>{
this.setData({ this.setData({
userInfo: data.wx_user, userInfo: data,
userTel: data.wx_user.tel.substr(0, 3) + '****' + data.wx_user.tel.substring(7, 11) userTel: data.wx_user.tel.substr(0, 3) + '****' + data.wx_user.tel.substring(7, 11)
}) })
} }
...@@ -77,6 +77,9 @@ Page({ ...@@ -77,6 +77,9 @@ Page({
getSubjectlist: function () { getSubjectlist: function () {
let params = { let params = {
url: 'coach/course', url: 'coach/course',
data:{
coach_id: app.globalData.coach_id,
},
callback: (data) => { callback: (data) => {
this.setData({ this.setData({
subjectList: data subjectList: data
...@@ -118,7 +121,7 @@ Page({ ...@@ -118,7 +121,7 @@ Page({
let params = { let params = {
url: 'coach/save_course', url: 'coach/save_course',
data: { data: {
coach_id: 4, coach_id: app.globalData.coach_id,
course_ids: JSON.stringify(newArr) course_ids: JSON.stringify(newArr)
}, },
type: 'POST', type: 'POST',
...@@ -127,6 +130,7 @@ Page({ ...@@ -127,6 +130,7 @@ Page({
this.setData({ this.setData({
subjectShow: false subjectShow: false
}) })
this.getInfo()
} }
} }
base.newRequest(params) base.newRequest(params)
......
pages/tabbar/personal/personal.wxml
View file @ 99be398a
<view class="personInf"> <view class="personInf">
<view class="head flex-h flex-vc flex-hb" wx:if='{{showUserInfo}}' catchtap="goUserInfo"> <view class="head flex-h flex-vc flex-hb" wx:if='{{showUserInfo}}' catchtap="goUserInfo">
<view class="headLeft flex-h flex-vc"> <view class="headLeft flex-h flex-vc">
<image src="{{userInfo.avatarurl}}"></image> <image src="{{userInfo.wx_user.avatarurl}}"></image>
<view> <view>
<view class="name">{{userInfo.nickname}}</view> <view class="name">{{userInfo.wx_user.nickname}}</view>
<view class="tel">{{userTel}}</view> <view class="tel">{{userTel}}</view>
</view> </view>
</view> </view>
......
project.config.json
View file @ 99be398a
{ {
"description": "项目配置文件", "description": "项目配置文件",
"packOptions": { "packOptions": {
"ignore": [] "ignore": []
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"enhance": false, "enhance": false,
"postcss": true, "postcss": true,
"preloadBackgroundData": false, "preloadBackgroundData": false,
"minified": true, "minified": true,
"newFeature": false, "newFeature": false,
"coverView": true, "coverView": true,
"nodeModules": false, "nodeModules": false,
"autoAudits": false, "autoAudits": false,
"showShadowRootInWxmlPanel": true, "showShadowRootInWxmlPanel": true,
"scopeDataCheck": false, "scopeDataCheck": false,
"uglifyFileName": false, "uglifyFileName": false,
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": true, "checkSiteMap": true,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": true, "useIsolateContext": true,
"useCompilerModule": false, "useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false, "userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": false, "useMultiFrameRuntime": false,
"useApiHook": true, "useApiHook": true,
"enableEngineNative": false, "enableEngineNative": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true "minifyWXSS": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.14.0", "libVersion": "2.14.0",
"appid": "wx6e6eaca9cc1c406d", "appid": "wx6e6eaca9cc1c406d",
"projectname": "wandouchengzhang_coach", "projectname": "wandouchengzhang_coach",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
}, },
"scripts": {}, "scripts": {},
"isGameTourist": false, "isGameTourist": false,
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
"condition": { "condition": {
"plugin": { "plugin": {
"list": [] "list": []
}, },
"game": { "game": {
"list": [] "list": []
}, },
"gamePlugin": { "gamePlugin": {
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"list": [ "list": [
{ {
"id": -1, "id": -1,
"name": "pages/tabbar/personal/personal", "name": "pages/tabbar/personal/personal",
"pathName": "pages/tabbar/personal/personal", "pathName": "pages/tabbar/personal/personal",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/tabbar/personal/personal", "name": "pages/tabbar/personal/personal",
"pathName": "pages/tabbar/personal/personal", "pathName": "pages/tabbar/personal/personal",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/my/parents/parents", "name": "pages/my/parents/parents",
"pathName": "pages/my/parents/parents", "pathName": "pages/my/parents/parents",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/tabbar/personal/personal", "name": "pages/tabbar/personal/personal",
"pathName": "pages/tabbar/personal/personal", "pathName": "pages/tabbar/personal/personal",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/my/teachingArea/teachingArea", "name": "pages/my/teachingArea/teachingArea",
"pathName": "pages/my/teachingArea/teachingArea", "pathName": "pages/my/teachingArea/teachingArea",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/index/classManagement/classManagement", "name": "pages/index/classManagement/classManagement",
"pathName": "pages/index/classManagement/classManagement", "pathName": "pages/index/classManagement/classManagement",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/index/courseInstant/courseInstant", "name": "pages/index/courseInstant/courseInstant",
"pathName": "pages/index/courseInstant/courseInstant", "pathName": "pages/index/courseInstant/courseInstant",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": 7, "id": 7,
"name": "pages/index/classDetail/classDetail", "name": "pages/index/classDetail/classDetail",
"pathName": "pages/index/classDetail/classDetail", "pathName": "pages/index/classDetail/classDetail",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/team/teamDetail/teamDetail", "name": "pages/team/teamDetail/teamDetail",
"pathName": "pages/team/teamDetail/teamDetail", "pathName": "pages/team/teamDetail/teamDetail",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/index/performance/performance", "name": "pages/index/performance/performance",
"pathName": "pages/index/performance/performance", "pathName": "pages/index/performance/performance",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/index/evaluation/evaluation", "name": "pages/index/evaluation/evaluation",
"pathName": "pages/index/evaluation/evaluation", "pathName": "pages/index/evaluation/evaluation",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "个人中心", "name": "个人中心",
"pathName": "pages/tabbar/personal/personal", "pathName": "pages/tabbar/personal/personal",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/tabbar/class/class", "name": "pages/tabbar/class/class",
"pathName": "pages/tabbar/class/class", "pathName": "pages/tabbar/class/class",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/team/teamDetail/teamDetail", "name": "pages/team/teamDetail/teamDetail",
"pathName": "pages/team/teamDetail/teamDetail", "pathName": "pages/team/teamDetail/teamDetail",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "财务", "name": "财务",
"pathName": "pages/tabbar/financial/financial", "pathName": "pages/tabbar/financial/financial",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "课程管理详情页面", "name": "课程管理详情页面",
"pathName": "pages/index/classManagement/classManagement", "pathName": "pages/index/classManagement/classManagement",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "申请成为教练", "name": "申请成为教练",
"pathName": "pages/sign/apply/apply", "pathName": "pages/sign/apply/apply",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "课程瞬间上传", "name": "课程瞬间上传",
"pathName": "pages/index/courseInstant/courseInstant", "pathName": "pages/index/courseInstant/courseInstant",
"scene": null "scene": null
} }
] ]
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment