update:变更首页样式

FrontCode2/sunshine_levy/package-lock.json

@@ -3408,8 +3408,8 @@
     },
     "base64-arraybuffer": {
       "version": "0.2.0",
-      "resolved": "https://registry.nlark.com/base64-arraybuffer/download/base64-arraybuffer-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
-      "integrity": "sha1-S5RPrAGRqlkHr+LYyZnMxXzoD0U="
+      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
     },
     "base64-js": {
       "version": "1.5.1",
@@ -5226,8 +5226,8 @@
     },
     "css-line-break": {
       "version": "2.0.1",
-      "resolved": "https://registry.nlark.com/css-line-break/download/css-line-break-2.0.1.tgz?cache=0&sync_timestamp=1628083299735&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-line-break%2Fdownload%2Fcss-line-break-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz",
-      "integrity": "sha1-PcdMLtXrZCEUgCgZMkdXkCQ+czg=",
+      "integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
       "requires": {
         "base64-arraybuffer": "^0.2.0"
       }
@@ -8391,8 +8391,8 @@
     },
     "html2canvas": {
       "version": "1.3.2",
-      "resolved": "https://registry.nlark.com/html2canvas/download/html2canvas-1.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.2.tgz",
-      "integrity": "sha1-lRzIOIo86Tn9rAITEAfuKBJK/Cc=",
+      "integrity": "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ==",
       "requires": {
         "css-line-break": "2.0.1",
         "text-segmentation": "^1.0.2"
@@ -9345,8 +9345,8 @@
     },
     "jquery": {
       "version": "3.6.0",
-      "resolved": "https://registry.nlark.com/jquery/download/jquery-3.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA="
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
     },
     "js-base64": {
       "version": "2.6.4",
@@ -19133,8 +19133,8 @@
     },
     "text-segmentation": {
       "version": "1.0.2",
-      "resolved": "https://registry.nlark.com/text-segmentation/download/text-segmentation-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz",
-      "integrity": "sha1-H4KPoUqhAcEU3tG9o1un3MF8mFg=",
+      "integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
       "requires": {
         "utrie": "^1.0.1"
       }
@@ -19901,16 +19901,16 @@
     },
     "utrie": {
       "version": "1.0.1",
-      "resolved": "https://registry.nlark.com/utrie/download/utrie-1.0.1.tgz?cache=0&sync_timestamp=1628857080382&other_urls=https%3A%2F%2Fregistry.nlark.com%2Futrie%2Fdownload%2Futrie-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz",
-      "integrity": "sha1-4VUjXry93ImuCSYatudzzmFAGy8=",
+      "integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
       "requires": {
         "base64-arraybuffer": "^1.0.1"
       },
       "dependencies": {
         "base64-arraybuffer": {
           "version": "1.0.1",
-          "resolved": "https://registry.nlark.com/base64-arraybuffer/download/base64-arraybuffer-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-          "integrity": "sha1-h70TUlYm20qYOOAKUIwrc+/PNIw="
+          "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
         }
       }
     },

FrontCode2/sunshine_levy/src/views/home.css

@@ -18,7 +18,7 @@
 
   width: 173px;
   height: 36px;
-  margin: 15px 0 15px 2px;
+  margin: 15px 0 15px 0;
 
   border-radius: 0 22px 22px 0;
   background: rgba(6, 63, 142, .66);
@@ -78,11 +78,11 @@
   height: 80px;
   margin: 12px 6px;
 
-  opacity: .9;
-}
-.gridImg:hover {
   opacity: 1;
 }
