From f534d22a24d23dc165091f355ea117ca56a1feb0 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sun, 18 Feb 2024 17:29:03 +0800
Subject: [PATCH] 更新
---
pages/home/index.vue | 3 +
pages.json | 8 ++++
pages/home/launch.html | 20 ++++++++++
subPackage/workbench/views/cscj.vue | 1
pages/home/launch.vue | 33 ++++++++++++++++
common/setting.js | 4 +-
subPackage/house/roomControl/index.vue | 2
7 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index c64e154..1fe3904 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- devUrl: 'http://192.168.2.109:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.2.109: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/",
diff --git a/pages.json b/pages.json
index ef53090..4000c69 100644
--- a/pages.json
+++ b/pages.json
@@ -58,6 +58,14 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path": "pages/home/launch",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
}
],
"subPackages": [
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 5220718..4d6063b 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -731,6 +731,9 @@
this.$u.func.globalNavigator(
`/subPackage/house/list/index?id=${code}&title=${aoiName}&neiName=${neiName}&address=${addressName}&neiCode=${neiCode}&aoiCode=${aoiCode}`,
"navTo")
+ } else if (doorplateType == "小门牌") {
+ this.$u.func.globalNavigator(
+ `/subPackage/house/houseNumber/index?stdId=${code}`, "navTo")
}
} else {
uni.showModal({
diff --git a/pages/home/launch.html b/pages/home/launch.html
new file mode 100644
index 0000000..a8ec79e
--- /dev/null
+++ b/pages/home/launch.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title></title>
+ </head>
+ <body>
+ <script type="text/javascript">
+ var config = {
+ id: "wx41aa8a5d2e565a05",
+ path: "subPackage/workbench/views/cscj",
+ version: "trial"
+ }
+ window.onload = function() {
+ location.href = `weixin://dl/business/?appid=${config.id}&path=${config.path}&env_version=${config.version}`
+ })
+ </script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/pages/home/launch.vue b/pages/home/launch.vue
new file mode 100644
index 0000000..13d1a96
--- /dev/null
+++ b/pages/home/launch.vue
@@ -0,0 +1,33 @@
+<template>
+ <view class="">
+ <footer-btn @click="navTo" text="跳转"></footer-btn>
+ </view>
+</template>
+
+<script>
+ export default {
+ // onLoad() {
+ // var config = {
+ // id: "wx41aa8a5d2e565a05",
+ // path: "subPackage/workbench/views/cscj",
+ // version: "trial"
+ // }
+ // location.href = `weixin://dl/business/?appid=${config.id}&path=${config.path}&env_version=${config.version}`
+ // },
+ methods: {
+ navTo() {
+ var config = {
+ id: "wx41aa8a5d2e565a05",
+ path: "subPackage/workbench/views/cscj",
+ version: "trial",
+ query: "test"
+ }
+ location.href =
+ `weixin://dl/business/?appid=${config.id}&path=${config.path}&env_version=${config.version}&query=${config.query}`
+ }
+ }
+ }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/subPackage/house/roomControl/index.vue b/subPackage/house/roomControl/index.vue
index 7c28aee..232fa5e 100644
--- a/subPackage/house/roomControl/index.vue
+++ b/subPackage/house/roomControl/index.vue
@@ -219,7 +219,7 @@
}
let roleName = uni.getStorageSync("activeRole").roleName;
- if (roleName == "网格员") {
+ if (roleName != "居民") {
this.roleType = 2;
}
},
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index dab58dc..e37c17b 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -506,6 +506,7 @@
styleIsolation: 'shared', // 解除样式隔离
},
async onLoad(option) {
+ console.log("option===>", option);
await this.getCategory();
await this.getAllBizDict();
// this.getNineTypeList();
--
Gitblit v1.9.3