From e5b270a0dbdcfd3847fec6c9c3a1b351925c51c3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 10 May 2024 11:20:26 +0800
Subject: [PATCH] bug修復
---
subPackage/counterfraud/add.vue | 2 +-
manifest.json | 4 ++--
pages/home/index.vue | 9 +++++++++
subPackage/school/troubleDetail.vue | 4 ++--
common/setting.js | 8 ++++----
subPackage/school/clockIn.vue | 5 ++++-
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 0195f11..2c15442 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,14 +10,14 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- devUrl: 'http://192.168.2.105:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.3.214:9528',
+ devUrl: 'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
// 线上环境接口Url
- // prodUrl: 'https://srgdjczzxtpt.com:2080/api',
- prodUrl: 'http://192.168.2.105:9528',
+ prodUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // prodUrl: 'http://192.168.2.105:9528',
uploadUrl: 'https://srgdjczzxtpt.com:2080/api',
// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
diff --git a/manifest.json b/manifest.json
index 7820fb9..3dfc43f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "饶城格格通",
- "appid" : "__UNI__EE88272",
+ "appid" : "__UNI__C5BC0E5",
"description" : "",
"versionName" : "1.0.10",
"versionCode" : 104,
@@ -8,7 +8,7 @@
/* 5+App特有相关 */
"app-plus" : {
"compatible" : {
- "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+ "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
},
"safearea" : {
"bottom" : {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index ba6afcf..a595b26 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -194,6 +194,15 @@
<text class="nav-item-text f-26 mt-10">校园任务</text>
</view>
</u-grid-item>
+
+ <u-grid-item v-if="roleName == 'xyzt'"
+ @click="navigatorPage('/subPackage/workbench/views/editExamine')">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-02.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">场所维护</text>
+ </view>
+ </u-grid-item>
+
<u-grid-item @click="navToSchoolClockIn()" v-if="roleName == 'xyty'">
<view class="nav-item flex f-d-c a-i-c">
<u-icon name="/static/icon/nav-29.png" width="80rpx" height="80rpx"></u-icon>
diff --git a/subPackage/counterfraud/add.vue b/subPackage/counterfraud/add.vue
index bb2e6db..1c9c271 100644
--- a/subPackage/counterfraud/add.vue
+++ b/subPackage/counterfraud/add.vue
@@ -60,7 +60,7 @@
</u-radio-group>
</u-form-item>
- <u-form-item v-if="isShowOtherId" class="form-item" labelWidth="100" label="反诈宣防类别:"
+ <u-form-item v-if="isShowOtherId" class="form-item" labelWidth="100" label="反诈宣防方式:"
:required="isRequired" :disabled="isDisabled" prop="otherId">
<view class="flex j-c-s-b a-i-c" v-if="!currentId" @click="showNotSwindleTypePicker= true">
<u-input border="none" v-model="notSwindleValue" disabled disabledColor="#ffffff"
diff --git a/subPackage/school/clockIn.vue b/subPackage/school/clockIn.vue
index 99fdf3a..f7f8847 100644
--- a/subPackage/school/clockIn.vue
+++ b/subPackage/school/clockIn.vue
@@ -269,7 +269,10 @@
if (isJur == 1) {
if (doorplateType == "中门牌" || doorplateType == "小门牌") {
this.info.houseCode = code;
- this.info.placeName = res.data.poi;
+ this.info.placeName = res.data.aoiName;
+ this.info.location = res.data.addressName;
+ this.info.lng = res.data.x;
+ this.info.lat = res.data.y;
}
} else {
uni.showModal({
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index 6494962..e13c79f 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/subPackage/school/troubleDetail.vue
@@ -62,7 +62,7 @@
<block v-if="roleTypeName == 'mj'">
<view class="image-wrap bgc-ff">
<view class="mb-20">
- 处理意见
+ <text style="color: red;">* </text> 处理意见
</view>
<view class="flex flex-wrap">
<u-textarea v-model="confirmNotion" placeholder="请输入处理意见"
@@ -72,7 +72,7 @@
<view class="image-wrap bgc-ff">
<view class="mb-20">
- 工作照片
+ <text style="color: red;">* </text> 工作照片
</view>
<view class="flex-wrap" v-if="info.confirmFlag == 2">
<view class="mr-20" v-for="i in workImage">
--
Gitblit v1.9.3