Merge branch 'dd-7' of https://git.oa00.com/xiaowen/swsWecat into dd-7

pages/index/Salesranking/Allbrands/Allbrands.js

@@ -105,7 +105,7 @@ Page({
     })
     setTimeout(() => {
       wx.hideToast();
-    }, 500)
+    }, 1000)
 
   },
 

pages/index/Salesranking/Allbrands/Allbrands.wxml

@@ -16,7 +16,7 @@
             </picker>
         </view>
     </view>
-    <view style="margin: 32rpx 0 ;">
+    <view style="margin: 32rpx 0;">
         <view class="ranking">
             <view class="title">排名</view>
             <view class="title1">品牌名称</view>

pages/index/Salesranking/Allbrands/Allbrands.wxss

@@ -1,6 +1,4 @@
 /* pages/index/Salesranking/Allbrands/Allbrands.wxss */
-/* pages/index/Rankdetail/Rankdetail.wxss */
-
 /* 排行榜 */
 .list_event {
     margin: 32rpx;

pages/index/Salesranking/Salesranking.wxss

@@ -21,15 +21,17 @@
     background: transparent;
 }
 
-.van-dropdown-menu--top-bottom {
+/* .van-dropdown-menu--top-bottom {
     width: 166rpx;
     text-align: center;
     margin: 0rpx 12rpx 12rpx 12rpx;
-}
+} */
 
 .box_title {
+    color: #000;
     width: 150rpx;
     height: 60rpx;
+    line-height: 60rpx;
     font-size: 24rpx;
     text-align: center;
     /* background: #02ffd5; */
@@ -45,128 +47,15 @@
 }
 
 .color6 {
-    color: #666;
+    color: #000;
     font-size: 24rpx;
 }
 
 .timeIcon {
     color: #666;
     font-size: 18rpx;
-    margin-left: 5rpx;
-
-}
-
-
-.service_selection .is_checked{ 
-    border: 1px solid #FE0002 ; 
-    color: #FE0002 ; 
-    background: #fff; 
-   } 
-   .service_selection .normal{ 
-    border: none; 
-    color: #333; 
-    background: #F0F1EC; 
-   }
-
-   
-.screen {
-    width: 750rpx;
-    height: 190rpx;
-    background-color: #ffffff;
-
-}
-
-
-.van-dropdown-menu {
-    box-shadow: none !important;
-    /* border-bottom: 1rpx solid #F9F9F9; */
-}
-
-.condition {
-    margin: 16rpx 36rpx;
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    grid-gap: 16rpx;
-}
-
-.condition text {
-    width: 131rpx;
-    height: 24rpx;
-    text-align: center;
-    background: #ffffff;
-    border-radius: 4rpx;
-    font-size: 24rpx;
-    color: #333333;
-    padding: 16rpx 38rpx;
-    border: 1rpx solid #EAEAEA;
-}
-
-.condition .active {
-    color: #027AFF;
-}
-
-.custom-button {
-    font-size: 28px;
-}
-
-.slider-number {
-    position: absolute;
-    width: 100%;
-    font-size: 10px;
-    color: #AAAAAA;
-    bottom: 50rpx;
-}
-
-.slider-number .item .active {
-    color: #027AFF;
-}
-
-.slider-number .item text:after {
-    content: '';
-    display: block;
-    width: 1rpx;
-    height: 16rpx;
-    background-color: #EEEEEE;
-    position: absolute;
-    right: 50%;
+    left: 5rpx;
 }
-
-.slider-number text {
-    position: absolute;
-    transform: translateX(-50%);
-    white-space: nowrap;
-}
-
-.scrollList {
-    width: calc(100% - 48rpx);
-    display: flex;
-    margin: 16rpx 24rpx;
-    height: 80rpx;
-}
-
-.scrollList text {
-    background: #F6F6F6;
-    border-radius: 2px;
-    font-size: 12px;
-    color: #999999;
-    margin: 0 8rpx;
-    padding: 18rpx 24rpx;
-    height: min-content;
-    flex-shrink: 0;
-}
-
-.scrollList .actived {
-    font-size: 12px;
-    font-weight: bold;
-    color: #027AFF;
-    background: #F0F5FF;
-}
-
-.van-dropdown-item__title {
-    text-align: center;
-}
-
-
 /* 排行榜 */
 .list_event {
     margin: 24rpx 32rpx;
@@ -302,7 +191,7 @@
     flex-direction: row-reverse;
     color: #0084FF;
 }
-
+/* 
 .bs-item {
     display: flex;
     justify-items: flex-start;
@@ -322,7 +211,7 @@
     width: 200rpx;
     height: 200rpx;
     background-color: aquamarine;
-}
+} */
 
 /* 弹出框 */
 .brand_tu {
@@ -336,11 +225,13 @@
     height: 80rpx;
     line-height: 80rpx;
     text-align: center;
+    margin-left: 50rpx;
     font-size: 34rpx;
 
 }
 
 .tubiao {
+    width: 100rpx;
     height: 80rpx;
     line-height: 80rpx;
     text-align: center;
@@ -358,6 +249,14 @@
 }
 
 /* 顶部 */
+.top text{
+    font-size: 24rpx;
+    /* color: #333333; */
+}
+.top .timeIcon{
+    color: #666;
+    font-size: 18rpx;
+}
 .top {
     height: 80rpx;
     line-height: 50rpx;
@@ -374,6 +273,7 @@
     height: 60rpx;
     display: flex;
     margin-top: 10rpx;
+    /* color:  #027AFF; */
     /* float: right; */
     align-items: center;
     justify-content: space-between;
@@ -388,6 +288,7 @@
         height: 60rpx;
         display: flex;
         margin-top: 10rpx;
+        
         /* float: right; */
         align-items: center;
         justify-content:space-between;
@@ -412,7 +313,7 @@
 }
 /* 选中 */
   .title{
-    color: #333;
+    color: rgb(190, 62, 62);
     font-size: 24rpx
 }
 /* 选择中 */
@@ -438,7 +339,7 @@
       overflow: hidden;
       text-align:center;
       animation: myfirst 0.5s;
-      font-size: 30rpx;
+      font-size: 24rpx;
   }
   .select_one {
       padding-left: 20rpx;
@@ -466,128 +367,6 @@
     font-size: 12px;
 }
 
