From 2234cce02f8c50a7b181ce57329260ff15d47311 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Mon, 21 Nov 2022 16:05:39 +0800
Subject: [PATCH] cxw-010203

---
 components/indexCom/rankingChild/index.js | 18 +++++++++++-------
 pages/index/Salesranking/Salesranking.js  | 13 ++++++++++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/components/indexCom/rankingChild/index.js b/components/indexCom/rankingChild/index.js
index b76f208..83bdd13 100644
--- a/components/indexCom/rankingChild/index.js
+++ b/components/indexCom/rankingChild/index.js
@@ -31,9 +31,6 @@ Component({
                     sType: 'Marketing'
                 }).then(res => {
                     wx.setStorageSync('newTime', res)
-                    this.setData({
-                        newTime: wx.getStorageSync('newTime')
-                    })
                     resolve(true)
                 }).catch(() => {
                     reject(false)
@@ -95,9 +92,11 @@ Component({
             })
         },
         Rankdetail() {
+            this.getTimeData().then(() => {
                 wx.navigateTo({
                     url: "/pages/index/Salesranking/Salesranking"
                 })
+            })
         },
         //品牌排行
         ranking() {
@@ -106,8 +105,10 @@ Component({
             //       url: '/pages/mine/pages/bindUser/index'
             //     })
             // } else {
-                wx.navigateTo({
-                    url: "/pages/index/Salesranking/Brandranking/Brandranking"
+                this.getTimeData().then(() => {
+                    wx.navigateTo({
+                        url: "/pages/index/Salesranking/Brandranking/Brandranking"
+                    })
                 })
             // }
         },
@@ -118,9 +119,12 @@ Component({
             //       url: '/pages/mine/pages/bindUser/index'
             //     })
             // } else {
-                wx.navigateTo({
-                    url: "/pages/index/Salesranking/Salesranking"
+                this.getTimeData().then(() => {
+                    wx.navigateTo({
+                        url: "/pages/index/Salesranking/Salesranking"
+                    })
                 })
+               
             // }
         }
 
diff --git a/pages/index/Salesranking/Salesranking.js b/pages/index/Salesranking/Salesranking.js
index b8b9341..be20d12 100644
--- a/pages/index/Salesranking/Salesranking.js
+++ b/pages/index/Salesranking/Salesranking.js
@@ -40,7 +40,7 @@ Page({
         //图表
         // positiveOption:brokenLine(dName,dValue,dColor,data),
         imageUrl: getApp().globalData.imageUrl,
-        date: wx.getStorageSync('newTime'),
+        date: '',
         accountIndex: 0,
         ranking: [],
         accountIndex: 0,
@@ -268,10 +268,14 @@ Page({
     mySelect2({ detail }) {
         iPageIndex = 1
         iPageSize = 20
+        let n = 0;
+        if(detail) {
+            n = detail * 1;
+        }
         this.setData({
             ranking: [],
-            sPriceType: this.data.grades2[detail].value,
-            nengtitle2:this.data.grades2[detail].text,
+            sPriceType: this.data.grades2[n].value,
+            nengtitle2:this.data.grades2[n].text,
         })
         this.getTrend()
     },
@@ -372,6 +376,9 @@ Page({
      */
     onShow() {
         iPageIndex = 1;
+        this.setData({
+            date: wx.getStorageSync('newTime')
+        })
         // this.getTabBar().init();
         this.getData()
     },