差图标

pages/user/index.js

@@ -156,6 +156,10 @@ Page({
         id: 6,
         name: '兴趣培训'
       },
+      {
+        id: 7,
+        name: '邮轮体验'
+      },
     ],
     talentsType: -1,
     shield: '../../images/shield.png',
@@ -168,39 +172,47 @@ Page({
    */
   onLoad: function (options) {
     serviceModel.getService(res => {
-      var serviceList = res.result
-      var service = []
-      var list = []
-      let j = 1;
-      var pList = []
-      var serviceData=[]
+      var serviceList = res.result;
+      var service = [];
+      var list = [];
+      var pList = [];
+      var serviceData = [];
+      var j = 0;
+    
       for (var i = 0; i < serviceList.length; i++) {
-        list.push(serviceList[i])
-        if (j == 10) {
-          j = 1;
-          service.push(list)
-          list = []
-        } else {
+        list.push(serviceList[i]);
         j++;
+    
+        if (j == 10) {
+          service.push(list);
+          list = [];
+          j = 0;
         }
+    
         this.data.servicePublic.forEach(item => {
           if (serviceList[i].server_name == item.name) {
-            pList.push(serviceList[i])
+            pList.push(serviceList[i]);
           }
-        })
+        });
       }
+    
+      if (list.length > 0) {
+        service.push(list);
+      }
+    
       for (let i = 0; i < pList.length; i += 6) {
-        serviceData.push(pList.slice(i, i + 6))
-      };
-      // console.log(serviceData)
-      console.log('service-->',service)
-      // console.log('servicePublic-->',serviceData)
+        serviceData.push(pList.slice(i, i + 6));
+      }
+    
+      console.log('service-->', service);
+      console.log('servicePublic-->', serviceData);
+    
+      // 更新页面数据
       this.setData({
         service: service,
         servicePublic: serviceData
-      })
-      // console.log(this.data.servicePublic)
-    })
+      });
+    });
     // this.fetchHomeBanner()
     wx.showShareMenu({
       withShareTicket: true,