Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

css/shopping.css

@@ -172,18 +172,6 @@
         float: left;
         margin:0 0.7rem 0.7rem 0;
     }
-    #wodejiangquanBox .duiItem .cpnum{
-        position: absolute;
-        top: -1rem;
-        right: -0.5rem;
-        background: #FF5656;
-        width: 2rem;
-        height: 2rem;
-        border-radius: 50%;
-        color: #fff;
-        line-height: 2rem;
-        text-align: center;
-    }
     #wodejiangquanBox .duiItem .imgDiv{
         width: 100%;
         height: 70%;
@@ -205,7 +193,8 @@
         margin-top: 2%;
     }
     #wodejiangquanBox .duiItem .imgDiv img{
-        height:100%;
+        height:90%;
+        width:80%;
     }
     .shangcheng_back{
         position: fixed;

html/task/home.html

@@ -240,12 +240,51 @@
         <img onclick="CloseqiandaoBox('wodejiangquanBox')" class="duihuan" src="../../images//task//ass/close4.png" alt="">
         <div class="juanbox">
             <div class="duiItem">
-              <div class="cpnum">x2</div>
               <div class="imgDiv">
-                <img src="../../images/task/ass/bql_02.png" alt="">
+                <img src="../../images/task/ice/img1.png" alt="">
               </div>
               <div class="spanDiv">
-                <span>空气进化器</span>
+                <span>签证</span>
+              </div>
+        </div>
+        <div class="duiItem">
+            <div class="imgDiv">
+              <img src="../../images/task/ice/img2.png" alt="">
+            </div>
+            <div class="spanDiv">
+              <span>特价机票</span>
+            </div>
+        </div>
+        <div class="duiItem">
+            <div class="imgDiv">
+              <img src="../../images/task/ice/img3.png" alt="">
+            </div>
+            <div class="spanDiv">
+              <span>跟团游</span>
+            </div>
+          </div>
+          <div class="duiItem">
+              <div class="imgDiv">
+                <img src="../../images/task/ice/img4.png" alt="">
+              </div>
+              <div class="spanDiv">
+                <span>当地游</span>
+              </div>
+          </div>
+          <div class="duiItem">
+              <div class="imgDiv">
+                <img src="../../images/task/ice/img5.png" alt="">
+              </div>
+              <div class="spanDiv">
+                <span>自由行</span>
+              </div>
+            </div>
+            <div class="duiItem">
+                <div class="imgDiv">
+                  <img src="../../images/task/ice/img6.png" alt="">
+                </div>
+                <div class="spanDiv">
+                  <span>抽奖券</span>
                 </div>
             </div>
         </div>