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

FrontCode2/sunshine_levy/src/views/home.css

@@ -74,15 +74,22 @@
   background: rgba(255, 255, 255, .28);
 }
 .gridImg {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+
   width: 90px;
   height: 80px;
   margin: 12px 6px;
+  padding-top: 5px;
 
-  opacity: 1;
+  border-radius: 10px;
+}
+.gridImgBg {
+  width: 38px;
+  height: 35px;
 }
-/* .gridImg:hover {
-  opacity: 1;
-} */
 .bigImg {
   width: 100%;
   height: 91px;
@@ -101,12 +108,15 @@
   background-size: 100% 41px;
 }
 .projectIcon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
   width: 40px;
-  height: 39px;
+  height: 40px;
+  margin-right: 10px;
 
-  vertical-align: middle;
+  border-radius: 5px 0 0;
-
-  border-radius: 5px 0 0 0;
   background: #3284cd;
 }
 .projectTitle {
@@ -126,7 +136,6 @@
   display: flex;
   align-items: center;
 
-  width: 95px;
   height: 27px;
 
   opacity: .82;
@@ -136,10 +145,11 @@
 .projectRightFont {
   font-family: PingFangSC-Semibold,
   PingFang SC;
-  font-size: 10px;
+  font-size: 12px;
-  font-weight: 600;
   line-height: 14px;
 
+  padding-right: 5px;
+
   color: #fff;
 }
 .projectRightIcon {

FrontCode2/sunshine_levy/src/views/index.vue

@@ -26,20 +26,35 @@
         <!-- 三张背景图 -->
         <div>
           <div class="gridBg centerMagin">
-            <van-image
+            <div class="gridImg" style="background:#1897FB;">
-              :src="require('@/assets/img/scan.png')"
+              <van-image
-              class="gridImg"
+                :src="require('@/assets/img/scan.png')"
-            />
+                class="gridImgBg"
-            <van-image
+              />
-              :src="require('@/assets/img/evaluation.png')"
+              <span class="baseFont" style="padding-top: 5px;">扫一扫</span>
+            </div>
+            <div
               @click="gotoProject('pg')"
               class="gridImg"
-            />
+              style="background:#F1AE4B;"
-            <van-image
+            >
-              :src="require('@/assets/img/compensation.png')"
+              <van-image
+                :src="require('@/assets/img/evaluation.png')"
+                class="gridImgBg"
+              />
+              <span class="baseFont" style="padding-top: 5px;">查评估结果</span>
+            </div>
+            <div
               @click="gotoProject('xy')"
               class="gridImg"
-            />
+              style="background:#16D7ED;"
+            >
+              <van-image
+                :src="require('@/assets/img/compensation.png')"
+                class="gridImgBg"
+              />
+              <span class="baseFont" style="padding-top: 5px;">查补偿协议</span>
+            </div>
           </div>
         </div>
       </div>
@@ -56,11 +71,13 @@
             <!-- 图标所在行 -->
             <div class="project">
               <!-- window图标 -->
-              <div>
+              <div style="display: flex;align-items: center;">
-                <van-image
+                <div class="projectIcon">
-                  :src="require('@/assets/img/project.png')"
+                  <van-image
-                  class="projectIcon"
+                    :src="require('@/assets/img/project.png')"
-                />
+                    style="width: 25px;height: 25px;"
+                  />
+                </div>
                 <span class="projectTitle">{{ item.name }}</span>
               </div>
               <!-- 补偿协议图标 -->
@@ -114,9 +131,9 @@
                     class="projectCenterImg"
                   />
                   <span class="projectCenterFont">征收决定号：</span>
-                  <span class="projectCenterFont" style="color: #3883f1">{{
+                  <span class="projectCenterFont" style="color: #3883f1">
-                    item.zsjdh
+                    {{ item.zsjdh }}
-                  }}</span>
+                  </span>
                 </div>
               </div>
             </div>
@@ -135,23 +152,23 @@
               <van-list>
                 <div
                   :key="assess.id"
+                  @click="gotoProject('pg', item.prjId)"
                   class="assessCenter1"
                   v-for="assess in item.fhpgList"
-                  @click="gotoProject('pg', item.prjId)"
                 >
                   <div class="assessBox">
                     <span class="projectCenterFont">评估报告编号：</span>
-                    <span class="projectCenterFont">
+                    <span class="projectCenterFont">{{
-                      {{ assess.assessmentNo }}
+                      assess.assessmentNo
-                    </span>
+                    }}</span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont" style="width: 40%"
                       >被征收房屋地址：</span
                     >
-                    <span class="projectCenterFont protocolTitle">{{
+                    <span class="projectCenterFont protocolTitle">
-                      assess.houseAddress
+                      {{ assess.houseAddress }}
-                    }}</span>
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">评估总金额：</span>
@@ -178,9 +195,9 @@
               <van-list>
                 <div
                   :key="protocol.id"
+                  @click="gotoProject('xy', item.prjId)"
                   class="assessCenter2"
                   v-for="protocol in item.bcxyList"
-                  @click="gotoProject('xy', item.prjId)"
                 >
                   <div class="assessBox">
                     <span class="projectCenterFont">协议编号：</span>
@@ -190,15 +207,15 @@
                     <span class="projectCenterFont" style="width: 40%"
                       >被征收房屋地址：</span
                     >
-                    <span class="projectCenterFont protocolTitle">{{
+                    <span class="projectCenterFont protocolTitle">
-                      protocol.houseAddress
+                      {{ protocol.houseAddress }}
-                    }}</span>
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">补偿方式：</span>
-                    <span class="projectCenterFont">{{
+                    <span class="projectCenterFont">
-                      protocol.switchProductionWay
+                      {{ protocol.switchProductionWay }}
-                    }}</span>
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">合计补偿资金：</span>
@@ -234,9 +251,9 @@
           <van-list>
             <div
               :key="item.id"
+              @click="pageJump(item.id)"
               class="protocolList"
               v-for="(item, i) in data.policiesRegulationsLists.list"
-              @click="pageJump(item.id)"
             >
               <!-- 非最后一行 -->
               <div
@@ -328,7 +345,7 @@ export default {
             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"