feat: merge

pages.json

@@ -29,19 +29,18 @@
     "color": "#333333",
     "selectedColor": "#eb4450",
     "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "/static/tabs/my2_icon@2x.png",
+        "selectedIconPath": "static/tabs/my2_icon@2x.png",
+        "text": "pages"
+      },
       {
         "pagePath": "pages/homeIndex/index",
         "iconPath": "/static/tabs/首页@2x.png",
-        "selectedIconPath": "static/tabs/首页@2x.png",
+        "selectedIconPath": "static/tabs/首页2@2x.png",
-        "text": "首页1"
+        "text": "首页"
       }
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "/static/tabs/首页@2x.png",
-        "selectedIconPath": "static/tabs/首页@2x.png",
-        "text": "pages"
-      }
-      
     ]
   },
   "globalStyle": {

pages/homeIndex/index.vue

@@ -6,7 +6,7 @@
         <div class="icon">
           <image
             style="width: 100%; height: 100%"
-            src="../../static/tabs/user.png"
+            src="../../static/tabs/头像_icon@2x.png"
             mode="aspectFit"
           ></image>
         </div>
@@ -354,6 +354,7 @@ export default {
 .container {
   font-size: 14px;
   line-height: 24px;
+  background-color: #f3f5f8;
 }
 .info {
   height: 100rpx;

unpackage/dist/dev/mp-weixin/app.json

@@ -18,15 +18,15 @@
     "list": [
       {
         "pagePath": "pages/index/index",
-        "iconPath": "/static/tabs/首页@2x.png",
+        "iconPath": "/static/tabs/my2_icon@2x.png",
-        "selectedIconPath": "static/tabs/首页@2x.png",
+        "selectedIconPath": "static/tabs/my2_icon@2x.png",
-        "text": "首页"
+        "text": "pages"
       },
       {
         "pagePath": "pages/homeIndex/index",
         "iconPath": "/static/tabs/首页@2x.png",
-        "selectedIconPath": "static/tabs/首页@2x.png",
+        "selectedIconPath": "static/tabs/首页2@2x.png",
-        "text": "首页1"
+        "text": "首页"
       }
     ]
   },

unpackage/dist/dev/mp-weixin/pages/homeIndex/index.wxss

@@ -1,7 +1,8 @@
 
 .container.data-v-34e6b08d {
   font-size: 14px;
-  line-height: 24px;
+  line-height: 24px;
+  background-color: #f3f5f8;
 }
 .info.data-v-34e6b08d {
   height: 100rpx;