Skip to content

X
xzf_uniapp-wechat-web
Commit 10b53e5d authored by 李智书's avatar 李智书
Browse files
Options

1.合并代码解决冲突;

parents d4998ed2 645f5ca4
Show whitespace changes
Inline Side-by-side
Showing with 3875 additions and 24076 deletions
package-lock.json
View file @ 10b53e5d
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
View file @ 10b53e5d
......@@ -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 @ 10b53e5d
......@@ -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 @ 10b53e5d
......@@ -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": "校园报告",
......@@ -424,6 +424,15 @@
}
, {
"path": "pages/NotFound/NotFound",
"style": {
"navigationBarTitleText": "抱歉！没有找到您想要的资源",
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
......
src/pages/BankModule/Recharge/Recharge.vue
View file @ 10b53e5d
......@@ -571,14 +571,27 @@ export default {
},
// 代扣状态查询
async signStatusQuery() {
let respes = await this.$http.post({
// url: "http://159.75.47.27:8091/bank-wechat/bohai/comprehensive/signStatusQuery",
url: orderApi + "/bank-wechat/bohai/comprehensive/signStatusQuery",
let loading = Toast.loading({
message: "加载中...",
forbidClick: true,
loadingType: "spinner",
duration: 0,
});
$.ajax({
url: gHost + "/bank-wechat/bohai/comprehensive/signStatusQuery",
type: "POST",
contentType: "application/x-www-form-urlencoded",
data: {
schoolId: bankInfo.schoolId, //学校id
userId: userID, //用户id
sessionid: sessionID,
wechattype: 1
},
});
headers: {
sessionid: sessionID,
},
success: function (respes) {
loading.clear();
if (respes.code == "10000") {
console.log(respes, "respes");
if (respes.results.dkstatus != 1) {
......@@ -607,6 +620,13 @@ export default {
throw new Error("代扣状态查询,请重试！");
}
},
error: function (err) {
loading.clear();
Toast(err || "代扣状态查询,请重试！");
throw new Error("代扣状态查询,请重试！");
},
});
},
// 充值验证获取验证码
async SendSms() {
if (MyTimer) {
......
src/pages/NotFound/NotFound.vue 0 → 100644
View file @ 10b53e5d
<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 @ 10b53e5d
<template>
<view class="tainer" :style="{height:containerHeight+'rpx'}">
<view class="tainer" :style="{ height: containerHeight + 'rpx' }">
<view>
<view v-if="showReport">
<view class="school-report-header">
<view class="school-report-header-item">
<view class="user-avatar">
</view>
<view class="user-avatar"> </view>
<view class="user-info">
<view class="user-name">
<text>{{userInfo.userName}}</text>
<text>{{ userInfo.userName }}</text>
</view>
<view class="class-name">
<text>{{userInfo.gradeName}} {{userInfo.className}}</text>
<text>{{ userInfo.gradeName }} {{ userInfo.className }}</text>
</view>
</view>
</view>
......@@ -19,21 +19,22 @@
<view class="school-report-screen-item">
<view class="school-report-type">
<picker @change="schoolReportChange" :value="reportTypeIndex" :range="reportTypeArr">
<view class="uni-input">{{reportTypeArr[reportTypeIndex]}}</view>
<view class="uni-input">{{
reportTypeArr[reportTypeIndex]
}}</view>
</picker>
</view>
<view class="triangle">
</view>
<view class="triangle"> </view>
</view>
<view class="school-report-screen-item-two">
<view class="school-report-date">
<picker @change="dataRangeChange" :value="dataRangeIndex" :range="dataRangeArr"
range-key="week">
<view class="uni-input">{{dataRangeArr[dataRangeIndex].weekstr||""}}</view>
<picker @change="dataRangeChange" :value="dataRangeIndex" :range="dataRangeArr" range-key="week">
<view class="uni-input">{{
dataRangeArr[dataRangeIndex].weekstr || ""
}}</view>
</picker>
</view>
<view class="triangle">
</view>
<view class="triangle"> </view>
</view>
</view>
</view>
......@@ -41,36 +42,112 @@
<view class="school-report-context">
<view class="school-report-context-tab">
<view class="school-report-context-tab-item">
<view class="school-report-context-tab-item-one" :class="tabIndex==1?'active':''"
@tap="tabTap(1)">
<view class="school-report-context-tab-item-one active">
<text>消费报告</text>
</view>
<view v-if="isAttendanceOpen" class="school-report-context-tab-item-one"
:class="tabIndex==2?'active':''" @tap="tabTap(2)">
<text>门禁报告</text>
</view>
<view v-if="isPubTalkOpen" class="school-report-context-tab-item-one"
:class="tabIndex==3?'active':''" @tap="tabTap(3)">
<text>公话报告</text>
</view>
</view>
<view class="school-report-context-tab-item-two">
<view class="share-button" @tap="shareHandler">
<view class="share-button-img">
</view>
<view class="share-button-txt">
<text>分享</text>
</view>
</view>
</view>
</view>
<view :class="['consumer-report-bgImg','attendance-report-bgImg','pubTalk-report-bgImg'][tabIndex-1]">
</view>
<view class="school-report-context-card">
<view class="school-report-context-card-one" :style="{height:[598,256,525][tabIndex-1]+'rpx'}">
<view :class="['consumer-report-img','attendance-report-img','pubTalk-report-img'][tabIndex-1]">
</view>
<!-- 消费报告 -->
<!-- <view class="school-report-context-tab-item-one">
<text>门禁报告</text>
</view>
<view class="triangle">
</view>
</view>
<view class="school-report-screen-item-two">
<view class="school-report-date">
<picker @change="dataRangeChange" :value="dataRangeIndex" :range="dataRangeArr"
range-key="week">
<view class="uni-input">{{dataRangeArr[dataRangeIndex].weekstr||""}}</view>
</picker>
</view>
<view class="triangle">
</view>
</view>
</view>
</view>
</view>
<view class="school-report-context">
<view class="school-report-context-tab">
<view class="school-report-context-tab-item">
<view class="school-report-context-tab-item-one" :class="tabIndex==1?'active':''"
@tap="tabTap(1)">
<text>消费报告</text>
</view>
<view v-if="isAttendanceOpen" class="school-report-context-tab-item-one"
:class="tabIndex==2?'active':''" @tap="tabTap(2)">
<text>门禁报告</text>
</view>
<view v-if="isPubTalkOpen" class="school-report-context-tab-item-one"
:class="tabIndex==3?'active':''" @tap="tabTap(3)">
<text>公话报告</text>
</view>
</view>
<view class="school-report-context-tab-item-two">
<view class="share-button" @tap="shareHandler">
<view class="share-button-img">
</view>
<view class="share-button-txt">
<text>分享</text>
</view>
</view>
</view>
</view>
<view :class="['consumer-report-bgImg','attendance-report-bgImg','pubTalk-report-bgImg'][tabIndex-1]">
</view>
<view class="school-report-context-card">
<view class="school-report-context-card-one" :style="{height:[598,256,525][tabIndex-1]+'rpx'}">
<view :class="['consumer-report-img','attendance-report-img','pubTalk-report-img'][tabIndex-1]">
</view>
<!-- 消费报告 -->
<view v-show="tabIndex==1" class="school-report-context-card-one-context">
<view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot">
......@@ -78,12 +155,9 @@
</view>
</view>
<view class="school-report-context-card-one-context-txt">
<text v-if="diningSituations.cateringLevel">共<text
class="txt-important">{{diningSituations.notCateringNumber}}</text>次未吃{{diningSituations.notCateringType}},请提醒<text
class="txt-important">{{userInfo.userName}}</text>
<text v-if="diningSituations.cateringLevel">共<text class="txt-important">{{diningSituations.notCateringNumber}}</text>次未吃{{diningSituations.notCateringType}},请提醒<text class="txt-important">{{userInfo.userName}}</text>
{{diningSituations.clues}}</text>
<text v-else>恭喜<text
class="txt-important">{{userInfo.userName}}</text>荣获“快乐干饭人”称号，快乐要和家人一起分享哦</text>
<text v-else>恭喜<text class="txt-important">{{userInfo.userName}}</text>荣获“快乐干饭人”称号，快乐要和家人一起分享哦</text>
</view>
</view>
<view class="school-report-context-card-one-context-item">
......@@ -92,8 +166,7 @@
</view>
</view>
<view class="school-report-context-card-one-context-txt">
<text v-if="isEatLow">食堂消费占比<text
class="txt-important-two">过低</text>,请及时调整饮食习惯</text>
<text v-if="isEatLow">食堂消费占比<text class="txt-important-two">过低</text>,请及时调整饮食习惯</text>
<text v-else>饮食较<text class="txt-important-two">均衡</text>，继续保持哦</text>
</view>
</view>
......@@ -108,15 +181,13 @@
的同学<text v-if="isReasonable">,请及时评估生活费是否合理</text>
</view>
</view>
<view
class="school-report-context-card-one-context-item school-report-context-card-one-context-item-last">
<view class="school-report-context-card-one-context-item school-report-context-card-one-context-item-last">
<view class="school-report-context-card-one-context-dot">
<view class="school-report-context-card-one-context-dot-item">
</view>
</view>
<view class="school-report-context-card-one-context-txt">
<text v-if="isAbnormal"><text
class="txt-important-two">{{consumerTrend.clues}}</text>的消费金额存在异常,请及时关注</text>
<text v-if="isAbnormal"><text class="txt-important-two">{{consumerTrend.clues}}</text>的消费金额存在异常,请及时关注</text>
<text v-else>每日消费金额较稳定，继续保持哦</text>
</view>
</view>
......@@ -124,10 +195,8 @@
<!-- 门禁报告 -->
<view v-show="tabIndex==2" class="attendance-report-context-card-one-context">
<view class="attendance-report-context-card-one-context-item">
<text v-if="attendanceReport.abnormalNum">共<text
class="txt-important">{{attendanceReport.abnormalNum}}</text>天出勤异常，请及时关注</text>
<text v-else>恭喜<text
class="txt-important">{{userInfo.userName}}</text>荣获全勤好学生，风雨无阻上学路</text>
<text v-if="attendanceReport.abnormalNum">共<text class="txt-important">{{attendanceReport.abnormalNum}}</text>天出勤异常，请及时关注</text>
<text v-else>恭喜<text class="txt-important">{{userInfo.userName}}</text>荣获全勤好学生，风雨无阻上学路</text>
</view>
</view>
<!-- 公话报告 -->
......@@ -138,10 +207,8 @@
</view>
</view>
<view class="pubTalk-report-context-card-one-context-txt">
<text>最喜欢和<text class="txt-important">{{pubTalkReport.talkText1}}</text>沟通，共通话<text
class="txt-important">{{pubTalkReport.talkText2}}次
{{pubTalkReport.talkText3}}分钟</text>，超过全校<text
class="txt-important">{{pubTalkReport.talkText4}}</text>的同学</text>
<text>最喜欢和<text class="txt-important">{{pubTalkReport.talkText1}}</text>沟通，共通话<text class="txt-important">{{pubTalkReport.talkText2}}次
{{pubTalkReport.talkText3}}分钟</text>，超过全校<text class="txt-important">{{pubTalkReport.talkText4}}</text>的同学</text>
</view>
</view>
<view class="pubTalk-report-context-card-one-context-item" v-else>
......@@ -159,23 +226,17 @@
</view>
</view>
<view class="pubTalk-report-context-card-one-context-txt">
<text>跟<text class="txt-important">{{pubTalkReport.talkText5}}</text>沟通最少，共通话<text
class="txt-important">{{pubTalkReport.talkText6}}次
{{pubTalkReport.talkText7}}分钟</text>，超过全校<text
class="txt-important">{{pubTalkReport.talkText8}}</text>的同学</text>
<text>跟<text class="txt-important">{{pubTalkReport.talkText5}}</text>沟通最少，共通话<text class="txt-important">{{pubTalkReport.talkText6}}次
{{pubTalkReport.talkText7}}分钟</text>，超过全校<text class="txt-important">{{pubTalkReport.talkText8}}</text>的同学</text>
</view>
</view>
<view
class="pubTalk-report-context-card-one-context-item pubTalk-report-context-card-one-context-item-last"
v-if="pubTalkReport.talkText9">
<view class="pubTalk-report-context-card-one-context-item pubTalk-report-context-card-one-context-item-last" v-if="pubTalkReport.talkText9">
<view class="pubTalk-report-context-card-one-context-dot">
<view class="pubTalk-report-context-card-one-context-dot-item">
</view>
</view>
<view class="pubTalk-report-context-card-one-context-txt">
<text><text
class="txt-important">{{pubTalkReport.talkText9}}</text>是默默的守护，有时也不要忘记多和<text
class="txt-important">{{pubTalkReport.talkText9}}</text>进行交流</text>
<text><text class="txt-important">{{pubTalkReport.talkText9}}</text>是默默的守护，有时也不要忘记多和<text class="txt-important">{{pubTalkReport.talkText9}}</text>进行交流</text>
</view>
</view>
</view>
......@@ -189,25 +250,20 @@
</view>
<view class="school-report-context-card-two-conclusion">
<view class="school-report-context-card-two-conclusion-txt">
<text>本{{['月','周'][reportTypeIndex]}}共<text
class="abnormal-days">{{diningSituations.notRepastDay}}</text>天就餐异常</text>
<text>本{{['月','周'][reportTypeIndex]}}共<text class="abnormal-days">{{diningSituations.notRepastDay}}</text>天就餐异常</text>
</view>
<view class="school-report-context-card-two-conclusion-logo">
<view class="school-report-context-card-two-conclusion-logo-item">
<view class="school-report-context-card-two-conclusion-logo-item-dot">
</view>
</view>
<view
class="school-report-context-card-two-conclusion-logo-item school-report-context-card-two-conclusion-logo-item-right">
<view class="school-report-context-card-two-conclusion-logo-item school-report-context-card-two-conclusion-logo-item-right">
<text>未就餐</text>
</view>
</view>
</view>
<view class="school-report-context-card-two-calendar">
<van-calendar v-if="tabIndex==1" :formatter="formatter" :min-date="minDate"
:max-date="maxDate" :default-date="minDate" :row-height="44" :show-title="false"
:show-subtitle="false" :show-mark="false" :poppable="false" :show-confirm="false"
:style="{ height: '575rpx' }" @select="dateSelect" />
<van-calendar v-if="tabIndex==1" :formatter="formatter" :min-date="minDate" :max-date="maxDate" :default-date="minDate" :row-height="44" :show-title="false" :show-subtitle="false" :show-mark="false" :poppable="false" :show-confirm="false" :style="{ height: '575rpx' }" @select="dateSelect" />
</view>
<view class="school-report-context-card-two-details">
<view class="school-report-context-card-two-details-item">
......@@ -219,8 +275,7 @@
<text>早餐</text>
</view>
<view class="school-report-context-card-two-details-meal-logo">
<view v-if="diningSituations.notRepastDetails.breakfastStatus"
class="school-report-context-card-two-details-meal-img">
<view v-if="diningSituations.notRepastDetails.breakfastStatus" class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image>
</view>
<view v-else class="school-report-context-card-two-details-meal-noeat">
......@@ -230,10 +285,8 @@
<view class="school-report-context-card-two-details-meal-txt">
<text>中餐</text>
</view>
<view
class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-two">
<view v-if="diningSituations.notRepastDetails.lunchStatus"
class="school-report-context-card-two-details-meal-img">
<view class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-two">
<view v-if="diningSituations.notRepastDetails.lunchStatus" class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image>
</view>
<view v-else class="school-report-context-card-two-details-meal-noeat">
......@@ -243,10 +296,8 @@
<view class="school-report-context-card-two-details-meal-txt">
<text>晚餐</text>
</view>
<view
class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-three">
<view v-if="diningSituations.notRepastDetails.supperStatus"
class="school-report-context-card-two-details-meal-img">
<view class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-three">
<view v-if="diningSituations.notRepastDetails.supperStatus" class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image>
</view>
<view v-else class="school-report-context-card-two-details-meal-noeat">
......@@ -265,10 +316,8 @@
</view>
<view class="school-report-context-card-three-conclusion">
<view class="school-report-context-card-three-conclusion-item">
<text v-if="isEatLow">食堂消费占比<text
class="school-report-context-card-three-conclusion-item-describe">过低</text>,请及时调整饮食习惯</text>
<text v-else>饮食较<text
class="school-report-context-card-three-conclusion-item-describe">均衡</text>，继续保持哦</text>
<text v-if="isEatLow">食堂消费占比<text class="school-report-context-card-three-conclusion-item-describe">过低</text>,请及时调整饮食习惯</text>
<text v-else>饮食较<text class="school-report-context-card-three-conclusion-item-describe">均衡</text>，继续保持哦</text>
</view>
</view>
<view id="consumer-preferences-pie">
......@@ -282,10 +331,7 @@
</view>
<view class="school-report-context-card-four-conclusion">
<view class="school-report-context-card-four-conclusion-item">
<text>消费总额<text
class="consume-total">{{consumerAmountObj.consumerAmount}}</text>元，超过全校<text
class="consume-total">{{consumerAmountObj.exceedRate}}%</text>的同学<text
v-if="isReasonable">，请及时评估生活费是否合理</text></text>
<text>消费总额<text class="consume-total">{{consumerAmountObj.consumerAmount}}</text>元，超过全校<text class="consume-total">{{consumerAmountObj.exceedRate}}%</text>的同学<text v-if="isReasonable">，请及时评估生活费是否合理</text></text>
</view>
</view>
<view class="consume-total-img">
......@@ -323,8 +369,7 @@
</view>
<view class="school-report-context-card-five-conclusion">
<view class="school-report-context-card-five-conclusion-item">
<text v-if="isAbnormal"><text
class="abnormal-date">{{consumerTrend.clues}}</text>的消费金额存在异常,请及时关注</text>
<text v-if="isAbnormal"><text class="abnormal-date">{{consumerTrend.clues}}</text>的消费金额存在异常,请及时关注</text>
<text v-else>每日消费金额较稳定，继续保持哦</text>
</view>
</view>
......@@ -355,8 +400,7 @@
</view>
<view class="attendance-report-context-card-two-conclusion">
<view class="attendance-report-context-card-two-conclusion-txt">
<text>本{{['月','周'][reportTypeIndex]}}共<text
class="abnormal-days">{{attendanceReport.abnormalNum}}</text>天出勤异常</text>
<text>本{{['月','周'][reportTypeIndex]}}共<text class="abnormal-days">{{attendanceReport.abnormalNum}}</text>天出勤异常</text>
</view>
<view class="attendance-report-context-card-two-conclusion-logo">
<view class="attendance-report-context-card-two-conclusion-logo-item">
......@@ -376,10 +420,7 @@
</view>
</view>
<view class="attendance-report-context-card-two-calendar">
<van-calendar v-if="tabIndex==2" :formatter="formatter" :min-date="minDate"
:max-date="maxDate" :default-date="minDate" :row-height="44" :show-title="false"
:show-subtitle="false" :show-mark="false" :poppable="false" :show-confirm="false"
:style="{ height: '575rpx' }" @select="attendanceDateSelect">
<van-calendar v-if="tabIndex==2" :formatter="formatter" :min-date="minDate" :max-date="maxDate" :default-date="minDate" :row-height="44" :show-title="false" :show-subtitle="false" :show-mark="false" :poppable="false" :show-confirm="false" :style="{ height: '575rpx' }" @select="attendanceDateSelect">
<template #top-info="item">
<span v-if="item.topInfo=='请假'" class="mark-green">请假</span>
<span v-if="item.topInfo=='迟到'" class="mark-orange">迟到</span>
......@@ -392,8 +433,7 @@
</view>
<view v-if="tabIndex==2&&attendanceReportDatail.length" class="attendance-report-context-details">
<view v-for="(detailItem,detailIndex) in attendanceReportDatail">
<view v-if="detailItem.attendIntervalType&&detailItem.attendIntervalType!=-1"
class="attendance-report-context-card-two-details">
<view v-if="detailItem.attendIntervalType&&detailItem.attendIntervalType!=-1" class="attendance-report-context-card-two-details">
<view class="attendance-report-context-card-two-details-item">
<view class="attendance-report-context-card-two-details-time">
<view class="attendance-report-context-card-two-details-time-img">
......@@ -410,8 +450,7 @@
</view>
</view>
</view>
<view v-else-if="detailItem.attendIntervalType==-1"
class="attendance-report-context-card-two-details">
<view v-else-if="detailItem.attendIntervalType==-1" class="attendance-report-context-card-two-details">
<view class="attendance-report-context-card-two-details-item">
<view class="attendance-report-context-card-two-details-time">
<view class="attendance-report-context-card-two-details-time-txt txt-details">
......@@ -431,15 +470,12 @@
</view>
<view v-else class="dashed-line-first">
</view>
<view v-if="index" class="attendance-report-dot"
:style="{border:item.border}">
<view v-if="index" class="attendance-report-dot" :style="{border:item.border}">
</view>
<view v-else class="attendance-report-dot-first"
:style="{border:item.border}">
<view v-else class="attendance-report-dot-first" :style="{border:item.border}">
</view>
</view>
<view class="attendance-report-details-item-box"
:style="{top: 18+index*170+'rpx'}">
<view class="attendance-report-details-item-box" :style="{top: 18+index*170+'rpx'}">
<view class="attendance-report-details-item">
<view class="attendance-report-time">
<view class="attendance-report-time-txt">
......@@ -459,16 +495,14 @@
</view>
<view class="attendance-report-details-img-item">
<view class="attendance-report-time-details">
<view v-if="item.describeContent!='当日早到冠军'"
class="attendance-report-time-details-item">
<view v-if="item.describeContent!='当日早到冠军'" class="attendance-report-time-details-item">
<text>{{item.describeContent}}</text>
</view>
<view class="attendance-report-time-details-icon">
</view>
</view>
<view class="attendance-report-details-img-box">
<image v-if="item.attendImage" :src="item.attendImage" mode=""
@click="imageClick(item.attendImage)">
<image v-if="item.attendImage" :src="item.attendImage" mode="" @click="imageClick(item.attendImage)">
</image>
</view>
</view>
......@@ -515,18 +549,13 @@
</view>
</view>
<view class="leave-message-summary" v-if="pubTalkReport.messageText1">
<text><text class="txt-important">{{pubTalkReport.messageText1}}</text> 最喜欢和你留言，共 <text
class="txt-important">{{pubTalkReport.messageText2}}</text> 次，超过全校<text
class="txt-important">{{pubTalkReport.messageText3}}%</text>的同学</text>
<text><text class="txt-important">{{pubTalkReport.messageText1}}</text> 最喜欢和你留言，共 <text class="txt-important">{{pubTalkReport.messageText2}}</text> 次，超过全校<text class="txt-important">{{pubTalkReport.messageText3}}%</text>的同学</text>
</view>
<view class="leave-message-summary" v-else>
<text class="txt-important">想家人了可以多多留言哦~</text>
</view>
<view class="leave-message-summary leave-message-less-summary"
v-if="pubTalkReport.messageText4">
<text><text class="txt-important">{{pubTalkReport.messageText4}}</text> 留言最少，共 <text
class="txt-important">{{pubTalkReport.messageText5}}</text> 次，超过全校<text
class="txt-important">{{pubTalkReport.messageText6}}%</text>的同学</text>
<view class="leave-message-summary leave-message-less-summary" v-if="pubTalkReport.messageText4">
<text><text class="txt-important">{{pubTalkReport.messageText4}}</text> 留言最少，共 <text class="txt-important">{{pubTalkReport.messageText5}}</text> 次，超过全校<text class="txt-important">{{pubTalkReport.messageText6}}%</text>的同学</text>
</view>
<view class="leave-message-bar-unit">
<text>（次）</text>
......@@ -540,8 +569,7 @@
<text>到期后将无法查看完整报告</text>
</view>
<view class="school-report-validity">
<text>有效期至<text class="validity-date">{{memberInfo.invalidDateStr}}</text>,剩余<text
class="validity-date">{{memberInfo.differDay}}天</text></text>
<text>有效期至<text class="validity-date">{{memberInfo.invalidDateStr}}</text>,剩余<text class="validity-date">{{memberInfo.differDay}}天</text></text>
</view>
</view>
<view class="school-report-footer-item-two">
......@@ -552,8 +580,7 @@
</view>
</view>
</view>
<view v-if="flag==tabIndex" class="no-open"
:style="{height:[915,845,891][tabIndex-1]+'rpx',top:[1425,1099,1260][tabIndex-1]+'rpx'}">
<view v-if="flag==tabIndex" class="no-open" :style="{height:[915,845,891][tabIndex-1]+'rpx',top:[1425,1099,1260][tabIndex-1]+'rpx'}">
<view class="no-open-solution" @tap="equityPay">
<view class="no-open-solution-txt">
<text>最低{{memberInfo.leastAmount||''}}元/天开通，查看完整{{['消费','门禁','公话'][tabIndex-1]}}报告</text>
......@@ -570,8 +597,7 @@
<view class="summary-item">
<text>{{['月度消费报告','实时推送','音视频通话'][tabIndex-1]}}</text>
</view>
<view class="summary-item-icon"
:class="['consumer-report-icon','attendance-report-icon','pubTalk-report-icon'][tabIndex-1]">
<view class="summary-item-icon" :class="['consumer-report-icon','attendance-report-icon','pubTalk-report-icon'][tabIndex-1]">
<text>+</text>
</view>
<view class="summary-item">
......@@ -705,22 +731,20 @@
</view>
</view>
</view>
<van-dialog class="htmlCanvas" id="htmlCanvas" ref="imgCanvas" v-model="dialogShow" show-cancel-button
style="width: 100%; max-height: 80% !important;overflow: scroll">
<van-dialog class="htmlCanvas" id="htmlCanvas" ref="imgCanvas" v-model="dialogShow" show-cancel-button style="width: 100%; max-height: 80% !important;overflow: scroll">
</van-dialog>
</view>
</view>
</view>
</template>
<script>
import html2cancas from "html2canvas"
var gHost = "https://" + window.location.host;
if (window.location.protocol != "https:") {
import html2cancas from "html2canvas"
var gHost = "https://" + window.location.host;
if (window.location.protocol != "https:") {
gHost = "https://fpdev.xiaopay.net";
}
//获取参数
function getQueryParams(params) {
}
//获取参数
function getQueryParams(params) {
let href = window.location.href
let query = href.substring(href.indexOf('?') + 1);
let vars = query.split("&");
......@@ -731,10 +755,10 @@
}
}
return (false);
}
// 时间处理模块
import dayjs from 'dayjs'
export default {
}
// 时间处理模块
import dayjs from 'dayjs'
export default {
name: 'SchoolReport',
data() {
return {
......@@ -890,7 +914,7 @@
this.queryConsumerTrend();
},
methods: {
tabTap: function(num) {
tabTap: function (num) {
this.tabIndex = num;
if (num == 1) {
this.$nextTick(() => {
......@@ -1014,7 +1038,7 @@
})
}
},
toImage: function() {
toImage: function () {
this.$nextTick(() => {
html2cancas(document.getElementsByClassName("tainer")[0], {
useCORS: true,
......@@ -1030,7 +1054,7 @@
})
})
},
shareHandler: function() {
shareHandler: function () {
let htmlCanvasImg = document.getElementsByClassName("htmlCanvasImg")[0];
if (htmlCanvasImg) {
htmlCanvasImg.parentNode.removeChild(htmlCanvasImg);
......@@ -1038,15 +1062,15 @@
this.toImage();
this.dialogShow = true;
},
schoolReportChange: function(e) {
schoolReportChange: function (e) {
this.reportTypeIndex = e.target.value;
this.getDataRangeArr(this.reportTypeIndex);
},
dataRangeChange: function(e) {
dataRangeChange: function (e) {
this.dataRangeIndex = e.target.value;
this.getDataRangeArr(this.reportTypeIndex);
},
getDataRangeArr: function(num) {
getDataRangeArr: function (num) {
if (num) {
let tmpArr = []
for (let i = 1; i <= 52; i++) {
......@@ -1185,13 +1209,13 @@
this.attendanceSituations.attendanceDate = this.formatDate(date);
this.attendanceReprotDatail(this.formatDateTwo(date));
},
piechart: function() {
piechart: function () {
var myChart = echarts.init(document.getElementById('consumer-preferences-pie'));
var option = {
tooltip: {
trigger: 'item'
},
series: this.pieDatas.map(function(data, idx) {
series: this.pieDatas.map(function (data, idx) {
return {
type: 'pie',
radius: ['33', '58'],
......@@ -1201,7 +1225,7 @@
borderWidth: 3,
},
label: {
formatter: function(e) {
formatter: function (e) {
return e.name + "\n" + e.value + '元';
},
padding: [0, 2],
......@@ -1218,12 +1242,12 @@
color: ['#00C47C', '#F6C723', '#FF8646']
};
option && myChart.setOption(option);
window.addEventListener('resize', function() {
window.addEventListener('resize', function () {
myChart.resize();
})
},
// 获取某月的所有周六
getMonthSaturdayDate: function(year, month) {
getMonthSaturdayDate: function (year, month) {
const lastDay = new Date(year, month, 0).getDate();
const startDay = new Date(year, month, 1).getDate()
const allDate = [];
......@@ -1239,7 +1263,7 @@
})
return saturdayDate;
},
linechart: function(num) {
linechart: function (num) {
var mySize = document.getElementById('consumer-trend-line');
mySize.style.width = 360 + 'px';
mySize.style.height = 260 + 'px';
......@@ -1344,24 +1368,26 @@
}
},
extraCssText: `width:109px;height:55px;line-height:33rpx;background: no-repeat center/100% url(../../static/images/consumeTrendbgm.png);
font-size:24rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;
color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
font-size:24rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;
color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
confine: true,
position: function(pt) {
position: function (pt) {
return [pt[0] - 27, pt[1] - 73];
},
formatter: function(data) {
formatter: function (data) {
let desp = ['', '消费金额偏高', '消费金额偏低'][data[0].data.isException - 1]
return data[0].name + '消费' + data[0].value + '元' + '<br>' + desp;
}
},
};
option && myLineChart.setOption(option);
window.addEventListener('resize', function() {
window.addEventListener('resize', function () {
myLineChart.resize();
})
},
callNumberBarchart: function() {
callNumberBarchart: function () {
var mySize = document.getElementById('call-number-bar');
mySize.style.width = 350 + 'px';
mySize.style.height = 260 + 'px';
......@@ -1379,7 +1405,7 @@
color: 'rgba(0, 0, 0, 0.5)',
fontSize: 12
},
formatter: function(params) {
formatter: function (params) {
var newParamsName = "";
var tempParamsName = "";
var paramsNameNumber = params.length;
......@@ -1412,7 +1438,7 @@
yAxis: {
type: 'value',
min: 0,
max: function(value) {
max: function (value) {
return Math.ceil(value.max) + 1
},
minInterval: 1
......@@ -1437,11 +1463,11 @@
}]
};
option && myCallNumberBarchart.setOption(option);
window.addEventListener('resize', function() {
window.addEventListener('resize', function () {
myCallNumberBarchart.resize();
})
},
callDurationBarchart: function() {
callDurationBarchart: function () {
var mySize = document.getElementById('call-duration-bar');
mySize.style.width = 340 + 'px';
mySize.style.height = 260 + 'px';
......@@ -1459,7 +1485,7 @@
color: 'rgba(0, 0, 0, 0.5)',
fontSize: 12
},
formatter: function(params) {
formatter: function (params) {
var newParamsName = "";
var tempParamsName = "";
var paramsNameNumber = params.length;
......@@ -1492,7 +1518,7 @@
yAxis: {
type: 'value',
min: 0,
max: function(value) {
max: function (value) {
return Math.ceil(value.max)
},
minInterval: 1
......@@ -1517,11 +1543,11 @@
}]
};
option && myCallDurationBarchart.setOption(option);
window.addEventListener('resize', function() {
window.addEventListener('resize', function () {
myCallDurationBarchart.resize();
})
},
leaveMessageBarchart: function() {
leaveMessageBarchart: function () {
var mySize = document.getElementById('leave-message-bar');
mySize.style.width = 350 + 'px';
mySize.style.height = 260 + 'px';
......@@ -1539,7 +1565,7 @@
color: 'rgba(0, 0, 0, 0.5)',
fontSize: 12
},
formatter: function(params) {
formatter: function (params) {
var newParamsName = "";
var tempParamsName = "";
var paramsNameNumber = params.length;
......@@ -1572,7 +1598,7 @@
yAxis: {
type: 'value',
min: 0,
max: function(value) {
max: function (value) {
return Math.ceil(value.max)
},
minInterval: 1
......@@ -1597,7 +1623,7 @@
}]
};
option && myLeaveMessageBarchart.setOption(option);
window.addEventListener('resize', function() {
window.addEventListener('resize', function () {
myLeaveMessageBarchart.resize();
})
},
......@@ -2062,7 +2088,7 @@
})
}
},
equityPay: function() {
equityPay: function () {
jWeixin.miniProgram.switchTab({
url: `/pages/UserMain/main`,
success: function success() {
......@@ -2076,16 +2102,16 @@
}
});
},
imageClick: function(src) {
imageClick: function (src) {
this.imageDialogSrc = src;
this.imageDialogShow = true;
},
},
}
}
</script>
<style lang="scss" scope>
.tainer {
<style lang="scss">
.tainer {
.school-report-header {
height: 88rpx;
margin: 72rpx 0 48rpx 40rpx;
......@@ -2154,7 +2180,6 @@
}
}
.school-report-screen-item-two {
width: 270rpx;
display: flex;
......@@ -2619,7 +2644,6 @@
}
}
}
}
}
......@@ -2816,7 +2840,6 @@
}
}
}
.attendance-report-context-card-two-details-date {
......@@ -3300,7 +3323,6 @@
}
}
}
}
......@@ -3598,5 +3620,5 @@
}
}
}
}
</style>
src/pages/TemperatureRecords/HighTemperature/HighTemperature.vue
View file @ 10b53e5d
......@@ -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 @ 10b53e5d
......@@ -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 @ 10b53e5d
......@@ -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 @ 10b53e5d
......@@ -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/pdfPreview/pdfPreview.vue
View file @ 10b53e5d
......@@ -5,6 +5,7 @@
</template>
<script>
import Pdfh5 from "pdfh5";
import "pdfh5/css/pdfh5.css";
export default {
name: 'App',
data() {
......@@ -36,6 +37,11 @@
default:
break;
}
if (options.pdfName == 'azkjmenber') {
uni.setNavigationBarTitle({
title: "会员服务协议"
})
}
this.pdfName = options.pdfName
this.Init(this.ImgUrl + 'AgreementPdf/' + this.pdfName)
},
......@@ -50,9 +56,8 @@
this_.pdfh5 = new Pdfh5("#pdfh5", {
pdfurl: pdfName + '.pdf',
scale: 2,
goto: 0,
zoomEnable: true,
renderType: 'svg'
});
//监听完成事件
this_.pdfh5.on("complete", function(status, msg, time) {
......@@ -76,6 +81,10 @@
margin: 0;
}
page {
height: 100%;
}
html,
body,
#app {
......
src/template.h5.html
View file @ 10b53e5d
......@@ -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