Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

2021-09-16 17:00:18 +08:00
parent 1165188074 c9dcd8a05e
commit 0e6b6d7ffa
8 changed files with 276 additions and 175 deletions
--- a/FrontCode2/sunshine_levy/index.html
+++ b/FrontCode2/sunshine_levy/index.html
@@ -2,9 +2,8 @@
 <html>

 <head>
-  <meta charset="utf-8">
-  <meta name="viewport"
-    content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
  <title>房屋征收</title>
  <script type="text/javascript" src="https://d.alicdn.com/alilog/mlog/aplus.js?id=202951085"></script>
 </head>
@@ -13,7 +12,8 @@
  <div id="app"></div>
  <!-- built files will be auto injected -->
  <script>
-    (function (w, d, s, q, i) {
+    // console.log("初始页面");
+    (function(w, d, s, q, i) {
      w[q] = w[q] || [];
      var f = d.getElementsByTagName(s)[0];
      var j = d.createElement(s);
@@ -43,15 +43,12 @@
    // 单页应用路由切换后 或 在异步获取到 pv 日志所需的参数后再执行 sendPV：
    aplus_queue.push({
      action: "aplus.sendPV",
-      arguments: [
-        {
-          is_auto: false
-        },
-        {
-          miniAppId: "2001833218", //'应用开发管理平台-应用 ID
-          miniAppName: "房屋征收"
-        }
-      ]
+      arguments: [{
+        is_auto: false
+      }, {
+        miniAppId: "2001833218", //'应用开发管理平台-应用 ID
+        miniAppName: "房屋征收"
+      }]
    });
  </script>
 </body>
--- a/FrontCode2/sunshine_levy/src/common/apis/requests.js
+++ b/FrontCode2/sunshine_levy/src/common/apis/requests.js
@@ -1,15 +1,15 @@
 // 接口文档地址
 // https://docs.qq.com/doc/DZkdyS3hNT2V4Q3VJ
+const url_prefix = "http://183.136.157.9:7099/api";
 const url = {
-    // 登录
-    login: '/webapi/account.ashx?action=login',
+  // 登录
+  login: "/webapi/account.ashx?action=login",

-    // 个人信息
-    account: '/webapi/account.ashx?action=userinfo',
-
-    // 项目数统计信息
-    projectStatistics: '/webapi/project.ashx?action=getStatistics',
+  // 个人信息
+  account: "/webapi/account.ashx?action=userinfo",

+  // 项目数统计信息
+  projectStatistics: "/webapi/project.ashx?action=getStatistics"
 };

 export default url;
--- a/FrontCode2/sunshine_levy/src/common/util/index.js
+++ b/FrontCode2/sunshine_levy/src/common/util/index.js
@@ -1,27 +1,32 @@
-import axios from "axios"
+import axios from "axios";

 const instance = axios.create({
-    baseURL: "https://some-domain.com/api/",
-    timeout: 5000,
-
-})
+  baseURL: "http://183.136.157.9:7099/api",
+  timeout: 5000
+});

 // 添加请求拦截器
-axios.interceptors.request.use(function(config) {
+axios.interceptors.request.use(
+  function(config) {
    // 在发送请求之前做些什么
    return config;
-}, function(error) {
+  },
+  function(error) {
    // 对请求错误做些什么
    return Promise.reject(error);
-});
+  }
+);

 // 添加响应拦截器
-axios.interceptors.response.use(function(response) {
+axios.interceptors.response.use(
+  function(response) {
    // 对响应数据做点什么
    return response;
-}, function(error) {
+  },
+  function(error) {
    // 对响应错误做点什么
    return Promise.reject(error);
-});
+  }
+);

-export default instance
+export default instance;
--- a/FrontCode2/sunshine_levy/src/common/util/request.js
+++ b/FrontCode2/sunshine_levy/src/common/util/request.js
@@ -0,0 +1,20 @@
+import request from "./index";
+
+export function PolicyInfo(data) {
+  return request({
+    url: "/policies/info",
+    params: data
+  });
+}
+
+export function Login() {
+  return request({
+    url: "/webapi/account.ashx?action=login"
+  });
+}
+
+export function Account() {
+  return request({
+    url: "/webapi/account.ashx?action=userinfo"
+  });
+}
--- a/FrontCode2/sunshine_levy/src/views/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/index.vue
@@ -7,19 +7,28 @@
        </div>
        <div>
          <div class="baseInfo">
-            <van-image :src="require('@/assets/img/renyuanliebiao.png')" class="baseImg" />
+            <van-image
+              :src="require('@/assets/img/renyuanliebiao.png')"
+              class="baseImg"
+            />
            <span class="baseFont">被征收人姓名：</span>
            <span class="baseFont">{{ data.userName }}</span>
          </div>
          <div class="baseInfo">
-            <van-image :src="require('@/assets/img/credentials_icon.png')" class="baseImg" />
+            <van-image
+              :src="require('@/assets/img/credentials_icon.png')"
+              class="baseImg"
+            />
            <span class="baseFont">身份证号码：</span>
            <span class="baseFont">{{ data.idCard }}</span>
          </div>
        </div>
        <div>
          <div class="gridBg centerMagin">
-            <van-image :src="require('@/assets/img/scan.png')" class="gridImg" />
+            <van-image
+              :src="require('@/assets/img/scan.png')"
+              class="gridImg"
+            />
            <van-image
              :src="require('@/assets/img/evaluation.png')"
              @click="gotoProject('pg')"
@@ -34,23 +43,33 @@
        </div>
      </div>
      <div class="centerMagin">
-        <van-image :src="require('@/assets/img/government.png')" class="bigImg" />
+        <van-image
+          :src="require('@/assets/img/government.png')"
+          class="bigImg"
+        />
      </div>
      <van-list>
        <div :key="item.prjId" v-for="item in data.prjList">
          <div class="centerMagin">
            <div class="project">
              <div>
-                <van-image :src="require('@/assets/img/project.png')" class="projectIcon" />
+                <van-image
+                  :src="require('@/assets/img/project.png')"
+                  class="projectIcon"
+                />
                <span class="projectTitle">{{ item.name }}</span>
              </div>
              <div class="projectRight">
-                <van-image :src="require('@/assets/img/menu_yhxy.png')" class="projectRightIcon" />
+                <van-image
+                  :src="require('@/assets/img/menu_yhxy.png')"
+                  class="projectRightIcon"
+                />
                <span class="projectRightFont">{{ item.currentState }}</span>
              </div>
            </div>
          </div>
          <div class="projectCenter centerMagin">
+            <!-- 曙光一村内容 -->
            <div class="projectCenterBox">
              <div class="projectCenterInfo">
                <div class="projectCenterInfo">
@@ -89,14 +108,20 @@
                    class="projectCenterImg"
                  />
                  <span class="projectCenterFont">征收决定号：</span>
-                  <span class="projectCenterFont" style="color: #3883f1">{{ item.zsjdh }}</span>
+                  <span class="projectCenterFont" style="color: #3883f1">{{
+                    item.zsjdh
+                  }}</span>
                </div>
              </div>
            </div>
            <div class="centerMagin">
+              <!-- 分户评估结果部分 -->
              <div class="assess">
                <div>
-                  <van-image :src="require('@/assets/img/assess_1.png')" class="assessIcon" />
+                  <van-image
+                    :src="require('@/assets/img/assess_1.png')"
+                    class="assessIcon"
+                  />
                  <span class="assessTitle">分户评估结果</span>
                </div>
                <!-- <div>
@@ -104,28 +129,40 @@
                </div>-->
              </div>
              <van-list>
-                <div :key="assess.id" class="assessCenter1" v-for="assess in item.fhpgList">
+                <div
+                  :key="assess.id"
+                  class="assessCenter1"
+                  v-for="assess in item.fhpgList"
+                >
                  <div class="assessBox">
                    <span class="projectCenterFont">评估报告编号：</span>
                    <span class="projectCenterFont">
-                      {{
-                      assess.assessmentNo
-                      }}
+                      {{ assess.assessmentNo }}
                    </span>
                  </div>
                  <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%">被征收房屋地址：</span>
-                    <span class="projectCenterFont protocolTitle">{{ assess.houseAddress }}</span>
+                    <span class="projectCenterFont" style="width: 40%"
+                      >被征收房屋地址：</span
+                    >
+                    <span class="projectCenterFont protocolTitle">{{
+                      assess.houseAddress
+                    }}</span>
                  </div>
                  <div class="assessBox">
                    <span class="projectCenterFont">评估总金额：</span>
-                    <span class="projectTitle" style="color: red">¥{{ assess.countValue }}</span>
+                    <span class="projectTitle" style="color: red"
+                      >¥{{ assess.countValue }}</span
+                    >
                  </div>
                </div>
              </van-list>
+              <!-- 补偿协议部分 -->
              <div class="assess">
                <div>
-                  <van-image :src="require('@/assets/img/assess_2.png')" class="assessIcon" />
+                  <van-image
+                    :src="require('@/assets/img/assess_2.png')"
+                    class="assessIcon"
+                  />
                  <span class="assessTitle">补偿协议</span>
                </div>
                <!-- <div>
@@ -133,25 +170,34 @@
                </div>-->
              </div>
              <van-list>
-                <div :key="protocol.id" class="assessCenter2" v-for="protocol in item.bcxyList">
+                <div
+                  :key="protocol.id"
+                  class="assessCenter2"
+                  v-for="protocol in item.bcxyList"
+                >
                  <div class="assessBox">
                    <span class="projectCenterFont">协议编号：</span>
                    <span class="projectCenterFont">{{ protocol.xyNo }}</span>
                  </div>
                  <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%">被征收房屋地址：</span>
-                    <span class="projectCenterFont protocolTitle">{{ protocol.houseAddress }}</span>
+                    <span class="projectCenterFont" style="width: 40%"
+                      >被征收房屋地址：</span
+                    >
+                    <span class="projectCenterFont protocolTitle">{{
+                      protocol.houseAddress
+                    }}</span>
                  </div>
                  <div class="assessBox">
                    <span class="projectCenterFont">补偿方式：</span>
-                    <span class="projectCenterFont">{{ protocol.switchProductionWay }}</span>
+                    <span class="projectCenterFont">{{
+                      protocol.switchProductionWay
+                    }}</span>
                  </div>
                  <div class="assessBox">
                    <span class="projectCenterFont">合计补偿资金：</span>
-                    <span
-                      class="projectTitle"
-                      style="color: red"
-                    >¥{{ protocol.summationShouldCompensateMoney }}</span>
+                    <span class="projectTitle" style="color: red"
+                      >¥{{ protocol.summationShouldCompensateMoney }}</span
+                    >
                  </div>
                </div>
              </van-list>
@@ -159,33 +205,41 @@
          </div>
        </div>
      </van-list>
+      <!-- 征收政策背景图 -->
      <div class="centerMagin">
-        <van-image :src="require('@/assets/img/expropriationPolicy.png')" class="bigImg" />
+        <van-image
+          :src="require('@/assets/img/expropriationPolicy.png')"
+          class="bigImg"
+        />
      </div>
+      <!-- 征收政策部分 -->
      <div class="centerMagin">
        <span class="projectTitle" style="color: #202020">征收政策</span>
        <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-          <span
-            class="font11"
-            style="color: #2c2b2b"
-          >共{{ data.policiesRegulationsLists.totalCount }}条</span>
-          <!-- <div>
-            <span class="font11">查看全部</span>
-            <van-icon color="#1989fa" name="arrow" />
-          </div>-->
+          <span class="font11" style="color: #2c2b2b"
+            >共{{ data.policiesRegulationsLists.totalCount }}条</span
+          >
        </div>
      </div>
      <div class="centerMagin" style="padding-bottom: 20px">
-        <div @click="pageJump()" class="protocolBox">
+        <div class="protocolBox">
          <van-list>
            <div
              :key="item.id"
              class="protocolList"
              v-for="(item, i) in data.policiesRegulationsLists.list"
+              @click="pageJump(item.id)"
            >
-              <div class="protocolLine" v-if="i != data.policiesRegulationsLists.list.length - 1">
+              <!-- 非最后一行 -->
+              <div
+                class="protocolLine"
+                v-if="i != data.policiesRegulationsLists.list.length - 1"
+              >
                <div class="font14 protocolTitle">{{ item.title }}</div>
-                <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
+                <div
+                  class="assessBox"
+                  style="padding-left: 5px; padding-right: 5px"
+                >
                  <div>
                    <span class="font11">发布时间：</span>
                    <span class="font11">{{ item.publicTime }}</span>
@@ -196,9 +250,13 @@
                  </div>
                </div>
              </div>
+              <!-- 最后一行 -->
              <div style="padding-bottom: 10px" v-else>
                <div class="font14 protocolTitle">{{ item.title }}</div>
-                <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
+                <div
+                  class="assessBox"
+                  style="padding-left: 5px; padding-right: 5px"
+                >
                  <div>
                    <span class="font11">发布时间：</span>
                    <span class="font11">{{ item.publicTime }}</span>
@@ -218,66 +276,65 @@
 </template>

 <script>
-import './home.css';
-import { apis } from '@/common/apis';
-import { token } from '@/common/token';
-import request from '@/common/util';
-import { mgop } from '@aligov/jssdk-mgop';
-
+import "./home.css";
+import { apis } from "@/common/apis";
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
-  name: 'home',
+  name: "home",
  data() {
    return {
      data: {
-        idCard: '加载中...',
-        userName: '加载中...',
+        idCard: "加载中...",
+        userName: "加载中...",
        policiesRegulationsLists: {
-          totalCount: 0,
-        },
-      },
-      // userInfoData: {} // 用户个人信息
+          totalCount: 0
+        }
+      }
    };
  },
