更新前端页面

pages.json

@@ -241,6 +241,12 @@
 			"style": {
 				"navigationBarTitleText": "项目详情"
 			}
+		},
+		{
+			"path": "pages/metrics/importantPage/index",
+			"style": {
+				"navigationBarTitleText": "重点项目"
+			}
 		}
 	],
 	"globalStyle": {

pages/metrics/importantPage/index.vue

@@ -0,0 +1,117 @@
+<template>
+	
+	<view class="content-box">
+		
+		<view class="policy-item-box" style="justify-content: space-around;">
+		  <view v-for="(item, idx) in projectList" :key="idx"  :class="{ active: active === idx }"  class="policy-item-name" @click="changeProjectTabs(idx)">
+		    {{ item }}
+		  </view>
+		</view>
+		
+		<view class="project-box">
+			<view class="project-content display-around-column" v-for="(item, idx) in projectData" :key="idx" style="padding-top: 20rpx;"
+			:class="{ borderBottom: idx == projectData.length - 1 }" @click="enterProjectDeatil()">
+				<view class="display-between items-center pos-class">
+					<view style="font-size: 30rpx;">{{item.title}}</view>
+					<!-- <image src="/static/important_icon.png" mode="aspectFit" style="width:80rpx;height: 80rpx;"></image> -->
+				</view>
+				<view class="display-flex-start pos-class">
+					<view class="left-title">业主名称</view>
+					<view>{{item.name}}</view>
+				</view>
+				<view class="display-flex-start pos-class" style="margin-bottom: 20rpx;">
+					<view class="left-title">总投资</view>
+					<view>{{item.maxMony}}</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+	
+</template>
+
+<script>
+	import md5 from "@/common/md5.js";
+	export default {
+	  data() {
+	    return {
+	      swiperList: [],
+	      projectList: ["新建", "续建"],
+	      active: 0,
+	      projectData: new Array(5).fill({
+	        title:"普汇中金生命科学国际合作中心",
+	        name: "普汇中金国际控股有限公司",
+	        maxMony: "160000（万元）",
+	      }),
+	    };
+	  },
+	  onLoad(option) {
+		  this.active = Number(option.idx)
+	  },
+	  methods: {
+	    enterProjectDeatil(id) {
+	      uni.navigateTo({
+			url:"/pages/metrics/projectPage/detail?id=" + id
+	      });
+	    },
+	    changeProjectTabs(idx) {
+	      let that = this;
+	      that.active = idx;
+	      switch (idx) {
+	        case 0:
+	        //  that.getPolicyList("2");
+	          break;
+	        case 1:
+	        //  that.getPolicyList("3");
+	          break;
+	        case 2:
+	        //  that.getPolicyList("4");
+	          break;
+	        case 3:
+	        //  that.getPolicyList("5");
+	          break;
+	      }
+	    },
+	  },
+	};
+</script>
+
+<style lang="scss">
+	.content-box {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+	}
+	.policy-item-box {
+	  display: flex;
+	  justify-content: space-between;
+	  margin: 0 20rpx;
+	  margin-top: 20rpx;
+	  .policy-item-name {
+		    padding-bottom: 10rpx;
+		    font-size: 30rpx;
+		    width: 25%;
+		    text-align: center;
+	  }
+	  .active {
+	    font-weight: 600;
+	    border-bottom: 7rpx solid #02a7f0;
+	  }
+	}
+	.project-content {
+		border-top: 1px solid #f2f2f2;
+	}
+	.pos-class {
+		padding-left: 10rpx;
+		margin-bottom: 10rpx;
+		font-size: 28rpx;
+	}
+	.left-title {
+		width: 20%;
+		color: #7F7F7F;
+		font-size: 26rpx;
+	}
+	.borderBottom {
+		border-bottom: 1px solid #f2f2f2;
+	}
+</style>

pages/metrics/index.vue

@@ -15,7 +15,7 @@
 	
 		<qiun-title-bar title="规上工业企业"/>
 	    <view class="block-box display-wrap items-center" style="justify-content: space-evenly;height: 340rpx;">
-			 <view class="block-box-content" style="background-color: #77AFCA;" @click="goScale()">
+			 <view class="block-box-content" style="background-color: #77AFCA;" @click="goScale('规上工业企业')">
 				 <view>规上工业企业</view>
 				 <view>21</view>
 			 </view>
@@ -23,7 +23,7 @@
 				 <view>工业增加值增速</view>
 				 <view>同比增长3.2%</view>
 			 </view>
-			 <view class="block-box-content" style="background-color: #8D7E95;">
+			 <view class="block-box-content" style="background-color: #8D7E95;" @click="goScale('先进制造业企业')">
 				 <view>先进制造业</view>
 				 <view>6</view>
 			 </view>
@@ -47,15 +47,15 @@
 		
 		<qiun-title-bar title="工业投资" style="border-top:10rpx solid #f2f2f2" />
 		<view class="block-box display-around items-center">
-			 <view class="block-box-content" style="width:30%;background-color:#F2CD4F;" @click="goProject()">
+			 <view class="block-box-content" style="width:30%;background-color:#F2CD4F;" @click="goProject(0)">
 				 <view>在库项目</view>
 				 <view>18</view>
 			 </view>
-			 <view class="block-box-content" style="width:30%;background-color: #9776F2;">
+			 <view class="block-box-content" style="width:30%;background-color: #9776F2;" @click="goProject(1)">
 				 <view>技改项目</view>
 				 <view>2</view>
 			 </view>
-			 <view class="block-box-content" style="width:30%;background-color: #51A9E3;">
+			 <view class="block-box-content" style="width:30%;background-color: #51A9E3;" @click="goProject(2)">
 				 <view>在谈项目</view>
 				 <view>2</view>
 			 </view>
@@ -72,11 +72,11 @@
 	
 	    <qiun-title-bar title="重点项目" style="border-top:10rpx solid #f2f2f2" />
 	    <view class="block-box display-around items-center">
-	    	 <view class="block-box-content" style="width:30%;background-color:#F2CD4F;">
+	    	 <view class="block-box-content" style="width:30%;background-color:#F2CD4F;" @click="goImportant(0)">
 	    		 <view>重点项目</view>
 	    		 <view>18</view>
 	    	 </view>
-	    	 <view class="block-box-content" style="width:30%;background-color: #9776F2;">
+	    	 <view class="block-box-content" style="width:30%;background-color: #9776F2;" @click="goImportant(1)">
 	    		 <view>新建/续建</view>
 	    		 <view>13/8</view>
 	    	 </view>
@@ -96,11 +96,11 @@
 	
 	    <qiun-title-bar title="科技创新指标" style="border-top:10rpx solid #f2f2f2;margin-bottom: 10rpx;" />
 	    <view class="block-box display-around items-center">
-	    	 <view class="block-box-content" style="width:47%;color: #555;">
+	    	 <view class="block-box-content" style="width:47%;color: #555;" @click="goScale('科技创新企业')">
 	    		 <view>国家高新技术企业</view>
 	    		 <view>8/<text style="color: red;">5</text></view>
 	    	 </view>
-	    	 <view class="block-box-content" style="width:47%;color: #555;">
+	    	 <view class="block-box-content" style="width:47%;color: #555;" @click="goScale('科技创新企业')">
 	    		 <view>科技型中小企业</view>
 	    		 <view>70/<text style="color: red;">50</text></view>
 	    	 </view>
@@ -218,14 +218,19 @@
 		  bindDateCityChange(){
 			  this.sortSelect = this.arrayNewCity[e.target.value]
 		  },
-		  goScale(){
+		  goScale(title){
 			  uni.navigateTo({
-			  	url:'./largeScale/index'
+			  	url:'./largeScale/index?title=' + title
 			  })
 		  },
-		  goProject(){
+		  goProject(idx){
 			  uni.navigateTo({
-			  	url:'./projectPage/index'
+			  	url:'./projectPage/index?idx=' + idx
+			  })
+		  },
+		  goImportant(idx){
+			  uni.navigateTo({
+				url:'./importantPage/index?idx=' + idx
 			  })
 		  }
 	  }

pages/metrics/largeScale/index.vue

@@ -14,7 +14,7 @@
 		<view class="companys">
 		  <!-- <view>推荐企业</view> -->
 		  <view  v-for="(company, index) in companyList" :key="index" @click="toDetail(company.id)" class="company">
-			<image src="/static/selfCenter/add-icon.png" mode="aspectFit" class="addIcon"></image> 
+			<!-- <image src="/static/selfCenter/add-icon.png" mode="aspectFit" class="addIcon"></image> -->
 		    <view class="title">
 		      <view class="logo">
 		        <!-- <image :src="globalUrl + company.pic_url" alt="" class="logo-img" mode="aspectFit"/> -->
@@ -22,7 +22,7 @@
 		      </view>
 		      <view class="name display-around-column" style="align-items: flex-start;">
 		         <view>{{ company.name }}</view>
-				 <view class="isAdvanced" v-show="index === 0">先进制造业</view>
+				 <!-- <view class="isAdvanced" v-show="index === 0">先进制造业</view> -->
 		      </view>
 		    </view>
 		    <view class="info">
@@ -64,7 +64,10 @@
 			  globalUrl:getApp().globalData.shareUrl,
 		 }
 	  },
