行程特色加载修改

src/components/administrative/SurveyManager.vue

+<style>
+  .height_auto.el-select .el-input {
+    height: auto;
+  }
+
+  .CommodityType ._addUpload_box {
+    display: block;
+    margin: 10px 0 0;
+  }
+
+  .CommodityType ._addUpload_box img {
+    height: 15px;
+    display: block;
+    margin-right: 25px;
+  }
+
+  .CommodityType ._addUpload_box>div.el-upload {
+    float: left;
+    width: 138px;
+    height: 92px;
+    border: 1px dashed rgba(210, 210, 210, 1);
+    border-radius: 2px;
+    cursor: pointer;
+    margin-bottom: 10px;
+    padding: 5px;
+    margin-right: 10px;
+    position: relative;
+  }
+
+  .CommodityType ._addUpload_box .icon-guanbi1 {
+    font-size: 12px;
+    color: white;
+    display: inline-block;
+    margin-left: 15px;
+    position: absolute;
+    left: 9px;
+    top: -5px;
+    background-color: #f56c6c;
+    border-radius: 50%;
+    height: 15px;
+    width: 15px;
+    text-align: center;
+    line-height: 15px;
+  }
+
+  .CommodityType ._addUpload_box>div:hover {
+    background-color: #f5f5f5;
+  }
+
+  .CommodityType .el-upload-dragger {
+    font-size: 28px;
+    color: #8c939d;
+    width: 126px;
+    height: 80px;
+    line-height: 41px;
+    text-align: center;
+  }
+
+  .CommodityType .bg_color_delete {
+    background-color: #ee4454;
+    border-color: #ee4454;
+  }
+
+  .comType_Img {
+    max-height: 50px;
+  }
+
+</style>
+
+<template>
+  <div class="flexOne CommodityType">
+    <div class="query-box">
+      <ul class>
+        <li>
+          <span>
+            <em>名称</em>
+            <el-input v-model="msg.Title"></el-input>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
+          <input type="button" @click="outerVisible = true,dialogTitle='新增', addMsg.reqType = 'add',resetInfo()"
+            class="normalBtn" :value="$t('pub.addBtn')">
+        </li>
+      </ul>
+    </div>
+    <div class="clearfix"></div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th width="100px">
+          编号
+        </th>
+        <th>问卷名称</th>
+        <th width="200px">操作人</th>
+        <th width="200px">操作时间</th>
+        <th width="120px">{{$t('hotel.table_operat')}}</th>
+      </tr>
+      <tr v-for="(item,index) in dataList" :key="index">
+        <td>{{item.MainId}}</td>
+        <td>{{item.Title}}</td>
+        <td>{{item.CreateByName}}</td>
+        <td>
+          <template v-if="item.UpdateDate&&item.UpdateDate!=''">
+            {{item.UpdateDate}}
+          </template>
+          <template v-else>
+            {{item.CreateDate}}
+          </template>
+        </td>
+        <td>
+          <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
+            <el-button type="primary" icon="el-icon-edit" circle
+              @click="outerVisible=true,dialogTitle='修改',updateData(item)"></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="设置问卷内容" placement="top">
+            <el-button type="primary" icon="el-icon-tickets" circle @click="setSurverContent(item)">
+            </el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
+            <el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)">
+            </el-button>
+          </el-tooltip>
+        </td>
+      </tr>
+    </table>
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+    <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
+      :page-size="msg.pageSize" :total="total">
+    </el-pagination>
+    <el-dialog custom-class="w400" :title="dialogTitle" :visible.sync="outerVisible" center
+      :before-close="closeChangeMachie">
+      <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="110px">
+        <el-form-item label="问卷名称" prop="Title">
+          <el-input v-model="addMsg.Title" class="w217" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn"
+          @click="outerVisible = false, resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
+        <button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        //请求
+        msg: {
+          pageIndex: 1,
+          pageSize: 15,
+          Title: ''
+        },
+        addMsg: {
+          MainId: 0,
+          Title: "",
+        },
+        total: 0,
+        rules: {
+          Title: [{
+            required: true,
+            message: "请输入名称",
+            trigger: "blur"
+          }]
+        },
+        loading: false,
+        outerVisible: false,
+        dialogTitle: "",
+        dataList: [],
+      };
+    },
+    mounted() {
+      this.getList();
+    },
+    filters: {},
+    methods: {
+      //设置问卷内容
+      setSurverContent(item) {
+        let query = {
+          MainId: item.MainId,
+        }
+        this.OpenNewPage('/VoucherInquiry', query)
+      },
+      // 删除
+      Delete(item) {
+        this.$confirm("是否删除? 删除后不可恢复", this.$t('tips.tips'), {
+            confirmButtonText: this.$t('pub.sureBtn'),
+            cancelButtonText: this.$t('pub.cancelBtn'),
+            type: "warning"
+          })
+          .then(() => {
+            this.apipost(
+              "survey_post_RemoveSurveyMain", {
+                MainId: item.MainId
+              },
+              res => {
+                if (res.data.resultCode == 1) {
+                  this.Success(res.data.message);
+                  this.getList();
+                } else {
+                  this.Error(res.data.message);
+                }
+              },
+              err => {}
+            );
+          })
+          .catch(() => {});
+      },
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost(
+          "survey_post_GetSurveyMainPage",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode === 1) {
+              this.dataList = res.data.data.pageData;
+              this.total = res.data.data.count;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      //提交
+      submitForm(addMsg) {
+        //提交创建、修改表单
+        this.$refs[addMsg].validate(valid => {
+          if (valid) {
+            this.addAward();
+          } else {
+            return false;
+          }
+        });
+      },
+      //提交添加
+      addAward() {
+        this.apipost(
+          "survey_post_SetSurveyMain",
+          this.addMsg,
+          res => {
+            if (res.data.resultCode === 1) {
+              this.Success(res.data.message);
+              this.outerVisible = false;
+              this.getList();
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      //修改信息
+      updateData(item) {
+        this.outerVisible = true;
+        this.apipost(
+          "survey_post_GetSurveyMain", {
+            MainId: item.MainId
+          },
+          res => {
+            if (res.data.resultCode === 1) {
+              let data = res.data.data
+              this.addMsg.MainId = data.MainId;
+              this.addMsg.Title = data.Title;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+      //重置信息
+      resetInfo() {
+        this.addMsg.MainId = 0;
+        this.addMsg.Title = "";
+      },
+      closeChangeMachie(done) {
+        //弹出框关闭初始化弹框内表单
+        done();
+        this.resetForm("addMsg");
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      },
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+    }
+  };
+
+</script>

src/components/h5page/guestlogin.vue

+<style>
+
+</style>
+
+
+
+<template>
+  <div>
+    <input type="button" value="手机号验证" />
+    <input type="button" value="护照号验证" />
+  </div>
+</template>
+
+<script>
+  export default {
+    components: {
+
+    },
+    data() {
+      return {
+        activeName: 'first',
+        postMsg: {
+          loginType: 1, //1-手机号码验证登录，2-护照号码验证登录
+          phoneNum: "", //电话号码
+          passportNum: "", //护照号码
+        }
+      };
+    },
+    mounted() {
+
+    },
+    methods: {
+     
+      guestLogin() {
+
+      }
+    }
+  };
+
+</script>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -451,7 +451,8 @@
               }
 
               if (this.myIframeUrl && this.myIframeUrl != '') {
-                document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
+                this.myIframeUrl = this.myIframeUrl + `&t=${new Date().getTime()}`
+                document.all.myIframe.src = this.myIframeUrl;
               }
               this.$emit('pptJourney', true)
             } else if (event.data == '暂无行程数据') {
@@ -782,6 +783,16 @@
       }
     },
     watch: {
+      myIframeUrl: {
+        //深度监听，可监听到对象、数组的变化
+        handler: function (val, oldVal) {
+          if (val != '' && val != oldVal) {
+            this.resizeIframe();
+          }
+        },
+        deep: true,
+        immediate: true
+      },
       dataAll: {
         handler: function (val, oldVal) {},
         deep: true,