-  created() {
+  async created() {
    this.onInit();
-    console.log('this', this);
+    console.log("this", this);
  },
-  mounted() {},
  methods: {
-    onLoad() {},
+    // 获取数据
    onInit() {
      mgop({
-        api: 'mgop.kykj.houseexpropriat.getprjlist', // 必须
-        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: 'JSON',
-        type: 'POST',
+        api: "mgop.kykj.houseexpropriat.getprjlist",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
        data: {
-          ticket: this.$route.query.ticket,
+          // ticket: this.$route.query.ticket
+          ticket: "8a118a427bda7bed017bed084ec10622-ticket"
        },
-        appKey: 'es4b8zmz+2001833218+dehllx', // 必须
-        onSuccess: (data) => {
-          console.log('data', data);
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          console.log("首页数据", data);
          if (data.data && data.data.success == true) {
            this.data = data.data.data;
+            // 埋点
            this.setZwUserAplus(this.data.idCard, this.data.userName);
          } else {
            var errorCodes = [6001, 6501];
+            // 跳转到政务系统
            if (errorCodes.indexOf(data.data.bizCode) > -1) {
              window.location.replace(
-                'https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs'
+                "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs"
              );
-            } else console.log('用户无数据，不展示');
+            } else console.log("用户无数据，不展示");
          }
        },
-        onFail: (err) => {
-          console.log('用户无数据，不展示');
-        },
+        onFail: err => {
+          console.log("用户无数据，不展示");
+        }
      });
    },
+    // 跳转项目详情
    gotoProject(type) {
      this.$router.push({
-        name: 'projectSelect',
-        params: { type: type, ticket: this.$route.query.ticket },
+        name: "projectSelect",
+        params: { type: type, ticket: this.$route.query.ticket }
      });
    },
    onLoadStatistic() {
@@ -285,32 +342,37 @@ export default {
        this.statistics = result;
      });
    },
