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

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/common/apis/requests.js

@@ -9,10 +9,7 @@ const url = {
   account: "/webapi/account.ashx?action=userinfo",
 
   // 项目数统计信息
-  projectStatistics: "/webapi/project.ashx?action=getStatistics",
+  projectStatistics: "/webapi/project.ashx?action=getStatistics"
-
-  getprjdata: "/project/list",
-  get_policies_info: "/policies/info"
 };
 
 export default url;

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

@@ -30,7 +30,7 @@
               class="gridImg"
             />
             <van-image
-              :src="require('@/assets/img/evaluation .png')"
+              :src="require('@/assets/img/evaluation.png')"
               @click="gotoProject('pg')"
               class="gridImg"
             />
@@ -108,9 +108,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>
@@ -136,17 +136,17 @@
                 >
                   <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>
@@ -183,15 +183,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>

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

@@ -1,33 +1,27 @@
 <template>
   <div>
-    <div style="height: 240px;">
+    <div :class="type == 'pg' ? 'proTopBoxpg': 'proTopBoxxy'">
-      <div class="proTopBox">
+      <div class="proCenterBox">
-        <div :class="type == 'pg' ? 'proTopBoxpg': 'proTopBoxxy' "></div>
+        <div class="proCenterInfo">
-        <div class="proCenterBox">
+          <van-image :src="require('@/assets/img/expropriated_person.png')" class="proCenterImg" />
-          <div class="proCenterInfo">
+          <div>
-            <van-image :src="require('@/assets/img/expropriated_person.png')" class="proCenterImg" />
             <div>
-              <div>
+              <span class="proCenterFont">被征收人姓名：</span>
-                <span class="proCenterFont">被征收人姓名：</span>
+              <span class="proCenterFont" style="color:#626262;">{{user.name}}</span>
-                <span class="proCenterFont" style="color:#626262;">{{user.name}}</span>
+            </div>
-              </div>
+            <div>
-              <div>
+              <span class="proCenterFont">身份证号：</span>
-                <span class="proCenterFont">身份证号：</span>
+              <span class="proCenterFont" style="color:#626262;">{{user.identityId}}</span>
-                <span class="proCenterFont" style="color:#626262;">{{user.identityId}}</span>
-              </div>
             </div>
           </div>
-          <div class="proCenterFlex">
+        </div>
-            <div class="proCenterFlexFont">请选择您的征收项目</div>
+        <div class="proCenterFlex" style="margin-bottom: 15px;">
-            <van-image
+          <div class="proCenterFlexFont">请选择您的征收项目</div>
-              :src="require('@/assets/img/expropriated_select.png')"
+          <van-icon color="#9da2a3" name="arrow-down" />
-              class="proCenterFlexImg"
-            />
-          </div>
         </div>
       </div>
     </div>
-    <div>
+    <div class="proList">
       <van-list>
         <div
           :key="item.id"

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%;
+  width: 95%;
-  height: 90px;
+  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%;
+  width: 95%;
-  height: 90px;
+  height: 220px;
+  margin: 10px;
 
   background: url(../../assets/img/zsxy.jpg);
+  background-repeat: no-repeat;
   background-size: 100% 90px;
 }
 .proCenterBox {
-  position: absolute;
+  width: 94%;
-  top: 50%;
+  margin-top: 78px;
-  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);
 }
+.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;