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

FrontCode2/sunshine_levy/src/router/index.js

@@ -51,6 +51,13 @@ export default new Router({
       name: "evaluteResult",
       component: () =>
         import ("../views/pdf/evaluteResult")
+    },
+    // 政策详情页面
+    {
+      path: "/policyInfo",
+      name: "policyInfo",
+      component: () =>
+        import ("../views/policyInfo/policyInfo")
     }
   ]
 });

FrontCode2/sunshine_levy/src/views/index.vue

@@ -219,7 +219,7 @@
         </div>
       </div>
       <div class="centerMagin" style="padding-bottom: 20px">
-        <div class="protocolBox">
+        <div class="protocolBox" @click="pageJump()">
           <van-list :finished="finished" @load="onLoad" v-model="loading">
             <div :key="item.id" class="protocolList" v-for="(item, i) in list">
               <div class="protocolLine" v-if="i != list.length - 1">
@@ -314,24 +314,24 @@ export default {
           id: 11,
           area: "全大市",
           title: "宁波市住房和城乡建设委员会开展关于住房的政策",
-          publish_date: "2021年09月05日",
+          publish_date: "2021年09月05日"
         },
         {
           id: 22,
           area: "全大市",
           title: "宁波市住房和城乡建设委员会开展关于住房的政策",
-          publish_date: "2021年09月05日",
+          publish_date: "2021年09月05日"
         },
         {
           id: 33,
           area: "全大市",
           title: "宁波市住房和城乡建设委员会开展关于住房的政策",
-          publish_date: "2021年09月05日",
-        },
+          publish_date: "2021年09月05日"
+        }
       ],
       loading: false,
       finished: true,
-      userInfoData: {}, // 用户个人信息
+      userInfoData: {} // 用户个人信息
     };
   },
   created() {
@@ -349,10 +349,10 @@ export default {
         dataType: "JSON",
         type: "GET",
         data: {
-          ticket: this.$route.query.ticket,
+          ticket: this.$route.query.ticket
         },
         appKey: "es4b8zmz+2001833218+dehllx", // 必须
-        onSuccess: (data) => {
+        onSuccess: data => {
           console.log("data", data);
           if (data.data && data.data.success == true) {
             this.data = data.data;
@@ -361,10 +361,58 @@ export default {
             console.log("用户无数据，不展示");
           }
         },
-        onFail: (err) => {
+        onFail: err => {
           console.log(err, "err");
         },
+        onFail: err => {
+          console.log(err, "err");
+        }
       });
+      let apidata = {
+        success: true,
+        code: 200,
+        message: "请求成功",
+        data: {
+          userName: "张三丰",
+          idCard: "341203199206303411",
+          prjList: [
+            {
+              prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+              name: "项目名称",
+              area: "海曙区",
+              zsbm: "宁波市海曙区房屋征收管理服务中心",
+              year: 2021.0,
+              zsjdh: "海政发[2021]513号",
+              currentState: "项目报结",
+              fhpgList: [
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+                  id: "a400583e-ae93-444f-8a20-4c4731b0cc13",
+                  assessmentNo: "0513",
+                  houseAddress: "高桥镇",
+                  countValue: "137654.00"
+                }
+              ],
+              bcxyList: [
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+                  id: "bf21b302-8059-462d-985f-ce7452c4d5b4",
+                  xyNo: "海政发2021513-0513-1",
+                  houseAddress: "高桥镇",
+                  switchProductionWay: "货币补偿",
+                  summationShouldCompensateMoney: "137654.00"
+                }
+              ]
+            }
+          ]
+        },
+        extras: null,
+        timestamp: 1631261808797
+      };
+      if (apidata.code == 200) {
+        this.data = apidata.data;
+      }
+      // this.onLogin();
       //获取当前数据
       // apis.getprjdata({ ticket: this.$route.query.ticket }).then((prjdata) => {
       //   debugger;
@@ -376,23 +424,69 @@ export default {
     gotoProject(type) {
       this.$router.push({ name: "projectSelect", params: { type: type } });
     },
+    onLogin() {
+      // this.loading = true;
+      let form = { account: "zgbqc", password: "111qqqqq" };
+      apis
+        .login(form)
+        .finally(() => {
+          debugger;
+          // this.loading = false;
+        })
+        .then(({ result }) => {
+          token.value = result.token;
+          // this.$root.replace('/');
+          debugger;
+          this.onLoadUserInfo();
+          this.onLoadStatistic();
+        })
+        .catch(err => {
+          debugger;
+          // this.$toast(err);
+        });
+    },
+    onLoadUserInfo() {
+      apis.account().then(({ result }) => {
+        for (let key in result) {
+          if (this.user.hasOwnProperty(key)) {
+            this.user[key] = result[key];
+          }
+        }
+      });
+    },
+    onLoadStatistic() {
+      apis.projectStatistics().then(({ result }) => {
+        this.statistics = result;
+      });
+    },
+    padStart(num, n) {
+      var tbl = [];
+      var len = n - num.toString().length;
+      if (len <= 0) return num;
+      if (!tbl[len]) tbl[len] = new Array(len + 1).join("0");
+      return tbl[len] + num;
+    },
+    // 页面跳转
+    pageJump() {
+      this.$router.push("/policyInfo");
+    },
     setZwUserAplus(Userid, userName) {
       // 设置用户信息埋点
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_hold", "BLOCK"],
+        arguments: ["_hold", "BLOCK"]
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_user_nick", userName], // this.userInfoData.username],
+        arguments: ["_user_nick", userName] // this.userInfoData.username],
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_user_id", Userid],
+        arguments: ["_user_id", Userid]
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["_hold", "START"],
+        arguments: ["_hold", "START"]
       });
     },
     // 基础信息埋点配置
