Merge branch 'dev' into 'test'

Dev See merge request !14

Merge branch 'dev' into 'test'
Dev See merge request !14
后端研发-苏明海
2 parents da39d48c 709a54fa
Showing 19 changed files with 211 additions and 162 deletions
pages/cart/cart2/cart2.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
pages/cart/cart_wk/cart_wk.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/team/team_ping/team_ping.js
pages/team/team_ping/team_ping.wxml
pages/team/team_ping/team_ping.wxss
pages/team/team_show/team_show.js
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
pages/team/team_success/team_success.wxss
pages/user/index/index.js
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
pages/user/order_detail/order_detail.wxss
pages/user/order_list/order_list.wxml
pages/user/order_list/order_list.wxss
@@ -81,6 +81,7 @@ Page({
     th.data.param=t;
     //-----先获取物流，再获取用户信息，再展示页面-----
     th.get_wuliu(th.get_info(th.show_page));
+   
   },
   onUnload: function () { this.setData({ isclose: 1 })},
   //-------------------获取物流---------------
@@ -101,12 +102,7 @@ Page({
   //------获取会员收货地址-----
   getuser_addr:function(func){
-    console.log(to.globalData.baddr);
-    if (to.globalData.baddr!=null){
-      var user_addr = to.globalData.baddr;
-      to.globalData.baddr=null;
-      func(user_addr);
-    }else{
+    
       a.get("/api/weshop/useraddress/page", {
         data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600 },
         success: function (su) {
@@ -121,11 +117,12 @@ Page({
             if (user_addr[i]['is_default'] == 1) { item = user_addr[i]; break; }
           }
           if (item == null) item = user_addr[0];
+          if(item==undefined) item=null;
           func(item);
         }
       });
-    }
   },
+  
   //----------------展示页面,是再获取用户信息之后--------------
   show_page:function(){
     var th=this,ta = this.data.param;
@@ -309,6 +306,7 @@ Page({
           switch (gd.prom_type){
             case 0:
+            case 6:
               //--此时开始计算商品的使用券相关,如果有等级价还要计算和等级价相关的,
               // 如果有优惠促销，还要把促销的部分计算在内，因为促销还有不能使用优惠券--
@@ -375,9 +373,17 @@ Page({
     }else{
       this.getuser_addr(function(ie){
-        th.setData({user_addr: ie });
-      });
+          console.log("getuser_addr")
+          console.log(ie)
+
+          th.setData({user_addr: ie });
+          if (th.data.is_b_now == 1) {
+              th.calculatePrice2();
+          } else {
+             th.calculatePrice();
+          }
+      });
     }
   },
   //---------------检查是否有收货地址-------------------
@@ -676,7 +682,8 @@ Page({
     if (th.data.is_b_now==1){
       console.log("buy_new");
-      if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ ff = false; confirmBox("请新建收货地址"); }
+      if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ 
+          ff = false; getApp().confirmBox("请新建收货地址"); }
       if (!ff) return false;
       var addr = th.data.user_addr;
       if (th.data.bn_exp_type == 1) addr=null;
@@ -687,7 +694,7 @@ Page({
       if(th.data.bn_exp_type==0)
         if(th.data.wu_arr==null ||  th.data.wu_arr.length<=0){
-          confirmBox("读取物流失败");
+          getApp().confirmBox("读取物流失败");
           return false;
         }
@@ -752,7 +759,7 @@ Page({
       console.log(pdata);
     }else{
       //---------购物车的结算---------
-      if (th.data.is_all_zt == 0 && th.data.user_addr == null) { ff = false;confirmBox("请新建收货地址");}
+      if (th.data.is_all_zt == 0 && th.data.user_addr == null) { ff = false; getApp().confirmBox("请新建收货地址");}
       if (!ff) return false;
       var addr = th.data.user_addr;
@@ -763,7 +770,7 @@ Page({
       if(th.data.is_all_zt !=1)
         if(th.data.wu_arr==null || th.data.wu_arr.length<=0 ){
-          confirmBox("读取物流失败");
+          getApp().confirmBox("读取物流失败");
           return false;
         }
@@ -110,6 +110,7 @@ Page({
               if (user_addr[i]['is_default'] == 1) { item = user_addr[i]; break; }
             }
             if (item == null) item = user_addr[0];
+            if (item == undefined) item = null;
             func(item);
           }
         });
@@ -59,12 +59,16 @@ Page({
 	 th.getuser_addr(function(addr) {
       if(addr==null || addr==undefined || addr.length==0) {
-	    	th.setData({ enterAddressPage: 1,});
+        th.setData({ user_addr: null, enterAddressPage: 1,});
       }else {
         th.setData({
           user_addr: addr, enterAddressPage: 0,
         });
       }
+
+     if (th.data.exp_type == 0){
+       th.calculate_wuliu();
+     }
 	 })
   },
@@ -92,13 +96,9 @@ Page({
   //------获取会员收货地址-----
   getuser_addr: function(func) {
-    var to = getApp(),
+      var to = getApp(),
       a = to.request;
-    if (to.globalData.baddr != null) {
-      var user_addr = to.globalData.baddr;
-      to.globalData.baddr = null;
-      func(user_addr);
-    } else {
+
       a.get("/api/weshop/useraddress/page", {
         data: {
           user_id: to.globalData.user_id,
@@ -115,10 +115,11 @@ Page({
             }
           }
           if (item == null) item = user_addr[0];
+          if (item == undefined) item = null;
           func(item);
         }
       });
-    }
+    
   },
   //----------------展示页面,是再获取用户信息之后--------------
@@ -312,6 +313,12 @@ Page({
   //--立即支付--
   to_pay_type: function(ind) {
       var th=this;
+
+      //--物流支付时要有地址--
+      if (th.data.exp_type == 0 && th.data.user_addr==null){
+           return getApp().my_warnning("请先建地址",0,th);
+      }
+
       //---支付参数--
       var dd = {
         order_sn: th.data.order.order_sn,
@@ -323,6 +330,7 @@ Page({
         prom_id:th.data.order.pt_prom_id,
         tail_pay_type:ind,//0微信支付 1余额支付
       };
+
       if(th.data.exp_type==0){
         var index=th.data.index;
         dd.shipping_code=th.data.wu_arr[index].code;
@@ -391,7 +399,7 @@ Page({
             case 3:
               if (goods_piece < 0) goods_piece = 0;
               //累积商品数量
-              goods_piece += good['buynum'];
+              goods_piece += th.data.order.order_goods['goods_num'];
               break;
           }
            var code = th.data.wu_arr[th.data.index].code;
-<!--pages/cart/cart_wk/cart_wk.wxml-->
-
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <!----要进行判断地址是否显示---->
 <view bindtap="enterAddressPage" class="user-mes"
       hidden='{{exp_type==1 }}'>
@@ -80,7 +79,7 @@
   </view>
   <view class='ct_one'>
     <view class='ct_one_left'>成团单价</view>
-    <view class='ct_one_right'>￥<text class='redwz'>{{order.order_amount+order.user_money+order.pt_tail_money}}</text></view>
+    <view class='ct_one_right'>￥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}</text></view>
   </view>
   <view class='ct_one'>
     <view class='ct_one_left'>支付定金</view>
@@ -174,12 +174,10 @@ Page({
     quan_list:null,    //åˆ¸åˆ—è¡¨
     coupon:0,
-
     //ä¼šå‘˜åˆ†äº«çš„å¤´åƒ
     share_head:"",
     share_goods_img:"",
-
     //----------è§†é¢‘å›¾ç‰‡dataå‚æ•°---------
     current: 0,//å›¾ç‰‡è®¡æ•°
     swiperCurrent:0,//è½®æ’çš„ä¸‹æ ‡
@@ -211,7 +209,6 @@ Page({
     var ee = this, that=ee,
       gid = t.goods_id;
-
     //å¦‚æžœtg_idæ˜¯ç©ºçš„è¯ï¼Œåˆ†äº«å›žæ¥
     if (gid == undefined || gid == null || gid == "") {
       gid = decodeURIComponent(postdata.scene);
@@ -395,8 +392,6 @@ Page({
   //---å±•ç¤º---
   onShow: function() {
-
-  
     this.data.is_timer=1;
     var ee = this,gid = this.data.gid,i=getApp().request;
     i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
@@ -1476,6 +1471,14 @@ Page({
                           user_order_pt_state: 2
                         });
                       }
+                      
+                      if (odr.pt_status == 2 && odr.is_zsorder == 4) {
+                          th.setData({
+                             user_order_pt_state: 3,
+                          });
+                          th.data.wk_order_id=odr.order_id;
+                      }
+
                     }
                   },
@@ -2215,10 +2218,7 @@ Page({
           //---äº§å“åç§°---
           //æ–‡æœ¬æ¢è¡Œ å‚æ•°ï¼š1ã€canvaså¯¹è±¡ï¼Œ2ã€æ–‡æœ¬ 3ã€è·ç¦»å·¦ä¾§çš„è·ç¦» 4ã€è·ç¦»é¡¶éƒ¨çš„è·ç¦» 5ã€6ã€æ–‡æœ¬çš„å®½åº¦
           console.log("ssssssss", th.data.data.goods_name);
-
-f          //æ–‡æœ¬æ¢è¡Œ å‚æ•°ï¼š1ã€canvaså¯¹è±¡ï¼Œ2ã€æ–‡æœ¬ 3ã€è·ç¦»å·¦ä¾§çš„è·ç¦» 4ã€è·ç¦»é¡¶éƒ¨çš„è·ç¦» 5ã€6ã€æ–‡æœ¬çš„å®½åº¦
-          console.log("ssssssss", th.data.data.goods_name);
-
+          
           context.setFillStyle("black");
           context.setFontSize(21.3 * unit)
           th.draw_Text(context, th.data.data.goods_name,
@@ -2558,6 +2558,10 @@ f          //æ–‡æœ¬æ¢è¡Œ å‚æ•°ï¼š1ã€canvaså¯¹è±¡ï¼Œ2ã€æ–‡æœ¬ 3ã€è·ç¦»å·¦ä¾
     getApp().goto(url);
   },
-
+  //--è·³è½¬åˆ°æ”¯ä»˜å°¾æ¬¾ç•Œé¢--
+  go_pay_wk:function () {
+    var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id;
+    getApp().goto(url);
+  }
 });
 \ No newline at end of file
@@ -682,11 +682,11 @@
         </view>
         <!---阶梯团---->
-        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3}}" class="buy-btn cart-btn line-h">
+        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
           <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view>
           <view>支付定金</view>
         </view>
-
+          
         <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view>
         <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view>
         <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view>
@@ -694,6 +694,7 @@
       <block wx:else>
         <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">您还未支付</view>
         <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn">查看支付详情</view>
+        <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk"  class="buy-btn cart-btn">支付尾款</view>
       </block>
     </block>
     <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view>-->
@@ -90,34 +90,34 @@ Page({
       order_goods=null;//订单商品表
     //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0
+    /*---
     await getApp().request.promiseGet("/api/weshop/order/page?"+where, {
       data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
     }).then(res => {
         order = res.data.data.pageData;
         this.data.currentPage++;
+    })--*/
+
+    await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, {
+      data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
+    }).then(res => {
+       order = res.data.data.pageData;
+       this.data.currentPage++;
     })
+
     wx.showLoading({ title: "加载中"});
     for (i = 0; i < order.length; i++) {
       //获取订单从表信息
-      await getApp().request.promiseGet("/api/weshop/ordergoods/page", {
+      await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", {
         data: { store_id: os.stoid, order_id: order[i].order_id }
       }).then(res => {
         order_goods = res.data.data.pageData;
         order[i].order_goods = order_goods;
+        order[i].gimage = ee.data.imageurl + order_goods[0].original_img; 
       })
-      for (var j = 0; j < order_goods.length;j++){
-        //获取商品表信息
-        await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + order_goods[j].goods_id, {
-          data: {}
-        }).then(res => {
-          goods = res.data.data;
-          order[i].goods = goods;
-          order[i].original_img = this.data.imageurl + goods.original_img;
-        })
-      }
-
+          
      //获取订单表信息根据上面查询的订单号order[i].pt_listno
       await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
         data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1}
@@ -128,43 +128,19 @@ Page({
          order[i].tx=ordertx;
       })
-      var teamlist=null;
-      //获取团的信息
-      await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + order[i].pt_prom_id,{
-           1:1
-      }).then(res=>{
-          teamlist=res.data.data;
-          order[i].ct_num=teamlist.ct_num;  
-      })
+     
-      if (teamlist.kttype == 3) {
+      if (order[i].is_zsorder== 4) {
         var num = 0;
-        var jt_data = JSON.parse(teamlist.ct_rylist);
+        var jt_data = JSON.parse(order[i].ct_rylist);
         for (var m in jt_data) {
           if (jt_data[m].rynum > num) num = jt_data[m].rynum;
         }
         order[i].max_ct_num = num;
       }
-    
-      var teamgroup=null;
-      //获取活动从表信息team_id:305暂时
-      await getApp().request.promiseGet("/api/weshop/teamgroup/page" , {
-            data: { store_id: os.stoid, listno: order[i].pt_listno, team_id: order[i].pt_prom_id }
-      }).then(res => {
-            teamgroup = res.data.data.pageData[0];
-      })
-
-      //--正在进行中的团，才有时间倒计时--
-      if(teamgroup &&  teamgroup.state==2) {
-          order[i].kt_end_time = teamgroup.kt_end_time;
-          //---如果参团的人数没有3个人，则要体现沙发---
-          order[i].tg_state = teamgroup.state;
-          
-      }
-
-      var sf_num=teamlist.ct_num;
-      if(teamlist.ct_num>=3){ sf_num=3;}
+      var sf_num = order[i].ct_num;
+      if (order[i].ct_num>=3){ sf_num=3;}
       sf_num=sf_num-ordertx.length;
       if(sf_num>0) {
         var arr = [];
@@ -181,7 +157,7 @@ Page({
     }
     wx.hideLoading();
-    ee.setData({ order: this.data.requestData, ordertx:ordertx});
+    ee.setData({ order: this.data.requestData, ordertx: ordertx, isgo:1});
   },
   //---滚动到底部加载更多---
@@ -245,6 +221,13 @@ Page({
     return param < 10 ? '0' + param : param;
   },
+  images_err:function(e){
+      var txt = e.currentTarget.dataset.err;
+      var ob={};
+      ob[txt] = this.data.imageurl + "/miniapp/images/default_g_img.gif";
+      this.setData(ob);
+  }
+
 })
-<!--pages/team_ping/team_ping.wxml-->
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <!--选择款-->
 <view class='top'>
@@ -22,13 +22,12 @@
     <view class='pd-list-image'>
     <view class="xc-list flex">
     <view class="frame"> 
-       <image src='{{item.original_img}}'></image>
+       <image src='{{item.gimage}}' binderror='images_err' data-err="order[{{index}}].gimage"></image>
     </view>
     <view>
        <view class='pd-img-wz1 ellipsis-2'>{{item.goods.goods_name}}
       </view>
-   
       <view class="flex-space-between {{item.pt_status==1? 'xc-price-sn':'xc-price-no'}}">
       <view class="flex">
@@ -63,9 +62,24 @@
     <view style='width:100%;border-bottom:10rpx solid #eee; '> 
     <view class='pd-list-foot'>
       <view class='foot-left'>
-        共{{item.order_goods[0].goods_num}}件, 金额：
-        <text class="xc-wc">￥</text>
-        <view class='foot-l-wz fs35'>{{item.user_money+item.order_amount}}</view>
+        共{{item.order_goods[0].goods_num}}件, 
+        <block wx:if="{{item.is_zsorder==4}}">
+            <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
+               定金：<text class="xc-wc">￥</text>
+               <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
+            </block>       
+            <block wx:else>
+                  <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4">
+                       定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>     
+                  <view class='foot-l-wz fs35' wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
+                  <view class='foot-l-wz2 fs35'  wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view>
+            </block>
+        
+        </block>
+        <block wx:else>
+           金额：<text class="xc-wc">￥</text>
+           <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
+        </block>
       </view>
       <view class='foot-right'>
@@ -104,6 +118,6 @@
 </view>
-<view wx:else>
-<view class='kon'>暂无更多</view>
+<view wx:elif="{{isgo}}">
+  <view class='kon'>暂无更多</view>
 </view>
 \ No newline at end of file
@@ -175,34 +175,28 @@ height:222rpx;
 .pd-list-foot{
-  
-      width: 100%;
+    width: 100%;
     margin: auto;
-    overflow: hidden;
-    height: 105rpx;
-        font-size: 28rpx;
+    font-size: 28rpx;
     line-height: 105rpx;
     color: #000;
     display: flex;
     justify-content:space-between;
-    
-
+  
 }
-
+ 
 .foot-l-wz{
-  padding-right: 10rpx;
+    padding-right: 10rpx;
     display: inline-block;
-    font-size: 34rpx;
-    line-height: 100rpx;
-        color: #e4374d;
+    font-size: 34rpx;  
+    color: #e4374d;
     font-weight: normal;
 }
 .foot-left{
- margin-left:19rpx;
-min-width: 360rpx;
-  height: 100rpx;
+   margin-left:19rpx;
+   min-width: 360rpx;
    line-height: 100rpx;
    font-size:26rpx;
 }
@@ -338,11 +332,8 @@ margin-bottom:40rpx;
   color: #e4374d;
   border-radius: 7rpx;
   font-size: 25rpx;
-
-  letter-spacing:4;
-margin-right:8rpx;
-
-
+  margin-right:8rpx;
+  line-height: 46rpx
 }
 .xc-price-sn{
   height:73rpx;
@@ -378,4 +369,12 @@ line-height:100rpx;
   line-height:121rpx;
 margin-left:5rpx;
+}
+
+.foot-l-wz2{
+    font-size: 34rpx;  
+    color: #e4374d;
+    font-weight: normal;
+    margin-top:-40rpx; 
+    margin-left:80rpx 
 }
 \ No newline at end of file
@@ -684,6 +684,8 @@ Page({
           pick_id: th.data.pick_id,
           user_id: oo.user_id,
           store_id: th.data.stoid,
+          goods_name: th.data.goods.goods_name,
+          goods_sn: th.data.goods.goods_sn,
         };
         //-----拼团-----
         newd.goods_price = th.data.teamlist.price;
@@ -651,8 +651,10 @@ Page({
         });
     },
-
-    
-
+    go_pay_wk:function(){
+      var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
+      getApp().goto(url);
+    }
+  
 })
@@ -152,16 +152,14 @@
     <!-- <block wx:if="{{pay_f!=1 && order.pt_status<2}}"> -->
       <!----/ // // // //按钮---->
-      <view wx:if="{{teamlist.kttype==3}}" class='bodybutton' bindtap='cmeng'>
+      <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-        <button wx:if="{{p_status==1}}"  style='background-color:#fab55a; color:#fff'>
+        <button wx:if="{{p_status==1}}"  bindtap='cmeng'  style='background-color:#fab55a; color:#fff'>
           邀请好友参团
         </button>
-        <button style='background-color:#42c780;' wx:if="{{p_status==2}}">
+        <button bindtap="go_pay_wk" style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
           支付尾款
-        </button>
-        
-        
+        </button>    
       </view>
       <!-- <view wx:elif="{{teamlist.ct_num-ordertx.length>0}}" class='' bindtap='cmeng'> -->
@@ -234,15 +234,12 @@ width:101rpx;
 }
 .bodybutton{
- min-height: 60rpx;
   width: 90%;
   margin: 0 auto;
   text-align: center;
   line-height: 60rpx;
   border-radius:15rpx;
-   height: auto;
-
-
+  height: auto;
 }
 .bodybutton button{
@@ -75,7 +75,7 @@ Page({
             if (su.data.code == 0) {
               var yuer = parseFloat(th.data.userInfo.user_money -
                   th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2);
-              th.setData({ txmon: su.data.data.summoney, yuer });
+              th.setData({ txmon: su.data.data.summoney, yuer: yuer });
             }
           }
         })
@@ -178,4 +178,9 @@ Page({
       _errObj[_errImg] = "public/images/default_goods_image_240.gif";
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
     },
+
+    zfwk:function(){
+      var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
+      getApp().goto(url);
+    }
 });
 \ No newline at end of file
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
     <view class="user-mes" wx:if="{{order.exp_type==0}}">
         <view class="user-contact">
@@ -60,45 +61,58 @@
         </view>
     </view>
     <view class="price-information information">
-        <view class="title">价格信息</view>
-        <view class="item">
-            <view>商品总价</view>
-            <view>￥ {{order.goods_price}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.shipping_price>0}}">
-            <view>运费</view>
-            <view>￥ {{order.shipping_price}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.coupon_price>0}}">
-            <view>优惠券</view>
-            <view>- ￥ {{order.coupon_price}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.integral_money>0}}">
-            <view>积分</view>
-            <view>- ￥ {{order.integral_money}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.user_money>0}}">
-            <view>余额</view>
-            <view>- ￥ {{order.user_money}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.order_prom_amount>0}}">
-            <view>订单优惠</view>
-            <view>- ￥ {{order.order_prom_amount}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.pt_tail_money>0}}">
-            <view>尾款金额</view>
-            <view>- ￥ {{order.pt_tail_money}}元</view>
-        </view>
+           <view class="title" style="margin-bottom:10rpx" >价格信息</view>
+           <view class="item pnew"  wx:if="{{order.is_zsorder==4}}">
+                <view>商品总价</view>
+                <view>￥ {{filters.toFix(order.order_goods[0].member_goods_price*order.order_goods[0].goods_num,2)}}元</view>
+           </view>
+           <view class="item pnew" wx:else>
+              <view>商品总价</view>
+              <view>￥ {{order.goods_price}}元</view>
+            </view>
+           <view class="item pnew">
+                <view>定金金额</view>
+                <view>￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元</view>
+           </view>
+           <view class="item pnew" wx:if="{{order.pt_tail_money>0}}">
+              <view>尾款金额</view>
+              <view>￥ {{order.pt_tail_money}}元</view>
+           </view>
-        <view class="item">
-            <view>实付金额</view>
-            <view class="pay-amount">￥ {{order.order_amount}}元</view>
-        </view>
+            <view class="item pnew" wx:if="{{order.shipping_price>0}}">
+                 <view>配送费用</view>
+                 <view>￥ {{order.shipping_price}}元</view>
+            </view>
+            <view class="item pnew" wx:if="{{order.coupon_price>0}}">
+                <view>优惠券</view>
+                <view> ￥ {{order.coupon_price}}元</view>
+           </view>
+
+            <view class="item pnew" wx:if="{{order.integral_money>0}}">
+               <view>积分</view>
+               <view> ￥ {{order.integral_money}}元</view>
+            </view>
+
+            <view class="item pnew" wx:if="{{order.order_prom_amount>0}}">
+                <view>订单优惠</view>
+                <view>￥ {{order.order_prom_amount}}元</view>
+            </view>
+          
+            <view class="item" wx:if="{{order.pt_tail_money>0}}">
+              <view>订单总价</view>
+              <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
+            </view>
+
+           <view class="item-line"></view>
+           <view class="item" wx:if="{{order.user_money>0}}">
+              <view>使用余额</view>
+              <view>￥ {{order.user_money}}元</view>
+           </view>
     </view>
     <view class="btn-wrap">
-        <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0}}">支付尾款</view>
+        <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
         <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
         <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
         <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
@@ -119,7 +119,7 @@
 .information .title {
     height: 70rpx;
     line-height: 70rpx;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 1rpx solid #ddd;
     font-size: 34rpx;
     color: #333;
 }
@@ -130,8 +130,15 @@
     height: 60rpx;
     line-height: 60rpx;
     font-size: 30rpx;
-    color: #666;
+    color: #333;
+}
+
+.information .item.pnew{
+    height: 50rpx;
+    line-height: 50rpx;
+    color: #999; 
 }
+.item-line{ margin: 5rpx 0; height: 1rpx; border-bottom:1rpx solid #ddd }
 .delivery-address,.leave-word {
     width: 500rpx;
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
     <view class="type-navbar">
         <view class="type-box" wx:for="{{categories}}" wx:key="{{index}}">
@@ -48,8 +49,15 @@
             <view class="goods-tips">
                 <view class="order-total">
                     共{{item.g_num}}件,<view class="goods-total">
-                        <view>金额:￥{{item.order_amount+item.user_money}}</view>
+                      <block wx:if="{{item.pt_status==4 || item.pt_status==5 }}">
+                             <view>金额:￥{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}</view>
+                      </block>    
+                      <block wx:else>
+                        <view wx:if="{{item.is_zsorder==4}}">定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>          
+                        <view wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
                         <view wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view>
+                      </block>    
+                     
                     </view>
                 </view>
                 <view class="check-btn">
@@ -36,7 +36,7 @@
 .goods-box {
     width: 100%;
     background-color: #fff;
-    padding: 0 30rpx;
+    padding: 0 25rpx;
     margin-bottom: 20rpx;
     font-size: 28rpx;
     border-bottom: 1rpx solid #eee;
@@ -117,7 +117,7 @@
 .order-total {
     display: flex;
     justify-content: flex-start;
-    font-size: 32rpx;
+    font-size: 31rpx;
     color: #333;
 }
@@ -127,12 +127,12 @@
 }
 .order-btn {
-    width: 150rpx;
+    width: 125rpx;
     height: 60rpx;
     line-height: 60rpx;
     text-align: center;
     border: 1px solid #eee;
-    margin-left: 20rpx;
+    margin-left: 10rpx;
     float: right;
     border-radius: 5rpx;
 }