fix

virgo.wzfrontend/console/src/components/work/common/amap.vue

@@ -2,13 +2,13 @@
 	<div class="hui-flex hui-dialog">
 		<div class="hui-flex-box hui-dialog-content" style="padding: 0;padding-bottom: 20px;">
 			<div class="map">
-				<div class="map-input">
+				<div class="map-input" v-if="type == 'insert'">
 					<input type="text" placeholder="请输入地理位置" v-model="input" id="tipinput" />
 				</div>
 				<div ref="gaode_Map" id="gaode_Map"></div>
 			</div>
 		</div>
-		<div class="hui-dialog-submit">
+		<div class="hui-dialog-submit" v-if="type == 'insert'">
 			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
 			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
 		</div>
@@ -21,7 +21,7 @@
 		securityJsCode: "3e392dc7eb2cf2c04b1b8899776e8905",
 	};
 	export default {
-		props: ['coordinates'],
+		props: ['coordinates', 'type'],
 		data() {
 			return {
 				map: {},
@@ -55,6 +55,7 @@
 						resizeEnable: true,
 					});
 					this.setMarker();
+					if (this.type === 'look') return;
 					this.searchMap();
 					// 监听鼠标点击事件
 					this.map.on("click", this.clickMapHandler);

virgo.wzfrontend/console/src/components/work/common/selectLocation.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="set-map">
-		<div class="map-button">
-			<el-button size="medium" @click="visible = true" v-if="type === 'insert'">
+		<div class="map-button" v-if="type === 'insert'">
+			<el-button size="medium" @click="visible = true">
 				<i class="el-icon-setting"></i>设置地图位置
 			</el-button>
 			<div class="tips">
@@ -9,8 +9,13 @@
 				<span>{{!address?'未设置':'已设置'}}</span>
 			</div>
 		</div>
+		<div class="map-button" v-else-if="type === 'look'">
+			<el-button size="medium" @click="visible = true">
+				查看地图位置
+			</el-button>
+		</div>
 		<el-dialog title="选择位置" :visible.sync="visible" width="900px" :append-to-body="true">
-			<amap v-if="visible" :coordinates="coordinates" @callback="callback"></amap>
+			<amap v-if="visible" :coordinates="coordinates" @callback="callback" :type="type"></amap>
 		</el-dialog>
 	</div>
 

virgo.wzfrontend/console/src/components/work/space/project/detail.vue

@@ -23,6 +23,19 @@
 				<div class="hui-detail-value">{{detail.comment}}</div>
 			</div>
 		</div>
+		<div class="hui-detail-title" v-if="detail.supportingFacilities">配套设施</div>
+		<div class="hui-detail-content hui-detail-image" v-if="detail.supportingFacilities">
+			<div class="hui-tag hui-tag-info"
+				v-for="item in $field.findTypeNameByList('supportingFacilities',detail.supportingFacilities)"
+				:key="item.id" style="margin-right: 10px;">
+				{{item.name}}
+			</div>
+		</div>
+		<div class="hui-detail-title" v-if="detail.coordinates">地图位置</div>
+		<div class="hui-detail-content hui-detail-image" v-if="detail.coordinates">
+			<select-location ref="map" type="look" :coordinates="detail.coordinates">
+			</select-location>
+		</div>
 		<div class="hui-detail-title">项目标签</div>
 		<div class="hui-detail-content hui-detail-image">
 			<tag ref="tag" type="look" :tagType="1" :tagActive="detail.tagIds ? detail.tagIds.split(',') : []">
@@ -42,6 +55,7 @@
 	} from '@/httpApi/space'
 	import upload from '@/components/common/upload'
 	import tag from '@/components/common/tag'
