处理冲突文件

pages/index/index.vue

@@ -522,213 +522,6 @@ export default {
     },
   },
 };
-	import md5 from '@/common/md5.js';
-	export default {
-		data() {
-			return {
-			    swiperList:[
-					{
-						img:'/static/swiper/swiper1.jpg'
-					},
-					{
-						img:'/static/swiper/swiper2.jpg'
-					},
-				],
-				swiperCurrent:0,
-			    navList:[
-					{
-						url:'/static/navList/appeal.png',
-						path:'/pages/appeal/index',
-						content:'提诉求'
-					},
-					{
-						url:'/static/navList/policy.png',
-						path:'/pages/policy/index',
-						content:'搜政策'
-					},
-					{
-						url:'/static/navList/park.png',
-						path:'/pages/park/index',
-						content:'找园区'
-					},
-					{
-						url:'/static/navList/activity.png',
-						path:'/pages/activity/index',
-						content:'找活动'
-					},
-					{
-						url:'/static/navList/supply.png',
-						path:'/pages/supply/index',
-						content:'发供需'
-					},
-					{
-						url:'/static/navList/enterprise.png',
-						path:'/pages/enterprise/index',
-						content:'查企业'
-					},
-					{
-						url:'/static/navList/service.png',
-						path:'/pages/service/index',
-						content:'找服务'
-					},
-				],
-				noticeList:[
-					{
-						url:'/static/navList/policy-icon.png',
-						title:'政策速览 | 小微企业、个体工商户税费...',
-						time:'2021-08-05'
-					},
-					{
-						url:'/static/navList/activity-icon.png',
-						title:'活动预告 | 想了解跨境电商？8月5日带...',
-						time:'2021-08-04'
-					},
-					{
-						url:'/static/navList/notice-icon.png',
-						title:'通知公告 | 2022年首批次重点新材料扶...',
-						time:'2021-08-03'
-					},
-				],
-				parkList:[
-					// {
-					// 	url:'/static/park/1.png',
-					// 	title:'华潮科技产业园',
-					// 	time:'2015-10-25',
-					// 	num:484,
-					// 	area1:1.72,
-					// 	area2:1.01
-						
-					// },
-					// {
-					// 	url:'/static/park/1.png',
-					// 	title:'华潮科技产业园',
-					// 	time:'2015-10-25',
-					// 	num:484,
-					// 	area1:1.72,
-					// 	area2:1.01
-					// },
-					// {
-					// 	url:'/static/park/1.png',
-					// 	title:'华潮科技产业园',
-					// 	time:'2015-10-25',
-					// 	num:484,
-					// 	area1:1.72,
-					// 	area2:1.01
-					// },
-				],
-			    attractList:[
-			    	{
-			    		url:'/static/attract/1.png',
-			    		title:'工业互联网',
-						subtitle:'工业互联网是全球工业系统与高级计算、分析、...',
-			    		time:'2021-09-05'
-			    	},
-			    	{
-			    		url:'/static/attract/2.png',
-			    		title:'生产性服务业',
-						subtitle:'生产性服务业是指为保持工业生产过程的连续性...',
-			    		time:'2021-09-05'
-			    	},
-			    ],
-				activityList:[
-					{
-						url:'/static/activity/2.png',
-						title:'400场讲座,200门课程,免费送上门!就等你申请',
-						isOnline:1,
-						department:'区人力资源局', 
-						time:'2021-09-05',
-						browe:'322',
-						share:'2'
-					},
-					{
-						url:'/static/activity/1.png',
-						title:'智能制造商标品牌培育系列培训活动',
-						isOnline:0,
-						department:'市场监督管理局',
-						time:'2021-09-05',
-						browe:'322',
-						share:'2'
-					},
-				],
-			}
-		},
-		onLoad() {
-           this.getSwiperList();
-		   this.getPark();
-		//   this.loginLoad();
-		},
-		methods: {
-			swiperChange(e){
-				this.swiperCurrent = e.detail.current
-			},
-			getSwiperList(){
-				let md5Sign = md5("method="+'common'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
-				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=common&source=main_pics&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
-				uni.request({
-					url:url,
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						order_by:"weight desc",
-						s_status:1,
-						page:1,
-						page_size:7
-					},
-					success: (res) => {
-						console.log(res)
-						if(res.data.code === 200){
-							res.data.data.list.forEach((item)=>{item.pic_path = getApp().globalData.shareUrl + item.pic_path})
-							this.swiperList = res.data.data.list;
-					  	
-						}
-					},
-					fail: () => {
-						console.log("连接失败");
-					}
-				});
-			},
-			getPark(){
-				let md5Sign = md5("method="+'park'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
-				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=park&source=park&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
-				uni.request({
-					url:url,
-					method: 'POST',
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					data: {
-						order_by:"weight desc",
-						s_show:1,
-						// page:1,
-						// page_size:7
-					},
-					success: (res) => {
-						console.log(res)
-						if(res.data.code === 200){
-							res.data.data.list.forEach((item)=>{
-								if(item.park_pics.length){
-									item.park_pics[0].pic_path = getApp().globalData.shareUrl + item.park_pics[0].pic_path
-								}else {
-									item.park_pics = [{pic_path:'/static/park/1.png'}]
-								}
-								});
-							this.parkList = res.data.data.list;
-						}
-					},
-					fail: () => {
-						console.log("连接失败");
-					}
-				});
-			},
-			goParkDetailFn(id){
-				uni.navigateTo({
-					url:'/pages/park/park_deatil?id='+id
-				})
-			},
-		}
-	}
 </script>
 
 <style>