heyang лет назад: 3
Родитель
Сommit
8ce090cf7f

+ 94 - 10
microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -290,13 +290,15 @@ ul, li {
   border-radius: 0.1rem;
   margin: auto;
   margin-top: 0.26rem;
-  background-image: url('../img/anniversaryCelebrate/right-selected.png');
-  background-repeat: repeat-y;
-  background-size: cover;
+  position: relative;
+  z-index: 999;
 }
 
-.record-main-active-wrap{
-  background-image: url('../img/anniversaryCelebrate/left-selected.png');
+.selected-bg{
+  width: 7.09rem;
+  height: 7.83rem;
+  position: absolute;
+  top: 0;
 }
 
 .change-wrap{
@@ -319,20 +321,20 @@ ul, li {
   display: flex;
   justify-content: center;
   align-items: center;
+  padding-top: 0.06rem;
   margin: 0.11rem 0 0 0.26rem;
   position: relative;
 }
 
 .get-award-right-wrap{
   justify-content: flex-end;
-  padding-left: 0.08rem;
 }
 
 .award-img{
   width: 3.11rem;
   height: 0.62rem;
   position: absolute;
-  top: 0;
+  top: 0.06rem;
 }
 
 .right-bg{
@@ -359,6 +361,7 @@ ul, li {
 .light-title-wrap{
   display: flex;
   justify-content: space-between;
+  padding: 0 0.13rem;
   margin: 0 0.25rem;
   margin-top: 0.36rem;
   border-bottom: 0.01rem solid rgba(213, 227, 253, 0.1);
@@ -392,22 +395,51 @@ ul, li {
 
 .light-content-container{
   padding-top: 0.3rem;
+  position: relative;
+  z-index: 999;
 }
 
 .light-content-list{
   border-bottom: 0.01rem solid rgba(213, 227, 253, 0.5);
   margin: 0 0.23rem;
-  height: 4.88rem;
+  height: 5.58rem;
   overflow-y: scroll;
   padding-bottom: 0.3rem;
 }
 
+.page-number{
+  display: flex;
+  align-items: center;
+  font-size: 0.24rem;
+  color: #808080;
+}
+
+.page-number-text{
+  margin: 0 0.2rem;
+}
+
 .light-content-wrap{
   display: flex;
   justify-content: space-between;
   margin: 0.26rem 0;
 }
 
+.page-row-wrap{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.6rem;
+}
+
+.page-row-record-wrap{
+  margin-top: 0.1rem;
+}
+
+.left-head,.right-head{
+  width: 0.12rem;
+  height: 0.15rem;
+}
+
 .light-content-text{
   margin-top: 0.27rem;
   text-align: center;
@@ -421,6 +453,14 @@ ul, li {
   color: #B3B3B3;
 }
 
+.rule-title{
+  margin: 0.06rem 0 0.16rem 0;
+  text-align: center;
+  font-size: 0.36rem;
+  font-weight: bold;
+  color: #333333;
+}
+
 .get-btn{
   width: 1.2rem;
   height: 0.4rem;
@@ -467,7 +507,7 @@ ul, li {
   border-bottom: 0.01rem solid rgba(91, 180, 255, 1);
 }
 
-.law-mask,.rule-mask,.award-result-mask,.no-start-mask {
+.law-mask,.rule-mask,.award-result-mask,.no-start-mask,.distribution-time-mask {
   width: 100%;
   height: 100vh;
   position: fixed;
@@ -526,6 +566,17 @@ ul, li {
   transform: translateX(-50%);
 }
 
+.distribution-time-dialog{
+  width: 5.48rem;
+  height: 6.56rem;
+  background: #FFFFFF;
+  border-radius: 0.2rem;
+  position: absolute;
+  left: 50%;
+  top: 6.86rem;
+  transform: translateX(-50%);
+}
+
 .award-success{
   width: 5.8rem;
   height: 3.44rem;
@@ -662,7 +713,7 @@ ul, li {
   width: 5.52rem;
 }
 
-.rule-close,.law-close,.award-result-close{
+.rule-close,.law-close,.award-result-close,.distribution-close{
   width: 0.68rem;
   height: 0.68rem;
   position: absolute;
@@ -717,6 +768,39 @@ ul, li {
   color: #666666;
 }
 
+.distribution-time-title{
+  margin: 0.4rem 0;
+  text-align: center;
+  font-size: 0.3rem;
+  color: #333333;
+}
+
+.distribution-time-wrap{
+  display: flex;
+  justify-content: space-between;
+  margin: 0 0.34rem;
+  padding-bottom: 0.2rem;
+  border-bottom: 0.01rem solid #E6E6E6;
+}
+
+.distribution-time-name{
+  font-size: 0.26rem;
+  color: #333333;
+}
+
+.distribution-content-wrap{
+  display: flex;
+  justify-content: space-between;
+  margin: 0 0.34rem;
+  margin-top: 0.08rem;
+  font-size: 0.26rem;
+  color: #333333;
+}
+
+.distribution-time-text{
+  color: #B3B3B3;
+}
+
 #toast-container>.toast-error {
   background-image: none !important;
 }

+ 686 - 0
microserviceUserH5/static/css/doubleChristmasActivity.css

@@ -0,0 +1,686 @@
+@media screen and (max-width: 750px) {
+  html {
+    font-size: calc(100vw / 7.5);
+  }
+}
+
+@media screen and (min-width: 750px) {
+  html {
+    font-size: calc(450px / 7.5);
+  }
+}
+
+html, body, div, ul, li, p {
+  padding: 0;
+  margin: 0;
+}
+
+ul, li {
+  list-style: none;
+}
+.footer-cloud{
+  width: 7.5rem;
+  height: 1.4rem;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 99;
+}
+.header-container{
+  width: 7.5rem;
+  height: 6.54rem;
+  margin: 0 auto;
+  position: relative; 
+  overflow: hidden;
+}
+.top-banner{
+  width: 101%;
+  height: 6.54rem;
+}
+.activity-meal{
+  position: absolute;
+  top: 1.46rem;
+  left: 2.23rem;
+  font-size: 0.28rem;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+.meal-price{
+  position: absolute;
+  bottom: 1.86rem;
+  left: 2.32rem;
+  font-size: 0.32rem;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+.rest-time{
+  height: 0.5rem;
+  line-height: 0.5rem;
+  text-align: center;
+  position: absolute;
+  bottom: 1.12rem;
+  left: 50%;
+  transform: translateX(-50%);
+  background: #000000;
+  border-radius: 0.29rem;
+  opacity: 0.49;
+  font-size: 0.22rem;
+  color: #FFFFFF;
+  padding: 0 0.06rem;
+}
+.limit{
+  position: absolute;
+  bottom: 0.72rem;
+  left: 2.4rem;
+  font-size: 0.24rem;
+  font-weight: 600;
+        color: #FFFFFF;
+  opacity: 0.9;
+}
+.middle-container{
+  width: 7.5rem;
+  margin: 0 auto;
+  position: relative;
+  background: url(../../static/img/doubleChristmasActivity/bg.png) no-repeat;
+  background-size: 100% auto,100% auto;
+  margin-top: -0.72rem;
+  padding-bottom: 0.5rem;
+}
+.tips{
+  width: 7.46rem;
+  height: 4.43rem;
+  position: absolute;
+  top: 1.82rem;
+  left: 0;
+  z-index: 9;
+}
+.step-container{
+  width: 6.9rem;
+  height: 4.43rem;
+  position: relative;
+  padding-top: 2.68rem;
+}
+.main-step-content{
+  width: 6.9rem;
+  position: relative;
+  z-index: 9;
+  border-radius: 0.1rem;
+  margin-left: 0.3rem;
+}
+.top-step{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 0.4rem;
+}
+.hongbao{
+  width: 1.44rem;
+  height: 1.5rem;
+  margin-top: 0.4rem;
+}
+.step{
+  width: 0.52rem;
+  height: 0.24rem;
+  margin-top: 0.76rem;
+}
+.buyphone{
+  width: 1.44rem;
+  height: 1.5rem;
+  margin-top: 0.4rem;
+}
+.rest-tip{
+  margin-top: -0.38rem;
+  text-align: center;
+  font-size: 0.28rem;
+  color: #FFFFFF;
+  opacity: 0.8;
+}
+.tab-row{
+  width: 6.66rem;
+  height: 1rem;
+  background: linear-gradient(180deg, #EFEADD 0%, #EFDDB3 100%);
+  border-radius: 0.2rem;
+  display: flex;
+  align-items: center;
+  margin: 0 auto;
+  margin-top: 0.42rem;
+  padding: 0 0.12rem;
+  position: relative;
+}
+.tab-item{
+  width: 3.45rem;
+  text-align: center;
+  font-size: 0.32rem;
+  font-weight: 600;
+  color: #B8865A;
+  position: relative;
+  z-index: 99;
+}
+.middle-cloud{
+  width: 2.64rem;
+  height: 1.4rem;
+  position: absolute;
+  bottom: -0.42rem;
+}
+.tab-active{
+  line-height: 0.76rem;
+  text-align: center;
+  color: rgba(255,255,255,0.9);
+}
+.tab-bg{
+  width: 3.2rem;
+  height: 0.76rem;
+  position: absolute;
+  top: 0.12rem;
+}
+.tab-left{
+  left: 0.12rem;
+}
+.tab-right{
+  right: 0.12rem;
+}
+.step-item{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.step-text{
+  font-size: 0.24rem;
+}
+.join-activity-btn{
+  width: 6.6rem;
+  height: 1.8rem;
+  line-height: 1.4rem;
+  position: absolute;
+  bottom: 0.2rem;
+  left: 0.35rem;
+  z-index: 99;
+}
+.join-activity{
+  width: 100%;
+  height: 100%;
+}
+.activity-btn-content{
+  font-size: 0.44rem;
+  position: absolute;
+  left: 2.1rem;
+  top: 0;
+}
+.activity-btn-text{
+  font-size: 0.44rem;
+  font-weight: 600;
+  color: #BB3804;
+}
+.icon-left{
+  width: 0.2rem;
+  height: 0.32rem;
+}
+.invite-text{
+  margin-top: 0.6rem;
+  font-size: 0.28rem;
+  text-align: center;
+  color: #ffffff;
+  display: none;
+}
+.reward-container{
+  width: 6.5rem;
+  max-height: 12.56rem;
+  overflow-y: scroll;
+  background: #F9F8FB;
+  box-shadow: 0 0.12rem 0.28rem 0 rgba(253, 89, 136, 0.46);
+  border-radius: 0.2rem;
+  margin: 0 auto;
+  margin-top: 0.2rem;
+  padding: 0.2rem;
+  position: relative;
+}
+.activity-finish{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 101;
+  background: rgba(0, 0, 0, 0.6);
+  border-radius: 0.2rem;
+  display: none;
+}
+.finish-text{
+  width: 1.76rem;
+  height: 1.76rem;
+  line-height: 1.76rem;
+  text-align: center;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  z-index: 999;
+  transform: translate(-50%,-50%);
+  border-radius: 50%;
+  font-size: 0.24rem;
+  color: #333333;
+  background-color: #FFFFFF;
+}
+.no-time-data{
+  height: 2.2rem;
+  line-height: 2.2rem;
+  text-align: center;
+  font-size: 0.32rem;
+  color: #999999;
+}
+.reward-time{
+  width: 6.5rem;
+  height: 0.72rem;
+  line-height: 0.72rem;
+  text-align: center;
+  background: #FE5140;
+  border-radius: 0.36rem;
+  font-size: 0.24rem;
+  color: rgba(255,255,255,0.9);
+}
+.time-num{
+  background: #F9F8FB;
+  border-radius: 0.08rem;
+  padding: 0.03rem;
+  color: #333333;
+}
+.time-line{
+  font-size: 0.32rem;
+  color: #CF1300;
+}
+.reward-tip-row{
+  position: relative;
+  padding-left: 0.2rem;
+  border-bottom: 0.01rem solid #ED4C55;
+}
+.reward-tip-img{
+  width: 6.1rem;
+  height: 0.5rem;
+  position: absolute;
+  top: 0.1rem;
+}
+.reward-tip{
+  font-size: 0.24rem;
+  font-weight: 600;
+  color: #333333;
+  padding: 0.2rem;
+  margin-left: 0.1rem;
+}
+.reward-list{
+  position: relative;
+}
+.left-ear{
+  width: 0.16rem;
+  height: 0.24rem;
+  position: absolute;
+  top: 40%;
+  left: -0.1rem;
+  transform: translate(-50%,-50%);
+  animation: mymove 1s infinite;
+  display: none;
+}
+.right-ear{
+  width: 0.16rem;
+  height: 0.24rem;
+  position: absolute;
+  top: 40%;
+  right: -0.2rem;
+  transform: translate(-50%,-50%);
+  animation: mymove2 1s infinite;
+  display: none;
+}
+@keyframes mymove {
+  0%   {transform: translateX(-3px);}
+  50% {transform: translateX(-4px);}
+  100% {transform: translateX(-3px);}
+}
+@keyframes mymove2 {
+  0%   {transform: translateX(0);}
+  50% {transform: translateX(-2px);}
+  100% {transform: translateX(0);}
+}
+.distribution-total-num,.no-distribution-num,.total-time-num,.next-time-num{
+  background-color: #FFFFFF;
+  color: #333333;
+  border-radius: 0.08rem;
+  padding: 0.04rem;
+}
+.time-row{
+  display: flex;
+  align-items: center;
+}
+.time-icon{
+  width: 0.26rem;
+  height: 0.26rem;
+  margin-top: 0.05rem;
+  margin-right: 0.1rem;
+}
+.time-overdue{
+  color: #FF9F3A;
+}
+.compute-block{
+  display: flex;
+  align-items: center;
+}
+.ipt{
+  width: 0.74rem;
+  height: 0.38rem;
+  margin: 0 0.1rem;
+  background: linear-gradient(180deg, #E8E6E6 0%, #FFFFFF 100%);
+  border-radius: 0.04rem;
+  text-align: center;
+  border: none;
+}
+.compute-icon{
+  width: 0.4rem;
+  height: 0.4rem;
+}
+input:focus{ 
+  outline:none; 
+}
+.icon_xingyao{
+  width: 0.68rem;
+  height: 0.68rem;
+  margin-left: 0.18rem;
+}
+.distribution-reward-btn{
+  width: 6.5rem;
+  height: 1.04rem;
+  margin-top: -0.1rem;
+}
+.page-row{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 0.1rem 0;
+}
+.schedule-line{
+  width: 0.72rem;
+  height: 0.12rem;
+  margin-top: 0.04rem;
+  background-color: rgba(251, 94, 104, 0.3);
+  border-radius: 0.08rem;
+  position: relative;
+}
+.schedule-child-line{
+  width: 0.2rem;
+  height: 0.12rem;
+  background-color: #FB5E68;
+  border-radius: 0.08rem;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 99;
+}
+.page{
+  font-size: 0.2rem;
+  color: #333333;
+  margin-left: 0.16rem;
+}
+.reward-btn-img{
+  width: 6.5rem;
+  height: 0.92rem;
+}
+.reward-row{
+  width: 6.5rem;
+  height: 1.22rem;
+  margin-top: 0.2rem;
+  position: relative;
+}
+.reward-row-bg{
+  width: 6.5rem;
+  height: 1.22rem;
+  position: absolute;
+  top: 0;
+}
+.reward-row-content{
+  width: 6.18rem;
+  height: 1.22rem;
+  display: flex;
+  align-items: center;
+  padding: 0 0.22rem 0 0.1rem;
+  position: absolute;
+  top: 0;
+  z-index: 99;
+}
+.reward-img{
+  width: 1.06rem;
+  height: 1.02rem;
+}
+.reward-day-text{
+  margin-left: 0.16rem;
+  color: #FFFFFF;
+  flex: 1;
+}
+.reward-day{
+  font-size: 0.28rem;
+  font-weight: 600;
+}
+.total-day{
+  margin-top: 0.08rem;
+  font-size: 0.24rem;
+  opacity: 0.9;
+}
+.reward-btn{
+  width: 1.34rem;
+  height: 0.78rem;
+}
+.reward-last-tip{
+  text-align: center;
+  margin-top: 0.2rem;
+  font-size: 0.24rem;
+  color: #3B7FFF;
+}
+.distribution-container{
+  width: 6.5rem;
+  max-height: 12.36rem;
+  overflow-y: scroll;
+  background: #F9F8FB;
+  box-shadow: 0 0.12rem 0.28rem 0 rgba(253, 89, 136, 0.46);
+  border-radius: 0.2rem;
+  margin: 0 auto;
+  margin-top: 0.2rem;
+  padding: 0.2rem;
+  display: none;
+}
+.distribution-time{
+  width: 5.48rem;
+  height: 0.72rem;
+  background: #FE5140;
+  border-radius: 0.36rem;
+  font-size: 0.24rem;
+  color: rgba(255,255,255,0.9);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 0.54rem;
+}
+.distribution-line{
+  font-size: 0.32rem;
+  color: #CF1300;
+}
+.distribution-num{
+  background: #F9F8FB;
+  border-radius: 0.08rem;
+  padding: 0.03rem;
+  color: #333333;
+}
+.time-title-row{
+  display: flex;
+  justify-content: center;
+  position: relative;
+  margin-top: 0.2rem;
+}
+.time-title-bg{
+  width: 6.08rem;
+  height: 0.4rem;
+  position: absolute;
+  top: 0.1rem;
+  left: 0.2rem;
+}
+.time-title{
+  font-size: 0.28rem;
+  font-weight: 600;
+  color: #333333;
+}
+.title-row{
+  display: flex;
+  justify-content: space-between;
+  margin-top: 0.3rem;
+  padding: 0 0.36rem;
+  font-size: 0.24rem;
+  font-weight: 600;
+  color: #333333;
+  padding-bottom: 0.1rem;
+  border-bottom: 0.04rem solid #ED4C55;
+}
+.time-container{
+  width: 6.5rem;
+  max-height: 5.2rem;
+  overflow-y: scroll;
+}
+.time-content-row{
+  display: flex;
+  padding: 0.2rem 0.36rem 0.2rem 0.26rem;
+  font-size: 0.24rem;
+  font-weight: 600;
+  color: #333333;
+  border-bottom: 0.04rem solid rgba(253, 89, 136, 0.46);
+}
+.time-content-diskName{
+  width: 1.2rem;
+}
+.time-content-time{
+  width: 3.6rem;
+  margin: 0 0.2rem 0 0.5rem;
+}
+.time-content-day{
+  width: 1.2rem;
+  text-align: right;
+}
+
+.blue{
+  color: #02A7F0;
+}
+
+#toast-container>.toast-error {
+  background-image: none!important;
+}
+
+.toast-error {
+  background-color: rgba(0, 0, 0, 0.7);
+}
+
+.toast-message {
+  font-size: 0.24rem;
+  padding: 0 0.1rem;
+  line-height: 0.9rem;
+  text-align: center;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+#toast-container>div {
+  width: 4rem;
+  height: 0.9rem;
+  opacity: 1;
+  padding: 0 !important;
+  border-radius: 0.2rem;
+  box-shadow: none;
+}
+
+.toast-center-center {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 99;
+  margin-top: -0.45rem;
+  transform: translateX(-50%);
+}
+
+@media (max-width: 480px) and (min-width: 241px) {
+  #toast-container>div {
+    min-width: 80px !important;
+    width: auto;
+  }
+}
+
+.flex{
+  display: flex;
+}
+.slider{
+  flex:1;
+}
+.slider-list{
+  transition:all .6s;
+}
+.no-slider{
+  height: 2.6rem;
+  line-height: 2.6rem;
+  text-align: center;
+  font-size: 0.32rem;
+  color: #999999;
+}
+.item{
+  height: 218px;
+  text-align: center;
+  flex:none;
+  width: 6.5rem;
+}
+.schedule-child-line{
+  transition:all .6s;
+}
+.slider-item{
+  width: 100%;
+}
+
+.sure-distribution-wrap{
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.24);
+  z-index: 999;
+  display: none;
+}
+.sure-distribution-box{
+  width: 6.22rem;
+  height: 2.28rem;
+  background: #FFFFFF;
+  border-radius: 0.2rem;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+}
+.sure-distribution-title{
+  text-align: center;
+  padding: 0.48rem;
+  font-size: 0.32rem;
+        color: #333333;
+}
+.sure-distribution-btn-list{
+  width: 100%;
+  height: 0.86rem;
+  display: flex;
+  justify-content: space-between;
+  border-top: 0.01rem solid #E5E5E5;
+  font-size: 0.28rem;
+}
+.sure-distribution-btn{
+  height: 0.86rem;
+  line-height: 0.86rem;
+  text-align: center;
+  flex: 1;
+}
+.sure-distribution-sure{
+  border-left: 0.01rem solid #b4bbc5;
+  color: #3B7FFF;
+}
+.sure-distribution-cannel:active{
+  background-color: #E5E5E5;
+  border-bottom-left-radius: 0.2rem;
+}
+.sure-distribution-sure:active{
+  background-color: #E5E5E5;
+  border-bottom-right-radius: 0.2rem;
+}

BIN
microserviceUserH5/static/img/anniversaryCelebrate/add.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/cut.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/distribution-reward-btn.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/home_list_icon_xingyao.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/left-ear.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/left-head.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/left-selected.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/reward-row-bg.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/right-ear.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/right-head.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/right-selected.png


BIN
microserviceUserH5/static/img/anniversaryCelebrate/time-icon.png


+ 435 - 169
microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -8,9 +8,62 @@
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
 	<link rel="stylesheet" href="../static/css/anniversaryCelebrate.css">
+	<link rel="stylesheet" href="../static/css/doubleChristmasActivity.css">
 	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
 	<script src="../static/js/vender/toastr/toastr.min.js"></script>
 	<script src="../static/js/vender/config.js"></script>
+	<style>
+		.reward-list{
+			display: none;
+		}
+		.slider{
+			height: 5.92rem;
+			overflow: hidden;
+		}
+		.slider-item {
+			padding-left: 0.3rem;
+		}
+		.page{
+			color: #FFFFFF;
+		}
+		.icon_xingyao{
+			width: 0.8rem;
+			height: 0.4rem;
+		}
+		.reward-btn-img{
+			width: 4rem;
+			height: 0.6rem;
+			margin: auto;
+		}
+		.distribution-reward-btn{
+			width: 100%;
+			text-align: center;
+		}
+		.distribution-time-Record{
+			width: 1.6rem;
+			margin: 0.25rem auto;
+			padding-bottom: 0.05rem;
+			border-bottom: 0.01rem solid #F5F5F5;
+			font-size: 0.26rem;
+			color: #FFFFFF;
+		}
+		.reward-row{
+			height: 0.8rem;
+			margin-top: 0.1rem;
+		}
+		.page-row{
+			margin-top: 0.4rem;
+		}
+		.time-color{
+			color: #FDFF41;
+		}
+		.btn-wrap{
+			position: absolute;
+			bottom: -0.36rem;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+	</style>
 </head>
 
 <body>
@@ -62,6 +115,7 @@
 				<img class="record-title" src="../static/img/anniversaryCelebrate/record-title.png" />
 			</div>
 			<div class="record-main-wrap">
+  				<img class="selected-bg" src="../static/img/anniversaryCelebrate/right-selected.png" />
 				<div class="change-wrap">
 					<div class="get-award-wrap">
 						<img class="award-img" src="../static/img/anniversaryCelebrate/left-bg.png" />
@@ -72,15 +126,39 @@
 						<img class="award-img right-bg" src="../static/img/anniversaryCelebrate/right-bg.png" />
 						<img class="get-award-img" src="../static/img/anniversaryCelebrate/get-award-success-hidden.png" />
 						<div class="get-award-text used-text">分配奖励</div>
-						<div class="no-distribution-award">999+</div>
+						<div class="no-distribution-award"></div>
 					</div>
 				</div>
 				<div class="light-content-container">
-					<div class="light-content-list">
-						<div class="light-content-text">点亮一颗星获得星曜7天时长奖励</div>
-					</div>
+					<div class="light-content-list"></div>
 					<div class="all-light">已全部点亮<text class="light-number"></text>次</div>
 				</div>
+				<div class="reward-list">
+					<div class="light-title-wrap">
+						<div class="light-title-text">总时长<text class="time-color all-time">0</text>天</div>
+						<div class="light-title-text">已分配<text class="time-color get-time">0</text>天</div>
+						<div class="light-title-text">未分配<text class="time-color no-distribution">0</text>天</div>
+					</div>
+					<div class="slider" id="slider">
+						<div class="slider-list flex" id="slider-list"></div>
+					</div>
+					<div class="btn-wrap">
+						<div class="page-row-wrap">
+							<img class="left-head" src="../static/img/anniversaryCelebrate/left-head.png" />
+							<div class="page-number">
+								<div class="page-number-text">1</div>
+								<div class="page-number-text">2</div>
+								<div class="page-number-text">3</div>
+								<div class="page-number-text">4</div>
+							</div>
+							<img class="right-head" src="../static/img/anniversaryCelebrate/right-head.png" />
+						</div>
+						<div class="distribution-reward-btn">
+							<img class="reward-btn-img" src="../static/img/anniversaryCelebrate/distribution-reward-btn.png" />
+						</div>
+						<div class="distribution-time-Record">分配时长记录</div>
+					</div>
+				</div>
 			</div>
 			<div class="activity-intrduction-wrap">
 				<div>活动时间:2022年6月18日-2022年6月27日</div>
@@ -88,22 +166,6 @@
 			</div>
 			<div class="law-statement">请阅读相关《法律声明》文件</div>
 		</div>
-		<div class="reward-list">
-			<img class="left-ear" src="../static/img/doubleChristmasActivity/left-ear.png" />
-			<img class="right-ear" src="../static/img/doubleChristmasActivity/right-ear.png" />
-			<div class="slider" id="slider">
-				<div class="slider-list flex" id="slider-list"></div>
-			</div>
-			<div class="page-row">
-				<div class="schedule-line">
-					<div class="schedule-child-line"></div>
-				</div>
-				<div class="page">1/4页</div>
-			</div>
-			<div class="distribution-reward-btn">
-				<img class="reward-btn-img" src="../static/img/doubleChristmasActivity/distribution-reward-btn.png" />
-			</div>
-		</div>
 		<div class="award-result-mask">
 			<div class="award-result-dialog-sure">
 				<div class="have-times-wrap">
@@ -122,6 +184,7 @@
 		<div class="rule-mask">
 			<div class="rule-result-dialog">
 				<div class="rule-content">
+					<div class="rule-title">活动规则</div>
 					<div class="rule-point">1、本次活动参与活动的套餐是星曜月卡、年卡套餐,其他套餐不参与活动,现金购买及续费皆可参与活动</div>
 					<div class="rule-point">2、激活码、优惠券、星币购买的订单不参与本次活动</div>
 					<div class="rule-point">3、本次活动购买限时折扣次数不限,获得赠送天数,可分配在购买套餐的云机账户上,单账号购买新增云机总数上限为200台</div>
@@ -199,6 +262,39 @@
 		<div class="no-start-mask">
 			<div class="no-start-dialog"></div>
 		</div>
+		<div class="sure-distribution-wrap">
+			<div class="sure-distribution-box">
+				<div class="sure-distribution-title">确定分配奖励时长</div>
+				<div class="sure-distribution-btn-list">
+					<div class="sure-distribution-btn sure-distribution-cannel">取消</div>
+					<div class="sure-distribution-btn sure-distribution-sure">确定</div>
+				</div>
+			</div>
+		</div>
+		<div class="distribution-time-mask">
+			<div class="distribution-time-dialog">
+				<div class="distribution-time-container">
+					<div class="distribution-time-title">分配时长记录</div>
+					<div class="distribution-time-wrap">
+						<div class="distribution-time-name">云机名称</div>
+						<div class="distribution-time-name">时间</div>
+						<div class="distribution-time-name">时长</div>
+					</div>
+					<div class="distribution-list"></div>
+					<div class="page-row-wrap page-row-record-wrap">
+						<img class="left-head" src="../static/img/anniversaryCelebrate/left-head.png" />
+						<div class="page-number">
+							<div class="page-number-text">1</div>
+							<div class="page-number-text">2</div>
+							<div class="page-number-text">3</div>
+							<div class="page-number-text">4</div>
+						</div>
+						<img class="right-head" src="../static/img/anniversaryCelebrate/right-head.png" />
+					</div>
+				</div>
+				<img class="distribution-close" src="../static/img/anniversaryCelebrate/close.png" />
+			</div>
+		</div>
 	</div>
 	<script>
 		toastr.options.positionClass = 'toast-center-center';
@@ -206,7 +302,7 @@
 	</script>
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 	<script type="text/javascript">
-        var baseUrl = 'http://14.18.190.141:1280'
+        var baseUrl = 'http://192.168.31.198'
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')
@@ -229,12 +325,14 @@
 			notReceive = true,
 			phoneRemainQuantity = 0,
 		    totalTime = 0,
+			receivedDuration = 0,
+			totalRewardDuration = 0,
 		    currTotalTime = 0,
 		    distributionList = [],
 		    totalRecords = [],
 		    pageNums = 0,
 		    distributionFlag = true,
-		    distributionPageNum = 0,
+		    distributionPageNum = 1,
 		    distributionPages = 0,
 		    sliderNumber = 0,//滑块是数量,控制溢出不能滑动
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
@@ -265,6 +363,17 @@
 						residueDegree = res.data.residueDegree;
 						anniversarySwitch = res.data.anniversarySwitch;
 						result = res.data.lighten;
+						totalTime = res.data.notReceivedDuration;
+						receivedDuration = res.data.receivedDuration;
+						totalRewardDuration = res.data.totalRewardDuration;
+						$('.all-time').eq(0).text(totalRewardDuration);
+						$('.get-time').eq(0).text(receivedDuration);
+						$('.no-distribution').eq(0).text(totalTime);
+						if(totalTime > 999){
+							$('.no-distribution-award').eq(0).text('999+');
+						} else {
+							$('.no-distribution-award').eq(0).text(totalTime);
+						}
 						lighten = result && result.split(',') || [], str = '';
 						$('.rest-number').eq(0).text(residueDegree);
 						$('.light-number').eq(0).text(res.data.allTotal);
@@ -310,7 +419,7 @@
 				},
 			})
 		};
-		// getAward();
+		getAward();
 		//点击抽奖
 		$('.once-btn')[0].addEventListener('click',() => {
 			if(!animationFlag) return;
@@ -455,6 +564,7 @@
 						$('.award-result-wrap').eq(0).append(str);
 						init();
 					}else{
+						animationFlag = true;
 						stopManyClick(() =>{
 							toastr.error(res.msg)
 						})
@@ -486,24 +596,25 @@
 			getAward();
 			$('.get-award-img')[0].src = '../static/img/anniversaryCelebrate/get-award-show.png';
 			$('.get-award-img')[1].src = '../static/img/anniversaryCelebrate/get-award-success-hidden.png';
+			$('.reward-list').eq(0).css('display', 'none');
 			$('.award-img').eq(1).css('display', 'none');
 			$('.award-img').eq(0).css('display', 'block');
-			$('.record-main-wrap')[0].className = 'record-main-wrap';
+			$('.light-content-container').eq(0).css('display', 'block');
+			$('.selected-bg')[0].src = '../static/img/anniversaryCelebrate/right-selected.png';
 			$('.get-award-text')[1].className = 'get-award-text used-text';
 			$('.get-award-text')[0].className = 'get-award-text';
 		},false);
 		$('.get-award-wrap')[1].addEventListener('click',(e) => {
-			$('.light-content-list').eq(0).empty();
-			pageNum = 1;
+			$('.reward-list').eq(0).css('display', 'block');
+			$('.light-content-container').eq(0).css('display', 'none');
+			pageNums = 1;
 			pages = 0;
-			receive = 1;
-			recordFlag = true;
-			getAward();
+			getLists();
 			$('.get-award-img')[0].src = '../static/img/anniversaryCelebrate/get-award-hidden.png';
 			$('.get-award-img')[1].src = '../static/img/anniversaryCelebrate/get-award-success-show.png';
 			$('.award-img').eq(0).css('display', 'none');
 			$('.award-img').eq(1).css('display', 'block');
-			$('.record-main-wrap')[0].className = 'record-main-wrap record-main-active-wrap';
+			$('.selected-bg')[0].src = '../static/img/anniversaryCelebrate/left-selected.png';
 			$('.get-award-text')[0].className = 'get-award-text used-text';
 			$('.get-award-text')[1].className = 'get-award-text';
 		},false);
@@ -538,11 +649,7 @@
 							$('.title-row').eq(0).css('display', 'flex');
 						}
 						for (var i = 0; i < records.length; i++) {
-							str += `<div class="light-content-wrap">
-										<div class="light-content-text">获得星曜${records[i].awardDurations}天时长</div>
-										<div class="light-content-time" >${records[i].createTime.substr(6)}</div>
-										<div class="get-btn ${records[i].receive === 1 ? 'btn-active' : ''}" data-awardid=${records[i].id} data-day=${records[i].day}>领取</div>
-									</div>`
+							str += `<div class="light-content-text">点亮一颗星获得星曜${records[i].awardDurations}天时长奖励</div>`
 						}
 						$('.light-content-list').eq(0).append(str)
 					}else{
@@ -637,38 +744,28 @@
 			}
 		});
 		// 活动获取用户云机列表,分页
-		getLists();
 		function getLists(){
 			const sliderLen = Array.from($('.slider-item')).length;
-			// if(sliderLen != 0 && sliderLen >= sliderNumber){
-			// 	return
-			// }
-			// $.ajax({
-			// 	url: baseUrl + '/api/user/v1/activity/getUserCardPage',
-			// 	type: 'get',
-			// 	data: {
-			// 		pageNum: pageNum + 1,
-			// 		pageSize: 4,
-			// 		phoneType: 'SVIP'
-			// 	},
-			// 	headers: {
-			// 		'Authorization': id //id
-			// 	},
-			// 	contentType: "application/json",
-			// 	dataType: 'json',
-			// 	cache: false,
-			// 	success: function (res) {
-			// 		if (res.status === 0) {
-				let res = {
-					data: {
-						userCardPage: {
-							records: [{id: 1, exceptTime: '2022-11-11 12:21:22',diskName: 'fdf',}]
-						},
-						pages: 1
-					},
-					now: '2022-11-11 12:21:22'
-				}
-						let records = res.data.userCardPage.records;
+			if(sliderLen != 0 && sliderLen >= sliderNumber){
+				return
+			}
+			$.ajax({
+				url: baseUrl + '/api/resources/v5/client/disk/info/anniversary/usercard',
+				type: 'get',
+				data: {
+					pageNum: pageNums,
+					pageSize: 4,
+					phoneType: 'SVIP'
+				},
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if (res.status === 0) {
+						let records = res.data.list;
 						totalRecords = [...totalRecords, ...records];
 						if(records.length === 0){
 							$('.page-row').eq(0).css('display','none');
@@ -677,145 +774,314 @@
 							return
 						}
 						if(res.data && records.length > 0){
-							sliderNumber = res.data.userCardPage.pages;
+							sliderNumber = res.data.pages;
 						    let sliderItemText = $('.slider-item').eq(pageNums).text();
 							var str = '',
 								len = records.length;
 							for (var i = 0; i < len; i++) {
 					            // 解决ios时间显示为NaN
+								now = '2021-11-11 12:22:22'
 								// var now = res.data.now.replace(/T/g, ' ');
-					                // now = now.replace(/\-/g, '/');
+					                now = now.replace(/\-/g, '/');
 								var exceptTime = records[i].exceptTime.replace(/T/g, ' ');
 								    exceptTime = exceptTime.replace(/\-/g, '/');
 								var diskName = records[i].diskName,
-									// currTime = parseInt(Date.parse(now)),
+									currTime = parseInt(Date.parse(now)),
 									closeTime = parseInt(Date.parse(exceptTime)),
-									// resultTime = closeTime - currTime,
-									// day = parseInt(resultTime / 1000 / 60 / 60 / 24),
-									// hour = parseInt(resultTime / 1000 / 60 / 60 % 24),
-									time = 1 + "天" + 1 + "时",
+									resultTime = closeTime - currTime,
+									day = parseInt(resultTime / 1000 / 60 / 60 / 24),
+									hour = parseInt(resultTime / 1000 / 60 / 60 % 24),
+									time = day + "天" + hour + "时",
 								    recordsId = records[i].id;
-									// if(day == 0 && hour <= 0){
-									// 	time = '已过期';
-									// }
+									if(day == 0 && hour <= 0){
+										time = '已过期';
+									}
 									if(sliderItemText){
 										$('.reward-diskName').eq(pageNums*4 + i).text(diskName);
 										$('.reward-time-content').eq(pageNums*4 + i).text(time);
 									}
 								str += `<div class="reward-row">
-										<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
 										<div class="reward-row-content">
-											<img class="icon_xingyao" src="../static/img/doubleChristmasActivity/home_list_icon_xingyao.png" />
+											<img class="icon_xingyao" src="../static/img/anniversaryCelebrate/home_list_icon_xingyao.png" />
 											<div class="reward-day-text">
 												<div class="reward-day reward-diskName">${diskName}</div>
 												<div class="total-day time-row">
-													<img class="time-icon" src="../static/img/doubleChristmasActivity/time-icon.png" />
+													<img class="time-icon" src="../static/img/anniversaryCelebrate/time-icon.png" />
 													<span class="reward-time-content ${time === '已过期'?'time-overdue':''}">${time}</span>
 												</div>
 											</div>
 											<div class="compute-block">
-												<img class="compute-icon cut" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/cut.png" />
-												<input class="ipt" data-id=${recordsId} data-index=${(pageNums)*4 + i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
-												<img class="compute-icon add" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/add.png" />
+												<img class="compute-icon cut" data-id=${recordsId} data-index=${i} src="../static/img/anniversaryCelebrate/cut.png" />
+												<input class="ipt" data-id=${recordsId} data-index=${i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
+												<img class="compute-icon add" data-id=${recordsId} data-index=${i} src="../static/img/anniversaryCelebrate/add.png" />
 											</div>
 										</div>
 									</div>`
 
 							}
 							let sliderItemDom = `<div class="slider-item">${str}</div>`;
-							$('#slider-list').append(sliderItemDom);
-							// if(!sliderItemText){
-							//     $('#slider-list').append(sliderItemDom);
-							// }else{
-							// 	return
-							// }
-							$('.left-ear').eq(0).css('display','block');
-							$('.right-ear').eq(0).css('display','block');
-							$('.distribution-reward-btn').eq(0).css('display','block');
-							$('.schedule-child-line').eq(0).css('width',`${36/sliderNumber}px`);
-						    $('.page').eq(0).text(`${pageNums + 1}/${sliderNumber}页`);
-							if(sliderNumber === 1){
-							   $('.left-ear').eq(0).css('display','none');
-							   $('.right-ear').eq(0).css('display','none');
-							   $('.page-row').eq(0).css('display','none');
-							   $('.distribution-reward-btn').eq(0).css('margin-top','20px');
+							console.log('sliderItemText', sliderItemText)
+							if(!sliderItemText){
+							    $('#slider-list').append(sliderItemDom);
+							}else{
+								return
 							}
+							$('.distribution-reward-btn').eq(0).css('display','block');
 							for (var i = 0; i < len; i++) {
-								iptIndex = (pageNums) * 4 + parseInt(i);
-								// $('.ipt')[iptIndex].oninput = function (e) {
-								// 	const id = e.target.dataset.id;
-								// 	let oldDuration = 0;
-								// 	let preTotalTime = 0;
-								// 	let index = e.target.dataset.index;
-								// 	let value = $('.ipt').eq(index).val();
-								// 	if(value.length >= 5){
-								// 		value = value.substr(0, 5);
-								// 	}
-								// 	console.log('value',value)
-								// 	var position = String(value).indexOf(".");//获取小数点的位置
-								// 	if(position != -1){
-								// 		value = value.substr(0, position);
-								// 	}
-								// 	distributionList.map(item => { // 上一次的总数据
-								// 		preTotalTime += parseInt(item.duration);
-								// 	})
-								// 	//这一次操作
-								// 	if(value == 0){
-								// 		if(!distributionList.find((item) => item.cardId == id)){
-								// 			distributionList.push({
-								// 				cardId: id,
-								// 				duration: +value
-								// 			});
-								// 		}else{
-								// 		    distributionList = distributionList.filter(item => item.cardId != id);
-								// 		}
-								// 		distributionList = distributionList.filter(item => item.duration != 0);
-								// 	}else{
-								// 		if(!distributionList.find((item) => item.cardId == id)){
-								// 			distributionList.push({
-								// 				cardId: id,
-								// 				duration: Math.abs(value)
-								// 			});
-								// 		}else{
-								// 			distributionList.map(item => {
-								// 				if (item.cardId == id) {
-								// 					oldDuration = item.duration;
-								// 					item.duration = +value;
-								// 				}
-								// 			})
-								// 		}
-								// 	}
-								// 	currTotalTime = 0;
-								// 	distributionList.map(item => { // 这一次的总数据
-								// 		currTotalTime += parseInt(item.duration);
-								// 	})
-								// 	if(currTotalTime > totalTime){ // 当前已分配大于总分配时长
-								// 		let val = totalTime - preTotalTime + oldDuration;
-								// 		distributionList.map(item => {
-								// 			if (item.cardId == id) {
-								// 				item.duration = val;
-								// 			}
-								// 		})
-								// 		$('.ipt').eq(index).val(val);
-								// 		stopManyClick(() => {
-								// 			toastr.error('分配时长不能大于未分配总时长');
-								// 		})
-								// 		return
-								// 	}
-								// 	console.log(distributionList)
-								// 	if(value.length > 5) value=value.slice(0, 5);
-								// 	$('.ipt').eq(index).val(value);
-								// }
+								console.log(i)
+								$('.ipt')[i].oninput = function (e) {
+									const id = e.target.dataset.id;
+									let oldDuration = 0;
+									let preTotalTime = 0;
+									let index = e.target.dataset.index;
+									let value = $('.ipt').eq(index).val();
+									console
+									if(value.length >= 5){
+										value = value.substr(0, 5);
+									}
+									console.log('value',value)
+									var position = String(value).indexOf(".");//获取小数点的位置
+									if(position != -1){
+										value = value.substr(0, position);
+									}
+									distributionList.map(item => { // 上一次的总数据
+										preTotalTime += parseInt(item.duration);
+									})
+									//这一次操作
+									if(value == 0){
+										if(!distributionList.find((item) => item.userCardId == id)){
+											distributionList.push({
+												userCardId: id,
+												duration: +value
+											});
+										}else{
+										    distributionList = distributionList.filter(item => item.userCardId != id);
+										}
+										distributionList = distributionList.filter(item => item.duration != 0);
+									}else{
+										if(!distributionList.find((item) => item.userCardId == id)){
+											distributionList.push({
+												userCardId: id,
+												duration: Math.abs(value)
+											});
+										}else{
+											distributionList.map(item => {
+												if (item.userCardId == id) {
+													oldDuration = item.duration;
+													item.duration = +value;
+												}
+											})
+										}
+									}
+									currTotalTime = 0;
+									distributionList.map(item => { // 这一次的总数据
+										currTotalTime += parseInt(item.duration);
+									})
+									if(currTotalTime > totalTime){ // 当前已分配大于总分配时长
+										let val = totalTime - preTotalTime + oldDuration;
+										distributionList.map(item => {
+											if (item.userCardId == id) {
+												item.duration = val;
+											}
+										})
+										$('.ipt').eq(index).val(val);
+										stopManyClick(() => {
+											toastr.error('分配时长不能大于未分配总时长');
+										})
+										return
+									}
+									console.log(distributionList)
+									if(value.length > 5) value=value.slice(0, 5);
+									$('.ipt').eq(index).val(value);
+								}
 							}
 						}
-				// 	} else {
-				// 		stopManyClick(() => {
-				// 			toastr.error(res.msg);
-				// 		})
-				// 	}
-				// }
-			// })
+					} else {
+						stopManyClick(() => {
+							toastr.error(res.msg);
+						})
+					}
+				}
+			})
 		}
+		//点击加号
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon add'){
+			    const id = e.target.dataset.id;
+				let currTotalTime = 0;
+			    let index = e.target.dataset.index;
+				let number = $('.ipt').eq(index).val();
+				// 这一次操作
+				if(number == 0){
+					if(!distributionList.find((item) => item.userCardId == id)){
+						distributionList.push({
+							userCardId: id,
+							duration: +number + 1
+						});
+					}else{
+						distributionList.map(item => {
+							if(item.userCardId == id){
+								item.duration++;
+							}
+						})
+					}
+				}else{
+					distributionList.map(item => {
+						if(item.userCardId == id){
+							item.duration++;
+						}
+					})
+				}
+				distributionList.map(item => { // 这一次的总数据
+					currTotalTime += parseInt(item.duration);
+				})
+				console.log(currTotalTime)
+				console.log(totalTime)
+				if(currTotalTime <= totalTime){
+					number++;
+					$('.ipt').eq(index).val(number);
+				}else{
+					distributionList.map(item => {
+						if(item.userCardId == id){
+							item.duration = +number;
+						}
+					})
+					stopManyClick(() => {
+						toastr.error('分配时长不能大于未分配总时长');
+					})
+				}
+				console.log(distributionList)
+			}
+		});
+		//点击减号
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon cut'){
+				const id = e.target.dataset.id;
+			    let index = e.target.dataset.index;
+			        index = (pageNum)*4 + parseInt(index);
+				let number = $('.ipt').eq(index).val();
+				if(number > 0){
+					distributionList.map(item => {
+						if(item.userCardId == id){
+							item.duration--;
+						}
+					})
+					number--;
+					if(number == 0){
+					    distributionList = distributionList.filter(item => item.userCardId != id);
+					}
+					currTotalTime--;
+					$('.ipt').eq(index).val(number);
+				}else{
+					stopManyClick(() => {
+						toastr.error('分配的时长不能小于0');
+					})
+				}
+				console.log(distributionList)
+			}
+		});
+		//点击分配时长按钮
+		$('.distribution-reward-btn')[0].addEventListener('click', (e) => {
+			distributionList = distributionList.filter(item => item.duration != 0);
+			if (distributionList.length === 0) {
+				stopManyClick(() => {
+					toastr.error('未选中任何云手机');
+				})
+			} else {
+				$('.sure-distribution-wrap').eq(0).css('display', 'block');
+			}
+		});
+		//点击分配时长取消按钮
+		$('.sure-distribution-cannel')[0].addEventListener('click', (e) => {
+			operate('dt_双旦_h5_分配奖励_取消');
+			$('.sure-distribution-wrap').eq(0).css('display', 'none');
+		});
+		//点击分配时长确定按钮
+		$('.sure-distribution-sure')[0].addEventListener('click', (e) => {
+			$.ajax({
+				url: baseUrl + '/api/activity/v1/anniversary/receive',
+				type: 'post',
+				data: JSON.stringify({
+					userCards: distributionList
+				}),
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						operate('dt_双旦_h5_分配奖励_确定');
+						$('.sure-distribution-wrap').eq(0).css('display', 'none');
+						getLists();
+						distributionPageNum = 1;
+						$('.time-row-data').eq(0).text('');
+						distributionList.map((val) => {
+							totalRecords.map((item, indexs) => {
+								if(val.userCardId == item.id){
+									$('.ipt').eq(indexs).val(0);
+								}
+							})
+						})
+						distributionList = [];
+						stopManyClick(() => {
+							toastr.error('分配成功,请前往云机列表查看');
+						})
+					} else {
+						stopManyClick(() => {
+							toastr.error(res.msg);
+						})
+					}
+				},
+			})
+		});
+		//点击分配时长记录
+		$('.distribution-time-Record')[0].addEventListener('click', (e) => {
+			$('.distribution-time-dialog').animate({top: '4.86rem'},"fast");
+			$('.distribution-time-mask').show();
+			document.documentElement.style.overflow='hidden';
+			$('.distribution-list').eq(0).empty();
+			$.ajax({
+				url: baseUrl + '/api/activity/v1/anniversary/receiveData',
+				type: 'get',
+				headers: {
+					'Authorization': id //id
+				},
+				data: {
+					pageNum: distributionPageNum,
+					pageSize: 10,
+					phoneType: 'SVIP'
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						let records = res.data.records, str = '';
+						for (var i = 0; i < records.length; i++) {
+							str += `<div class="distribution-content-wrap">
+										<div class="distribution-content-name">${records[i].diskName}</div>
+										<div class="distribution-content-name distribution-time-text">${records[i].createTime}</div>
+										<div class="distribution-content-name">${records[i].receiveDurations}天</div>
+									</div>`
+						}
+						$('.distribution-list').eq(0).append(str)
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+					
+				},
+			})
+		});
+		//点击分配时长关闭按钮
+		$('.distribution-close')[0].addEventListener('click',() => {
+			$('.distribution-time-dialog').animate({top: '-10.96rem'},"fast");
+			$('.distribution-time-mask').hide();
+			document.documentElement.style.overflow='auto';
+		},false);
 		//获取云机数量
 		getPhoneNumber();
 		function getPhoneNumber(){

+ 1 - 1
microserviceUserH5/vcloud/browserDetail.html

@@ -5,7 +5,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 	<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0">
-	<title></title>
+	<title>双子星浏览器</title>
 	<link rel="stylesheet" href="https://cdn.bootcss.com/weui/1.1.3/style/weui.min.css">
 	<script src="../static/js/vender/vue/axios.min.js"></script>
 	<script src="../static/js/vender/vue/vue.min.js"></script>

+ 825 - 0
microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -0,0 +1,825 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<title>双旦活动</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+	<link rel="stylesheet" href="../static/css/doubleChristmasActivity.css">
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+	<style>
+
+	</style>
+</head>
+
+<body>
+	<div class="container">
+		<div class="header-container">
+			<img class="top-banner" src="../static/img/doubleChristmasActivity/top-banner.png" />
+			<div class="activity-meal">活动参与套餐:星曜套餐</div>
+			<div class="meal-price">云机低至<span class="meal-price-num"></span>元/天</div>
+			<div class="rest-time"></div>
+			<div class="limit">PC端用户不参与本次活动</div>
+		</div>
+		<div class="middle-container">
+			<img class="footer-cloud" src="../static/img/doubleChristmasActivity/footer-cloud.png" />
+			<div class="step-container">
+				<img class="tips" src="../static/img/doubleChristmasActivity/tip.png" />
+				<div class="main-step-content">
+					<div class="top-step">
+						<div class="step-item">
+							<img class="buyphone" src="../static/img/doubleElevenActivity/buyphone.png" />
+							<span class="step-text">购买续费云机</span>
+						</div>
+						<img class="step" src="../static/img/doubleElevenActivity/step.png" />
+						<div class="step-item">
+							<img class="hongbao" src="../static/img/doubleChristmasActivity/hongbao.png" />
+							<span class="step-text">累计云机时长</span>
+						</div>
+						<img class="step" src="../static/img/doubleElevenActivity/step.png" />
+						<div class="step-item">
+							<img class="buyphone" src="../static/img/doubleChristmasActivity/buyphone2.png" />
+							<span class="step-text">获取额外奖励</span>
+						</div>
+					</div>
+				</div>
+				<div class="join-activity-btn">
+					<img class="join-activity" src="../static/img/doubleElevenActivity/button-join-activity.png" />
+					<div class="activity-btn-content">
+						<span class="activity-btn-text">立即参与</span>
+						<img class="icon-left" src="../static/img/doubleElevenActivity/icon-left.png" />
+					</div>
+				</div>
+				<img class="middle-cloud" src="../static/img/doubleChristmasActivity/middle-cloud.png" />
+			</div>
+			<div class="rest-tip">使用激活码,优惠券和星币支付不参与活动</div>
+			<div class="tab-row">
+				<div class="tab-item tab-active" data-index="0">充值奖励</div>
+				<div class="tab-item" data-index="1">分配奖励(<span class="time-number">0</span>)</div>
+				<img class="tab-bg" src="../static/img/doubleChristmasActivity/tab-bg.png" />
+			</div>
+			<div class="reward-container">
+				<div class="activity-finish">
+					<div class="finish-text">活动已结束</div>
+				</div>
+				<div class="reward-time">
+					<span class="reward-text">购买套餐累计时长</span>
+					<span class="total-time-num"></span>
+					<span class="reward-text">天</span>
+					<span class="next-reward">
+						<span class="time-line">|</span>
+						<span class="reward-text">距离下一个奖励还差</span>
+						<span class="next-time-num"></span>
+						<span class="reward-text">天</span>
+				    </span>
+				</div>
+				<div class="reward-tip-row">
+					<img class="reward-tip-img" src="../static/img/doubleChristmasActivity/reward-tip-img.png" />
+					<div class="reward-tip">精彩不停的充值福利专场已经来临充值越多折扣越大</div>
+				</div>
+				<div class="reward-list"></div>
+			</div>
+			<div class="distribution-container">
+				<div class="distribution-time">
+					<div>
+						<span class="distribution-text">奖励总时长</span>
+						<span class="distribution-total-num">0</span>
+						<span class="distribution-text">天</span>
+					</div>
+					<span class="distribution-line">|</span>
+					<div>
+						<span class="distribution-text">未分配时长</span>
+						<span class="no-distribution-num">0</span>
+						<span class="distribution-text">天</span>
+					</div>
+				</div>
+				<div class="reward-list">
+					<img class="left-ear" src="../static/img/doubleChristmasActivity/left-ear.png" />
+					<img class="right-ear" src="../static/img/doubleChristmasActivity/right-ear.png" />
+					<div class="slider" id="slider">
+						<div class="slider-list flex" id="slider-list"></div>
+					</div>
+					<div class="page-row">
+						<div class="schedule-line">
+							<div class="schedule-child-line"></div>
+						</div>
+						<div class="page">1/4页</div>
+					</div>
+					<div class="distribution-reward-btn">
+						<img class="reward-btn-img" src="../static/img/doubleChristmasActivity/distribution-reward-btn.png" />
+					</div>
+				</div>
+			</div>
+			<div class="distribution-container time-container">
+				<div class="time-title-row">
+					<img class="time-title-bg" src="../static/img/doubleChristmasActivity/time-title-bg.png" />
+					<div class="time-title">分配时长记录(已分配时长<span class="time-title-usedDuration"></span>天)</div>
+				</div>
+				<div class="time-list">
+					<div class="title-row">
+						<div>云机名称</div>
+						<div>时间</div>
+						<div>时长</div>
+					</div>
+					<div class="time-row-data"></div>
+					<div class="no-time-data">暂无分配时长</div>
+				</div>
+			</div>
+			<div class="rule-container">
+				<img class="rule-tips" src="../static/img/doubleChristmasActivity/rule.png" />
+				<div class="rule-content">
+					<div class="rule-point">一、活动时间:2021年12月18日-2022年1月3日。</div>
+					<div class="rule-point">二、任务奖励与获取说明</div>
+					<div class="rule-point">1.活动期间购买星曜云机达累计天数,可获得相应奖励,同一个账号同一进度的奖励只能领取一次。</div>
+					<div class="rule-point">任务奖励一览:</div>
+					<div class="rule-point">1.1.累积购买天数小于等于2022天时 ,获得对应任务奖励。</div>
+					<div class="rule-point">1.2.累积购买天数大于2022天时,超过2022天的部分按买一送二发放奖励。</div>
+					<div class="rule-point">2.使用星币支付、激活码兑换、优惠劵购买和购买非星曜套餐不计入任务进度。</div>
+					<div class="rule-point">3.奖励获取的云机时长仅可用于续费账号中现有的星曜云机设备。</div>
+					<div class="rule-point blue">4.奖励领取日期为:2021年12月18日-2022年1月6日,超过领取时间未领取奖励则视为放弃任务奖励。</div>
+					<div class="rule-point">5.从他人获取授权的云手机不能分配累计奖励时长。</div>
+					<div class="rule-point">三、其他说明</div>
+					<div class="rule-point">1.本次活动不与其他活动优惠叠加。</div>
+					<div class="rule-point">2.本次活动期间购买的云手机套餐不支持退款。</div>
+					<div class="rule-point">3.双子星官方对活动具有最终解释权。</div>
+				</div>
+			</div>
+		</div>
+		<div class="sure-distribution-wrap">
+			<div class="sure-distribution-box">
+				<div class="sure-distribution-title">确定分配奖励时长</div>
+				<div class="sure-distribution-btn-list">
+					<div class="sure-distribution-btn sure-distribution-cannel">取消</div>
+					<div class="sure-distribution-btn sure-distribution-sure">确定</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<script>
+		toastr.options.positionClass = 'toast-center-center';
+		toastr.options.timeOut = '1500';
+	</script>
+	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
+	<script type="text/javascript">
+		let timer, flag = true;
+		var url = window.location.href;
+		url = url.split('/');
+		var topVal = -0.5;
+		let obj = {};
+		// var baseUrl = 'http://test.androidscloud.com'
+		var loc = window.location.search,
+			n1 = loc.length,//地址的总长度
+			n2 = loc.indexOf("="),//取得=号的位置
+			id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
+			u = navigator.userAgent,
+			ua = navigator.userAgent.toLowerCase(),
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1, //android终端
+			isMiniprogram = false;
+		if (ua.match(/MicroMessenger/i) == "micromessenger") {
+			//ios的ua中无miniProgram,但都有MicroMessenger(表示是微信浏览器)
+			wx.miniProgram.getEnv((res) => {
+				if (res.miniprogram) {
+					isMiniprogram = true;
+				} else {
+					isMiniprogram = false;
+				}
+			})
+		} else {
+			isMiniprogram = false;
+		}
+		let tabIndex = 0,
+		    userName = '',
+		    totalTime = 0,
+			activityState = 0,
+		    christmasDoubleReward = 0,
+		    currTotalTime = 0,
+		    distributionList = [],
+		    totalRecords = [],
+		    pageNum = 0,
+		    distributionFlag = true,
+		    distributionPageNum = 0,
+		    distributionPages = 0,
+		    sliderNumber = 0;//滑块是数量,控制溢出不能滑动
+		getBaseData();
+		getLists();
+		//点击立即参与按钮
+		$('.join-activity-btn')[0].addEventListener('click', () => {
+			if(activityState == 0){
+				stopManyClick(() => {
+					toastr.error('活动未开始');
+				})
+				return
+			}else if(activityState == 1){
+			    operate('dt_双旦_h5_立即参与');
+			}else if(activityState == 2){
+				stopManyClick(() => {
+					toastr.error('活动已结束');
+				})
+				return
+			}
+			if (isMiniprogram) { // 小程序
+				wx.miniProgram.navigateTo({
+					url: '/packageA/order/buy/index?type=activity'
+				})
+			} else if (isAndroid) { // 安卓
+				window.native.startPurchase(1, 365);
+			} else if (isiOS) {
+				window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
+			}
+		})
+		//点击去完成
+		$('.reward-list')[0].addEventListener('click', (e) => {
+			if (e.target.className === 'reward-btn') {
+				let receive = e.target.dataset.receive;
+				if (receive !== 'null') {
+					return
+				}
+				if (isMiniprogram) { // 小程序
+					wx.miniProgram.navigateTo({
+						url: '/packageA/order/buy/index?type=activity'
+					})
+				} else if (isAndroid) { // 安卓
+					window.native.startPurchase(1, 365);
+				} else if (isiOS) {
+					window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
+				}
+			}
+		});
+		//点击tab选项卡
+		$('.tab-row')[0].addEventListener('click', (e) => {
+			const index = e.target.dataset.index;
+			if (!index || tabIndex == index) {
+				return
+			}
+			tabIndex = index;
+			if (index == 0) {
+				operate('dt_双旦_h5_tab_充值奖励');
+				$('.tab-item')[1].className = 'tab-item';
+				$('.tab-bg')[0].className = 'tab-bg tab-left';
+				$('.reward-container').eq(0).css('display', 'block');
+				$('.distribution-container').eq(0).css('display', 'none');
+				$('.distribution-container').eq(1).css('display', 'none');
+			} else {
+				operate('dt_双旦_h5_tab_分配奖励');
+				$('.tab-item')[0].className = 'tab-item';
+				$('.tab-bg')[0].className = 'tab-bg tab-right';
+				$('.reward-container').eq(0).css('display', 'none');
+				$('.distribution-container').eq(0).css('display', 'block');
+				$('.distribution-container').eq(1).css('display', 'block');
+			}
+			$('.tab-item')[index].className = 'tab-item tab-active';
+		})
+		//获取倒计时
+		function getBaseData() {
+			$.ajax({
+				url: baseUrl + '/api/user/v1/activity/getChristmasActivityConf',
+				type: 'get',
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					getList();
+					const objData = res.data;
+					userName = objData.userName;
+					activityState = objData.activityState;
+	            	distributionRecord();
+					christmasDoubleReward = objData.christmasDoubleReward;
+					// 解决ios时间显示为NaN
+					objData.now = objData.now.replace(/T/g, ' ');
+					objData.now = objData.now.replace(/\-/g, '/');
+					objData.endTime = objData.endTime.replace(/T/g, ' ');
+					objData.endTime = objData.endTime.replace(/\-/g, '/');
+					$('.meal-price-num').eq(0).text(objData.price);
+					let currTime = parseInt(Date.parse(objData.now)),
+						closeTime = parseInt(Date.parse(objData.endTime)),
+						result = closeTime - currTime,
+						day = parseInt(result / 1000 / 60 / 60 / 24),
+						hour = parseInt(result / 1000 / 60 / 60 % 24),
+						minute = parseInt(result / 1000 / 60 % 60),
+						seconds = parseInt(result / 1000 % 60),
+						time = day + "天" + hour + "时" + minute + "分" + seconds + "秒";
+						if (day == 0 && hour == 0 && minute == 0 && seconds == 0 || objData.activityState == 2) {
+							astr = '活动已结束';
+						    $('.activity-finish').eq(0).css('display', 'block');
+					        $('.rest-time').eq(0).text(astr);
+							return
+						}else if(objData.activityState == 0){
+							astr = '活动未开始';
+					        $('.rest-time').eq(0).text(astr);
+							return
+						}
+					const timeInterval = setInterval(() => {
+						if (seconds > 0) {
+							seconds--;
+						} else if (minute > 0) {
+							seconds = 59;
+							minute--;
+						} else if (hour > 0) {
+							minute = 59;
+							seconds = 59;
+							hour--;
+						} else if (day > 0) {
+							hour = 59;
+							minute = 59;
+							seconds = 59;
+							day--;
+						} else {
+							clearInterval(timeInterval);
+						}
+						time = day + "天" + hour + "时" + minute + "分" + seconds + "秒";
+						let str = `距离活动结束:${time}`
+						if (day == 0 && hour == 0 && minute == 0 && seconds == 0 || objData.activityState == 2) {
+							str = '活动已结束';
+							clearInterval(timeInterval);
+						    $('.activity-finish').eq(0).css('display', 'block');
+						}
+						$('.rest-time').eq(0).text(str);
+					}, 1000)
+					let str = `距离活动结束:${time}`
+					$('.rest-time').eq(0).text(str);
+				},
+			})
+		}
+		//调用获取数据列表接口
+		function getList() {
+			$.ajax({
+				url: baseUrl + '/api/user/v1/activity/getReceivingList',
+				type: 'get',
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if (res.status === 0) {
+						if (res.data.open == 2) {
+							$('.activity-finish').eq(0).css('display', 'block');
+						}
+						if (res.data && res.data.operateActivityGoodsInfos.length > 0) {
+							var str = '',
+								flag = true,
+								nextDuration = 0,
+								usedDuration = res.data.usedDuration,
+								rewardDuration = res.data.rewardDuration,
+								totalDuration = res.data.totalDuration,
+								len = res.data.operateActivityGoodsInfos.length;
+							for (var i = 0; i < len; i++) {
+								let rewardDuration = res.data.operateActivityGoodsInfos[i].rewardDuration,
+									receiveDuration = res.data.operateActivityGoodsInfos[i].receiveDuration,
+									cumulativeDuration = res.data.operateActivityGoodsInfos[i].cumulativeDuration;
+								str += `<div class="reward-row">
+										<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
+										<div class="reward-row-content">
+											<img class="reward-img" src="../static/img/doubleChristmasActivity/reward.png" />
+											<div class="reward-day-text">
+												<div class="reward-day">奖励天数${rewardDuration}天</div>
+												<div class="total-day">购买套餐累计时长达${cumulativeDuration}天</div>
+											</div>
+											<img class="reward-btn" data-receive=${receiveDuration} src="../static/img/doubleChristmasActivity/${receiveDuration ? 'get-btn' : 'finish-btn'}.png" />
+										</div>
+									</div>`
+								if (totalDuration - cumulativeDuration < 0 && flag) {
+									flag = false;
+									nextDuration = cumulativeDuration - totalDuration;
+								}
+							}
+							str += `<div class="reward-row">
+								<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
+								<div class="reward-row-content">
+									<img class="reward-img" src="../static/img/doubleChristmasActivity/three-reward.png" />
+									<div class="reward-day-text">
+										<div class="reward-day">星曜套餐买一送二</div>
+										<div class="total-day">购买套餐累计时长达高于${christmasDoubleReward}天</div>
+									</div>
+									<img class="reward-btn" data-receive='null' src="../static/img/doubleChristmasActivity/finish-btn.png" />
+								</div>
+							</div>`
+							str += `<div class="reward-last-tip">已获得奖励请在分配奖励栏中进行时长分配</div>`
+							const noDistributionDuration = rewardDuration - usedDuration;
+							$('.reward-list').eq(0).append(str);
+							$('.time-number').eq(0).text(noDistributionDuration);
+							$('.total-time-num').eq(0).text(totalDuration);
+							$('.next-time-num').eq(0).text(nextDuration);
+							$('.distribution-total-num').eq(0).text(rewardDuration);
+						    $('.time-title-usedDuration').eq(0).text(usedDuration);
+							totalTime = noDistributionDuration;
+							$('.no-distribution-num').eq(0).text(noDistributionDuration);
+							if(totalDuration >= 2022){
+								$('.next-reward').eq(0).css('display', 'none');
+							}
+						}
+					} else if(res.status === 4104) {
+						let sliderItemDom = `<div class="slider-item no-slider">暂无活动开启</div>`;
+						$('.reward-container').eq(0).append(sliderItemDom);
+						stopManyClick(() => {
+							toastr.error(res.msg);
+						})
+					}
+				}
+			})
+		}
+		// 获取分配列表数据
+		function distributionRecord() {
+			$.ajax({
+				url: baseUrl + '/api/user/v1/activity/queryUserDistribution',
+				type: 'get',
+				data:{
+					pageNum: distributionPageNum + 1,
+					pageSize: 10,
+					userName: userName
+				},
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						distributionFlag = true;
+						let records = res.data.records;
+						distributionPages = res.data.pages;
+						if(res.data && records.length > 0){
+							var str = '',
+								len = records.length;
+							for (var i = 0; i < len; i++) {
+								var diskName = records[i].diskName,
+								    createTime = records[i].createTime,
+								    increaseDuration = records[i].increaseDuration;
+								    str += `<div class="time-content-row">
+										<div class="time-content-diskName">${diskName}</div>
+										<div class="time-content-time">${createTime.substring(0,4)}年${createTime.substring(5,7)}月${createTime.substring(8,10)}日 ${createTime.substring(11,19)}</div>
+										<div class="time-content-day">${increaseDuration}天</div>
+									</div>`
+							}
+							$('.time-row-data').eq(0).append(str);
+							if (len !== 0) {
+								$('.no-time-data').eq(0).css('display', 'none');
+							}
+						}
+					} else {
+						stopManyClick(() => {
+							toastr.error(res.msg);
+						})
+					}
+				},
+			})
+		}
+		//分配列表数据下拉加载
+		$('.time-container')[0].addEventListener('scroll',function () {
+			let scrollTop = $('.time-container')[0].scrollTop;
+			let clientHeight = $('.time-container')[0].clientHeight;
+			let scrollHeight = $('.time-container')[0].scrollHeight;
+			if(scrollTop + clientHeight + 100 > scrollHeight){
+				if(distributionFlag && distributionPageNum < distributionPages){
+					distributionFlag = false;
+					distributionPageNum++;
+				    distributionRecord();
+				}
+			}
+		});
+		// 活动获取用户云机列表,分页
+		function getLists(){
+			const sliderLen = Array.from($('.slider-item')).length;
+			// if(sliderLen != 0 && sliderLen >= sliderNumber){
+			// 	return
+			// }
+			$.ajax({
+				url: baseUrl + '/api/user/v1/activity/getUserCardPage',
+				type: 'get',
+				data: {
+					pageNum: pageNum + 1,
+					pageSize: 4,
+					phoneType: 'SVIP'
+				},
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if (res.status === 0) {
+						let records = res.data.userCardPage.records;
+						totalRecords = [...totalRecords, ...records];
+						if(records.length === 0){
+							$('.page-row').eq(0).css('display','none');
+							let sliderItemDom = `<div class="slider-item no-slider">暂无可分配的云手机</div>`;
+							$('#slider-list').append(sliderItemDom);
+							return
+						}
+						if(res.data && records.length > 0){
+							sliderNumber = res.data.userCardPage.pages;
+						    let sliderItemText = $('.slider-item').eq(pageNum).text();
+							var str = '',
+								len = records.length;
+							for (var i = 0; i < len; i++) {
+					            // 解决ios时间显示为NaN
+								var now = res.data.now.replace(/T/g, ' ');
+					                now = now.replace(/\-/g, '/');
+								var exceptTime = records[i].exceptTime.replace(/T/g, ' ');
+								    exceptTime = exceptTime.replace(/\-/g, '/');
+								var diskName = records[i].diskName,
+									currTime = parseInt(Date.parse(now)),
+									closeTime = parseInt(Date.parse(exceptTime)),
+									resultTime = closeTime - currTime,
+									day = parseInt(resultTime / 1000 / 60 / 60 / 24),
+									hour = parseInt(resultTime / 1000 / 60 / 60 % 24),
+									time = day + "天" + hour + "时",
+								    recordsId = records[i].id;
+									if(day == 0 && hour <= 0){
+										time = '已过期';
+									}
+									if(sliderItemText){
+										$('.reward-diskName').eq(pageNum*4 + i).text(diskName);
+										$('.reward-time-content').eq(pageNum*4 + i).text(time);
+									}
+								str += `<div class="reward-row">
+										<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
+										<div class="reward-row-content">
+											<img class="icon_xingyao" src="../static/img/doubleChristmasActivity/home_list_icon_xingyao.png" />
+											<div class="reward-day-text">
+												<div class="reward-day reward-diskName">${diskName}</div>
+												<div class="total-day time-row">
+													<img class="time-icon" src="../static/img/doubleChristmasActivity/time-icon.png" />
+													<span class="reward-time-content ${time === '已过期'?'time-overdue':''}">${time}</span>
+												</div>
+											</div>
+											<div class="compute-block">
+												<img class="compute-icon cut" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/cut.png" />
+												<input class="ipt" data-id=${recordsId} data-index=${(pageNum)*4 + i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
+												<img class="compute-icon add" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/add.png" />
+											</div>
+										</div>
+									</div>`
+
+							}
+							let sliderItemDom = `<div class="slider-item">${str}</div>`;
+							if(!sliderItemText){
+							    $('#slider-list').append(sliderItemDom);
+							}else{
+								return
+							}
+							$('.left-ear').eq(0).css('display','block');
+							$('.right-ear').eq(0).css('display','block');
+							$('.distribution-reward-btn').eq(0).css('display','block');
+							$('.schedule-child-line').eq(0).css('width',`${36/sliderNumber}px`);
+						    $('.page').eq(0).text(`${pageNum + 1}/${sliderNumber}页`);
+							if(sliderNumber === 1){
+							   $('.left-ear').eq(0).css('display','none');
+							   $('.right-ear').eq(0).css('display','none');
+							   $('.page-row').eq(0).css('display','none');
+							   $('.distribution-reward-btn').eq(0).css('margin-top','20px');
+							}
+							for (var i = 0; i < len; i++) {
+								iptIndex = (pageNum) * 4 + parseInt(i);
+								$('.ipt')[iptIndex].oninput = function (e) {
+									const id = e.target.dataset.id;
+									let oldDuration = 0;
+									let preTotalTime = 0;
+									let index = e.target.dataset.index;
+									let value = $('.ipt').eq(index).val();
+									if(value.length >= 5){
+										value = value.substr(0, 5);
+									}
+									console.log('value',value)
+									var position = String(value).indexOf(".");//获取小数点的位置
+									if(position != -1){
+										value = value.substr(0, position);
+									}
+									distributionList.map(item => { // 上一次的总数据
+										preTotalTime += parseInt(item.duration);
+									})
+									//这一次操作
+									if(value == 0){
+										if(!distributionList.find((item) => item.cardId == id)){
+											distributionList.push({
+												cardId: id,
+												duration: +value
+											});
+										}else{
+										    distributionList = distributionList.filter(item => item.cardId != id);
+										}
+										distributionList = distributionList.filter(item => item.duration != 0);
+									}else{
+										if(!distributionList.find((item) => item.cardId == id)){
+											distributionList.push({
+												cardId: id,
+												duration: Math.abs(value)
+											});
+										}else{
+											distributionList.map(item => {
+												if (item.cardId == id) {
+													oldDuration = item.duration;
+													item.duration = +value;
+												}
+											})
+										}
+									}
+									currTotalTime = 0;
+									distributionList.map(item => { // 这一次的总数据
+										currTotalTime += parseInt(item.duration);
+									})
+									if(currTotalTime > totalTime){ // 当前已分配大于总分配时长
+										let val = totalTime - preTotalTime + oldDuration;
+										distributionList.map(item => {
+											if (item.cardId == id) {
+												item.duration = val;
+											}
+										})
+										$('.ipt').eq(index).val(val);
+										stopManyClick(() => {
+											toastr.error('分配时长不能大于未分配总时长');
+										})
+										return
+									}
+									console.log(distributionList)
+									if(value.length > 5) value=value.slice(0, 5);
+									$('.ipt').eq(index).val(value);
+								}
+							}
+						}
+					} else {
+						stopManyClick(() => {
+							toastr.error(res.msg);
+						})
+					}
+				}
+			})
+		}
+		//点击分配时长按钮
+		$('.distribution-reward-btn')[0].addEventListener('click', (e) => {
+			distributionList = distributionList.filter(item => item.duration != 0);
+			if (distributionList.length === 0) {
+				stopManyClick(() => {
+					toastr.error('未选中任何云手机');
+				})
+			} else {
+				$('.sure-distribution-wrap').eq(0).css('display', 'block');
+			}
+		});
+		//点击分配时长取消按钮
+		$('.sure-distribution-cannel')[0].addEventListener('click', (e) => {
+			operate('dt_双旦_h5_分配奖励_取消');
+			$('.sure-distribution-wrap').eq(0).css('display', 'none');
+		});
+		//点击分配时长确定按钮
+		$('.sure-distribution-sure')[0].addEventListener('click', (e) => {
+			$.ajax({
+				url: baseUrl + '/api/user/v1/activity/distributeRewardDuration',
+				type: 'post',
+				data: JSON.stringify(distributionList),
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						operate('dt_双旦_h5_分配奖励_确定');
+						$('.sure-distribution-wrap').eq(0).css('display', 'none');
+						$('.reward-list').eq(0).text('');
+						getList();
+						getLists();
+						distributionPageNum = 0;
+						$('.time-row-data').eq(0).text('');
+						distributionRecord();
+						distributionList.map((val) => {
+							totalRecords.map((item, indexs) => {
+								if(val.cardId == item.id){
+									$('.ipt').eq(indexs).val(0);
+								}
+							})
+						})
+						
+						distributionList = [];
+						stopManyClick(() => {
+							toastr.error('分配成功,请前往云机列表查看');
+						})
+					} else {
+						stopManyClick(() => {
+							toastr.error(res.msg);
+						})
+					}
+				},
+			})
+		});
+		//点击加号
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon add'){
+			    const id = e.target.dataset.id;
+				let currTotalTime = 0;
+			    let index = e.target.dataset.index;
+			        index = (pageNum)*4 + parseInt(index);
+				let number = $('.ipt').eq(index).val();
+				// 这一次操作
+				if(number == 0){
+					if(!distributionList.find((item) => item.cardId == id)){
+						distributionList.push({
+							cardId: id,
+							duration: +number + 1
+						});
+					}else{
+						distributionList.map(item => {
+							if(item.cardId == id){
+								item.duration++;
+							}
+						})
+					}
+				}else{
+					distributionList.map(item => {
+						if(item.cardId == id){
+							item.duration++;
+						}
+					})
+				}
+				distributionList.map(item => { // 这一次的总数据
+					currTotalTime += parseInt(item.duration);
+				})
+				console.log(currTotalTime)
+				console.log(totalTime)
+				if(currTotalTime <= totalTime){
+					number++;
+					$('.ipt').eq(index).val(number);
+				}else{
+					distributionList.map(item => {
+						if(item.cardId == id){
+							item.duration = +number;
+						}
+					})
+					stopManyClick(() => {
+						toastr.error('分配时长不能大于未分配总时长');
+					})
+				}
+				console.log(distributionList)
+			}
+		});
+		//点击减号
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon cut'){
+				const id = e.target.dataset.id;
+			    let index = e.target.dataset.index;
+			        index = (pageNum)*4 + parseInt(index);
+				let number = $('.ipt').eq(index).val();
+				if(number > 0){
+					distributionList.map(item => {
+						if(item.cardId == id){
+							item.duration--;
+						}
+					})
+					number--;
+					if(number == 0){
+					    distributionList = distributionList.filter(item => item.cardId != id);
+					}
+					currTotalTime--;
+					$('.ipt').eq(index).val(number);
+				}else{
+					stopManyClick(() => {
+						toastr.error('分配的时长不能小于0');
+					})
+				}
+				console.log(distributionList)
+			}
+		});
+
+		//埋点
+		operate('dt_双旦_h5_活动首页');
+		function operate(pointName, type) {
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data: JSON.stringify({
+					pointName: pointName
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+
+				},
+			})
+		}
+		//防止提示一秒内重复显示
+		function stopManyClick(fn) {
+			if (flag) {
+				fn();
+			}
+			flag = false;
+			if (timer) { clearTimeout(timer); }
+			timer = setTimeout(() => { flag = true }, 1500);
+		}
+	</script>
+	<script src="../static/js/vender/move.js"></script>
+</body>
+
+</html>

