合并master

constant/url.js

@@ -124,6 +124,7 @@ export default {
 	deleteAllocationStorehouse: baseUrl + "callComponent/resourceStore.deleteAllocationStorehouse",
 	// 取消申请
 	deletePurchaseApply: baseUrl + "callComponent/deletePurchaseApply/delete",
+	//查询水电抄表记录
 	listMeterWaters: baseUrl+"app/meterWater.listMeterWaters",
 	listRepairSettings: baseUrl + 'app/repair.listRepairSettings',
 	saveHelpOwnerRepair: baseUrl + "callComponent/addOwnerRepair/save",

pages/changeCommunity/changeCommunity.vue

@@ -16,9 +16,11 @@
 				<view class="cu-item" v-for="(item,sub) in communitys" :key="sub" @tap="_doChangeCommunity(item)">
 					<view class="content padding-tb-sm">
 						<view>
-							<text class="lg  cuIcon-homefill text-blue margin-right-xs"></text> {{item.name}}</view>
+							<text class="lg  cuIcon-homefill text-blue margin-right-xs"></text> {{item.name}}
+						</view>
 						<view class="text-gray text-sm">
-							<text class="lg text-gray cuIcon-location margin-right-xs"></text> {{item.address}}</view>
+							<text class="lg text-gray cuIcon-location margin-right-xs"></text> {{item.address}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -28,7 +30,9 @@
 </template>
 
 <script>
-	import {getCommunity} from '../../api/community/community.js'
+	import {
+		getCommunity
+	} from '../../api/community/community.js'
 	import mapping from '../../constant/mapping.js'
 	export default {
 		data() {
@@ -47,10 +51,12 @@
 				let _condition = {
 					name: this.communityName
 				}
-				getCommunity(function(_communitys){
+				getCommunity(true, _condition)
+					.then(_communitys => {
 						_that.communitys = _communitys;
 						console.log('_communitys', _communitys);
-				},true,_condition);
+
+					});
 			},
 			_searchCommunity: function() {
 				this._loadCommunitys();