update；合并

FrontCode2/sunshine_levy/src/main.js

@@ -3,6 +3,10 @@
 import './assets/reset.css';
 import 'lib-flexible/flexible';
 
+import '@/elementui'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+
 import Vue from 'vue'
 import App from './App'
 import router from './router'

FrontCode2/sunshine_levy/src/router/index.js

@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import index from '@/components/index'
 
 Vue.use(Router)
 
@@ -9,7 +8,25 @@ export default new Router({
     {
       path: '/index',
       name: 'index',
-      component: index
-    }
+      component: () => import('../views')
+    },
+    // 选择项目页面
+    {
+      path: '/project-select',
+      name: 'projectSelect',
+      component: () => import('../views/project')
+    },
+    // 评估结果页面
+    {
+      path: '/report/compensate',
+      name: 'reportCompensate',
+      component: () => import('../views/report/compensate')
+    },
+    // 协议结果页面
+    {
+      path: '/report/agreement',
+      name: 'reportAgreement',
+      component: () => import('../views/report/agreement')
+    },
   ]
 })

FrontCode2/sunshine_levy/src/views/agreement.vue

@@ -1,103 +0,0 @@
-<template>
-  <div class="container">
-    <div class="image"><img src="@/assets/image/agreement.png" alt="" /></div>
-    <div class="text">为您查询到{{ this.result }}条结果</div>
-    <div v-for="(item, index) in info" :key="index">
-      <el-card>
-        <div>
-          <img src="@/assets/image/bianhao.png" alt="" />
-          评估报告编号：<b>{{ item.number }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/name.png" alt="" />
-          被征收人姓名：<b>{{ item.name }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/address.png" alt="" />
-          被征收人房屋地址：<b>{{ item.address }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/money.png" alt="" />
-          评估总金额：<b style="color: red">{{ item.money }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/money.png" alt="" />
-          合计补偿金额：<b style="color: red">{{ item.money }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/hengxian.png" alt="" />
-        </div>
-        <div class="date">
-          <div class="flex backgroundColor">
-            <img src="@/assets/image/shijian.png" alt="" />
-            签订日期：{{ item.time }}
-          </div>
-        </div>
-      </el-card>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      result: "2",
-      info: [
-        {
-          number: "044",
-          name: "胡守钧",
-          address: "宁波市江北区四洲街16号404",
-          money: "180234元",
-          person: "王勇",
-          time: "2021-9-1",
-        },
-        {
-          number: "044",
-          name: "胡守钧",
-          address: "宁波市江北区四洲街16号404",
-          money: "180234元",
-          person: "王勇",
-          time: "2021-9-1",
-        },
-      ],
-    };
-  },
-  created() {
-    console.log(1234);
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.container {
-  .image {
-    text-align: center;
-    margin-top: 20px;
-  }
-  .text {
-    text-align: center;
-    margin: 10px 0;
-    color: #2d6df2;
-    font-weight: bolder;
-  }
-  .el-card {
-    margin: 0 10px 10px;
-    ::v-deep.el-card__body {
-      padding: 0 10px;
-      > div {
-        margin: 10px 0;
-      }
-      .date {
-        display: flex;
-        justify-content: center;
-        .backgroundColor {
-          background-color: #e3ebfd;
-          img {
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>

FrontCode2/sunshine_levy/src/views/compensate.vue

@@ -1,96 +0,0 @@
-<template>
-  <div class="container">
-    <div class="image"><img src="@/assets/image/evalute.png" alt="" /></div>
-    <div class="text">为您查询到{{ this.result }}条结果</div>
-    <div v-for="(item, index) in info" :key="index">
-      <el-card>
-        <div>
-          <img src="@/assets/image/bianhao.png" alt="" />
-          评估报告编号：<b>{{ item.number }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/name.png" alt="" />
-          被征收人姓名：<b>{{ item.name }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/address.png" alt="" />
-          被征收人房屋地址：<b>{{ item.address }}</b>
-        </div>
-        <div>
-          <img src="@/assets/image/money.png" alt="" />
-          评估总金额：<b style="color: red">{{ item.money }}</b>
-        </div>
-        <div class="flex">
-          <div class="flex backgroundColor">
-            <img src="@/assets/image/renyuan.png" alt="" />
-            评估人员：{{ item.person }}
-          </div>
-          <div class="flex backgroundColor">
-            <img src="@/assets/image/shijian.png" alt="" />
-            评估时间：{{ item.time }}
-          </div>
-        </div>
-      </el-card>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      result: "2",
-      info: [
-        {
-          number: "044",
-          name: "胡守钧",
-          address: "宁波市江北区四洲街16号404",
-          money: "180234元",
-          person: "王勇",
-          time: "2021-9-1",
-        },
-        {
-          number: "044",
-          name: "胡守钧",
-          address: "宁波市江北区四洲街16号404",
-          money: "180234元",
-          person: "王勇",
-          time: "2021-9-1",
-        },
-      ],
-    };
-  },
-  created() {
-    console.log(1234);
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.container {
-  .image {
-    text-align: center;
-    margin-top: 20px;
-  }
-  .text {
-    text-align: center;
-    margin: 10px 0;
-    color: #2d6df2;
-    font-weight: bolder;
-  }
-  .el-card {
-    margin: 0 10px 10px;
-    ::v-deep.el-card__body {
-      padding: 0 10px;
-      > div {
-        margin: 10px 0;
-      }
-      .backgroundColor {
-        background-color: #e3ebfd;
-        img {
-          margin-right: 10px;
-        }
-      }
-    }
-  }
-}
-</style>

FrontCode2/sunshine_levy/src/views/home.css

@@ -76,6 +76,11 @@
   width: 90px;
   height: 80px;
   margin: 12px 6px;
+
+  opacity: .9;
+}
+.gridImg:hover {
+  opacity: 1;
 }
 .bigImg {
   width: 100%;

FrontCode2/sunshine_levy/src/views/index.vue

@@ -25,16 +25,27 @@
         </div>
         <div>
           <div class="gridBg centerMagin">
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
             <van-image
               :src="require('@/assets/img/scan.png')"
               class="gridImg"
             />
             <van-image
               :src="require('@/assets/img/evaluation .png')"
+=======
+            <van-image :src="require('@/assets/img/scan.png')" class="gridImg" />
+            <van-image
+              :src="require('@/assets/img/evaluation .png')"
+              @click="gotoProject('pg')"
+>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
               class="gridImg"
             />
             <van-image
               :src="require('@/assets/img/compensation.png')"
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
+=======
+              @click="gotoProject('xy')"
+>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
               class="gridImg"
             />
           </div>
@@ -116,6 +127,7 @@
               />
               <span class="assessTitle">分户评估结果</span>
             </div>
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
             <div>
               <van-image
                 :src="require('@/assets/img/skip.png')"
@@ -123,6 +135,11 @@
                 round
               />
             </div>
+=======
+            <!-- <div>
+              <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
+            </div>-->
+>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
           </div>
           <div class="assessCenter1">
             <div class="assessBox">
@@ -152,6 +169,7 @@
               />
               <span class="assessTitle">补偿协议</span>
             </div>
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
             <div>
               <van-image
                 :src="require('@/assets/img/skip.png')"
@@ -159,6 +177,11 @@
                 round
               />
             </div>
+=======
+            <!-- <div>
+              <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
+            </div>-->
+>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
           </div>
           <div class="assessCenter2">
             <div class="assessBox">
@@ -195,13 +218,20 @@
         />
       </div>
       <div class="centerMagin">
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
         <span class="projectTitle" style="color: #202020">征收政策</span>
         <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
           <span class="font11" style="color: #2c2b2b">共{{ total }}条</span>
           <div>
+=======
+        <span class="projectTitle" style="color:#202020">征收政策</span>
+        <div class="assessBox" style="padding-left: 5px;padding-right: 5px;">
+          <span class="font11" style="color:#2c2b2b">共{{total}}条</span>
+          <!-- <div>
+>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
             <span class="font11">查看全部</span>
             <van-icon color="#1989fa" name="arrow" />
-          </div>
+          </div>-->
         </div>
       </div>
       <div class="centerMagin" style="padding-bottom: 20px">
@@ -343,6 +373,9 @@ export default {
       var prjdata = apis.getprjdata({ ticket: this.$route.query.ticket });
       console.log(prjdata);
     },
+    gotoProject(type) {
+      this.$router.push({ name: 'projectSelect', params: { type: type } });
+    },
     onLogin() {
       // this.loading = true;
       let form = { account: "zgbqc", password: "111qqqqq" };

FrontCode2/sunshine_levy/src/views/project/index.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <div style="height: 240px;">
+      <div class="proTopBox">
+        <div :class="type == 'pg' ? 'proTopBoxpg': 'proTopBoxxy' "></div>
+        <div class="proCenterBox">
+          <div class="proCenterInfo">
+            <van-image :src="require('@/assets/img/expropriated_person.png')" class="proCenterImg" />
+            <div>
+              <div>
+                <span class="proCenterFont">被征收人姓名：</span>
+                <span class="proCenterFont" style="color:#626262;">{{user.name}}</span>
+              </div>
+              <div>
+                <span class="proCenterFont">身份证号：</span>
+                <span class="proCenterFont" style="color:#626262;">{{user.identityId}}</span>
+              </div>
+            </div>
+          </div>
+          <div class="proCenterFlex">
+            <div class="proCenterFlexFont">请选择您的征收项目</div>
+            <van-image
+              :src="require('@/assets/img/expropriated_select.png')"
+              class="proCenterFlexImg"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <van-list>
+        <div
+          :key="item.id"
+          @click="gotoDetail(item.id)"
+          class="proListBox shadow"
+          v-for="(item,i) in list"
+        >
+          <div class="proAreaBox">
+            <div class="proArea">{{item.area}}</div>
+            <div class="proCenterFont" v-if="item.state_cd == 1">· {{item.state}}</div>
+            <div
+              class="proCenterFont"
+              style="color:#179D5C"
+              v-else-if="item.state_cd == 2"
+            >· {{item.state}}</div>
+          </div>
+          <div class="proAreaBox">
+            <div class="proTitleBox">{{item.title}}</div>
+          </div>
+          <van-divider style="margin:8px 0;" />
+          <div class="proDateBox">
+            <div>{{item.date}}</div>
+          </div>
+        </div>
+      </van-list>
+    </div>
+  </div>
+</template>
+
+<script>
+import './project.css';
+import { apis } from '@/common/apis';
+
+export default {
+  data() {
+    return {
+      loading: true,
+      type: '',
+      data: new Object(),
+      user: {
+        name: '胡伯钧',
+        identityId: '3302041982893743782',
+      },
+      list: [
+        {
+          id: 11,
+          area: '镇海区',
+          title: '郁金花园北块地',
+          date: '2021-09-08',
+          state_cd: '1',
+          state: '协议签订阶段',
+        },
+        {
+          id: 22,
+          area: '象山县',
+          title: '象山县人民广场周边区块改造项目',
+          date: '2021-09-08',
+          state_cd: '2',
+          state: '项目已报结',
+        },
+        // {
+        //   id: 33,
+        //   area: '全大市',
+        //   title: '宁波市住房和城乡建设委员会开展关于住房的政策',
+        //   date: '2021年09月05日',
+        //   state_cd: '0',
+        //   state: '测试',
+        // },
+      ],
+      loading: false,
+      finished: true,
+    };
+  },
+  created() {
+    this.onInit();
+  },
+  methods: {
+    onInit() {
+      this.onLoadData();
+    },
+    onLoadData() {
+      // apis.mailDetail({ id: this.$route.query.id }).then(({ result }) => {
+      //   this.loading = false;
+      //   this.data = result;
+      // });
+      this.type = this.$route.params.type;
+    },
+    gotoDetail(id) {
+      if (this.type == 'pg') {
+        // 评估结果页面
+        this.$router.push({ name: 'reportCompensate', params: { projectid: id, type: this.type } });
+      } else if (this.type == 'xy') {
+        // 协议结果页面
+        this.$router.push({ name: 'reportAgreement', params: { projectid: id, type: this.type } });
+      }
+    },
+  },
+};
+</script>
+
+<style>
+</style>

FrontCode2/sunshine_levy/src/views/project/project.css

@@ -0,0 +1,146 @@
+.proTopBox {
+  position: relative;
+
+  margin: 15px 12px;
+}
+.proTopBoxpg {
+  position: absolute;
+
+  overflow: hidden;
+
+  width: 100%;
+  height: 90px;
+
+  background: url(../../assets/img/zspg.jpg);
+  background-size: 100% 90px;
+}
+.proTopBoxxy {
+  position: absolute;
+
+  overflow: hidden;
+
+  width: 100%;
+  height: 90px;
+
+  background: url(../../assets/img/zsxy.jpg);
+  background-size: 100% 90px;
+}
+.proCenterBox {
+  position: absolute;
+  top: 50%;
+  left: 50% ;
+
+  width: 95%;
+  height: 140px;
+
+  transform: translate(-50%, 50%);
+
+/* margin: 70px 0 15px 10px; */
+
+  border-radius: 6px;
+  background: rgba(248, 253, 255, 1);
+  box-shadow: 1px 1px 3px rgb(202, 201, 201);
+}
+.proCenterInfo {
+  display: flex;
+
+  padding-top: 20px;
+}
+.proCenterImg {
+  width: 45px;
+  height: 45px;
+  padding-right: 10px;
+  padding-left: 15px;
+}
+.proCenterFont {
+  font-family: PingFangSC-Regular,
+  PingFang SC;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 25px;
+
+  height: 25px;
+
+  color: #09a4fa;
+}
+.proCenterFlex {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+
+  padding-top: 15px;
+}
+.proCenterFlexImg {
+  width: 20px;
+  height: 12px;
+  padding-top: 3px;
+  padding-right: 10px;
+  padding-left: 15px;
+}
+.proCenterFlexFont {
+  font-family: PingFangSC-Regular,
+  PingFang SC;
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 25px;
+
+  height: 25px;
+
+  color: #09a4fa;
+}
+.shadow {
+  -webkit-box-shadow: rgb(189, 189, 189) 0 0 3px;
+     -moz-box-shadow: rgb(189, 189, 189) 0 0 3px;
+          box-shadow: rgb(189, 189, 189) 0 0 3px;
+}
+.proListBox {
+  height: 127px;
+  margin: 15px 20px;
+
+  border-radius: 3px;
+}
+.proAreaBox {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  padding: 10px;
+}
+.proArea {
+  font-family: PingFangSC-Regular;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 25px;
+
+  height: 25px;
+  padding: 3px 17px;
+
+  color: #fff;
+  border-radius: 4px;
+  background: #09a4fa;
+}
+.proTitleBox {
+  font-family: PingFangSC-Regular,
+  PingFang SC;
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 20px;
+
+  overflow: hidden;
+
+  height: 20px;
+  margin-left: 10px;
+  padding-left: 7px;
+
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
+  color: #252525;
+  border-left: 3px solid #09a4fa;
+}
+.proDateBox {
+  display: flex;
+  flex-direction: row-reverse;
+
+  padding-right: 10px;
+}

FrontCode2/sunshine_levy/src/views/report/agreement.vue

@@ -0,0 +1,125 @@
+<template>
+  <div class="container">
+    <div class="image">
+      <img alt src="@/assets/img/agreement.png" />
+    </div>
+    <div class="text">为您查询到{{ this.result }}条结果</div>
+    <div :key="index" v-for="(item, index) in info">
+      <el-card>
+        <div>
+          <img alt src="@/assets/img/bianhao.png" />
+          评估报告编号：
+          <b>{{ item.number }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/name.png" />
+          被征收人姓名：
+          <b>{{ item.name }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/address.png" />
+          被征收人房屋地址：
+          <b>{{ item.address }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/money.png" />
+          评估总金额：
+          <b style="color: red">{{ item.money }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/money.png" />
+          合计补偿金额：
+          <b style="color: red">{{ item.money }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/hengxian.png" />
+        </div>
+        <div class="date">
+          <div class="flex backgroundColor">
+            <img alt src="@/assets/img/shijian.png" />
+            签订日期：{{ item.time }}
+          </div>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      result: '2',
+      info: [
+        {
+          number: '044',
+          name: '胡守钧',
+          address: '宁波市江北区四洲街16号404',
+          money: '180234元',
+          person: '王勇',
+          time: '2021-9-1',
+        },
+        {
+          number: '044',
+          name: '胡守钧',
+          address: '宁波市江北区四洲街16号404',
+          money: '180234元',
+          person: '王勇',
+          time: '2021-9-1',
+        },
+      ],
+    };
+  },
+  created() {
+    this.onInit();
+    console.log(1234);
+  },
+  methods: {
+    onInit() {
+      this.onLoadData();
+    },
+    onLoadData() {
+      console.log(this.$route.params);
+      this.type = this.$route.params.type;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.container {
+  .image {
+    margin-top: 20px;
+
+    text-align: center;
+  }
+  .text {
+    font-weight: bolder;
+
+    margin: 10px 0;
+
+    text-align: center;
+
+    color: #2d6df2;
+  }
+  .el-card {
+    margin: 0 10px 10px;
+    ::v-deep.el-card__body {
+      padding: 0 10px;
+      >div {
+        margin: 10px 0;
+      }
+      .date {
+        display: flex;
+        justify-content: center;
+        .backgroundColor {
+          background-color: #e3ebfd;
+          img {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+}
+
+</style>

FrontCode2/sunshine_levy/src/views/report/compensate.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="container">
+    <div class="image">
+      <img alt src="@/assets/img/evalute.png" />
+    </div>
+    <div class="text">为您查询到{{ this.result }}条结果</div>
+    <div :key="index" v-for="(item, index) in info">
+      <el-card>
+        <div>
+          <img alt src="@/assets/img/bianhao.png" />
+          评估报告编号：
+          <b>{{ item.number }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/name.png" />
+          被征收人姓名：
+          <b>{{ item.name }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/address.png" />
+          被征收人房屋地址：
+          <b>{{ item.address }}</b>
+        </div>
+        <div>
+          <img alt src="@/assets/img/money.png" />
+          评估总金额：
+          <b style="color: red">{{ item.money }}</b>
+        </div>
+        <div class="flex">
+          <div class="flex backgroundColor">
+            <img alt src="@/assets/img/renyuan.png" />
+            评估人员：{{ item.person }}
+          </div>
+          <div class="flex backgroundColor">
+            <img alt src="@/assets/img/shijian.png" />
+            评估时间：{{ item.time }}
+          </div>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      result: '2',
+      info: [
+        {
+          number: '044',
+          name: '胡守钧',
+          address: '宁波市江北区四洲街16号404',
+          money: '180234元',
+          person: '王勇',
+          time: '2021-9-1',
+        },
+        {
+          number: '044',
+          name: '胡守钧',
+          address: '宁波市江北区四洲街16号404',
+          money: '180234元',
+          person: '王勇',
+          time: '2021-9-1',
+        },
+      ],
+    };
+  },
+  created() {
+    this.onInit();
+    console.log(1234);
+  },
+  methods: {
+    onInit() {
+      this.onLoadData();
+    },
+    onLoadData() {
+      console.log(this.$route.params);
+      this.type = this.$route.params.type;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.container {
+  .image {
+    margin-top: 20px;
+
+    text-align: center;
+  }
+  .text {
+    font-weight: bolder;
+
+    margin: 10px 0;
+
+    text-align: center;
+
+    color: #2d6df2;
+  }
+  .el-card {
+    margin: 0 10px 10px;
+    ::v-deep.el-card__body {
+      padding: 0 10px;
+      >div {
+        margin: 10px 0;
+      }
+      .backgroundColor {
+        background-color: #e3ebfd;
+        img {
+          margin-right: 10px;
+        }
+      }
+    }
+  }
+}
+
+</style>