修改样式

1b2dc769 · 郑秀明 · c3e7a640 · 1b2dc769 · 1b2dc769
Commit 1b2dc769 authored Jul 15, 2020 by 郑秀明
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

manifest.json manifest.json +2 -6

functionmenu.vue pages/home/components/functionmenu.vue +1 -1

No files found.
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
  "name": "shop_mobile_uni",
  "appid": "__UNI__F904656",
  "description": "",
-  "versionName": "1.0.16",
+  "versionName": "1.0.17",
  "versionCode": "100",
  "transformPx": false,
  "app-plus": {
@@ -51,11 +51,7 @@
      "mode": "history",
      "base": "/uni"
    },
-<<<<<<< HEAD
+		"publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.17/",
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.14/",
-=======
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.16/",
->>>>>>> 33e0ae6b16fefaff99580171274e902f3237a6f2
    "optimization": {
      "treeShaking": {
        "enable": true

--- a/pages/home/components/functionmenu.vue
+++ b/pages/home/components/functionmenu.vue
@@ -79,7 +79,7 @@
 		display: block;
 		width: 96rpx;
 		height: 96rpx;
-		margin: 0 auto 20rpx;
+		margin: 0 auto 10rpx;
 	}
 	.title {
 		font-size: 24rpx;