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

src/components/WebSet/WebSiteEdit.vue

@@ -223,9 +223,12 @@
       <!-- 图片链接 -->
       <imglinkdialog v-if="currentEditItem.Id=='white_label_link_picture'" :plugData="currentEditItemData">
       </imglinkdialog>
-      
-      <!-- 挑选自有行程 -->
+      <!-- 挑选自有行程 图片 -->
       <b2bdialog v-if="currentEditItem.Id=='b2b'" :plugData="currentEditItemData"></b2bdialog>
+      <!-- 挑选自有行程 段落链接 -->
+      <b2blinkdialog v-if="currentEditItem.Id=='b2b_LinkP'" :plugData="currentEditItemData"></b2blinkdialog>
+      <!-- 挑选自有行程 图片链接 -->
+      <linkpicturedialog v-if="currentEditItem.Id=='b2b_LinkPicture'" :plugData="currentEditItemData"></linkpicturedialog>
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="isShowDialog = false" size="small">取 消</el-button>
@@ -244,6 +247,8 @@
   import paragraphLinkdialog from "../WebSet/plug-in/paragraphLink_dialog.vue"
   import imglinkdialog from "../WebSet/plug-in/imglink_dialog.vue"
   import b2bdialog from "../WebSet/plug-in/b2b_dialog.vue"
+  import b2blinkdialog from "../WebSet/plug-in/b2blink_dialog.vue"
+  import linkpicturedialog from "../WebSet/plug-in/linkpicture_dialog.vue"
   export default {
     props: ["templateData"],
     data() {
@@ -274,7 +279,9 @@
       sectiondialog,
       paragraphLinkdialog,
       imglinkdialog,
-      b2bdialog
+      b2bdialog,
+      b2blinkdialog,
+      linkpicturedialog
     },
     methods: {
       //显示弹窗

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

+<style>
+  .b2blinkDialog .webSliderDiv {
+    line-height: 0;
+    height: 536px;
+    border: 1px solid #ccc;
+    position: relative;
+    background-color: #f1f1f1;
+  }
+
+  .b2blinkDialog .webSliderDiv>div {
+    height: 100%;
+  }
+  .b2blinkDialog .sectionImg{
+    position:absolute;
+    width:100%;
+    height:100%;
+    background-position: center;
+    background-size: cover;
+  }
+
+</style>
+<template>
+  <div class="b2blinkDialog">
+    <el-form label-width="80px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="標題">
+            <el-input type="text" v-model="plugData.Title"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="描述">
+            <el-input type="textarea" v-model="plugData.Describe" :rows="4"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :span="24">
+        <el-form-item label="行程名稱">
+            <el-select v-model="plugData.TripTitle" style="width:100%">
+                <el-option label="不限" :value="0"></el-option>
+                <el-option label="B2B前台菜单" :value="-1">B2B前台菜单</el-option>
+                <el-option label="个人中心菜单" :value="-2">个人中心菜单</el-option>
+            </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item>
+            <div class="webSliderDiv">
+                <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage + ')'}"></div>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+  export default {
+    props: ["plugData"],
+    data() {
+      return {
+
+      };
+    },
+    created() {},
+    methods: {
+    },
+    mounted() {
+      
+    },
+  };
+
+</script>

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

+<style>
+  .linkpicdialog .webSliderDiv {
+    width: 305px;
+    line-height: 0;
+    height: 305px;
+    border: 1px solid #ccc;
+    position: relative;
+  }
+
+  .linkpicdialog .webSliderDiv>div {
+    height: 100%;
+  }
+
+  .linkpicdialog .sectionImg {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background-position: center;
+    background-size: cover;
+    background-color: #f1f1f1;
+  }
+
+</style>
+<template>
+  <div class="linkpicdialog">
+    <el-form label-width="120px">
+      <el-form-item label="標題">
+        <el-input type="text" v-model="plugData.Title"></el-input>
+      </el-form-item>
+      <el-form-item label="描述">
+        <el-input type="textarea" v-model="plugData.Describe" :rows="4"></el-input>
+      </el-form-item>
+      <el-row style="margin-bottom:20px;">
+        <el-col :span="10">
+          <el-form-item>
+            <div class="webSliderDiv">
+              <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage1 + ')'}"></div>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="'行程名稱1'">
+                <el-select v-model="plugData.TripId1" style="width:100%">
+                  <el-option label="不限" :value="0"></el-option>
+                  <el-option label="B2B前台菜单" :value="-1">B2B前台菜单</el-option>
+                  <el-option label="个人中心菜单" :value="-2">个人中心菜单</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom:20px;">
+        <el-col :span="10">
+          <el-form-item>
+            <div class="webSliderDiv">
+              <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage2 + ')'}"></div>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="14">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="'行程名稱2'">
+                <el-select v-model="plugData.TripId2" style="width:100%">
+                  <el-option label="不限" :value="0"></el-option>
+                  <el-option label="B2B前台菜单" :value="-1">B2B前台菜单</el-option>
+                  <el-option label="个人中心菜单" :value="-2">个人中心菜单</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+  export default {
+    props: ["plugData"],
+    data() {
+      return {};
+    },
+    created() {},
+    methods: {},
+    mounted() {
+      console.log(this.plugData, 'plugData');
+    },
+  };
+
+</script>