diff --git a/bundle/pages/bargain_process/bargain_process.vue b/bundle/pages/bargain_process/bargain_process.vue index 4a1b1aa..e64b150 100644 --- a/bundle/pages/bargain_process/bargain_process.vue +++ b/bundle/pages/bargain_process/bargain_process.vue @@ -499,7 +499,7 @@ } this.$Router.push({ - path: '/pages/confirm_order/confirm_order', + path: '/bundle_b/pages/confirm_order/confirm_order', query: { data: params } diff --git a/bundle/pages/resource_details/resource_details.vue b/bundle/pages/resource_details/resource_details.vue index accdd22..86ec026 100644 --- a/bundle/pages/resource_details/resource_details.vue +++ b/bundle/pages/resource_details/resource_details.vue @@ -250,31 +250,7 @@ team_min_price } } }); - // uni.downloadFile({ - // url: this.resourceDetail.path,//文件的下载路径 - // success(res) { - // //保存到本地 - // uni.saveFile({ - // tempFilePath: res.tempFilePath,//文件的临时路径 - // success: function(res) { - // const savedFilePath = res.savedFilePath; - // // 打开文件 - // uni.openDocument({ - // filePath: savedFilePath, - // success: function(res) { - // uni.hideLoading() - // }, - // fail: function(res) {}, - // complete: function(res) { - // setTimeout(uni.hideLoading(), 4000) - // }, - // }); - // }, - // fail: function(err) { } - // }); - // }, - // fail(res) {} - // }) + }else if(goodsType == 1){ //vip会员开通页面 uni.navigateTo({ url: '/bundle/pages/user/vip' diff --git a/bundle/pages/shop_cart/shop_cart.vue b/bundle/pages/shop_cart/shop_cart.vue index d3b564a..7fddf19 100644 --- a/bundle/pages/shop_cart/shop_cart.vue +++ b/bundle/pages/shop_cart/shop_cart.vue @@ -319,7 +319,7 @@ type: 'cart' }; this.$Router.push({ - path: '/pages/confirm_order/confirm_order', + path: '/bundle_b/pages/confirm_order/confirm_order', query: { data: params } diff --git a/components/components/explore.vue b/components/components/explore.vue index 1596839..bac3da0 100644 --- a/components/components/explore.vue +++ b/components/components/explore.vue @@ -10,13 +10,21 @@ - + - + + + + + + + + + @@ -42,17 +50,21 @@ id: '' }], current: 0., - type:1, - + type:this.active == 2?0:1, } }, watch: { active() { if(this.active == 1){ + this.type =1; + }else if(this.active == 2){ + this.type =0; + } + console.log("当前类型:",this.type) + if(this.active == 1 || this.active == 2){ + this.current = 0 ; this.initRecommendTopic() - this.mescroll.resetUpScroll() - - + // this.mescroll.resetUpScroll() } } }, @@ -71,6 +83,7 @@ // 切换标签导航 changeTabs(event) { this.current = event; + this.type =this.type; }, // 初始化获取话题 initRecommendTopic() { diff --git a/components/components/lists.vue b/components/components/lists.vue index 74d64aa..9c91e1d 100644 --- a/components/components/lists.vue +++ b/components/components/lists.vue @@ -35,8 +35,10 @@ }, typeId: { type: [String, Number] - } + }, + }, + data() { return { height: '', @@ -48,7 +50,7 @@ top: "0", } }, - lists: [] + lists: [], } }, mounted() { diff --git a/components/components/xuqiu.vue b/components/components/xuqiu.vue index 02abab5..4391f57 100644 --- a/components/components/xuqiu.vue +++ b/components/components/xuqiu.vue @@ -11,9 +11,9 @@ - + - + @@ -41,16 +41,15 @@ name: '全部', id: '' }], - current: 0, + current2: 0., type:0, } }, watch: { - active() { if(this.active == 2){ this.initRecommendTopic() - this.mescroll.resetUpScroll() + // this.mescroll.resetUpScroll() } } }, @@ -61,15 +60,13 @@ initMescroll(event) { this.isInit = true; // 标记为true this.mescroll = event; - }, handleCancel() { this.keyword = ''; }, // 切换标签导航 changeTabs(event) { - - this.current = event; + console.log(111,this.current2) }, // 初始化获取话题 initRecommendTopic() { diff --git a/components/tabs/tabs.vue b/components/tabs/tabs.vue index f0ea0e6..3374371 100644 --- a/components/tabs/tabs.vue +++ b/components/tabs/tabs.vue @@ -323,8 +323,8 @@ // 滚动scroll-view,让活动的tab处于屏幕的中间位置 scrollByIndex() { // 当前活动tab的布局信息,有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息 - console.log('tabInfo') - console.log(this.tabQueryInfo) + // console.log('tabInfo') + // console.log(this.tabQueryInfo) let tabInfo = this.tabQueryInfo[this.currentIndex]; if (!tabInfo) return; diff --git a/pages.json b/pages.json index 5f736f6..db4fa38 100644 --- a/pages.json +++ b/pages.json @@ -98,15 +98,7 @@ } }, - { - "path": "pages/confirm_order/confirm_order", - "meta": { - "auth": true - }, - "style": { - "navigationBarTitleText": "确认订单" - } - }, + { "path": "pages/payment/payment", "meta": { @@ -834,6 +826,15 @@ { "root": "bundle_b", "pages": [ + { + "path": "pages/confirm_order/confirm_order", + "meta": { + "auth": true + }, + "style": { + "navigationBarTitleText": "确认订单" + } + }, { "path": "pages/published_works/published_works", "meta": { diff --git a/pages/community/community.vue b/pages/community/community.vue index f53c865..c1097cb 100644 --- a/pages/community/community.vue +++ b/pages/community/community.vue @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - diff --git a/pages/goods_details/goods_details.vue b/pages/goods_details/goods_details.vue index b45cfa8..b912d73 100644 --- a/pages/goods_details/goods_details.vue +++ b/pages/goods_details/goods_details.vue @@ -532,7 +532,7 @@ team_min_price this.goodsType == 2 ? (params.teamId = this.team.id) : ''; this.foundId ? (params.foundId = this.foundId) : ''; this.$Router.push({ - path: '/pages/confirm_order/confirm_order', + path: '/bundle_b/pages/confirm_order/confirm_order', query: { data: params } @@ -575,7 +575,7 @@ team_min_price type: 'buy' }; this.$Router.push({ - path: '/pages/confirm_order/confirm_order', + path: '/bundle_b/pages/confirm_order/confirm_order', query: { data: params } diff --git a/static/images/address_null.png b/static/images/address_null.png index 1298e8c..a69f311 100644 Binary files a/static/images/address_null.png and b/static/images/address_null.png differ diff --git a/static/images/banner_coupon.jpg b/static/images/banner_coupon.jpg index de01afb..17f77e1 100644 Binary files a/static/images/banner_coupon.jpg and b/static/images/banner_coupon.jpg differ diff --git a/static/images/bg_seckill.png b/static/images/bg_seckill.png index 0a8d176..88f0603 100644 Binary files a/static/images/bg_seckill.png and b/static/images/bg_seckill.png differ diff --git a/static/images/cart_null.png b/static/images/cart_null.png index 7baf296..518588c 100644 Binary files a/static/images/cart_null.png and b/static/images/cart_null.png differ diff --git a/static/images/category_title.png b/static/images/category_title.png index 4289bce..d36af8d 100644 Binary files a/static/images/category_title.png and b/static/images/category_title.png differ diff --git a/static/images/coupon_bg.png b/static/images/coupon_bg.png index f92d0d3..7520f0d 100644 Binary files a/static/images/coupon_bg.png and b/static/images/coupon_bg.png differ diff --git a/static/images/coupon_null.png b/static/images/coupon_null.png index 4189103..922468b 100644 Binary files a/static/images/coupon_null.png and b/static/images/coupon_null.png differ diff --git a/static/images/follow_null.png b/static/images/follow_null.png index 739bf60..fd7c4a9 100644 Binary files a/static/images/follow_null.png and b/static/images/follow_null.png differ diff --git a/static/images/icon_address.png b/static/images/icon_address.png index 41319a0..64b430d 100644 Binary files a/static/images/icon_address.png and b/static/images/icon_address.png differ diff --git a/static/images/icon_emoji.png b/static/images/icon_emoji.png index 030f70d..aebdd9e 100644 Binary files a/static/images/icon_emoji.png and b/static/images/icon_emoji.png differ diff --git a/static/images/icon_generate_poster.png b/static/images/icon_generate_poster.png index 2b732a4..06067d1 100644 Binary files a/static/images/icon_generate_poster.png and b/static/images/icon_generate_poster.png differ diff --git a/static/images/icon_share.png b/static/images/icon_share.png index 5dfdd1c..0da189e 100644 Binary files a/static/images/icon_share.png and b/static/images/icon_share.png differ diff --git a/static/images/icon_wait.png b/static/images/icon_wait.png index 1e9e49a..54cd289 100644 Binary files a/static/images/icon_wait.png and b/static/images/icon_wait.png differ diff --git a/static/images/icon_wechat.png b/static/images/icon_wechat.png index 11a8b0d..533c6fe 100644 Binary files a/static/images/icon_wechat.png and b/static/images/icon_wechat.png differ diff --git a/static/images/img_store_fail.png b/static/images/img_store_fail.png index e06cde5..9c5fd51 100644 Binary files a/static/images/img_store_fail.png and b/static/images/img_store_fail.png differ diff --git a/static/images/img_store_submit.png b/static/images/img_store_submit.png index 7f8cc2d..22bdf53 100644 Binary files a/static/images/img_store_submit.png and b/static/images/img_store_submit.png differ diff --git a/static/images/img_store_success.png b/static/images/img_store_success.png index 3610463..b739282 100644 Binary files a/static/images/img_store_success.png and b/static/images/img_store_success.png differ diff --git a/static/images/index_shop_bg.png b/static/images/index_shop_bg.png index 4aa6c50..95e2022 100644 Binary files a/static/images/index_shop_bg.png and b/static/images/index_shop_bg.png differ diff --git a/static/images/likes.png b/static/images/likes.png index 820969f..e2857d8 100644 Binary files a/static/images/likes.png and b/static/images/likes.png differ diff --git a/static/images/loading.gif b/static/images/loading.gif index d341d32..248df5f 100644 Binary files a/static/images/loading.gif and b/static/images/loading.gif differ diff --git a/static/images/null_gift.png b/static/images/null_gift.png index 1d39af8..18685ed 100644 Binary files a/static/images/null_gift.png and b/static/images/null_gift.png differ diff --git a/static/images/order_null.png b/static/images/order_null.png index 7b9fcfc..bce22c9 100644 Binary files a/static/images/order_null.png and b/static/images/order_null.png differ diff --git a/static/images/pintuan_bg.png b/static/images/pintuan_bg.png index 2e2d485..8b66743 100644 Binary files a/static/images/pintuan_bg.png and b/static/images/pintuan_bg.png differ diff --git a/static/images/portrait_empty.png b/static/images/portrait_empty.png index f8d230d..aa4c5cb 100644 Binary files a/static/images/portrait_empty.png and b/static/images/portrait_empty.png differ diff --git a/static/images/profit_null.png b/static/images/profit_null.png index 9eb7962..1a17540 100644 Binary files a/static/images/profit_null.png and b/static/images/profit_null.png differ diff --git a/static/images/tab-community.png b/static/images/tab-community.png index 26ddf48..17f1d98 100644 Binary files a/static/images/tab-community.png and b/static/images/tab-community.png differ