diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index fc481a9..d813ffc 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -4367,10 +4367,10 @@ Page({
     if (!user_id) user_id = 0;
     var gd = e.currentTarget.dataset.gd;
     var item2 = e.currentTarget.dataset.item;
-
+    
     var good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
 
-    if(item2.prom_type>0){
+    if(item2 && item2.prom_type>0){
       good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd + "&prom_id=" + item2.prom_id + "&prom_type="+item2.prom_type;
       getApp().goto(good_url);
       return false;
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 9f32e13..4bfd4a8 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -598,6 +598,32 @@ Page({
       }
     });
   },
+  //预存款判断
+  async vipadvancesum(keyid,pre_cut,pre_json){
+    let pre=JSON.parse(pre_json)
+    let listform=[]
+    pre.map(item=>{
+      let obj={
+        advancesum: item.advancesum,
+        advanceitemid: item.advanceitemid
+      }
+      listform.push(obj)
+    })
+    let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
+      data: {
+        accdb: getApp().globalData.config.erpid,
+        ApiName: 'api.pos.shop.vipadvancesum.list',
+        // usercode: "admin",
+        vipid: getApp().globalData.userInfo.erpvipid,
+        // oddsum: "0",
+        // advancesum: cartList.order_amount,
+        storageid: keyid,
+        listform
+      },
+      is_json: 1
+    })
+    return res.data
+  },
   /*----------跳转支付-----------*/
   async jumpToCart4(t) {
 
@@ -613,6 +639,20 @@ Page({
     var order_goods = e.order_goods;
     var user_id = getApp().globalData.userInfo.user_id;
     
+    //如果使用预存的话，要重新效验下预存金额是否足够
+    if(order.pre_cut && order.pre_json){
+      let pickup_id=order.pickup_id
+      let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})
+      let keyid = res.data.data.keyid
+      let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)
+      if(resdata.code !=0){
+        let msg=resdata.msg || "预存金额不足"
+        getApp().confirmBox(msg);
+        th.setData({ paying: 0 });
+        return false;
+      }
+    }
+
     // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
     if (parseInt(order_goods['0']['prom_type']) == 9) {
       var aid = order_goods['0']['prom_id'];
@@ -818,14 +858,18 @@ Page({
           if (res.data.code == 0 && res.data.data && res.data.data.length) {
             for (let i in res.data.data) {
               let item = res.data.data[i];
-              if (item.prom_type == 3) {
+              if (item.prom_type == 3 || item.prom_type==5) {
                 is_g_prom = 1; break;
               }
             }
           }
         })
+        
         if (is_g_prom) {
-          await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
+          
+          // await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
+          await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
+            
             if (res.data.code == 0) {
               var r_data = res.data.data;
               if (!r_data.collocationPromList && good.prom_type == 5) {
@@ -848,6 +892,7 @@ Page({
             }
           })
         } else {
+          //只读优化促销和阶梯促销
           await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
             if (res.data.code == 0) {
               var r_data = res.data.data;