Skip to content

X
xzf_uniapp-wechat-web
Commit efdb686c authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com
Browse files
Options

Merge branch 'develop' into uat

parents 297dada9 a836e44d
Hide whitespace changes
Inline Side-by-side
Showing with 2375 additions and 20977 deletions
package-lock.json
View file @ efdb686c
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
View file @ efdb686c
......@@ -4,7 +4,10 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<link rel="shortcut icon" type="image/x-icon" href="./faceico.ico"/>
<meta http-equiv="pragram" content="no-cache">
<meta http-equiv="cache-control" content="no-cache, must-revalidate">
<meta http-equiv="expires" content="0">
<link rel="shortcut icon" type="image/x-icon" href="./static/faceico.ico"/>
<title>
<%= htmlWebpackPlugin.options.title %>
</title>
......
src/App.vue
View file @ efdb686c
......@@ -8,6 +8,11 @@
},
onHide: function() {
console.log('App Hide')
},
onPageNotFound: function(res) {
uni.redirectTo({
url: "/pages/NotFound/NotFound"
})
}
}
</script>
......
src/pages.json
View file @ efdb686c
......@@ -374,7 +374,7 @@
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/TemperatureRecords/TemperatureStatistics/TemperatureStatistics",
"style": {
"navigationBarTitleText": "体温记录",
......@@ -382,7 +382,7 @@
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/TemperatureRecords/HighTemperature/HighTemperature",
"style": {
"navigationBarTitleText": "高温",
......@@ -390,7 +390,7 @@
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/TemperatureRecords/LowTemperature/LowTemperature",
"style": {
"navigationBarTitleText": "低温",
......@@ -398,7 +398,7 @@
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/TemperatureRecords/NormalTemperatrue/NormalTemperatrue",
"style": {
"navigationBarTitleText": "正常",
......@@ -406,7 +406,7 @@
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/TemperatureRecords/Undetected/Undetected",
"style": {
"navigationBarTitleText": "未测量",
......@@ -414,7 +414,7 @@
"enablePullDownRefresh": false
}
},{
}, {
"path": "pages/SchoolReport/SchoolReport",
"style": {
"navigationBarTitleText": "校园报告",
......@@ -423,7 +423,16 @@
}
}
, {
"path": "pages/NotFound/NotFound",
"style": {
"navigationBarTitleText": "抱歉！没有找到您想要的资源",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
......
src/pages/NotFound/NotFound.vue 0 → 100644
View file @ efdb686c
<template>
<view class="noData hideToShow" :style="{ backgroundColor: bgColor }">
<view class="image">
<image :src="noDataImg"></image>
</view>
<!-- 网络连接失败默认显示内容 -->
<view class="content">
<text class="title" :style="{ color: mainColor }">不存在的内容</text>
<text class="desc" :style="{ color: viceColor }">没有找到您想要的东西</text>
</view>
<!-- 自定义内容 -->
<slot />
</view>
</template>
<script>
export default {
name: "NotFound",
props: {
isShow: {
type: Boolean,
default: false
},
/* 背景颜色自定义 */
bgColor: {
type: String,
default: '#ffffff'
},
/* 标题颜色自定义 */
mainColor: {
type: String,
default: '#373a40'
},
/* 描述颜色自定义 */
viceColor: {
type: String,
default: '#8b8b8b'
},
// 是否开启自定义
custom: {
type: false,
default: false
}
},
data() {
return {
type: '',
netType: "",
mainText: '网络居然崩溃了',
viceText: '别紧张,去检测一下网络设置',
netWorkImg: '/static/images/noNetWork.png',
noDataImg: '/static/images/notFound.png'
}
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.noData {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
padding-top: 400rpx;
.image {
width: 187upx;
height: 144upx;
image {
width: 100%;
height: 100%;
}
}
.content {
width: 100%;
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
letter-spacing: 1upx;
.title {
font-size: 36upx;
}
.desc {
font-size: 28upx;
margin-top: 6upx;
}
.btn {
width: 160upx;
height: 65upx;
color: #868d91;
font-size: 24upx;
margin-top: 34upx;
border-radius: 36upx;
border: 1upx solid #d4d4d4;
}
.btn::after {
border: none;
}
}
}
</style>
src/pages/SchoolReport/SchoolReport.vue
View file @ efdb686c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/pages/TemperatureRecords/HighTemperature/HighTemperature.vue
View file @ efdb686c
......@@ -14,7 +14,7 @@
</view>
<view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList">
<view class="card" v-for="(item,index) of detailsList" :key="index">
<view class="temperatureResult">
<view class="studentInfo">
<view class="studentName">
......
src/pages/TemperatureRecords/LowTemperature/LowTemperature.vue
View file @ efdb686c
......@@ -14,7 +14,7 @@
</view>
<view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList">
<view class="card" v-for="(item,index) of detailsList" :key="index">
<view class="temperatureResult">
<view class="studentInfo">
<view class="studentName">
......
src/pages/TemperatureRecords/NormalTemperatrue/NormalTemperatrue.vue
View file @ efdb686c
......@@ -14,7 +14,7 @@
</view>
<view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList">
<view class="card" v-for="(item,index) of detailsList" :key="index">
<view class="temperatureResult">
<view class="studentInfo">
<view class="studentName">
......
src/pages/TemperatureRecords/Undetected/Undetected.vue
View file @ efdb686c
......@@ -14,7 +14,7 @@
</view>
<view class="cardBox">
<view v-if="ifShow">
<view class="card" v-for="item of detailsList">
<view class="card" v-for="(item,index) of detailsList" :key="index">
<view class="temperatureResult">
<view class="studentInfo">
<view class="studentName">
......
src/template.h5.html
View file @ efdb686c
......@@ -4,7 +4,10 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<link rel="shortcut icon" type="image/x-icon" href="./faceico.ico"/>
<meta http-equiv="pragram" content="no-cache">
<meta http-equiv="cache-control" content="no-cache, must-revalidate">
<meta http-equiv="expires" content="0">
<link rel="shortcut icon" type="image/x-icon" href="./static/faceico.ico"/>
<title>
<%= htmlWebpackPlugin.options.title %>
</title>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment