diff --git a/mini-app/project.config.json b/mini-app/project.config.json index bdc7665b4..31600f617 100644 --- a/mini-app/project.config.json +++ b/mini-app/project.config.json @@ -127,6 +127,13 @@ "pathName": "pages/mall/user/user-address-list", "query": "", "scene": null + }, + { + "id": -1, + "name": "酒庄调查首页", + "pathName": "pages/index", + "query": "", + "scene": null } ] } diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy index 8f647cbe8..9db0ff705 100644 --- a/mini-app/src/app.wpy +++ b/mini-app/src/app.wpy @@ -93,6 +93,7 @@ wepy.app({ { pages: [ +'pages/mall/index', 'pages/index', 'pages/form1', 'pages/form2', @@ -100,7 +101,7 @@ pages: [ 'pages/form4', 'pages/form5', 'pages/form6', -'pages/mall/index', + 'pages/mall/goods-detail', 'pages/mall/user/user-address', 'pages/mall/user/user-address-list', diff --git a/mini-app/src/components/mall/tab/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy index 3b01bb9e3..50d87dfe2 100644 --- a/mini-app/src/components/mall/tab/mall-bbs.wpy +++ b/mini-app/src/components/mall/tab/mall-bbs.wpy @@ -56,6 +56,7 @@ +
diff --git a/mini-app/src/components/mall/tab/mall-car.wpy b/mini-app/src/components/mall/tab/mall-car.wpy index 40e945ed5..d28f545c5 100644 --- a/mini-app/src/components/mall/tab/mall-car.wpy +++ b/mini-app/src/components/mall/tab/mall-car.wpy @@ -30,6 +30,8 @@ > 全选 + +
diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy index 24c3b86b9..c883632d0 100644 --- a/mini-app/src/components/mall/tab/mall-home.wpy +++ b/mini-app/src/components/mall/tab/mall-home.wpy @@ -3,7 +3,7 @@ .header-image { width: 100%; - height: 200px; + height: 210px; z-index: -1; position: absolute; top: 0; @@ -11,7 +11,7 @@ } .user-banner { - margin-top: 180px; + margin-top: 190px; border-top: 1px solid #F5F6F7; border-top-right-radius: 20px; border-top-left-radius: 20px; @@ -26,10 +26,10 @@ border: #fff 1px solid; border-radius: 20px; width: 270rpx; - height: 60px; + height: 42px; box-shadow: 4px 4px 10px #cccccc; background-color: #ffffff; - padding: 10px; + padding: 16px; display: flex; font-weight: bold; @@ -77,12 +77,12 @@ diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy index dfbb2231b..010798896 100644 --- a/mini-app/src/components/mall/tab/mall-shopping.wpy +++ b/mini-app/src/components/mall/tab/mall-shopping.wpy @@ -11,9 +11,6 @@ module.exports.parseImage = parseImage; - - - @@ -57,7 +54,7 @@ module.exports.parseImage = parseImage; - +
@@ -78,8 +75,7 @@ wepy.component({ active: 0, records: [], currentFilter: '全部', - filterButtons: ['全部'], - isInit: false + filterButtons: ['全部'] }, @@ -106,11 +102,11 @@ wepy.component({ }, async init() { + + this.isInit = false const req = await mailApis.getGoodsList() - if (req.code === 200) { - this.records = req.rows - } + this.records = req.rows this.isInit = true } @@ -125,6 +121,7 @@ wepy.component({ break } } + this.init() } }) diff --git a/mini-app/src/components/nav-bar.wpy b/mini-app/src/components/nav-bar.wpy index 4f60238d3..0bbe64592 100644 --- a/mini-app/src/components/nav-bar.wpy +++ b/mini-app/src/components/nav-bar.wpy @@ -1,43 +1,44 @@ diff --git a/mini-app/src/pages/winery/winery-detail.wpy b/mini-app/src/pages/winery/winery-detail.wpy index 5d4ce753c..0b5b31f57 100644 --- a/mini-app/src/pages/winery/winery-detail.wpy +++ b/mini-app/src/pages/winery/winery-detail.wpy @@ -69,9 +69,18 @@ module.exports.parseImage = parseImage;