no message

src/main.js

@@ -1,37 +1,37 @@
-import Vue from 'vue'
-import commonMethods from '@/common/commonMethods.js'
-import commonData from '@/common/commonData.js'
-import App from './App'
-import store from './store/index.js'
-
-import floatTab from '@/components/float-tab.vue'
-import cuCustom from './components/cu-custom.vue'
-import pageLoading from './components/page-loading.vue'
-import mpTabbar from './components/mp-tabbar.vue'
-import mixin from '@/common/utils/mixin.js'
-Vue.mixin(mixin)
-Vue.component('cu-custom', cuCustom)
-Vue.component('page-loading', pageLoading)
-Vue.component('mp-tabbar', mpTabbar)
-Vue.component('float-tab', floatTab)
-
-// 公共方法挂载在vue原型上
-for (const key in commonMethods) {
-  Vue.prototype[key] = commonMethods[key]
-}
-
-// 公共方法挂载在vue原型上
-for (const key in commonData) {
-  Vue.prototype[key] = commonData[key]
-}
-
-Vue.config.productionTip = false
-// 需要全局注册一下store
-Vue.prototype.$store = store
-App.mpType = 'app'
-
-const app = new Vue({
-  store,
-  ...App
-})
-app.$mount()
+import Vue from 'vue'
+import commonMethods from '@/common/commonMethods.js'
+import commonData from '@/common/commonData.js'
+import App from './App'
+import store from './store/index.js'
+
+import floatTab from '@/components/float-tab.vue'
+import cuCustom from './components/cu-custom.vue'
+import pageLoading from './components/page-loading.vue'
+import mpTabbar from './components/mp-tabbar.vue'
+import mixin from '@/common/utils/mixin.js'
+Vue.mixin(mixin)
+Vue.component('cu-custom', cuCustom)
+Vue.component('page-loading', pageLoading)
+Vue.component('mp-tabbar', mpTabbar)
+Vue.component('float-tab', floatTab)
+
+// 公共方法挂载在vue原型上
+for (const key in commonMethods) {
+  Vue.prototype[key] = commonMethods[key]
+}
+
+// 公共方法挂载在vue原型上
+for (const key in commonData) {
+  Vue.prototype[key] = commonData[key]
+}
+
+Vue.config.productionTip = false
+// 需要全局注册一下store
+Vue.prototype.$store = store
+App.mpType = 'app'
+
+const app = new Vue({
+  store,
+  ...App
+})
+app.$mount()

src/pages/mine/mine.vue

@@ -11,10 +11,13 @@
 			 <view class="user-info flex">
 				 		<image mode="scaleToFill" :src="user.avatarUrl||defaultAvatar" class="avatar"></image>
 						<view class="study-info">
-							  <view class="user-name" @tap="switchStudent">
-									{{ kid_info.name ? kid_info.name + '-' + kid_info.school_name  : '切换学生' }}
-									<!-- <image :src="isLogin?switchIcon:loginIcon" mode="aspectFit" class="switch-icon"></image> -->
-									<text class="iconfont margin-left-xs" style="font-size:18px;" @tap="login">{{isLogin?'&#xe600;':'&#xe716;'}}</text>
+							  <view class="user-name" @tap="switchStudent" v-if="isLogin&&user.nickName">
+									{{ kid_info.name + '-' + kid_info.school_name }}
+									<text class="iconfont margin-left-xs" style="font-size:18px;">&#xe600;</text>
+								</view>
+								<view  class="user-name"  @tap="login" v-else>
+									 	 切换学生
+										 <text class="iconfont margin-left-xs" style="font-size:18px;">&#xe716;</text>
 								</view>
 								 <view class="user-learn">已学习{{info.parent_data.learn_day}}天</view>
 						</view>
@@ -22,14 +25,12 @@
 			 <view class="user-relative flex justify-between" v-if="isLogin">
 				  <view v-for="(relate,index) in courseRelates" :key="index" class="course-item" :style="'background:'+relate.background"
 					@tap="goto(relate.page)">
-						 <!-- <image :src="relate.img"  mode="widthFix" class="back-img relate-img"> -->
 						 <text class="iconfont back-img" style="font-size:32px;">{{relate.icon}}</text>
 						 <view class="text-df">{{relate.name}}</view>
 					</view>
 			 </view>
 			 <view class="user-relative flex justify-between" v-else>
 				  <view class="course-item relate-item" v-for="(course,index) in courses" :key="index" :style="'background:'+course.background">
