diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index a1b9547..59ed7ac 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -601,8 +601,7 @@ Page({
             th.data.cartlist[i].shipping_price=0;
           }
 
-         th.data.cartlist[i].shipping_price.toFixed(2);
-
+         th.data.cartlist[i].shipping_price=th.data.cartlist[i].shipping_price.toFixed(2);
           //---如果有选择优惠券的情况下---
          var quan_price=0;
          var  coupon_price=0,bn_pick=th.data.bn_pick,pickid=cart_item.pickup_id;
@@ -653,6 +652,9 @@ Page({
               umoney=0;
             }
           }
+          else{
+              th.data.cartlist[i].user_money=0;
+          }
 
           th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2);
           
@@ -662,14 +664,12 @@ Page({
           th.data.cartlist[i].goods_price = o_price.toFixed(2);
           th.data.cartlist[i].order_amount= th.data.cartlist[i].order_amount- th.data.cartlist[i].user_money;         //会员使用余额
 
-          all_price += o_price;
-          all_total_m += th.data.cartlist[i].total_amount;
-          all_shipping_m += th.data.cartlist[i].shipping_price;
-          all_order_m += th.data.cartlist[i].order_amount;
-          all_user_m += th.data.cartlist[i].user_money;
-          all_coupon_price_m=parseFloat(all_coupon_price_m)+parseFloat(th.data.cartlist[i].coupon_price);
-
-
+            all_price += parseFloat(o_price);
+            all_total_m +=  parseFloat(th.data.cartlist[i].total_amount);
+            all_shipping_m +=  parseFloat(th.data.cartlist[i].shipping_price);
+            all_order_m +=  parseFloat(th.data.cartlist[i].order_amount);
+            all_user_m +=  parseFloat(th.data.cartlist[i].user_money);
+            all_coupon_price_m+= parseFloat(th.data.cartlist[i].coupon_price);
         }
 
         all_shipping_m=parseFloat(all_shipping_m).toFixed(2);
@@ -1013,12 +1013,12 @@ Page({
               //  order_sn: data.data,
               //}, 1);
                 util_pay.pay(data.data, function() {
-                    app.my_warnning("支付成功",1,th);
-                    setTimeout(function () {
+                    //app.my_warnning("支付成功",1,th);
+                    //setTimeout(function () {
                         wx.navigateTo({
-                            url: "/pages/user/order_list/order_list"
+                            url: "/pages/payment/pay_success/pay_success?type=2&order_sn="+data.data
                         })
-                    },1000)
+                    //},1000)
 
                 }, function () {
                     //支付失败
@@ -1038,13 +1038,13 @@ Page({
                 success: function (t) {
                   //console.log(t);
                   if(t.data.code==0){
-                      app.my_warnning("支付成功",1,th);
-                      setTimeout(function () {
+                      //app.my_warnning("支付成功",1,th);
+                      //setTimeout(function () {
                         th.setData({ isclose: 0 });
                         wx.navigateTo({
-                          url: "/pages/user/order_list/order_list"
+                          url: "/pages/payment/pay_success/pay_success?type=2&order_sn="+data.data,
                         })
-                      }, 1000)
+                      //}, 1000)
                   }
                 },
                 fail:function () {
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 355498f..c4302ed 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -541,7 +541,7 @@ Page({
   //------支付成功页面--------
   jumpPaymentPage: function(order_sn,order_amount) {
     wx.setStorageSync("order:order_list:update", !0), wx.redirectTo({
-      url: "/pages/payment/payment/payment?order_sn=" + order_sn + "&order_amount=" + order_amount
+      url: "/pages/payment/pay_success/pay_success?order_sn=" + order_sn + "&type=1",
     });
   },
 
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index a587e52..3449f74 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -293,10 +293,11 @@ Page({
 
   //跳转到分类的商品列表
   go_cate:function(t){
-    var cid=  t.currentTarget.dataset.cid;
-    var pid = t.currentTarget.dataset.pid;
-    console.log("是这个吗", pid);  
-    var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid +"&pid="+pid;
+     var cid=  t.currentTarget.dataset.cid;
+     var pid = t.currentTarget.dataset.pid;
+     var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid;
+     if(pid!=undefined) lurl+="&pid="+pid;
+
      wx.navigateTo({ url: lurl});   
   },
 
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 57494fe..53fe04c 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -217,7 +217,7 @@
 <view class="classify_content-frame flex-wrap">
 <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="indx">
  
- <view  class="brand_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="1" bindtap="go_cate">
+ <view  class="brand_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
      <image class="brand_img"src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
    <view class="brand_img_name fs24">{{goods.items.name}}</view>
   </view>
@@ -233,7 +233,7 @@
 <view>
 
 
-<view class="classify_name fs32 flex-space-between"data-pid="1"data-cid="{{goods.items.id}}" bindtap='select_more'>
+<view class="classify_name fs32 flex-space-between"data-pid="goods.items.parent_id" data-cid="{{goods.items.id}}" bindtap='select_more'>
 <view>{{goods.items.name}}</view>
 <view class="flex select_more" > 
   <view class="red-co fs24" >更多</view>
@@ -244,7 +244,7 @@
 
 <block wx:if="{{goods.arrays.length>0}}">
 <view class="classify_content-frame  flex-wrap">
-  <view  class="brand_img_frame t-c ib" data-cid="{{item.id}}" data-pid="2"wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
+  <view  class="brand_img_frame t-c ib" data-cid="{{item.id}}"  wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
      <image class="brand_img"src="{{item.icoimg==null||item.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
    <view class="brand_img_name fs24">{{item.name}}</view>
   </view>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index df5ad73..810c38d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -797,7 +797,7 @@ Page({
     //     action: "buy_now"
     // }),
     s.set_b_now(e);
-    wx.navigateTo({
+    wx.redirectTo({
       url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
     });
   },