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

Ewide.NbzsZheliban/Service/DataService.cs

@@ -135,6 +135,7 @@ namespace Ewide.NbzsZheliban.Service
         public async Task<dynamic> PrjList2([FromBody] JObject args)
         {
             var cardno = "341203199206303411";
+            var username = "张三丰";
 
             //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
             //住宅调查表
@@ -158,7 +159,9 @@ namespace Ewide.NbzsZheliban.Service
             });
             H5IndexModel h5IndexModel = new()
             {
-                PrjList = list_projects
+                PrjList = list_projects,
+                IdCard = cardno,
+                UserName = username
             };
             return h5IndexModel;
 

FrontCode2/sunshine_levy/src/views/home.css

@@ -139,8 +139,6 @@
   font-weight: 600;
   line-height: 14px;
 
-  height: 17px;
-
   color: #fff;
 }
 .projectRightIcon {
@@ -150,7 +148,7 @@
   margin-left: 8px;
 }
 .projectCenter {
-  height: 440px;
+  /* height: 440px; */
   padding-bottom: 35px;
 
   background: #fff;

FrontCode2/sunshine_levy/src/views/index.vue

@@ -12,7 +12,7 @@
               class="baseImg"
             />
             <span class="baseFont">被征收人姓名：</span>
-            <span class="baseFont">{{ user.name }}</span>
+            <span class="baseFont">{{ data.userName }}</span>
           </div>
           <div class="baseInfo">
             <van-image
@@ -20,7 +20,7 @@
               class="baseImg"
             />
             <span class="baseFont">身份证号码：</span>
-            <span class="baseFont">{{ user.identityId }}</span>
+            <span class="baseFont">{{ data.idCard }}</span>
           </div>
         </div>
         <div>
@@ -48,140 +48,158 @@
           class="bigImg"
         />
       </div>
-      <div class="centerMagin">
+      <van-list>
-        <div class="project">
+        <div :key="item.prjId" v-for="(item, i) in data.prjList">
-          <div>
+          <div class="centerMagin">
-            <van-image
+            <div class="project">
-              :src="require('@/assets/img/project.png')"
+              <div>
-              class="projectIcon"
+                <van-image
-            />
+                  :src="require('@/assets/img/project.png')"
-            <span class="projectTitle">{{ project.name }}</span>
+                  class="projectIcon"
-          </div>
+                />
-          <div class="projectRight">
+                <span class="projectTitle">一块地？？？</span>
-            <van-image
+              </div>
-              :src="require('@/assets/img/menu_yhxy.png')"
+              <div class="projectRight">
-              class="projectRightIcon"
+                <van-image
-            />
+                  :src="require('@/assets/img/menu_yhxy.png')"
-            <span class="projectRightFont">协议签订阶段</span>
+                  class="projectRightIcon"
-          </div>
+                />
-        </div>
+                <span class="projectRightFont">{{ item.currentState }}</span>
-      </div>
+              </div>
-      <div class="projectCenter centerMagin">
-        <div class="projectCenterInfo">
-          <div class="projectCenterInfo">
-            <van-image
-              :src="require('@/assets/img/project_area.png')"
-              class="projectCenterImg"
-            />
-            <span class="projectCenterFont">项目所在区域：</span>
-            <span class="projectCenterFont">{{ project.area }}</span>
-          </div>
-        </div>
-        <div class="projectCenterInfo">
-          <div class="projectCenterInfo">
-            <van-image
-              :src="require('@/assets/img/project_dep.png')"
-              class="projectCenterImg"
-            />
-            <span class="projectCenterFont">征收部门：</span>
-            <span class="projectCenterFont">{{ project.department }}</span>
-          </div>
-        </div>
-        <div class="projectCenterInfo">
-          <div class="projectCenterInfo">
-            <van-image
-              :src="require('@/assets/img/project_year.png')"
-              class="projectCenterImg"
-            />
-            <span class="projectCenterFont">所属年份：</span>
-            <span class="projectCenterFont">{{ project.year }}</span>
-          </div>
-        </div>
-        <div class="projectCenterInfo">
-          <div class="projectCenterInfo">
-            <van-image
-              :src="require('@/assets/img/project_no.png')"
-              class="projectCenterImg"
-            />
-            <span class="projectCenterFont">征收决定号：</span>
-            <span class="projectCenterFont" style="color: #3883f1">{{
-              project.num
-            }}</span>
-          </div>
-        </div>
-        <div class="centerMagin">
-          <div class="assess">
-            <div>
-              <van-image
-                :src="require('@/assets/img/assess_1.png')"
-                class="assessIcon"
-              />
-              <span class="assessTitle">分户评估结果</span>
-            </div>
-            <!-- <div>
-              <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
-            </div>-->
-          </div>
-          <div class="assessCenter1">
-            <div class="assessBox">
-              <span class="projectCenterFont">评估报告编号：</span>
-              <span class="projectCenterFont">{{ assess.num }}</span>
-            </div>
-            <div class="assessBox">
-              <span class="projectCenterFont" style="width: 40%"
-                >被征收房屋地址：</span
-              >
-              <span class="projectCenterFont protocolTitle">{{
-                assess.address
-              }}</span>
-            </div>
-            <div class="assessBox">
-              <span class="projectCenterFont">评估总金额：</span>
-              <span class="projectTitle" style="color: red"
-                >¥{{ assess.amount }}</span
-              >
             </div>
           </div>
-          <div class="assess">
+          <div class="projectCenter centerMagin">
-            <div>
+            <div class="projectCenterInfo">
-              <van-image
+              <div class="projectCenterInfo">
-                :src="require('@/assets/img/assess_2.png')"
+                <van-image
-                class="assessIcon"
+                  :src="require('@/assets/img/project_area.png')"
-              />
+                  class="projectCenterImg"
-              <span class="assessTitle">补偿协议</span>
+                />
+                <span class="projectCenterFont">项目所在区域：</span>
+                <span class="projectCenterFont">{{ item.area }}</span>
+              </div>
             </div>
-            <!-- <div>
+            <div class="projectCenterInfo">
-              <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
+              <div class="projectCenterInfo">
-            </div>-->
+                <van-image
-          </div>
+                  :src="require('@/assets/img/project_dep.png')"
-          <div class="assessCenter2">
+                  class="projectCenterImg"
-            <div class="assessBox">
+                />
-              <span class="projectCenterFont">协议编号：</span>
+                <span class="projectCenterFont">征收部门：</span>
-              <span class="projectCenterFont">{{ retrievalProtocol.num }}</span>
+                <span class="projectCenterFont">{{ item.zsbm }}</span>
+              </div>
             </div>
-            <div class="assessBox">
+            <div class="projectCenterInfo">
-              <span class="projectCenterFont" style="width: 40%"
+              <div class="projectCenterInfo">
-                >被征收房屋地址：</span
+                <van-image
-              >
+                  :src="require('@/assets/img/project_year.png')"
-              <span class="projectCenterFont protocolTitle">{{
+                  class="projectCenterImg"
-                retrievalProtocol.address
+                />
-              }}</span>
+                <span class="projectCenterFont">所属年份：</span>
+                <span class="projectCenterFont">{{ item.year }}</span>
+              </div>
             </div>
-            <div class="assessBox">
+            <div class="projectCenterInfo">
-              <span class="projectCenterFont">补偿方式：</span>
+              <div class="projectCenterInfo">
-              <span class="projectCenterFont">{{
+                <van-image
-                retrievalProtocol.compensation
+                  :src="require('@/assets/img/project_no.png')"
-              }}</span>
+                  class="projectCenterImg"
+                />
+                <span class="projectCenterFont">征收决定号：</span>
+                <span class="projectCenterFont" style="color: #3883f1">
+                  {{ item.zsjdh }}
+                </span>
+              </div>
             </div>
-            <div class="assessBox">
+            <div class="centerMagin">
-              <span class="projectCenterFont">合计补偿资金：</span>
+              <div class="assess">
-              <span class="projectTitle" style="color: red"
+                <div>
-                >¥{{ retrievalProtocol.amount }}</span
+                  <van-image
-              >
+                    :src="require('@/assets/img/assess_1.png')"
+                    class="assessIcon"
+                  />
+                  <span class="assessTitle">分户评估结果</span>
+                </div>
+                <!-- <div>
+                  <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
+                </div>-->
+              </div>
+              <van-list>
+                <div
+                  :key="assess.prjId"
+                  class="assessCenter1"
+                  v-for="(assess, i) in item.fhpgList"
+                >
+                  <div class="assessBox">
+                    <span class="projectCenterFont">评估报告编号：</span>
+                    <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">评估总金额：</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"
+                  />
+                  <span class="assessTitle">补偿协议</span>
+                </div>
+                <!-- <div>
+                  <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
+                </div>-->
+              </div>
+              <van-list>
+                <div
+                  :key="protocol.prjId"
+                  class="assessCenter2"
+                  v-for="(protocol, i) 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>
+                  </div>
+                  <div class="assessBox">
+                    <span class="projectCenterFont">补偿方式：</span>
+                    <span class="projectCenterFont">
+                      {{ protocol.compensation }}
+                    </span>
+                  </div>
+                  <div class="assessBox">
+                    <span class="projectCenterFont">合计补偿资金：</span>
+                    <span class="projectTitle" style="color: red"
+                      >¥{{ protocol.summationShouldCompensateMoney }}</span
+                    >
+                  </div>
+                </div>
+              </van-list>
             </div>
           </div>
         </div>
-      </div>
+      </van-list>
       <div class="centerMagin">
         <van-image
           :src="require('@/assets/img/expropriationPolicy.png')"
@@ -308,6 +326,7 @@ export default {
       //   compensation: "加载中...",
       //   amount: "0",
       // },
+      data: {},
       total: "8",
       list: [
         {
@@ -339,7 +358,82 @@ export default {
   methods: {
     onLoad() {},
     onInit() {
-      debugger;
+      let apidata = {
+        success: true,
+        code: 200,
+        message: "请求成功",
+        data: {
+          prjList: [
+            {
+              prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+              area: "海曙区",
+              zsbm: "宁波市海曙区房屋征收管理服务中心",
+              year: 2021.0,
+              zsjdh: "海政发[2021]513号",
+              currentState: "项目报结",
+              fhpgList: [
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+                  assessmentNo: "0513",
+                  houseAddress: "高桥镇",
+                  countValue: "137654.00"
+                },
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f6022",
+                  assessmentNo: "0514",
+                  houseAddress: "高桥镇11",
+                  countValue: "137611.00"
+                }
+              ],
+              bcxyList: [
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+                  xyNo: "海政发2021513-0513-1",
+                  houseAddress: "高桥镇",
+                  summationShouldCompensateMoney: "137654.00"
+                },
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f6334",
+                  xyNo: "海政发2021513-0513-3",
+                  houseAddress: "高桥镇33",
+                  summationShouldCompensateMoney: "137633.00"
+                }
+              ]
+            },
+            {
+              prjId: "936d98a8-2c8f-410f-b126-68a7568f60c3",
+              area: "海曙区11",
+              zsbm: "宁波市海曙区房屋征收管理服务中心11",
+              year: 2021.0,
+              zsjdh: "海政发[2021]513号11",
+              currentState: "项目报结",
+              fhpgList: [
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+                  assessmentNo: "0513",
+                  houseAddress: "高桥镇",
+                  countValue: "137654.00"
+                }
+              ],
+              bcxyList: [
+                {
+                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
+                  xyNo: "海政发2021513-0513-1",
+                  houseAddress: "高桥镇",
+                  summationShouldCompensateMoney: "137654.00"
+                }
+              ]
+            }
+          ],
+          idCard: "330203199904044544",
+          userName: "姓名"
+        },
+        extras: null,
+        timestamp: 1631256680049
+      };
+      if (apidata.code == 200) {
+        this.data = apidata.data;
+      }
       // this.onLogin();
       //获取当前数据
       // apis.getprjdata({ ticket: this.$route.query.ticket }).then((prjdata) => {