From 478a3fa72d33dd038b209b2bd1525354252198bc Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Fri, 16 Dec 2022 15:35:48 +0800
Subject: [PATCH] zx

---
 pages/insight/brandChild/index.js   | 15 +++++++++++----
 pages/insight/brandChild/index.wxml |  2 +-
 pages/insight/modalChild/index.js   | 18 +++++++++++++-----
 pages/insight/modalChild/index.wxml |  2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pages/insight/brandChild/index.js b/pages/insight/brandChild/index.js
index 32e20b1..03d5d40 100644
--- a/pages/insight/brandChild/index.js
+++ b/pages/insight/brandChild/index.js
@@ -7,6 +7,7 @@ Component({
             brand: ''
         },
         history: [],
+        alphalist: [],
     },
     methods: {
         toBrandInsight(e) {
@@ -58,21 +59,26 @@ Component({
             //页面数据
             app.globalData.request({
                 action: 'getUserBrand',
-                token: wx.getStorageSync('token'),
+                token: wx.getStorageSync('token') || 't%2BrswgjvzGM=',
             }).then(res => {
                 let arr = []
                 let recommandArr = [];
+                let alphalist = [];
                 res.forEach(ele => {
                     if(ele.firstword == '热门') {
                         recommandArr.push(ele)
+                    } else {
+                        if(alphalist.indexOf(ele.firstword) == -1) {
+                            alphalist.push(ele.firstword)
+                        }
                     }
                 });
-                for (let i = 65; i <= 90; i++) {
+                alphalist.forEach(ele => {
                     arr.push({
-                        name: String.fromCharCode(i),
+                        name: ele,
                         data: []
                     });
-                }
+                });
                 for(let i of res){
                     for(let j of arr){
                         if(i.firstword == j.name){
@@ -81,6 +87,7 @@ Component({
                     }
                 }
                 this.setData({
+                    alphalist: alphalist,
                     brandList:arr,
                     recommandBrand: recommandArr,
                 });
diff --git a/pages/insight/brandChild/index.wxml b/pages/insight/brandChild/index.wxml
index 05f36dd..8241569 100644
--- a/pages/insight/brandChild/index.wxml
+++ b/pages/insight/brandChild/index.wxml
@@ -9,7 +9,7 @@
                 </view>
             </scroll-view>
         </view>
-        <van-index-bar class="bs-bar" sticky-offset-top="40">
+        <van-index-bar index-list="{{ alphalist }}" class="bs-bar" sticky-offset-top="40">
             <view wx:for="{{brandList}}" wx:for-item="item" wx:key="index">
                 <van-index-anchor index="{{item.name}}" />
                 <van-cell wx:for="{{item.data}}" wx:for-item="it" wx:key="index" clickable data-id="{{it}}" bind:click="toBrandInsight">
diff --git a/pages/insight/modalChild/index.js b/pages/insight/modalChild/index.js
index 875ede5..772b0c2 100644
--- a/pages/insight/modalChild/index.js
+++ b/pages/insight/modalChild/index.js
@@ -7,6 +7,7 @@ Component({
         currentBrand: '',
         history: [],
         queryname: '',
+        alphalist: [],
     },
     methods: {
         modalChoose(e) {
@@ -106,13 +107,19 @@ Component({
                 action: 'getUserBrand',
                 token: wx.getStorageSync('token'),
             }).then(res => {
-                let arr = []
-                for (let i = 65; i <= 90; i++) {
+                let arr = [];
+                let alphalist = [];
+                res.forEach(ele => {
+                    if(ele.firstword != '热门' && alphalist.indexOf(ele.firstword) == -1) {
+                        alphalist.push(ele.firstword)
+                    }
+                });
+                alphalist.forEach(ele => {
                     arr.push({
-                        name: String.fromCharCode(i),
+                        name: ele,
                         data: []
                     });
-                }
+                });
                 for(let i of res){
                     for(let j of arr){
                         if(i.firstword == j.name){
@@ -121,7 +128,8 @@ Component({
                     }
                 }
                 this.setData({
-                    brandList:arr
+                    alphalist: alphalist,
+                    brandList: arr
                 });
             });
         },
diff --git a/pages/insight/modalChild/index.wxml b/pages/insight/modalChild/index.wxml
index 7190059..3deb953 100644
--- a/pages/insight/modalChild/index.wxml
+++ b/pages/insight/modalChild/index.wxml
@@ -11,7 +11,7 @@
                 </view>
             </scroll-view>
         </view>
-        <van-index-bar class="bs-bar" sticky-offset-top="40">
+        <van-index-bar index-list="{{ alphalist }}" class="bs-bar" sticky-offset-top="40">
             <view wx:for="{{brandList}}" wx:for-item="item" wx:key="index">
                 <van-index-anchor index="{{item.name}}" />
                 <van-cell wx:for="{{item.data}}" wx:for-item="it" wx:key="brandname" clickable data-id="{{it.brandname}}" bind:click="modalChoose">