Merge remote-tracking branch 'origin/dev' into dev

project/dv/apps/components/PdGrid.vue

@@ -9,15 +9,27 @@
     <div class="pdgrid-body">
       <div class="pdgrid-body__item">
         <h2>240</h2>
-        <p>多层网格</p>
+        <div class="bottom">
+          <i></i>
+          <p>第一网格</p>
+          <i class="right"></i>
+        </div>
       </div>
       <div class="pdgrid-body__item" @click.stop="isShowGrid1 = true">
         <h2>240</h2>
-        <p>第一网格</p>
+        <div class="bottom">
+          <i></i>
+          <p>第二网格</p>
+          <i class="right"></i>
+        </div>
       </div>
       <div class="pdgrid-body__item">
         <h2>240</h2>
-        <p>微网格</p>
+        <div class="bottom">
+          <i></i>
+          <p>微网格</p>
+          <i class="right"></i>
+        </div>
       </div>
     </div>
     <transition name="fade">
@@ -84,7 +96,13 @@
       text-align: center;
       background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/grid-title-sbg.png) no-repeat center;
       background-size: 100% 100%;
+      cursor: pointer;
       transform: translateX(-50%);
+      transition: opacity ease 0.3s;
+
+      &:hover {
+        opacity: 0.8;
+      }
 
       h2 {
         color: #FFFFFF;
@@ -98,7 +116,7 @@
 
     .pdgrid-title {
       position: absolute;
-      top: 220px;
+      top: 200px;
       left: 50%;
       width: 640px;
       height: 80px;
@@ -158,14 +176,45 @@
         }
 
         p {
-          font-size: 18px;
+          max-width: 164px;
+          margin-top: 4px;
+          padding: 0 16px;
+          font-size: 16px;
           color: #FFFFFF;
           text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
           background: #fff;
           -webkit-background-clip: text;
           font-weight: 600;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
           -webkit-text-fill-color: transparent;
         }
+
+        .bottom {
+          display: flex;
+          align-items: center;
+
+          i {
+            width: 0px;
+            height: 0px;
+            border: 6px solid transparent;
+            border-top-color: transparent;
+            border-bottom-color: transparent;
+            border-left-color: transparent;
+            border-right-color: #FFCB42;
+
+            &.right {
+              width: 0px;
+              height: 0px;
+              border: 6px solid transparent;
+              border-top-color: transparent;
+              border-bottom-color: transparent;
+              border-left-color: #FFCB42;
+              border-right-color: transparent;
+            }
+          }
+        }
       }
     }
 

project/sass/apps/Announce/AppAnnounce/components/Phone.vue

@@ -36,8 +36,8 @@
             <div class="msg-wrapper msg-link" v-if="item.msgType === '4'">
               <h2>{{ item.linkTitle }}</h2>
               <div class="msg-right">
-                <p v-if="item.linkDesc">{{ item.linkDesc }}</p>
-                <img v-if="item.linkPicUrl" :src="item.linkPicUrl" />
+                <p>{{ item.linkDesc }}</p>
+                <img :src="item.linkPicUrl || 'https://cdn.cunwuyun.cn/dvcp/announce/html.png'" />
               </div>
             </div>
             <div class="msg-wrapper msg-miniapp" v-if="item.msgType === '5'">