diff --git a/package-lock.json b/package-lock.json
index 6b11ee4..c0074e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
"vue-router": "^4.0.3",
"vue-waterfall-plugin-next": "^2.4.3",
"vue3-hash-calendar": "^1.1.3",
+ "vue3-marquee": "^4.2.2",
"vuex": "^4.0.0"
},
"devDependencies": {
@@ -15428,6 +15429,17 @@
"vue": "^3.0.0"
}
},
+ "node_modules/vue3-marquee": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmmirror.com/vue3-marquee/-/vue3-marquee-4.2.2.tgz",
+ "integrity": "sha512-FeFvGUVInKfFilXFcnl8sDRBJBZCZSNLlQDquJErB9db6W2xICRVqbRV/jtdzsEP0rftarLQhx9MeEAU0+TPuQ==",
+ "engines": {
+ "node": ">=12"
+ },
+ "peerDependencies": {
+ "vue": "^3.2"
+ }
+ },
"node_modules/vuex": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.1.0.tgz",
diff --git a/package.json b/package.json
index b1df2d2..93cbc1b 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
"vue-router": "^4.0.3",
"vue-waterfall-plugin-next": "^2.4.3",
"vue3-hash-calendar": "^1.1.3",
+ "vue3-marquee": "^4.2.2",
"vuex": "^4.0.0"
},
"devDependencies": {
diff --git a/public/static/js/config.js b/public/static/js/config.js
index 9d2dee7..c5d5e64 100644
--- a/public/static/js/config.js
+++ b/public/static/js/config.js
@@ -1,28 +1,32 @@
window.config = {
loginUrl: "https://web.ceniu.sztg.com/#/login",
- VConsole: true,
+ VConsole: false,
userIdList: [],
shareEnv: "production",
getCarProductLink: ({
token,
refreshToken,
// departmentId = 36,
- // eId = 0,
+ staffNo = "",
activityId,
}) => {
- // let url = ""
- // if (activityId.includes("?")) {
- // url = `${activityId}&departmentId=${departmentId}&eId=${eId}`
- // } else {
- // url = `${activityId}?eId=${eId}`
- // }
+ let url = ""
+ if (staffNo) {
+ if (activityId.includes("?")) {
+ url = `${activityId}&eId=${staffNo}`
+ } else {
+ url = `${activityId}?eId=${staffNo}`
+ }
+ } else {
+ url = activityId
+ }
// console.log("url", url)
// debugger
return `https://web.ceniu.sztg.com/setTokenAndRedirect.html?token=${encodeURIComponent(
token
)}&refreshToken=${encodeURIComponent(
refreshToken
- )}&redirect=${encodeURIComponent(activityId)}`
+ )}&redirect=${encodeURIComponent(url)}`
}, // 购物车产品地址
mobileRegister:
"https://web.ceniu.sztg.com/#/login?pageType=mobileRegister&redirect=", // 用户注册地址
diff --git a/src/main.js b/src/main.js
index 71a06ba..7926da3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,47 +1,49 @@
-import "amfe-flexible";
-import { createApp } from "vue";
-import VConsole from "vconsole";
-import App from "./App.vue";
-import router from "./router";
-import store from "./store";
-import "./assets/css/reset.css";
-import "vant/es/dialog/style";
-import "vant/es/toast/style";
-import "vant/es/image-preview/style";
-import VueHashCalendar from "vue3-hash-calendar";
-import "vue3-hash-calendar/es/index.css";
-import { liveStatusObj } from "@/config/constant";
-import shieldConfig from "@/config/index";
-import { getProductType, dateFormat, getPrice } from "@/utils/filters";
-import SvgIcon from "@/components/SvgIcon";
+import "amfe-flexible"
+import { createApp } from "vue"
+// import VConsole from "vconsole"
+import App from "./App.vue"
+import router from "./router"
+import store from "./store"
+import "./assets/css/reset.css"
+import "vant/es/dialog/style"
+import "vant/es/toast/style"
+import "vant/es/image-preview/style"
+import VueHashCalendar from "vue3-hash-calendar"
+import "vue3-hash-calendar/es/index.css"
+import { liveStatusObj } from "@/config/constant"
+import shieldConfig from "@/config/index"
+import { getProductType, dateFormat, getPrice } from "@/utils/filters"
+import SvgIcon from "@/components/SvgIcon"
+import Vue3Marquee from "vue3-marquee"
// import { terminalType } from "@/utils/index";
// import loadScript from "@/utils/loadScript";
-if (window.config.VConsole) {
- new VConsole();
-}
-const app = createApp(App);
+// if (window.config.VConsole) {
+// new VConsole();
+// }
+const app = createApp(App)
// 自定义指令
-import * as directive from "@/directive";
+import * as directive from "@/directive"
Object.keys(directive).forEach((key) => {
- app.directive(key, directive[key]);
-});
+ app.directive(key, directive[key])
+})
const init = () => {
- app.use(store);
- app.use(router);
- app.use(VueHashCalendar);
- app.config.globalProperties.$liveStatusObj = liveStatusObj;
- app.config.globalProperties.$shieldConfig = shieldConfig;
+ app.use(store)
+ app.use(router)
+ app.use(VueHashCalendar)
+ app.use(Vue3Marquee)
+ app.config.globalProperties.$liveStatusObj = liveStatusObj
+ app.config.globalProperties.$shieldConfig = shieldConfig
app.config.globalProperties.$filters = {
getProductType,
dateFormat,
getPrice,
- };
+ }
- app.component("svg-icon", SvgIcon);
- app.mount("#app");
-};
-init();
+ app.component("svg-icon", SvgIcon)
+ app.mount("#app")
+}
+init()
diff --git a/src/views/VideoPlay/HScreen.vue b/src/views/VideoPlay/HScreen.vue
index d7f60ef..14ce758 100644
--- a/src/views/VideoPlay/HScreen.vue
+++ b/src/views/VideoPlay/HScreen.vue
@@ -15,8 +15,7 @@
[$liveStatusObj.NotStart, $liveStatusObj.PausePlay].includes(
liveStatus
)
- "
- >
+ ">
即将开播,敬请期待
@@ -30,16 +29,14 @@
v-else-if="
liveStatus === $liveStatusObj.FinishPlay &&
(!detail.libraryList || !detail.libraryList.length)
- "
- >
+ ">
直播已结束,稍后将提供回放视频
{{ `距离${detail.playType == 1 ? "直" : "录"}播开始` }}
@@ -49,8 +46,7 @@
-
+ + 北京首证投资顾问有限公司 投资顾问:{{ detail.advisorBasic.name + }}({{ detail.advisorBasic.license }}) + 观点仅供参考,不作为投资决依据。股市有风險,投资需逢慎。 +
+
+ alt="" />
{{ item.content }}
+ src="@/assets/images/chat/close.png" />