梁航：合并冲突

pages/Partnerships/Partnerships.vue

@@ -29,15 +29,25 @@
 </template>
 
 <script>
+import form from 'uview-ui/libs/config/props/form';
+
 	export default {
 		data() {
 			return {
 				show: false,
+				submitForm:{
+					name:'',
+					idcode:''
+				}
 			}
 		},
 		methods: {
 			submit(){
-				console.log('提交');
+				console.log('提交',form);
+				
+					//this.$u.api.submit( this.form )
+					uni.$u.toast('提交成功')
+				
 			},
 			confirmCheckWay(e){
 				
@@ -74,7 +84,7 @@
 		margin-top: 10rpx;
 		margin-left: 17rpx;     
 		color: #c1c1c1;
-		font-size: 27rpx;
+		/* font-size: 27rpx; */
 	}
 	
 </style>

pages/index/NavBarPages/czxx/czxx.vue

@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<ShowShopList :showStyle="2"/>
+			<ShowShopList :showStyle="2" :adlinkPath = "adlinkPath"/>
 		</view>
 	</view>
 </template>
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				
+				adlinkPath: "/pages/publish/publishRent/publishRent"
 			}
 		},
 		methods: {

pages/index/NavBarPages/xmzs/xmzs.vue

@@ -15,7 +15,7 @@
 			<DropDown></DropDown>
 		</view>
 		<view class="marginLR10">
-			<ShowShopList :showStyle="2"/>
+			<ShowShopList :showStyle="2" :adlinkPath="adlinkPath"/>
 		</view>
 	</view>
 </template>
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				
+				adlinkPath: "/pages/publish/publishInvestment/publishInvestment"
 			}
 		},
 		methods: {

pages/index/index.vue

@@ -42,7 +42,7 @@
 				notice: [],
 				chooseIndex: 0,
 				statNum: {},
-				swiperList: []
+				swiperList: [],
 			}
 		},
 		onLoad() {
@@ -74,7 +74,12 @@
 			},
 			getClassList() {
 				this.$api.getClassList().then(res => {
-					console.log(res.data.data);
+					let data = res.data.data
+					data.sort((a,b)=>{
+						return a.id - b.id
+					})
+					data = data.map(item => item.name)
+					uni.setStorageSync('classList', JSON.stringify(data))
 				})
 			},
 			getRegionList() {

pages/index/map/map.vue

@@ -8,12 +8,12 @@
 			</view>
 		</view> -->
 		<view class="content">
-			<map id="map" @markertap="markerClick" @regionchange="handleRegionChange()" :markers="marker"
-				:show-location="true" :latitude="lat" :longitude="lng" :show-scale="true"></map>
+			<map id="map" @markertap="markerClick" @regionchange="handleRegionChange()" :markers="marker" show-location="true"
+				:latitude="lat" :longitude="lng" :show-scale="true"></map>
 		</view>
-		<!-- <view class="down-shop">
+		<view class="down-shop" v-if="showShop">
 			<ShowShopListItem :shopInfo="shopList" :is-adshow="true" :show-style="0"></ShowShopListItem>
-		</view> -->
+		</view>
 	</view>
 </template>
 
@@ -22,6 +22,7 @@
 		data() {
 			return {
 				radius: '',
+				showShop: false,
 				scaleM: [{
 						scale: 3,
 						milo: 1000000
@@ -82,29 +83,40 @@
 					}
 				],
 				scale: '',
-				lat: '30.48772', //纬度
-				lng: '104.080145', //经度
-				marker: [{ //用户当前位置
-						id: 1,
-						latitude: 30.48772,
-						longitude: 104.080145,
-						iconPath: '../../../static/map/sp_icon_dw.png',
-						width: '58rpx',
-						height: '72rpx',
-						rotate: 0,
-						alpha: 1
-					},
-					//周围标记点
-					{
-						id: 2,
-						latitude: 30.488573,
-						longitude: 104.081248,
-						// iconPath: '../../../static/map/sp_icon_dw.png',
-						width: '58rpx',
-						height: '72rpx',
-						rotate: 0,
-						alpha: 1
-					}
+				lat: uni.getStorageSync('latitude'), //纬度
+				lng: uni.getStorageSync('longitude'), //经度
+				marker: [
+					// { //用户当前位置
+					// 	id: 1,
+					// 	latitude: uni.getStorageSync('latitude'),
+					// 	longitude: uni.getStorageSync('longitude'),
+					// 	// iconPath: '../../../static/map/sp_icon_hdw.png',
+					// 	width: '58rpx',
+					// 	height: '72rpx',
+					// 	rotate: 0,
+					// 	alpha: 1
+					// },
+					// { //用户当前位置
+					// 	id: 2,
+					// 	latitude: 30.48772,
+					// 	longitude: 104.080145,
+					// 	iconPath: '../../../static/map/sp_icon_dw.png',
+					// 	width: '58rpx',
+					// 	height: '72rpx',
+					// 	rotate: 0,
+					// 	alpha: 1
+					// },
+					// //周围标记点
+					// {
+					// 	id: 2,
+					// 	latitude: 30.488573,
+					// 	longitude: 104.081248,
+					// 	// iconPath: '../../../static/map/sp_icon_dw.png',
+					// 	width: '58rpx',
+					// 	height: '72rpx',
+					// 	rotate: 0,
+					// 	alpha: 1
+					// }
 				],
 				shopList: {
 					shopid: 1,
@@ -149,9 +161,9 @@
 		},
 		watch: {
 			scale(newVal, oldVal) {
-				console.log('thisscale',newVal, Math.round(newVal));
-				let ra=''
-				this.scaleM.forEach(item => {		
+				console.log('thisscale', newVal, Math.round(newVal));
+				let ra = ''
+				this.scaleM.forEach(item => {
 					if (item.scale == Math.round(newVal)) {
 						ra = item.milo
 					}
@@ -168,35 +180,63 @@
 			}
 		},
 		created() {
-			this.getMapList()
+			// this.getMapList()
 		},
 		methods: {
+			getDetail(type, id) {
+				this.$api.getShopDetail(type, id).then(res => {
+					console.log('详情', res);
+					const data = res.data.data
+					if (res.data.code == 1) {
+						this.shopList = data
+						// {
+						// 	shopid: 1,
+						// 	pics: this.$api.imgUrl + data.pics,
+						// 	tt: data.tt,
+						// 	num: data.num,
+						// 	zujin: data.zujin,
+						// 	date: data.update_time,
+						// 	area1: data.area1,
+						// 	address: data.address,
+						// 	mianji: data.mianji,
+						// 	zhuanrangfei: "转让费：" + data.zhuanrangfei,
+						// 	trade: data.trade,
+						// 	lianxiren: data.lianxiren,
+						// 	mobile: data.mobile,
+						// }
+						// data.pics = [this.$api.imgUrl + data.pics]
+						// this.shopInfo = data
+					}
+				})
+			},
 			handleRegionChange(e) {
 				console.log('地图缩放层级变化, 只能监听拖拽, 不能监听缩放', e);
 			},
 			getMapList(radius) {
-				console.log('this.radius',radius);
+				console.log('longitude', uni.getStorageSync('longitude'));
+				console.log('latitude', uni.getStorageSync('latitude'));
 				const realData = {
 					longitude: uni.getStorageSync('longitude'),
 					latitude: uni.getStorageSync('latitude'),
-					radius: 100
+					radius: radius * 1000
 				}
+				console.log('realData.radius', realData.radius);
 				const mockData = {
 					longitude: 23.40,
 					latitude: 116.38,
 					radius: 1111111111
 				}
-				this.$api.getMap(mockData).then(res => {
+				this.$api.getMap(realData).then(res => {
 					console.log('getMap', res);
 					let obj = {}
 					let arr = []
-					if (res.statusCode === 200) {
+					if (res.data.code == 1) {
 						res.data.data.forEach(item => {
 							obj = {
 								id: parseInt(item.id),
 								latitude: item.lat,
 								longitude: item.lng,
-								// iconPath: '../../../static/map/sp_icon_dw.png',
+								iconPath: '../../../static/map/sp_icon_dw.png',
 								width: '58rpx',
 								height: '72rpx',
 								rotate: 0,
@@ -204,7 +244,18 @@
 							}
 							arr.push(obj)
 						})
-						// this.marker=arr
+						this.marker = [{ //用户当前位置
+								id: 1,
+								latitude: realData.latitude,
+								longitude: realData.longitude,
+								iconPath: '../../../static/map/sp_icon_hdw.png',
+								width: '58rpx',
+								height: '72rpx',
+								rotate: 0,
+								alpha: 1
+							},
+							...arr,
+						]
 						console.log('this.marker', this.marker);
 					}
 				})
@@ -212,12 +263,18 @@
 			// 图标点击
 			markerClick(e) {
 				console.log('标记点击', e);
+				this.showShop = true
 				let markerId = e.markerId; //点击标记点, 获取id, 查询店铺详情, 展示在下方
+				this.getDetail(1, markerId)
 				this.marker.forEach(item => {
 					if (markerId === item.id) {
-						item.iconPath = ""
+						item.iconPath = "../../../static/map/sp_icon_hdw.png"
+						item.width = '58rpx'
+						item.height = '72rpx'
 					} else {
 						item.iconPath = "../../../static/map/sp_icon_dw.png"
+						item.width = '58rpx'
+						item.height = '72rpx'
 					}
 				})
 			},

pages/my/my.vue

@@ -45,8 +45,8 @@
 		data() {
 			return {
 				src: 'https://cdn.uviewui.com/uview/album/2.jpg',
-				account: '123',
-				username: '用户名',
+				account: '',
+				username: '',
 				isLoad: true
 			}
 		},
@@ -56,6 +56,7 @@
 				return
 			}
 			this.isLoad = true
+			this.getInfo()
 		},
 		methods: {
 			reOnLoad() {
@@ -65,7 +66,7 @@
 					return
 				}
 				this.isLoad = true
-				if(this.isLoad){
+				if (this.isLoad) {
 					this.getInfo()
 				}
 			},