对入驻按钮作重新设置跳转

components/default/christmas.vue

@@ -2,7 +2,7 @@
   <div class="christmas" v-if="hasOpen">
     <div class="christmas-modal">
       <div class="christmas-info">
-        <a href="https://account.ubtob.com/sso/register_mall?appId=mall&returnURL=https%3A%2F%2Fwww.usoftmall.com%2F%3FreturnURL%3Dhttps%253A%252F%252Fwww.usoftmall.com%252F" target="_blank"></a>
+        <a href="https://www.usoftmall.com/activity/business" target="_blank"></a>
         <a href="javascript:void(0)" @click="close">×</a>
         <div class="christmas-img">
           <img src="/images/christmas/christmas1.png">

layouts/main.vue

@@ -45,17 +45,16 @@
       const activeEndDate = new Date('2017/12/25 00:00:00')
       if (nowDate > activeStartDate && nowDate < activeEndDate) {
         const endTime = window.localStorage.getItem('endTime')
-        if (!user) {
-          setInterval(function () {
-            count++
-            if (count >= 30) {
-              count = 1
-              self.isOpen = true
-            }
-          }, 1000)
-        }
         if (endTime) {
-          if (nowDate.getTime() - endTime >= 1000 * 60 * 2) {
+          if (!user) {
+            setInterval(function () {
+              count++
+              if (count >= 30) {
+                count = 1
+                self.isOpen = true
+              }
+            }, 1000)
+          } else if (nowDate.getTime() - endTime >= 1000 * 60 * 2) {
             this.isOpen = true
             window.localStorage.setItem('endTime', nowDate.getTime())
           } else {

pages/activity/business.vue

@@ -13,7 +13,8 @@
           我们严格把关供应商资质，从源头上杜绝虚假信息，做到付款交期如实，借助物流仓储的一站式服务帮您实现交易高效、库存无忧。<br/>
         </div>
         <div class="join">
-          <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+          <a href="https://account.ubtob.com/sso/register_mall?appId=mall&returnURL=https%3A%2F%2Fwww.usoftmall.com%2F%3FreturnURL%3Dhttps%253A%252F%252Fwww.usoftmall.com%252F
+" target="_blank">立即入驻</a>
         </div>
       </div>
     </div>
@@ -49,7 +50,8 @@
           </ul>
         </div>
         <div class="join">
-          <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+          <a href="https://account.ubtob.com/sso/register_mall?appId=mall&returnURL=https%3A%2F%2Fwww.usoftmall.com%2F%3FreturnURL%3Dhttps%253A%252F%252Fwww.usoftmall.com%252F
+" target="_blank">立即入驻</a>
         </div>
       </div>
     </div>
@@ -93,7 +95,8 @@
           </ul>
         </div>
         <div class="join">
-          <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+          <a href="https://account.ubtob.com/sso/register_mall?appId=mall&returnURL=https%3A%2F%2Fwww.usoftmall.com%2F%3FreturnURL%3Dhttps%253A%252F%252Fwww.usoftmall.com%252F
+" target="_blank">立即入驻</a>
         </div>
       </div>
     </div>
@@ -115,7 +118,8 @@
           </div>
         </div>
         <div class="join">
-          <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+          <a href="https://account.ubtob.com/sso/register_mall?appId=mall&returnURL=https%3A%2F%2Fwww.usoftmall.com%2F%3FreturnURL%3Dhttps%253A%252F%252Fwww.usoftmall.com%252F
+" target="_blank">立即入驻</a>
         </div>
       </div>
     </div>