+	import selectLocation from '@/components/work/common/selectLocation'
 	export default {
 		props: ['detailId'],
 		data() {
@@ -62,7 +76,8 @@
 		},
 		components: {
 			upload,
-			tag
+			tag,
+			selectLocation
 		},
 		methods: {
 			init() {

virgo.wzfrontend/console/src/components/work/space/project/edit.vue

@@ -19,6 +19,13 @@
 					<el-input type="text" v-model="specific" placeholder="请输入具体地点">
 					</el-input>
 				</el-form-item>
+				<el-form-item label="配套设施" prop="type">
+					<el-select v-model="supportingFacilities" placeholder="请选择配套设施" multiple collapse-tags>
+						<el-option :label="item.name" :value="item.id"
+							v-for="(item,index) in $field.field.supportingFacilities" :key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="项目描述" class="hui-textarea">
 					<el-input type="textarea" v-model="projectForm.comment" placeholder="请输入项目描述" resize="none">
 					</el-input>
@@ -67,11 +74,13 @@
 					picture: '',
 					tagIds: '',
 					type: 1,
-					coordinates: ''
+					coordinates: '',
+					supportingFacilities: ''
 				},
 				specific: '',
 				responsibility: [],
-				showMap: false
+				showMap: false,
+				supportingFacilities: []
 			}
 		},
 		created() {
@@ -83,6 +92,8 @@
 						this.showMap = true;
 						this.projectForm.address = JSON.parse(this.projectForm.address);
 						if (this.projectForm.picture) this.responsibility = JSON.parse(this.projectForm.picture);
+						if (this.projectForm.supportingFacilities) this.supportingFacilities = this.projectForm
+							.supportingFacilities.split(',').map(node => Number(node));
 						if (this.projectForm.data) {
 							let data = JSON.parse(this.projectForm.data);
 							this.specific = data.specific;
@@ -105,6 +116,7 @@
 						postData['address'] = JSON.stringify(this.projectForm.address);
 						postData['tagIds'] = this.$refs.tag.tagIds();
 						postData['coordinates'] = this.$refs.map.address;
+						postData['supportingFacilities'] = this.supportingFacilities.join(',');
 						if (this.isUpdate) {
 							updateProject(postData).then(this.successFunc);
 						} else {

virgo.wzfrontend/console/src/config/field.js

@@ -219,6 +219,32 @@ const clearWorkWay = [{
 	name: '垃圾处理'
 }];
 
+const supportingFacilities = [{
+	id: 1,
+	name: '交通便利',
+	icon: 'icon-jiaotong'
+}, {
+	id: 2,
+	name: '免费wifi',
+	icon: 'icon-wifi'
+}, {
+	id: 3,
+	name: '幼儿教育',
+	icon: 'icon-zhishiku'
+}, {
+	id: 4,
+	name: '医疗完善',
+	icon: 'icon-tubiao_-'
+}, {
+	id: 5,
+	name: '靠近公园',
+	icon: 'icon-gongyuan'
+}, {
+	id: 6,
+	name: '便捷购物',
+	icon: 'icon-gouwu'
+}];
+
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
 		id: 0,
@@ -246,9 +272,15 @@ export default {
 		preferentialRentFreeWay,
 		invoiceType,
 		serviceWorkWay,
-		clearWorkWay
+		clearWorkWay,
+		supportingFacilities
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;
 	},
+	findTypeNameByList(type, ids) {
+		return ids.split(',').map(id => {
+			return findItem(type, id)
+		});
+	}
 }

virgo.wzfrontend/yui_wx/config/field.js

@@ -219,14 +219,33 @@ const clearWorkWay = [{
 	name: '垃圾处理'
 }];
 
-const findItem = (type, id) => {
-	return eval(type).find(node => node.id == id) || {
-		id: 0,
-		name: '-'
-	};
-};
+const supportingFacilities = [{
+	id: 1,
+	name: '交通便利',
+	icon: 'icon-jiaotong'
+}, {
+	id: 2,
+	name: '免费wifi',
+	icon: 'icon-wifi'
+}, {
+	id: 3,
+	name: '幼儿教育',
+	icon: 'icon-zhishiku'
+}, {
+	id: 4,
+	name: '医疗完善',
+	icon: 'icon-tubiao_-'
+}, {
+	id: 5,
+	name: '靠近公园',
+	icon: 'icon-gongyuan'
+}, {
+	id: 6,
+	name: '便捷购物',
+	icon: 'icon-gouwu'
+}];
 
-export default {
+const obj = {
 	field: {
 		projectType,
 		houseType,
@@ -246,9 +265,23 @@ export default {
 		preferentialRentFreeWay,
 		invoiceType,
 		serviceWorkWay,
-		clearWorkWay
+		clearWorkWay,
+		supportingFacilities
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;
 	},
-}
+	findTypeNameByList(type, ids) {
+		ids = ids || '';
+		return ids.split(',').map(id => {
+			return findItem(type, id)
+		});
+	}
+}
+const findItem = (type, id) => {
+	return obj.field[type].find(node => node.id == id) || {
+		id: 0,
+		name: '-'
+	};
+};
+export default obj;

virgo.wzfrontend/yui_wx/pages/project/project.vue

@@ -1,33 +1,17 @@
 <template>
 	<view class="project-detail">
 		<swiper class="swiper" circular :indicator-dots="true">
-			<swiper-item>
-				<image class="image"
-					src="https://assets.api.uizard.io/api/cdn/stream/0ba939e8-082b-42f9-a314-be3e195b3b25.png"
-					mode="aspectFill">
-				</image>
-			</swiper-item>
-			<swiper-item>
-				<image class="image"
-					src="https://assets.api.uizard.io/api/cdn/stream/0ba939e8-082b-42f9-a314-be3e195b3b25.png"
-					mode="aspectFill">
-				</image>
-			</swiper-item>
-			<swiper-item>
-				<image class="image"
-					src="https://assets.api.uizard.io/api/cdn/stream/0ba939e8-082b-42f9-a314-be3e195b3b25.png"
-					mode="aspectFill">
+			<swiper-item v-for="item in responsibility" :key="item.id">
+				<image class="image" :src="item.url" mode="aspectFill">
 				</image>
 			</swiper-item>
 		</swiper>
 		<view class="project-title">
-			<view class="project-name">维绿大厦项目</view>
+			<view class="project-name">{{detail.name}}</view>
 			<view class="project-label">距离您2km</view>
 			<uni-icons class="wx-icon" type="weixin" size="38" color="#43b156"></uni-icons>
 		</view>
-		<view class="project-label project-article">
-			维绿大厦位于武进区，交通便利，环境优美，周围公园便于锻炼。
-		</view>
+		<view class="project-label project-article">{{detail.comment}}</view>
 		<view class="project-content">
 			<view class="content-title">地理位置</view>
 			<view class="content-map">
@@ -35,30 +19,12 @@
 			</view>
 			<view class="content-title">配套设施</view>
 			<view class="content-device">
-				<view class="device-item">
-					<uni-icons class="device-icon" custom-prefix="iconfont" type="icon-gongyuan" size="16"></uni-icons>
-					<text class="device-label">公园环境</text>
-				</view>
-				<view class="device-item">
-					<uni-icons class="device-icon" custom-prefix="iconfont" type="icon-jiaotong" size="18"></uni-icons>
+				<view class="device-item"
+					v-for="item in $field.findTypeNameByList('supportingFacilities',detail.supportingFacilities)"
+					:key="item.id">
+					<uni-icons class="device-icon" custom-prefix="iconfont" :type="item.icon" size="18"></uni-icons>
 					<text class="device-label">交通便利</text>
 				</view>
-				<view class="device-item">
-					<uni-icons class="device-icon" custom-prefix="iconfont" type="icon-tubiao_-" size="18"></uni-icons>
-					<text class="device-label">医疗完善</text>
-				</view>
-				<view class="device-item">
-					<uni-icons class="device-icon" custom-prefix="iconfont" type="icon-wifi" size="16"></uni-icons>
-					<text class="device-label">免费wifi</text>
-				</view>
-				<view class="device-item">
-					<uni-icons class="device-icon" custom-prefix="iconfont" type="icon-zhishiku" size="16"></uni-icons>
-					<text class="device-label">幼儿教育</text>
-				</view>
-				<view class="device-item">
-					<uni-icons class="device-icon" custom-prefix="iconfont" type="icon-gouwu" size="18"></uni-icons>
-					<text class="device-label">便捷购物</text>
-				</view>
 			</view>
 			<view class="content-title">房源列表</view>
 			<view class="house-list">
@@ -72,13 +38,19 @@
 	import {
 		getOpenHouseListByPage
 	} from '@/request/api/house.js'
+	import {
+		getProjectDetailById
+	} from '@/request/api/project.js'
 	import houseItems from "@/components/house/houseItems.vue";
 	export default {
 		data() {
 			return {
-				latitude: 27.973361,
-				longitude: 120.658992,
-				list: []
+				list: [],
+				detail: {},
+				responsibility: [],
+				coordinates: [],
+				latitude: 39.90923,
+				longitude: 116.397428
 			}
 		},
 		onLoad(body) {
@@ -87,13 +59,25 @@
 		},
 		onReady() {
 			this._mapContext = uni.createMapContext("map", this);
-			this.addMarkers();
 		},
 		components: {
 			houseItems
 		},
 		methods: {
 			init() {
+				getProjectDetailById(9).then(res => {
+					if (res.code === 200) {
+						this.detail = res.data;
+						if (this.detail.picture) this.responsibility = JSON.parse(this.detail.picture);
+						if (this.detail.coordinates) {
+							this.coordinates = this.detail.coordinates.split(',');
+							this.latitude = this.coordinates[1];
+							this.longitude = this.coordinates[0];
+							this.addMarkers();
+						}
+
+					}
+				})
 				getOpenHouseListByPage({
 					currPage: 1,
 					pageSize: 10
@@ -105,14 +89,12 @@
 			},
 			addMarkers() {
 				const positions = [{
-					latitude: 23.099994,
-					longitude: 113.324520,
+					latitude: this.coordinates[1],
+					longitude: this.coordinates[0],
 				}]
-
+				console.log(positions);
 				const markers = []
-
 				positions.forEach((p, i) => {
-					console.log(i)
 					markers.push(
 						Object.assign({}, {
 							id: i + 1,

virgo.wzfrontend/yui_wx/request/api/project.js

@@ -7,4 +7,15 @@ import {
  * 
  * 
  */
-export function getProjectList() {}
+export function getProjectList() {}
+/* 
+ * 获取项目详情
+ * 
+ * 
+ */
+export function getProjectDetailById(id) {
+	return request({
+		url: `/api/project/getProject/${id}`,
+		method: 'get'
+	})
+}