+ 25 - 7
screenIos/WXtrialInterface.html

@@ -682,7 +682,7 @@
           url: '/pages/home/home'
         })
       } else {
-        location.href = 'http://14.18.190.141:1280/cloud/phone/web/#/pages/index/index'
+        location.href = `${baseUrl}/cloud/phone/web/#/pages/index/index`
         // 动态设置有问题 https://ask.dcloud.net.cn/question/96060
         // document.addEventListener('UniAppJSBridgeReady', function() {
         //   console.log(222)
@@ -1056,13 +1056,31 @@
       }
       systemBuriedPoint(pointName);
       if (getDate) {
-        wx.miniProgram.navigateTo({
-          url: '/packageA/order/buy/index'
-        })
+        if (window.__wxjs_environment === 'miniprogram') {
+          wx.miniProgram.navigateTo({
+            url: '/packageA/order/buy/index'
+          })
+        } else {
+          document.addEventListener('UniAppJSBridgeReady', function () {
+            uni.navigateTo({
+              url: '/pages/order/buy'
+            });
+          })
+        }
+        
       } else {
-        wx.miniProgram.navigateTo({
-          url: '/packageA/order/renew/index?record=' + form.userCardId
-        })
+        if (window.__wxjs_environment === 'miniprogram') {
+          wx.miniProgram.navigateTo({
+            url: '/packageA/order/renew/index?record=' + form.userCardId
+          })
+        } else {
+          document.addEventListener('UniAppJSBridgeReady', function () {
+            uni.navigateTo({
+              url: '/pages/order/renew?record=' + form.userCardId
+            });
+          })
+        }
+        
       }
     })
     // 放弃