From 8dae74070e63cec1b2627a71f1f2d0e8dffc0e6a Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Sun, 08 Sep 2024 11:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master

---
 gz-wxparty/utils/wxs/util.wxs |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/gz-wxparty/utils/wxs/util.wxs b/gz-wxparty/utils/wxs/util.wxs
index 867b9fd..cefffe1 100644
--- a/gz-wxparty/utils/wxs/util.wxs
+++ b/gz-wxparty/utils/wxs/util.wxs
@@ -1,36 +1,37 @@
 // 组合省市区街道展示
 function showLocation(value) {
-	var villageName = value.villageName ? '/' + value.villageName : '';
-	return value.provName + '/' + value.cityName + '/' + value.areaName + '/' + value.roadName + villageName;
+  var villageName = value.villageName ? '/' + value.villageName : '';
+  // return value.provName + '/' + value.cityName + '/' + value.areaName + '/' + value.roadName + villageName;
+  return value.cityName + '/' + value.areaName + '/' + value.roadName + villageName;
 }
 // 判断文件类型
 function fileType(value) {
-	var obj = {
-		'22_00017-0': '未分类',
-		'22_00017-1': '音频',
-		'22_00017-2': '视频',
-		'22_00017-3': '图片',
-		'22_00017-4': 'Word文档',
-		'22_00017-5': 'Excel文档',
-		'22_00017-6': 'PDF文件',
-		'22_00017-7': 'txt文本',
-		'22_00017-8': '压缩文件',
-		'22_00017-9': 'PPT文件',
-		'22_00017-99': '其它文件',
-	};
-	return obj[value];
+  var obj = {
+    '22_00017-0': '未分类',
+    '22_00017-1': '音频',
+    '22_00017-2': '视频',
+    '22_00017-3': '图片',
+    '22_00017-4': 'Word文档',
+    '22_00017-5': 'Excel文档',
+    '22_00017-6': 'PDF文件',
+    '22_00017-7': 'txt文本',
+    '22_00017-8': '压缩文件',
+    '22_00017-9': 'PPT文件',
+    '22_00017-99': '其它文件',
+  };
+  return obj[value];
 }
 // 字符串转变数组
 function strArr(value) {
-	if (!value) {
-		return ['无'];
-	}
-	var arr = value.split(',');
-	return arr;
+  if (!value) {
+    return ['无'];
+  }
+  var arr = value.split(',');
+  return arr;
 }
 
 module.exports = {
-	showLocation: showLocation,
-	fileType: fileType,
-	strArr: strArr,
-};
+  showLocation: showLocation,
+  fileType: fileType,
+  strArr: strArr,
+};
\ No newline at end of file

--
Gitblit v1.8.0