From 5508f6eb7f1f0bddea046f553d8060f359c89117 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 19 Dec 2020 10:44:49 +0800
Subject: [PATCH] 1。  小程序立即购买，设置全程包邮，主商品不包邮，会影响赠品也不包邮，其实赠品是不在不包邮列表中，应该包邮 2。  分类列表的等级名称最多要显示6个自以上 3。  商品详情页的积分分享标题的修改 4。  商品搜索列表和商品列表的排序默认要按  sort排序 5。  商品取消退款的功能

---
 pages/cart/cart2/cart2.js                           |  5 ++---
 pages/goods/categoryList/categoryList.js            |  8 ++++----
 pages/goods/categoryList/categoryList.wxml          |  6 +++---
 pages/goods/goodsInfo/goodsInfo.js                  | 13 ++++++++++---
 pages/goods/goodsList/goodsList.js                  |  2 +-
 pages/goods/goodsList/goodsList.wxml                |  4 ++--
 pages/goods/goodsList/goodsList.wxss                |  5 +++--
 pages/goods/search/search.wxml                      |  4 ++--
 pages/user/return_goods_info/return_goods_info.js   | 21 ++++++++++++++++-----
 pages/user/return_goods_info/return_goods_info.wxml | 22 +++++++++++++++++-----
 pages/user/return_goods_info/return_goods_info.wxss | 14 ++++++++++++++
 pages/user/return_goods_list/return_goods_list.js   | 20 ++++++++++++++++----
 pages/user/return_goods_list/return_goods_list.wxml |  6 ++++--
 13 files changed, 94 insertions(+), 36 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index f9ae1e0..e86a4aa 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -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) {
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 5923ff0..e337e35 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -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;
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 4a87b11..d325ce6 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -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>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 319e058..32c492a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -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;
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index ad859fe..3f11805 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -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; 
 		}
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index c8ff1f4..e1bce26 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -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>
diff --git a/pages/goods/goodsList/goodsList.wxss b/pages/goods/goodsList/goodsList.wxss
index 9c1375f..daf9b92 100644
--- a/pages/goods/goodsList/goodsList.wxss
+++ b/pages/goods/goodsList/goodsList.wxss
@@ -193,8 +193,9 @@
 } */
 
 .card_name {
-	position: relative;
-	top: -4rpx;
+	 position: relative;
+	 top: -3rpx;
+   display: inline-block;
 }
 
 
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index fefd0c4..66d132a 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -1,8 +1,8 @@
 <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>
diff --git a/pages/user/return_goods_info/return_goods_info.js b/pages/user/return_goods_info/return_goods_info.js
index 8c1ff7f..63e4103 100644
--- a/pages/user/return_goods_info/return_goods_info.js
+++ b/pages/user/return_goods_info/return_goods_info.js
@@ -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)							
+						}
+						
+                       
                     }
                 });
             }
diff --git a/pages/user/return_goods_info/return_goods_info.wxml b/pages/user/return_goods_info/return_goods_info.wxml
index ccbaf5a..77d3c16 100644
--- a/pages/user/return_goods_info/return_goods_info.wxml
+++ b/pages/user/return_goods_info/return_goods_info.wxml
@@ -1,4 +1,5 @@
 <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>
diff --git a/pages/user/return_goods_info/return_goods_info.wxss b/pages/user/return_goods_info/return_goods_info.wxss
index 36eeef8..e5ac868 100644
--- a/pages/user/return_goods_info/return_goods_info.wxss
+++ b/pages/user/return_goods_info/return_goods_info.wxss
@@ -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
diff --git a/pages/user/return_goods_list/return_goods_list.js b/pages/user/return_goods_list/return_goods_list.js
index ee65f6c..d137523 100644
--- a/pages/user/return_goods_list/return_goods_list.js
+++ b/pages/user/return_goods_list/return_goods_list.js
@@ -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);
+						}
+						
+                        
                     }
                 });
             }
diff --git a/pages/user/return_goods_list/return_goods_list.wxml b/pages/user/return_goods_list/return_goods_list.wxml
index f690a85..0c4d801 100644
--- a/pages/user/return_goods_list/return_goods_list.wxml
+++ b/pages/user/return_goods_list/return_goods_list.wxml
@@ -1,3 +1,4 @@
+<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>
--
libgit2 0.21.4