diff --git a/components/user-info/user-info.vue b/components/user-info/user-info.vue index 118e25f..45c1558 100644 --- a/components/user-info/user-info.vue +++ b/components/user-info/user-info.vue @@ -4,7 +4,11 @@ - + + 请先登录 + + + {{ vuex_userInfo.name}} diff --git a/manifest.json b/manifest.json index 168742a..9457e40 100644 --- a/manifest.json +++ b/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" : { diff --git a/pages.json b/pages.json index fd203e7..8e8a0d9 100644 --- a/pages.json +++ b/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": "我的", diff --git a/pages/indexEntry/settlement/settlement.vue b/pages/indexEntry/settlement/settlement.vue index e0aaba7..c5af709 100644 --- a/pages/indexEntry/settlement/settlement.vue +++ b/pages/indexEntry/settlement/settlement.vue @@ -25,7 +25,7 @@ - 结算金额共计: 待对接 + 结算金额共计: {{ extend }} 元 @@ -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 } } } diff --git a/pages/login/login.vue b/pages/login/login.vue index bc7b3cf..fde8f84 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -5,7 +5,11 @@ --> - + + + 教练端短信验证码登录 @@ -69,7 +73,11 @@ } }, methods: { - + goHome() { + uni.switchTab({ + url: '/pages/tabbar/student/index' + }) + }, // 是否选择协议 changeRadio(val) { this.isCheck = val diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 6710716..89baed1 100644 --- a/pages/tabbar/mine/index.vue +++ b/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({ diff --git a/pages/tabbar/operateTrain/index.vue b/pages/tabbar/operateTrain/index.vue index 992c454..c9b03fc 100644 --- a/pages/tabbar/operateTrain/index.vue +++ b/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() { diff --git a/pages/tabbar/statistics/index.vue b/pages/tabbar/statistics/index.vue index 91627e2..a0651c3 100644 --- a/pages/tabbar/statistics/index.vue +++ b/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() diff --git a/pages/tabbar/student/index.vue b/pages/tabbar/student/index.vue index 5aa2f60..be0fb20 100644 --- a/pages/tabbar/student/index.vue +++ b/pages/tabbar/student/index.vue @@ -40,15 +40,15 @@ 我的学员 - {{count.accumulateCount}} + {{count.accumulateCount||0}} 累计学员数量 - {{count.todayCount}} + {{count.todayCount||0}} 今日新增学员 - {{count.todayDropoutCount}} + {{count.todayDropoutCount||0}} 今日退学学员 @@ -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() diff --git a/pages/userCenter/refund/comp/item.vue b/pages/userCenter/refund/comp/item.vue index 82b28e8..decd0b2 100644 --- a/pages/userCenter/refund/comp/item.vue +++ b/pages/userCenter/refund/comp/item.vue @@ -1,13 +1,12 @@