Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

src/router/index.js

@@ -1436,6 +1436,24 @@ export const constantRoutes = [
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail'], resolve)
+  },
+  {
+    path: '/onlineHome/villagePortrait',
+    name: 'villagePortrait',
+    meta: {
+      title: '村画像',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/villagePortrait'], resolve)
+  },
+  {
+    path: '/onlineHome/farmerPortrait',
+    name: 'farmerPortrait',
+    meta: {
+      title: '村民信息',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/farmerPortrait'], resolve)
   }
 ];
 

src/views/onlineHome/farmerPortrait.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      title="村民画像"
+      left-arrow
+      @click-left="$router.back(-1)"
+    >
+    </van-nav-bar>
+    <van-list
+      finished-text="没有更多了"
+      >
+      <van-swipe-cell v-for="(item,index) in list" :key="index">
+        <van-cell :title="'户编号：'+item.name1" center class="van-cell-group">
+          <template #icon>
+            <van-icon name="../../../static/images/onlineHome/myIcon1.png" size="22" color="#FF4646" style="margin-right: 10px;" />
+          </template>
+          <template #label>
+            <p><span>{{item.name2}}</span><i style="margin-right: 30px;"></i>{{item.name3}}<i style="margin-right: 30px;"></i>{{item.name4}}</p>
+          </template>
+        </van-cell>
+      </van-swipe-cell>
+    </van-list>
+  </div>
+</template>
+
+<script>
+  import onlineHomeIndex from "../onlineHomeIndex";
+  export default {
+    components: {
+      onlineHomeIndex
+    },
+    name: "farmerPortrait",
+    data() {
+      return {
+        list:[{name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'},
+          {name1:'53123123123123',name2:'张三',name3:'男',name4:'53岁'}],
+        finished: false,
+        loading: false,
+      };
+    },
+    methods: {
+      getList(){
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  >>> .van-cell-group{
+    width: 96%;margin:1% 2%;border-radius: 8px;overflow: hidden;padding-top: 20px;padding-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+  }
+</style>

src/views/onlineHome/home.vue

@@ -8,7 +8,7 @@
         </template>
       </van-nav-bar>
       <van-cell-group style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 20px;padding-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-        <van-cell title="村画像" is-link>
+        <van-cell title="村画像" is-link to="villagePortrait">
           <template #icon>
             <van-image
               fit="contain"
@@ -18,7 +18,7 @@
             />
           </template>
         </van-cell>
-        <van-cell title="村民信息" is-link >
+        <van-cell title="村民信息" is-link to="farmerPortrait">
           <template #icon>
             <van-image
               fit="contain"

src/views/onlineHome/threeAffairsDetail.vue

@@ -28,7 +28,6 @@
     <p style="margin-top:20px;padding: 0 10px">附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
     <van-cell v-for="(item,index) in fileList" :key="index">
       <a :href="item.fileUrl">{{index+1}}.{{item.fileName}}</a>
-
     </van-cell>
   </div>
 </template>

src/views/onlineHome/villagePortrait.vue

@@ -0,0 +1,137 @@
+<template>
+    <div class="app-container">
+      <van-nav-bar
+        title="村画像"
+        left-arrow
+        @click-left="$router.back(-1)"
+      >
+      </van-nav-bar>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+          <p style="color: #1D6FE9;padding:10px;font-size: 16px">基本情况</p>
+        <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
+          <van-swipe-item>1</van-swipe-item>
+          <van-swipe-item>2</van-swipe-item>
+          <van-swipe-item>3</van-swipe-item>
+          <van-swipe-item>4</van-swipe-item>
+        </van-swipe>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">户籍人口：2000人</p>
+          <p style="float: left;width: 50%;font-size: 14px">村长：李四</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">总资产：2000万元</p>
+          <p style="float: left;width: 50%;font-size: 14px">村支书：李琪琪</p>
+        </div>
+      </van-cell-group>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+        <p style="color: #1D6FE9;padding:10px;font-size: 16px">财务情况</p>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">现金：200万</p>
+          <p style="float: left;width: 50%;font-size: 14px">总负债：152万元</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">银行存款：1500万元</p>
+          <p style="float: left;width: 50%;font-size: 14px">总收入：2053万元</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">总资产：2000万元</p>
+          <p style="float: left;width: 50%;font-size: 14px">总支出：2053万元</p>
+        </div>
+      </van-cell-group>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+        <p style="color: #1D6FE9;padding:10px;font-size: 16px">产改情况</p>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">量化总资产：54312万元</p>
+          <p style="float: left;width: 50%;font-size: 14px">成员清册：1157人</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">股份总数：12000股</p>
+          <p style="float: left;width: 50%;font-size: 14px">成员占股：78%</p>
+        </div>
+      </van-cell-group>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+        <p style="color: #1D6FE9;padding:10px;font-size: 16px">人居环境</p>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">户厕：300个</p>
+          <p style="float: left;width: 50%;font-size: 14px">污水站：2个</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">公厕：2个</p>
+          <p style="float: left;width: 50%;font-size: 14px">路灯：130个</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">垃圾点：2个</p>
+          <p style="float: left;width: 50%;font-size: 14px">监控：130个</p>
+        </div>
+      </van-cell-group>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+        <p style="color: #1D6FE9;padding:10px;font-size: 16px">行政管理</p>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">党委管理：300个</p>
+          <p style="float: left;width: 50%;font-size: 14px">单元数量：2个</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">网格数：2个</p>
+        </div>
+      </van-cell-group>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+        <p style="color: #1D6FE9;padding:10px;font-size: 16px">宅基地概况</p>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">宗数：200宗</p>
+          <p style="float: left;width: 50%;font-size: 14px">一宅多户：18户</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">面积：25000m²</p>
+          <p style="float: left;width: 50%;font-size: 14px">闲置：380亩</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">规划指标：25000m²</p>
+          <p style="float: left;width: 50%;font-size: 14px">流转：380亩</p>
+        </div>
+      </van-cell-group>
+      <van-cell-group class="van-cell-group" style="padding:10px;">
+        <p style="color: #1D6FE9;padding:10px;font-size: 16px">承包地概况</p>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">宗数：200宗</p>
+          <p style="float: left;width: 50%;font-size: 14px">承包合同数：18个</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">面积：25000m²</p>
+          <p style="float: left;width: 50%;font-size: 14px">流转亩数：380亩</p>
+        </div>
+        <div style="line-height: 20px;overflow: auto;padding:5px 10px;">
+          <p style="float: left;width: 50%;font-size: 14px">确权户数：157户</p>
+          <p style="float: left;width: 50%;font-size: 14px">流转合同数：38个</p>
+        </div>
+      </van-cell-group>
+    </div>
+</template>
+
+<script>
+  import onlineHomeIndex from "../onlineHomeIndex";
+    export default {
+      components: {
+        onlineHomeIndex
+      },
+        name: "villagePortrait",
+      data() {
+        return {
+
+        };
+      },
+    }
+</script>
+
+<style scoped>
+  >>> .my-swipe .van-swipe-item {
+    color: #fff;
+    font-size: 20px;
+    line-height: 300px;
+    text-align: center;
+    background-color: #39a9ed;
+    border-radius: 10px;
+  }
+  >>> .van-cell-group{
+    width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 20px;padding-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+  }
+</style>

src/views/onlineHome/workbench.vue

@@ -42,7 +42,7 @@
           </template>
         </van-cell>
       </van-row>
-      <!--<van-row style="margin:2%;width:96%;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
+      <van-row style="margin:2%;width:96%;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
             <p style="display:inline-block;background: #FFA63E;height:20px;width: 20px;border-radius: 2px;margin-right: 10px;float: left"></p>
@@ -254,8 +254,8 @@
             <p style="margin-top: 5px;color: #666666;">盘活利用</p>
           </van-grid-item>
         </van-grid>
-      </van-row>-->
-     <!-- <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
+      </van-row>
+      <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
             <p style="font-weight: bold;font-size: 18px;display: inline-block">农村产权制度改革管理</p>
@@ -293,7 +293,7 @@
             <p style="margin-top: 5px;color: #666666;">股权管理</p>
           </van-grid-item>
         </van-grid>
-      </van-row>-->
+      </van-row>
       <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
@@ -349,21 +349,21 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">汇票支出</p>
           </van-grid-item>
-<!--          <van-grid-item text="收款账户" :to="{name:'collectionList'}" >-->
-<!--            <div slot="default" style="background:#7dda4f;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >-->
-<!--              <img src="../../../static/images/onlineHome/yinnongIcon5.png" style="width: 25px;" alt />-->
-<!--            </div>-->
-<!--            <p style="margin-top: 5px;color: #666666;">收款账户</p>-->
-<!--          </van-grid-item>-->
-<!--          <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >-->
-<!--            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >-->
-<!--              <img src="../../../static/images/onlineHome/yinnongIcon2.png" style="width: 25px;" alt />-->
-<!--            </div>-->
-<!--            <p style="margin-top: 5px;color: #666666;">付款账户</p>-->
-<!--          </van-grid-item>-->
+          <van-grid-item text="收款账户" :to="{name:'collectionList'}" >
+            <div slot="default" style="background:#7dda4f;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon5.png" style="width: 25px;" alt />
+            </div>
+            <p style="margin-top: 5px;color: #666666;">收款账户</p>
+          </van-grid-item>
+          <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >
+            <div slot="default" style="background:#FF4646;padding: 10px;text-align:center;border-radius: 10px;box-sizing: border-box;width: 44px;height: 44px" >
+              <img src="../../../static/images/onlineHome/yinnongIcon2.png" style="width: 25px;" alt />
+            </div>
+            <p style="margin-top: 5px;color: #666666;">付款账户</p>
+          </van-grid-item>
         </van-grid>
       </van-row>
-      <!--<van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
+      <van-row  style="margin:2%;width:96%;padding:20px 0;padding:20px 0;border-radius: 6px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);background: #fff">
         <van-cell style="border-radius: 6px;">
           <template #title>
             <p style="font-weight: bold;font-size: 18px;display: inline-block">农村宅基地审批管理</p>
@@ -465,7 +465,7 @@
             <p style="margin-top: 5px;color: #666666;">违法监管</p>
           </van-grid-item>
         </van-grid>
-      </van-row>-->
+      </van-row>
       <onlineHomeIndex></onlineHomeIndex>
     </div>
 </template>