+/* .gridImg:hover {
+  opacity: 1;
+} */
 .bigImg {
   width: 100%;
   height: 91px;

FrontCode2/sunshine_levy/src/views/index.vue

@@ -7,30 +7,21 @@
         </div>
         <div>
           <div class="baseInfo">
-            <van-image
+            <van-image :src="require('@/assets/img/renyuanliebiao.png')" class="baseImg" />
-              :src="require('@/assets/img/renyuanliebiao.png')"
-              class="baseImg"
-            />
             <span class="baseFont">被征收人姓名：</span>
             <span class="baseFont">{{ data.userName }}</span>
           </div>
           <div class="baseInfo">
-            <van-image
+            <van-image :src="require('@/assets/img/credentials_icon.png')" class="baseImg" />
-              :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')"
+              :src="require('@/assets/img/evaluation.png')"
-              class="gridImg"
-            />
-            <van-image
-              :src="require('@/assets/img/evaluation .png')"
               @click="gotoProject('pg')"
               class="gridImg"
             />
@@ -43,27 +34,18 @@
         </div>
       </div>
       <div class="centerMagin">
-        <van-image
+        <van-image :src="require('@/assets/img/government.png')" class="bigImg" />
-          :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
+                <van-image :src="require('@/assets/img/project.png')" class="projectIcon" />
-                  :src="require('@/assets/img/project.png')"
-                  class="projectIcon"
-                />
                 <span class="projectTitle">{{ item.name }}</span>
               </div>
               <div class="projectRight">
-                <van-image
+                <van-image :src="require('@/assets/img/menu_yhxy.png')" class="projectRightIcon" />
-                  :src="require('@/assets/img/menu_yhxy.png')"
-                  class="projectRightIcon"
-                />
                 <span class="projectRightFont">{{ item.currentState }}</span>
               </div>
             </div>
@@ -107,19 +89,14 @@
                     class="projectCenterImg"
                   />
                   <span class="projectCenterFont">征收决定号：</span>
-                  <span class="projectCenterFont" style="color: #3883f1">
+                  <span class="projectCenterFont" style="color: #3883f1">{{ item.zsjdh }}</span>
-                    {{ item.zsjdh }}
-                  </span>
                 </div>
               </div>
             </div>
             <div class="centerMagin">
               <div class="assess">
                 <div>
-                  <van-image
+                  <van-image :src="require('@/assets/img/assess_1.png')" class="assessIcon" />
-                    :src="require('@/assets/img/assess_1.png')"
-                    class="assessIcon"
-                  />
                   <span class="assessTitle">分户评估结果</span>
                 </div>
                 <!-- <div>
@@ -127,39 +104,28 @@
                 </div>-->
               </div>
               <van-list>
-                <div
+                <div :key="assess.id" class="assessCenter1" v-for="assess in item.fhpgList">
-                  :key="assess.id"
-                  class="assessCenter1"
-                  v-for="assess in item.fhpgList"
-                >
                   <div class="assessBox">
                     <span class="projectCenterFont">评估报告编号：</span>
-                    <span class="projectCenterFont">{{
+                    <span class="projectCenterFont">
+                      {{
                       assess.assessmentNo
-                    }}</span>
+                      }}
-                  </div>
-                  <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%"
-                      >被征收房屋地址：</span
-                    >
-                    <span class="projectCenterFont protocolTitle">
-                      {{ assess.houseAddress }}
                     </span>
                   </div>
+                  <div class="assessBox">
+                    <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"
+                    <span class="projectTitle" style="color: red">¥{{ assess.countValue }}</span>
-                      >¥{{ assess.countValue }}</span
-                    >
                   </div>
                 </div>
               </van-list>
               <div class="assess">
                 <div>
-                  <van-image
+                  <van-image :src="require('@/assets/img/assess_2.png')" class="assessIcon" />
-                    :src="require('@/assets/img/assess_2.png')"
-                    class="assessIcon"
-                  />
                   <span class="assessTitle">补偿协议</span>
                 </div>
                 <!-- <div>
@@ -167,34 +133,25 @@
                 </div>-->
               </div>
               <van-list>
-                <div
+                <div :key="protocol.id" class="assessCenter2" v-for="protocol in item.bcxyList">
-                  :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 class="projectCenterFont" style="width: 40%">被征收房屋地址：</span>
-                      >被征收房屋地址：</span
+                    <span class="projectCenterFont protocolTitle">{{ protocol.houseAddress }}</span>
-                    >
-                    <span class="projectCenterFont protocolTitle">
-                      {{ protocol.houseAddress }}
-                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">补偿方式：</span>
-                    <span class="projectCenterFont">
+                    <span class="projectCenterFont">{{ protocol.switchProductionWay }}</span>
-                      {{ protocol.switchProductionWay }}
-                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">合计补偿资金：</span>
-                    <span class="projectTitle" style="color: red"
+                    <span
-                      >¥{{ protocol.summationShouldCompensateMoney }}</span
+                      class="projectTitle"
-                    >
+                      style="color: red"
+                    >¥{{ protocol.summationShouldCompensateMoney }}</span>
                   </div>
                 </div>
               </van-list>
@@ -203,17 +160,15 @@
         </div>
       </van-list>
       <div class="centerMagin">
-        <van-image
+        <van-image :src="require('@/assets/img/expropriationPolicy.png')" class="bigImg" />
-          :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"
+          <span
-            >共{{ data.policiesRegulationsLists.totalCount }}条</span
+            class="font11"
-          >
+            style="color: #2c2b2b"
+          >共{{ data.policiesRegulationsLists.totalCount }}条</span>
           <!-- <div>
             <span class="font11">查看全部</span>
             <van-icon color="#1989fa" name="arrow" />
@@ -228,15 +183,9 @@
               class="protocolList"
               v-for="(item, i) in data.policiesRegulationsLists.list"
             >
-              <div
+              <div class="protocolLine" v-if="i != data.policiesRegulationsLists.list.length - 1">
-                class="protocolLine"
-                v-if="i != data.policiesRegulationsLists.list.length - 1"
-              >
                 <div class="font14 protocolTitle">{{ item.title }}</div>
-                <div
+                <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-                  class="assessBox"
-                  style="padding-left: 5px; padding-right: 5px"
-                >
                   <div>
                     <span class="font11">发布时间：</span>
                     <span class="font11">{{ item.publicTime }}</span>
@@ -249,10 +198,7 @@
               </div>
               <div style="padding-bottom: 10px" v-else>
                 <div class="font14 protocolTitle">{{ item.title }}</div>
-                <div
+                <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-                  class="assessBox"
-                  style="padding-left: 5px; padding-right: 5px"
-                >
                   <div>
                     <span class="font11">发布时间：</span>
                     <span class="font11">{{ item.publicTime }}</span>
@@ -272,19 +218,19 @@
 </template>
 
 <script>
-import "./home.css";
+import './home.css';
-import { apis } from "@/common/apis";
+import { apis } from '@/common/apis';
-import { token } from "@/common/token";
+import { token } from '@/common/token';
-import request from "@/common/util";
+import request from '@/common/util';
-import { mgop } from "@aligov/jssdk-mgop";
+import { mgop } from '@aligov/jssdk-mgop';
 
 export default {
-  name: "home",
+  name: 'home',
   data() {
     return {
       data: {
-        idCard:'加载中...',
+        idCard: '加载中...',
-        userName:'加载中...',
+        userName: '加载中...',
         policiesRegulationsLists: {
           totalCount: 0,
         },
@@ -294,23 +240,23 @@ export default {
   },
   created() {
     this.onInit();
-    console.log("this", this);
+    console.log('this', this);
   },
   mounted() {},
   methods: {
     onLoad() {},
     onInit() {
       mgop({
-        api: "mgop.kykj.houseexpropriat.getprjlist", // 必须
+        api: 'mgop.kykj.houseexpropriat.getprjlist', // 必须
-        host: "https://mapi.zjzwfw.gov.cn/",
+        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: "JSON",
+        dataType: 'JSON',
-        type: "POST",
+        type: 'POST',
         data: {
           ticket: this.$route.query.ticket,
         },
-        appKey: "es4b8zmz+2001833218+dehllx", // 必须
+        appKey: 'es4b8zmz+2001833218+dehllx', // 必须
         onSuccess: (data) => {
-          console.log("data", data);
+          console.log('data', data);
           if (data.data && data.data.success == true) {
             this.data = data.data.data;
             this.setZwUserAplus(this.data.idCard, this.data.userName);
@@ -318,13 +264,13 @@ export default {
             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("用户无数据，不展示");
+          console.log('用户无数据，不展示');
         },
       });
       //获取当前数据
@@ -337,7 +283,7 @@ export default {
     },
     gotoProject(type) {
       this.$router.push({
-        name: "projectSelect",
+        name: 'projectSelect',
         params: { type: type, ticket: this.$route.query.ticket },
       });
     },
@@ -349,27 +295,27 @@ export default {
     // 页面跳转
     pageJump(type) {
       this.$router.push({
-        name: "policyInfo",
+        name: 'policyInfo',
         params: { type: type, ticket: this.$route.query.ticket },
       });
     },
     setZwUserAplus(Userid, userName) {
       // 设置用户信息埋点
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_hold", "BLOCK"],
+        arguments: ['_hold', 'BLOCK'],
       });
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_user_nick", userName], // this.userInfoData.username],
+        arguments: ['_user_nick', userName], // this.userInfoData.username],
       });
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_user_id", Userid],
+        arguments: ['_user_id', Userid],
       });
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_hold", "START"],
+        arguments: ['_hold', 'START'],
       });
     },
   },