xinyilu/KindergartenAppletUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jihan_0413_运动处方和视频功能开发分支' into jihan_0413_运动处方和视频功能开发分支

Browse Source 
# Conflicts:
#	pages/grade/grade.vue
This commit is contained in:
闫晓茹 2023-04-19 15:34:46 +08:00
commit 164f752f52
8 changed files with 72 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/Parentinformation/Parentinformation.vue
View File

@ -126,7 +126,7 @@
if (this.checked == false) {
this.$refs.uToast.show({
type: 'error',
title: "请先阅读《隐私保护协议》!",
message: "请先阅读《隐私保护协议》!",
})
setTimeout(() => {
this.maskshow = true
@ -143,7 +143,7 @@
data: res.msg
});
this.$refs.uToast.show({
title: "添加成功",
message: "添加成功",
type: 'success'
})
// uni.showToast({
@ -158,7 +158,7 @@
} else if (res.code == 500) {
this.$refs.uToast.show({
title: res.msg,
message: res.msg,
type: 'error'
})
// uni.showToast({

14
pages/Personal/Personal.vue
View File

@ -1,10 +1,10 @@
<template>
<view class="top">
<view class="content" v-if="!studentId">
<view class="content" v-if="!studentId" @tap="goindex">
<view class="pictures">
<image src="../../static/toux.png" mode=""></image>
</view>
<view class="name" @tap="goindex">
<view class="name">
点击登录
</view>
</view>
@ -22,7 +22,6 @@
<image src="../../static/tuichu.png" mode=""></image>
</view>
</view>
<view class="student" v-if="!studentId">
<view class="studentitem">
<image src="../../static/renshi.png" mode=""></image>
@ -34,7 +33,6 @@
</view>
</view>
</view>
<view class="student" v-for="item in studentInfoList" v-else>
<view class="studentitem">
<image src="../../static/renshi.png" mode=""></image>
@ -58,20 +56,18 @@
<span>{{item.kindergartenName}}</span>
</view>
</view>
</view>
<view class="school" v-if="!studentId">
<view class="schoolitem">
<view class="studentitem">
<image src="../../static/xuexiao.png" mode=""></image>
<span>幼儿园信息</span>
</view>
<view class="schoolitem">
<view class="picitem">
<image src="../../static/zanwu.png" mode=""></image>
</view>
</view>
</view>
<view class="school" v-for="item in kindergartenInfoList" v-else>
<view class="gongli" v-if="kindergartenInfoList.kindergartenType=='public_handle'">
<image src="../../static/gongli.png" mode=""></image>
@ -93,8 +89,6 @@
<span>{{item.principalName}} {{item.kindergartenPhone}}</span>
</view>
</view>
</view>
<view class="masks" style="" v-if="mask">
<view class="mask">
@ -115,8 +109,6 @@
</view>
<u-toast ref="uToast" />
</view>
</template>
<script>

4
pages/Viewprescription/Viewprescription.vue
View File

@ -144,7 +144,7 @@
},
showToast() {
this.$refs.uToast.show({
title: "暂无报告",
message: "暂无报告",
type: 'error',
duration: 1000
})
@ -180,7 +180,7 @@
fail: function(err) {
uni.hideLoading();
that.$refs.uToast.show({
title: '请求报告失败',
message: '请求报告失败',
type: 'error'
})
}

21
pages/grade/grade.vue
View File

@ -24,15 +24,12 @@
{{item.totalFraction}}
<span>分</span>
</view>
<view class="baogao" @tap='lookbook(item)'>
<view class="baogao">
<view class="image">
</view>
<view class="look" v-if="item.existFlag==false">暂无报告</view>
<view class="lookreport" v-else>查看报告</view>
<view class="lookreport" @tap='lookbook(item)' v-else>
<view class="image">
</view>查看报告
</view>
<!-- <view class="look">查看报告</view> -->
<view class="look" @tap='showToast(item)' v-if="item.existFlag==false">查看报告</view>
<view class="lookreport" @tap='lookbook(item)' v-else>查看报告</view>
</view>
</view>
<u-toast ref="uToast" />
@ -73,14 +70,15 @@
},
methods: {
lookbook(item) {
if (item.existFlag == false) {
showToast() {
this.$refs.uToast.show({
message: "暂无报告",
type: 'error',
duration: 1000
})
} else {
},
lookbook(item) {
uni.showLoading({
title: '获取报告中'
});
@ -103,12 +101,11 @@
fail: function(err) {
uni.hideLoading();
that.$refs.uToast.show({
title: '请求报告失败',
message: '请求报告失败',
type: 'error'
})
}
});
}
},
getPhoneNumberp(val) {
wx.login({

4
pages/home/home.vue
View File

@ -54,7 +54,7 @@
methods: {
showToast() {
this.$refs.uToast.show({
title: '暂无报告',
message: '暂无报告',
type: 'error'
})
},
@ -82,7 +82,7 @@
fail: function(err) {
uni.hideLoading();
that.$refs.uToast.show({
title: '请求报告失败',
message: '请求报告失败',
type: 'error'
})
}

8
pages/index/index.vue
View File

@ -85,7 +85,7 @@
this.getInfoByPhoneinfo()
}
this.$refs.uToast.show({
title: "登录成功",
message: "登录成功",
type: 'success',
duration: '5000'
})
@ -96,6 +96,12 @@
}, 500)
this.top = false
}
} else {
this.$refs.uToast.show({
message: "登录失败",
type: 'error',
duration: '5000'
})
}
})
},

6
pages/phone/phone.vue
View File

@ -111,7 +111,7 @@
bindParent() {
if (this.checked == false) {
this.$refs.uToast.show({
title: '请先阅读《隐私保护协议》',
message: '请先阅读《隐私保护协议》',
type: 'error'
})
setTimeout(() => {
@ -132,12 +132,12 @@
url: '/pages/index/index'
})
this.$refs.uToast.show({
title: '添加成功',
message: '添加成功',
type: 'success'
})
} else if (res.code == 500) {
this.$refs.uToast.show({
title: res.msg,
message: res.msg,
type: 'error'
})
// uni.showToast({

2
pages/prescription/prescription.vue
View File

@ -230,7 +230,7 @@
fail: function(err) {
uni.hideLoading();
that.$refs.uToast.show({
title: '请求报告失败',
message: '请求报告失败',
type: 'error'
})
}