Merge remote-tracking branch 'origin/dev4.4' into dev4.4

src/jfw/modules/app/src/web/staticres/jyapp/squeeze/css/squeezeMobile.css

@@ -48,33 +48,33 @@
   z-index: 1;
   margin: 0 auto;
   width: 6.86rem;
-  height: 7.58rem;
-  background: url('/jyapp/squeeze/images/ticketBg.png') no-repeat;
-  background-size: cover;
+  height: 4.8rem;
+  background: url(/jyapp/squeeze/images/ticketBg.png) no-repeat;
+  background-size: 100%;
   text-align: center;
   overflow: hidden;
 }
 .squeeze-mobile main .ticket ul {
-  height: 5.04rem;
-  margin-top: 1.26rem;
+  height: 3.14rem;
+  margin-top: 1rem;
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
 }
 .squeeze-mobile main .ticket ul li {
   position: relative;
-  margin: 0 0.12rem;
-  margin-bottom: 0.27rem;
-  width: 3.03rem;
+  margin: 0;
+  margin-bottom: 0.20rem;
+  width: 100%;
   height: 1.41rem;
 }
 .squeeze-mobile main .ticket ul li img {
-  width: 100%;
+  width: 4.5rem;
 }
 .squeeze-mobile main .ticket ul li .ticket-btn {
   position: absolute;
   bottom: 0.21rem;
-  right: 0.32rem;
+  right: 1.85rem;
   width: 1.07rem;
   height: 0.41rem;
   text-align: center;
@@ -96,8 +96,8 @@
   transform: scale(0.5) translate(-50%, -50%);
 }
 .squeeze-mobile main .ticket ul li .ticket-btn button.use {
-  color: #fff;
-  background-color: #da1f0f;
+  color: #da1f0f;
+  background-color: #fff;
 }
 .squeeze-mobile main .ticket ul li .ticket-btn button.get {
   color: #da1f0f;
@@ -107,13 +107,14 @@
   font-size: 0.29rem;
   color: rgba(255, 255, 255, 0.5);
 }
+.squeeze-mobile main .ticket ul li .ticket-btn span.end{
+  font-size: 0.2rem;
+}
 .squeeze-mobile main .ticket #getAll {
-  width: 2.94rem;
+  width: 100%;
   height: 0.67rem;
-  background-color: #fff;
-  color: #da1f0f;
+  color: #fff;
   font-size: 0.28rem;
-  border: 1px solid #fff;
   border-radius: 0.33rem;
 }
 .squeeze-mobile main .ticket #getAll.dis {

src/jfw/modules/app/src/web/staticres/jyapp/squeeze/js/squeeze_mobile.js

@@ -7,13 +7,8 @@ let activityId // 活动id
 let isWX = isWeChat()
 console.log(isWX);
 ticketImg = [
-  // '/frontRouter/wx/squeeze/images/ticket5.png',
-  // '/frontRouter/wx/squeeze/images/ticket15.png',
-  // '/frontRouter/wx/squeeze/images/ticket38.png',
-  // '/frontRouter/wx/squeeze/images/ticket100.png',
-  // '/frontRouter/wx/squeeze/images/ticket250.png'
-  '/frontRouter/wx/squeeze/images/ticket380.png',
-  '/frontRouter/wx/squeeze/images/ticket1000.png',
+  '/jyapp/squeeze/images/ticket380.png',
+  '/jyapp/squeeze/images/ticket1000.png'
 ]
 
 activityId = GetRequest() || ''
@@ -39,11 +34,11 @@ function getTicket() {
         }else{
           if (item.IsUser) {
             lis += `<li>
-                        <img src="${ticketImg[index]}" alt="">
-                        <div class="ticket-btn">
-                          <span  data-id="${item.LotteryIdStr}">已使用</span>
-                        </div>
-                      </li>`
+                      <img src="${ticketImg[index]}" alt="">
+                      <div class="ticket-btn">
+                        <span  data-id="${item.LotteryIdStr}">已使用</span>
+                      </div>
+                    </li>`
           } else {
             if (item.IsReceive) {
               if (item.StockNumber > 0) {

src/web/staticres/digital_expo/css/index.css

@@ -336,7 +336,7 @@ p.text--y {
     letter-spacing:0.04em;
     color:#FFFFFF;
     padding:0 0.16rem;
-    border:0.08rem solid transparent;
+    border: 0.08rem solid #005ACD;
     box-sizing:border-box;
     border-image-outset:0;
     border-image-slice:10 12;
@@ -351,7 +351,7 @@ p.text--y {
 }
 .articles-box {
     padding:0.24rem 0;
-    border-bottom:0.0.1rem solid rgba(255,255,255,0.16);
+    border-bottom: 0.5px solid rgba(255,255,255,0.16);
 }
 .articles-info {
     font-weight:500;

src/web/templates/active/digital/index.html

@@ -35,7 +35,7 @@
             background-size: cover;
         }
         .border-change-box {
-            border: 4px solid transparent;
+            border: 4px solid #005ACD;
             border-image: url('{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/border_c.png?v={{Msg "seo" "digital_v"}}') ;
             box-sizing: border-box;
             border-image-outset: 0;