xgxt_sd/zhxg_app
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_app

Browse Source
This commit is contained in:
weishengyou
2026-01-07 09:46:03 +08:00
parent c153ae907f 08369aed72
commit 6fda606449
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.js
View File

@@ -4,10 +4,10 @@ module.exports = {
// 若在同一台机器调试：使用 localhost:8066 // 若在同一台机器调试：使用 localhost:8066
// 若手机在同一局域网：替换为本机局域网 IP，例如 172.16.96.111:8066 // 若手机在同一局域网：替换为本机局域网 IP，例如 172.16.96.111:8066
// 页面在 https://zhxg.gxsdxy.cn 下访问，接口同域同协议以避免 CORS // 页面在 https://zhxg.gxsdxy.cn 下访问，接口同域同协议以避免 CORS
// baseUrl: 'https://zhxg.gxsdxy.cn/prod_api', baseUrl: 'https://zhxg.gxsdxy.cn/prod_api',
//baseUrl: 'https://zhxg.gxsdxy.cn/prod_api', //baseUrl: 'https://zhxg.gxsdxy.cn/prod_api',
// 若本地/内网以 HTTP 访问页面，可改为： // 若本地/内网以 HTTP 访问页面，可改为：
baseUrl: 'http://localhost:8085', //baseUrl: 'http://localhost:8085',
// 应用信息 // 应用信息
appInfo: { appInfo: {
// 应用名称 // 应用名称

2
manifest.json
View File

@@ -1,7 +1,7 @@
{ {
"sassImplementationName" : "node-sass", "sassImplementationName" : "node-sass",
"name" : "学工系统", "name" : "学工系统",
"appid" : "__UNI__CB00986", "appid" : "__UNI__4E0771D",
"description" : "", "description" : "",
"versionName" : "1.1.0", "versionName" : "1.1.0",
"versionCode" : "100", "versionCode" : "100",

50
pages/sub/StuApply.vue
View File

@@ -9,7 +9,7 @@
<view class="list" v-if="surList.length>0"> <view class="list" v-if="surList.length>0">
<view class="item" v-for="(v,i) in surList" :key="i" @tap="doEdit(v)"> <view class="item" v-for="(v,i) in surList" :key="i" @tap="doEdit(v)">
<view class="top"> <view class="top">
主题：{{v.surveyName}} 主题:{{v.surveyName}}
<uni-icons type="right" size="18" color="#202020"></uni-icons> <uni-icons type="right" size="18" color="#202020"></uni-icons>
<view class="fill"> <view class="fill">
<!-- <uni-icons type="compose" color="#1890FF" size="18"></uni-icons> <!-- <uni-icons type="compose" color="#1890FF" size="18"></uni-icons>
@@ -26,7 +26,7 @@
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view>截止时间：{{v.cutoffTime}}</view> <view>截止时间:{{v.cutoffTime}}</view>
<view class="level">是否填写: <view class="level">是否填写:
<!-- <text <!-- <text
:class="v.isSubmit=='是'?'finish':'underway'">{{v.isSubmit == "是" ? "已填写" : "未填写"}}</text> --> :class="v.isSubmit=='是'?'finish':'underway'">{{v.isSubmit == "是" ? "已填写" : "未填写"}}</text> -->
@@ -34,7 +34,7 @@
:type="v.isSubmit=='是'?'success':'error'" plain></u-tag> :type="v.isSubmit=='是'?'success':'error'" plain></u-tag>
</view> </view>
<view class="level"> <view class="level">
审核状态： 审核状态:
<!-- {{getApplyStatus(v.leaveStatus)}} --> <!-- {{getApplyStatus(v.leaveStatus)}} -->
<u-tag :text="getApplyStatus(v.leaveStatus).text" <u-tag :text="getApplyStatus(v.leaveStatus).text"
:type="getApplyStatus(v.leaveStatus).type"></u-tag> :type="getApplyStatus(v.leaveStatus).type"></u-tag>
@@ -114,7 +114,7 @@
</radio-group> </radio-group>
</view> </view>
<view v-if="formData.leaveStatus == 2" class="form-item"> <view v-if="formData.leaveStatus == 2" class="form-item">
<label>家长是否知晓：{{formData.famKnow}}</label> <label>家长是否知晓:{{formData.famKnow}}</label>
</view> </view>
<view v-if="formData.leaveStatus != 2"> <view v-if="formData.leaveStatus != 2">
<view class="form-item"> <view class="form-item">
@@ -136,7 +136,7 @@
</view> </view>
</view> </view>
<view v-if="formData.leaveStatus == 2" class="form-item"> <view v-if="formData.leaveStatus == 2" class="form-item">
<label>是否离校：{{formData.isLeave== "1" ?"是":"否"}}</label> <label>是否离校:{{formData.isLeave== "1" ?"是":"否"}}</label>
</view> </view>
<view v-if="formData.isLeave == '1'"> <view v-if="formData.isLeave == '1'">
<view class="form-item"> <view class="form-item">
@@ -167,7 +167,7 @@
</radio-group> </radio-group>
</view> </view>
<view v-if="formData.homeSubmit == '1'" class="form-item"> <view v-if="formData.homeSubmit == '1'" class="form-item">
<label>是否到家：{{formData.isHome}}</label> <label>是否到家:{{formData.isHome}}</label>
</view> </view>
<view v-if="formData.isHome == '是'" class="form-item"> <view v-if="formData.isHome == '是'" class="form-item">
<view v-if="formData.homeSubmit != '1'"> <view v-if="formData.homeSubmit != '1'">
@@ -239,7 +239,7 @@
<view class="item" v-for="(v,i) in returnList" :key="i" <view class="item" v-for="(v,i) in returnList" :key="i"
@tap.stop="()=>{formData.returnSchoolId = v.returnSchoolId;toReturn();}"> @tap.stop="()=>{formData.returnSchoolId = v.returnSchoolId;toReturn();}">
<view class="top"> <view class="top">
主题：{{v.surveyName}} 主题:{{v.surveyName}}
<uni-icons type="right" size="18" color="#202020"></uni-icons> <uni-icons type="right" size="18" color="#202020"></uni-icons>
<view class="fill" @tap.stop="()=>{formData.returnSchoolId = v.returnSchoolId;toReturn();}"> <view class="fill" @tap.stop="()=>{formData.returnSchoolId = v.returnSchoolId;toReturn();}">
<!-- <uni-icons type="compose" color="#1890FF" size="18"></uni-icons> <!-- <uni-icons type="compose" color="#1890FF" size="18"></uni-icons>
@@ -254,7 +254,7 @@
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<!-- <view>收假时间：{{v.cutoffTime}}</view> --> <!-- <view>收假时间:{{v.cutoffTime}}</view> -->
<view class="level">状态: <view class="level">状态:
<u-tag :text='getApplyStatus(v.status).text' :type="getApplyStatus(v.status).type" <u-tag :text='getApplyStatus(v.status).text' :type="getApplyStatus(v.status).type"
plain></u-tag> plain></u-tag>
@@ -603,14 +603,14 @@
}); });
return; return;
} }
if (isEmpty(sdata.scheduledReturnTime)) { // if (isEmpty(sdata.scheduledReturnTime)) {
uni.showToast({ // uni.showToast({
title: "请选择预计返校时间", // title: "请选择预计返校时间",
icon: "none", // icon: "none",
mask: true // mask: true
}); // });
return; // return;
} // }
} }
// console.log("表单", sdata) // console.log("表单", sdata)
return; return;
@@ -633,10 +633,10 @@
let res = await that.getConfigSignature(); let res = await that.getConfigSignature();
that.info += JSON.stringify(res) that.info += JSON.stringify(res)
ww.register({ ww.register({
corpId: 'wx129e6bf0f36b8b3d', // 必填，当前用户企业所属企业ID corpId: 'wx129e6bf0f36b8b3d', // 必填,当前用户企业所属企业ID
agentId: 1000093, // 必填，当前应用的AgentID agentId: 1000093, // 必填,当前应用的AgentID
jsApiList: ["getLocation", "openLocation"], // 必填，需要使用的JSAPI列表 jsApiList: ["getLocation", "openLocation"], // 必填,需要使用的JSAPI列表
// getAgentConfigSignature: that.getAgentConfigSignature, // 必填，根据url生成应用签名的回调函数 // getAgentConfigSignature: that.getAgentConfigSignature, // 必填,根据url生成应用签名的回调函数
getConfigSignature() { getConfigSignature() {
// console.log(res) // console.log(res)
return res return res
@@ -646,7 +646,7 @@
// 初始化微信 JS-SDK // 初始化微信 JS-SDK
async getConfigSignature() { async getConfigSignature() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// 调用后端接口获取签名信息（需要后端支持） // 调用后端接口获取签名信息(需要后端支持)
getWxConfig("corpId").then(res => { getWxConfig("corpId").then(res => {
const { const {
timestamp, timestamp,
@@ -665,7 +665,7 @@
}, },
async getAgentConfigSignature() { async getAgentConfigSignature() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// 调用后端接口获取签名信息（需要后端支持） // 调用后端接口获取签名信息(需要后端支持)
getWxConfig("agentId").then(res => { getWxConfig("agentId").then(res => {
const { const {
timestamp, timestamp,
@@ -742,13 +742,13 @@
this.formData.name = this.ownName; this.formData.name = this.ownName;
this.formData.stuNo = this.ownStuNo; this.formData.stuNo = this.ownStuNo;
// 安全检查：确保moreDeptList存在且不为空，并且能找到匹配的部门 // 安全检查:确保moreDeptList存在且不为空,并且能找到匹配的部门
if (this.moreDeptList && this.moreDeptList.length > 0 && this.ownDeptName) { if (this.moreDeptList && this.moreDeptList.length > 0 && this.ownDeptName) {
const matchedDept = this.moreDeptList.filter(x => x && x.dictValue && x.dictValue.includes(this.ownDeptName)); const matchedDept = this.moreDeptList.filter(x => x && x.dictValue && x.dictValue.includes(this.ownDeptName));
if (matchedDept.length > 0) { if (matchedDept.length > 0) {
this.formData.moreDeptName = matchedDept[0].dictValue; this.formData.moreDeptName = matchedDept[0].dictValue;
} else { } else {
// 如果没有找到匹配的部门，使用第一个部门或者设置为空 // 如果没有找到匹配的部门,使用第一个部门或者设置为空
this.formData.moreDeptName = this.moreDeptList[0] && this.moreDeptList[0].dictValue ? this.moreDeptList[0].dictValue : ''; this.formData.moreDeptName = this.moreDeptList[0] && this.moreDeptList[0].dictValue ? this.moreDeptList[0].dictValue : '';
} }
} else { } else {
@@ -824,7 +824,7 @@
} }
.bottom-div { .bottom-div {
/* 此处不需要特别设置，因为它默认就在下面的位置 */ /* 此处不需要特别设置,因为它默认就在下面的位置 */
} }

16
pages/sub/StudoEdit.vue
View File

@@ -542,14 +542,14 @@ import {
}); });
return; return;
} }
if (isEmpty(sdata.scheduledReturnTime)) { // if (isEmpty(sdata.scheduledReturnTime)) {
uni.showToast({ // uni.showToast({
title: "请选择预计返校时间", // title: "请选择预计返校时间",
icon: "none", // icon: "none",
mask: true // mask: true
}); // });
return; // return;
} // }
const today = new Date(); const today = new Date();
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);
const willLeaveTime = new Date(sdata.willLeaveTime.replace(/-/g, '/')); const willLeaveTime = new Date(sdata.willLeaveTime.replace(/-/g, '/'));

4
pages/sub/add.vue
View File

@@ -49,7 +49,7 @@ template>
</radio-group> </radio-group>
</view> </view>
<view v-if="formData.leaveStatus == 2" class="form-item"> <view v-if="formData.leaveStatus == 2" class="form-item">
<label>家长是否知晓：{{formData.famKnow}}</label> <label>家长是否知晓:{{formData.famKnow}}</label>
</view> </view>
<view v-if="formData.leaveStatus != 2"> <view v-if="formData.leaveStatus != 2">
<view class="form-item"> <view class="form-item">
@@ -71,7 +71,7 @@ template>
</view> </view>
</view> </view>
<view v-if="formData.leaveStatus == 2" class="form-item"> <view v-if="formData.leaveStatus == 2" class="form-item">
<label>是否离校：{{formData.isLeave== "1" ?"是":"否"}}</label> <label>是否离校:{{formData.isLeave== "1" ?"是":"否"}}</label>
</view> </view>
<view v-if="formData.isLeave == '1'"> <view v-if="formData.isLeave == '1'">
<view class="form-item"> <view class="form-item">