-/* pages/index/Salesranking/Brandranking/Brandranking.wxss */
-.add1 {
-    width: 686rpx;
-    overflow-x: scroll;
-    white-space: nowrap;
-}
-
-.add_box1 {
-    display: inline-block;
-    height: 208rpx;
-    width: 200rpx;
-    margin-left: 32rpx;
-    background-color: #339cff;
-    border-radius: 8rpx;
-    border: 2rpx solid #85c3ff;
-    overflow: hidden;
-}
-
-
-.heng1 {
-    height: 8rpx;
-    width: 72rpx;
-    background: white;
-    border-radius: 6rpx;
-    position: relative;
-    left: 66rpx;
-    top: 82rpx
-}
-
-.shu1 {
-    width: 8rpx;
-    height: 72rpx;
-    background: white;
-    border-radius: 6rpx;
-    position: relative;
-    left: 98rpx;
-    top: 45rpx
-}
-
-.event1 {
-    display: inline-block;
-    color: white;
-    font-size: 28rpx;
-    margin-left: 32rpx;
-    margin-top: 60rpx;
-}
-
-.btns {
-    margin-top: 32rpx;
-    width: 686rpx;
-    height: 88rpx;
-    font-weight: bold;
-    line-height: 88rpx;
-    color: rgba(0, 132, 255, 1);
-    font-size: 28rpx;
-}
-
-.event_recom1 {
-    margin-top: 32rpx;
-    min-height: 1000rpx;
-    background-color: #f9f9f9;
-    border-top-left-radius: 24rpx;
-    border-top-right-radius: 24rpx;
-}
-
-.van-index-bar .van-index-bar__sidebar {
-    top: 480rpx;
-    transform: none;
-}
-
-.van-index-anchor text {
-    font-size: 24rpx;
-    color: rgba(153, 153, 153, 1);
-}
-
-.event_recom1 .van-cell .van-cell__title {
-    font-size: 28rpx;
-}
-
-.my_cell {
-    width: 686rpx;
-    height: 96rpx;
-    background: white;
-    display: flex;
-    align-items: center;
-    padding: 0 32rpx;
-}
-
-.van-checkbox {
-    display: inline-block !important;
-}
-
-.my_cell .van-checkbox__icon {
-    margin-left: 32rpx;
-    font-size: 32rpx !important;
-}
-
-.my_cell .van-image {
-    margin-left: 48rpx;
-    margin-top: 4rpx;
-}
-
-.my_cell text {
-    font-size: 28rpx;
-    margin-left: 24rpx;
-}
-
-.event_box {
-    height: 36rpx;
-    background: white;
-    border-top-left-radius: 24rpx;
-    border-top-right-radius: 24rpx;
-}
-
-.bs-item-image {
-    display: inline-block;
-    width: 84rpx;
-    height: 84rpx;
-    padding: 12rpx;
-    margin-right: 24rpx;
-}
-
 .all {
     background: #027AFF;
     width: 72rpx;