Merge branch 'master' of...

Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying

components/none/index.wxml

 <view class="noneBox">
-  <image src="../../images/none.png"></image>
+  <image src="/images/without.png"></image>
   <view>暂无内容</view>
 </view>
\ No newline at end of file

pages/index/classDetail/classDetail.js

@@ -20,6 +20,7 @@ Page({
 			lesson_id: options.lesson_id
 		})
 		console.log(options.lesson_id)
+		console.log(options.class_id)
 		this.getlessondetail()
 
 	},
@@ -47,7 +48,7 @@ Page({
 		var child_id = e.currentTarget.dataset.id
 		console.log(child_id)
 		wx.navigateTo({
-			url: '../../index/performance/performance?child_id=' + child_id,
+			url: '../../index/performance/performance?child_id=' + child_id + '&lesson_id=' + this.data.lesson_id + '&class_id=' + this.data.class_id,
 		})
 	},
 	gocourseinstant: function () {

pages/index/evaluation/evaluation.js

@@ -9,7 +9,6 @@ Page({
     min: 0,//最少字数
     max: 300, //最多字数
     currentWordNumber:0,
-    currentValue: 50,
   },
 
   onLoad: function (options) {

pages/index/evaluation/evaluation.wxml

@@ -2,18 +2,18 @@
 	<view class="performance">
 		<view class="title">运动表现</view>
 		<bar id="bar1" class="bar1" currentProgress="10" maxProgress="10" canSlide="{{true}}" progressName="运动量" slideImg="../../images/ic_slide_button_1.png" />
-		<bar id="bar1" class="bar1" currentProgress="9" maxProgress="10" canSlide="{{true}}" progressName="体力" slideImg="../../images/ic_slide_button_1.png" />
-		<bar id="bar1" class="bar1" currentProgress="8" maxProgress="10" canSlide="{{true}}" progressName="完整度" slideImg="../../images/ic_slide_button_1.png" />
-		<bar id="bar1" class="bar1" currentProgress="6" maxProgress="10" canSlide="{{true}}" progressName="柔韧度" slideImg="../../images/ic_slide_button_1.png" />
-		<bar id="bar1" class="bar1" currentProgress="8" maxProgress="10" canSlide="{{true}}" progressName="耐力" slideImg="../../images/ic_slide_button_1.png" />
+		<bar id="bar1" class="bar1" currentProgress="10" maxProgress="10" canSlide="{{true}}" progressName="体力" slideImg="../../images/ic_slide_button_1.png" />
+		<bar id="bar1" class="bar1" currentProgress="10" maxProgress="10" canSlide="{{true}}" progressName="完整度" slideImg="../../images/ic_slide_button_1.png" />
+		<bar id="bar1" class="bar1" currentProgress="10" maxProgress="10" canSlide="{{true}}" progressName="柔韧度" slideImg="../../images/ic_slide_button_1.png" />
+		<bar id="bar1" class="bar1" currentProgress="10" maxProgress="10" canSlide="{{true}}" progressName="耐力" slideImg="../../images/ic_slide_button_1.png" />
 	</view>
 	<view class="coach">
 		<view class="title">教练评语</view>
 		<view class="text">
 			<textarea placeholder="请输入对学生的评价" minlength="{{min}}" maxlength="{{max}}" bindinput="inputs">
-      <text class="currentWordNumber">{{currentWordNumber}}/{{max}}</text>
-      <text class="hint">{{texts}}{{num}}</text>
-    </textarea>
+				<text class="currentWordNumber">{{currentWordNumber}}/{{max}}</text>
+				<text class="hint">{{texts}}{{num}}</text>
+    	</textarea>
 		</view>
 	</view>
 	<view class="badge">

pages/index/performance/performance.js

@@ -8,18 +8,15 @@ Page({
         windowWidth: '',
         windowHeight: '',
         coach : '',
-        scoreList: '',
+        scoreList: [],
         coachcomment:'',
-        awardList: []
+        awardList: [],
+        arr1: [],
+        arr2:[]
     },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
     onLoad: function (options) {
         console.log(options.child_id)
         this.getRpx()
-        this.getCharts()
         this.getcomment()
         this.getbadges()
     },
@@ -34,10 +31,10 @@ Page({
         lineChart = new Charts({
             canvasId: 'radarCanvas',
             type: 'radar',
-            categories: ['耐力', '体力', '柔韧度', '训练完整度', '运动量' ],
+            categories: this.data.arr1,
+            legend: false,
             series: [{
-                name: '运动表现',
-                data: [90, 110, 125, 95, 87],
+                data: this.data.arr2,
             }],
             width: this.data.windowWidth,
             height: this.data.windowHeight,
@@ -49,14 +46,14 @@ Page({
         });
     },
     getcomment : function () {
-        const { coach_id,class_id,lesson_id,child_id } = this.data
+        const { coach_id,class_id,lesson_id,child_id, } = this.data
         let params = {
             url: 'coach/comment',
             data:{
                 coach_id : 5,
                 class_id : 16,
                 lesson_id : 69,
-                child_id : 14
+                child_id : 14,
             },
             callback : (data) => {
                 console.log(data)
@@ -65,23 +62,38 @@ Page({
                     coachcomment : data,
                     scoreList : data.comment_score,
                 })
-            }
+                var arrs = [];
+                var newArrs =[];
+                for(var i = 0 ; i<this.data.scoreList.length; i++) {
+                    // console.log(this.data.scoreList)
+                    arrs.push(this.data.scoreList[i].comment_norm.name)
+                    // console.log(arrs)
+                    newArrs.push(this.data.scoreList[i].score)
+                    // console.log(newArrs)  
+                }
+                this.setData({
+                    arr1:arrs,
+                    arr2: newArrs
+                })
+                console.log(this.data.arr1)
+                console.log(this.data.arr2)
+                this.getCharts()
+            },
         }
         base.newRequest(params)
     },
     getbadges : function () {
-        const { user_child_id,class_id,class_single_id } = this.data
         let params = {
             url: 'badges',
             data : {
-                user_child_id,
-                class_id,
-                class_single_id
+                user_child_id : 303,
+                class_id : 16 ,
+                class_single_id : 69,
             },
             callback : (data) =>{
                 console.log(data)
                 this.setData({
-                    
+                    awardList : data
                 })
             }
         }

pages/index/performance/performance.json

 {
   "usingComponents": {},
-  "navigationBarTitleText": "运动表现"
+  "navigationBarTitleText": "运动评价"
 }
\ No newline at end of file

pages/index/performance/performance.wxml

@@ -22,7 +22,7 @@
 		<view class="flex-h">
 			<image src="/images/default_head.png" wx:if="{{coachcomment.child.wx_user.avatarurl == null}}"></image>
 			<image src="{{coachcomment.child.wx_user.avatarurl}}" wx:else></image>
-			<text class="name">{{coachcomment.child.wx_user.nickname ? 'coachcomment.child.wx_user.nickname' : '家长名字'}}</text>
+			<text class="name">{{coachcomment.child.wx_user.nickname}}</text>
 		</view>
 		<view class="comments">{{coachcomment.comment_reply}}</view>
 	</view>
@@ -30,8 +30,9 @@
 <view class="one">
 	<view class="title">收获徽章</view>
 	<view class="flex-h flex-hw flex-vc">
-		<block wx:for='{{awardList}}' wx:key='index'>
-			<image class="awardone" src="{{item.src}}"></image>
+		<block wx:for='{{awardList}}' wx:key='index' wx:for-item="item">
+			<image class="awardone" src="/images/my/per_pic_02.png" wx:if="{{item.badges.icon == null}}"></image>
+			<image class="awardone" src="{{item.badges.icon}}" wx:else></image>
 		</block>
 	</view>
 </view>
\ No newline at end of file

pages/my/teachingArea/teachingArea.js

-// pages/my/teachingArea/teachingArea.js
+const app = getApp()
+import { Base } from '../../../utils/base.js';
+const base = new Base()
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    cityShow: false,
+    cityList: [
+      {
+        name: '石家庄市'
+      },
+      {
+        name: '保定市'
+      },
+      {
+        name: '邯郸市'
+      },
+      {
+        name: '秦皇岛市'
+      },
+      {
+        name: '邢台市'
+      },
+      {
+        name: '承德市'
+      },
+    ]
   },
 
   /**
@@ -14,6 +36,50 @@ Page({
   onLoad: function (options) {
 
   },
+  changeCity: function (e) {
+    this.setData({
+      cityShow: true
+    })
+  },
+  closeCityShow: function (e) {
+    this.setData({
+      cityShow: false
+    })
+  },
+  chooseCity(e) {
+    let index = e.currentTarget.dataset.index
+    let list = this.data.cityList
+    if (list[index].isChecked) {
+      list[index].isChecked = false
+    } else {
+      list[index].isChecked = true
+    }
+    this.setData({
+      cityList: list
+    })
+    // console.log(e.currentTarget.dataset.item)
+    // if (e.currentTarget.dataset.item.city_name != this.data.cityChecked) {
+    //   this.setData({
+    //     cityList: list
+    //   })
+    // }
+  },
+  cityChangeComfirm() {
+    for (var i = 0; i < this.data.cityList.length; i++) {
+      if (this.data.cityChecked == this.data.cityList[i].city_name) {
+        app.globalData.city_id = this.data.cityList[i].id
+        app.globalData.city_name = this.data.cityList[i].city_name
+      }
+      this.setData({
+        cityShow: false
+      })
+    }
+    // if (arr.length == 0) {
+    //   base.toast('至少选择一个城市')
+    // }else {
+    //   console.log(arr)
+    // }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/my/teachingArea/teachingArea.wxml

-<view class="place flex-h flex-vc">
+<view class="place flex-h flex-vc" catchtap="changeCity">
 	<image src="../../../images/location.png"></image>
 	<view>已选城市：石家庄</view>
 </view>
@@ -30,3 +30,20 @@
 </view>
 <view class="line"></view>
 
+<view class="cityBox" wx:if="{{cityShow}}" catchtap="closeCityShow">
+	<view class="cityContent">
+		<view class="cityTitle">
+			请选择城市
+			<text class="iconfont iconguanbi1" catchtap="closeCityShow"></text>
+		</view>
+		<view class="cityCenter">
+			<!-- <view class="cityCenter_title">已开通服务城市</view> -->
+			<view class="cityCenter_con flex-h flex-hw">
+				<block wx:for='{{cityList}}' wx:key='index'>
+					<text class="{{item.isChecked ? 'city_active' : ''}}" catchtap="chooseCity" data-index='{{index}}'>{{item.name}}</text>
+				</block>
+			</view>
+		</view>
+		<view class="cityConfirm" catchtap="cityChangeComfirm">确定</view>
+	</view>
+</view>
\ No newline at end of file

pages/my/teachingArea/teachingArea.wxss

@@ -37,4 +37,72 @@
   height: 1px;
   background: #EBEBEB;
   margin: 0 auto;
+}
+/* 切换城市弹出框 */
+.cityBox {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+background: rgba(0, 0, 0, 0.3);
+z-index: 20;
+}
+.cityContent {
+width: 580rpx;
+height: auto;
+background: #FFFFFF;
+border-radius: 10rpx;
+margin: 40% auto;
+padding: 54rpx 0 51rpx 0;
+position: relative;
+}
+.cityTitle {
+font-size: 32rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #1A1A1A;
+width: 100%;
+text-align: center;
+margin-bottom: 58rpx;
+}
+.cityTitle text{
+position: absolute;
+right: 39rpx;
+top: 43rpx;
+color: #CCCCCC;
+}
+.cityCenter {
+padding-left: 40rpx;
+}
+.cityCenter_title {
+font-size: 24rpx;
+color: #A6A6A6;
+margin-bottom: 34rpx;
+}
+.cityCenter_con text {
+min-width: 156rpx;
+height: 56rpx;
+border-radius: 28rpx;
+text-align: center;
+line-height: 56rpx;
+font-size: 26rpx;
+color: #B4BC4D;
+border: 1px solid #B4BC4D;
+margin: 0 15rpx 20rpx 0;
+}
+.city_active {
+color: #fff !important;
+background: linear-gradient(13deg, #AAB247 0%, #B4BC4D 100%);
+}
+.cityConfirm {
+width: 345rpx;
+height: 68rpx;
+background: linear-gradient(-70deg, #FFC600 0%, #FFD400 100%);
+border-radius: 34rpx;
+text-align: center;
+line-height: 68rpx;
+margin: 29rpx auto 0 auto;
+font-size: 28rpx;
+color: #1A1A1A;
 }
\ No newline at end of file

pages/tabbar/class/class.js

@@ -8,15 +8,19 @@ Page({
   data: {
     activeIndex: 1,
     datalList: [],
-    locked:false
+    locked:false,
+    classList : [],
   },
 
 
   onLoad: function (options) {
-    this.getList();
+    wx.showLoading({
+      title: '加载中...',
+  })
+    this.getList()
     this.getMyclasslist();
-    this.getList();
   },
+  // 抢班列表
   getList: function () {
     wx.showLoading({
       title: '加载中',
@@ -34,11 +38,11 @@ Page({
           datalList: data,
           locked:false
         })
-        console.log(data)
       }
     }
     base.newRequest(params)
   },
+  // 我的班级列表
   getMyclasslist: function () {
     wx.showLoading({
       title: '加载中...',
@@ -53,13 +57,14 @@ Page({
         console.log(data)
         wx.hideLoading();
         this.setData({  
-          datalList:data,
+          classList: data,
           locked:false
         })
       }
     }
     base.newRequest(params)
   },
+  // 抢班-我的班级列表
   getrobclass : function () {
     const { coach_id, class_id} = this.data
     let params = {
@@ -71,7 +76,7 @@ Page({
       callback : (data) => {
         console.log(data)
         this.setData({
-            datalList: data
+          datalList: data
         })
       }
     }
@@ -86,10 +91,9 @@ Page({
     }
   },
   goteamDetail (e) {
-    var lesson_id = e.currentTarget.dataset.id
-    console.log(lesson_id)
+    var class_id = e.currentTarget.dataset.id
     wx.navigateTo({
-      url: '../../team/teamDetail/teamDetail?lesson_id=' + lesson_id,
+      url: '../../team/teamDetail/teamDetail?class_id=' + class_id,
     })
   },
   initData:function(){

pages/tabbar/class/class.json

 {
-  "usingComponents": {},
+  "usingComponents": {
+    "van-empty": "/components/vant/empty/index"
+  },
   "navigationBarTitleText": "抢班"
 }
\ No newline at end of file

pages/tabbar/class/class.wxml

@@ -4,7 +4,7 @@
 		<text class="{{activeIndex == 2 ? 'active': ''}}" catchtap="changeTab" data-index="2">我的班级</text>
 	</view>
 	<view>
-		<view wx:if="{{datalList.length>0}}">
+		<block wx:if="{{datalList.length>0}}">
 			<view class="tabContent" wx:if="{{activeIndex == 1 }}" wx:for="{{datalList}}" wx:key="item" data-item="{{item}}">
 				<view class="tab_item">
 					<view class="class-title">{{item.course.name}}</view>
@@ -16,12 +16,16 @@
 					<view class="goclass" bindtap="getrobclass">我要上课</view>
 				</view>
 			</view>
-		</view>
-		<none wx:else></none>
+		</block>
+		<block wx:else>
+			<view class="empty">
+				<van-empty class="custom-image" image="/images/without.png" description="暂无课程" />
+			</view>
+		</block>
 	</view>
 	<view>
-		<view wx:if="{{datalList.length>0}}">
-			<view class="tabContent1" wx:if="{{activeIndex == 2}}" wx:for="{{datalList}}" wx:key="item" data-id="{{item.id}}" catchtap="goteamDetail">
+		<block wx:if="{{classList.length>0}}">
+			<view class="tabContent1" wx:if="{{activeIndex == 2}}" wx:for="{{classList}}" wx:key="item" data-id="{{item.id}}" catchtap="goteamDetail">
 				<view class="tab_item1">
 					<view class="top">
 						<view class="class-title">{{item.course.name}}</view>
@@ -34,7 +38,11 @@
 					</view>
 				</view>
 			</view>
-		</view>
-		<none wx:else></none>
+		</block>
+		<block wx:else>
+			<view class="empty">
+				<van-empty class="custom-image" image="/images/without.png" description="暂无课程" />
+			</view>
+		</block>
 	</view>
 </view>
\ No newline at end of file

pages/tabbar/personal/personal.js

-// pages/personal/personal.js
+const app = getApp()
+import { Base } from '../../..//utils/base.js';
+const base = new Base()
 Page({
 
   /**
@@ -8,7 +10,7 @@ Page({
     showUserInfo: true, //用户信息是否显示
     noticeCount: 9, // 家长回复小红点
     show:false,
-    emailShow: false,
+    subjectShow: false,
     subjectList:[
       {
         name: '跳绳'
@@ -51,6 +53,7 @@ Page({
       })
     }
   },
+  
   goLogin() {
     wx.navigateTo({ // 登录
       url: '/pages/sign/login/login',
@@ -74,7 +77,7 @@ Page({
   //教学科目弹窗
   tcHold: function (e) {
     this.setData({
-      emailShow: !this.data.emailShow
+      subjectShow: !this.data.subjectShow
     })
   },
   chooseOne(e) {

pages/tabbar/personal/personal.wxml

@@ -58,7 +58,7 @@
   </view>
 </view>
 
-<van-popup show="{{ emailShow }}" closeable round bind:close="tcHold">
+<van-popup show="{{ subjectShow }}" closeable round bind:close="tcHold">
   <view class="tc">
     <view class="top">
       <view class="til">请选择教学科目</view>

pages/team/teamDetail/teamDetail.js

@@ -9,7 +9,10 @@ Page({
   },
 
   onLoad: function (options) {
-    console.log(options)
+    this.setData({
+      class_id : options.class_id
+    })
+    console.log(options.class_id)
     this.getclassdetail();
   },
   getclassdetail: function () {
@@ -34,9 +37,8 @@ Page({
 
   goclassDetail:function(e){
     var lesson_id = e.currentTarget.dataset.id
-    console.log(lesson_id)
     wx.navigateTo({
-      url: '../../index/classDetail/classDetail?lesson_id=' + lesson_id
+      url: '../../index/classDetail/classDetail?lesson_id=' + lesson_id + '&class_id=' + this.data.class_id
     })
   },
 

pages/team/teamDetail/teamDetail.wxml

@@ -31,10 +31,10 @@
 		<text class="title">已上课时</text>
 		<text class="restclass">剩余<text class="number">{{courseData.left_num_count}}</text>课时</text>
 	</view>
-	<view class="item" wx:for="{{lessonList}}" wx:key="index" data-id="{{item.id}}" >
+	<view class="item" wx:for="{{lessonList}}" wx:key="index" data-id="{{item.id}}" wx:for-index="idx" >
 		<image src="/images/select_circle.png" wx:if="{{item.lesson_status == 1}}"></image>
 		<image src="/images/circle.png" wx:else></image>
-		<view class="line"></view>
+		<view class="line" wx:if="{{idx != lessonList.length - 1}}"></view>
 		<view class="{{item.lesson_status == 1 ? 'lesson' : 'unlesson'}}">第{{item.class_index}}节课</view>
 		<view class="date">日期：{{item.class_date}}</view>
 		<view class="number">