Merge branch 'dev' into 'test'

默认自提的是显示的bug See merge request !1061

Merge branch 'dev' into 'test'
默认自提的是显示的bug See merge request !1061
后端研发-苏明海
2 parents dd11cced 565f9cdc
Showing 1 changed file with 0 additions and 1 deletions
pages/cart/cart2/cart2.js
@@ -814,7 +814,6 @@ Page({
                     })
                     if(!fd || fd.length==0){
                         arr[ik].show_same_city=1;
-                        th.setData({is_all_zt:0})
                     }
                 }