-	  onLoad() {
+	  onLoad(option) {
+		uni.setNavigationBarTitle({
+			title: option.title
+		})  
 	    this.getCompany();
 	  },
 	  methods:{

pages/metrics/projectPage/detail.vue

@@ -1,8 +1,137 @@
 <template>
+	<view class="content-box">
+		<view class="item-list">
+		  <view v-for="(item, idx) in itemList" :key="idx" class="term">
+		    <view class="term-name">{{ item.name }}:</view>
+		    <view class="term-value-group" >
+		      <p  class="term-value-item">{{ item.value || "-" }}</p>
+		    </view>
+		</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+	  data() {
+		  return{
+			  itemList: [
+			    {
+			      name: "业主",
+			      value: '普汇中金国际控股有限公司',
+			    },
+			    {
+			      name: "项目名称",
+			      value: '普汇中金生命科学国际合作中心',
+			    },
+			    {
+			      name: "入库情况",
+			      value: '在库/未入库',
+			    },
+			    {
+			      name: "建设性质",
+			      value: '新建/续建',
+			    },
+			    {
+			      name: "工业技改",
+			      value: '是/否',
+			    },
+			    {
+			      name: "入库时间",
+			      value: '2020.6.30',
+			    },
+			    {
+			      name: "建设规模及主要建设内容",
+			      value: '占地面积155.48亩，拟新建机械加工厂房5栋，孵化中心（框架结构）3栋，服务配套中心1栋，总建筑面积约147625平方米。',
+			    },
+			    {
+			      name: "主要经济社会效益",
+			      value: '针对产业链上游（研发）企业中的中小型企业，提供标准研发、检测、生产及配套服务，提升区域产业能级，形成产业聚集，实现规模效益',
+			    },
+			    {
+			      name: "建设地址",
+			      value: '位于空港新城临空产业区内，西安咸阳机场西北侧，东、南侧为机场规划用地，北临正平大街，西侧为项目一期用地。',
+			    },
+			    {
+			      name: "总用地面积（亩）",
+			      value: '155.48',
+			    },
+				{
+				  name: "建设起止年限",
+				  value: '2019.11-2022.12',
+				},
+				{
+				  name: "总投资（万元）",
+				  value: '67330',
+				},
+				{
+				  name: "年度计划投资（万元）",
+				  value: '20199',
+				},
+				{
+				  name: "已到位资金额（万元）",
+				  value: '-',
+				},
+				{
+				  name: "投资方式",
+				  value: '社会投资',
+				},
+				{
+				  name: "年度主要建设内容及年底前形象进度",
+				  value: '服务中心二次结构施工完成；其余楼栋号二次结构、屋面工程、水电安装、装饰装修施工完成。',
+				},
+				{
+				  name: "重点级别",
+				  value: '非重点、省级/市级/新区/新城',
+				},
+				{
+				  name: "备注",
+				  value: '-',
+				},
+			  ],
+		 }
+	  },
+	  onLoad(option) {
+	  	console.log(option.id)
+	  },
+	  methods:{
+	  }
+	};
 </script>
 
-<style>
+<style lang="scss">
+	.content-box {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+	}
+	.item-list {
+	  margin-left: 20rpx;
+	  display: flex;
+	  flex-direction: column;
+	  .term {
+	    display: flex;
+	    .term-name {
+	      font-size: 28rpx;
+	      width: 30%;
+	      display: flex;
+	      margin: 20rpx;
+	      color: #7f7f7f;
+	    }
+	    .term-value-group {
+	      flex: 1;
+	      display: flex;
+	      flex-direction: column;
+	      font-size: 28rpx;
+	      .term-value-item {
+	        margin: 20rpx;
+	      }
+	      .flex_i {
+	        display: flex;
+	        flex-flow: row;
+	        justify-content: space-around;
+	      }
+	    }
+	  }
+	}
 </style>

pages/metrics/projectPage/index.vue

@@ -3,22 +3,31 @@
 	<view class="content-box">
 		
 		<view class="policy-item-box">
-		  <view
-		    v-for="(item, idx) in policyList"
-		    :key="idx"
-		    :class="{ active: active === idx }"
-		    class="policy-item-name"
-		    @click="changePolicyTabs(idx)"
-		  >
+		  <view v-for="(item, idx) in projectList" :key="idx"  :class="{ active: active === idx }"  class="policy-item-name" @click="changeProjectTabs(idx)">
 		    {{ item }}
 		  </view>
 		</view>
 		
+		<view class="project-box">
+			<view class="project-content display-around-column" v-for="(item, idx) in projectData" :key="idx" 
+			:class="{ borderBottom: idx == projectData.length - 1 }" @click="enterProjectDeatil()">
+				<view class="display-between items-center pos-class">
+					<view style="font-size: 30rpx;">{{item.title}}</view>
+					<image src="/static/important_icon.png" mode="aspectFit" style="width:80rpx;height: 80rpx;"></image>
+				</view>
+				<view class="display-flex-start pos-class">
+					<view class="left-title">业主名称</view>
+					<view>{{item.name}}</view>
+				</view>
+				<view class="display-flex-start pos-class" style="margin-bottom: 20rpx;">
+					<view class="left-title">总投资</view>
+					<view>{{item.maxMony}}</view>
+				</view>
+			</view>
+		</view>
+		
 	</view>
 	
-	
-	
-	
 </template>
 
 <script>
@@ -27,24 +36,25 @@
 	  data() {
 	    return {
 	      swiperList: [],
-	      policyList: ["在库", "技改", "在谈"],
+	      projectList: ["在库", "技改", "在谈"],
 	      active: 0,
-	      policyData: new Array(5).fill({
+	      projectData: new Array(5).fill({
 	        title:"普汇中金生命科学国际合作中心",
 	        name: "普汇中金国际控股有限公司",
 	        maxMony: "160000（万元）",
 	      }),
 	    };
 	  },
-	  onLoad() {
+	  onLoad(option) {
+		  this.active = Number(option.idx)
 	  },
 	  methods: {
-	    enterPolicyDeatil(id) {
+	    enterProjectDeatil(id) {
 	      uni.navigateTo({
-	        url: "/pages/policy/policy_deatil?id=" + id,
+			url:"/pages/metrics/projectPage/detail?id=" + id
 	      });
 	    },
-	    changePolicyTabs(idx) {
+	    changeProjectTabs(idx) {
 	      let that = this;
 	      that.active = idx;
 	      switch (idx) {
@@ -88,4 +98,20 @@
 	    border-bottom: 7rpx solid #02a7f0;
 	  }
 	}
+	.project-content {
+		border-top: 1px solid #f2f2f2;
+	}
+	.pos-class {
+		padding-left: 10rpx;
+		margin-bottom: 10rpx;
+		font-size: 28rpx;
+	}
+	.left-title {
+		width: 20%;
+		color: #7F7F7F;
+		font-size: 26rpx;
+	}
+	.borderBottom {
+		border-bottom: 1px solid #f2f2f2;
+	}
 </style>

pages/selfCenter/index.vue

@@ -62,17 +62,17 @@ export default {
           url: "/pages/selfCenter/collection",
 		  isShow:true,
         },
-        { 
-		   icoin: "/static/selfCenter/back.png",
-		   name: "退出登录" ,
-		   isShow:true,
-		 },
 		{
 		  icoin: "/static/selfCenter/collection.png",
 		  name: "工业经济指标",
 		  url: "/pages/metrics/index",
 		  isShow:true,
 		},
+        { 
+		   icoin: "/static/selfCenter/back.png",
+		   name: "退出登录" ,
+		   isShow:true,
+		 }
       ],
       swiperBackground: "",
     };
@@ -121,22 +121,22 @@ export default {
 			  url,
 			}); 
           break;
-        case 3: //退出登录
-            uni.showModal({
-              title: "确定退出登录吗?",
-              success(res) {
-                if (res.confirm) {
-                  that.loginOut();
-                } else if (res.cancel) {
-                  console.log("用户点击取消");
-                }
-              },
-            });
-          break;
-		 case 4: //经济指标
+        case 3: //经济指标
 			uni.navigateTo({
 			  url,
 			}); 
+          break;
+		 case 4: //退出登录
+			uni.showModal({
+			  title: "确定退出登录吗?",
+			  success(res) {
+				if (res.confirm) {
+				  that.loginOut();
+				} else if (res.cancel) {
+				  console.log("用户点击取消");
+				}
+			  },
+			});
 		   break; 
       }
     },