Skip to content

W
wandouchengzhang_coach
Commit 68326a62 authored by 石盼盼's avatar 石盼盼
Browse files
Options

Merge branch 'shipanpan' into 'master' 

Shipanpan

See merge request !42
parents dc8316a1 372b6a0e
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 197 deletions
pages/index/classManagement/classManagement.wxml
View file @ 68326a62
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<block wx:for="{{list}}" wx:key='index'> <block wx:for="{{list}}" wx:key='index'>
<view class="item flex-h flex-vc flex-hb"> <view class="item flex-h flex-vc flex-hb">
<view class="flex-h flex-vc"> <view class="flex-h flex-vc">
<image src="{{item.child.thumb !=null ? item.child.thumb: '/images/default_head.png'}}"></image> <image src="{{item.child.thumb !=null ? item.child.thumb: '/images/default_head.png'}}" mode="aspectFill"></image>
<view> <view>
<view class="name">{{item.child.nick_name != null ? item.child.nick_name: ''}}</view> <view class="name">{{item.child.nick_name != null ? item.child.nick_name: ''}}</view>
<view class="big_name">大名：{{item.child.child_name}}</view> <view class="big_name">大名：{{item.child.child_name}}</view>
......
pages/index/classManagement/classManagement.wxss
View file @ 68326a62
...@@ -28,6 +28,9 @@ page { ...@@ -28,6 +28,9 @@ page {
line-height: 64rpx; line-height: 64rpx;
text-align: center; text-align: center;
} }
.instant image{
margin-left: 12rpx;
}
.top image{ .top image{
width: 41rpx; width: 41rpx;
height: 32rpx; height: 32rpx;
......
pages/my/parents/parents.wxml
View file @ 68326a62
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="item" wx:for="{{list}}" wx:key="index"> <view class="item" wx:for="{{list}}" wx:key="index">
<view class="top flex-h flex-vc flex-hb"> <view class="top flex-h flex-vc flex-hb">
<view class="row"> <view class="row">
<image src="{{item.child.wx_user.avatarurl}}"></image> <image src="{{item.child.wx_user.avatarurl}}" mode="aspectFill"></image>
<view class="name">{{item.child.wx_user.nickname}}</view> <view class="name">{{item.child.wx_user.nickname}}</view>
</view> </view>
<view class="date"> <view class="date">
......
pages/tabbar/class/class.js
View file @ 68326a62
...@@ -111,7 +111,7 @@ Page({ ...@@ -111,7 +111,7 @@ Page({
this.setData({ this.setData({
locked: true locked: true
}) })
this.onLoadFun(); this.onLoad();
} }
wx.stopPullDownRefresh() wx.stopPullDownRefresh()
}, },
......
pages/tabbar/class/class.json
View file @ 68326a62
{ {
"enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"van-empty": "/components/vant/empty/index" "van-empty": "/components/vant/empty/index"
}, },
......
pages/tabbar/index/index.js
View file @ 68326a62
...@@ -90,6 +90,7 @@ Page({ ...@@ -90,6 +90,7 @@ Page({
afterCalendarRender(e) { afterCalendarRender(e) {
const calendar = this.selectComponent('#calendar').calendar; const calendar = this.selectComponent('#calendar').calendar;
calendar.cancelSelectedDates()
const toSet = [ const toSet = [
{ {
year: this.data.curDate.split('-')[0], year: this.data.curDate.split('-')[0],
...@@ -204,4 +205,21 @@ Page({ ...@@ -204,4 +205,21 @@ Page({
url: '/pages/index/classDetail/classDetail?class_id=' + item.class_id + '&lesson_id=' + item.id, url: '/pages/index/classDetail/classDetail?class_id=' + item.class_id + '&lesson_id=' + item.id,
}) })
}, },
initData : function (){
this.setData({
allList : [],
list : [],
locked : false
})
},
onPullDownRefresh : function () {
this.initData()
if (!this.data.locked) {
this.setData({
locked: true
})
this.onLoad()
}
wx.stopPullDownRefresh()
}
}) })
\ No newline at end of file
pages/tabbar/index/index.json
View file @ 68326a62
{ {
"enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"van-count-down": "/components/vant/count-down/index", "van-count-down": "/components/vant/count-down/index",
"van-empty": "/components/vant/empty/index", "van-empty": "/components/vant/empty/index",
......
pages/tabbar/personal/personal.json
View file @ 68326a62
{ {
"usingComponents": {}, "usingComponents": {},
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#FFC600" "navigationBarBackgroundColor": "#FFC600"
} }
\ No newline at end of file
pages/team/teamDetail/teamDetail.wxml
View file @ 68326a62
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
<text>本班学员</text> <text>本班学员</text>
<view class="stu flex-h flex-hw"> <view class="stu flex-h flex-hw">
<view class="stus column" wx:for="{{studentList}}" wx:key="index" wx:for-item="item"> <view class="stus column" wx:for="{{studentList}}" wx:key="index" wx:for-item="item">
<image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}"></image> <image src="/images/default_head.png" wx:if="{{item.child.thumb == null}}" mode="aspectFill"></image>
<image src="{{item.child.thumb}}" wx:else></image> <image src="{{item.child.thumb}}" mode="aspectFill" wx:else ></image>
<view class="name">{{item.child.child_name}}</view> <view class="name">{{item.child.nick_name}}</view>
</view> </view>
</view> </view>
</view> </view>
......
project.config.json
View file @ 68326a62
{ {
"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",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "教学区域", "name": "教学区域",
"pathName": "pages/my/teachingArea/teachingArea", "pathName": "pages/my/teachingArea/teachingArea",
"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