Commit 98b1710b3aa82317b972497d2a3e5fbdd9de2266
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
7 additions
and
2 deletions
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.json
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | "navigationBarTitleText": "参团详情", | 2 | "navigationBarTitleText": "参团详情", |
| 3 | "enablePullDownRefresh": false, | 3 | "enablePullDownRefresh": false, |
| 4 | "usingComponents": { | 4 | "usingComponents": { |
| 5 | - "share": "/components/share/share" | 5 | + "share": "/components/share/share", |
| 6 | + "nav_box": "/components/nav_box/nav_box" | ||
| 6 | } | 7 | } |
| 7 | } | 8 | } |
| 8 | \ No newline at end of file | 9 | \ No newline at end of file |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
| @@ -377,7 +377,11 @@ | @@ -377,7 +377,11 @@ | ||
| 377 | <view class="pdv20"> | 377 | <view class="pdv20"> |
| 378 | <view class="btn" bindtap="closeRules">我知道了</view> | 378 | <view class="btn" bindtap="closeRules">我知道了</view> |
| 379 | </view> | 379 | </view> |
| 380 | - </view> | 380 | + </view>. |
| 381 | + | ||
| 382 | + | ||
| 383 | + <!-- 制作一个圆球导航 --> | ||
| 384 | + <nav_box></nav_box> | ||
| 381 | 385 | ||
| 382 | 386 | ||
| 383 | 387 |