Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots into master

src/components/CalendarPoster.vue

@@ -23,11 +23,12 @@
             </div>
             <div class="mod2 flex-col">
               <div class="block1 flex-col">
-                <div
+                <!-- <div
                   class="section1 flex-col"
                   @click="()=>{this.shaerShow=true}"
                   :style="`background-image: url(${shaerBut});`"
-                ></div>
+                ></div> -->
+                <img class="section1 flex-col" :src="shaerBut" @click="()=>{this.shaerShow=true}" />
                 <span :style="`background-image: url(${pressImage});`" class="info2"></span>
               </div>
             </div>
@@ -42,12 +43,7 @@
               </div>
               <div class="wrap5 flex-col">
                 <span class="txt1" :style="`background-image: url(${pressLucky});`"></span>
-                <!-- <div
-                  class="main5-month flex-col"
-                  :style="`background-image: url(${shaerButRed});`"
-                  @click="()=>{this.shaerShow=true}"
-                ></div> -->
-              <img class="main5-month flex-col" :src="shaerButRed" @click="()=>{this.shaerShow=true}" />
+                <img class="main5-month flex-col" :src="shaerButRed" @click="()=>{this.shaerShow=true}" />
               </div>
             </div>
           </div>
@@ -225,14 +221,8 @@ export default {
       .block1 {
         height: 113px;
         .section1 {
-          height: 75.6px;
-          border-radius: 8px;
-          background-size: 100% auto;
-          background-color: #fff;
-          width: 162px;
-          justify-content: center;
-          align-items: center;
-          border: 0;
+          height: 48px;
+          width: 141px;
         }
         .info2 {
           width: 140.4px;
@@ -241,7 +231,6 @@ export default {
           color: #fff;
           text-align: center;
           align-self: center;
-          margin-top: 12px;
           background-size: 100% auto;
           background-repeat: no-repeat;
         }

src/components/Popup.vue

@@ -299,9 +299,8 @@ export default {
       background-size: 100% auto;
       margin: 10px auto 0;
       .btn {
-        padding-top: 0;
-        width: 40px;
-        height: 34px;
+        width: 36px;
+        height: 30.6px;
       }
     }
   }

src/components/ShaerPopup.vue

@@ -2,7 +2,7 @@
   <div v-if="showSelf" class="dialog" :style="{'z-index': zIndex}">
     <div class="dialog-mark" @click="closeMyself" :style="{'z-index': zIndex + 1}">
       <div v-show="myShareShow" class="sharetiptxt" style>
-        <img style=" height:100%; z-index:46" src="../assets/buttonImg/shareText.png" alt />
+        <img style=" height:90%; z-index:46" src="../assets/buttonImg/shareText.png" alt />
       </div>
       <fire-flies></fire-flies>