From d85dba339eedb9f43b86a4e14defd65e1cdcf397 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 20 Jul 2021 09:23:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activityDetail/activityDetail.vue     | 5 +++--
 pages/activityes/activityes.vue             | 5 +++--
 pages/addressList/addressList.vue           | 3 ++-
 pages/complaintOrder/complaintOrder.vue     | 2 +-
 pages/excuteInspection/excuteInspection.vue | 4 ++--
 pages/floorList/floorList.vue               | 3 ++-
 pages/index/index.vue                       | 9 +++++----
 pages/meterReading/meterReading.vue         | 2 +-
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pages/activityDetail/activityDetail.vue b/pages/activityDetail/activityDetail.vue
index 39f62a0..ebeacb1 100644
--- a/pages/activityDetail/activityDetail.vue
+++ b/pages/activityDetail/activityDetail.vue
@@ -21,6 +21,7 @@
 	import stringUtil from '../../lib/java110/utils/StringUtil.js';
 	import conf from '../../conf/config.js'
 	import {replaceImgSrc} from '../../lib/java110/utils/ImageUtil.js'
+	import url from '../../constant/url.js'
 	export default {
 		data() {
 			return {
@@ -62,7 +63,7 @@
 			      communityId: this.currentCommunityId
 			    };
 			    _that.java110Context.request({
-			      url: _that.java110Constant.url.listActivitiess,
+			      url: url.listActivitiess,
 			      header: _that.java110Context.getHeaders(),
 			      method: "GET",
 			      data: _objData, //动态数据
@@ -71,7 +72,7 @@
 			        if (res.statusCode == 200) {
 			          let _activites = res.data.activitiess;
 			          _activites.forEach(function (_item) {
-			            _item.src = _that.java110Constant.url.filePath + "?fileId=" + _item.headerImg + "&communityId=" + _that.currentCommunityId + "&time=" + new Date();
+			            _item.src = url.filePath + "?fileId=" + _item.headerImg + "&communityId=" + _that.currentCommunityId + "&time=" + new Date();
 			            let _startTime = _item.startTime.replace(/\-/g, "/")
 			            let _tmpStartTime = new Date(_startTime);
 
diff --git a/pages/activityes/activityes.vue b/pages/activityes/activityes.vue
index f8927f7..b53084d 100644
--- a/pages/activityes/activityes.vue
+++ b/pages/activityes/activityes.vue
@@ -30,6 +30,7 @@
 </template>
 
 <script>
+	import url from '../../constant/url.js'
 	export default {
 		data() {
 			return {
@@ -57,7 +58,7 @@
 			      communityId: this.currentCommunityId
 			    };
 			    _that.java110Context.request({
-			      url: _that.java110Constant.url.listActivitiess,
+			      url: url.listActivitiess,
 			      header: _that.java110Context.getHeaders(),
 			      method: "GET",
 			      data: _objData, //动态数据
@@ -68,7 +69,7 @@
 			          let _activites = res.data.activitiess;
 			          let _acts = [];
 			          _activites.forEach(function (_item) {
-			            _item.src = _that.java110Constant.url.filePath + "?fileId=" + _item.headerImg + "&communityId=" + _that.currentCommunityId + "&time=" + new Date();
+			            _item.src = url.filePath + "?fileId=" + _item.headerImg + "&communityId=" + _that.currentCommunityId + "&time=" + new Date();
 			            let _startTime = _item.startTime.replace(/\-/g, "/")
 			            let _tmpStartTime = new Date(_startTime);
 			
diff --git a/pages/addressList/addressList.vue b/pages/addressList/addressList.vue
index 69a00fd..de32923 100644
--- a/pages/addressList/addressList.vue
+++ b/pages/addressList/addressList.vue
@@ -47,6 +47,7 @@
 </template>
 
 <script>
+	import url from '../../constant/url.js'
 	export default {
 		data() {
 			return {
@@ -85,7 +86,7 @@
 					name: this.name
 				};
 				this.java110Context.request({
-					url: _that.java110Constant.url.queryStaffInfos,
+					url: url.queryStaffInfos,
 					header: _that.java110Context.getHeaders(),
 					method: "GET",
 					data: _objData, //动态数据
diff --git a/pages/complaintOrder/complaintOrder.vue b/pages/complaintOrder/complaintOrder.vue
index d16c19d..42a3b1d 100644
--- a/pages/complaintOrder/complaintOrder.vue
+++ b/pages/complaintOrder/complaintOrder.vue
@@ -290,7 +290,7 @@
 					})
 				} else {
 					this.java110Context.request({
-						url: _that.java110Constant.url.saveComplaint,
+						url: url.saveComplaint,
 						header: _that.java110Context.getHeaders(),
 						method: "POST",
 						data: obj, //动态数据
diff --git a/pages/excuteInspection/excuteInspection.vue b/pages/excuteInspection/excuteInspection.vue
index a04a4c4..98a5ec4 100644
--- a/pages/excuteInspection/excuteInspection.vue
+++ b/pages/excuteInspection/excuteInspection.vue
@@ -85,7 +85,7 @@
 
 				_that.java110Context.request({
 					header: _that.java110Context.getHeaders(),
-					url: _that.java110Constant.url.listInspectionTaskDetails,
+					url: url.listInspectionTaskDetails,
 					method: "GET",
 					data: {
 						communityId: _that.communityId,
@@ -100,7 +100,7 @@
 						_inspectionTaskDetails.forEach(function(_item) {
 							if (_item.state == '20200407') {
 								_item.photos.forEach(function(_photoTmp) {
-									_photoTmp.url = _that.java110Constant.url.hcBaseUrl + _photoTmp.url;
+									_photoTmp.url = url.hcBaseUrl + _photoTmp.url;
 								});
 							}
 
diff --git a/pages/floorList/floorList.vue b/pages/floorList/floorList.vue
index 046a243..4279fed 100644
--- a/pages/floorList/floorList.vue
+++ b/pages/floorList/floorList.vue
@@ -28,6 +28,7 @@
 
 <script>
 	import {getCurrentCommunity} from '../../api/community/community.js'
+	import url from '../../constant/url.js'
 	export default {
 		data() {
 			return {
@@ -62,7 +63,7 @@
 				
 				
 				this.java110Context.request({
-					url: _that.java110Constant.url.queryFloors,
+					url: url.queryFloors,
 					header: _that.java110Context.getHeaders(),
 					method: "GET",
 					data: _objData, //动态数据
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b44be6f..9b6454e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,9 +25,9 @@
 				<swiper class="screen-swiper swiper-height-index" :indicator-dots="true" :circular="true"
 					:autoplay="true" interval="5000" duration="500">
 					<swiper-item v-for="(item,index) in swiperList" :key="index">
-						<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
-						<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false"
-							objectFit="cover" v-if="item.type=='video'"></video>
+						<image :src="item.url" mode="aspectFill"></image>
+						<!-- <video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false"
+							objectFit="cover" v-if="item.type=='video'"></video> -->
 					</swiper-item>
 				</swiper>
 			</view>
@@ -89,6 +89,7 @@
 	import {isNull} from '../../lib/java110/utils/StringUtil.js'
 	
 	import {getUserInfo} from '../../lib/java110/api/Java110SessionApi.js'
+	import url from '../../constant/url.js'
 	export default {
 		data() {
 			return {
@@ -163,7 +164,7 @@
 							let _activites = res.data.activitiess;
 							let _acts = [];
 							_activites.forEach(function(_item) {
-								_item.src = _that.java110Constant.url.filePath + "?fileId=" + _item
+								_item.src = url.filePath + "?fileId=" + _item
 									.headerImg + "&communityId=" + _that.currentCommunityId +
 									"&time=" + new Date();
 								_acts.push(_item);
diff --git a/pages/meterReading/meterReading.vue b/pages/meterReading/meterReading.vue
index 0cec6e7..ee86bee 100644
--- a/pages/meterReading/meterReading.vue
+++ b/pages/meterReading/meterReading.vue
@@ -38,7 +38,7 @@
 	export default {
 		data() {
 			return {
-				orderImg: this.java110Constant.url.baseUrl + 'img/order.png',
+				orderImg: url.baseUrl + 'img/order.png',
 				meterReads: [],
 				roomNum: '',
 			}