预售的订单详情的bug优化 5条

yvan.ni
1 parent ee0bbe7c
Showing 6 changed files with 1231 additions and 495 deletions
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.json
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/cart/cart.wxss
pages/index/index/index.js
pages/user/order_list/order_list.wxml
@@ -4,6 +4,7 @@ var oo = t.globalData.setting, os = oo;
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 var util_pay = require("../../../../utils/pay.js");
+
 Page({
     data: {
         url: t.globalData.setting.url,
@@ -120,7 +121,7 @@ Page({
 	  if(t.order_id)	this.data.order_id=t.order_id;
 	  if(t.order_sn)	this.data.order_sn=t.order_sn;
-        wx.setNavigationBarTitle({title: "填写订单",})
+        wx.setNavigationBarTitle({title: "订单详情",})
         var th = this;
         this.setData({is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,});
         th.data.param = t;
@@ -414,6 +415,10 @@ Page({
             getApp().confirmBox("活动已经结束，或者会员身份不符合");
             return false;
         }
+
+
+
+
         await getApp().request.promiseGet("/api/weshop/order/orderPresell/get/"+oo.stoid+"/"+order.order_id, {}).then(res => {
             presell = res.data.data;
         });
@@ -423,14 +428,20 @@ Page({
             th.setData({wait_dj:1})
         }
         //等待尾款
-        if(order.order_status<2 && presell.deposit_pay_time>0 && presell.tail_pay_state==0){
+        if(order.order_status<2 && presell.deposit_pay_time>0 && presell.tail_pay_state==0 && presell.presell_type!=1){
             th.setData({wait_wk:1})
+            wx.setNavigationBarTitle({title: "支付尾款",})
         }
         //等待发货
         if(order.pay_status==1 && order.shipping_status==0){
             th.setData({wait_fh:1})
         }
+        if(order.pay_status==1 && order.shipping_status==1 && order.order_status<2){
+            th.setData({wait_sh:1})
+        }
+
+
         //---获取商品---
         await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + order_goods.goods_id, {}).then(res => {
             goods = res.data.data;
@@ -444,6 +455,42 @@ Page({
             pickup = res.data.data;
         });
+        order['is_all_return'] = 0;
+        //------------对比一下有没有退款记录------------
+        await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
+            data: { order_id: order.order_id, store_id: oo.stoid,
+                user_id:order.user_id, pageSize: 200 }
+        }).then(rss=>{
+            var ttd=rss;
+            //----没有相关的退款记录----
+            if (ttd.data.data.total==0){
+                order['is_all_return'] = 0;
+            }else{
+                var eea = ttd.data.data.pageData[0];
+                //1.退款正在进行中，
+                //2.退款被拒绝就要显示可以退款
+                //3.退款已经完成
+                order['is_all_return']=1;
+                order['is_all_return_status'] = ttd.data.data.pageData[0].status;
+
+                if (order['order_status'] == 1 && order['pay_status'] == 1) {
+                    switch (eea.status) {
+                        case 0:
+                        case 1:
+                            order.order_status_detail="退款中";
+                            order['return_btn'] = 2; break;
+                        case 2:
+                            order.order_status_detail="退款完成";
+                            order['return_btn'] = 4; break;
+                        case 3:
+                            order['return_btn'] = 3; break;
+                        default:
+                            order['return_btn'] = 0;
+                    }
+                }
+            }
+        })
+
         var price=presell.presell_price;
         if(!goods) return false;
         //--判断物流--
@@ -467,6 +514,16 @@ Page({
                 break; //物流
         }
+        //等待发货的时候
+        if(th.data.wait_fh){
+             var send_time=pre_arr.delivery_date;
+             if(pre_arr.delivery_type==2){
+                 send_time=pre_arr.delivery_daynum*3600;
+             }
+
+        }
+
+
         order.order_goods = order_goods;
         var tail_pay=pre_arr.presell_price*order_goods.goods_num-presell.presell_deposit;
         this.setData({
@@ -482,7 +539,8 @@ Page({
             tail_pay:tail_pay,
             order_goods:order_goods,
             all_price:pre_arr.presell_price*order_goods.goods_num,
-            pickup_id:pickup.pickup_id
+            pickup_id:pickup.pickup_id,
+            send_time:send_time
         });
         th.get_diff();
         //统一进行计算金额
@@ -812,6 +870,8 @@ Page({
         });
     },
     enterAddressPage: function () {
+        if(!this.data.wait_wk) return false;
+
         getApp().globalData.is_cart_old = 1;
         this.data.isget_by_quan = {};
         this.data.enterAddressPage = !0, wx.navigateTo({
@@ -1868,7 +1928,7 @@ Page({
             })
         }else{
-            th.setData({ exp_price: exp_price, order_m: o_condition+exp_price })
+            th.setData({ exp_price: exp_price, order_m: parseFloat(o_condition)+parseFloat(exp_price) })
         }
     },
@@ -2048,6 +2108,482 @@ Page({
     },
+    //--------立即支付----------
+    async jumpToCart4(e) {
+        var th=this;
+        if(this.data.optionIsGoup)
+            wx.navigateTo({
+                url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true"
+            })
+        var order=this.data.order;
+        var order_goods=this.data.order_goods;
+
+        var wlist="";
+
+            var good=order_goods;
+            //线下取价功能已经关闭或者过期
+            if(!th.data.is_open_offline && good.offline_cut>0){
+                wx.showModal({
+                    title: '提示',
+                    content: '线下取价功能已经关闭或者过期！'
+                });
+                return false;
+            }
+            //如果不是小程序有的功能，直接提示要去3.0处理
+            if(good.prom_type==2 ){
+                wx.showModal({
+                    title: '提示',
+                    content: '小程序还未有该活动，请到3.0公众号支付'
+                });
+                return false;
+            }
+
+            //要每件每件的商品进行检查，看有么有超出库存，超出限购
+            var goodsbuynum=0,promgoodsbuynum=0,gg=null;
+            //获取单品的现在的活动状态
+            await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {
+            }).then(res=>{
+                gg=res.data.data;
+            })
+            var limit = gg.viplimited;
+            var store_count = gg.store_count;
+            good.erpwareid=gg.erpwareid;
+
+            //---要获得商品，该用户买了多少件,同步应用---
+            await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                data: {
+                    store_id: os.stoid,
+                    user_id: getApp().globalData.user_id,
+                    goods_id: good.goods_id,
+                    prom_type: good.prom_type,
+                    prom_id: good.prom_id
+                },
+            }).then(res => {
+                var buy_num_data = res.data.data;
+                if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+                goodsbuynum = buy_num_data.goodsbuynum;
+            })
+
+            var buyed_mum2=goodsbuynum+good.goods_num;
+            if (buyed_mum2 > limit && limit > 0) {
+
+                var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
+                th.toast(content);
+                return false;
+            }
+
+            //当是组合优惠的时候
+            if(good.prom_type==7){
+                //如果有组合购
+                var isok = 1;
+                var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
+                await getApp().request.promiseGet(url, {}).then(res => {
+                    if(res.data.code==0 && res.data.data){
+                        if(res.data.data.is_show!=1){
+                            isok=0;
+                        }
+                        //如果活动已经结束
+                        if(res.data.data.is_end==1){
+                            isok=0;
+                        }
+                        //已经结束
+                        if(ut.gettimestamp()>res.data.data.end_time){
+                            isok=0;
+                        }
+                        //还未开始
+                        if(ut.gettimestamp()<res.data.data.start_time){
+                            isok=0;
+                        }
+
+                    }else{
+                        //未找到商品的活动
+                        isok = 0;
+                    }
+
+                })
+                if (!isok){
+                    var  content=gg.goods_name+'活动已经结束,请取消订单';
+                    th.toast(content);
+                    return false;
+                }
+
+                var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                var req_data = {
+                    page: 1,
+                    pageSize: 1,
+                    store_id: os.stoid,
+                    zh_id: good.prom_id,
+                    goods_id:good.goods_id
+                }
+                await getApp().request.promiseGet(url1, {
+                    data: req_data
+                }).then(res => {
+                    if (ut.ajax_ok(res)) {
+                        var gdlist = res.data.data.pageData[0];
+                        good.buyqty=gdlist.buyqty;
+                    }
+                })
+
+                var num=good['buyqty'];
+                console.log(1111);
+                console.log(num);
+                //---- 要计算商品的限购 -----
+                if(good['buyqty']>0){
+                    if(good.goods_num+promgoodsbuynum>good['buyqty']){
+
+                        var  content= good['goods_name']+"超出活动限购\n";
+                        th.toast(content);
+                        return false;
+                    }
+                }
+            }
+
+            //如果优惠促销和搭配购的时候
+            if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
+                var p_ok=1;
+                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+                    if(res.data.code==0){
+                        var r_data=res.data.data;
+                        if(!r_data.collocationPromList && good.prom_type==5){
+
+                            var content=good.goods_name+'未找到活动,请取消订单重新购买';
+                            th.toast(content);
+                            p_ok=0;
+                        }
+                        if(!r_data.promGoodsLists && good.prom_type==3){
+
+                            var  content=good.goods_name+'未找到活动,请取消订单重新购买';
+                            th.toast(content);
+                            p_ok=0;
+                        }
+                    }else{
+
+                        var content=good.goods_name+'未找到活动,请取消订单重新购买';
+                        th.toast(content);
+                        p_ok=0;
+                    }
+                })
+                if(!p_ok) return false;
+            }
+
+            //商品的普通购买 ，不要进行判断
+            if((good.prom_type==1 || good.prom_type==6  || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
+                if(gg.prom_type!=good.prom_type)	{
+
+                    var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+                    th.toast(content);
+                    return false;
+                }
+            }else{
+                if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4)
+                    && !good.is_collocation  && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
+                    var prom=null;
+                    //---如果是活动的时候---
+                    var prom=null,th=this;
+                    if(gg.prom_type==1){
+                        await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{
+                        }).then(res=>{
+                            if(res.data.code==0){
+                                prom=res.data.data;
+                            }
+                        })
+                    }
+                    if(gg.prom_type==6){
+                        await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
+                        }).then(res=>{
+                            if(res.data.code==0){
+                                prom=res.data.data;
+                            }
+                        })
+                    }
+
+                    if(gg.prom_type==4){
+                        await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+                            data:{store_id:os.stoid,goods_id:gg.goods_id}
+                        }).then(res=>{
+                            if(res.data.code==0 && res.data.data && res.data.data.pageData){
+                                prom=res.data.data.pageData[0];
+                            }
+                        })
+                    }
+
+                    if(prom){
+                        var t_now=ut.gettimestamp();
+                        if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
+
+                            var  content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+                            th.toast(content);
+                            return false;
+                        }
+                    }
+                }
+                else{
+                    //不是赠品的时候
+                    if(!good.is_gift && good.prom_type!=3){
+                        var t_ok=1;
+                        await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
+                            if(res.data.code==0){
+                                var r_data=res.data.data;
+                                //-- 参加了全局的优惠活动 --
+                                if(r_data.promGoodsLists){
+
+                                    var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+                                    th.toast(content);
+                                    t_ok=0;
+                                }
+                            }
+                        })
+                        if(!t_ok) return false;
+                    }
+
+                    //-- 如果有参加线下取价 --
+                    if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+",";
+                }
+                //赠品和搭配购不判断商品金额
+                var isok=1;
+                var card_field=th.data.card_field;
+                //如果会员是等级会员,商品有等级价,且不是活动商品
+                if(!good.is_gift && !good.is_collocation && good.prom_type!=8) {
+                    if (card_field && gg[card_field] > 0) {
+                        if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0;
+                        if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0;  //如果线下价格比较贵，则不通过
+
+                    } else {
+                        if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0;
+                        if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过
+                    }
+                    var is_h=0;
+                    if (!isok) {
+
+                        var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+                        th.toast(content);
+                        return false;
+                    }
+                }
+
+
+                    if(good.goods_num>store_count){
+
+                        var content=gg.goods_name+'商品的库存不足,请取消订单';
+                        th.toast(content);
+                        return false;
+                    }
+
+
+            }
+
+            console.log("------------------------------------");
+            //---如果是活动的时候---
+            var prom=null,goodsinfo=good,th=this;
+            if(goodsinfo.prom_type==1){
+                await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
+                }).then(res=>{
+                    if(res.data.code==0){
+                        prom=res.data.data;
+                    }
+                })
+            }
+            if(goodsinfo.prom_type==6 && !good.is_pd_normal){
+                await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
+                }).then(res=>{
+                    if(res.data.code==0){
+                        prom=res.data.data;
+                    }
+                })
+            }
+
+            if(goodsinfo.prom_type==4 && !good.is_integral_normal){
+                await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
+                    data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
+                }).then(res=>{
+                    if(res.data.code==0 && res.data.data && res.data.data.pageData){
+                        prom=res.data.data.pageData[0];
+                    }
+                })
+            }
+
+            //----------如果有活动，并且在进行中，就不计算线下库存---------------
+            if(prom){
+                var now=ut.gettimestamp();
+                if(prom.is_end==1 && prom.end_time<now){
+
+                    var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单重新购买';
+                    th.toast(content);
+                    return false;
+                }
+
+                buyed_mum2=promgoodsbuynum+good.goods_num;
+                if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
+
+                    var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买';
+                    th.toast(content);
+                    return false;
+                }
+
+                if(goodsinfo.prom_type==4){
+                    if (good.goods_num > prom.limitqty-prom.buy_num) {
+
+                        var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单';
+                        th.toast(content);
+                        return false;
+                    }
+                }else{
+                    var redis_num = 0;
+                    //------判断活动是否抢光-----
+                    await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+                        os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, {
+                    }).then(res => {
+                        redis_num = res.data.data;
+                    });
+
+                    if (good.goods_num > redis_num) {
+
+                        var content=gg.goods_name+'超出商品活动库存,请取消订单';
+                        th.toast(content);
+                        return false;
+                    }
+                }
+
+            }
+
+
+
+        //-- 要判断一下线下取价价格是不是发生改变 --
+        if(wlist!="" && th.data.is_open_offline && th.data.is_open_offline>0){
+            wlist=ut.sub_last(wlist);
+            var keyid=order.pickup_id;
+            var user_info=getApp().globalData.userInfo;
+            if(!keyid) return false;
+            var offarr=null;
+            await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", {
+                    data:{
+                        VIPId:encodeURIComponent(user_info.erpvipid),
+                        store_id:os.stoid,
+                        PickupId:keyid,
+                        WareIds:wlist},
+                },
+            ).then(res=>{
+                if(res.data.code==0 && res.data.data && res.data.data.length>0){
+                    offarr=res.data.data;
+                }
+            })
+            if(!offarr && offarr.length<=0 ){
+                wx.showModal({ title: '获取线下取价失败',});
+            }
+            var newarr=ut.convert_arr_key(offarr,'WareId');
+            //-- 循环判断线下的价格 --
+            for(var k in order_goods){
+                var good=order_goods[k];
+                //判断线下取价是不是一样
+                if(newarr[good.erpwareid] &&
+                    parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){
+
+                    var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+                    th.toast(content);
+                    return false;
+                }
+            }
+
+        }
+
+        /*---
+         o.jumpToCart4({
+         order_sn: this.data.order.order_sn,
+         order_amount: this.data.order.order_amount,
+         type: 1 //正常单
+         }, 1);--*/
+
+        util_pay.pay(this.data.order.order_sn, function() {
+            wx.showToast({title: '支付成功'})
+            wx.navigateBack();
+        },null,os.stoid,1);
+
+
+    },
+
+
+    //--------取消订单---------
+    cancelOrder: function(e) {
+        var t = this,th=t, ord_id = this.data.order.order_id,order=this.data.order;
+
+        wx.showModal({
+            title: "是否取消订单？",
+            success: function(e) {
+                if(!e.confirm) return false;
+                //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
+                //if(is_skill==1 || is_zsorder>=2){
+                getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+ord_id+"/"+getApp().globalData.user_id,{
+                    data:{},
+                    success: function(t) {
+                        if(t.data.code==0){
+                             th.setData({'order.order_status':3});
+                             wx.setStorageSync("order:order_list:update", !0);
+                        }
+
+                    },
+                })
+
+            }
+        });
+    },
+
+
+    //-----删除订单-----
+    deleteOrderData: function(t) {
+        var th=this;
+        var order_id=this.data.order.order_id;
+        var	up_data={
+            order_id: order_id,isdel:1
+        };
+        if(th.data.order.order_status!=6){
+            up_data.order_status=5;
+        }
+        wx.showModal({
+            title: "是否删除订单？",
+            success: function(tt) {
+                tt.confirm && getApp().request.put("/api/weshop/order/updatebyId", {
+                    data: up_data,
+                    success: function (t) {
+                        getApp().my_warnning("删除成功",1,th);
+                        setTimeout(function () {
+                            getApp().goto("/pages/user/order_list/order_list");
+                        },1000);
+                    }
+                })
+            }
+        });
+    },
+
+    go_goods:function (e) {
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    },
+    toast(msg){
+        wx.showToast({
+            title: msg,
+            icon: 'none',
+            duration: 3000
+        })
+    },
+    //--------确认收货---------
+    confirmOrder: function(e) {
+        var th=this;
+        var o = this.data.order.order_id,order=this.data.order;
+        wx.showModal({
+            title: "是否确认收货?",
+            success: function(t) {
+                t.confirm && getApp().request.post("/api/weshop/order/confirmOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
+                    success:function (e) {
+                        if(e.data.code==0){
+                            th.setData({})
+                        }
+                    }
+                })
+            }
+        });
+    },
+
+
 {
-    "navigationBarTitleText": "填写订单",
+    "navigationBarTitleText": "订单详情",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "warn": "/components/long_warn/long_warn"
@@ -3,508 +3,657 @@
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <form bindsubmit="submitForm" wx:if="{{show_submit}}">
-	<view class="container">
-		<!-- 支付进度 -->
-		<view class="information bdr14 mgt20">
-			<view class="item ai-center" style="justify-content: flex-start;">
-				<view class="pdr20"><text class="iconfont icon-qianbao fs60"></text></view>
-
-				<view wx:if="{{wait_dj}}">
-					<view>等待买家付定金</view>
-					<view>{{filters.format_time(presell.kw_start_time,1)}} - {{filters.format_time(presell.kw_end_time,1)}}</view>
-				</view>
-
-				<view wx:if="{{no_start}}">
-					<view>等待尾款支付开始</view>
-					<view>{{filters.format_time(presell.kw_start_time,1)}} - {{filters.format_time(presell.kw_end_time,1)}}</view>
-				</view>
-
-				<view wx:if="{{wait_wk && !no_start}}">
-					<view>等待买家付尾款</view>
-					<view  class="fs22">请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消</view>
-				</view>
-				<view wx:if="{{wait_fh}}">
-					<view>等待商家发货</view>
-					<view  class="fs22">将在2022-12-1 10:10:00后发货</view>
-				</view>
-				<view wx:if="{{order.order_status==2}}">
-					<view>待评价</view>
-				</view>
-				<view wx:if="{{order.order_status==3}}">
-					<view>已取消</view>
-				</view>
-				<view wx:if="{{order.order_status==4}}">
-					<view>已完成</view>
-				</view>
-				<view wx:if="{{order.order_status==5}}">
-					<view>已作废</view>
-				</view>
-				<view wx:if="{{order.order_status==6}}">
-					<view>退款退货完成</view>
-				</view>
-
-			</view>
-
-
-			<view class="pdb20 flex t-c fs22 c-7b">
-				<view class="f1">
-					<view>付定金</view>
-					<view wx:if="{{presell.deposit_pay_time>0}}"   class="box"><text class="iconfont icon-yes"></text></view>
-					<view wx:else class="box"><text class="iconfont icon-yes"></text></view>
-				</view>
-				<view class="f1">
-					<view>付尾款</view>
-					<view wx:if="{{presell.tail_pay_state==1}}"   class="box"><text class="iconfont icon-yes"></text></view>
-					<view wx:else class="box line"><text class="circle1"></text></view>
-				</view>
-				<view class="f1">
-					<view>商家发货</view>
-					<view wx:if="{{order.order_status==2 || order.order_status==4}}"  class="box line"><text class="circle1"></text></view>
-					<view wx:else class="box line"><text class="circle1"></text></view>
-				</view>
-				<view class="f1">
-					<view>交易完成</view>
-					<view wx:if="{{order.order_status==4}}" class="box"><text class="iconfont icon-yes"></text></view>
-					<view wx:else  class="box line"><text class="circle1"></text></view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 退款完成 -->
-		<!--
-		<view class="information bdr14 mgt20">
-			<view class="item ai-center" style="justify-content: flex-start;">
-				<view class="pdr20"><text class="iconfont icon-tkcg fs60"></text></view>
-				<view class="">退款完成（定金）</view>
-			</view>
-		</view>-->
-		<!-- 立即购买的时候 -->
-		<view class="tab-wrapper" wx:if="{{presell.deposit_pay_time>0 && presell.tail_pay_state==0  && !no_start}}">
-				<view hidden="{{distr_type==2}}" bindtap='set_wuliu' data-type='1' class="tab {{exp_type == 1? 'active':''}}"
-					  data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
-
-				<view hidden="{{distr_type==1}}" bindtap='set_wuliu' data-type='0' class="tab {{exp_type== 0 ? 'active':''}}"
-					  data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
-		</view>
-
-
-		<!----要进行判断地址是否显示---->
-		<view bindtap="enterAddressPage" class="user-mes mgt20"
-			  hidden='{{exp_type==1 }}'>
-			<!-----默认地址显示---->
-			<block wx:if="{{user_addr!=null}}">
-				<view class="user-contact">
-					<text class="bold fs36 pdr20">{{user_addr.consignee}}</text>
-					<text class="fs28">{{user_addr.mobile}}</text>
-				</view>
-				<view class="location flex ai_c" style="font-size: 28rpx">
-					<view class="pos-icon">
-						<image class="wh100" style="vertical-align: top" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
-					</view>
-					<view class="address">{{user_addr.more_address}}{{'  '}}{{user_addr.address}}</view>
-
-				</view>
-				<view class="update-logistics">
-					<image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
-				</view>
-			</block>
-			<!-----先增地址------>
-			<block wx:else>
-				<view class="add_new">
-					<image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
-				</view>
-			</block>
-
-		</view>
-
-			<view class="use-item bfff bdr_t-14 mgt20">
-				<image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image>
-				<view>{{pickup.pickup_name}}</view>
-			</view>
-			<view class="order-detail">
-				<view class="goods-img">
-					<image class="wh100 bdr14" src="{{imgUrl}}{{goods.original_img}}" binderror='cart_set_err' data-err="goods.original_img"></image>
-				</view>
-				<navigator class="order-cont" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{goods.goods_id}}&pre_id={{pre_arr.id}}">
-					<view class="goods-name ellipsis-2">{{goods.goods_name}}</view>
-					<!-- 商品属性 -->
-					<view class="flex-vertical fs28 xc-ash color-gray n_guige">
-						<view class="goods-color">
-							<block><text>{{filters.show_gui_ge(goods.goods_spec,goods.goods_color)}}</text></block>
-						</view>
-					</view>
-					<!-- ---商品名称规格---- -->
-					<view class="order-num  flex-space-between">
-						<view class="co-red">￥<text class="fs36">{{filters.toFix(pre_arr.presell_price,2)}}</text></view>
-						<view class="goods-num">×{{order.order_goods.goods_num}}</view>
-					</view>
-				</navigator>
-
-			</view>
-
-            <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
-			<view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
-				<view class="flex">
-					<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
-						<image  src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></ image>
-						<text class="card_name">{{show_card.CardName}}</text>
-					</view>            						
-					<view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
-				</view>
-				<view>
-					<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
-				</view>				
-				<!-- 三角形 -->
-				<view class="car_tri_up"></view>
-				<!-- 立即开通跳转 -->
-				<view bindtap="buycard" class="card_op">立即开通</view>				
-			</view>		
-			
-
-			<view class="set-mes bdr_b-14">
-				<view wx:if="{{order.store_prom}}">
-					<icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
-				</view>
-
-				<view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{pickup_id}}" wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
-					<view class="work-frame flex-space-between">
-						<view class="work">
-							优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text>
-						</view>
-						<view class="xc-right-frame">
-							<text wx:if="{{using_quan[pickup_id].is_nouse_red}}">不使用</text>
-							<block wx:else>
-								<text wx:if="{{using_quan[pickup_id].money}}">￥{{using_quan[pickup_id].money}}元优惠券</text>
-								<text wx:if="{{using_quan[pickup_id].isby}}">包邮券</text>
-							</block>
-							<view class="xc-right"></view>
-						</view>
-					</view>
-				</view>
-
-				<view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics}}">			
-					<view class="flex-space-between" style="padding: 20rpx 25rpx; font-size: 30rpx;">
-						<view>选择物流</view>			
-						<view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 12rpx;">
-								<view class="logistics-name">{{wu_arr[index].name}}</view>
-								<view class="xc-right"></view>
-						</view>
-					</view>	
-				</view>
-			</view>
-			<!-- 留言 -->
-			<view class="coupon-mes flex-vertical">
-				<view>留言</view>
-				<view class="leave-word" wx:if="{{sh_liuyan}}">
-					<input placeholder-class="fs28" bindblur="close_liuyan" focus="{{sh_liuyan}}" bindinput="keyUpChangeNum" value="{{user_note}}"
-					 class="word-box" maxlength="100" name="user_note"></input>
-				</view>
-
-				<view wx:if="{{!sh_liuyan}}" bindtap="show_liuyan">
-					<text class="fs26 {{user_note?'':'gray'}} note_text">{{user_note?user_note:'给商家留言，最多100字'}}</text>
-				</view>
-
-			</view>
-			
-			<!-- 是否参与店铺优惠 -->
-			<view class="coupon-mes flex-vertical" bindtap="bn_pop_offline" wx:if="{{bn_goods.offline_price}}">
-				<view>店铺优惠</view>
-				<view class="leave-word fs32" style="color: #999;">
-					省{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}元
-				</view>	
-				<block wx:if="{{bn_goods.is_offline}}">
-			     	<text style="color: #d7642b;">-￥{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}</text>	
-				</block>
-				<block wx:else>
-					 <text style="color: #d7642b;">不使用优惠</text>	
-				</block>
-				<!-- 右边点击 -->
-				<view class="xc-right" style="margin-right: 12rpx; border-color: #d7642b;"></view>
-			</view>
-			
-
-		<view class="information bdr14">
-			<view class="item" wx:if="{{allpice>0}}">
-				<view>商品金额</view>
-				<view class="co-red">￥ {{filters.toFix(allpice,2)}}元</view>
-			</view>
-			<view class="item" wx:if="{{exp_price>0}}">
-				<view>配送费用</view>
-				<view class="co-red">￥ {{filters.toFix(exp_price,2)}}元</view>
-			</view>
-
-			<view class="item" wx:if="{{quan_price>0}}">
-				<view>优惠券优惠</view>
-				<view class="co-red">￥ -{{filters.toFix(quan_price,2)}}元</view>
-			</view>
-
-			<view class="item" wx:if="{{order_prom_amount>0}}">
-				<view>订单优惠</view>
-				<view class="co-red">￥ -{{filters.toFix(order_prom_amount,2)}}元</view>
-			</view>
-
-		</view>
-
-		<view class="information bdr14 mgt20">
-			<view class="item">
-				<view>阶段一：定金（待付款）</view>
-				<view class="co-red">￥{{filters.toFix(pre_arr.presell_money*order.order_goods.goods_num,2)}}元</view>
-			</view>
-			<view class="item">
-				<view>阶段二：尾款</view>
-				<view class="co-red">￥{{filters.toFix(tail_pay,2)}}元</view>
-			</view>
-		</view>
-	</view>
-
-	<view class="fixedToBottom shadow-1" wx:if="{{wait_wk}}" >
-		<view  wx:if="{{no_start}}" class="date-container">尾款时间{{filters.format_time(presell.kw_start_time,1)}} - {{filters.format_time(presell.kw_end_time,1)}}</view>
-		<view wx:elif="{{is_end}}" class="date-container">尾款时间已经结束</view>
-		<view wx:elif="{{wait_wk && !no_start}}" class="date-container">请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消</view>
-
-		<view class="btn-wrap" >
-			<view class="pay-amount">
-				<view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{filters.toFix(order_m-presell.presell_deposit,2)}}</text></view>
-			</view>
-			<button wx:if="{{no_start || is_end || is_complete}}"  class="tips-btn gray" >提交订单</button>
-			<button wx:else  class="tips-btn" bindtap="show_pay" >提交订单</button>
-			<!-- 预售 -->
-			<!-- <button  class="tips-btn" formType="submit" id="submitOrder">立即支付</button> -->
-		</view>
-	</view>
+    <view class="container">
+        <!-- 支付进度 -->
+        <view class="information bdr14 mgt20">
+            <view class="item ai-center" style="justify-content: flex-start;">
+                <view class="pdr20">
+                    <text class="iconfont icon-qianbao fs60"></text>
+                </view>
+
+                <view wx:if="{{wait_dj}}">
+                    <view>等待买家付定金</view>
+                    <view>{{filters.format_time(presell.kw_start_time,1)}} -
+                        {{filters.format_time(presell.kw_end_time,1)}}
+                    </view>
+                </view>
+
+                <view wx:if="{{wait_wk && no_start}}">
+                    <view>等待尾款支付开始</view>
+                    <view>{{filters.format_time(presell.kw_start_time,1)}} -
+                        {{filters.format_time(presell.kw_end_time,1)}}
+                    </view>
+                </view>
+
+
+                <view wx:if="{{wait_sh}}">
+                    <view>等待收货</view>
+                    <view>{{order.order_sn}}</view>
+                </view>
+
+                <view wx:if="{{wait_wk && !no_start}}">
+                    <view>等待买家付尾款</view>
+                    <view class="fs22">请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消</view>
+                </view>
+                <view wx:if="{{wait_fh}}">
+                    <view>等待商家发货</view>
+                    <view class="fs22">将在{{filters.format_time(send_time,1)}}后发货</view>
+                </view>
+                <view wx:if="{{order.order_status==2}}">
+                    <view>待评价</view>
+                    <view>{{order.order_sn}}</view>
+                </view>
+                <view wx:if="{{order.order_status==3}}">
+                    <view>已取消</view>
+                    <view>{{order.order_sn}}</view>
+                </view>
+                <view wx:if="{{order.order_status==4}}">
+                    <view>已完成</view>
+                    <view>{{order.order_sn}}</view>
+                </view>
+                <view wx:if="{{order.order_status==5}}">
+                    <view>已作废</view>
+                    <view>{{order.order_sn}}</view>
+                </view>
+                <view wx:if="{{order.order_status==6}}">
+                    <view>退款退货完成</view>
+                    <view>{{order.order_sn}}</view>
+                </view>
+            </view>
+
+
+            <view class="pdb20 flex t-c fs22 c-7b">
+                <view class="f1">
+                    <view>付定金</view>
+                    <view wx:if="{{presell.deposit_pay_time>0}}" class="box">
+                        <text class="iconfont icon-yes"></text>
+                    </view>
+                    <view wx:else class="box">
+                        <text class="circle1"></text>
+                    </view>
+                </view>
+                <view class="f1" wx:if="{{presell.presell_type!=1}}">
+                    <view>付尾款</view>
+                    <view wx:if="{{presell.tail_pay_state==1}}" class="box line">
+                        <text class="iconfont icon-yes"></text>
+                    </view>
+                    <view wx:else class="box line">
+                        <text class="circle1"></text>
+                    </view>
+                </view>
+                <view class="f1">
+                    <view>商家发货</view>
+                    <view wx:if="{{order.pay_status==2 || order.shipping_status==1}}" class="box line">
+                        <text class="iconfont icon-yes"></text>
+                    </view>
+                    <view wx:else class="box line">
+                        <text class="circle1"></text>
+                    </view>
+                </view>
+                <view class="f1">
+                    <view>交易完成</view>
+                    <view wx:if="{{order.order_status==4}}" class="box line">
+                        <text class="iconfont icon-yes"></text>
+                    </view>
+                    <view wx:else class="box line">
+                        <text class="circle1"></text>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 退款完成 -->
+        <!--
+        <view class="information bdr14 mgt20">
+            <view class="item ai-center" style="justify-content: flex-start;">
+                <view class="pdr20"><text class="iconfont icon-tkcg fs60"></text></view>
+                <view class="">退款完成（定金）</view>
+            </view>
+        </view>-->
+
+        <block wx:if="{{wait_wk}}">
+            <!-- 立即购买的时候 -->
+            <view class="tab-wrapper">
+                <view hidden="{{distr_type==2}}" bindtap='set_wuliu' data-type='1'
+                      class="tab {{exp_type == 1? 'active':''}}"
+                      data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">门店自提
+                </view>
+
+                <view hidden="{{distr_type==1}}" bindtap='set_wuliu' data-type='0'
+                      class="tab {{exp_type== 0 ? 'active':''}}"
+                      data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}">快递邮寄
+                </view>
+            </view>
+            <!----要进行判断地址是否显示---->
+            <view bindtap="enterAddressPage" class="user-mes mgt20"
+                  hidden='{{exp_type==1 }}'>
+                <!-----默认地址显示---->
+                <block wx:if="{{user_addr!=null}}">
+                    <view class="user-contact">
+                        <text class="bold fs36 pdr20">{{user_addr.consignee}}</text>
+                        <text class="fs28">{{user_addr.mobile}}</text>
+                    </view>
+                    <view class="location flex ai_c" style="font-size: 28rpx">
+                        <view class="pos-icon">
+                            <image class="wh100" style="vertical-align: top"
+                                   src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
+                        </view>
+                        <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view>
+
+                    </view>
+                    <view class="update-logistics">
+                        <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
+                    </view>
+                </block>
+                <!-----先增地址------>
+                <block wx:else>
+                    <view class="add_new">
+                        <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>
+                        添加地址
+                    </view>
+                </block>
+            </view>
+        </block>
+
+        <view class="user-mes" style="margin-top: 20rpx"  wx:if="{{order.pay_status==1 && order.exp_type==0}}">
+            <view class="user-contact" style=" margin-left: 20rpx">
+                {{order.consignee}}{{'　　'}}{{order.mobile}}
+            </view>
+            <view class="location flex ">
+
+                <view class="pos-icon" style="width: 26rpx; height: 26rpx">
+                    <image class="wh100" src="{{imgUrl}}/miniapp/images/iconfont-shouhuodizhi.png"></image>
+                </view>
+                <view class="address">{{order.more_address}} {{order.address}}</view>
+            </view>
+
+        </view>
+
+
+
+        <view class="use-item bfff bdr_t-14 mgt20">
+            <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image>
+            <view>{{pickup.pickup_name}}</view>
+        </view>
+        <view class="order-detail">
+            <view class="goods-img" bindtap="go_goods" data-url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{goods.goods_id}}&pre_id={{pre_arr.id}}">
+                <image class="wh100 bdr14" src="{{imgUrl}}{{goods.original_img}}" binderror='cart_set_err'
+                       data-err="goods.original_img"></image>
+            </view>
+            <navigator class="order-cont"
+                       url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{goods.goods_id}}&pre_id={{pre_arr.id}}">
+                <view class="goods-name ellipsis-2">{{goods.goods_name}}</view>
+                <!-- 商品属性 -->
+                <view class="flex-vertical fs28 xc-ash color-gray n_guige">
+                    <view class="goods-color">
+                        <block>
+                            <text>{{filters.show_gui_ge(goods.goods_spec,goods.goods_color)}}</text>
+                        </block>
+                    </view>
+                </view>
+                <!-- ---商品名称规格---- -->
+                <view class="order-num  flex-space-between">
+                    <view class="co-red">￥
+                        <text class="fs36">{{filters.toFix(pre_arr.presell_price,2)}}</text>
+                    </view>
+                    <view class="goods-num">×{{order.order_goods.goods_num}}</view>
+                </view>
+            </navigator>
+
+        </view>
+
+        <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
+        <view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
+            <view class="flex">
+                <view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
+                    <image src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></
+                    image>
+                    <text class="card_name">{{show_card.CardName}}</text>
+                </view>
+                <view>立减
+                    <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text>
+                    元
+                </view>
+            </view>
+            <view>
+                <text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
+            </view>
+            <!-- 三角形 -->
+            <view class="car_tri_up"></view>
+            <!-- 立即开通跳转 -->
+            <view bindtap="buycard" class="card_op">立即开通</view>
+        </view>
+
+
+        <view class="set-mes bdr_b-14" wx:if="{{presell.deposit_pay_time>0 && presell.tail_pay_state==0  && !no_start &&  !wait_dj}}">
+            <view wx:if="{{order.store_prom}}">
+                <icon color="#f23030" size="16" type="info"></icon>
+                {{order.store_prom}}
+            </view>
+
+            <view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{pickup_id}}"
+                  wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
+                <view class="work-frame flex-space-between">
+                    <view class="work">
+                        优惠券
+                        <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+
+                            (get_by_quan_list?get_by_quan_list.length:0)}}张可用
+                        </text>
+                    </view>
+                    <view class="xc-right-frame">
+                        <text wx:if="{{using_quan[pickup_id].is_nouse_red}}">不使用</text>
+                        <block wx:else>
+                            <text wx:if="{{using_quan[pickup_id].money}}">￥{{using_quan[pickup_id].money}}元优惠券</text>
+                            <text wx:if="{{using_quan[pickup_id].isby}}">包邮券</text>
+                        </block>
+                        <view class="xc-right"></view>
+                    </view>
+                </view>
+            </view>
+
+            <view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
+                <view class="flex-space-between" style="padding: 20rpx 25rpx; font-size: 30rpx;">
+                    <view>选择物流</view>
+                    <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 12rpx;">
+                        <view class="logistics-name">{{wu_arr[index].name}}</view>
+                        <view class="xc-right"></view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <!-- 留言 -->
+        <view class="coupon-mes flex-vertical">
+            <view>留言</view>
+            <view class="leave-word" wx:if="{{sh_liuyan}}">
+                <input placeholder-class="fs28" bindblur="close_liuyan" focus="{{sh_liuyan}}" bindinput="keyUpChangeNum"
+                       value="{{user_note}}"
+                       class="word-box" maxlength="100" name="user_note"></input>
+            </view>
+
+            <view wx:if="{{!sh_liuyan}}" bindtap="show_liuyan">
+                <text class="fs26 {{user_note?'':'gray'}} note_text">{{user_note?user_note:'给商家留言，最多100字'}}</text>
+            </view>
+
+        </view>
+
+        <!-- 是否参与店铺优惠 -->
+        <view class="coupon-mes flex-vertical" bindtap="bn_pop_offline" wx:if="{{bn_goods.offline_price}}">
+            <view>店铺优惠</view>
+            <view class="leave-word fs32" style="color: #999;">
+                省{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}元
+            </view>
+            <block wx:if="{{bn_goods.is_offline}}">
+                <text style="color: #d7642b;">-￥{{filters.toFix(bn_goods.shop_price-bn_goods.offline_price,2)}}</text>
+            </block>
+            <block wx:else>
+                <text style="color: #d7642b;">不使用优惠</text>
+            </block>
+            <!-- 右边点击 -->
+            <view class="xc-right" style="margin-right: 12rpx; border-color: #d7642b;"></view>
+        </view>
+
+
+        <view class="information bdr14">
+            <view class="item" wx:if="{{allpice>0}}">
+                <view>商品金额</view>
+                <view class="co-red">￥ {{filters.toFix(allpice,2)}}元</view>
+            </view>
+            <view class="item" wx:if="{{exp_price>0}}">
+                <view>配送费用</view>
+                <view class="co-red">￥ {{filters.toFix(exp_price,2)}}元</view>
+            </view>
+
+            <view class="item" wx:if="{{quan_price>0}}">
+                <view>优惠券优惠</view>
+                <view class="co-red">￥ -{{filters.toFix(quan_price,2)}}元</view>
+            </view>
+
+            <view class="item" wx:if="{{order_prom_amount>0}}">
+                <view>订单优惠</view>
+                <view class="co-red">￥ -{{filters.toFix(order_prom_amount,2)}}元</view>
+            </view>
+
+        </view>
+
+        <view class="information bdr14 mgt20">
+            <view class="item">
+                <view>阶段一：定金（待付款）</view>
+                <view class="co-red">￥{{filters.toFix(pre_arr.presell_money*order.order_goods.goods_num,2)}}元</view>
+            </view>
+            <view class="item">
+                <view>阶段二：尾款</view>
+                <view class="co-red">￥{{filters.toFix(tail_pay,2)}}元</view>
+            </view>
+        </view>
+    </view>
+
+    <!-- 要支付尾款的时候 -->
+    <view class="fixedToBottom shadow-1" wx:if="{{wait_wk}}">
+        <view wx:if="{{no_start}}" class="date-container">尾款时间{{filters.format_time(presell.kw_start_time,1)}} -
+            {{filters.format_time(presell.kw_end_time,1)}}
+        </view>
+        <view wx:elif="{{is_end}}" class="date-container">尾款时间已经结束</view>
+        <view wx:elif="{{wait_wk && !no_start}}" class="date-container">
+            请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消
+        </view>
+
+        <view class="btn-wrap">
+            <view class="pay-amount">
+                <view class="payable">应付金额：
+                    <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m-presell.presell_deposit,2)}}</text>
+                </view>
+            </view>
+            <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">提交订单</button>
+            <button wx:else class="tips-btn" bindtap="show_pay">提交订单</button>
+            <!-- 预售 -->
+            <!-- <button  class="tips-btn" formType="submit" id="submitOrder">立即支付</button> -->
+        </view>
+    </view>
+    <!-- 当订单不是支付尾款的时候 -->
+    <view class="fixedToBottom shadow-1" wx:else style="background-color: #fff;display: flex; justify-content: flex-end; padding: 10rpx 0">
+        <view  bindtap="cancelOrder"  data-id="{{order.order_id}}" class="tips-btn2" wx:if="{{wait_dj}}">取消订单</view>
+        <view bindtap="jumpToCart4" class="tips-btn2" wx:if="{{wait_dj}}">立即付款</view>
+        <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4)}}">
+            <navigator bindtap="confirmOrder" class="tips-btn2" hidden="{{!wait_sh}}">收货确认</navigator>
+        </block>
+
+        <view class="tips-btn2" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
+
+
+        <navigator class="tips-btn2" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+
+
+        <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1}}">
+            <navigator class="tips-btn2" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+            <navigator class="tips-btn2" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+        </block>
+        <block wx:else>
+            <view class="tips-btn2" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
+            <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
+            <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
+                       url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
+        </block>
+
+
+        <block wx:if="{{order.order_status==2 }}">
+            <navigator  class="tips-btn2" url="/packageB/pages/user/add_comment/add_comment?goods_id={{order_goods.goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
+        </block>
+
+    </view>
+
+
 </form>
 <!-- 使用券列表的弹窗 -->
 <view wx:if='{{open_quan==1}}'>
