MM - 订单列表 logo显示

pages/mine/home/home.js

@@ -60,6 +60,12 @@ Page({
         shopConfig: App.globalData.shopId,
         shopConfig: App.globalData.shopId,
         isYearCard: true,
         isYearCard: true,
         isMonthCard: false,
         isMonthCard: false,
+        goodTypeCountData: {}
+    },
+    goQuestion: function () {
+        wx.navigateTo({
+            url: '/pages/mine/question/question',
+        })
     },
     },
     // 跳转订单详情
     // 跳转订单详情
     onOrderDetail: function (event) {
     onOrderDetail: function (event) {
@@ -225,6 +231,25 @@ Page({
             }
             }
         })
         })
     },
     },
+    //获取分类统计
+    getCountByGoodType() {
+        let that = this
+        App.wxRequest({
+            url: '/api/v1/order/getCountByGoodType',
+            data: {
+                status: "", //0已过期1待使用2已使用(""全部)
+                pageNo: 1,
+                pageSize: -1
+            },
+            success: function (res) {
+                console.log(res, '获取分类统计');
+                let data = res.data ? res.data : {}
+                that.setData({
+                    goodTypeCountData: data
+                })
+            }
+        })
+    },
 
 
     setUserInfo: function () {
     setUserInfo: function () {
         let funcUserInfo = wx.getStorageSync('userInfo')
         let funcUserInfo = wx.getStorageSync('userInfo')
@@ -265,6 +290,8 @@ Page({
                     this.getWillUseOrders()
                     this.getWillUseOrders()
                     this.getPermissions()
                     this.getPermissions()
                     this.getIntegral()
                     this.getIntegral()
+                    this.getList()
+                    this.getCountByGoodType()
                 },
                 },
             })
             })
         } else {
         } else {
@@ -418,7 +445,6 @@ Page({
                         id: item.id,
                         id: item.id,
                         mobile: item.mobile,
                         mobile: item.mobile,
                         name: item.name,
                         name: item.name,
-
                     }
                     }
                     tmpArr.push(obj)
                     tmpArr.push(obj)
                 })
                 })

pages/mine/order/order.js

@@ -132,7 +132,7 @@ Page({
 
 
                     // 映射门店信息
                     // 映射门店信息
                     for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
                     for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
-                        if (funcItem.shopName === App.globalData.shopId[i].name) {
+                        if (funcItem.shopName.toLowerCase() === App.globalData.shopId[i].name.toLowerCase()) {
                             funcItem.shopId = App.globalData.shopId[i].id
                             funcItem.shopId = App.globalData.shopId[i].id
                             funcItem.shopAppId = App.globalData.shopId[i].appId
                             funcItem.shopAppId = App.globalData.shopId[i].appId
                             funcItem.shopLogo = App.globalData.shopId[i].logo
                             funcItem.shopLogo = App.globalData.shopId[i].logo