diff --git a/config/app.js b/config/app.js index 0e16dde..cee47b2 100644 --- a/config/app.js +++ b/config/app.js @@ -55,7 +55,6 @@ module.exports = { HTTP_REQUEST_URL_THREE: httpApiThree, HTTP_REQUEST_URL_FOUR: httpApiFour, HTTP_REQUEST_URL_FIVE: httpApiFive, - OSS_URL: ossUrl, VUE_APP_WS_URL: `${wsApi}?type=user`, VUE_APP_WS_URL_ONE:wsApi_one, // #endif @@ -72,6 +71,7 @@ module.exports = { // #endif openPlantGrass: openPlantGrass, ENV: env, + OSS_URL: ossUrl, HEADER: { 'content-type': 'application/json', diff --git a/pages.json b/pages.json index 7f77c71..a8ba8c6 100644 --- a/pages.json +++ b/pages.json @@ -240,7 +240,9 @@ "style" : { "navigationBarTitleText" : "红包余额", - "enablePullDownRefresh" : false + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "onReachBottomDistance": 300 } }, { @@ -280,6 +282,14 @@ "navigationBarTitleText" : "购物车", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/newActivity/giftBag/giftBag", + "style" : + { + "navigationBarTitleText" : "新人礼包", + "enablePullDownRefresh" : false + } } ], "subPackages": [{ diff --git a/pages/newActivity/giftBag/giftBag.vue b/pages/newActivity/giftBag/giftBag.vue new file mode 100644 index 0000000..943d5d6 --- /dev/null +++ b/pages/newActivity/giftBag/giftBag.vue @@ -0,0 +1,819 @@ + + + + + \ No newline at end of file diff --git a/pages/redpacket/redpack_type.vue b/pages/redpacket/redpack_type.vue index 334d779..cbb8955 100644 --- a/pages/redpacket/redpack_type.vue +++ b/pages/redpacket/redpack_type.vue @@ -1,6 +1,8 @@