Browse Source

Signed-off-by: yukangzhe <382985154@qq.com>

yukangzhe 4 years ago
parent
commit
74ffd548a9

+ 3 - 2
app.json

@@ -1,14 +1,15 @@
 {
   "plugins": {},
   "pages": [
+    "pages/index/index",
+    "pages/student/student",
+    "pages/myself/myself",
     "pages/pianoDetail/pianoDetail",
     "pages/pianoList/pianoList",
-    "pages/myself/myself",
     "pages/classTotalList/classTotalList",
     "pages/teamWork/teamWork",
     "pages/forBack/forBack",
     "pages/orderClassDetail/orderClassDetail",
-    "pages/index/index",
     "pages/leaveRecord/leaveRecord",
     "pages/leave/leave",
     "pages/doTask/doTask",

+ 1 - 1
pages/Components/selectDate/selectDate.js

@@ -30,7 +30,7 @@ Component({
       var num = 0
       var opacity = 0
       if(this.data.yFlag == false){
-        num = 195
+        num = 180
         opacity = 0.4
         this.setData({
           yFlag: true

+ 1 - 1
pages/addClass/addClass.js

@@ -15,7 +15,7 @@ Page({
   getTip: function () {
     wx.showModal({
       title: '加课说明',
-      content: '1加课课时将从剩余课时中划扣',
+      content: '1.加课课时将从剩余课时中划扣',
       showCancel: false, //是否显示取消按钮
       cancelText: "否", //默认是“取消”
       cancelColor: '#999999', //取消文字的颜色

+ 1 - 0
pages/classTotalList/classTotalList.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "课时统计",
   "usingComponents": {}
 }

+ 1 - 1
pages/index/index.js

@@ -14,7 +14,7 @@ Page({
     classList: [
       { img: '/images/kc.png', title: '今日课程', num: '0', url: "/pages/schedule/schedule" },
       { img: '/images/jtzy.png', title: '今日作业', num: '0',url: "/pages/task/task" },
-      { img: '/images/cq.png', title: '出勤率', num: '0%' },
+      { img: '/images/cq.png', title: '出勤率', num: '0%',url:"/pages/classTotalList/classTotalList" },
     ],
     appList: [
       { img: '/images/kb.png', title: '我的课表',url:"/pages/schedule/schedule" },

+ 1 - 2
pages/lessons/lessons.js

@@ -17,7 +17,6 @@ Page({
   },
 
   changeIndex: function (e) {
-    console.log(e.detail)
     if (e.detail == 0) {
 
     } else {
@@ -38,7 +37,7 @@ Page({
   getTip:function(){
     wx.showModal({
         title: '补课说明',
-         content: '1针对请假的课程进行补课',
+         content: '1.针对请假的课程进行补课',
          showCancel: false,//是否显示取消按钮
          cancelText:"否",//默认是“取消”
          cancelColor:'#999999',//取消文字的颜色

+ 3 - 3
pages/myself/myself.wxml

@@ -15,7 +15,7 @@
 				</view>
 				<image lazy-load mode="aspectFill" class="li-arrow" src="{{imageUrl? imageUrl+'arrow0603.png' : ''}}"></image>
       </view>
-      <view class="list-item" catchtap="goNavigateTo" data-url="/pages/listenRumination/listenRumination">
+      <view class="list-item" catchtap="goNavigateTo" data-url="/pages/pianoList/pianoList">
 				<view class="li-left">
 					<image lazy-load mode="aspectFill" class="li-icon" src="/images/my-buyPiano.png"></image>
 					<text>商城(练琴卡购买)</text>
@@ -43,7 +43,7 @@
 				</view>
 				<image lazy-load mode="aspectFill" class="li-arrow" src="{{imageUrl? imageUrl+'arrow0603.png' : ''}}"></image>
 			</view>
-			<view class="list-item" catchtap="goNavigateTo" data-url="/pages/campusDistribution/campusDistribution">
+			<view class="list-item" catchtap="goNavigateTo" data-url="/pages/student/student">
 				<view class="li-left">
 					<image lazy-load mode="aspectFill" class="li-icon" src="/images/my-student.png"></image>
 					<text>推荐学员</text>
@@ -53,7 +53,7 @@
 			<view class="line"></view>
 			<view class="list-item" catchtap="goNavigateTo" data-url="/pages/forBack/forBack" >
 				<view class="li-left">
-					<image lazy-load mode="aspectFill" class="li-icon" src="/images/my-forback.png"></image>
+					<image lazy-load mode="aspectFill" class="li-icon" src="/images/my-forBack.png"></image>
 					<text>校长信箱</text>
 				</view>
 				<image lazy-load mode="aspectFill" class="li-arrow" src="{{imageUrl? imageUrl+'arrow0603.png' : ''}}"></image>

+ 6 - 0
pages/pianoList/pianoList.js

@@ -12,6 +12,12 @@ Page({
     ]
   },
 
+  getCard:function(e){
+    wx.navigateTo({
+      url: '/pages/pianoDetail/pianoDetail',
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */

+ 1 - 1
pages/quan/quan.wxss

@@ -250,7 +250,7 @@ page{
   line-height: 46rpx;
 }
 .btnn-ed{
-  font-size: 30rpx;
+  font-size: 28rpx;
   font-family: PingFangSC-Semibold, PingFang SC;
   font-weight: 600;
   width: 120rpx;

+ 66 - 0
pages/student/student.js

@@ -0,0 +1,66 @@
+// pages/student/student.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 4 - 0
pages/student/student.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "邀请有礼",
+  "usingComponents": {}
+}

+ 38 - 0
pages/student/student.wxml

@@ -0,0 +1,38 @@
+<view class="container">
+<image class="bgImg" mode="widthFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation_bg.png"></image>
+<view class="btn-view">
+  <view class="left-radius"></view>
+  <view class="right-radius"></view>
+  <view class="btn-box">
+    <view class="share-btn">海报分享邀请好友</view>
+    <view class="line"></view>
+    <view class="other-btn">
+      <view class="">
+        <image class="icon-img" mode="heightFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/sm_link.png"></image>
+        <text>链接邀请</text>
+      </view>
+      <view class="">
+        <image class="icon-img" mode="heightFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/sm_code.png"></image>
+        <text>面对面扫码</text>
+      </view>
+    </view>
+  </view>
+</view>
+<image class="bgImg step-one" mode="widthFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c1.png"></image>
+<image class="bgImg step-two" mode="widthFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c2.png"></image>
+<view class="total-view">
+  <view>
+    0
+    <text>已试听/人</text>
+  </view>
+  <view>
+    0
+    <text>已购课/人</text>
+  </view>
+  <view>
+    0
+    <text>获得奖励</text>
+  </view>
+</view>
+<image class="bgImg step-three" mode="widthFix" src="https://app.schoolwisdoms.com/static/app/student/imgs/invitation-c3.png"></image>
+</view>

+ 114 - 0
pages/student/student.wxss

@@ -0,0 +1,114 @@
+/* pages/student/student.wxss */
+.bgImg{
+  width: 100%;
+  background: #FA1E17;
+}
+.icon-img{
+  height: 48rpx;
+    margin-right: 16rpx;
+    margin-left: 30rpx;
+    margin-top: 18rpx;
+}
+image{
+  display:block;
+}
+.btn-view{
+  background: #FA1E17;
+  padding: 40rpx 0;
+  position: relative;
+}
+.btn-box{
+  width: 700rpx;
+    margin: 0 auto;
+    padding: 40rpx 0;
+    background: #FFF;
+    border-radius: 20rpx;
+}
+.share-btn{
+  width: 600rpx;
+    margin: 40rpx auto;
+    text-align: center;
+    color: #FFF;
+    background: linear-gradient(45deg, #FA2E17, #FB671E);
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 50rpx;
+    font-size: 32rpx;
+}
+.line{
+  width: 100%;
+  height: 1px;
+  border-top: 1px dashed #ddd;
+  margin: 70rpx 0;
+}
+.other-btn{
+  width: 600rpx;
+    margin: 40rpx auto;
+    display: flex;
+    justify-content: space-between;
+}
+.other-btn>view{
+  display: flex;
+    background: linear-gradient(45deg, #FA2E17, #FB671E);
+    color: #FFF;
+    font-size: 32rpx;
+    width: 270rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 50rpx;
+}
+.other-btn>view:last-child{
+  background: linear-gradient(45deg, #FBA425, #FFC736);
+}
+.step-one{
+  width: 50%;
+  padding: 30rpx 25% 60rpx;
+}
+.step-two,.step-three{
+  background: none;
+}
+.step-three{
+  border-top: 20rpx solid #eee;
+  width: 58%;
+  padding: 20rpx 21%;
+}
+.left-radius{
+  height: 30rpx;
+    width: 30rpx;
+    position: absolute;
+    background: #FA1E17;
+    top: 256rpx;
+    border-radius: 100%;
+    left: 15rpx;
+}
+.right-radius{
+    height: 30rpx;
+      width: 30rpx;
+      position: absolute;
+      background: #FA1E17;
+      top: 256rpx;
+      border-radius: 100%;
+      right: 15rpx;
+}
+.total-view{
+  display: flex;
+  padding: 40rpx;
+  height: 60rpx;
+}
+.total-view view{
+  margin: 0 auto;
+  text-align: center;
+  text-align: center;
+    font-size: 36rpx;
+    font-weight: 600;
+}
+.total-view view:last-child{
+  color: #FA1E17;
+}
+.total-view text{
+  display: block;
+  display: block;
+    font-weight: 400;
+    font-size: 32rpx;
+    color: #999;
+}

+ 5 - 0
pages/task/task.js

@@ -14,6 +14,11 @@ Page({
     beginDate: null,
     endDate: null,
     status: 0,
+    list:[
+      {},
+      {},
+      {}
+    ]
   },
 
   changeIndex: function (e) {

+ 4 - 4
pages/teamWork/teamWork.wxml

@@ -3,7 +3,7 @@
     <view class="input-box">
       <view class="title">企业名称</view>
       <view class="input-view">
-        <input class="weui-input" auto-focus placeholder="请填写" maxlength="50" />
+        <input class="weui-input"  placeholder="请填写" maxlength="50" />
       </view>
     </view>
 
@@ -21,21 +21,21 @@
     <view class="input-box">
       <view class="title">联系人姓名</view>
       <view class="input-view">
-        <input class="weui-input" auto-focus placeholder="请填写" maxlength="5" />
+        <input class="weui-input"  placeholder="请填写" maxlength="5" />
       </view>
     </view>
 
     <view class="input-box">
       <view class="title">联系人电话</view>
       <view class="input-view">
-        <input class="weui-input" auto-focus placeholder="请填写" maxlength="11" />
+        <input class="weui-input"  placeholder="请填写" maxlength="11" />
       </view>
     </view>
 
     <view class="input-box">
       <view class="title">联系人微信</view>
       <view class="input-view">
-        <input class="weui-input" auto-focus placeholder="请填写" maxlength="50" />
+        <input class="weui-input" placeholder="请填写" maxlength="50" />
       </view>
     </view>
 

+ 1 - 1
pages/theClasses/theClasses.js

@@ -18,7 +18,7 @@ Page({
     weekMap: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
     tipList:[
       '1.每月仅有2次调课机会。如撤销,默认是为使用一次调整机会\r\n\r\n',
-      '2.允许调课至原课程前后一周内。例如:今天11-30日,可调整到11.23到12-07之间的课程\r\n\r\n',
+      '2.允许调课至原课程前后一周内。例如:今天11-30日,可调整到11.23到12.07之间的课程\r\n\r\n',
       '3.可提前7天进行调课\r\n\r\n',
       '4.调入后的课程,不可再调及请假'
     ]