From 52f80012c2c226cc6b150c9d0ca3aba71e856812 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 26 May 2022 09:01:16 +0800
Subject: [PATCH] =?UTF-8?q?29873=EF=BC=8C29872?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppReturnHomeRegister.vue                 | 24 +++++++++++----
 .../AppIntegralApply/AppIntegralApply.vue     | 29 ++++++++++---------
 .../conv/score/AppIntegralApply/detail.vue    |  8 ++---
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
index c894595..3339044 100644
--- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -42,12 +42,20 @@
       <div class="addbtn" @click="toReport" hover-class="text-hover">添加返乡报备</div>
     </div>
 
-    <u-popup v-model="show" mode="center" border-radius="14" width="90%" height="150px">
-			<view>出淤泥而不染，濯清涟而不妖</view>
-			<view>出淤泥而不染，濯清涟而不妖</view>
-			<view>出淤泥而不染，濯清涟而不妖</view>
-			<view>出淤泥而不染，濯清涟而不妖</view>
+    <u-popup  v-model="show" mode="bottom" border-radius="30" height="200px">
+			<div class="shareBox">
+        <h2>分享到：</h2>
+        <div>
+          <div class="itemCard" @click="toPage(item.url)" v-for="(item, i) in list" :key="i">
+            <img :src="item.img" alt="" class="imgs" />
+            <div class="names">{{ item.name }}</div>
+          </div>
+        </div>
+      </div>
+		</u-popup>
 
+    <u-popup v-model="showCode" mode="center" border-radius="14" width="90%" height="150px">
+			
 		</u-popup>
   </div>
 </template>
@@ -64,6 +72,7 @@ export default {
       current: 1,
       total: 0,
       show: false,
+      showCode: false,
     }
   },
 
@@ -260,6 +269,11 @@ export default {
       color: #fff;
     }
   }
+
+  .shareBox {
+    padding: 32px;
+    box-sizing: border-box;
+  }
   
 }
 </style>
diff --git a/src/mods/conv/score/AppIntegralApply/AppIntegralApply.vue b/src/mods/conv/score/AppIntegralApply/AppIntegralApply.vue
index 95de045..eabce27 100644
--- a/src/mods/conv/score/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/conv/score/AppIntegralApply/AppIntegralApply.vue
@@ -4,11 +4,11 @@
 
     <div class="middle">
       <div class="nav">
-        <div class="navLeft" @click="showType = true">
+        <!-- <div class="navLeft" @click="showType = true">
           <span class="showTypes">{{ name ? name : '全部类型' }}</span>
 
           <u-icon name="arrow-down" style="margin-left: 16px"></u-icon>
-        </div>
+        </div> -->
 
         <u-search v-model="searchObj" placeholder="请输入姓名或电话" :show-action="false" clearabled bg-color="#fff" search-icon-color="#6AA8F8" placeholder-color="#D0D4D4" @search="handerSearch" @clear=";(searchObj = ''), init()" />
       </div>
@@ -19,7 +19,8 @@
             <div class="cont">{{ item.description }}</div>
 
             <div class="flex">
-              <span class="tags">{{ $dict.getLabel('atWillReportType', item.applyIntegralType) }}</span>
+              <!-- {{ $dict.getLabel('atWillReportType', item.applyIntegralType) }} -->
+              <span class="tags"></span>
               <span class="times">{{ item.createTime }}</span>
             </div>
           </div>
@@ -183,10 +184,10 @@ export default {
       align-items: center;
       padding: 54px 0 14px 0;
       .navLeft {
-        display: flex;
-        width: calc(100% - 430px);
-        height: 32px;
-        line-height: 32px;
+        // display: flex;
+        // width: calc(100% - 430px);
+        // height: 32px;
+        // line-height: 32px;
 
         .showTypes {
           font-size: 38px;
@@ -197,7 +198,7 @@ export default {
         }
       }
       ::v-deep u-search {
-        width: 410px;
+        width: 100%;
       }
     }
 
@@ -225,12 +226,12 @@ export default {
           justify-content: space-between;
           margin-top: 28px;
           .tags {
-            display: inline-block;
-            padding: 4px 16px;
-            background: #eeeeee;
-            border-radius: 24px;
-            font-size: 28px;
-            color: #999999;
+            // display: inline-block;
+            // padding: 4px 16px;
+            // background: #eeeeee;
+            // border-radius: 24px;
+            // font-size: 28px;
+            // color: #999999;
           }
           .times {
             width: 47%;
diff --git a/src/mods/conv/score/AppIntegralApply/detail.vue b/src/mods/conv/score/AppIntegralApply/detail.vue
index 7286b44..b43778e 100644
--- a/src/mods/conv/score/AppIntegralApply/detail.vue
+++ b/src/mods/conv/score/AppIntegralApply/detail.vue
@@ -49,19 +49,19 @@
         </div>
       </div>
 
-      <div class="cards" v-if="detail.auditStatus == 1">
+      <!-- <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分规则类型</div>
         <div class="cards-right">
           <span>
             {{ $dict.getLabel('atWillReportType', detail.applyIntegralType) }}
           </span>
         </div>
-      </div>
+      </div> -->
 
-      <div class="cards" v-if="detail.auditStatus == 1">
+      <!-- <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分规则事项</div>
         <div class="cards-right" style="width: 75%; text-align: right">{{ detail.auditRuleName }}</div>
-      </div>
+      </div> -->
 
       <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分调整</div>