@@ -408,38 +502,36 @@ export default {
       })(window, document, "script", "aplus_queue");
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"],
+        arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"]
       });
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"],
+        arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"]
       });
       // 这个会落到 app_key 字段上
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["appId", "60506758"],
+        arguments: ["appId", "60506758"]
       });
       // 单页应用 或 “单个页面”需异步补充 PV 日志参数还需进行如下埋点：
       aplus_queue.push({
         action: "aplus.setMetaInfo",
-        arguments: ["aplus-waiting", "MAN"],
+        arguments: ["aplus-waiting", "MAN"]
       });
       // 单页应用路由切换后 或 在异步获取到 pv 日志所需的参数后再执行 sendPV：
       aplus_queue.push({
         action: "aplus.sendPV",
         arguments: [
           {
-            is_auto: false,
+            is_auto: false
           },
           {
             miniAppId: "2001833218", //'应用开发管理平台-应用 ID
-            miniAppName: "房屋征收",
-          },
-        ],
+            miniAppName: "房屋征收"
+          }
+        ]
       });
-    },
-  },
+    }
+  }
 };
 </script>
-
-

FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="container">
+    <div class="title">{{ info.title }}</div>
+    <div class="date">{{ info.date }}</div>
+    <hr />
+    <p class="content">{{ info.content }}</p>
+    <p class="content">{{ info.content }}</p>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      info: {
+        title: "国有土地征收详情与政策",
+        date: "2021-9-5",
+        content: `第一条　为了规范国有土地上房屋征收与补偿活动,维护公共利益,保障被征收房屋所有权人的合法权益,制定本条例<br/>
+          第二条　市、县级人民政府有关部门应当依照本条例的规定和本级人民政府规定的职责分工，互相配合，保障房屋征收与补偿工作的顺利进行`
+      }
+    };
+  }
+};
+</script>
+<style lang="less" scoped>
+.container {
+  padding: 20px;
+  font-size: 14px;
+  .title {
+    text-align: center;
+    font-weight: bolder;
+  }
+  .date {
+    text-align: center;
+    margin: 10px 0;
+  }
+  .content {
+    text-indent: 2em;
+    line-height: 2.5;
+  }
+}
+</style>