diff --git a/.env.development b/.env.development
index 639b029..6db265a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 扫码连网
ENV = 'development'
# 扫码连网/开发环境
-VUE_APP_BASE_API = 'https://192.168.0.105: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/VideoView/index.vue b/src/components/VideoView/index.vue
new file mode 100644
index 0000000..c4fc01a
--- /dev/null
+++ b/src/components/VideoView/index.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/main.js b/src/main.js
index d78c226..4c99ba5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,6 +46,8 @@ import VueMeta from "vue-meta";
import DictData from "@/components/DictData";
//上传视频
import VideoUpload from "@/components/VideoUpload";
+//阅览广告
+import VideoView from "@/components/VideoView";
// 全局方法挂载
Vue.prototype.getDicts = getDicts;
@@ -67,6 +69,7 @@ Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
Vue.component("VideoUpload", VideoUpload);
+Vue.component("VideoView", VideoView);
Vue.use(directive);
Vue.use(plugins);
diff --git a/src/views/netEwm/posterHistory/index.vue b/src/views/netEwm/posterHistory/index.vue
index e84c50e..7d2e886 100644
--- a/src/views/netEwm/posterHistory/index.vue
+++ b/src/views/netEwm/posterHistory/index.vue
@@ -105,7 +105,7 @@
- {{
+ {{
scope.row.posterName
}}
@@ -197,6 +197,7 @@
取 消
+
@@ -214,7 +215,6 @@ export default {
name: "PosterHistory",
data() {
return {
- baseUrl: process.env.VUE_APP_BASE_API,
// 遮罩层
loading: true,
// 选中数组
@@ -270,6 +270,11 @@ export default {
this.getList();
},
methods: {
+ openVideoView(url) {
+ if (url) {
+ this.$refs.VideoView.openDialog(url);
+ }
+ },
/** 查询广告历史列表 */
getList() {
this.loading = true;
diff --git a/src/views/netEwm/shanghu/components/MyTable.vue b/src/views/netEwm/shanghu/components/MyTable.vue
index 0943823..a98d331 100644
--- a/src/views/netEwm/shanghu/components/MyTable.vue
+++ b/src/views/netEwm/shanghu/components/MyTable.vue
@@ -40,9 +40,11 @@
- {{
- scope.row.posterName
- }}
+ {{ scope.row.posterName }}
@@ -81,6 +83,7 @@
/>
+
@@ -89,7 +92,6 @@ import { listPoster, batchAllocation } from "@/api/netEwm/poster";
export default {
data() {
return {
- baseUrl: process.env.VUE_APP_BASE_API,
loading: false,
posterList: [],
total: 0,
@@ -108,6 +110,11 @@ export default {
};
},
methods: {
+ openVideoView(url) {
+ if (url) {
+ this.$refs.VideoView.openDialog(url);
+ }
+ },
openDialog(data, posterId) {
this.shanghuPosterId = posterId;
this.fpData = data;