diff --git a/.env.development b/.env.development
index de5f62d..639b029 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 扫码连网
 ENV = 'development'
 
 # 扫码连网/开发环境
-# VUE_APP_BASE_API = 'https://localhost:9038'
-VUE_APP_BASE_API = 'https://www.jichuanglanhai.com:9038'
+VUE_APP_BASE_API = 'https://192.168.0.105:9038'
+# VUE_APP_BASE_API = 'https://www.jichuanglanhai.com:9038'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/components/VideoUpload/index.vue b/src/components/VideoUpload/index.vue
index dda77b3..82c6893 100644
--- a/src/components/VideoUpload/index.vue
+++ b/src/components/VideoUpload/index.vue
@@ -67,7 +67,6 @@ export default {
   watch: {
     value: {
       handler(val) {
-        console.log("会显示", val);
         if (val) {
           this.videoForm.showVideoPath = this.baseUrl + val;
         }
@@ -81,6 +80,7 @@ export default {
     handleClose() {
       this.videoForm.showVideoPath = "";
       this.videoFlag = false;
+      this.$emit("getDuration", null); //时长
       this.$emit("input", "");
     },
     //上传前回调
@@ -105,16 +105,19 @@ export default {
       this.videoUploadPercent = file.percentage.toFixed(0) * 1;
     },
     //上传成功回调
-    handleVideoSuccess(res, file) {
+    handleVideoSuccess(res, file, fileList) {
       this.isShowUploadVideo = true;
       this.videoFlag = false;
       this.videoUploadPercent = 0;
       this.videoForm.showVideoPath = this.baseUrl + res.fileName;
+      this.$emit("getDuration", file.response.duration); //时长
       this.$emit("input", res.fileName);
       this.$modal.msgSuccess("上传成功");
     },
     // 上传失败
     handleUploadError() {
+      this.$emit("getDuration", null); //时长
+      this.$emit("input", "");
       this.$modal.msgError("上传视频失败，请重试");
       this.$modal.closeLoading();
     },
diff --git a/src/views/netEwm/net/index.vue b/src/views/netEwm/net/index.vue
index fb29347..9cc09d2 100644
--- a/src/views/netEwm/net/index.vue
+++ b/src/views/netEwm/net/index.vue
@@ -161,7 +161,7 @@
     >
       <div ref="downloadElement" style="padding: 20px 10px">
         <img :src="code.imgs" alt="" class="codeImg" />
-        <div class="netName">WI-FI名称：{{ code.netName }}</div>
+        <div class="netName">WI-FI名称：{{ code.wifiName }}</div>
       </div>
 
       <div slot="footer" class="dialog-footer">
@@ -244,11 +244,11 @@ export default {
     handleCode(row) {
       let data = {
         path: "pages/index/index",
-        shanghuId: row.id,
+        posterId: row.id,
       };
       getCode(data).then((res) => {
         this.code.imgs = "data:image/png;base64," + res.data;
-        this.code.netName = row.netName;
+        this.code.wifiName = row.wifiName;
         this.wifiopen = true;
       });
     },
diff --git a/src/views/netEwm/netHistory/index.vue b/src/views/netEwm/netHistory/index.vue
index 8a5a116..4c20a91 100644
--- a/src/views/netEwm/netHistory/index.vue
+++ b/src/views/netEwm/netHistory/index.vue
@@ -8,26 +8,23 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="是否连接成功" prop="isTrue" label-width="100px">
-        <el-select
-          v-model="queryParams.isTrue"
-          placeholder="请选择是否连接成功"
+      <el-form-item
+        label="商户名称"
+        prop="posName"
+        label-width="100px"
+        v-if="!shanghuId"
+      >
+        <el-input
+          v-model="queryParams.posName"
+          placeholder="请输入商户名称"
           clearable
-        >
-          <el-option
-            v-for="dict in dict.type.b_is_true"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        />
       </el-form-item>
       <el-form-item label="网络名称" prop="netName">
         <el-input
           v-model="queryParams.netName"
           placeholder="请输入网络名称"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -103,13 +100,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="是否连接成功" align="center" prop="isTrue">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.b_is_true" :value="scope.row.isTrue" />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="网络id" align="center" prop="netId" />
-      <el-table-column label="网络名称" align="center" prop="netName" /> -->
+      <el-table-column label="商户名称" align="center" prop="posName" />
+      <el-table-column label="网络名称" align="center" prop="netName" />
       <el-table-column label="wifi名称" align="center" prop="wifiName" />
       <el-table-column label="wifi密码" align="center" prop="wifiPass" />
       <el-table-column
@@ -221,6 +213,7 @@ export default {
         shanghuId: null,
         isTrue: null,
         netName: null,
+        posName: null,
       },
       // 表单参数
       form: {},
diff --git a/src/views/netEwm/poster/index.vue b/src/views/netEwm/poster/index.vue
index 0442dc4..17405de 100644
--- a/src/views/netEwm/poster/index.vue
+++ b/src/views/netEwm/poster/index.vue
@@ -197,7 +197,11 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="广告视频" prop="videoPath">
-          <VideoUpload v-model="form.videoPath" v-if="open" />
+          <VideoUpload
+            v-model="form.videoPath"
+            v-if="open"
+            @getDuration="getDuration"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -223,6 +227,9 @@
         <el-descriptions-item label="有效结束时间">{{
           form.endTime
         }}</el-descriptions-item>
+        <el-descriptions-item label="视频时长"
+          >{{ form.duration }}/秒</el-descriptions-item
+        >
       </el-descriptions>
       <div class="my-info">
         <div class="cell-info">广告视频</div>
@@ -305,6 +312,10 @@ export default {
     this.getList();
   },
   methods: {
+    //视频时长
+    getDuration(duration) {
+      this.form.duration = duration;
+    },
     /**批量分配广告给商户 */
     handleFp(row) {
       getPoster(row.id).then((res) => {
@@ -338,6 +349,7 @@ export default {
         endTime: null,
         videoLogo: null,
         videoPath: null,
+        duration: null,
         createBy: null,
         createTime: null,
         updateBy: null,
diff --git a/src/views/netEwm/posterHistory/index.vue b/src/views/netEwm/posterHistory/index.vue
index 0737ad0..e84c50e 100644
--- a/src/views/netEwm/posterHistory/index.vue
+++ b/src/views/netEwm/posterHistory/index.vue
@@ -8,6 +8,18 @@
       v-show="showSearch"
       label-width="68px"
     >
+      <el-form-item
+        label="商户名称"
+        prop="posName"
+        label-width="100px"
+        v-if="!shanghuId"
+      >
+        <el-input
+          v-model="queryParams.posName"
+          placeholder="请输入商户名称"
+          clearable
+        />
+      </el-form-item>
       <el-form-item label="广告名称" prop="posterName">
         <el-input
           v-model="queryParams.posterName"
@@ -16,26 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="有效起始时间" prop="startTime" label-width="100px">
-        <el-date-picker
-          clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择有效起始时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="有效结束时间" prop="endTime" label-width="100px">
-        <el-date-picker
-          clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择有效结束时间"
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -110,32 +102,22 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="广告id" align="center" prop="posterId" /> -->
-      <el-table-column label="广告名称" align="center" prop="posterName" />
-      <el-table-column
-        label="有效起始时间"
-        align="center"
-        prop="startTime"
-        width="180"
-      >
+      <el-table-column label="商户名称" align="center" prop="posName" />
+      <el-table-column label="广告名称" align="center" prop="posterName">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
+          <el-link type="primary" :href="baseUrl + scope.row.videoPath">{{
+            scope.row.posterName
+          }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column
-        label="有效结束时间"
-        align="center"
-        prop="endTime"
-        width="180"
-      >
+      <el-table-column label="有效起始时间" align="center" prop="startTime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="广告视频" align="center" prop="videoPath">
+      <el-table-column label="有效结束时间" align="center" prop="endTime">
         <template slot-scope="scope">
-          <el-link type="primary" :href="baseUrl + scope.row.videoPath">{{
-            scope.row.videoPath
-          }}</el-link>
+          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="视频封面" align="center" prop="videoLogo" /> -->
@@ -179,6 +161,7 @@
         <!-- <el-form-item label="广告id" prop="posterId">
           <el-input v-model="form.posterId" placeholder="请输入广告id" />
         </el-form-item> -->
+
         <el-form-item label="广告名称" prop="posterName">
           <el-input v-model="form.posterName" placeholder="请输入广告名称" />
         </el-form-item>
@@ -258,6 +241,7 @@ export default {
         startTime: null,
         endTime: null,
         shanghuId: null,
+        posName: null,
       },
       // 表单参数
       form: {},
diff --git a/src/views/netEwm/shanghu/components/MyTable.vue b/src/views/netEwm/shanghu/components/MyTable.vue
index d0b2346..0943823 100644
--- a/src/views/netEwm/shanghu/components/MyTable.vue
+++ b/src/views/netEwm/shanghu/components/MyTable.vue
@@ -38,7 +38,13 @@
         </el-form>
       </div>
       <el-table v-loading="loading" :data="posterList" :height="tableHeigth">
-        <el-table-column label="广告名称" align="center" prop="posterName" />
+        <el-table-column label="广告名称" align="center" prop="posterName">
+          <template slot-scope="scope">
+            <el-link type="primary" :href="baseUrl + scope.row.videoPath">{{
+              scope.row.posterName
+            }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column label="有效起始时间" align="center" prop="startTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
@@ -49,18 +55,6 @@
             <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="点击预览广告"
-          align="center"
-          prop="posterName"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <el-link type="primary" :href="baseUrl + scope.row.videoPath">{{
-              scope.row.posterName
-            }}</el-link>
-          </template>
-        </el-table-column>
         <el-table-column
           label="操作"
           align="center"