From 534b6c2f8a7d375727703dbf702c3753a3e17165 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 17 Apr 2024 17:38:41 +0800
Subject: [PATCH] 更新

---
 subPackage/counterfraud/add.vue   |   15 ++++++++++++++-
 subPackage/school/dispute.vue     |    8 ++++++++
 subPackage/school/trouble.vue     |    8 ++++++++
 subPackage/house/family/index.vue |   12 +++++++++---
 subPackage/school/security.vue    |    8 ++++++++
 subPackage/article/detail.vue     |    6 +++++-
 6 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index c729118..f5ea66f 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -72,7 +72,7 @@
 					<view class="vote bgc-ff">
 						<view class="mb-20" v-for="(item,index) in voteTopicList" :key="index">
 							<view class="vote-title">
-								<text v-if="item.mandatoryFlag == 2">*</text>
+								<text v-if="item.mandatoryFlag == 2" class="vote-sign">*</text>
 								<text class="f-30 fw">{{item.discussContent}}</text>
 								<text class="f-26 ml-10" v-if="item.optionRange == 0">(单选)</text>
 								<text class="f-26 ml-10" v-if="item.optionRange == 1 && !item.optionNumber">(多选)</text>
@@ -782,6 +782,10 @@
 		.vote-title {
 			padding: 30rpx 0;
 		}
+
+		.vote-sign {
+			color: red;
+		}
 	}
 
 	.comment {
diff --git a/subPackage/counterfraud/add.vue b/subPackage/counterfraud/add.vue
index 52da27d..717a3f2 100644
--- a/subPackage/counterfraud/add.vue
+++ b/subPackage/counterfraud/add.vue
@@ -519,7 +519,14 @@
 							this.isScan = true;
 							if (addType == 1 || addType == 3) {
 								if (res.data.householdList.length) {
-									this.houseHoldInfo = res.data.householdList[0]
+									this.houseHoldInfo = res.data.householdList[0];
+									let data = {
+										name: res.data.householdList[0].name,
+										telephone: res.data.householdList[0].phoneNumber,
+										idCard: res.data.householdList[0].idCard,
+										address: res.data.householdList[0].currentAddress
+									}
+									this.info.backblastPubPersonEntityList.push(data);
 								} else {
 									this.houseHoldInfo = {}
 								}
@@ -528,6 +535,12 @@
 
 								if (res.data.place) {
 									this.principalInfo = res.data.place;
+									let data = {
+										name: res.data.place[0].principal,
+										telephone: res.data.place[0].principalPhone,
+										idCard: res.data.place[0].principalIdCard
+									}
+									this.info.backblastPubPersonEntityList.push(data);
 								} else {
 									this.principalInfo = {}
 								}
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index c78e756..cb91c89 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -327,9 +327,15 @@
 					code,
 					type
 				} = e.currentTarget.dataset;
-
-				let url = `/subPackage/house/houseNumber/index?stdId=${code}&addressType=${type}`
-				this.$u.func.globalNavigator(url, "navTo")
+				if (this.shopType == 1) {
+					//自建房商铺跳转
+					let url = `/subPackage/house/roomDetails/detail?code=${code}`
+					this.$u.func.globalNavigator(url, "navTo")
+				} else {
+					//商超跳转
+					let url = `/subPackage/house/houseNumber/index?stdId=${code}&addressType=${type}`
+					this.$u.func.globalNavigator(url, "navTo")
+				}
 			},
 			getHouseData(code, code2, type) {
 				let params = {
diff --git a/subPackage/school/dispute.vue b/subPackage/school/dispute.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/subPackage/school/dispute.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/subPackage/school/security.vue b/subPackage/school/security.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/subPackage/school/security.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/subPackage/school/trouble.vue b/subPackage/school/trouble.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/subPackage/school/trouble.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.3