修改不登录可以进主页，为了应用宝审核

components/user-info/user-info.vue

@@ -4,7 +4,11 @@
 			<!-- <image src="@/static/images/coach/avatar.png" mode=""></image> -->
 			<image :src="vuex_userInfo.photoPath" mode="" v-if="vuex_userInfo.photoPath"></image>
 		</view>
-		<view class="info" @click="$goPage('/pages/userCenter/personaInfo/personaInfo')" :class="{Fwidth: Fwidth}">
+		<view class="flex" v-if="!$store.state.user.vuex_loginInfo.accessToken"  @click="$goPage('/pages/login/login')">
+			<view class="name oneRowText" style="padding-left: 20rpx;">请先登录</view>
+			<u-icon name="arrow-right" color="#686B73" :size="'28rpx'"></u-icon>
+		</view>
+		<view class="info" @click="$goPage('/pages/userCenter/personaInfo/personaInfo')" :class="{Fwidth: Fwidth}" v-else>
 			<view class="name_row">
 				<view class="name oneRowText">{{ vuex_userInfo.name}}</view>
 				<view class="icon">

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "洛阳驾校版",
+    "name" : "洛阳学车驾校版",
     "appid" : "__UNI__BD23957",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -44,7 +44,8 @@
             },
             /* ios打包配置 */
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

pages.json

@@ -1,6 +1,15 @@
 {
 	"pages": [
 		{
+			"path": "pages/tabbar/student/index",
+			"style": {
+				"navigationBarTitleText": "学员",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true,
+				"backgroundTextStyle": "dark" 
+			}
+		},
+		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录",
@@ -38,15 +47,6 @@
 			}
 		},
 		{
-			"path": "pages/tabbar/student/index",
-			"style": {
-				"navigationBarTitleText": "学员",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
-				"backgroundTextStyle": "dark" 
-			}
-		},
-		{
 			"path": "pages/tabbar/mine/index",
 			"style": {
 				"navigationBarTitleText": "我的",

pages/indexEntry/settlement/settlement.vue

@@ -25,7 +25,7 @@
 					<u-icon name="arrow-down" color="#686B73" size="14"></u-icon>
 				</view>
 			</view>
-			<view class="total">结算金额共计: 待对接</view>
+			<view class="total">结算金额共计: {{ extend }} 元</view>
 			<view class="record" v-if="list.length">
 				<view class="card" v-for="(item,index) in list" :key="index"
 					@click="$goPage('/pages/indexEntry/settlement/detail/detail')">
@@ -90,7 +90,9 @@
 					"searchMonth": ''
 				},
 				list: [],
-				status: 'loading'
+				status: 'loading',
+				extend: 0,
+				total: 0
 			}
 		},
 		onLoad() {
@@ -149,6 +151,7 @@
 					this.status='nomore'
 				}
 				this.total = res.total
+				this.extend = res.extend
 			}
 		}
 	}

pages/login/login.vue

@@ -5,7 +5,11 @@
 				<u-icon name="arrow-left" color="#333" size="28"></u-icon>
 			</view>
 		</view> -->
-		<u-navbar title=" " :bgColor="bgColor" :autoBack="true" ></u-navbar>
+		<u-navbar title=" " :bgColor="bgColor" :autoBack="false" >
+			<template #left>
+				<u-icon name="arrow-left" color="#686B73" :size="'42rpx'" @click="goHome"></u-icon>
+			</template>
+		</u-navbar>
 		<view class="title">教练端短信验证码登录</view>
 		<view class="form">
 			<view class="form-item">