-    // 页面跳转
-    pageJump(type) {
-      this.$router.push({
-        name: 'policyInfo',
-        params: { type: type, ticket: this.$route.query.ticket },
-      });
+    // 政策信息页面跳转
+    pageJump(id) {
+      // this.$router.push({
+      //   name: "policyInfo",
+      //   params: { type: type, ticket: this.$route.query.ticket }
+      // });
+      window.location.replace(
+        "http://localhost:8080/#/policyInfo?id=" +
+          id +
+          "&ticket=8a118a427bda7bed017bed084ec10622-ticket"
+      );
    },
    setZwUserAplus(Userid, userName) {
      // 设置用户信息埋点
      aplus_queue.push({
-        action: 'aplus.setMetaInfo',
-        arguments: ['_hold', 'BLOCK'],
+        action: "aplus.setMetaInfo",
+        arguments: ["_hold", "BLOCK"]
      });
      aplus_queue.push({
-        action: 'aplus.setMetaInfo',
-        arguments: ['_user_nick', userName], // this.userInfoData.username],
+        action: "aplus.setMetaInfo",
+        arguments: ["_user_nick", userName] // this.userInfoData.username],
      });
      aplus_queue.push({
-        action: 'aplus.setMetaInfo',
-        arguments: ['_user_id', Userid],
+        action: "aplus.setMetaInfo",
+        arguments: ["_user_id", Userid]
      });
      aplus_queue.push({
-        action: 'aplus.setMetaInfo',
-        arguments: ['_hold', 'START'],
+        action: "aplus.setMetaInfo",
+        arguments: ["_hold", "START"]
      });
-    },
-  },
+    }
+  }
 };
 </script>
