1 直播分享的优化

2 预存的充值的过期显示 3 自定义组件商品分组，视频本地上传的功能，扫一扫的组件 4 秒杀列表，拼单列表的广告，礼包的广告 5. 积分0积分的时候的优化

1 直播分享的优化
2 预存的充值的过期显示 3 自定义组件商品分组，视频本地上传的功能，扫一扫的组件 4 秒杀列表，拼单列表的广告，礼包的广告 5. 积分0积分的时候的优化
yvan.ni
1 parent a7360293
Showing 24 changed files with 213 additions and 39 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_video/diy_video.js
components/diy_video/diy_video.wxml
packageA/pages/chongzhi/chongzhi.wxml
packageA/pages/liveStreamDetails/liveStreamDetails.js
pages/activity/pind_list/pind_list.js
pages/activity/pind_list/pind_list.wxml
pages/activity/seckill_list/seckill_list.js
pages/activity/seckill_list/seckill_list.wxml
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/buygiftpack/giftpackbuy.wxml
pages/giftpack/buygiftpack/giftpackbuy.wxss
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/mygiftpack/mygiftpack.wxml
pages/giftpack/mygiftpack/mygiftpack.wxss
pages/goods/goodsInfo/buy_integral.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -121,9 +121,13 @@ Component({
   methods: {
     // 这里是一个自定义方法
-    init: function (classstyle_id, wgroup) {
+    init:async function (classstyle_id, wgroup) {
+		
+	  this.setData({classstyle_id:classstyle_id})	
+		
       var th = this;
       var g_id = this.data.g_id;
+	  var len=this.data.firist_type_data.length;
       if (classstyle_id == 1) {
         //---手动选择的时候---
         g_id = this.data.firist_type_data[th.data.firist_type_curr];
@@ -147,7 +151,7 @@ Component({
             str += g_id[i].goodsid + ",";           
           }
           str=str.substring(0, str.length - 1);     
-          app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
+          await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
 			    isShowLoading:false,  
 			    success: function(res) {
@@ -179,8 +183,8 @@ Component({
 						   }
 						 //---控制有没有加载更多的按钮---
-						 if (th.data.firist_type_curr == th.data.firist_type_data.length) {th.setData({ goods_btn: [] }); }
-						 else  th.setData({ goods_btn: res.data});                   
+						 if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }
+						 else  th.setData({ goods_btn: [1,2]});                   
 					}
 				}
@@ -199,7 +203,7 @@ Component({
            if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
            if(th.data.is_new) r_data.is_new=th.data.is_new;
-          app.request.promiseGet("/api/weshop/goods/page", {
+         await app.request.promiseGet("/api/weshop/goods/page", {
               data:r_data
           }).then(res => {
             //商品地址
@@ -216,7 +220,7 @@ Component({
           break;
         case "3":
           var item = {};
-          app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
+          await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
             data: {
               store_id:os.stoid  ,
               gpid: wgroup,
@@ -602,14 +602,16 @@
     </block>
     <view class="clear"></view>
 </view>
+
+
 <!-- 商品的显示不是左右 -->
 <block wx:if="{{object.column!=5}}">
-<block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
+<block wx:if="{{classstyle_id=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
       {{loadText}}
     </button>
 </view></block>
-<block wx:if="{{object.classstyle!='1' }}">
+<block wx:if="{{classstyle_id!='1' }}">
   <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
      <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button>
   </view>
+var t = getApp(),
+  a = t.request,
+  os = t.globalData.setting;
+
 Component({
   properties: {
     object: {
@@ -11,10 +15,17 @@ Component({
     // 这里是一些组件内部数据
     someData: {},
     videoUrl: "",
+	url:os.imghost
   },
-  ready: function () {
-    this.create_url();
+  ready: function () {	 
+	 //-- 如果是本地视频的时候 -- 
+	 if(this.properties.object.style!=2){	
+		 //网络地址
+		 this.create_url();
+	 }else{
+		 this.setData({videoUrl:this.properties.object.src});
+	 }	   
   },
   methods: {
     // 这里是一个自定义方法
 <view class="vd_view">
-<video class="vd_web" src="{{videoUrl}}"></video>
+   <video class="vd_web" src="{{videoUrl}}"></video>
 </view>
 \ No newline at end of file
@@ -36,6 +36,7 @@
 						<view class="bottom" wx:if="{{currentIndex == 0}}" >
 							<text wx:if="{{g_filter.is_acting(item.EndDate)}}" 
 							   catchtap="viewDetails" data-index="{{index}}"  class="btn" >立即使用</text>
+							<text wx:else class="btn" style="background-color: #ccc;">已过期</text>   
 							<text  data-index="{{index}}"  class="btn details" >详情</text>
 						</view>
 						<view class="bottom" wx:if="{{currentIndex == 1}}" >
@@ -399,13 +399,18 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
     this.getSystemInfo();
 	var first_leader=options.first_leader;
+	var staffId=options.staffId;
+	var storageId=options.storageId;
+
 	if(first_leader){
 		 //--  user_id代过来免登陆 --
 	     getApp().globalData.first_leader=first_leader;	  
 	     //调用接口判断是不是会员
 	     getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{
 	         if(res.data.code==0){
-	             getApp().globalData.guide_id=res.data.data.id;
+	             getApp().globalData.guide_id=res.data.data.id;	
+				 getApp().globalData.staffId=staffId;	
+				 getApp().globalData.storageId=storageId;	
 	         }
 	     })
 	 }
@@ -420,6 +425,22 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
           that.setData({
             details: obj
           })
+		  
+		  //-- 如果是导购的时候 --
+		  if(getApp().globalData.guide_id && getApp().globalData.user_id){		  
+			   //报错领取记录
+			   var record={};	
+			   record.storeId=os.stoid;			
+			   record.ReceiveTime=ut.formatTime();			
+			   record.ReceiveType=7;			
+			   record.ReceiveUserId=getApp().globalData.user_id;			
+			   record.ShareStaffId=getApp().globalData.staffId;		
+			   record.ShareStorageId=getApp().globalData.storageId;		
+			   record.shareActId=details.id;		
+			   record.shareActName=details.name;		
+			   getApp().request.promiseGet.post('api/weshop/MdReceiveType/saveReceive',{data:record}).then(res=>{})
+		  }
+		  
           // 请求主图
@@ -14,12 +14,14 @@ Page({
         timer:null,
         ismore:1,
         isshow:0,
-      iurl: os.imghost,
+        iurl: os.imghost,
+		ad_data:null,
     },
     //------初始化加载----------
     onLoad: function(t) {
         var  first_leader = t.first_leader;
+		var th=this;
         console.log("------------");
         console.log(first_leader);
@@ -33,6 +35,22 @@ Page({
                 }
             })
         }
+		
+		getApp().request.promiseGet("/api/weshop/ad/page?pid=801&store_id=" + os.stoid, {
+		  data: {
+		    enabled: 1
+		  }
+		}).then(res => {
+			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+				var a = res.data.data.pageData;
+				var tt = {
+				  'ad_code': os.imghost + a[0].ad_code,
+				  'media_link': '',
+				  'ad_weapplink':a[0].ad_weapplink
+				};
+				th.setData({ad_data:tt});				
+			}					 			
+		})
     },
     onShow: function(t) {
@@ -2,8 +2,13 @@
 <view class=" body_frame">
-<image class="xc-top-img" src="{{url}}/miniapp/images/team.jpg">
-</image>
+<block wx:if="{{ad_data}}">
+  <image class="xc-top-img" src="{{ad_data.ad_code}}"></image>
+</block>
+<block wx:else>
+  <image class="xc-top-img" src="{{url}}/miniapp/images/team.jpg"></image>
+</block>
+
 <view class="kill-list">
     <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}">
@@ -11,11 +11,13 @@ Page({
         timer:null,
         ismore:1,  //是否可以加载更多
         isshow:0,
+		ad_data:null,
     },
     //------初始化加载----------
     onLoad: function(t) {
         var  first_leader = t.first_leader;
+		var th=this;
         console.log("------------");
         console.log(first_leader);
@@ -29,6 +31,23 @@ Page({
                 }
             })
         }
+		
+		getApp().request.promiseGet("/api/weshop/ad/page?pid=701&store_id=" + os.stoid, {
+		  data: {
+		    enabled: 1
+		  }
+		}).then(res => {
+			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+				var a = res.data.data.pageData;
+				var tt = {
+				  'ad_code': os.imghost + a[0].ad_code,
+				  'media_link': '',
+				  'ad_weapplink':a[0].ad_weapplink
+				};
+				th.setData({ad_data:tt});				
+			}					 			
+		})
+		
     },
@@ -2,8 +2,12 @@
 <block wx:if="{{isshow}}">
 <view class=" body_frame">
-<image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg">
-</image>
+<block wx:if="{{ad_data}}">
+  <image class="xc-top-img" src="{{ad_data.ad_code}}"></image>
+</block>
+<block wx:else>
+  <image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image>
+</block>
 <view class="kill-list abs seckill_list"> 
@@ -25,6 +25,7 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
+	ad_data:null,
   },
   onLoad: function(options) {
@@ -35,6 +36,25 @@ Page({
       getStorageID: a.stoid,
       getUserID: d.user_id
     })
+	
+	
+	getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+	  data: {
+	    enabled: 1
+	  }
+	}).then(res => {
+		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+			var a = res.data.data.pageData;
+			var tt = {
+			  'ad_code': os.imghost + a[0].ad_code,
+			  'media_link': '',
+			  'ad_weapplink':a[0].ad_weapplink,
+			  'bgcolor':a[0].bgcolor,
+			};
+			th.setData({ad_data:tt});				
+		}					 			
+	})
+	
   },
   onShow: function() {
@@ -73,6 +93,13 @@ Page({
           "userId": that.getUserID, //用户ID
           "buyFrom": 2
         };
+		
+		//-- 分享导购要记录 --
+		if(getApp().globalData.guide_id){
+			json.guide_id=getApp().globalData.guide_id;
+		}
+		
+		
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
@@ -134,6 +161,13 @@ Page({
           "userId": that.getUserID, //用户ID
           "buyFrom": 2
         };
+		
+		//-- 分享导购要记录 --
+		if(getApp().globalData.guide_id){
+			json.guide_id=getApp().globalData.guide_id;
+		}
+		
+		
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
-<view class="top_img">
-  <view class="top_img">
-    <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
-  </view>
+<view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};">	
+	<block wx:if="{{ad_data}}">
+		<view class="top_img">
+		  <image src="{{ad_data.ad_code}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
+		</view>
+	</block>
+	<block wx:else>
+	  <view class="top_img">
+		<image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
+	  </view>
+  </block>
+  
+  
   <view class="top_title">
     <view class="top_title_box">
       <text class="top_title_redtext">礼包列表</text>
@@ -6,7 +6,7 @@
  */
 page {
-  background-color: #fb7454;
+  /* background-color: #fb7454; */
 }
 .top_img {
@@ -141,10 +141,8 @@ Page({
       }
-
     )
-
   },
   GetBuyIntegral: function(e) {
     var that = this.data;
@@ -175,6 +173,13 @@ Page({
           "userId": d.user_id, //用户ID
           "buyFrom":2
         };
+		
+		//-- 分享导购要记录 --
+		if(getApp().globalData.guide_id){
+			json.guide_id=getApp().globalData.guide_id;
+		}
+		
+		
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
@@ -25,6 +25,7 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
+	ad_data:null,
   },
   onLoad: function(options) {
@@ -36,6 +37,23 @@ Page({
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
     })
+	
+	getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+	  data: {
+	    enabled: 1
+	  }
+	}).then(res => {
+		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+			var a = res.data.data.pageData;
+			var tt = {
+			  'ad_code': os.imghost + a[0].ad_code,
+			  'media_link': '',
+			  'ad_weapplink':a[0].ad_weapplink,
+			  'bgcolor':a[0].bgcolor,
+			};
+			th.setData({ad_data:tt});				
+		}					 			
+	})
   },
   onShow: function() {
-<view class="top_img">
-  <view class="top_img">
-    <!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> -->
-    <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image>
-  </view>
+<view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};">
+	<block wx:if="{{ad_data}}">
+		<view class="top_img">
+		  <image src="{{ad_data.ad_code}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
+		</view>
+	</block>	
+	<block wx:else>	
+	  <view class="top_img">
+		<!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> -->
+		<image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image>
+	  </view>
+   </block>
+  
+  
   <view class="top_title">
     <view class="top_title_box">
       <text class="top_title_blacktext" bindtap="redirectTo" data-url="/pages/giftpack/buygiftpack/giftpackbuy">礼包列表</text>
@@ -235,7 +235,7 @@
 }
 page {
-  background-color: rgb(250, 120, 88);
+  /* background-color: rgb(250, 120, 88); */
 }
 .After_all {
   height: 80rpx;
@@ -11,6 +11,7 @@
 		      				   <text wx:if="{{prom_integral}}">{{prom_integral}}积分</text>
 		      				   <text wx:if="{{prom_integral && prom_price}}">+</text>				   
 		      				   <text wx:if="{{prom_price}}">{{prom_price}}元</text>
+							   <text wx:if="{{!prom_integral && !prom_price}}">0积分</text>								   
 		      			     </view>
 		                </view>
@@ -3763,7 +3763,8 @@ Page({
 			  if(integral){text=integral+"积分";  }				  
 			  if(pri0 && integral){ text+="+";}
 			  if(pri0){ text+="￥"+pri0;}
-			
+			  
+			  if(!pri0 && !integral){ text="0积分";}			
 			  context.setFillStyle("red");	  
 			  context.fillText(text, 38 * unit, 215 * unit); 	 
@@ -235,12 +235,13 @@
 			  <view class="goods-price rel">
 				  <!-- 价格显示 -->
 				  <view class="co-red" style="overflow: hidden" >
-				      <view class="market-price" style="overflow: hidden">
+				      <view class="market-price" style="overflow: hidden; height: 66rpx;">
 					     <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
 						 <block wx:if="{{prom_integral}}">{{prom_integral}}
 						 <text class="rel_txt">积分</text></block>						
 						 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>						
-					     <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> 
+					     <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> 					 
+						 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>						 
 						 <text class="rel_txt" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">&nbsp;&nbsp;&nbsp;零售价:￥{{data.market_price}}</text>
 					  </view>
 				  </view>	
-{
-     
+{    
     "usingComponents": {
         "goods_recommend":"/components/goods_list/goods_list",
         "nav": "/components/diy_nav/diy_nav",
@@ -17,6 +16,8 @@
         "assist":"/components/diy_assist/diy_assist",
         "picMax": "/components/diy_picMax/diy_picMax",
         "mvideo": "/components/diy_video/diy_video",    
-        "service": "/components/diy_service/diy_service"    
-    }
+        "service": "/components/diy_service/diy_service",
+		"scan": "/components/diy_scan/diy_scan"
+    },
+	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -348,6 +348,10 @@
 	  <!--在线上客服-->
 	  <block wx:if="{{item.ename=='onlineService'}}">
 	   <service object="{{item.content}}"></service>
+	  </block>  
+	  <!--扫一扫-->
+	  <block wx:if="{{item.ename=='scan'}}">
+	     <scan object="{{item.content}}"></scan>
 	  </block>
     </view>
@@ -18,6 +18,8 @@
         "assist":"/components/diy_assist/diy_assist",
         "picMax": "/components/diy_picMax/diy_picMax",
         "mvideo": "/components/diy_video/diy_video",
-		 "service": "/components/diy_service/diy_service"    
-    }
+		"service": "/components/diy_service/diy_service",
+		"scan": "/components/diy_scan/diy_scan"
+    },
+	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -57,6 +57,10 @@
 	  <block wx:if="{{item.ename=='onlineService'}}">
 	    <service object="{{item.content}}"></service>
 	  </block>
+	  <!--扫一扫-->
+	  <block wx:if="{{item.ename=='scan'}}">
+	     <scan object="{{item.content}}"></scan>
+	  </block>
     </view>
   </block>
 </view>