Merge branch 'fanchang' into dev

src/components/blessingGetPrize/index.js

@@ -135,8 +135,9 @@ class BlessingGetPrize extends Component {
         {
           (!prize_data || prize_data.length === 0) && (
             <div className="active_over_container">
-              <img src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/acitve__over.png' alt=''/>
-              <p>七月在线双十一抽奖活动已结束， 感谢你的参与！</p>
+              <p>AI充电节返场已开启</p>
+              <p>狂欢不能停~</p>
+              <a href='/blessingPreheat' className='to_active'>立即查看</a>
             </div>
           )
         }

src/components/blessingGetPrize/index.scss

@@ -199,22 +199,30 @@
   .active_over_container {
     display: flex;
     flex-direction: column;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
-    margin-top: 70px;
-    img {
-      width: 170px;
-      height: 134px;
-    }
+    width: 340px;
+    height: 156px;
+    margin: 4px auto;
+    background: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/active_over.png') center center no-repeat;
+    background-size: 100% 100%;
     p {
-      width:238px;
-      height:39px;
-      font-size:16px;
-      font-weight:400;
+      font-size:18px;
+      font-weight:500;
+      color:rgba(76,33,239,1);
+      line-height:27px;
+    }
+    .to_active {
+      width:298px;
+      height:44px;
+      background:linear-gradient(90deg,rgba(255,105,5,1) 0%,rgba(255,180,5,1) 100%);
+      border-radius:5px;
+      font-size:18px;
+      font-weight:500;
       color:rgba(255,255,255,1);
-      line-height:24px;
-      text-align: center;
-      text-align-last: center;
+      display: flex;
+      justify-content: center;
+      align-items: center;
       margin-top: 20px;
     }
   }

src/components/blessingPreheat/index.js

@@ -768,7 +768,7 @@ class BlessingPreheat extends Component {
                 />
                 <input type="tel"
                        placeholder={'联系方式'}
-                       name={'tel'}
+                       name={'phone'}
                        onChange={e => {
                          this.setAddressState(e)
                        }}