diff --git a/common/js/request.js b/common/js/request.js index e9c7772..01ab5f6 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -10,9 +10,9 @@ export default { title: '加载中' }) // request 触发前拼接 url - args.url = 'https://www.opsoul.com' + args.url; + // args.url = 'https://www.opsoul.com' + args.url; // args.url = 'http://192.168.2.42:80' + args.url; - // args.url = 'http://127.0.0.1:80' + args.url; + args.url = 'http://127.0.0.1:80' + args.url; if (args.data) { args.data.deptId = globalData.deptId; args.data.from = globalData.from; diff --git a/components/goods-card/vertical-goods-card.vue b/components/goods-card/vertical-goods-card.vue index 04cf18b..b9838d9 100644 --- a/components/goods-card/vertical-goods-card.vue +++ b/components/goods-card/vertical-goods-card.vue @@ -5,9 +5,16 @@ {{title}} - + - + + + + + + + + @@ -33,6 +40,10 @@ goodsInfos: { type: Array, default: [] + }, + multiPicMode: { + type: Boolean, + default: false } }, data() { @@ -49,5 +60,25 @@ diff --git a/pages/index/home.vue b/pages/index/home.vue index b79403b..d52e7b4 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -72,7 +72,7 @@ - + diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue index 36e33c8..8a0d62f 100644 --- a/pages/product/product-detail.vue +++ b/pages/product/product-detail.vue @@ -16,7 +16,7 @@ - + @@ -201,7 +201,8 @@ isShowAllSpecs: false, reviewers: [], productVideoPlaying: false, - showTopNav: false, + showTopNav: false, + changeSwiperHeight: false, curTopNav: 0, shopInfo: {}, ifShowPageMeta: false, @@ -223,7 +224,8 @@ this.productVideoContext = uni.createVideoContext('productVideo'); }, onPageScroll(e) { - this.showTopNav = e.scrollTop > 250 ? true : false + this.showTopNav = e.scrollTop > 250 ? true : false; + this.changeSwiperHeight = e.scrollTop > 50 ? true: false; }, methods: { async loadData(params) { @@ -339,5 +341,15 @@ right: 25rpx; top: 25rpx; z-index: 99; + } + + .sm-screen-swiper { + height: 400rpx; + transition: all 0.5s ease-in-out; + } + + .lg-screen-swiper { + height: 900rpx; + transition: all 0.5s ease-in-out; } diff --git a/style/default.css b/style/default.css index 8956bbd..5a690b8 100644 --- a/style/default.css +++ b/style/default.css @@ -94,4 +94,10 @@ .cu-form-group textarea { margin: 0 0 20rpx 0 !important; padding: 20rpx !important; +} + +.flex-column-start { + display: flex; + flex-direction: column; + justify-content: flex-start; } \ No newline at end of file