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

后端研发-倪永富
2 parents bb029e11 63044f80
Showing 9 changed files with 106 additions and 33 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.wxml
pages/cart/cart_wk/cart_wk.wxml
pages/user/add_address/add_address.js
pages/user/address_list/address_list.js
pages/user/address_list/address_list.wxml
pages/user/address_list/address_list.wxss
@@ -527,6 +527,9 @@ Page({
                         })
                     } catch (e) { err=e;}
                     if (isok==0){
+                      if (gname.length > 10) {
+                        gname = gname.substr(0, 10); gname+="...";
+                      }
                       t.confirmBox(gname+":"+ err); return false;
                     }
                     wx.navigateTo({
@@ -101,8 +101,7 @@ Page({
   },
  
   //------获取会员收货地址-----
-  getuser_addr:function(func){
-    
+  getuser_addr:function(func){  
       a.get("/api/weshop/useraddress/page", {
         data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600 },
         success: function (su) {
@@ -323,6 +322,9 @@ Page({
                   quanlist=res.data.data.pageData;
               })
  
+              t.data.data.prom_id = 0;
+              t.data.data.prom_type = 0;
+
               th.setData({
                 bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
                 bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
@@ -54,6 +54,7 @@ Page({
 				is_pt_tz:0,//是否开团团长
         qh:'',       //期号
         pt_listno:'',//期号
+        is_normal:0
     },
     onLoad: function(t) {
         console.log("onLoad_pt_cart");
@@ -160,7 +161,7 @@ Page({
                      t.data.data.is_normal=1;
                      th.setData({
                        bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
-                       bn_pick: gg.pick_id, bn_t_exp_t: distr_t
+                       bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1
                      });
                      th.calculatePrice2();
                }else{
@@ -472,9 +473,18 @@ Page({
                       app.my_warnning("支付成功",1,th);
                       setTimeout(function () {
                         th.setData({ isclose: 0 });
-                        wx.navigateTo({
-                          url: "/pages/team/team_success/team_success?ordersn=" + data.data,
-                        })
+
+                        if(th.data.is_normal==1){
+                            wx.navigateTo({
+                              url: "/pages/user/order_list/order_list",
+                            })
+                        }else{
+                            wx.navigateTo({
+                              url: "/pages/team/team_success/team_success?ordersn=" + data.data,
+                            })
+                        }
+
+                       
                       }, 1000)
                     }
                   });
@@ -50,7 +50,7 @@
                     </view>
  
                     <!--阶梯团是不显示的-->
-                    <view class="use-item" wx:if="{{kt_type!=3}}">
+                    <view class="use-item" wx:if="{{kt_type!=3 || is_normal==1}}">
                         <view bindtap='setexptype' data-t='1'  style="display:{{bn_t_exp_t==2?'none':'flex'}};">
                             <icon   color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon>
                             <view class="yu_er">自提</view>
@@ -62,7 +62,7 @@
                     </view>
  
                     <!--阶梯团是不显示的-->
-                    <block wx:if="{{kt_type!=3}}">
+                    <block wx:if="{{kt_type!=3 || is_normal==1 }}">
                         <view class="use-item" hidden='{{bn_exp_type==1}}'>
                               <view>使用物流：</view>
                               <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name">
@@ -91,7 +91,7 @@
          </block>
  
          <view class="information">
-            <view class="item" wx:if="{{kt_type<3}}">
+            <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
                 <view>商品金额</view>
                 <view class="co-red">￥ {{formData.all_price}}元</view>
             </view>
@@ -83,7 +83,7 @@
   </view>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>支付定金</view>
-    <view class='ct_one_right'>￥<text class='redwz'>{{order.order_amount+order.user_money}}</text>
+    <view class='ct_one_right'>￥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money,2)}}</text>
     </view>
   </view>
 </view>
@@ -107,7 +107,7 @@
 <view class='zf'>
   <view class='zf_left'>
     <text class='zf_left_wz'>支付合计：</text>
-    <text class='zf_left_red'>¥{{order.tail_money+exp_price}}</text>
+    <text class='zf_left_red'>¥{{filters.toFix(order.tail_money+exp_price,2)}}</text>
   </view>
   <view class='zf_btn' bindtap="to_pay">
     <text>支付尾款</text>
@@ -94,15 +94,40 @@ Page({
         }else{
           a['user_id'] = oo.user_id;
           a['store_id'] = os.stoid;
-          //-----新增地址-------
-          t.post("/api/weshop/useraddress/save", {
-            data: a,
-            success: function (s) {
-              e.showSuccess(s.data.msg, function () {
-                wx.navigateBack();
+
+
+          if (a.is_default == 1) {
+              t.put("/api/weshop/useraddress/update", {
+                data: { user_id: oo.user_id, is_default: 0 },
+                success: function (s) {
+
+                  //-----新增地址-------
+                  t.post("/api/weshop/useraddress/save", {
+                    data: a,
+                    success: function (s) {
+                      e.showSuccess(s.data.msg, function () {
+                        wx.navigateBack();
+                      });
+                    }
+                  });
+                     
+                }
+              })
+          }else{
+
+              //-----新增地址-------
+              t.post("/api/weshop/useraddress/save", {
+                data: a,
+                success: function (s) {
+                  e.showSuccess(s.data.msg, function () {
+                    wx.navigateBack();
+                  });
+                }
               });
-            }
-          });
+          }   
+
+
+        
         } 
     },
  
@@ -6,25 +6,45 @@ Page({
         url: e.globalData.setting.url,
         resourceUrl: e.globalData.setting.resourceUrl,
         iurl: e.globalData.setting.imghost,
-        addresses: null,
-        operate: null
+        addresses: [],
+        operate: null,
+        curpage:1,
+        total:0,
+        ismore:0,
+     
     },
     onLoad: function(e) {
         this.data.operate = e.operate;
     },
     onShow: function() {
+        this.data.curpage=1;
+        this.data.addresses=[];
         this.requestAddressList();
     },
-    onPullDownRefresh: function() {
-        this.requestAddressList();
-    },
-    requestAddressList: function() {
+    
+
+  onReachBottom: function () {
+     if(this.data.total<=6) return;
+     if(this.data.ismore) return;
+     this.requestAddressList();
+  },
+
+   requestAddressList: function() {
+       var tt= Math.random() * 100
         var e = this;
         t.get(e.data.url + "/api/weshop/useraddress/page", {
-          data: { store_id: os.stoid, user_id: oo.user_id},
+          data: { store_id: os.stoid, user_id: oo.user_id, page: e.data.curpage,pageSize:6,t:tt},
             success: function(t) {
-                e.setData({
-                    addresses: t.data.data.pageData,
+                e.data.curpage++;
+                var arr1 = e.data.addresses;
+                var arr2 = t.data.data.pageData;
+                var arr3 = [...arr1, ...arr2];
+
+                var ismore=0;
+                if (arr3.length == t.data.data.total) ismore=1
+
+                 e.setData({
+                  addresses: arr3, total: t.data.data.total, ismore: ismore
                 }), wx.stopPullDownRefresh();
             }
         });
@@ -58,5 +78,12 @@ Page({
         var t = this.data.addresses;
         for (var s in t) if (t[s].address_id == e) break;
         return s ? t[s] : {};
+    },
+
+    go_url:function(e){
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url); 
     }
+
+
 });
 \ No newline at end of file
@@ -12,7 +12,7 @@
             <image src="{{iurl}}/miniapp/images/address_edit.png"></image>
         </view>
     </view>
-    <navigator class="address-create" url="/pages/user/add_address/add_address">
+    <view bindtap="go_url" class="address-create" data-url="/pages/user/add_address/add_address">
         <view class="create-btn">+新建地址</view>
-    </navigator>
+    </view>
 </view>
@@ -62,14 +62,20 @@ page {
 }
  
 .address-create {
-    width: 50%;
+    background-color: #fff;
+    width: 100%;
     text-align: center;
     position: fixed;
-    bottom: 80rpx;
-    left: 25%;
+    bottom: 0rpx;
+    height: 200rpx;
+    border-top:1rpx solid #eee 
+    
 }
  
 .create-btn {
+    width: 50%;
+    margin: 0 auto;
+    margin-top: 60rpx;
     font-size: 28rpx;
     color: white;
     background-color: #f23030;