feat: merge

2024-05-31 10:51:44 +08:00 · 2024-05-31 10:51:44 +08:00 · e429af331b
parent 96c34551d3
commit e429af331b
17 changed files with 22 additions and 21 deletions
--- a/pages.json
+++ b/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",
-        "text": "首页1"
+        "selectedIconPath": "static/tabs/首页2@2x.png",
+        "text": "首页"
      }
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "/static/tabs/首页@2x.png",
-        "selectedIconPath": "static/tabs/首页@2x.png",
-        "text": "pages"
-      }
-      
    ]
  },
  "globalStyle": {
--- a/pages/homeIndex/index.vue
+++ b/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;
--- a/static/tabs/bigImg.png
+++ b/static/tabs/bigImg.png
--- a/static/tabs/yujing_icon@2x.png
+++ b/static/tabs/yujing_icon@2x.png
--- a/static/tabs/铃铛@2x.png
+++ b/static/tabs/铃铛@2x.png
--- a/static/tabs/首页2@2x.png
+++ b/static/tabs/首页2@2x.png
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeIndex/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/homeIndex/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-link/components/uni-link/uni-link.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-link/components/uni-link/uni-link.js.map
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@ -18,15 +18,15 @@
    "list": [
      {
        "pagePath": "pages/index/index",
-        "iconPath": "/static/tabs/首页@2x.png",
-        "selectedIconPath": "static/tabs/首页@2x.png",
-        "text": "首页"
+        "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",
-        "text": "首页1"
+        "selectedIconPath": "static/tabs/首页2@2x.png",
+        "text": "首页"
      }
    ]
  },
--- a/unpackage/dist/dev/mp-weixin/pages/homeIndex/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/homeIndex/index.wxml
--- a/unpackage/dist/dev/mp-weixin/pages/homeIndex/index.wxss
+++ b/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;
--- a/unpackage/dist/dev/mp-weixin/static/tabs/bigImg.png
+++ b/unpackage/dist/dev/mp-weixin/static/tabs/bigImg.png
--- a/unpackage/dist/dev/mp-weixin/static/tabs/yujing_icon@2x.png
+++ b/unpackage/dist/dev/mp-weixin/static/tabs/yujing_icon@2x.png
--- a/unpackage/dist/dev/mp-weixin/static/tabs/铃铛@2x.png
+++ b/unpackage/dist/dev/mp-weixin/static/tabs/铃铛@2x.png
--- a/unpackage/dist/dev/mp-weixin/static/tabs/首页2@2x.png
+++ b/unpackage/dist/dev/mp-weixin/static/tabs/首页2@2x.png