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

后端研发-倪永富
2 parents dd053a03 380cb805
Showing 9 changed files with 133 additions and 4 deletions
components/diy_shopname/diy_shopname.wxml
components/diy_shopname/diy_shopname.wxss
components/full_screen/filter.wxs
components/full_screen/full_screen.js
components/full_screen/full_screen.json
components/full_screen/full_screen.wxml
components/full_screen/full_screen.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/index/index/index.json
@@ -10,7 +10,7 @@
             <view style="position: relative; height: 150rpx;">
             <view class="big_border" >
                 <view class="circle">
-                    <view class="border">
+                    <view class="border" style="width: 100%; height: 100%;">
                         <image   class="wxd_ww" src='{{sto}}' bindtap="go_user"></image>
                     </view>
                 </view>
@@ -139,9 +139,9 @@ left:-116rpx;
   width: 100%;
   height: 260rpx;
   position: absolute;
-  top: -130rpx;
+  margin-top: -130rpx;
   text-align: center;
-  margin-top: 50%;
+  top: 50%;
 }
  
 /* 小图片2圆边框 */
+var format = function (text) {
+
+  if (!text) {
+    return
+  }
+  var reg = getRegExp('\\\\n', 'g')
+  return text.replace(reg, '\n')
+}
+
+module.exports = {
+  format: format
+}
+// components/userqy_pop_up/userqy_pop_up.js
+var  o = getApp().globalData.setting
+Component({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    control: 1,
+	is_full_screen_show:0,  //全屏显示
+	sec_show:3,    //倒计时的秒数
+	full_ad:null,  //全屏广告
+	url:o.imghost,
+	full_screen:0,
+  },
+  
+  pageLifetimes:{
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+    show: function () {
+		var th=this;
+		th.setData({sec_show:3});	
+		//--如果有全屏广告的时候--
+		if(this.data.is_full_screen_show){
+			 //--定时关闭--
+			 th.data.full_screen=setInterval(function(){
+			 	 if(!th.data.sec_show) {
+			 		  clearInterval(th.data.full_screen);
+			 		  th.close_full_screen();
+			 		  return false;
+			 	 }
+			 	 th.data.sec_show--;
+			 	 th.setData({sec_show:th.data.sec_show});		 
+			 },1000)
+		}						
+    },
+	hide: function() {
+        // 页面被隐藏
+		clearInterval(this.data.full_screen);
+	},
+  },
+ 
+  properties: {
+  
+  },
+  ready: function () {
+    this.get_the_full_screen();
+  },
+  methods: {
+    close_full_screen(){
+    	this.setData({is_full_screen_show:0,sec_show:0});
+    },
+    //-- 跳转到满屏广告的链接 --
+    go_full_ad(){
+    	if(!this.data.full_ad) return false;
+    	if(!this.data.full_ad.ad_weapplink) return false;
+    	getApp().goto(this.data.full_ad.ad_weapplink);
+		this.setData({is_full_screen_show:0});
+    },   
+    get_the_full_screen(){		
+    	var th=this;
+    	//获取全屏的广告
+    	getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
+    		data: { enabled: 1 }
+    	}).then(res=>{
+             //判断是不是有全屏广告 	
+    		 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+    			 th.setData({
+    				 is_full_screen_show:1,
+    				 full_ad:res.data.data.pageData[0]
+    			 })
+				 
+				 //--定时关闭--
+				 th.data.full_screen=setInterval(function(){
+				 	 if(!th.data.sec_show) {
+				 		  clearInterval(th.data.full_screen);
+				 		  th.close_full_screen();
+				 		  return false;
+				 	 }
+				 	 th.data.sec_show--;
+				 	 th.setData({sec_show:th.data.sec_show});		 
+				 },1000)
+    		 }				
+    	})
+    }
+  },
+ 
+})
 \ No newline at end of file
+{
+	"component": true,
+    "usingComponents": {}
+}
 \ No newline at end of file
+<!-- 全屏控制 -->
+<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
+	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
+</view>
+
+
+
+.full_screen{
+	position: fixed;left: 0;top: 0;
+	z-index: 1000000000000;
+	background-color: rgba(0,0,0,0.4);
+	width: 100%;
+	height: 100%;
+	background-position: center;
+	background-size: cover;
+	background-repeat: no-repeat;
+}
+
+
+.skip_box{
+        float: right;  margin-top: 10rpx;  margin-right: 10rpx;
+        background-color: gainsboro;  width: 120rpx;
+        height: 48rpx;  font-size: 28rpx;  line-height: 48rpx;
+        text-align: center;  border-radius: 20rpx;
+ }
 \ No newline at end of file
@@ -2703,6 +2703,7 @@ Page({
 		   }else{
 			   ee.setData({prom_type: 0, isshow: 1,});
 			   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+			   ee.get_sto();
 			   return false;
 		   }					   
 		})
@@ -17,7 +17,8 @@
         "picMax": "/components/diy_picMax/diy_picMax",
         "mvideo": "/components/diy_video/diy_video",    
         "service": "/components/diy_service/diy_service",
-		"scan": "/components/diy_scan/diy_scan"
+		"scan": "/components/diy_scan/diy_scan",
+		"full_screen": "/components/full_screen/full_screen"
     },
 	"enablePullDownRefresh": false
 }
 \ No newline at end of file