diff --git a/package-lock.json b/package-lock.json index c13cd9b..6e3b81c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9254,6 +9254,11 @@ "minipass": "^3.0.0" } }, + "miniprogram-skeleton": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/miniprogram-skeleton/-/miniprogram-skeleton-1.0.3.tgz", + "integrity": "sha512-oDt4rPP1gRYqlNuMcN+LQ0HDcEbBssOnp/weyZQsGV6+bDM++ClIX3AVU4LQBu3CF3XZ6n5qQIJJXt70e0Igsg==" + }, "mississippi": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz", diff --git a/package.json b/package.json index 1703d3e..2f75640 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "@dcloudio/uni-stat": "^2.0.0-26920200424005", "core-js": "^3.6.4", "flyio": "^0.6.2", + "miniprogram-skeleton": "^1.0.3", "regenerator-runtime": "^0.12.1", "sass-resources-loader": "^2.0.3", "vue": "^2.6.11", diff --git a/src/components/EasyLoadimage/EasyLoadimage.vue b/src/components/EasyLoadimage/EasyLoadimage.vue index a14d1d8..6448b06 100644 --- a/src/components/EasyLoadimage/EasyLoadimage.vue +++ b/src/components/EasyLoadimage/EasyLoadimage.vue @@ -57,7 +57,8 @@ export default{ loadImg:false, showImg:false, isLoadError:false, - showTransition:false + showTransition:false, + defaultImg: '/static/easy-loadimage/loading.gif' } }, methods:{ @@ -99,9 +100,13 @@ export default{ diff --git a/src/pages.json b/src/pages.json index 5b6074c..5857432 100644 --- a/src/pages.json +++ b/src/pages.json @@ -60,42 +60,42 @@ "navigationBarTitleText": "产品详情" } }, - { - "path": "pages/refundProgress/refundProgress", - "style": { - "navigationBarTitleText": "申请退款" - } - }, - { - "path": "pages/address/addAddress", - "style": { - "navigationBarTitleText": "新增地址" - } - }, - { - "path": "pages/address/addressList", - "style": { - "navigationBarTitleText": "地址管理" - } - }, + // { + // "path": "pages/refundProgress/refundProgress", + // "style": { + // "navigationBarTitleText": "申请退款" + // } + // }, + // { + // "path": "pages/address/addAddress", + // "style": { + // "navigationBarTitleText": "新增地址" + // } + // }, + // { + // "path": "pages/address/addressList", + // "style": { + // "navigationBarTitleText": "地址管理" + // } + // }, { "path": "pages/confirmOrder/confirmOrder", "style": { "navigationBarTitleText": "确认订单" } }, - { - "path": "pages/refundment/refundWays", - "style": { - "navigationBarTitleText": "退款方式" - } - }, - { - "path": "pages/refundment/refundment", - "style": { - "navigationBarTitleText": "申请退款" - } - }, + // { + // "path": "pages/refundment/refundWays", + // "style": { + // "navigationBarTitleText": "退款方式" + // } + // }, + // { + // "path": "pages/refundment/refundment", + // "style": { + // "navigationBarTitleText": "申请退款" + // } + // }, { "path": "pages/predelivery/predelivery", "style": { @@ -126,7 +126,25 @@ "navigationBarTitleText": "验光数据" } } - ], + ], + "subpackages": [ + { + "root": "pages/refundment", + "pages": [ + "pages/refundment/refundWays", + "pages/refundment/refundment", + "pages/refundProgress/refundProgress" + ] + }, + { + "root": "pages/address", + "name": "pack2", + "pages": [ + "pages/address/addAddress", + "pages/address/addressList" + ] + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", @@ -162,6 +180,11 @@ "condition": { "current": 0, "list": [ + // { + // "name": "首页", + // "path": "pages/test/index", + // "query": "" + // }, { "name": "首页", "path": "pages/index/index", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index a5748d7..ba6aad8 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,8 +1,9 @@ -