新增营销系统、分销系统、会员功能、门店、提现功能

style/main.scss

@@ -21,6 +21,10 @@ $tips-color: #999;
 $white-color: #fff;
 $black-color: #000;
 
+.primary-color {
+  color: $primary-color;
+}
+
 
 .animation-button {
   background: $primary-color;
@@ -41,7 +45,7 @@ $black-color: #000;
   height: var(--window-bottom); // docs https://zh.uniapp.dcloud.io/matter.html#h5-%E5%BC%80%E5%8F%91%E6%B3%A8%E6%84%8F
 }
 
-.tabbar-height{
+.tabbar-height {
   height: 118rpx;
   padding-bottom: constant(safe-area-inset-bottom);
   padding-bottom: env(safe-area-inset-bottom);

style/style.scss

@@ -218,9 +218,51 @@ image {
 .time-bar {
   background: #fff;
   height: 150rpx;
+  display: flex;
 
-  .van-tab--active {
-    .time-bar-item {
+  &-item {
+    width: 100%;
+    height: 150rpx;
+    background: #ffffff;
+
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    .time {
+      margin-top: 21rpx;
+      line-height: 48rpx;
+      font-size: 34rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .status {
+      line-height: 33rpx;
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+
+    .countdown {
+      display: flex;
+      flex: 1;
+      color: #E96B45;
+      font-size: 20rpx;
+      line-height: 28rpx;
+      height: 28rpx;
+      max-height: 28rpx;
+      overflow: hidden;
+      align-items: center;
+
+      ::v-deep .uv-count-down__text {
+        font-size: 20rpx;
+        line-height: 28rpx;
+        color: #E96B45;
+      }
+    }
+
+    &.on {
       background: #e96b45;
 
       .time {
@@ -230,63 +272,16 @@ image {
       .status {
         color: #fff;
       }
+
+      .countdown {
+        color: #ffffff;
+
+        ::v-deep .uv-count-down__text {
+          color: #ffffff;
+        }
+      }
     }
   }
-
-  &-item {
-    width: 180rpx;
-    height: 150rpx;
-    background: #ffffff;
-
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .time {
-      margin-top: 26rpx;
-      line-height: 1em;
-      font-size: 34rpx;
-      font-weight: bold;
-      color: #333333;
-      margin-bottom: 10rpx;
-    }
-
-    .status {
-      line-height: 1em;
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-    }
-
-    .countdown {
-      flex: 1;
-      height: 1em;
-      font-size: 20rpx;
-      color: #ffffff;
-      font-weight: 100;
-    }
-  }
-
-  .van-tab {
-    padding: 0;
-  }
-
-  .van-tabs--line .van-tabs__wrap {
-    height: 150rpx;
-  }
-
-  .van-tabs__nav--line {
-    padding-bottom: 0;
-    padding: 0;
-  }
-
-  .van-tabs__wrap {
-    height: 150rpx;
-  }
-
-  .van-tabs__line {
-    display: none;
-  }
 }
 
 .card {
@@ -660,6 +655,8 @@ image {
 
   &-evaluate {
     position: relative;
+    padding: 20rpx;
+    box-sizing: border-box;
 
     &-btn {
       z-index: 999;
@@ -669,7 +666,7 @@ image {
       height: 25px !important;
       line-height: 25px !important;
       font-size: 12px !important;
-      bottom: 30rpx;
+      bottom: 130rpx;
       border-radius: 0 !important;
     }
   }
@@ -868,24 +865,29 @@ image {
   right: 0;
   background: #fff;
   z-index: 89;
-  .off-tip{
+
+  .off-tip {
     display: none;
-    background-color: rgba(0,0,0,0.5);
+    background-color: rgba(0, 0, 0, 0.5);
     color: #fff;
     font-size: 24rpx;
     line-height: 60rpx;
     text-align: center;
   }
-  .action-cont{
+
+  .action-cont {
     width: 100%;
     display: flex;
   }
-  &.off{
+
+  &.off {
     display: block;
-    .off-tip{
+
+    .off-tip {
       display: block;
     }
   }
+
   //#ifdef H5
   &.screen {
     bottom: var(--window-bottom);
@@ -897,6 +899,7 @@ image {
     padding-bottom: 0;
     bottom: 0;
   }
+
   // #endif
 
 
@@ -927,6 +930,8 @@ image {
 
   .action-icons {
     flex: 1;
+    flex-grow: 0;
+    min-width: 40%;
     display: flex;
     align-items: center;
     height: 118rpx;
@@ -1051,6 +1056,7 @@ image {
       flex: 1;
       text-align: right;
     }
+
     &-coupon {
       text-align: left;
     }
@@ -1213,10 +1219,11 @@ image {
   }
 }
 
-.y-popup{
+.y-popup {
   padding: 0;
-  .popup_inner{
-    .modal-inner{
+
+  .popup_inner {
+    .modal-inner {
       padding: 30rpx 20rpx;
     }
   }
@@ -1237,6 +1244,6 @@ image {
   &.show {
     @include usePadding(40, 10);
     border-top: 1rpx solid #E6E6E6;
-    height: 260rpx;
+    height: 320rpx;
   }
 }