Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents f5b4a91e 4176121b
Showing 7 changed files with 20 additions and 6 deletions
packageB/pages/user/collect_list/collect_list.wxml
packageB/pages/user/comment/comment.js
packageB/pages/user/comment/comment.wxml
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -5,7 +5,7 @@
   </view>
   <view class="flex-level fs30 xc-ash">当前暂无收藏</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
+    <navigator bindtap="go_to" data-url="/pages/index/index/index" bindtap="goto">
       <view class="flex-center fs28 white">去首页逛逛</view>
     </navigator>
   </view>
@@ -154,5 +154,9 @@ Page({
       url: '/pages/index/index/index',
     })
   },
+   go_url(e){
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    }
 });
 \ No newline at end of file
@@ -14,7 +14,7 @@
     </view>
     <view class="flex-level fs30 xc-ash">当前暂无评价</view>
     <view class="flex-level">
-      <navigator url="/pages/index/index/index" bindtap="goto">
+      <navigator bindtap="go_url" data-url="/pages/index/index/index">
         <view class="flex-center fs28 white">去首页逛逛</view>
       </navigator>
     </view>
@@ -2066,5 +2066,10 @@ Page({
 	  if (hei< viewHeight) {
 	      this.setData({ max_sw_height: viewHeight });
 	   }
-	}
+	},
+
+    go_url(e){
+        var url=e.currentTarget.dataset.url;
+        getApp().goto(url);
+    }
 });
 \ No newline at end of file
@@ -252,7 +252,7 @@
   </view>
   <view class="flex-level fs32 xc-ash">购物车竟然是空的</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
+    <navigator bindtap="go_url" data-url="/pages/index/index/index" bindtap="goto">
       <view class="flex-center fs30 white">去首页逛逛</view>
     </navigator>
   </view>
@@ -1575,7 +1575,12 @@ Page({
 			icon: 'none',
 			duration: 3000
 		})
-	}
+	},
+
+    go_url(e){
+       var url=e.currentTarget.dataset.url;
+       getApp().goto(url);
+    }
 });
 \ No newline at end of file
@@ -249,7 +249,7 @@
   </view>
   <view class="flex-level fs30 xc-ash">当前暂无订单</view>
   <view class="flex-level">
-    <navigator url="/pages/index/index/index" bindtap="goto">
+    <navigator bindtap="go_url" data-url="/pages/index/index/index" >
       <view class="flex-center fs28 white">去首页逛逛</view>
     </navigator>
   </view>