diff --git a/app.json b/app.json index 3261492..22e4a66 100644 --- a/app.json +++ b/app.json @@ -24,7 +24,6 @@ "pages/user/return_goods/return_goods", "pages/user/withdrawals/withdrawals", "pages/user/express/express", - "pages/user/binding_info/binding_info", "pages/user/get_user_info/get_user_info", "pages/activity/seckill_list/seckill_list", "pages/activity/pind_list/pind_list", @@ -76,10 +75,8 @@ "pages/user/assistance/friend_assistance", "pages/user/assistance/assistance_success", "pages/user/assistance/assistance", - "pages/video/index", "pages/template/index", "pages/store/index", - "pages/user/choice_guide/choice_guide", "pages/cart/cart2_inte/cart2_inte", "pages/giftpack/festival/festival", "pages/team/team_more/team_more", @@ -88,12 +85,6 @@ "pages/user/deposit/prepaid/prepaid", "pages/distribution/distribution" ], - "plugins": { - "live-player-plugin": { - "version": "1.3.0", - "provider": "wx2b03c6e691cd7370" - } - }, "subPackages": [{ "root": "packageA/", "name":"pack1", @@ -158,7 +149,11 @@ "pages/evaluate_list/evaluate_list", "pages/luckactivity/luckinfo/luckinfo", "pages/luckactivity/index/index", - "pages/user/Change_phone/Change_phone" + "pages/user/Change_phone/Change_phone", + "pages/zuhegou/index/index", + "pages/user/binding_info/binding_info", + "pages/user/choice_guide/choice_guide", + "pages/video/index" ] } diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 8d346f3..b69427e 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -827,7 +827,7 @@ Page({ //-- 跳转到获取导购的列表 -- go_get_guide:function () { this.check_click_ok(function(){ - getApp().goto("/pages/user/choice_guide/choice_guide"); + getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); },1) }, diff --git a/components/catch/catch.js b/packageB/components/catch/catch.js index 27a6dca..5d4cd94 100644 --- a/components/catch/catch.js +++ b/packageB/components/catch/catch.js @@ -2,7 +2,7 @@ const { barcode, qrcode -} = require('../../utils/index.js') +} = require('../../../utils/index.js') Component({ data: { diff --git a/components/catch/catch.json b/packageB/components/catch/catch.json index e8cfaaf..e8cfaaf 100644 --- a/components/catch/catch.json +++ b/packageB/components/catch/catch.json diff --git a/components/catch/catch.wxml b/packageB/components/catch/catch.wxml index 2710fdf..2710fdf 100644 --- a/components/catch/catch.wxml +++ b/packageB/components/catch/catch.wxml diff --git a/components/catch/catch.wxss b/packageB/components/catch/catch.wxss index b6ea155..4be4891 100644 --- a/components/catch/catch.wxss +++ b/packageB/components/catch/catch.wxss @@ -1,5 +1,4 @@ -@import '../../app.wxss'; - +@import '../../../app.wxss'; .container { background-color: #f5f5f5; diff --git a/pages/user/choice_guide/choice_guide.js b/packageB/pages/user/choice_guide/choice_guide.js index 59394b7..59394b7 100644 --- a/pages/user/choice_guide/choice_guide.js +++ b/packageB/pages/user/choice_guide/choice_guide.js diff --git a/pages/user/choice_guide/choice_guide.json b/packageB/pages/user/choice_guide/choice_guide.json index fb6a217..fb6a217 100644 --- a/pages/user/choice_guide/choice_guide.json +++ b/packageB/pages/user/choice_guide/choice_guide.json diff --git a/pages/user/choice_guide/choice_guide.wxml b/packageB/pages/user/choice_guide/choice_guide.wxml index e72b521..e72b521 100644 --- a/pages/user/choice_guide/choice_guide.wxml +++ b/packageB/pages/user/choice_guide/choice_guide.wxml diff --git a/pages/user/choice_guide/choice_guide.wxss b/packageB/pages/user/choice_guide/choice_guide.wxss index fca6187..fca6187 100644 --- a/pages/user/choice_guide/choice_guide.wxss +++ b/packageB/pages/user/choice_guide/choice_guide.wxss diff --git a/pages/video/index.js b/packageB/pages/video/index.js index 82614ac..82614ac 100644 --- a/pages/video/index.js +++ b/packageB/pages/video/index.js diff --git a/pages/video/index.json b/packageB/pages/video/index.json index 6cb999b..6cb999b 100644 --- a/pages/video/index.json +++ b/packageB/pages/video/index.json diff --git a/pages/video/index.wxml b/packageB/pages/video/index.wxml index 9f7e86c..9f7e86c 100644 --- a/pages/video/index.wxml +++ b/packageB/pages/video/index.wxml diff --git a/pages/video/index.wxss b/packageB/pages/video/index.wxss index 04a0b0d..04a0b0d 100644 --- a/pages/video/index.wxss +++ b/packageB/pages/video/index.wxss diff --git a/packageB/pages/zuhegou/index/index.json b/packageB/pages/zuhegou/index/index.json index 1a3f45b..d341c05 100644 --- a/packageB/pages/zuhegou/index/index.json +++ b/packageB/pages/zuhegou/index/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "catch": "/components/catch/catch", + "catch": "/packageB//components/catch/catch", "nodata": "/components/nodata/nodata", "painter": "/packageB/components/painter/painter", "warn": "/components/long_warn/long_warn" diff --git a/pages/giftpack/festival/festival.wxml b/pages/giftpack/festival/festival.wxml index cd6ca6c..c50539e 100644 --- a/pages/giftpack/festival/festival.wxml +++ b/pages/giftpack/festival/festival.wxml @@ -1,6 +1,6 @@ - + diff --git a/pages/giftpack/festival/festival.wxss b/pages/giftpack/festival/festival.wxss index 632b656..d7ae42b 100644 --- a/pages/giftpack/festival/festival.wxss +++ b/pages/giftpack/festival/festival.wxss @@ -16,7 +16,7 @@ } .top { - margin: -20rpx 28rpx 45rpx 28rpx; + margin: 0rpx 28rpx 45rpx 28rpx; padding: 10rpx 10rpx 70rpx 10rpx; background-color: #fff; border-radius: 0rpx 0rpx 15rpx 15rpx; @@ -36,7 +36,7 @@ -webkit-box-pack: center; -webkit-justify-content: center; justify-content: center; - margin: 50rpx 15rpx 20rpx 15rpx; + margin: 20rpx 15rpx 20rpx 15rpx; } .top_box_text text { diff --git a/pages/index/index/index.js b/pages/index/index/index.js index f880fe3..a71d476 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -1009,7 +1009,7 @@ Page({ //弹出节日有礼 check_holiday_pop:function(){ var th=this; - getApp().waitfor(th,'w_holiday_pop',th.data.holiday_image,function(){ + getApp().waitfor2(th,'w_holiday_pop','holiday_image',function(){ console.log(th.data.holiday_image); th.setData({ new_image: th.data.holiday_image, diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 9e69ac7..5e92cdd 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -416,7 +416,7 @@ - + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 9b2a660..fb87eb7 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -1067,6 +1067,6 @@ page { .img-box { width: 560rpx; - height: 800rpx; + height: auto; } diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 0b6f43e..b322b97 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -896,7 +896,7 @@ Page({ //-- 跳转到获取导购的列表 -- go_get_guide:function () { this.check_click_ok(function(){ - getApp().goto("/pages/user/choice_guide/choice_guide"); + getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); },1) },