@@ -69,7 +73,11 @@
 			}
 		},
 		methods: {
-			
+			goHome() {
+				uni.switchTab({
+					url: '/pages/tabbar/student/index'
+				})
+			},
 			// 是否选择协议
 			changeRadio(val) {
 				this.isCheck = val

pages/tabbar/mine/index.vue

@@ -50,23 +50,9 @@
 		},
 		onShow() {
 			uni.hideTabBar();
-			this.test()
 			// this.getIpAddress()
 		},
 		methods: {
-			test() {
-				let a = 1
-				function fn () {
-					let a = 2
-					function fn2 () {
-					let	a = 3
-						console.log(a)
-					}
-					fn2()
-					console.log(a)
-				}
-				fn()
-			},
 			goPage(item) {
 				// if(item.text=='结算统计') {
 				// 	uni.switchTab({

pages/tabbar/operateTrain/index.vue

@@ -115,16 +115,18 @@
 		onLoad() {
 			console.log('我的页面')
 			this.params.coachId = this.vuex_coachId
-			this.carPageFn()
 			// this.bookingMasterPageFn()
 			let nowTime = new Date()*1
 			// 一个月的时间戳
 			const oneMonthMilliseconds = 30 * 24 * 60 * 60 * 1000;
 			this.minDate = parseInt( nowTime - oneMonthMilliseconds )
 			this.maxDate = parseInt( nowTime + oneMonthMilliseconds )
+			if(!this.$store.state.user.vuex_loginInfo.accessToken) return
+			this.carPageFn()
 		},
 		onShow() {
 			uni.hideTabBar();
+			if(!this.$store.state.user.vuex_loginInfo.accessToken) return
 			this.initList()
 		},
 		onPullDownRefresh() {

pages/tabbar/statistics/index.vue

@@ -92,6 +92,7 @@
 		},
 		onShow() {
 			uni.hideTabBar();
+			if(!this.$store.state.user.vuex_loginInfo.accessToken) return
 			this.getSettlementStatisticsFn()
 			this.settle_listFn()
 			this.getDaySettlement()

pages/tabbar/student/index.vue

@@ -40,15 +40,15 @@
 				<view class="h2" v-if="identity=='实操教练'">我的学员</view>
 				<view class="statistics">
 					<view class="statisticsItem">
-						<view class="val">{{count.accumulateCount}}</view>
+						<view class="val">{{count.accumulateCount||0}}</view>
 						<view class="lab">累计学员数量</view>
 					</view>
 					<view class="statisticsItem">
-						<view class="val">{{count.todayCount}}</view>
+						<view class="val">{{count.todayCount||0}}</view>
 						<view class="lab">今日新增学员</view>
 					</view>
 					<view class="statisticsItem" v-if="identity=='校长'">
-						<view class="val">{{count.todayDropoutCount}}</view>
+						<view class="val">{{count.todayDropoutCount||0}}</view>
 						<view class="lab">今日退学学员</view>
 					</view>
 				</view>
@@ -153,18 +153,20 @@
 		},
 		onShow() {
 			uni.hideTabBar();
+			if(!this.$store.state.user.vuex_loginInfo.accessToken) return
 			this.studentOwnerFn()
 		},
 		onLoad() {
 			this.params.schoolId = this.vuex_schoolId
-			this.studentRecordPageFn()
-			this.schoolClass()
-			this.needSignFn()
 			let nowTime = new Date()*1
 			// 一个月的时间戳
 			const oneMonthMilliseconds = 30 * 24 * 60 * 60 * 1000;
 			this.minDate = parseInt( nowTime - oneMonthMilliseconds )
 			this.maxDate = parseInt( nowTime + oneMonthMilliseconds )
+			if(!this.$store.state.user.vuex_loginInfo.accessToken) return
+			this.studentRecordPageFn()
+			this.schoolClass()
+			this.needSignFn()
 		},
 		onPullDownRefresh() {
 			this.studentRecordPageFn()

pages/userCenter/refund/comp/item.vue

@@ -1,13 +1,12 @@
 <template>
-	<!-- 考场 -->
 	<view class="consultItem">
 		<view class="top_row">
 			<view class="flex">
 				<view class="schoolName">{{item.studentName}} {{item.studentPhone}}</view>
 			</view>
 			<view class="status">
-				<text class="text red" v-if="item.auditStatus==-1">已 取 消 </text>
-				<view class="text" v-else :class="{red: item.auditStatus==2}">{{stateTxt[item.auditStatus]}}</view>
+				<text class="text red" v-if="item.schoolAuditStatus==-1">已 取 消 </text>
+				<view class="text" v-else :class="{red: item.schoolAuditStatus==2}">{{stateTxt[item.schoolAuditStatus]}}</view>
 				<!-- <view class="icon">
 					<u-icon name="arrow-right" size="14" color="#686B73" style="margin-left: 12rpx;" ></u-icon>
 				</view> -->
@@ -33,7 +32,7 @@
 				<view class="name">报名班型：{{item.className}}</view>
 			</view>
 		</view>
-		<view class="border_bottom">
+		<view class="border_bottom" v-if="item.schoolAuditStatus==2">
 			<view class="row">
 				<view class="lab">不通过原因</view>
 				<view class="val hui">{{ item.schoolFailReason }}</view>
@@ -60,7 +59,7 @@
 		}
 	}
 </script>
-
+<!--  -->
 <style lang="scss" scoped>
 	.consultItem {
 			width: 100%;

pages/userCenter/refund/refund.vue

@@ -15,7 +15,7 @@
 				<view class="card" v-for="(item,index) in list" :key="index">
 					<refundItem :item="item">
 						<template>
-							<view class="btn_row" v-if="item.auditStatus==0">
+							<view class="btn_row" v-if="item.schoolAuditStatus==0">
 								<view class="btnBg" @click="passFn(item)">审核通过</view>
 								<view class="btnBg" @click="noPassClick(item)">审核不通过</view>
 							</view>
@@ -37,7 +37,7 @@
 					<textarea placeholder="请输入不通过原因" maxlength="40" v-model.trim="schoolFailReason"></textarea>
 				</view>
 				<view class="footBox">
-					<view class="btn">取消</view>
+					<view class="btn" @click="show=false">取消</view>
 					<view class="btn blue" @click="noPass">确定</view>
 				</view>
 			</view>

uni.scss

@@ -77,4 +77,4 @@ $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
 
 // 自已定义的
-$themC: #1989FA,
+$themC: #1989FA