--- a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue
+++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue
@@ -1,41 +1,61 @@
 <template>
  <div class="container">
    <div class="title">{{ info.title }}</div>
-    <div class="date">{{ info.date }}</div>
+    <div class="date">{{ info.publicTime }}</div>
    <hr />
-    <p class="content">{{ info.content }}</p>
-    <p class="content">{{ info.content }}</p>
+    <div class="content"></div>
  </div>
 </template>
 <script>
+import { mgop } from "@aligov/jssdk-mgop";
 export default {
  data() {
    return {
-      info: {
-        title: "国有土地征收详情与政策",
-        date: "2021-9-5",
-        content: `第一条　为了规范国有土地上房屋征收与补偿活动,维护公共利益,保障被征收房屋所有权人的合法权益,制定本条例<br/>
-          第二条　市、县级人民政府有关部门应当依照本条例的规定和本级人民政府规定的职责分工，互相配合，保障房屋征收与补偿工作的顺利进行`
-      }
+      info: {}
    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 获取数据
+    getData() {
+      mgop({
+        api: "mgop.kykj.houseexpropriat.getpoliciesinfo",
+        host: "https://mapi.zjzwfw.gov.cn/",
+        dataType: "JSON",
+        type: "POST",
+        data: {
+          ticket: this.$route.query.ticket,
+          id: this.$route.query.id
+        },
+        appKey: "es4b8zmz+2001833218+dehllx",
+        onSuccess: data => {
+          const { data: res } = data;
+          this.info = res.data;
+          let content = document.querySelector(".content");
+          content.innerHTML = res.data.contents;
+        },
+        onFail: function(err) {
+          console.log("错误信息", err);
+        }
+      });
+    }
  }
 };
 </script>
 <style lang="less" scoped>
 .container {
  padding: 20px;
-  font-size: 14px;
  .title {
    text-align: center;
    font-weight: bolder;
+    font-size: 14px;
  }
  .date {
    text-align: center;
    margin: 10px 0;
-  }
-  .content {
-    text-indent: 2em;
-    line-height: 2.5;
+    font-size: 14px;
  }
 }
 </style>
--- a/FrontCode2/sunshine_levy/src/views/project/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/project/index.vue
@@ -1,33 +1,27 @@
 <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 :class="type == 'pg' ? 'proTopBoxpg': 'proTopBoxxy'">
+      <div class="proCenterBox">
+        <div class="proCenterInfo">
+          <van-image :src="require('@/assets/img/expropriated_person.png')" class="proCenterImg" />
+          <div>
            <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>
+              <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 class="proCenterFlex">
-            <div class="proCenterFlexFont">请选择您的征收项目</div>
-            <van-image
-              :src="require('@/assets/img/expropriated_select.png')"
-              class="proCenterFlexImg"
-            />
-          </div>
+        </div>
+        <div class="proCenterFlex" style="margin-bottom: 15px;">
+          <div class="proCenterFlexFont">请选择您的征收项目</div>
+          <van-icon color="#9da2a3" name="arrow-down" />
        </div>
      </div>
    </div>
-    <div>
+    <div class="proList">
      <van-list>
        <div
          :key="item.id"
--- a/FrontCode2/sunshine_levy/src/views/project/project.css
+++ b/FrontCode2/sunshine_levy/src/views/project/project.css
@@ -1,46 +1,48 @@
-.proTopBox {
-  position: relative;
-
-  margin: 15px 12px;
-}
 .proTopBoxpg {
  position: absolute;

-  overflow: hidden;
+  display: flex;
+  justify-content: space-around;

-  width: 100%;
-  height: 90px;
+  width: 95%;
+  height: 220px;
+  margin: 10px;

  background: url(../../assets/img/zspg.jpg);
+  background-repeat: no-repeat;
  background-size: 100% 90px;
 }
 .proTopBoxxy {
  position: absolute;

-  overflow: hidden;
+  display: flex;
+  justify-content: space-around;

-  width: 100%;
-  height: 90px;
+  width: 95%;
+  height: 220px;
+  margin: 10px;

  background: url(../../assets/img/zsxy.jpg);
+  background-repeat: no-repeat;
  background-size: 100% 90px;
 }
 .proCenterBox {
-  position: absolute;
-  top: 50%;
-  left: 50% ;
-
-  width: 95%;
-  height: 140px;
-
-  transform: translate(-50%, 50%);
-
-/* margin: 70px 0 15px 10px; */
+  width: 94%;
+  margin-top: 78px;

  border-radius: 6px;
  background: rgba(248, 253, 255, 1);
  box-shadow: 1px 1px 3px rgb(202, 201, 201);
 }
+.proList {
+  position: absolute;
+  top: 230px;
+  bottom: 0;
+
+  overflow-y: scroll;
+
+  width: 100%;
+}
 .proCenterInfo {
  display: flex;

@@ -86,7 +88,7 @@

  height: 25px;

-  color: #09a4fa;
+  color: #9da2a3;
 }
 .shadow {
  -webkit-box-shadow: rgb(189, 189, 189) 0 0 3px;
@@ -98,6 +100,7 @@
  margin: 15px 20px;

  border-radius: 3px;
+  background-color: #fff;
 }
 .proAreaBox {
  display: flex;