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

src/assets/common/lang/EN/fill.js

@@ -1592,6 +1592,7 @@ export const obj = {
   dianjikqksjp: 'Click to open tickets for sale',
   jietuanriqi: 'Knot date',
   xilietxbm: 'Series Group New Layout',
+  xilietdate: 'Series Group Date',
   dangtuanxbm: 'New Layout of Dangtuan',
   xiazaiqiyueshu: "Download The Contract",
   tuisongxiaoxi: 'Push message',

src/assets/common/lang/Japan/fill.js

@@ -1592,6 +1592,7 @@ export const obj = {
     dianjikqksjp: 'クリックして航空券を販売することができます',
     jietuanriqi: '結団日',
     xilietxbm: 'シリーズ団新版面',
+    xilietdate: 'シリーズ団期',
     dangtuanxbm: '契約書のダウンロード',
     xiazaiqiyueshu:"下載契約書",
     tuisongxiaoxi: 'プッシュメッセージ',

src/assets/common/lang/zhCN/fill.js

@@ -1592,6 +1592,7 @@ export const obj = {
     dianjikqksjp: '点击开启可售机票',
     jietuanriqi: '结团日期',
     xilietxbm: '系列团新版面',
+    xilietdate: '系列团期',
     dangtuanxbm: '当团新版面',
     xiazaiqiyueshu:"下载契约书",
     tuisongxiaoxi: '推送消息',

src/assets/common/lang/zhTW/fill.js

@@ -1592,6 +1592,7 @@ export const obj = {
   dianjikqksjp: '點擊開啓可售機票',
   jietuanriqi: '結團日期',
   xilietxbm: '系列團新版面',
+  xilietdate: '系列團期',
   dangtuanxbm: '當團新版面',
   xiazaiqiyueshu: "下載契約書",
   tuisongxiaoxi: '推送消息',

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -587,8 +587,8 @@
                 </p>
               </template>
               <template>
-                <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="downLoadloading"
-                  @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
+                <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
+                  :loading="downLoadloading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
                 </el-button>
               </template>
             </td>