-						<!-- <image :src="course.img" mode="widthFix" class="back-img"> -->
 						<text class="iconfont back-img" style="font-size:40px;">{{course.icon}}</text>
 						<view class="text-lg">{{course.title}}</view>
 						<view class="text-xxl margin-top-xs">{{course.name}}</view>
@@ -41,7 +42,6 @@
 				 <view class="order-info flex justify-between">
 					  <view v-for="(order,index) in menuList" :key="index" @tap="toOrder(index)">
 							  <view class="order-image">
-									<!-- <image :src="order.img" mode="aspectFill"></image> -->
 									<text class="iconfont text-student" style="font-size:32px;">{{order.icon}}</text>
 								</view>
 							  {{order.title}}
@@ -191,7 +191,6 @@ export default {
   },
   methods: {
     login() {
-      if (this.isLogin) return false
       this.globalNavigateTo('login')
     },
     get_info() {
@@ -222,11 +221,7 @@ export default {
       this.kid_info = this.students.find(item => item.id === kid)
     },
     switchStudent() {
-      if (!this.isLogin) {
-        this.globalNavigateTo('login')
-      } else {
-        this.modalName = 'showStudent'
-      }
+      this.modalName = 'showStudent'
     },
     goto(page) {
       if (!this.isLogin) {

src/pages/mine/onlineService.vue

@@ -1,102 +1,102 @@
-<template>
-	<view class="page">
-		  <cu-custom :isBack="true" title="在线客服"></cu-custom>
-			<view class="flex justify-center bg-white padding-tb-sm">
-				 <view class="link" style="background-color:#9aed6f;">
-					  <button class="button" open-type="contact" @contact="handleContact"></button>
-					 	<!-- <image src="/static/imgs/mine/wechat.png" mode="widthFix"></image> -->
-						<text class="iconfont" style="font-size:32px;">&#xe6c7;</text>
-				 </view>
-				 <view class="link" @tap="call" style="background-color:#5fcfe0;margin-left:160rpx;">
-					 <!-- <image src="/static/imgs/mine/tel.png" mode="widthFix"></image> -->
-					 <text class="iconfont" style="font-size:32px;">&#xe612;</text>
-				 </view>
-			</view>
-			<scroll-view class="questions margin-top-sm pardding-lr-sm  bg-white">
-				 <view class="cu-list menu">
-					<view class="questions-title margin-top">热点问题</view>
-					<view class="cu-item arrow solid-bottom" v-for="(item,index) in list" :key="index" @tap="answer(item)">
-						<view class="content margin-left-sm">
-							<text class="text-black">{{item.title}}</text>
-						</view>
-					</view>
-				 </view>
-			</scroll-view>
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      phoneNumber: '07592222030',
-      list: [
-        {
-          id: 1,
-          title: '报课注意事项？',
-          content: '1、购买本课程后第三节课起不接受退课、退费申请；\n' +
-            '2、因节假日冲突未上的课程，会进行调课补回；\n' +
-            '3、请假两次以内可安排补课，第三次起不予补课及退费；\n' +
-            '4、本平台对以上细则有最终解释权。'
-        },
-        { id: 2, title: '怎么得到报课结果？', content: '报课成功之后会有消息提醒，请您耐心等待即可' },
-        { id: 3, title: '如何退课？', content: '发起退课之后，经过审核通过，退课金额会自动转到您的微信，请您放心就好了' },
-        { id: 4, title: '如何接送？', content: '进入当天课程即可进行接送,还可以看到最新课堂动态喔' }
-      ]
-    }
-  },
-  methods: {
-    answer(item) {
-      uni.showModal({
-        title: item.title,
-        content: item.content,
-        showCancel: false,
-        success: res => {
-          if (res.confirm) {
-
-          }
-        }
-      })
-    },
-    call() {
-      uni.makePhoneCall({
-        phoneNumber: this.phoneNumber
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/common/css/mixin.scss';
-.page{
-	height:100vh;
-}
-.link{
-	position:relative;
-	width:60px;
-	height:60px;
-	line-height:60px;
-	color:#fff;
-	text-align:center;
-	border-radius:40%;
-	.button{
-    height: 75px;
-    width: 75px;
-    text-align: center;
-    position: absolute;
-    z-index: 2;
-    background: #fff;
-    border: none;
-    outline: none;
-    opacity: 0;
-	}
-}
-.questions{
-	height:calc(100vh - 240px);
-	&-title{
-		@include title(0,16px);
-		padding-left:40rpx;
-	}
-}
-</style>
+<template>
+	<view class="page">
+		  <cu-custom :isBack="true" title="在线客服"></cu-custom>
+			<view class="flex justify-center bg-white padding-tb-sm">
+				 <view class="link" style="background-color:#9aed6f;">
+					  <button class="button" open-type="contact" @contact="handleContact"></button>
+					 	<!-- <image src="/static/imgs/mine/wechat.png" mode="widthFix"></image> -->
+						<text class="iconfont" style="font-size:32px;">&#xe6c7;</text>
+				 </view>
+				 <view class="link" @tap="call" style="background-color:#5fcfe0;margin-left:160rpx;">
+					 <!-- <image src="/static/imgs/mine/tel.png" mode="widthFix"></image> -->
+					 <text class="iconfont" style="font-size:32px;">&#xe612;</text>
+				 </view>
+			</view>
+			<scroll-view class="questions margin-top-sm pardding-lr-sm  bg-white">
+				 <view class="cu-list menu">
+					<view class="questions-title margin-top">热点问题</view>
+					<view class="cu-item arrow solid-bottom" v-for="(item,index) in list" :key="index" @tap="answer(item)">
+						<view class="content margin-left-sm">
+							<text class="text-black">{{item.title}}</text>
+						</view>
+					</view>
+				 </view>
+			</scroll-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      phoneNumber: '07592222030',
+      list: [
+        {
+          id: 1,
+          title: '报课注意事项？',
+          content: '1、购买本课程后第三节课起不接受退课、退费申请；\n' +
+            '2、因节假日冲突未上的课程，会进行调课补回；\n' +
+            '3、请假两次以内可安排补课，第三次起不予补课及退费；\n' +
+            '4、本平台对以上细则有最终解释权。'
+        },
+        { id: 2, title: '怎么得到报课结果？', content: '报课成功之后会有消息提醒，请您耐心等待即可' },
+        { id: 3, title: '如何退课？', content: '发起退课之后，经过审核通过，退课金额会自动转到您的微信，请您放心就好了' },
+        { id: 4, title: '如何接送？', content: '进入当天课程即可进行接送,还可以看到最新课堂动态喔' }
+      ]
+    }
+  },
+  methods: {
+    answer(item) {
+      uni.showModal({
+        title: item.title,
+        content: item.content,
+        showCancel: false,
+        success: res => {
+          if (res.confirm) {
+
+          }
+        }
+      })
+    },
+    call() {
+      uni.makePhoneCall({
+        phoneNumber: this.phoneNumber
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/common/css/mixin.scss';
+.page{
+	height:100vh;
+}
+.link{
+	position:relative;
+	width:60px;
+	height:60px;
+	line-height:60px;
+	color:#fff;
+	text-align:center;
+	border-radius:40%;
+	.button{
+    height: 75px;
+    width: 75px;
+    text-align: center;
+    position: absolute;
+    z-index: 2;
+    background: #fff;
+    border: none;
+    outline: none;
+    opacity: 0;
+	}
+}
+.questions{
+	height:calc(100vh - 240px);
+	&-title{
+		@include title(0,16px);
+		padding-left:40rpx;
+	}
+}
+</style>

src/pages/mine/setting.vue

@@ -15,12 +15,12 @@
           </view>
 					<view>{{user.nickName}}</view>
         </view>
-        <view class="cu-item flex justify-between">
+        <!-- <view class="cu-item flex justify-between">
           <view class="content margin-left-sm">
             <text class="text-black">性别</text>
           </view>
           <view>{{user.gender?'女':'男'}}</view>
-        </view>
+        </view> -->
         <view class="cu-item" :class="phone?'':'arrow'" @tap="toBind">
           <view class="content margin-left-sm">
             <text class="text-black">手机号</text>

src/pages/studentcenter/evaluate.vue

@@ -1,104 +1,107 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true" title="评价"></cu-custom>
-		<view class="teacher flex bg-white padding">
-			<image mode="scaleToFill" :src="teacher_avatar" class="avatar lg"></image>
-				<view class="flex-sub margin-left">
-					<view class="teacher-title">{{teacher.username||''}}老师授课</view>
-					<view class="teacher-item">所属机构：{{teacher.agency_name||''}}</view>
-				<view class="teacher-exp flex">
-					<view class="exp-item">{{teacher.honor||''}}</view>
-					<view class="exp-item">{{teacher.introduce||''}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="comment bg-white margin-top padding-lr padding-tb-lg">
-			<view>请评价(已对班主任匿名，请放心评价)</view>
-			<view class="flex text-center margin-top" style="padding-left:80rpx;">
-					<view class="flex-sub">
-						<img src="/static/imgs/class/satisfaction.png" mode="widthFix" style="width:70px;">
-						<view>满意</view>
-					</view>
-					<view class="flex-sub">
-						<img src="/static/imgs/class/unsatisfaction.png" mode="widthFix" style="width:70px;">
-						<view>一般</view>
-					</view>
-			</view>
-			<view class="flex margin-top-sm">
-				<view style="width:80rpx;line-height:32px;">课程</view>
-				<view class="flex-sub text-center">
-					<button class="cu-btn" :class="params.agency_statisfaction===2?'bg-cyan':'line-cyan'"  @tap="evaluate('agency_statisfaction',2)">满意</button>
-				</view>
-				<view class="flex-sub text-center">
-					<button class="cu-btn" :class="params.agency_statisfaction===1?'bg-cyan':'line-cyan'"  @tap="evaluate('agency_statisfaction',1)">一般</button>
-				</view>
-			</view>
-			<view class="flex margin-top-sm">
-				<view style="width:80rpx;line-height:32px;">老师</view>
-				<view class="flex-sub text-center"  @tap="params.statisfaction=2">
-					<button class="cu-btn" :class="params.statisfaction===2?'bg-cyan':'line-cyan'"  @tap="evaluate('statisfaction',2)">满意</button>
-				</view>
-				<view class="flex-sub text-center" @tap="params.statisfaction=1">
-					<button class="cu-btn" :class="params.statisfaction===1?'bg-cyan':'line-cyan'"  @tap="evaluate('statisfaction',1)">一般</button>
-				</view>
-			</view>
-			<view class="margin-top-lg">
-				<button class="cu-btn bg-cyan lg" style="width:100%;" @tap="comment">提交评价</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { _commentDetail, _tocomment } from '@/api/course'
-export default {
-  data() {
-    return {
-      teacher: {},
-      satisfaction: {},
-      params: {
-        agency_statisfaction: 2,
-        statisfaction: 2,
-        plan_id: '',
-        teacher_id: ''
-      },
-      teacher_avatar: '/static/imgs/class/logo0.png'
-    }
-  },
-  onLoad(options) {
-    const id = decodeURIComponent(options.plan_id)
-    if (!id) uni.navigateBack()
-    this.params.plan_id = id
-    this.init()
-  },
-  methods: {
-    init() {
-      _commentDetail({ plan_id: this.params.plan_id }).then(res => {
-        this.teacher = res.teacher_data
-        this.satisfaction = res.satisfaction_data
-      })
-    },
-    evaluate(type, value) { // 评价
-      this.params[type] = value
-    },
-    comment() {
-      _tocomment(this.params).then(res => {
-        uni.showToast({ title: res.msg, icon: 'success' })
-        uni.navigateBack()
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/common/css/mixin.scss';
-.page{
-	height:100vh;
-}
-.teacher{
-	&-title{
-		@include title(4px,18px);
-	}
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="评价"></cu-custom>
+		<view class="teacher flex bg-white padding">
+			<image mode="scaleToFill" :src="teacher_avatar" class="avatar lg"></image>
+				<view class="flex-sub margin-left">
+					<view class="teacher-title">{{teacher.username||''}}老师授课</view>
+					<view class="teacher-item">所属机构：{{teacher.agency_name||''}}</view>
+				<view class="teacher-exp flex">
+					<view class="exp-item">{{teacher.honor||''}}</view>
+					<view class="exp-item">{{teacher.introduce||''}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="comment bg-white margin-top padding-lr padding-tb-lg">
+			<view>请评价(已对班主任匿名，请放心评价)</view>
+			<view class="flex text-center margin-top" style="padding-left:80rpx;">
+					<view class="flex-sub">
+						<img src="/static/imgs/class/satisfaction.png" mode="widthFix" style="width:70px;">
+						<view>满意</view>
+					</view>
+					<view class="flex-sub">
+						<img src="/static/imgs/class/unsatisfaction.png" mode="widthFix" style="width:70px;">
+						<view>一般</view>
+					</view>
+			</view>
+			<view class="flex margin-top-sm">
+				<view style="width:80rpx;line-height:32px;">课程</view>
+				<view class="flex-sub text-center">
+					<button class="cu-btn" :class="params.agency_statisfaction===2?'bg-cyan':'line-cyan'"  @tap="evaluate('agency_statisfaction',2)">满意</button>
+				</view>
+				<view class="flex-sub text-center">
+					<button class="cu-btn" :class="params.agency_statisfaction===1?'bg-cyan':'line-cyan'"  @tap="evaluate('agency_statisfaction',1)">一般</button>
+				</view>
+			</view>
+			<view class="flex margin-top-sm">
+				<view style="width:80rpx;line-height:32px;">老师</view>
+				<view class="flex-sub text-center"  @tap="params.statisfaction=2">
+					<button class="cu-btn" :class="params.statisfaction===2?'bg-cyan':'line-cyan'"  @tap="evaluate('statisfaction',2)">满意</button>
+				</view>
+				<view class="flex-sub text-center" @tap="params.statisfaction=1">
+					<button class="cu-btn" :class="params.statisfaction===1?'bg-cyan':'line-cyan'"  @tap="evaluate('statisfaction',1)">一般</button>
+				</view>
+			</view>
+			<view class="margin-top-lg">
+				<button class="cu-btn bg-cyan lg" style="width:100%;" @tap="comment">提交评价</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { _commentDetail, _tocomment } from '@/api/course'
+export default {
+  data() {
+    return {
+      teacher: {},
+      satisfaction: {},
+      params: {
+        agency_statisfaction: 2,
+        statisfaction: 2,
+        plan_id: '',
+        teacher_id: ''
+      },
+      teacher_avatar: '/static/imgs/class/logo0.png'
+    }
+  },
+  onLoad(options) {
+    const id = decodeURIComponent(options.plan_id)
+    if (!id) uni.navigateBack()
+    this.params.plan_id = id
+    this.init()
+  },
+  methods: {
+    init() {
+      _commentDetail({ plan_id: this.params.plan_id }).then(res => {
+        this.teacher = res.teacher_data
+        this.params.teacher_id = this.teacher ? this.teacher.teacher_id : 'undefined'
+        this.satisfaction = res.satisfaction_data
+      })
+    },
+    evaluate(type, value) { // 评价
+      this.params[type] = value
+    },
+    comment() {
+      _tocomment(this.params).then(res => {
+        uni.showToast({ title: res.msg, icon: 'success' })
+        setTimeout(() => {
+          uni.navigateBack()
+        }, 800)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/common/css/mixin.scss';
+.page{
+	height:100vh;
+}
+.teacher{
+	&-title{
+		@include title(4px,18px);
+	}
+}
+</style>

src/store/user.js

@@ -1,6 +1,6 @@
 export default {
   state: {
-    user: null,
+    user: {},
     token: '',
     session: '',
     kid: 0,
@@ -9,7 +9,7 @@ export default {
   },
   getters: {
     user(state) {
-      return state.user || JSON.parse(uni.getStorageSync('user'))
+      return state.user.nickName ? state.user : JSON.parse(uni.getStorageSync('user'))
     },
     kid(state) {
       return state.kid || uni.getStorageSync('kid')
@@ -24,20 +24,20 @@ export default {
       return state.session || uni.getStorageSync('session')
     },
     carts(state) {
-      return state.carts || JSON.parse(uni.getStorageSync('carts'))
+      return state.carts.length > 0 ? state.carts : JSON.parse(uni.getStorageSync('carts'))
     }
   },
   mutations: {
     CLEAR(state) {
-      state.user = null
+      state.user = {}
       state.token = ''
       state.session = ''
       state.phone = ''
       state.kid = 0
-      state.carts = null
+      state.carts = []
       uni.clearStorageSync()
     },
-    SET_USER(state, user) {
+    SET_USER(state, user = {}) {
       state.user = user
       uni.setStorage({
         key: 'user',