Merge branch 'master' of http://code.xmainc.com:3000/panyiping/jundaosuzhou_wechatxcx into dev

# Conflicts:
#	app.json
#	pages/info/museumInfo/index.wxss

app.json

@@ -176,7 +176,10 @@
     "pages/culture/index",
     "pages/culture/info/index",
     "pages/user/logout/index",
-	"pages/order/orderList/index"
+	"pages/order/orderList/index",
+	"pages/user/linkman/add/index",
+	"pages/user/address/add/index",
+	"pages/user/linkman/index"
   ],
   "requiredPrivateInfos": [
     "getLocation",

pages/info/museumInfo/index.js

@@ -399,6 +399,7 @@ Page({
     })
   },
   order: function () {
+	this.data.isGroup = null
     if(this.data.product.product.flag!=1 || this.data.product.sku.flag=='off') return;
     if(this.data.isGroup){
       // 如果是团队预约的话 是需要判断是否需要审核的

pages/order/hotel/index.wxml

@@ -110,10 +110,10 @@
       <view bindtap="cancel">取消</view>
       <view bindtap="confirm">确定</view>
     </view>
-    <navigator url="/pages/user/linkman/add/index" class="add-btn">添加出行人</navigator>
+    <navigator url="/pages/old/linkman/add/index" class="add-btn">添加出行人</navigator>
     <view class="linkmanlist-item" wx:for="{{linkmanList}}">
       <view class="linkmanlist-item-top">
-        <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
+        <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/old/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
         <view class="linkman-nickname">{{item.name}}</view>
         <view class="linkman-info">
           <view class="linkman-tel" style="margin-bottom:20rpx">手机号 {{item.tel}}</view>