组件调整

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

@@ -969,6 +969,7 @@ export const obj = {
   chanpingbj: 'Product quote',
   chanpinglx: 'Product type',
   fubiaoti: 'Subtitle',
+  dibudaohang:"Bottom navigation",
   suozaichengshi: 'City in',
   tiqianquxiaosj: 'Advance cancellation time',
   jichanghzl: 'Airport terminal',
@@ -2381,6 +2382,7 @@ export const obj = {
   xiugaiqxcd: 'Modify permissions menu',
   caidan: 'Menu',
   caidantubiao: 'Menu ICONS',
+  daohangshezhi:"Navigation settings",
   caidanbjpz: 'Menu background Configuration',
   xitongcd: 'System Menu',
   zicancd: 'Asset Menu',

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

@@ -969,6 +969,7 @@ export const obj = {
     chanpingbj: '製品オファー',
     chanpinglx: '製品の種類',
     fubiaoti: '副題',
+    dibudaohang:"下へ移動",
     suozaichengshi: '所在都市',
     tiqianquxiaosj: '早めにキャンセルします',
     jichanghzl: '空港ターミナル',
@@ -2381,6 +2382,7 @@ export const obj = {
     xiugaiqxcd: '修正権限メニュー',
     caidan: 'メニュー',
     caidantubiao: 'メニューアイコン',
+    daohangshezhi:"ナビゲーション設定",
     caidanbjpz: 'メニュー背景配置',
     xitongcd: 'システムメニュー',
     zicancd: '資産メニュー',

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

@@ -969,6 +969,7 @@ export const obj = {
     chanpingbj: '产品报价',
     chanpinglx: '产品类型',
     fubiaoti: '副标题',
+    dibudaohang:"底部导航",
     suozaichengshi: '所在城市',
     tiqianquxiaosj: '提前取消时间',
     jichanghzl: '机场航站楼',
@@ -2381,6 +2382,7 @@ export const obj = {
     xiugaiqxcd: '修改权限菜单',
     caidan: '菜单',
     caidantubiao: '菜单图标',
+    daohangshezhi:"导航设置",
     caidanbjpz: '菜单背景配置',
     xitongcd: '系统菜单',
     zicancd: '资产菜单',

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

@@ -969,6 +969,7 @@ export const obj = {
   chanpingbj: '産品報價',
   chanpinglx: '産品類型',
   fubiaoti: '副標題',
+  dibudaohang:"底部導航",
   suozaichengshi: '所在城市',
   tiqianquxiaosj: '提前取消時間',
   jichanghzl: '機場航站樓',
@@ -2381,6 +2382,7 @@ export const obj = {
   xiugaiqxcd: '修改權限菜單',
   caidan: '菜單',
   caidantubiao: '菜單圖標',
+  daohangshezhi:"導航設置",
   caidanbjpz: '菜單背景配置',
   xitongcd: '系統菜單',
   zicancd: '資產菜單',

src/components/WebSet/WebSiteEdit.vue

@@ -216,10 +216,6 @@
         </div>
       </div>
       <div class="WebSite_Left">
-        <!-- <el-select v-model="countryId" @change="changeCountry" style="margin-bottom:12px;">
-          <el-option v-for="x in tempCountry" :label="x.name" :value="x.val" :key="x.val">
-          </el-option>
-        </el-select> -->
         <el-select v-model="templateId" @change="getTemplateDetails()">
           <el-option :label="$t('pub.pleaseSel')" :value="0" :key="0">
           </el-option>

src/components/WebSet/home/indexRoll1.vue

@@ -115,24 +115,24 @@
         <tbody v-for="(item,index) in plugData.NavList" :key="index">
           <tr>
             <td class="caidantext">
-              {{$t('objFill.caidan')}}{{index+1}}:
+              {{$t('objFill.daohangshezhi')}}{{index+1}}:
             </td>
             <td></td>
             <td class="rowEnd">
               <div>
                 <el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
-                  <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
+                  <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
                 </el-tooltip>
                 <el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
                   :content="'- '+$t('objFill.caidan')" placement="top">
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
                   </el-button>
                 </el-tooltip>
               </div>
             </td>
           </tr>
           <tr>
-            <td class="w350">
+            <td class="w350" rowspan="3">
               <el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
                   <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
@@ -166,24 +166,33 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
-                <el-input type="text" v-model="item.LinkUrl">
-                   <el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
-                </el-input>
-                
-              </el-form-item>
-              <el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
-                <el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
-              </el-form-item>
             </td>
             <td class="colAs">
               <el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
                 <el-input type="text" v-model="item.SubName"></el-input>
               </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td>
               <el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
                 <el-input type="text" v-model="item.SubEnName"></el-input>
               </el-form-item>
             </td>
+            <td>
+              <el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
+                <el-input type="text" v-model="item.LinkUrl">
+                  <el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
+                </el-input>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
+                <el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
+              </el-form-item>
+            </td>
           </tr>
         </tbody>
       </table>
@@ -217,7 +226,6 @@
             Id: 2
           },
         ],
-        clickType: 0, //1主菜单  2二级菜单
         MenuList: {
           FileType: 1,
           FileUrl: '',
@@ -233,15 +241,14 @@
 
     },
     methods: {
-      addMenu(type, index) {
-        this.clickType = type
+      addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
       },
-      delMenu(type, index, i) {
-        this.clickType = type
-        if (type == 1) {
-          this.plugData.NavList.splice(index, 1)
-        }
+      delMenu(index) {
+        var that = this;
+        that.Confirm(this.$t('tips.shifoushanchu'), function () {
+          that.plugData.NavList.splice(index, 1)
+        });
       },
       //上传图片
       UploadAttachment(file) {

src/components/WebSet/home/indexRoll2.vue

@@ -113,24 +113,24 @@
         <tbody v-for="(item,index) in plugData.NavList" :key="index">
           <tr>
             <td class="caidantext">
-              {{$t('objFill.caidan')}}{{index+1}}:
+              {{$t('objFill.daohangshezhi')}}{{index+1}}:
             </td>
             <td></td>
             <td class="rowEnd">
               <div>
                 <el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
-                  <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
+                  <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
                 </el-tooltip>
                 <el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
                   :content="'- '+$t('objFill.caidan')" placement="top">
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
                   </el-button>
                 </el-tooltip>
               </div>
             </td>
           </tr>
           <tr>
-            <td class="w350">
+            <td class="w350" rowspan="3">
               <el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
                   <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
@@ -164,23 +164,33 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
-                <el-input type="text" v-model="item.LinkUrl">
-                  <el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
-                <el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
-              </el-form-item>
             </td>
             <td class="colAs">
               <el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
                 <el-input type="text" v-model="item.SubName"></el-input>
               </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td>
               <el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
                 <el-input type="text" v-model="item.SubEnName"></el-input>
               </el-form-item>
             </td>
+            <td>
+              <el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
+                <el-input type="text" v-model="item.LinkUrl">
+                  <el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
+                </el-input>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
+                <el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
+              </el-form-item>
+            </td>
           </tr>
         </tbody>
       </table>
@@ -214,7 +224,6 @@
             Id: 2
           },
         ],
-        clickType: 0, //1主菜单  2二级菜单
         MenuList: {
           FileType: 1,
           FileUrl: '',
@@ -230,15 +239,14 @@
 
     },
     methods: {
-      addMenu(type, index) {
-        this.clickType = type
+      addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
       },
-      delMenu(type, index, i) {
-        this.clickType = type
-        if (type == 1) {
-          this.plugData.NavList.splice(index, 1)
-        }
+      delMenu(index) {
+        var that = this;
+        that.Confirm(this.$t('tips.shifoushanchu'), function () {
+          that.plugData.NavList.splice(index, 1)
+        });
       },
       //上传图片
       UploadAttachment(file) {

src/components/WebSet/home/indexSlider1.vue

@@ -114,24 +114,24 @@
         <tbody v-for="(item,index) in plugData.NavList" :key="index">
           <tr>
             <td class="caidantext">
-              {{$t('objFill.caidan')}}{{index+1}}:
+              {{$t('objFill.daohangshezhi')}}{{index+1}}:
             </td>
             <td></td>
             <td class="rowEnd">
               <div>
                 <el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
-                  <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
+                  <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
                 </el-tooltip>
                 <el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
                   :content="'- '+$t('objFill.caidan')" placement="top">
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
                   </el-button>
                 </el-tooltip>
               </div>
             </td>
           </tr>
           <tr>
-            <td class="w350">
+            <td class="w350" rowspan="3">
               <el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
                   <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
@@ -165,23 +165,33 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
-                <el-input type="text" v-model="item.LinkUrl">
-                  <el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
-                </el-input>
-              </el-form-item>
-              <el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
-                <el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
-              </el-form-item>
             </td>
             <td class="colAs">
               <el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
                 <el-input type="text" v-model="item.SubName"></el-input>
               </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td>
               <el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
                 <el-input type="text" v-model="item.SubEnName"></el-input>
               </el-form-item>
             </td>
+            <td>
+              <el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
+                <el-input type="text" v-model="item.LinkUrl">
+                  <el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
+                </el-input>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
+                <el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
+              </el-form-item>
+            </td>
           </tr>
         </tbody>
       </table>
@@ -215,7 +225,6 @@
             Id: 2
           },
         ],
-        clickType: 0, //1主菜单  2二级菜单
         MenuList: {
           FileType: 1,
           FileUrl: '',
@@ -231,15 +240,14 @@
 
     },
     methods: {
-      addMenu(type, index) {
-        this.clickType = type
+      addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
       },
-      delMenu(type, index, i) {
-        this.clickType = type
-        if (type == 1) {
-          this.plugData.NavList.splice(index, 1)
-        }
+      delMenu(index) {
+        var that = this;
+        that.Confirm(this.$t('tips.shifoushanchu'), function () {
+          that.plugData.NavList.splice(index, 1)
+        });
       },
       //上传图片
       UploadAttachment(file) {