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

yvan.ni
2 parents 55cc3821 d592e97b
Showing 2 changed files with 7 additions and 2 deletions
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
@@ -2,6 +2,7 @@
 	"navigationBarTitleText": "参团详情",
 	"enablePullDownRefresh": false,
 	"usingComponents": {
-			"share": "/components/share/share"
+			"share": "/components/share/share",
+			"nav_box": "/components/nav_box/nav_box"
 	}
 }
 \ No newline at end of file
@@ -377,7 +377,11 @@
         <view class="pdv20">
             <view class="btn" bindtap="closeRules">我知道了</view>
         </view>
-    </view>
+    </view>.
+		
+		
+	<!-- 制作一个圆球导航 -->
+	<nav_box></nav_box>