Merge branch 'dev' into 'test'

Dev See merge request !771

Merge branch 'dev' into 'test'
Dev See merge request !771
后端研发-苏明海
2 parents 4c64f428 da7a2fae
Showing 3 changed files with 3 additions and 5 deletions
packageB/pages/zuhegou/index/index.js
pages/cart/cart/cart.js
pages/goods/categoryList/categoryList.wxss
@@ -440,6 +440,7 @@ Page({
         this.data.sele_index = index;
         let title = '';
         self = this;
+        th.data.s_cart_num=0;
         //说明是加入购物车是时候
         this.data.is_zuhe_addcart = 1;
@@ -496,7 +497,7 @@ Page({
                 success (res) {
                     if (res.confirm) {
                         console.log('用户点击确定');
-                        if(th.data.sele_g.cart_num){
+                        if(th.data.sele_g.cart_num && th.data.sele_g.cart_num - th.data.sele_g.num>0){
                             var updata = {
                                 id: th.data.sele_g.cart_id,
@@ -140,9 +140,6 @@ Page({
     },
     onHide(){
-        for(var i = 1; i < 100; i++) {
-            clearInterval(i);
-        }
         this.data.zuhe_map={};
     },
     onUnLoad(){
@@ -311,7 +311,7 @@ width: 60%;
  max-height: 90%;
  overflow-y:scroll;
  overflow: hidden scroll;
- padding-bottom: 65rpx;
+ /* padding-bottom: 65rpx; */
  }