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

SD-20201218MMYE\Administrator
2 parents aaa9536e 1032406f
Showing 34 changed files with 449 additions and 103 deletions
app.wxss
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/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
@@ -446,12 +446,12 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot');
-  src: url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.woff') format('woff'),
-  url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_2054717_kp0q24eh5l.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot');
+  src: url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2054717_ntayyd8f2u.svg#iconfont') format('svg');
 }
  
 .iconfont {
@@ -462,6 +462,10 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
  
+.icon-shanchu:before {
+  content: "\e61b";
+}
+
 .icon-buqian:before {
   content: "\e65f";
 }
@@ -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;
@@ -819,7 +819,7 @@ Page({
   // },
   // 左侧更新
   scrollLower: function (data) {
-    //console.log("上拉加载更多", JSON.stringify(data))
+    if(this.data.is_no_more) return false;
     var that = this;
     clearInterval(that.data.timer);
     that.setData({
@@ -843,18 +843,17 @@ Page({
         });
         if (e.data.data.pageData.length > 0) {
           s.setData({
-            msgStatus: false,
+            msgStatus: false,is_no_more:0
           });
           //如果有数据 判断分页为第一页的时候直接渲染数据
           if (page > 1) {
             //如果分页不是在第一页 那么就把返回的数据追加到原有数据后面
             var arr = s.data.requestData
-            console.log("arr:=" + JSON.stringify(arr))
-            
+          
             for (var i = 0; i < e.data.data.pageData.length;i++){
               arr.push(e.data.data.pageData[i]);
             }
-            console.log(arr)
+            
             s.setData({
               requestData: arr
             });
@@ -875,19 +874,28 @@ Page({
           if (page != 1) {
             var dataArray = s.data.one_level_classify
             var index = s.data.index
-            dataArray[index]['items']['is_show_class'] = false
-            dataArray[index+1]['items']['is_show_class'] = true
-            console.log(dataArray[index + 1]['items'])
-            s.setData({
-              msgStatus: true,
-              stylePage: 1,
-              index: index + 1,
-              select_classify_on: index + 1,
-              cat_id: dataArray[index + 1]['items']['id'],
-              classify_name: dataArray[index + 1]['items']['name'],
-              one_level_classify: dataArray
-            });
-            s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
+            dataArray[index]['items']['is_show_class'] = false		
+			//没有下一个类别的时候
+			if(index+1>=dataArray.length){
+				s.setData({is_no_more:1});
+			}else{
+				dataArray[index+1]['items']['is_show_class'] = true
+				console.log(dataArray[index + 1]['items'])
+				s.setData({
+				  msgStatus: true,
+				  stylePage: 1,
+				  index: index + 1,
+				  select_classify_on: index + 1,
+				  cat_id: dataArray[index + 1]['items']['id'],
+				  classify_name: dataArray[index + 1]['items']['name'],
+				  one_level_classify: dataArray,
+				  is_no_more:0
+				});
+				s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
+			}
+			
+			
+            
           }else{
             //没有数据而且是第一页的时候
             s.setData({
@@ -897,7 +905,8 @@ Page({
             s.setData({
               msgStatus: true,
               countDownNum: countDownNum,
-              requestData: []
+              requestData: [],
+			  is_no_more:0,
             });
             s.data.timer=setInterval(function () {
               if (countDownNum == 0) {
@@ -1012,6 +1021,12 @@ Page({
   		  if(!url || url=='') return; 
   		  if(url[0]!='/') url='/'+url;
   		  getApp().goto(url);
+   },
+   
+   onShareTimeline(){
+	    return {
+		   title:'商品分类-'+getApp().globalData.config.store_name,
+	   }
    }
  
 });
 \ No newline at end of file
@@ -493,6 +493,9 @@
                             </block>
                           </view>
                       </navigator>
+					  <!-- 暂无更多 -->
+					  <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" 
+					        wx:if="{{is_no_more}}">暂无更多</view>					  
                     </view>
                     <view class="no-data" wx:if="{{msgStatus == true}}">
                       <!-- <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> -->
@@ -500,8 +503,9 @@
                       <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title" style="text-align:center;margin-top:100px">
                       <view style="color:#444;line-height:30px;">该类别暂无推荐商品</view><view style="color:#444;line-height:30px;"> {{countDownNum}} 秒后自动跳到下一个类别</view> </view>
                       <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title" style="text-align:center;margin-top:100px">该类别暂无推荐商品</view>
-                      <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->
+                      <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->					  					 
                     </view>
+					
  
                 </scroll-view>
                 <!-- /goodslist -->
@@ -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>
  
@@ -261,10 +261,10 @@ Page({
 		room_user_share=t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
  
 	//-- 自定义海报 --
-	getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
-		data:{store_id:os.stoid, type:1, is_use:1 }
+	getApp().request.promiseGet("/api/weshop/goods/poster/page", {	
+		data:{store_id:os.stoid, type:1, is_use:1}
 	}).then(res=>{
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
+		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){
  
 			var poster_data=res.data.data.pageData[0];
 			var json_str=poster_data.jsonStr;
@@ -314,7 +314,6 @@ Page({
       getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
         if(res.data.code==0){
           getApp().globalData.guide_id=res.data.data.id;
-		  console.log("log2---".getApp().globalData.guide_id);
         }
       })
     }
@@ -3587,6 +3586,12 @@ Page({
       'store_id': os.stoid,
       'type': 5
     };
+	
+	//-- 导购ID --
+	if(getApp().globalData.guide_id){
+		pdata.guide_id=getApp().globalData.guide_id;
+	}
+	
     var app = getApp(),
         th = this;
     app.request.post("/api/weshop/couponList/saveCouponList", {
@@ -3641,14 +3646,14 @@ Page({
     var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
     var path2 = that.data.data.original_img;
     var scene = th.data.gid+"";
-    var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
-    if(user_id>0){
+    var user_id = getApp().globalData.user_id?getApp().globalData.user_id:0;
+    if(user_id>0) {
       scene+="_"+user_id;
     }
 	 //-- 如果不是会员分享过来的要分享给别人 --
-	if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share){
+	if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
 		 //固定房间是第3个字符
-		 if(!user_id)  scene+="_0";
+		 if(!user_id) scene+="_0";
 		 scene+="_"+getApp().globalData.room_id ;
 	}
     ///二微码
@@ -3678,7 +3683,7 @@ Page({
           context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
  
 		  //-- 是自定义海报的情况下 --
-		  if(th.data.poster && parseInt(th.data.poster.style)==2){
+		  if(th.data.poster && parseInt(th.data.poster.style)==2) {
 			  //在线上分享人的情况下
 			  if(parseInt(th.data.poster.show_headpic)){				 
 				  //获取坐标
@@ -3697,9 +3702,13 @@ Page({
 				  context.setFontSize(16 * unit)
 				  context.setLineJoin('round'); //交点设置成圆角
 				  context.setFillStyle("white")
-				  context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); 				  				  
+				  context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); 
+						
+					context.setFillStyle("black")
+					context.setFontSize(24 * unit)
+					context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
 			  }	
-		  }else{
+		  } else {
 			 //--昵称---
 			 context.setFontSize(24 * unit)
 			 context.setFillStyle("black")
@@ -3708,9 +3717,9 @@ Page({
 			 //强烈推荐 改许程
 			 var tj_path = "../../../images/share/q_tj.png";
 			 context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
-			 context.setFontSize(16 * unit)
+			 context.setFontSize(16 * unit);
 			 context.setLineJoin('round'); //交点设置成圆角
-			 context.setFillStyle("white")
+			 context.setFillStyle("white");
 			 context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); 
 		  }
  
@@ -3754,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); 	 
  
@@ -3805,23 +3815,33 @@ Page({
 			  }
  
  
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 710 * unit)
-              context.lineTo(520 * unit, 710 * unit)
-              context.stroke();
-              //---文字---
-              context.setFillStyle("black")
-              context.setFontSize(22 * unit)
+				//---画线---
+				context.setLineWidth(1 * unit)
+				context.moveTo(32 * unit, 710 * unit)
+				context.lineTo(520 * unit, 710 * unit)
+				context.stroke();
+				
+				//---文字---
+				context.setFillStyle("black")
+				context.setFontSize(22 * unit)
  
 			  if(type==0){
 				  // 原来start --->
+					
 				  context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
-				  context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);				  							
+				  context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);	
+					// context.setFillStyle("black")
+					// context.setFontSize(28 * unit)
+					// context.fillText(th.data.sto_sele_name, 40 * unit, 776 * unit);
 			  }else{
-				// 原来start --->
-				context.fillText("长按识别二维码", 40 * unit, 776 * unit);
-				context.fillText("立即开始兑换", 40 * unit, 826 * unit);										 
+					// 原来start --->
+					// context.fillText("长按识别二维码", 40 * unit, 776 * unit);
+					// context.fillText("立即开始兑换", 40 * unit, 826 * unit);
+					context.fillText("长按识别二维码", 40 * unit, 776 * unit);
+					context.fillText("立即开始兑换", 40 * unit, 826 * unit);
+					// context.setFillStyle("black")
+					// context.setFontSize(28 * unit)
+					// context.fillText(th.data.sto_sele_name, 40 * unit, 776 * unit);									 
 			  }
  
               //---二维吗图---            
@@ -4889,6 +4909,18 @@ Page({
  
 	 addCart_inte:function(t){
 		  this.add_cart_func_inte(t);
-	 }
+	 },
+	 
+	 
+	 
+
+	onShareTimeline() {
+		return {
+			title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name,
+			imageUrl:this.data.gallery[0].image_url,
+		}
+	},
+	     
+
  
 });
@@ -177,6 +177,7 @@
                     <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text>
                     <view class="t_show">
                       剩余
+					  <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
                       <text>{{timer[t_ind].hou}}</text>:
                       <text>{{timer[t_ind].min}}</text>:
                       <text>{{timer[t_ind].sec}}</text>
@@ -235,12 +236,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>	
@@ -1424,14 +1426,15 @@
  
 <view wx:if="{{showPoster}}" class="poster-container">
 	<view class="poster-wrapper">
-		<view class="poster" bindtap="previewImage">
-			<image src="{{shareImgPath}}" class="poster-img"></image>
+		<view class="poster">
+		<!-- <view class="poster" bindtap="previewImage"> -->
+			<image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
 			<view class="btn-close" catchtap="closePoster">x</view>
 		</view>
-		<view class="btn-container">
+		<!-- <view class="btn-container">
 			<button class="btn-share" open-type="share" bindtap="">微信好友分享</button>
 			<button class="btn-share" bindtap="savePic">保存到相册</button>
-		</view>
+		</view> -->
 	</view>
 </view>
  
@@ -22,7 +22,12 @@ Page({
         tabname: "sort",   //排序的字段
         adname: "asc",    //升降的字段
         rq_data:null,
+				
+				
+				searchRecord: [],
+				keyword: '',
     },
+		
     onLoad: function(t) {
         this.data.rq_data=t;
  
@@ -104,6 +109,9 @@ Page({
        if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
        if (url != this.data.baseUrl) return this.requestSearch(url);
        this.openSearchModal();
+			 
+			 // 获取历史搜索记录
+			 this.getHistorySearch();
     },
     changeTab: function(t) {
       var ord = t.currentTarget.dataset.href;
@@ -176,18 +184,23 @@ Page({
         });
     },
     submitSearch: function(t) {
+			console.log(111);
         this.search(t.detail.value.word);
+				
+				
     },
  
     //热搜关键字
     searchHotWord: function(t) {
-        this.search(t.currentTarget.dataset.word);
+			this.historyRecord();
+      this.search(t.currentTarget.dataset.word);
     },
  
     //-----点击搜索按钮----
     search: function(t) {
         if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
         this.data.key_str=t;
+				this.historyRecord();
         this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
     },
  
@@ -253,4 +266,56 @@ Page({
 			  func(ob);	
 	   })
 	 },
+	 
+	 
+	 getInput(e) {
+	 	this.setData({
+	 		keyword: e.detail.value
+	 	});
+	 },
+	 
+	 historyRecord() {
+		let self = this;
+	 	let keyword = this.data.key_str;
+	 	let searchRecord = this.data.searchRecord;
+	 	
+	 	if(keyword) {
+	 		if(searchRecord.indexOf(keyword) > -1) {
+	 			// 已经存在该值
+	 			return;
+	 		} else {
+	 			if(searchRecord.length >= 10) {
+	 				searchRecord.pop(); // 删除最早的一条记录	
+	 			};
+	 			searchRecord.unshift(keyword);
+	 			
+	 			// 		 // 将历史记录添加到缓存中
+	 			 wx.setStorage({
+	 				 key: 'searchRecord',
+	 				 data: searchRecord,
+	 				 success: function(res) {
+	 					 self.setData({
+	 						 searchRecord,
+	 					 })
+	 				 }
+	 			 })
+	 		};
+	 	};
+	 },
+	 
+	 
+	 
+	 
+	 getHistorySearch() {
+	   this.setData({
+	     searchRecord: wx.getStorageSync('searchRecord') || [] //若无存储则为空
+	   });
+	 },
+	 
+	 clearSearchRecord() {
+		 wx.clearStorageSync('searchRecord');
+		 this.setData({
+			 searchRecord: []
+		 });
+	 },
 });
 \ No newline at end of file
@@ -162,7 +162,7 @@
   <view class="search-modal">
     <view class="search-bar">
       <form bindsubmit="submitSearch">
-        <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input>
+        <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindinput="getInput"></input>
         <button class="search-btn" formType="submit">
           <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
         </button>
@@ -176,5 +176,17 @@
         </view>
       </block>
     </view>
+		<view class="search-hot">
+		  <view class="hot-title flex jc_sb ai_c">
+				<text>历史搜索</text>
+				<text class="iconfont icon-shanchu xc-ash" bindtap="clearSearchRecord" wx:if="{{searchRecord.length != 0}}"></text>
+			</view>
+		  <block wx:if="{{searchRecord.length>0}}">
+		    <view class="hot-row flex flex-wrap" wx:key="{{index}}">
+		      <view class="hot-item history ellipsis-1" bindtap="searchHotWord" data-word="{{item}}" wx:for="{{searchRecord}}" wx:key="{{index}}">{{item}}</view>
+		    </view>
+		  </block>
+			<view wx:else class="fs24">暂无历史搜索记录</view>
+		</view>
   </view>
 </view>
 \ No newline at end of file
@@ -298,3 +298,14 @@
   /* line-height: 38rpx; */
 	flex-grow: 1;
 }
+
+.history {
+	background-color: #f0f0f0;
+	color: #7b7b7b;
+	border: none;
+	margin-bottom: 8rpx;
+}
+
+.history:first-of-type {
+	margin-left: 0;
+}
@@ -884,7 +884,17 @@ Page({
    },
  
  
-  
+  onShareTimeline() {
+		// getApp().getConfig(function(t) {
+		// 	return {
+		// 		title: '首页-' + getApp().globalData.config.store_name,
+		// 	}
+		// });
+			
+		return {
+			title: '首页-' + getApp().globalData.config.store_name,
+		}
+	},
  
  
 });
 \ No newline at end of file
-{
-     
+{    
     "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>
@@ -17,7 +17,9 @@
       <text class='gred' wx:else>还差{{pt_act.ct_num - item.open_num}}人成团</text>
       <view>
         <view class="time_show_view">
-          剩余<text>{{item.djs.hou}}</text>:
+          剩余
+		  <text wx:if="{{item.djs.day}}">{{item.djs.day}}天:</text>
+		  <text>{{item.djs.hou}}</text>:
           <text>{{item.djs.min}}</text>:
           <text>{{item.djs.sec}}</text>结束
         </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>
@@ -228,6 +228,22 @@ Page({
     var help_id = this.data.help_id;
     var taskid=e.currentTarget.dataset.taskid;
     getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid);
-  }
+  },
+	
+	onShareAppMessage(res) {
+		if (res.from === 'button') {
+			// 来自页面内转发按钮
+			console.log(res.target)
+		}
+		return {
+			// title: '自定义转发标题',
+		}
+	},
+	
+	onShareTimeline() {
+		return {
+			title: '好友助力-' + getApp().globalData.config.store_name,
+		}
+	},
  
 })
@@ -213,19 +213,19 @@
 							 </block>							  
 							 <block wx:elif="{{item.name=='助力活动'}}">
 							  	 <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}">
-							  	 	<image class="xc-center-img " src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
+							  	 	<image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
 							  	 	<view class="four-level-word">助力活动</view>
 							  	 </view>							 							  															 
 							 </block> 																								  
 						     <block wx:elif="{{item.name=='我的权益'}}">
 						     	<view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
-						     	    <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+						     	    <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
 						     	    <view class="fs26">我的权益</view>
 						     	</view>							 							  								 
 						     </block> 							 																							  
 							 <block wx:else>							  
 								  <view  class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav">
-									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+									<image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
 									<view class="fs26">{{item.name}}</view>
 								  </view>
 							 </block>