-	<view class="cover-layer flex-center " bindtap='close_coupon'> </view>
-	<view class="cx-popup {{open_quan==true?'up' : 'down'}}">
-		<!-- 最上面 -->
-		<view class="top flex">
-			<view class="xc-top-content  t-c">
-				<view class="xc-title">优惠券使用</view>
-			</view>
-			<view class="xc-close-frame" bindtap='close_coupon'>
-				<view class="xc-close">×</view>
-			</view>
-		</view>
-		<!-- 使用优惠券和不使用优惠券层-->
-		<view class="may_use_coupon fs28 flex"> 可使用的优惠券
-			<view class=" is_use_coupon flex-vertical" bindtap="sele_quan_item" data-no="1">不使用优惠券
-				<block wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}">
-					<view class="circle white xc-hooka fs20 red-b  sn"><text>Γ</text></view>
-				</block>
-				<block wx:else>
-					<view class="circle  xc-hookst ons"></view>
-				</block>
-			</view>
-		</view>
-
-		<!-- 中间券内容显示 -->
-		<view class="xc-frame flex-level">
-			<view class="list-frame">
-				<view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{q_index}}"
-				 wx:for-item="item" wx:for-index="q_index">
-					<view class="xc-coupon-frame flex-center" data-ind="{{q_index}}">
-						<view class="coupon-frame flex rel">
-							<!-- 锯齿 -->
-							<include src="juchi_part.wxml" />
-							<!-- 左边 -->
-							<view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
-								<view class="white xc-money-frames">
-									<view class="f_text"><text class="xc-rmb-symbol">￥</text><text class="xc-rmb-val">{{item.Sum}}</text></view>
-									<view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">满{{item.BuySum}}元可用</view>
-									<view class="coupon-explain t-c" wx:else>满0元可用</view>
-								</view>
-							</view>
-							<!-- 右边 -->
-							<view class="coupon-right flex-center rel">
-								<view class="coupon-annotation  flex">
-									<view class="flex  top-frame">
-										<view class="frame">
-											<view class="coupon-wode ib flex ellipsis-2 ">
-												<text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}</text>
-												<block>{{item.Sum}}元优惠券</block>
-											</view>
-											<view class="coupon-time">{{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view>
-										</view>
-									</view>
-									<block wx:if="{{item.show_red}}">
-										<view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-									</block>
-									<block wx:else>
-										<view class="circle  xc-hooks on"></view>
-									</block>
-								</view>
-								<include src="remark_click_part.wxml" />
-							</view>
-						</view>
-					</view>
-					<!-- 打开是说明 -->
-					<include src="remark_part.wxml" />
-				</view>
-				<!-- 包邮券的显示，立即购买 -->
-				<block wx:if="{{ is_b_now && bn_exp_type==0}}">
-					<view wx:for="{{get_by_quan_list}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}"
-					 wx:for-item="item" wx:for-index="byq_index">
-						<view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
-							<view class="coupon-frame flex rel">
-								<!-- 锯齿 -->
-								<include src="juchi_part.wxml" />
-								<!-- 左边 -->
-								<view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
-									<view class="white xc-money-frames">
-										<view class="f_text"><text class="xc-rmb-val">包邮券</text></view>
-										<view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view>
-										<view class="coupon-explain t-c" wx:else>满0元可用</view>
-									</view>
-								</view>
-								<!-- 右边 -->
-								<view class="coupon-right flex-center rel">
-									<view class="coupon-annotation  flex">
-										<view class="flex  top-frame">
-											<view class="frame">
-												<view class="coupon-wode ib flex ellipsis-2 ">
-													<text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text>
-													<block>包邮券</block>
-												</view>
-												<view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view>
-											</view>
-										</view>
-										<block wx:if="{{item.show_red}}">
-											<view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-										</block>
-										<block wx:else>
-											<view class="circle  xc-hooks on"></view>
-										</block>
-									</view>
-									<include src="remark_click_part2.wxml" />
-								</view>
-							</view>
-						</view>
-						<!-- 打开是说明 -->
-						<include src="remark_part.wxml" />
-					</view>
-				</block>
-
-				<!-- 包邮券的显示，购物车购买 -->
-				<block wx:if="{{!is_b_now && sele_exp_type==0}}">
-					<view wx:for="{{by_quan_list_cart}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}"
-					 wx:for-item="item" wx:for-index="byq_index">
-						<view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
-							<view class="coupon-frame flex rel">
-								<!-- 锯齿 -->
-								<include src="juchi_part.wxml" />
-								<!-- 左边 -->
-								<view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
-									<view class="white xc-money-frames">
-										<view class="f_text"><text class="xc-rmb-val">包邮券</text></view>
-										<view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view>
-										<view class="coupon-explain t-c" wx:else>满0元可用</view>
-									</view>
-								</view>
-								<!-- 右边 -->
-								<view class="coupon-right flex-center rel">
-									<view class="coupon-annotation  flex">
-										<view class="flex  top-frame">
-											<view class="frame">
-												<view class="coupon-wode ib flex ellipsis-2 ">
-													<text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text>
-													<block>包邮券</block>
-												</view>
-												<view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view>
-											</view>
-										</view>
-										<block wx:if="{{item.show_red}}">
-											<view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-										</block>
-										<block wx:else>
-											<view class="circle  xc-hooks on"></view>
-										</block>
-									</view>
-									<include src="remark_click_part2.wxml" />
-								</view>
-							</view>
-						</view>
-						<!-- 打开是说明 -->
-						<include src="remark_part.wxml" />
-					</view>
-				</block>
-
-
-			</view>
-		</view>
-		<!-- 最底下确定层-->
-		<view class="determine-frame">
-			<view class="xc-confirm flex-center" bindtap="confirm_quan"> 确定 </view>
-		</view>
-	</view>
+    <view class="cover-layer flex-center " bindtap='close_coupon'></view>
+    <view class="cx-popup {{open_quan==true?'up' : 'down'}}">
+        <!-- 最上面 -->
+        <view class="top flex">
+            <view class="xc-top-content  t-c">
+                <view class="xc-title">优惠券使用</view>
+            </view>
+            <view class="xc-close-frame" bindtap='close_coupon'>
+                <view class="xc-close">×</view>
+            </view>
+        </view>
+        <!-- 使用优惠券和不使用优惠券层-->
+        <view class="may_use_coupon fs28 flex"> 可使用的优惠券
+            <view class=" is_use_coupon flex-vertical" bindtap="sele_quan_item" data-no="1">不使用优惠券
+                <block wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}">
+                    <view class="circle white xc-hooka fs20 red-b  sn">
+                        <text>Γ</text>
+                    </view>
+                </block>
+                <block wx:else>
+                    <view class="circle  xc-hookst ons"></view>
+                </block>
+            </view>
+        </view>
+
+        <!-- 中间券内容显示 -->
+        <view class="xc-frame flex-level">
+            <view class="list-frame">
+                <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}"
+                      data-ind="{{q_index}}"
+                      wx:for-item="item" wx:for-index="q_index">
+                    <view class="xc-coupon-frame flex-center" data-ind="{{q_index}}">
+                        <view class="coupon-frame flex rel">
+                            <!-- 锯齿 -->
+                            <include src="juchi_part.wxml"/>
+                            <!-- 左边 -->
+                            <view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
+                                <view class="white xc-money-frames">
+                                    <view class="f_text">
+                                        <text class="xc-rmb-symbol">￥</text>
+                                        <text class="xc-rmb-val">{{item.Sum}}</text>
+                                    </view>
+                                    <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">满{{item.BuySum}}元可用
+                                    </view>
+                                    <view class="coupon-explain t-c" wx:else>满0元可用</view>
+                                </view>
+                            </view>
+                            <!-- 右边 -->
+                            <view class="coupon-right flex-center rel">
+                                <view class="coupon-annotation  flex">
+                                    <view class="flex  top-frame">
+                                        <view class="frame">
+                                            <view class="coupon-wode ib flex ellipsis-2 ">
+                                                <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">
+                                                    {{filter.get_type_card(item.UseObjectType)}}
+                                                </text>
+                                                <block>{{item.Sum}}元优惠券</block>
+                                            </view>
+                                            <view class="coupon-time">
+                                                {{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}
+                                            </view>
+                                        </view>
+                                    </view>
+                                    <block wx:if="{{item.show_red}}">
+                                        <view class="circle white xc-hook fs20 red-b sn">
+                                            <text>Γ</text>
+                                        </view>
+                                    </block>
+                                    <block wx:else>
+                                        <view class="circle  xc-hooks on"></view>
+                                    </block>
+                                </view>
+                                <include src="remark_click_part.wxml"/>
+                            </view>
+                        </view>
+                    </view>
+                    <!-- 打开是说明 -->
+                    <include src="remark_part.wxml"/>
+                </view>
+                <!-- 包邮券的显示，立即购买 -->
+                <block wx:if="{{ is_b_now && bn_exp_type==0}}">
+                    <view wx:for="{{get_by_quan_list}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}"
+                          data-ind="{{byq_index}}"
+                          wx:for-item="item" wx:for-index="byq_index">
+                        <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
+                            <view class="coupon-frame flex rel">
+                                <!-- 锯齿 -->
+                                <include src="juchi_part.wxml"/>
+                                <!-- 左边 -->
+                                <view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
+                                    <view class="white xc-money-frames">
+                                        <view class="f_text">
+                                            <text class="xc-rmb-val">包邮券</text>
+                                        </view>
+                                        <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">
+                                            满{{item.condition}}元可用
+                                        </view>
+                                        <view class="coupon-explain t-c" wx:else>满0元可用</view>
+                                    </view>
+                                </view>
+                                <!-- 右边 -->
+                                <view class="coupon-right flex-center rel">
+                                    <view class="coupon-annotation  flex">
+                                        <view class="flex  top-frame">
+                                            <view class="frame">
+                                                <view class="coupon-wode ib flex ellipsis-2 ">
+                                                    <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">
+                                                        {{filter.get_type_card(0)}}
+                                                    </text>
+                                                    <block>包邮券</block>
+                                                </view>
+                                                <view class="coupon-time">
+                                                    {{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}
+                                                </view>
+                                            </view>
+                                        </view>
+                                        <block wx:if="{{item.show_red}}">
+                                            <view class="circle white xc-hook fs20 red-b sn">
+                                                <text>Γ</text>
+                                            </view>
+                                        </block>
+                                        <block wx:else>
+                                            <view class="circle  xc-hooks on"></view>
+                                        </block>
+                                    </view>
+                                    <include src="remark_click_part2.wxml"/>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 打开是说明 -->
+                        <include src="remark_part.wxml"/>
+                    </view>
+                </block>
+
+                <!-- 包邮券的显示，购物车购买 -->
+                <block wx:if="{{!is_b_now && sele_exp_type==0}}">
+                    <view wx:for="{{by_quan_list_cart}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}"
+                          data-ind="{{byq_index}}"
+                          wx:for-item="item" wx:for-index="byq_index">
+                        <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}">
+                            <view class="coupon-frame flex rel">
+                                <!-- 锯齿 -->
+                                <include src="juchi_part.wxml"/>
+                                <!-- 左边 -->
+                                <view class="coupon-left  rel {{filter.setcolor(item.UseObjectType)}} flex-center">
+                                    <view class="white xc-money-frames">
+                                        <view class="f_text">
+                                            <text class="xc-rmb-val">包邮券</text>
+                                        </view>
+                                        <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">
+                                            满{{item.condition}}元可用
+                                        </view>
+                                        <view class="coupon-explain t-c" wx:else>满0元可用</view>
+                                    </view>
+                                </view>
+                                <!-- 右边 -->
+                                <view class="coupon-right flex-center rel">
+                                    <view class="coupon-annotation  flex">
+                                        <view class="flex  top-frame">
+                                            <view class="frame">
+                                                <view class="coupon-wode ib flex ellipsis-2 ">
+                                                    <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">
+                                                        {{filter.get_type_card(0)}}
+                                                    </text>
+                                                    <block>包邮券</block>
+                                                </view>
+                                                <view class="coupon-time">
+                                                    {{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}
+                                                </view>
+                                            </view>
+                                        </view>
+                                        <block wx:if="{{item.show_red}}">
+                                            <view class="circle white xc-hook fs20 red-b sn">
+                                                <text>Γ</text>
+                                            </view>
+                                        </block>
+                                        <block wx:else>
+                                            <view class="circle  xc-hooks on"></view>
+                                        </block>
+                                    </view>
+                                    <include src="remark_click_part2.wxml"/>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- 打开是说明 -->
+                        <include src="remark_part.wxml"/>
+                    </view>
+                </block>
+
+
+            </view>
+        </view>
+        <!-- 最底下确定层-->
+        <view class="determine-frame">
+            <view class="xc-confirm flex-center" bindtap="confirm_quan"> 确定</view>
+        </view>
+    </view>
 </view>
 <!----弹起选择物流名的列表---->
 <view wx:if='{{open_express==1}}'>
-	<view class="cover-layer flex-center " bindtap='close_express'>
-	</view>
-
-	<view class="cx-popup radius {{open_express==1?'up' : 'down'}}">
-		<view class="tops flex">
-			<view class="top-content fs32">
-				<view>选择物流名字</view>
-			</view>
-			<view class="close-frame" bindtap='close_express'>
-				<view class="xc-close-express">×</view>
-			</view>
-		</view>
-		<view class="express_list">
-			<view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-				<view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}"
-				 data-name="{{express_list.name}}" data-idxe="{{idx}}">
-
-					<block wx:if="{{is_express==idx}}">
-						<view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
-					</block>
-					<block wx:else>
-						<view class="circle  xc-hooks"></view>
-					</block>
-					<view class="fs30">{{express_list.name}}</view>
-
-				</view>
-			</view>
-		</view>
-		<view class="flex click-buttem">
-			<view class="xc-determine flex-center" bindtap="determine_expres">
-				<view class="flex-vertical  t-c">确定</view>
-			</view>
-			<view class="xc-confirms flex-center" bindtap="select_default_logistics">
-				<view class="flex-vertical  t-c">设为默认</view>
-			</view>
-		</view>
-
-	</view>
+    <view class="cover-layer flex-center " bindtap='close_express'>
+    </view>
+
+    <view class="cx-popup radius {{open_express==1?'up' : 'down'}}">
+        <view class="tops flex">
+            <view class="top-content fs32">
+                <view>选择物流名字</view>
+            </view>
+            <view class="close-frame" bindtap='close_express'>
+                <view class="xc-close-express">×</view>
+            </view>
+        </view>
+        <view class="express_list">
+            <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
+                <view class="express_list_frame" bindtap="click_express_name"
+                      data-shippingcode="{{express_list.shipping_code}}"
+                      data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
+                    <block wx:if="{{is_express==idx}}">
+                        <view class="circle white xc-hook fs20 red-b">
+                            <text>Γ</text>
+                        </view>
+                    </block>
+                    <block wx:else>
+                        <view class="circle  xc-hooks"></view>
+                    </block>
+                    <view class="fs30">{{express_list.name}}</view>
+
+                </view>
+            </view>
+        </view>
+        <view class="flex click-buttem">
+            <view class="xc-determine flex-center" bindtap="determine_expres">
+                <view class="flex-vertical  t-c">确定</view>
+            </view>
+            <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+                <view class="flex-vertical  t-c">设为默认</view>
+            </view>
+        </view>
+
+    </view>
 </view>
 <warn id="warn"></warn>
 <!-- 客服 -->
 <view class="kefu-container shadow-1">
-	<block wx:if="{{sys_switch.weapp_customertype}}" >
-		<button wx:if="{{sys_switch.weapp_customertype}}" class="kefu-btn"
-				open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-			<text class="iconfont icon-kefu fs60 co-red"></text>
-		</button>
-	</block>
-	<block wx:else>
-		<text class="iconfont icon-kefu fs60 co-red"></text>
-	</block>
+    <block wx:if="{{sys_switch.weapp_customertype}}">
+        <button wx:if="{{sys_switch.weapp_customertype}}" class="kefu-btn"
+                open-type="contact"
+                session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+            <text class="iconfont icon-kefu fs60 co-red"></text>
+        </button>
+    </block>
+    <block wx:else>
+        <text class="iconfont icon-kefu fs60 co-red"></text>
+    </block>
 </view>
 <!--支付的方式选择，0微信支付  1余额支付-->
 <block wx:if="{{show_pay_type}}">
-	<view class="cover-layer" bindtap="close_show_pay"></view>
-	<view class="pay_type_view">
-		<view class="title">请选择支付方式</view>
-		<view class="anniu_view">
-			<view bindtap="set_pay_type" data-type="0" >微信支付</view>
-			<view bindtap="set_pay_type" data-type="1" >余额支付</view>
-		</view>
-	</view>
+    <view class="cover-layer" bindtap="close_show_pay"></view>
+    <view class="pay_type_view">
+        <view class="title">请选择支付方式</view>
+        <view class="anniu_view">
+            <view bindtap="set_pay_type" data-type="0">微信支付</view>
+            <view bindtap="set_pay_type" data-type="1">余额支付</view>
+        </view>
+    </view>
 </block>
@@ -70,7 +70,7 @@ page {
     color: #444;
 		/* margin-top: 28rpx; */
 		border-radius: 14rpx;
-		padding: 20rpx 70rpx 20rpx 20rpx;
+		padding: 20rpx;
 }
 .user-contact {
     /* padding: 24rpx 26rpx;
@@ -1096,3 +1096,20 @@ margin-left: 20rpx;
 }
+
+.tips-btn2 {
+    display: inline-block;
+    width: 140rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    text-align: center;
+    font-size: 30rpx;
+    color: #fff;
+    background-color: #f23030;
+    /* margin-left: 2rpx; */
+    margin-right: 12rpx;
+    border-radius: 10rpx;
+
+}
+
+
@@ -48,6 +48,7 @@ Page({
     pindGoods: null, //拼单数据
     newGoods: null, //新商品
     hotGoods: null, //hot商品
+	preGoods:null, //预售商品
     //----控制是是否显示计时器---
     is_timer: 1,
     ishow: 0,
@@ -302,7 +303,30 @@ Page({
       }
     }
-    //优惠券要实时更新
+      var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
+      if(userInfo){
+          pre_data.user_id= userInfo.user_id;
+      }
+
+      getApp().request.get("/api/weshop/marketing/marketingPresellList/page",{
+          data:pre_data,
+          success:function (e) {
+              if(e.data.code==0 && e.data.data.pageData && e.data.data.pageData.length>0 ){
+                  var pre_data=e.data.data.pageData;
+                  var arr = new Array();
+                  //--三个三个一组---
+                  for (var i = 0; i < pre_data.length; i += 3) {
+                      arr.push(pre_data.slice(i, i + 3));
+                  }
+                  th.setData({
+                      preGoods: arr
+                  });
+              }
+          }
+      })
+
+
+      //优惠券要实时更新
     getApp().getConfig2(function (e) {
       var json_d = JSON.parse(e.switch_list);
       th.setData({ is_closecoupon: json_d.is_closecoupon })
@@ -1121,4 +1145,14 @@ Page({
     this.close_full_screen();
   },
+  go_pre:function (e) {
+        var userInfo=getApp().globalData.userInfo;
+        if(!userInfo){
+            getApp().goto("/pages/togoin/togoin");
+            return false;
+        }
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    }
+
 });
 \ No newline at end of file
@@ -47,7 +47,7 @@
 				</block>
 				<block wx:else>
 					<text wx:if="{{!item.presell.deposit_pay_time}}">待支付定金</text>
-					<text wx:if="{{item.presell.deposit_pay_time && !item.presell.tail_pay_state}}">待尾款</text>
+					<text wx:if="{{item.presell.presell_type!=1 && item.presell.deposit_pay_time && !item.presell.tail_pay_state}}">待尾款</text>
 				</block>
 				<block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
@@ -200,7 +200,7 @@
 	            <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
 	          </block>
-				<block wx:if="{{item.presell}}">
+				<block wx:if="{{item.presell && item.presell.presell_type!=1}}">
 					<navigator class="commodity_To_evaluate flex-level comment_go" url="/packageC/pages/presell/cart/cart?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0}}">支付尾款</navigator>
 				</block>