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

src/components/WebSet/WebSiteEdit.vue

@@ -222,7 +222,6 @@
           <el-option v-for="item in templateList" :label="item.TemplateName" :value="item.Id" :key="item.Id">
           </el-option>
         </el-select>
-
         <div class="temp-list-wrap">
           <div v-for="(subItem,subIndex) in detailsList" class="temp-list-item" :key="subIndex" draggable="true"
             @dragstart="dragLeftStart($event,subItem)" @dragend="dragendLeft($event,subItem)">
@@ -234,7 +233,7 @@
       </div>
     </div>
     <el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px">
- 
+    
       <!--视频-->
       <plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog>
       <!--轮播图-->
@@ -458,6 +457,7 @@
         this.currentEditItemData = JSON.parse(JSON.stringify(item.plugData));
         if(!this.currentEditItemData.BottomList) this.$set(this.currentEditItemData,'BottomList',[])
         if(!this.currentEditItemData.MBgColor) this.$set(this.currentEditItemData,'MBgColor','')
+        if(!this.currentEditItemData.MLogo) this.$set(this.currentEditItemData,'MLogo','')
       },
       //获取数据
       setSubPlugData() {

src/components/WebSet/home/indexNav.vue

@@ -395,10 +395,10 @@
           //一级菜单
           this.plugData.MenuList.push(JSON.parse(JSON.stringify(this.MenuList)))
         } else if (type == 2) {
-          //二级菜单 
+          //二级菜单
           this.plugData.MenuList[index].SubMenuList.push(JSON.parse(JSON.stringify(this.SubMenuList)))
         } else if (type == 3) {
-          //底部导航 
+          //底部导航
           this.plugData.BottomList.push(JSON.parse(JSON.stringify(this.BottomList)))
         }
       },
@@ -411,11 +411,11 @@
           if (type == 1) {
             that.plugData.MenuList.splice(index, 1)
           }
-          //二级菜单 
+          //二级菜单
           else if (type == 2) {
             that.plugData.MenuList[index].SubMenuList.splice(i, 1)
           }
-          //底部导航 
+          //底部导航
           else if (type == 3) {
             that.plugData.BottomList.splice(i, 1)
           }

src/components/WebSet/home/indexRoll1.vue

@@ -93,23 +93,45 @@
 <template>
   <div class="WebSite_slider">
     <el-form label-width="100px">
-
-      <el-row class="row">
-        <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
-          <el-input type="text" v-model="plugData.Title"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
-          <el-input type="text" v-model="plugData.SubTitle"></el-input>
-        </el-form-item>
+      <el-row class="row" :gutter="24">
+        <el-col :span="10">
+          <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
+            <el-input type="text" v-model="plugData.Title"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
+            <el-input type="text" v-model="plugData.SubTitle"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
+            <div class="webSliderDiv" style="width:40px;height:40px;">
+              <el-upload :http-request="UploadAttachmentMLogo" :multiple="true"
+                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                <img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" />
+                <div class="addIconDiv">
+                  <i class="web_addImg iconfont icon-img_haha" style="font-size:15px;"></i>
+                  <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:8px;font-size:15px;"
+                    @click.stop="plugData.MLogo=''"></i>
+                </div>
+              </el-upload>
+            </div>
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-
-        <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
-          <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
-          <el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
-        </el-form-item>
+      <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"
+        :gutter="24">
+        <el-col :span="20">
+          <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
+            <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
+            <el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
+          </el-form-item>
+        </el-col>
       </el-row>
       <table>
         <tbody v-for="(item,index) in plugData.NavList" :key="index">
@@ -120,20 +142,14 @@
             <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()"></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(index)">
-                  </el-button>
-                </el-tooltip>
+                <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
+                <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)"></el-button>
               </div>
             </td>
           </tr>
           <tr>
             <td class="w350" rowspan="3">
-              <el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
+              <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
                   <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
                     accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
@@ -241,6 +257,16 @@
 
     },
     methods: {
+      UploadAttachmentMLogo(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        var path = "/Upload/WebSite/";
+        this.UploadSelfFileT(path, newArr, x => {
+          var str = x.data.FilePath;
+          var imgUrl = this.domainManager().ViittoFileUrl + str;
+          this.plugData.MLogo = imgUrl;
+        });
+      },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
       },

src/components/WebSet/home/indexRoll2.vue

@@ -93,21 +93,45 @@
 <template>
   <div class="WebSite_slider">
     <el-form label-width="100px">
