Merge branch 'dev4.4' of ssh://192.168.3.207:10022/qmx/jy into dev4.4

src/jfw/modules/app/src/app/front/bigMember.go

@@ -48,7 +48,7 @@ func (s *NewBigMemberAction) VipPageManager(htmlName string) error {
 			}
 		}
 		//如果没有首次使用
-		if !bigBaseMsg.Used {
+		if bigBaseMsg.Status > 0 && !bigBaseMsg.Used {
 			return s.Redirect("/jyapp/big/page/init") //跳转至首次初始化页面
 		}
 	}

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -220,7 +220,7 @@ var mine = {
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power
                     }
-                    if (res.viper) {
+                    if (res.data.viper) {
                         $('.ent-search').show().attr('data-href', '/jyapp/vipsubscribe/entSearch')
                     }
                     _this.setBigVipState()

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

@@ -1,19 +1,22 @@
 // let activityInfo; // 活动信息
 let ticketList // 奖券列表
-let baseUrl = getEVN('http://192.168.20.131:8080')
+let baseUrl = getEVN('https://web2-jytest.jydev.jianyu360.com')
 let ticket // 可领取的奖券
+let lis
 let activityId // 活动id
 let isWX = isWeChat()
 console.log(isWX);
 ticketImg = [
-  '/jyapp/squeeze/images/ticket5.png',
-  '/jyapp/squeeze/images/ticket15.png',
-  '/jyapp/squeeze/images/ticket38.png',
-  '/jyapp/squeeze/images/ticket100.png',
-  '/jyapp/squeeze/images/ticket250.png'
+  // '/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',
 ]
 
-activityId = GetRequest()
+activityId = GetRequest() || ''
 console.log(activityId);
 getTicket()
 
@@ -24,58 +27,70 @@ function getTicket() {
   }).then(data => {
     console.log(data)
     ticketList = data.data
-    let lis = ''
     ticket = []
+    lis = ''
     ticketList.forEach((item, index) => {
-      // console.log(item);
-      if (item.IsUser) {
-        lis += `<li>
-                    <img src="${ticketImg[index]}" alt="">
-                    <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">已结束</span>
-                    </div>
-                  </li>`
-      } else {
-        if (item.IsReceive) {
-          li = `<li>
-                <img src="${ticketImg[index]}" alt="">
-                <div class="ticket-btn">
-                <span data-id="${item.LotteryIdStr}">已结束</span>
-                </div>
-              </li>`
-          if (item.StockNumber > 0) {
+      if(data.activity.ActivityendDate){
+        const ONE_DAY_TIMP = 86400000
+        let endT = new Date().getTime() + ONE_DAY_TIMP
+        let nowT = new Date().getTime()
+        if(endT<nowT){
+          activity(item, index)
+        }else{
+          if (item.IsUser) {
             lis += `<li>
-                    <img src="${ticketImg[index]}" alt="">
-                    <div class="ticket-btn">
-                    <span data-id="${item.LotteryIdStr}">已结束</span>
-                    </div>
-                  </li>`
-            ticket.push(item.LotteryIdStr)
+                        <img src="${ticketImg[index]}" alt="">
+                        <div class="ticket-btn">
+                          <span  data-id="${item.LotteryIdStr}">已使用</span>
+                        </div>
+                      </li>`
           } else {
-            lis += `<li>
+            if (item.IsReceive) {
+              if (item.StockNumber > 0) {
+                lis += `<li>
+                          <img src="${ticketImg[index]}" alt="">
+                          <div class="ticket-btn">
+                          <button class="get" is-receive="true" data-id="${item.LotteryIdStr}">点击领取</button>
+                          </div>
+                        </li>`
+                ticket.push(item.LotteryIdStr)
+              } else {
+                lis += `<li>
+                        <img src="${ticketImg[index]}" alt="">
+                        <div class="ticket-btn">
+                        <span data-id="${item.LotteryIdStr}">抢光了</span>
+                        </div>
+                      </li>`
+              }
+            } else {
+              lis += `<li>
                     <img src="${ticketImg[index]}" alt="">
                     <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">已结束</span>
+                       <button data-id="${item.LotteryIdStr}" class="use">去使用</button>
                     </div>
                   </li>`
+            }
           }
-        } else {
-          lis += `<li>
-                <img src="${ticketImg[index]}" alt="">
-                <div class="ticket-btn">
-                <span data-id="${item.LotteryIdStr}">已结束</span>
-                </div>
-              </li>`
         }
-      }
+      } 
     })
     $('.ticket ul').html(lis)
     console.log(ticket);
-    if (ticket.length == 0) {
-      $('#getAll').attr('disabled', true).addClass('dis').text('活动已结束')
-    }
+    // if (ticket.length == 0) {
+    //   $('#getAll').attr('disabled', true).addClass('dis').text('活动已结束')
+    // }
   })
 }
+
+function activity(item, index){
+  lis += `<li>
+            <img src="${ticketImg[index]}" alt="">
+            <div class="ticket-btn">
+              <span class="end" data-id="${item.LotteryIdStr}">已结束</span>
+            </div>
+          </li>`
+}
+
 // 领取奖券
 function drawTicket(id) {
   request('/jyMarketing/lottery/lotteryReceive', 'POST', {
@@ -83,14 +98,14 @@ function drawTicket(id) {
   }).then(data => {
     // console.log(data);
     if (data.code === 1) {
-      $('#toast .toast-content').text('领取成功')
+      $('.ticket ul li button').text('去使用')
       // $('#toast').show()
       getTicket()
       setTimeout(() => {
         $('#toast').hide()
       }, 1500)
     } else {
-      $('#toast .toast-content').text('领取失败')
+      $('.ticket ul li button').text('领取失败')
       // $('#toast').show()
       setTimeout(() => {
         $('#toast').hide()
@@ -99,15 +114,14 @@ function drawTicket(id) {
   })
 }
 $('.ticket ul').on('click', 'li button', function () {
-  return
   // 领取
   if ($(this).attr('is-receive') === 'true') {
-    $('#toast .toast-content').text('领取中')
-    $('#toast').show()
+    // $('#toast .toast-content').text('领取中')
+    // $('#toast').show()
     let ids = []
     ids.push($(this).attr('data-id'))
     drawTicket(ids)
-  } else { // 使用
+  } else { // 使用  https://web2-jytest.jydev.jianyu360.com/weixin/frontPage/coupon/free/selectProduct?couponId=4d5f
     if (isWX) {
       location.href = '/weixin/frontPage/coupon/free/selectProduct?couponId=' + $(this).attr('data-id')
     } else {
@@ -124,7 +138,7 @@ $('#getAll').click(function () {
     drawTicket(ticket)
   }
 })
-$('#buy1').click(function () {
+$('.ticket ul li button.use').click(function () {
   if (isWX) {
     location.href = "/front/vipsubscribe/introducePage"
   } else {
@@ -132,14 +146,14 @@ $('#buy1').click(function () {
   }
 })
 
-$('#buy2').click(function () {
-  if (isWX) {
-    location.href = "/front/wx_dataExport/toSieve"
-  } else {
-    location.href = "/jyapp/front/dataExport/toSieve"
-  }
-})
+// $('#buy2').click(function () {
+//   if (isWX) {
+//     location.href = "/front/wx_dataExport/toSieve"
+//   } else {
+//     location.href = "/jyapp/front/dataExport/toSieve"
+//   }
+// })
 
-$('#buy3').click(function () {
-  location.href = "/page_docs_mobile/home"
-})
+// $('#buy3').click(function () {
+//   location.href = "/page_docs_mobile/home"
+// })

src/jfw/modules/app/src/web/templates/frontRouter/squeeze/sess/squeeze_mobile.html

@@ -24,7 +24,7 @@
             <img class="ac-bg" src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/images/bg.png' alt="">
             <div class="ac-content">
               <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/images/tit.png' alt="">
-              <p>活动时间：2021年4月20日-2021年5月7日</p>
+              <!-- <p>活动时间：2021年4月20日-2021年5月7日</p> -->
             </div>
             <img class="ac-discount" src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/images/hongbao.png' alt="">
           </div>
@@ -32,14 +32,14 @@
             <ul>
              
             </ul>
-            <button id="getAll">活动已结束</button>
+            <p id="getAll">【仅限超级订阅使用】2021年5月31日到期</p>
           </div>
-          <div class="product">
+          <!-- <div class="product">
             <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/images/product.png' alt="">
             <button id="buy1">购买</button>
             <button id="buy2">购买</button>
             <button id="buy3">购买</button>
-          </div>
+          </div> -->
           <div class="product">
             <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/images/rule.png' alt="">
           </div>
@@ -48,11 +48,11 @@
     </div>
   </div>
   
-  <div id="toast">
+  <!-- <div id="toast">
     <div class="toast-content">
       领取成功
     </div>
-  </div>
+  </div> -->
   {{include "/big-member/commonjs.html"}}
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/js/jquery-2.1.4.min.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/squeeze/js/tool.js?v={{Msg "seo" "version"}}'></script>

src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -157,7 +157,7 @@ func (this *BigVipBaseMsg) CheckBigVipFrontPower(reqFlag string) (pass bool) {
 }
 
 func (this *BigVipBaseMsg) CheckBigVipBackPower(reqFlag string) (pass bool) {
-	if this.Viper && reqFlag == "entPortrait" {
+	if this.Viper && (reqFlag == "entPortrait" || reqFlag == "entDetail") {
 		return true
 	}
 	return this.checkPower(reqFlag, BackService)

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -348,15 +348,20 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 
 //超级订阅获取购买项
 func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry []string, isUpgrade bool) *SubvipBuySet {
-	if area != nil && (*area)["全国"] != nil {
-		area = &map[string]interface{}{}
+	pCount := -1
+	citys := []int{}
+	if area != nil {
+		if (*area)["全国"] != nil {
+			area = &map[string]interface{}{}
+		} else if pCount_tmp := qutil.IntAll((*area)["areacount"]); pCount_tmp > 0 {
+			pCount = pCount_tmp
+		}
 	}
 	buyset := SubvipBuySet{}
 	if !isUpgrade {
 		buyset.Upgrade = 0 //升级版超级订阅标识
 		if len(*area) > 0 {
-			pCount := 0
-			citys := []int{}
+			pCount = 0
 			for _, v := range *area {
 				tmp := v.([]interface{})
 				if len(tmp) == 0 || len(tmp) > SubVipPrice.Old.CityMaxCount { //省份
@@ -370,12 +375,9 @@ func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry
 				pCount = -1
 				citys = []int{}
 			}
-			buyset.NewCitys = citys   //城市
-			buyset.AreaCount = pCount //地区
-		} else {
-			buyset.AreaCount = -1 //全国
-			buyset.NewCitys = []int{}
 		}
+		buyset.NewCitys = citys
+		buyset.AreaCount = pCount //地区
 		//行业数量自动转换全行业
 		buyset.BuyerclassCount = len(industry)
 		if len(industry) > SubVipPrice.Old.BuyerClassMaxCount || len(industry) == 0 {
@@ -389,15 +391,13 @@ func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry
 			if pCount > SubVipPrice.New.ProvinceMaxCount {
 				pCount = -1
 			}
-			buyset.NewCitys = []int{} //城市,4.4改版不支持购买城市
-			buyset.AreaCount = pCount //地区
 		} else {
 			buyset.AreaCount = -1 //全国
-			buyset.NewCitys = []int{}
 		}
+		buyset.AreaCount = pCount   //地区
+		buyset.NewCitys = citys     //城市,4.4改版不支持购买城市
 		buyset.BuyerclassCount = -1 //行业,4.4改版只能购买全行业
 	}
-
 	return &buyset
 }
 

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -115,9 +115,11 @@ func (this *SubscribeChange) SaveChange() {
 func (this *SubscribeChange) Upgrade() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	r := func() *entity.FuncResult {
+		area_count, _ := this.GetInteger("area_count") //地区
 		area := qutil.ObjToMap(this.GetString("area")) //地区
-		timeRenew := this.GetString("time")            //周期
-		req_price, _ := this.GetInteger("price")       //前端展示金额
+
+		timeRenew := this.GetString("time")      //周期
+		req_price, _ := this.GetInteger("price") //前端展示金额
 		openId := qutil.ObjToString(this.GetSession("s_m_openid"))
 		order_phone := this.GetString("order_phone") //p19.3用户信息采集 手机号
 
@@ -144,7 +146,11 @@ func (this *SubscribeChange) Upgrade() {
 			}
 			needRenew = true
 		}
-
+		area_select := true                     //是否回显城市选择
+		if len(*area) == 0 && area_count != 0 { //升级时为传入选择省份
+			(*area)["areacount"] = area_count
+			area_select = false
+		}
 		newBuyset := entity.JyVipSubStruct.NewBuySet(area, nil, true) //改版后只能购买升级版超级订阅
 
 		//升级校验
@@ -158,7 +164,6 @@ func (this *SubscribeChange) Upgrade() {
 		}
 
 		filter := entity.VipSimpleMsg{
-			Area:             area,
 			Industry:         nil, //行业保存默认选择
 			Cyclecount:       date_count,
 			Cycleunit:        date_unit,
@@ -168,6 +173,10 @@ func (this *SubscribeChange) Upgrade() {
 			OrderType:        3,
 			DisWord:          "",
 		}
+		if area_select {
+			filter.Area = area
+		}
+
 		var startTime, endTime time.Time
 		if needRenew {
 			startTime = now
@@ -485,7 +494,8 @@ func needUpgrade(newBuySet, oldBuySet *entity.SubvipBuySet) bool {
 			return false
 		}
 	} else {
-		return newBuySet.AreaCount > oldBuySet.AreaCount
+		return oldBuySet.AreaCount != -1 && newBuySet.AreaCount > oldBuySet.AreaCount
+		//return newBuySet.AreaCount == -1 || newBuySet.AreaCount > oldBuySet.AreaCount
 	}
 }
 

src/jfw/modules/subscribepay/src/subvip_price.json

@@ -22,7 +22,7 @@
     "cityMaxCount": 2,
     "provinceMaxCount": 9,
     "buyerClassMaxCount": 3,
-    "monthMaxCount": 9
+    "monthMaxCount": 10
   },
   "new": {
     "month": {

src/jfw/tag/tag.go

@@ -29,7 +29,7 @@ func seoConfigInit() {
 		applyV := util.ObjArrToStringArr(config.Seoconfig["applyVersion"].([]interface{}))
 		if len(applyV) > 0 {
 			for _, v := range applyV {
-				if len(strings.Split(v, ":")) > 0 {
+				if len(strings.Split(v, ":")) > 1 {
 					name := strings.Split(v, ":")[0]
 					version := strings.Split(v, ":")[1]
 					applyVersion[name] = version

src/web/staticres/frontRouter/pc/squeeze/sess/js/squeeze_pc.js

@@ -2,6 +2,7 @@
 let ticketList // 奖券列表
 let baseUrl = getEVN('http://192.168.20.131:8080')
 let ticket // 可领取的奖券
+let lis
 let activityId // 活动id
 ticketImg = [
   // '/frontRouter/pc/squeeze/sess/images/ticket5.png',
@@ -9,7 +10,8 @@ ticketImg = [
   // '/frontRouter/pc/squeeze/sess/images/ticket38.png',
   // '/frontRouter/pc/squeeze/sess/images/ticket100.png',
   // '/frontRouter/pc/squeeze/sess/images/ticket250.png'
-  '/frontRouter/pc/squeeze/sess/images/ticket380.png'
+  '/frontRouter/pc/squeeze/sess/images/ticket380.png',
+  '/frontRouter/pc/squeeze/sess/images/ticket1000.png'
 ]
 
 // 活动id
@@ -40,59 +42,59 @@ $(document).on('click', '#modal', function(e) {
 })
 
 // 获取奖券信息
-let lis = ''
 function getTicket() {
+  
   request('/jyMarketing/lottery/activityLottery', 'GET', {
     activityId
   }).then(data => {
     console.log(data)
     ticketList = data.data
-    
     ticket = []
+    lis = ""
     ticketList.forEach((item, index) => {
-      if (item.IsUser) {
-        lis += `<li>
-                    <img src="${ticketImg[index]}" alt="">
-                    <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">已使用</span>
-                    </div>
-                  </li>`
-      } else {
-        console.log(item.IsReceive,"IsReceive")
-        if (item.IsReceive) {
-          // li = `<li>
-        //       <img src="${ticketImg[index]}" alt="" />
-        //       <div class="ticket-btn">
-        //          <span data-id="${item.LotteryIdStr}">领取</span>
-        //       </div>
-        //     </li>`
-          if (item.StockNumber > 0) {
+      if(data.activity.ActivityendDate){
+        const ONE_DAY_TIMP = 86400000
+        let endT = new Date().getTime() + ONE_DAY_TIMP
+        let nowT = new Date().getTime()
+        if(endT<nowT){
+          activity(item, index)
+        }else{
+          if (item.IsUser) {
             lis += `<li>
-                    <img src="${ticketImg[index]}" alt="">
-                    <div class="ticket-btn">
-                        <button class="get" is-receive="true" data-id="${item.LotteryIdStr}">点击领取</button>
-                    </div>
-                  </li>`
-            ticket.push(item.LotteryIdStr)
+                        <img src="${ticketImg[index]}" alt="">
+                        <div class="ticket-btn">
+                          <span  data-id="${item.LotteryIdStr}">已使用</span>
+                        </div>
+                      </li>`
           } else {
-            lis += `<li>
+            if (item.IsReceive) {
+              if (item.StockNumber > 0) {
+                lis += `<li>
+                          <img src="${ticketImg[index]}" alt="">
+                          <div class="ticket-btn">
+                          <button class="get" is-receive="true" data-id="${item.LotteryIdStr}">点击领取</button>
+                          </div>
+                        </li>`
+                ticket.push(item.LotteryIdStr)
+              } else {
+                lis += `<li>
+                        <img src="${ticketImg[index]}" alt="">
+                        <div class="ticket-btn">
+                        <span data-id="${item.LotteryIdStr}">抢光了</span>
+                        </div>
+                      </li>`
+              }
+            } else {
+              lis += `<li>
                     <img src="${ticketImg[index]}" alt="">
                     <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">抢光了</span>
+                       <button data-id="${item.LotteryIdStr}" class="use">去使用</button>
                     </div>
                   </li>`
+            }
           }
-        } else {
-          lis += `<li>
-                <img src="${ticketImg[index]}" alt="">
-                <div class="ticket-btn">
-                   <button data-id="${item.LotteryIdStr}" class="use">去使用</button>
-                </div>
-              </li>`
         }
-      }
-      let times = data.activity
-      activity(times.ActivityBeginDate,times.ActivityendDate,item, index)
+      } 
     })
    
     console.log(lis)
@@ -104,38 +106,28 @@ function getTicket() {
   })
 }
 function activity(startTime,endTime,item, index){
-  const ONE_DAY_TIMP = 86400000
-  let startT = new Date(startTime).getTime()
-  let endT = new Date(endTime).getTime() + ONE_DAY_TIMP
-  let nowT = new Date().getTime()
-  if(endT<nowT){
-    lis = `<li>
+
+    lis += `<li>
               <img src="${ticketImg[index]}" alt="">
               <div class="ticket-btn">
                 <span class="end" data-id="${item.LotteryIdStr}">活动已结束</span>
               </div>
             </li>`
-  }
+
 }
 // 领取奖券
 function drawTicket(id) {
   request('/jyMarketing/lottery/lotteryReceive', 'POST', {
     lotteryIdArr: id.join(',')
   }).then(data => {
-    // console.log(data);
     if (data.code === 1) {
-      $('.ticket ul li button').text('领取成功')
-      // $('#toast').show()
+      $('.ticket ul li button').text('去使用')
       getTicket()
       setTimeout(() => {
         $('#toast').hide()
       }, 1500)
     } else {
       $('.ticket ul li button').text('领取失败')
-      // $('#toast').show()
-      setTimeout(() => {
-        $('#toast').hide()
-      }, 1500)
     }
   })
 }

src/web/staticres/frontRouter/wx/squeeze/css/squeezeMobile.css

@@ -51,33 +51,33 @@ html {
   z-index: 1;
   margin: 0 auto;
   width: 6.86rem;
-  height: 4.1rem;
+  height: 4.8rem;
   background: url('/frontRouter/wx/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;
@@ -99,8 +99,8 @@ html {
   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;
@@ -110,13 +110,14 @@ html {
   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/web/staticres/frontRouter/wx/squeeze/js/squeeze_mobile.js

@@ -1,16 +1,19 @@
 // let activityInfo; // 活动信息
 let ticketList // 奖券列表
-let baseUrl = getEVN('http://192.168.20.131:8080')
+let baseUrl = getEVN('https://web2-jytest.jydev.jianyu360.com')
 let ticket // 可领取的奖券
+let lis 
 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/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',
 ]
 
 activityId = GetRequest() || ''
@@ -18,64 +21,77 @@ console.log(activityId);
 getTicket()
 
 // 获取奖券信息
+
 function getTicket() {
   request('/jyMarketing/lottery/activityLottery', 'GET', {
     activityId
   }).then(data => {
     console.log(data)
     ticketList = data.data
-    let lis = ''
     ticket = []
+    lis = ""
     ticketList.forEach((item, index) => {
-      if (item.IsUser) {
-        lis += `<li>
-                    <img src="${ticketImg[index]}" alt="">
-                    <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">已结束</span>
-                    </div>
-                  </li>`
-      } else {
-        // console.log(item);
-        if (item.IsReceive) {
-          li = `<li>
-                <img src="${ticketImg[index]}" alt="">
-                <div class="ticket-btn">
-                <span data-id="${item.LotteryIdStr}">已结束</span>
-                </div>
-              </li>`
-          if (item.StockNumber > 0) {
+      if(data.activity.ActivityendDate){
+        const ONE_DAY_TIMP = 86400000
+        let endT = new Date().getTime() + ONE_DAY_TIMP
+        let nowT = new Date().getTime()
+        if(endT<nowT){
+          activity(item, index)
+        }else{
+          if (item.IsUser) {
             lis += `<li>
-                    <img src="${ticketImg[index]}" alt="">
-                    <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">已结束</span>
-                    </div>
-                  </li>`
-            ticket.push(item.LotteryIdStr)
+                        <img src="${ticketImg[index]}" alt="">
+                        <div class="ticket-btn">
+                          <span  data-id="${item.LotteryIdStr}">已使用</span>
+                        </div>
+                      </li>`
           } else {
-            lis += `<li>
+            if (item.IsReceive) {
+              if (item.StockNumber > 0) {
+                lis += `<li>
+                          <img src="${ticketImg[index]}" alt="">
+                          <div class="ticket-btn">
+                          <button class="get" is-receive="true" data-id="${item.LotteryIdStr}">点击领取</button>
+                          </div>
+                        </li>`
+                ticket.push(item.LotteryIdStr)
+              } else {
+                lis += `<li>
+                        <img src="${ticketImg[index]}" alt="">
+                        <div class="ticket-btn">
+                        <span data-id="${item.LotteryIdStr}">抢光了</span>
+                        </div>
+                      </li>`
+              }
+            } else {
+              lis += `<li>
                     <img src="${ticketImg[index]}" alt="">
                     <div class="ticket-btn">
-                      <span data-id="${item.LotteryIdStr}">已结束</span>
+                       <button data-id="${item.LotteryIdStr}" class="use">去使用</button>
                     </div>
                   </li>`
+            }
           }
-        } else {
-          lis += `<li>
-                <img src="${ticketImg[index]}" alt="">
-                <div class="ticket-btn">
-                  <span data-id="${item.LotteryIdStr}">已结束</span>
-                </div>
-              </li>`
         }
-      }
+      } 
     })
     $('.ticket ul').html(lis)
     console.log(ticket);
-    if (ticket.length == 0) {
-      $('#getAll').attr('disabled', true).addClass('dis').text('活动已结束')
-    }
+    // if (ticket.length == 0) {
+    //   $('#getAll').attr('disabled', true).addClass('dis').text('活动已结束')
+    // }
   })
 }
+
+function activity(item, index){
+  lis += `<li>
+            <img src="${ticketImg[index]}" alt="">
+            <div class="ticket-btn">
+              <span class="end" data-id="${item.LotteryIdStr}">已结束</span>
+            </div>
+          </li>`
+}
+
 // 领取奖券
 function drawTicket(id) {
   request('/jyMarketing/lottery/lotteryReceive', 'POST', {
@@ -83,14 +99,14 @@ function drawTicket(id) {
   }).then(data => {
     // console.log(data);
     if (data.code === 1) {
-      $('#toast .toast-content').text('领取成功')
+      $('.ticket ul li button').text('去使用')
       // $('#toast').show()
       getTicket()
       setTimeout(() => {
         $('#toast').hide()
       }, 1500)
     } else {
-      $('#toast .toast-content').text('领取失败')
+      $('.ticket ul li button').text('领取失败')
       // $('#toast').show()
       setTimeout(() => {
         $('#toast').hide()
@@ -99,11 +115,10 @@ function drawTicket(id) {
   })
 }
 $('.ticket ul').on('click', 'li button', function () {
-  return
   // 领取
   if ($(this).attr('is-receive') === 'true') {
-    $('#toast .toast-content').text('领取中')
-    $('#toast').show()
+    // $('#toast .toast-content').text('领取中')
+    // $('#toast').show()
     let ids = []
     ids.push($(this).attr('data-id'))
     drawTicket(ids)
@@ -124,7 +139,7 @@ $('#getAll').click(function () {
     drawTicket(ticket)
   }
 })
-$('#buy1').click(function () {
+$('.ticket ul li button.use').click(function () {
   if (isWX) {
     location.href = "/front/vipsubscribe/introducePage"
   } else {
@@ -132,14 +147,14 @@ $('#buy1').click(function () {
   }
 })
 
-$('#buy2').click(function () {
-  if (isWX) {
-    location.href = "/front/wx_dataExport/toSieve"
-  } else {
-    location.href = "/jyapp/front/dataExport/toSieve"
-  }
-})
+// $('#buy2').click(function () {
+//   if (isWX) {
+//     location.href = "/front/wx_dataExport/toSieve"
+//   } else {
+//     location.href = "/jyapp/front/dataExport/toSieve"
+//   }
+// })
 
-$('#buy3').click(function () {
-  location.href = "/page_docs_mobile/home"
-})
+// $('#buy3').click(function () {
+//   location.href = "/page_docs_mobile/home"
+// })

src/web/templates/frontRouter/pc/squeeze/sess/squeeze_pc.html

@@ -120,6 +120,12 @@
                     <button class="use">去使用</button>
                   </div>
                 </li>
+                <li>
+                  <img src="/frontRouter/pc/squeeze/sess/images/ticket1000.png" alt="">
+                  <div class="ticket-btn">
+                    <button class="use">去使用</button>
+                  </div>
+                </li>
               </ul>
               <p id="getAll">【仅限超级订阅使用】2021年5月31日到期</p>
             </div>

src/web/templates/frontRouter/wx/squeeze/sess/squeeze_mobile.html

@@ -69,15 +69,21 @@
             <div class="ticket-btn">
               <button class="get"><i>点击领取</i></button>
             </div>
-          </li>
+          </li>-->
           <li>
-            <img src="./images/app/ticket250.png" alt="">
+            <img src="/frontRouter/wx/squeeze/images/ticket380.png" alt="">
             <div class="ticket-btn">
-              <span>抢光了</span>
+              <button class="use" is-receive="true"><i>去使用</i></button>
             </div>
-          </li> -->
+          </li> 
+          <li>
+            <img src="/frontRouter/wx/squeeze/images/ticket1000.png" alt="">
+            <div class="ticket-btn">
+              <button class="use" is-receive="true"><i>去使用</i></button>
+            </div>
+          </li> 
         </ul>
-        <!-- <button id="getAll">活动已结束</button> -->
+        <p id="getAll">【仅限超级订阅使用】2021年5月31日到期</p>
       </div>
       <!-- <div class="product">
         <img src="/frontRouter/wx/squeeze/images/product.png" alt="">
@@ -90,11 +96,11 @@
       </div>
     </main>
   </div>
-  <div id="toast">
+  <!-- <div id="toast">
     <div class="toast-content">
       领取成功
     </div>
-  </div>
+  </div> -->
   <script src="/frontRouter/wx/squeeze/js/jquery-2.1.4.min.js"></script>
   <script src='{{Msg "seo" "cdn"}}/frontRouter/wx/squeeze/js/tool.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/frontRouter/wx/squeeze/js/squeeze_mobile.js?v={{Msg "seo" "version"}}'></script>