Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -739,6 +739,9 @@
               <el-switch v-model="isBook" active-color="#13ce66" inactive-color="#ff4949" active-text="供应商"
                 inactive-text="自订"></el-switch>
             </el-form-item>
+            <el-form-item label="是否包含领队">
+              <el-switch v-model="addMsg.IsIncludeLeader" :active-value="0" :inactive-value="1"></el-switch>
+            </el-form-item>
           </div>
           <span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
           <div class="resource-list">
@@ -893,6 +896,7 @@
           PayStyle: 0,
           PlayTimeHour:"",//游玩小时
           PlayTimeMinutes:"",//游玩分钟
+          IsIncludeLeader:0,//是否包含领队:0-包含,1-不包含
         },
         rules: {
           //表单必填验证
@@ -1127,7 +1131,6 @@
         );
       },
       goUrl(path) {
-        // this.$router.push({ path: path });
         this.$router.push({
           path: path,
           query: {