1、注册推荐人的优化

2、购物车失效的优化 3、评价删除的优化

1、注册推荐人的优化
2、购物车失效的优化 3、评价删除的优化
yvan.ni
1 parent 346430ac
Showing 6 changed files with 50 additions and 12 deletions
packageA/pages/profile/profile.js
packageA/pages/profile/profile.wxml
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -1144,7 +1144,13 @@ Page({
 			//-- 需要推荐人 --
 			if(this.data.reg_info.introducer_state){
-				let tjrname = this.data.referee || this.data.fir_user.mobile;
+
+                var tj= this.data.fir_user?this.data.fir_user.mobile:'';
+                if(!tj){
+                    tj=this.data.user['fromuser_id']?this.data.user['fromuser_id']:'';
+                }
+
+				let tjrname = this.data.referee || tj;
 				if (tjrname == "" || tjrname == null) {
 				  //app.my_warnning("请输入推荐人", 0, this);
 				  //return false;
@@ -34,7 +34,7 @@
                             class="user-txt-right f1 pdl20 t-r" />
                 </block>
-                <block v-else>
+                <block wx:else>
                      <input bindinput="getReferee" bindblur="" disabled="{{user['fromuser_id']}}"
                            value="{{user['fromuser_id']?user['fromuser_id']:''}}"  data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
                 </block>
@@ -566,7 +566,7 @@ Page({
                             })
                           }else{
-                            if(prom && !item.is_integral_normal && !item.is_pd_normal){
+                            if(prom && !item.is_integral_normal && !item.is_pd_normal && prom[0].prom_type!=5){
                               th.disInvalid(item);
                               continue;
                             }
@@ -669,7 +669,8 @@ Page({
                         }
                     }
                     //-- 判断一下，获取搭配购的消息 --
-                    if(item1.prom_type==0 || item1.prom_type==5){
+                    if((item1.prom_type==0 || item1.prom_type==5) && (!carr[i].collocationList || !carr[i].collocationList.length))  {
+
                        await th.set_collection(item1,carr,i);
                     }
                 }
@@ -1088,7 +1089,7 @@ Page({
                     }
                     //-- 判断是不是可以收藏 --
-                    if(gd.prom_type ==5){
+                    if(gd.prom_type ==5 && !th.data.all_collocation_list.length){
                         await th.set_collection(gd);
                     }
@@ -5632,6 +5633,8 @@ Page({
              item.goods_num=1;
              item.goods_price=item.price;
              item.is_collocation=1;
+             item.prom_type=5;
+
              var coll_arr=[];
              if(this.data.collocation_goods && this.data.collocation_goods.length){
@@ -481,6 +481,35 @@ Page({
       }
     });
   },
+
+  //-----删除订单(完成和带评价的)-----
+  deleteOrderData_: function(t) {
+        var th = this;
+        var order_id = t.currentTarget.dataset.order_id;
+        var index = t.currentTarget.dataset.index;
+        var up_data={order_id: order_id,isdel:1};
+
+
+        wx.showModal({
+            title: "是否删除订单？",
+            success: function(tt) {
+                tt.confirm && rq.put("/api/weshop/order/updatebyId", {
+                    data: up_data,
+                    success: function(t) {
+                        for (var e = 0; e < th.data.orderList.length; e++)
+                            if (th.data.orderList[e].order_id == order_id) {
+                                th.data.orderList.splice(e, 1), th.setData({
+                                    orderList: th.data.orderList
+                                });
+                                break;
+                            }
+                    }
+                })
+            }
+        });
+    },
+
+
   //-----删除订单-----
   deleteSerOrderData: function(t) {
     var th = this;
@@ -74,10 +74,10 @@
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
@@ -95,10 +95,10 @@
 				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
 				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
 				<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>      
-					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
         </view>
 				<view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view>
-					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
         </view>
 				<view wx:if="{{item.pay_status == 0 && item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
@@ -112,10 +112,10 @@
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
@@ -310,7 +310,7 @@
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"  ></image>
         </view>
 				<view wx:if="{{item.order_status == 2}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>        
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>
         </view>
 				<view wx:if="{{item.order_status == 3}}" class="c-a9" class="flex-center">已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>