Merge branch 'test' into 'qa'

Test See merge request !585

Merge branch 'test' into 'qa'
Test See merge request !585
后端研发-苏明海
2 parents a3120cbe 540644d5
Showing 26 changed files with 203 additions and 56 deletions
packageA/pages/activity_share/activity_share.js
packageA/pages/goods_share/goods_share.js
packageA/pages/live_share/live_share.js
packageA/pages/quan/quan.js
packageA/pages/quan_list/quan_list.js
packageA/pages/quan_pro/quan_pro.js
pages/cart/cart2/cart2.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/goods/goodsList/goodsList.wxss
pages/goods/search/search.wxml
pages/index/index/index.js
pages/order/refund_order/refund_order.js
pages/togoin/togoin.js
pages/user/return_goods_info/fil.wxs
pages/user/return_goods_info/return_goods_info.js
@@ -159,7 +159,7 @@ Page({
 		    imageUrl: img,
 		  };	
 		  th.setData({share_hidden:1});	  	
-		  th.insert_act_share(title,lbid);		   
+		  th.insert_act_share(title,lbid,6);		   
 		  return ob;		  		  
 	  }else{
 		  //---秒杀，拼团，促销---  
@@ -180,13 +180,17 @@ Page({
 			    imageUrl: img,
 			  };	
 			  th.setData({share_hidden:1,share_good:null});	  	
-			 
+			  
+			  var ind=3;//秒杀活动分享
+			  if(item.prom_type==6){
+				  ind=4;
+			  }	  	 
 			  //插入活动			   
 			  if(item.prom_type==3){
 				  var hui_active=this.data.hui_active;
-				  th.insert_act_share(hui_active.name,hui_active.id);
-			  }else{		  
-				  th.insert_act_share(item.title,item.id);	
+				  th.insert_act_share(hui_active.name,hui_active.id,5);
+			  }else{				 					  
+				  th.insert_act_share(item.title,item.id,ind);	
 			  }
 			  return ob;
@@ -1111,13 +1115,13 @@ Page({
 	 },
 	 //-- 推送活动分享 --
-	 insert_act_share:function(title,actid){
+	 insert_act_share:function(title,actid,ind){
 	 		 var th = this;	 		 	 
 	 		 var url="/api/weshop/sharetypeList/save";
 	 		 var req_data={
 	 		 	shareActId:actid,
 	 		 	shareActName:title,
-	 			shareType:3,
+	 			shareType:ind,
 	 			shareUserId:th.data.first_leader,
 	 			shareStaffId:th.data.StaffId,
 	 			shareStorageId:th.data.StorageId,
@@ -1129,7 +1133,18 @@ Page({
 	 			 data:req_data,
 	 			 success:function(){}
 	 		 })
-	 		 
+			  
+			 //收入线下数据
+			 req_data.userId=th.data.first_leader;
+			 delete req_data.shareUserId;
+			 
+			 //插入数据
+			 getApp().request.post('/api/weshop/MdShareType/saveShare',{
+				 data:req_data,
+				 success:function(){}
+			 })
+			 
+					 
 	 }
@@ -836,6 +836,15 @@ Page({
 			 }
 		 })
+		 //收入线下数据
+		 req_data.userId=th.data.first_leader;
+		 delete req_data.shareUserId;
+		 //插入数据
+		 getApp().request.post('/api/weshop/MdShareType/saveShare',{
+			 data:req_data,
+			 success:function(){}
+		 })
+		 
 	 }
@@ -202,7 +202,7 @@ Page({
 			 var req_data={
 			 	shareActId:actid,
 			 	shareActName:title,
-				shareType:4,
+				shareType:7,
 				shareUserId:th.data.first_leader,
 				shareStaffId:th.data.StaffId,
 				shareStorageId:th.data.StorageId,
@@ -215,6 +215,15 @@ Page({
 				 success:function(){}
 			 })
+			 //收入线下数据
+			 req_data.userId=th.data.first_leader;
+			 delete req_data.shareUserId;
+			 //插入数据
+			 getApp().request.post('/api/weshop/MdShareType/saveShare',{
+				 data:req_data,
+				 success:function(){}
+			 })
+			 
 	}
@@ -196,6 +196,15 @@ Page({
   			 data:req_data,
   			 success:function(){}
   		 })
+		 
+		 //收入线下数据
+		 req_data.userId=th.data.first_leader;
+		 delete req_data.shareUserId;
+		 //插入数据
+		 getApp().request.post('/api/weshop/MdShareType/saveShare',{
+			 data:req_data,
+			 success:function(){}
+		 })
   }
@@ -108,6 +108,10 @@ 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", {
@@ -102,6 +102,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", {
@@ -3136,9 +3136,9 @@ Page({
         }
         //如果有设置不包邮商品
         if(no_by_data && no_by_data.goods_list && gift_freight_free){
-            if(th.check_by_goods(no_by_data.goods_list)){
+            if(th.check_by_goods(no_by_data.goods_list,good.goods_id)){
                 gift_freight_free=0;
-                th.data.is_no_by[th.data.bn_pick]=1;
+                //th.data.is_no_by[th.data.bn_pick]=1;
             }
         }
         var t_shipping_price=
@@ -3174,7 +3174,6 @@ Page({
             }
         }
         return is_use;
-
     },
     //检查是不是有其他门店的订单在选择了包邮券
     check_other_use_by:function (iter,pkid) {
@@ -100,6 +100,12 @@ 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";
@@ -164,7 +164,7 @@ Page({
                 //--- 判断是等级会员，且在有效期范围内 ---
                 if (user.card_field && now < end) {
                   var card_name = ob.name_map.get(user.card_field);
-                  if (card_name.length > 4) card_name = card_name.substring(0, 4);
+                  //if (card_name.length > 4) card_name = card_name.substring(0, 4);
                   th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
                 }
               }
@@ -344,9 +344,9 @@ Page({
               for(var i=0;i<arr.length;i++){
                 arr[i]['items']['is_show_class'] = false;
                 var mobile_name = arr[i]['items']['name']
-                if(mobile_name.length > 4){
-                  arr[i]['items']['name'] = mobile_name.substring(0, 4)
-                }
+                //if(mobile_name.length > 4){
+                  //arr[i]['items']['name'] = mobile_name.substring(0, 4)
+                //}
               }
               if(t.data.is_show_pl==1 && t.data.is_show_pp != 1 && t.data.is_show_gb != 1){
                 arr[0]['items']['is_show_class'] = true;
@@ -435,7 +435,7 @@
                                   <block wx:if="{{item[card_field]>0}}">
                                     <view class="flex ai_and">
                                       <view class="price">￥{{item[card_field]}}</view>
-                                      <view class="card_bg">
+                                      <view class="card_bg ellipsis-1">
                                         <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
                                         <view class="card_name">{{card_name}}</view>
                                       </view>
@@ -463,9 +463,9 @@
                                     <view class="comment flex jc_sb">
                                       <view class="flex ai-center">
                                         <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
-                                        <view class="card_bg flex ai-center">
+                                        <view class="card_bg ellipsis-1">
                                           <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                          <text>{{g_filter.get_card_price(item,card_list,1)}}</text>
+                                          <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view>
                                         </view>
                                       </view>
                                     </view>
@@ -297,8 +297,7 @@ Page({
       gid=gid_str[0];
       if(gid_str.length>1){
         first_leader=gid_str[1];
-      }
-	  
+      }	  
 	  //-- 如果有room_id的获取 --
 	  if(gid_str.length>2 && gid_str[2]){
 		  room_id=gid_str[2];
@@ -1813,7 +1812,15 @@ Page({
 	//如果是积分购的时候
 	if(th.data.prom_type==4){
 		var name = th.data.prom_act.name;
-		ob.title=name;		
+		//-- 积分购的 --
+		var pri0 = th.data.prom_act.addmoney;
+		var integral=th.data.prom_act.integral;				 	  
+		var text="";			  
+		if(integral){text=integral+"积分";  }				  
+		if(pri0 && integral){ text+="+";}
+		if(pri0){ text+="￥"+pri0;}
+			
+		ob.title= text+" "+name;		
 	}
     return ob;
@@ -163,7 +163,7 @@ Page({
         this.data.requestUrl = t;
 		//不是商品分组的，不是默认排序的	
-		if(t.indexOf("group_id")==-1 || e.data.tabname!="goods_id" ){					
+		if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){					
            t += "&orderField=" + e.data.tabname;
            t += "&orderType=" + e.data.adname; 
 		}
@@ -15,8 +15,8 @@
   </view>
   <view class="nav">
-    <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
-      <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
+    <navigator bindtap="changeTab" class="nav-item" data-href="sort" data-ad="{{adname}}">综合
+      <view class="ico-dg" wx:if="{{tabname=='sort'}}">
         <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
         <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>
@@ -193,8 +193,9 @@
 } */
 .card_name {
-	position: relative;
-	top: -4rpx;
+	 position: relative;
+	 top: -3rpx;
+   display: inline-block;
 }
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
   <view class="nav">
-    <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
-      <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
+    <navigator bindtap="changeTab" class="nav-item" data-href="sort" data-ad="{{adname}}">综合
+      <view class="ico-dg" wx:if="{{tabname=='sort'}}">
         <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>
@@ -80,6 +80,10 @@ Page({
   onLoad: async function(tt) {
     var th = this;	
 	var first_leader=tt.first_leader;
+	if(!first_leader && tt.scene){	
+		first_leader= decodeURIComponent(tt.scene); 		
+	}
+	
 	if(first_leader){
 		 //--  user_id代过来免登陆 --
 	     getApp().globalData.first_leader=first_leader;	  
@@ -90,7 +94,9 @@ Page({
 	         }
 	     })
 	 }
-	 	
+	 	 
+	 
+	 	 	
     //看一下商家是否开通了权益
     //--初始化是否有打勾--
     getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
@@ -56,11 +56,10 @@ Page({
     },
     //------提交退款申请-------
-    refundOrder: function(e) {
-	   
-	   if(!this.data.back_money){
-		   return false;
-	   }	   
+    refundOrder: function(e) {	   
+	   //if(!this.data.back_money){
+	   //	   return false;
+	   //}	   
 	   if(this.data.isloading) return false;
 	   this.data.isloading=1;   		
        var th = this;
@@ -55,7 +55,11 @@ Page({
 		  head_pic: app.clear_word(app.globalData.getu.avatarUrl)      
         };
-			
+		//-- 导购会员ID --
+		if(getApp().globalData.guide_id){
+			dd.guide_id=getApp().globalData.guide_id;
+		}
+				
         getApp().request.get("/api/weshop/users/openidandkey", {
           data: dd,
           success: function (e) {
@@ -114,8 +118,12 @@ Page({
   	 //--如果有邀请人的时候--
   	 if(th.data.first_leader){
   	 	dd.first_leader=th.data.first_leader;
-  	 }
-  	 
+  	 }	 
+	 //-- 导购会员ID --
+	 if(getApp().globalData.guide_id){
+	 	dd.guide_id=getApp().globalData.guide_id;
+	 }
+	  
     console.log(dd);
     app.request.get("/api/weshop/users/thirdLogin", {
       data: dd,
+function is_cancle(word){
+	if(word.indexOf('客户取消')!==-1){
+		return true;
+	}
+	return false;
+}
+module.exports = {
+	is_cancle:is_cancle
+}
 \ No newline at end of file
@@ -10,7 +10,7 @@ Page({
         url: r.url,
         resourceUrl: r.imghost,
         return_goods: null,
-        goods: null
+        goods: null,
     },
     onLoad: function(e) {
       if (e.order_id!=undefined){
@@ -130,16 +130,27 @@ Page({
         });
     },
     cancelReturn: function() {
-        var e = this, t = this.data.return_goods.id;
+        var e = this, 
+		id = this.data.return_goods.id;		
         wx.showModal({
             title: "确定取消售后服务？",
             success: function(r) {
-                r.confirm && o.post("/api/order/return_goods_cancel", {
+                r.confirm && o.put("/api/weshop/order/returngoods/update", {
                     data: {
-                        id: t
+                        id: id,
+						store_id:os.stoid,
+						status:3,
+						remark:'客户取消'
                     },
                     success: function(r) {
-                        wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(t);
+						if(r.data.code==0){							
+							 getApp().showWarning('取消成功');									
+							 setTimeout(function(){
+								  wx.setStorageSync("user:return_goods_list:update", !0), e.requestReturnGoods(id);
+							 },1000)							
+						}
+						
+                       
                     }
                 });
             }
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<wxs module="fil" src="fil.wxs"></wxs>
 <view class="order-mes">
     <view class="order-name">
         <view>订单编号：{{return_goods.order_sn}}</view>
@@ -54,12 +55,12 @@
 </view>
 <view class="apply-state">
     <view class="state-item">
-        <view class="item-wrap">
+        <view  wx:if="{{return_goods.status==0}}" class="item-wrap">
             <view class="state-title">您的服务单已申请成功，等待售后审核中</view>
             <view class="state-time">{{return_goods.addTimeFormat}}</view>
-            <view class="state-user">操作人：系统</view>
+            <view class="state-user">操作人：客户</view>
         </view>
-        <view class="item-wrap" wx:if="{{return_goods.status==2}}">
+        <view class="item-wrap" wx:if="{{return_goods.status==1}}">
             <view class="state-title">亲爱的客户，您的服务正在处理中</view>
             <view class="state-time">{{filters.format_time(return_goods.handle_time,1)}}</view>
             <view class="state-user">操作人：卖家</view>
@@ -70,8 +71,19 @@
             <view class="state-user">操作人：卖家</view>
         </view>
         <view class="item-wrap" wx:if="{{return_goods.status==3}}">
-            <view class="state-title">亲爱的客户，商家已经拒绝退款</view>
-            <view class="state-user">操作人：卖家</view>
+			<block wx:if="{{fil.is_cancle(return_goods.remark)}}">
+				<view class="state-title">亲爱的客户，你已取消退款</view>
+				<view class="state-user" >操作人：客户</view>					
+			</block>
+			<block wx:else>
+				<view class="state-title">亲爱的客户，商家已经拒绝退款</view>
+				<view class="state-user" >操作人：卖家</view>				
+			</block>          
         </view>
     </view>
+	
+	<view  bindtap='cancelReturn' wx:if="{{return_goods.status==0 || return_goods.status==1}}" class="btn-wrap">
+	    <view class="submit-btn">取消退款</view>
+	</view>
+		
 </view>
@@ -143,3 +143,17 @@
 .state-time {
     padding-bottom: 20rpx;
 }
+
+.btn-wrap {
+    padding: 20rpx 0;
+}
+.submit-btn {
+    width: 320rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    background-color: #f15353;
+    color: #fff;
+    margin: auto;
+}
+.cred{color: #f15353}
 \ No newline at end of file
+function set_word(word){
+	if(word.indexOf('客户取消')!==-1){
+		return '客户取消';
+	}
+	return '卖家已经拒绝退款';
+}
+module.exports = {
+	set_word:set_word
+}
 \ No newline at end of file
@@ -92,16 +92,28 @@ Page({
         });
     },
     cancelReturn: function(t) {
-        var e = this, s = t.currentTarget.dataset.id;
+        var e = this, 
+		s = t.currentTarget.dataset.id;
         wx.showModal({
             title: "确定取消售后服务？",
             success: function(t) {
-                t.confirm && r.post("/api/order/return_goods_cancel", {
+                t.confirm && r.put("/api/weshop/order/returngoods/update", {
                     data: {
-                        id: s
+                        id: s,
+						store_id:os.stoid,
+						status:3,
+						remark:'客户取消'
                     },
                     success: function(t) {
-                        e.resetData(), e.requestReturnGoods();
+						if(t.data.code==0){
+							
+							getApp().showWarning('取消成功');
+							setTimeout(function(){
+							   e.resetData(), e.requestReturnGoods();
+							 },1000);
+						}
+						
+                        
                     }
                 });
             }
+<wxs module="fil" src="fil.wxs"></wxs>
 <view class="container">
     <view class="return-box" wx:for="{{list}}" wx:key="{{index}}">
         <view class="item">
@@ -7,7 +8,8 @@
             <block wx:if="{{item.status==0}}">已申请成功，待售后审核中</block>
             <block wx:elif="{{item.status==1}}">处理中</block>
             <block wx:elif="{{item.status==2}}">退款完成</block>
-            <block wx:elif="{{item.status==3}}">卖家已经拒绝退款</block>
+            <block wx:elif="{{item.status==3}}">{{fil.set_word(item.remark)}}</block>
+					
             <image class="wh100 arrow" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
         </navigator>
         <view class="item return-goods" wx:for="{{item.goodslist}}" wx:for-item="goods">
@@ -19,7 +21,7 @@
         </view>
         <navigator class="return-btn" url="/pages/user/return_goods_info/return_goods_info?id={{item.id}}">进度查询</navigator>
         <!-- <view bindtap="receiveOrder" class="return-btn" data-id="{{item.id}}" hidden="{{!(item.status==2&&item.type==1)}}">确认收货</view> -->
-        <!-- <view bindtap="cancelReturn" class="return-btn" data-id="{{item.id}}" hidden="{{!(item.status!=-2&&item.status<1)}}">取消申请</view> -->
+        <view bindtap="cancelReturn" class="return-btn" data-id="{{item.id}}" wx:if="{{item.status<=1}}">取消申请</view> 
     </view>
     <view class="no-data" wx:if="{{!list||list.length==0}}">
         <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
@@ -169,7 +169,7 @@ Page({
       var item=th.data.qy_list[ind];
       if(item.ishas==undefined || !item.ishas){
           var qt_txt = th.selectComponent("#pop_txt"); //组件的id
-          var ob={title:"温馨提示",content:"当前会员暂无此权益"};
+          var ob={title:"温馨提示",content:"您当前会员等级暂无此权益"};
           qt_txt.open(ob);
           return false;
       }
@@ -177,7 +177,7 @@ Page({
       if(th.data.click_gradeId!=null && th.data.click_gradeId!=th.data.gradeId){
           var qt_txt = th.selectComponent("#pop_txt"); //组件的id
-          var text="当前会员暂无此权益";
+          var text="您当前会员等级暂无此权益";
           if(th.data.this_curr_id>th.data.currentItemId){
               text="【"+th.data.backClass[th.data.currentItemId].GradeName+"】专享，您当前是【"+th.data.backClass[th.data.this_curr_id].GradeName+"】";
           }