-      <el-row class="row">
-        <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
-          <el-input type="text" v-model="plugData.Title"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
-          <el-input type="text" v-model="plugData.SubTitle"></el-input>
-        </el-form-item>
+      <el-row class="row" :gutter="24">
+        <el-col :span="10">
+          <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
+            <el-input type="text" v-model="plugData.Title"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
+            <el-input type="text" v-model="plugData.SubTitle"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
+            <div class="webSliderDiv" style="width:40px;height:40px;">
+              <el-upload :http-request="UploadAttachmentMLogo" :multiple="true"
+                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                <img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" />
+                <div class="addIconDiv">
+                  <i class="web_addImg iconfont icon-img_haha" style="font-size:15px;"></i>
+                  <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:8px;font-size:15px;"
+                    @click.stop="plugData.MLogo=''"></i>
+                </div>
+              </el-upload>
+            </div>
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-        <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
-          <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
-          <el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
-        </el-form-item>
+      <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"
+        :gutter="24">
+        <el-col :span="20">
+          <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
+            <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
+            <el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
+          </el-form-item>
+        </el-col>
       </el-row>
       <table>
         <tbody v-for="(item,index) in plugData.NavList" :key="index">
@@ -118,20 +142,15 @@
             <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()"></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(index)">
-                  </el-button>
-                </el-tooltip>
+                <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
+                <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
+                </el-button>
               </div>
             </td>
           </tr>
           <tr>
             <td class="w350" rowspan="3">
-              <el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
+              <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
                   <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
                     accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
@@ -239,6 +258,16 @@
 
     },
     methods: {
+      UploadAttachmentMLogo(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        var path = "/Upload/WebSite/";
+        this.UploadSelfFileT(path, newArr, x => {
+          var str = x.data.FilePath;
+          var imgUrl = this.domainManager().ViittoFileUrl + str;
+          this.plugData.MLogo = imgUrl;
+        });
+      },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
       },

src/components/WebSet/home/indexSlider1.vue

@@ -92,23 +92,45 @@
 <template>
   <div class="WebSite_slider">
     <el-form label-width="100px">
-
-      <el-row class="row">
-        <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
-          <el-input type="text" v-model="plugData.Title"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
-          <el-input type="text" v-model="plugData.SubTitle"></el-input>
-        </el-form-item>
+      <el-row class="row" :gutter="24">
+        <el-col :span="10">
+          <el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
+            <el-input type="text" v-model="plugData.Title"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
+            <el-input type="text" v-model="plugData.SubTitle"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
+            <div class="webSliderDiv" style="width: 40px;height:40px;">
+              <el-upload :http-request="UploadAttachmentMLogo" :multiple="true"
+                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                <img v-if="plugData.MLogo" :src="plugData.MLogo" class="web_imgUrl" alt="" />
+                <div class="addIconDiv">
+                  <i class="web_addImg iconfont icon-img_haha" style=" font-size:15px;"></i>
+                  <i class="web_delImg iconfont icon-img_delete_small" style="margin-left:8px;font-size:15px;"
+                    @click.stop="plugData.MLogo=''"></i>
+                </div>
+              </el-upload>
+            </div>
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
-
-        <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
-          <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
-          <el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
-        </el-form-item>
+      <el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"
+        :gutter="24">
+        <el-col :span="20">
+          <el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
+            <el-input type="textarea" :rows="2" v-model="plugData.Describe"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
+            <el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
+          </el-form-item>
+        </el-col>
       </el-row>
       <table>
         <tbody v-for="(item,index) in plugData.NavList" :key="index">
@@ -119,20 +141,15 @@
             <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()"></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(index)">
-                  </el-button>
-                </el-tooltip>
+                <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
+                <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
+                </el-button>
               </div>
             </td>
           </tr>
           <tr>
             <td class="w350" rowspan="3">
-              <el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
+              <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
                   <el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
                     accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
@@ -240,6 +257,16 @@
 
     },
     methods: {
+      UploadAttachmentMLogo(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        var path = "/Upload/WebSite/";
+        this.UploadSelfFileT(path, newArr, x => {
+          var str = x.data.FilePath;
+          var imgUrl = this.domainManager().ViittoFileUrl + str;
+          this.plugData.MLogo = imgUrl;
+        });
+      },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
       },
@@ -260,6 +287,16 @@
           this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
         });
       },
+      UploadAttachmentMLogo(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        var path = "/Upload/WebSite/";
+        this.UploadSelfFileT(path, newArr, x => {
+          var str = x.data.FilePath;
+          var imgUrl = this.domainManager().ViittoFileUrl + str;
+          this.plugData.MLogo = imgUrl;
+        });
+      },
       //显示菜单弹窗
       ShowMenuDialog(item) {
         this.clickItem = item;

src/components/WebSet/plug-in/choose_menu.vue

 <style>
   .choose_menu {
-    width: 450px;
-    line-height: 0;
-    max-height: 400px;
+    width: 500px;
+    max-height: 430px;
   }
 </style>
 <template>
@@ -24,6 +23,9 @@
           :check-strictly="true" show-checkbox :check-on-click-node="true">
         </el-tree>
       </el-tab-pane>
+      <el-tab-pane :label="$t('objFill.v101.xuanzhexingc')" name="3">
+
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -124,4 +126,5 @@
 
     },
   };
-</script>
\ No newline at end of file
+
+</script>

src/components/WebSet/plug-in/choose_trip.vue

@@ -186,7 +186,7 @@
             {{ item.DayNum }}
           </td>
           <td>
-            {{ item.B2BPrice }}
+            {{ item.B2CPrice }}
           </td>
           <td>
             {{