wxd / MShopWeApp

Commit c0a786d7045261850ff1e979bb1db58e0759a810

Authored by yvan.ni
2 parents a649dfbf 9e8d61f1

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 6 changed files with 0 additions and 108 deletions
components/full_screen/filter.wxs deleted
View file @a649dfb
1   -var format = function (text) {
2   -
3   - if (!text) {
4   - return
5   - }
6   - var reg = getRegExp('\\\\n', 'g')
7   - return text.replace(reg, '\n')
8   -}
9   -
10   -module.exports = {
11   - format: format
12   -}
components/full_screen/full_screen.js deleted
View file @a649dfb
1   -// components/userqy_pop_up/userqy_pop_up.js
2   -var o = getApp().globalData.setting
3   -Component({
4   - /**
5   - * 页面的初始数据
6   - */
7   - data: {
8   - control: 1,
9   - is_full_screen_show:0, //全屏显示
10   - sec_show:3, //倒计时的秒数
11   - full_ad:null, //全屏广告
12   - url:o.imghost,
13   - full_screen:0,
14   - is_full_screen_men:1,
15   - hidden:0,
16   - },
17   -
18   - pageLifetimes:{
19   - hide: function() {
20   - // 页面被隐藏
21   - clearInterval(this.data.full_screen);
22   - },
23   - },
24   -
25   - ready: function () {},
26   - properties: {},
27   - methods: {
28   - close_full_screen(){
29   - this.setData({is_full_screen_show:0,sec_show:0});
30   - },
31   - //-- 跳转到满屏广告的链接 --
32   - go_full_ad(){
33   - if(!this.data.full_ad) return false;
34   - if(!this.data.full_ad.ad_weapplink) return false;
35   - getApp().goto(this.data.full_ad.ad_weapplink);
36   - },
37   - get_the_full_screen(){
38   - if(this.data.full_ad) {
39   - return false;
40   - }
41   - var th=this;
42   - //获取全屏的广告
43   - getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
44   - data: { enabled: 1 }
45   - }).then(res=>{
46   - //判断是不是有全屏广告
47   - if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
48   - th.setData({
49   - is_full_screen_show:1,
50   - full_ad:res.data.data.pageData[0],
51   - })
52   - //--定时关闭--
53   - th.data.full_screen=setInterval(function(){
54   - if(!th.data.sec_show) {
55   - clearInterval(th.data.full_screen);
56   - th.close_full_screen();
57   - return false;
58   - }
59   - th.data.sec_show--;
60   - th.setData({sec_show:th.data.sec_show});
61   - },1000)
62   -
63   - }
64   - })
65   - }
66   - },
67   -
68   -})
69 0 \ No newline at end of file
components/full_screen/full_screen.json deleted
View file @a649dfb
1   -{
2   - "component": true,
3   - "usingComponents": {}
4   -}
5 0 \ No newline at end of file
components/full_screen/full_screen.wxml deleted
View file @a649dfb
1   -<!-- 全屏控制 -->
2   -<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
3   - <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view>
4   -</view>
5   -
6   -
7   -
components/full_screen/full_screen.wxss deleted
View file @a649dfb
1   -.full_screen{
2   - position: fixed;left: 0;top: 0;
3   - z-index: 1000000000000;
4   - background-color: rgba(0,0,0,0.4);
5   - width: 100%;
6   - height: 100%;
7   - background-position: center;
8   - background-size: 100% 100%;
9   - background-repeat: no-repeat;
10   -}
11   -.skip_box{
12   - float: right; margin-top: 10rpx; margin-right: 10rpx;
13   - background-color: gainsboro; width: 120rpx;
14   - height: 48rpx; font-size: 28rpx; line-height: 48rpx;
15   - text-align: center; border-radius: 20rpx;
16   - }
17 0 \ No newline at end of file
pages/index/index/index.json
  View file @c0a786d
... ... @@ -18,7 +18,6 @@
18 18 "mvideo": "/components/diy_video/diy_video",
19 19 "service": "/components/diy_service/diy_service",
20 20 "scan": "/components/diy_scan/diy_scan",
21   - "full_screen": "/components/full_screen/full_screen",
22 21 "store_select": "/components/diy_store_select/diy_store_select"
23 22 },
24 23 "enablePullDownRefresh": false
... ...