diff --git a/index.html b/index.html
index 78bb7e2..ceb6588 100644
--- a/index.html
+++ b/index.html
@@ -53,6 +53,10 @@
+
+
+
+
diff --git a/main.js b/main.js
index 11216a2..cdeb0e1 100644
--- a/main.js
+++ b/main.js
@@ -17,6 +17,7 @@ window.onload = () => {
onchangeSize();
window.addEventListener("resize",onchangeSize);
initDate(); //初始化时间
+ window.setInterval(initDate,60000);
setScrollPosition(); //自动滚动到底部
document.addEventListener("click",()=>{
window.playOver();
@@ -52,10 +53,10 @@ window.audioStart = () => {
// let res = {
// code:200,
// data: {
- // "type": "member",
+ // "type": "video",
// "value": {
// "text":"德基美术馆",
- // "content":[{"logo":"/assets/act.png"},{"logo":"/assets/act1.png"},{"logo":"/assets/act2.png"},{"logo":"/assets/act3.png"}]
+ // "content":[{"logo":"/assets/act.png","video":"/assets/1.mp4"},{"logo":"/assets/act1.png","img":"/assets/video.png"}]
// }
// }
// }
@@ -107,16 +108,11 @@ function callBack(str){
}
break;
case "shop" :
- try{
- if(typeof obj.data.value.length == "number"){
- addBackItemText(`${obj.data.value[0].name}位于商场 ${obj.data.value[0].house_number},\n下方为您推荐导航线路`);
- addItemImg("./assets/map.png");
- }else{
- addBackItemText(`${obj.data.value.name}位于商场 ${obj.data.value.house_number},\n下方为您推荐导航线路`);
- addItemImg("./assets/map.png");
- }
- }catch(e){
-
+ if(obj.data.value.length !=0){
+ addBackItemText(`${obj.data.value[0].name}位于商场 ${obj.data.value[0].house_number},\n下方为您推荐导航线路`);
+ addItemImg("./assets/map.png");
+ }else{
+ addBackItemText(`您的问题我还在持续学习中...`);
}
break;
case "facility" :
@@ -136,7 +132,7 @@ function callBack(str){
if(obj.data.value.content && obj.data.value.content.length>0){
let div = addWrapper();
obj.data.value.content.forEach((item, index)=>{
- addClickItemImg(div, item.logo, 200, 200, null);
+ addClickItemImg(div, item.logo, "", 200, 200, null);
});
}
break;
@@ -151,14 +147,14 @@ function callBack(str){
if(obj.data.value.content && obj.data.value.content.length>0){
let div = addWrapper();
obj.data.value.content.forEach((item)=>{
- addClickItemImg(div, item.logo, 165, 120, window.clickCoupon);
+ addClickItemImg(div, item.logo, item.img, 165, 120, window.clickCoupon);
});
}
break;
case "video" : //视频
addBackItemText(obj.data.value.text);
if(obj.data.value.content && obj.data.value.content.length>0){
- addItemBigImg(obj.data.value.content[0].logo, window.clickVideo);
+ addItemBigImg(obj.data.value.content[0].logo, obj.data.value.content[0].video, window.clickVideo);
}
break;
default :
@@ -171,10 +167,37 @@ function callBack(str){
//点击优惠券弹窗
window.clickCoupon = function(event){
- console.log(event);
+ console.log(event.target.dataset.pop);
+ window.isplayHello = false; //停止播放招呼语音
+ let mark = document.getElementById("mark");
+ mark.style.display = "flex";
+ let video = document.createElement("img");
+ video.src = event.target.dataset.pop;
+ video.style.width = "100%";
+ video.style.margin="auto";
+ mark.appendChild(video);
+ mark.addEventListener("click", ()=>{
+ video.remove();
+ mark.style.display = "none";
+ window.isplayHello = true;
+ })
}
window.clickVideo = function(event){
- console.log(event);
+ console.log(event.target.dataset.video);
+ window.isplayHello = false; //停止播放招呼语音
+ let mark = document.getElementById("mark");
+ mark.style.display = "flex";
+ let video = document.createElement("video");
+ video.src = event.target.dataset.video;
+ video.autoplay = true;
+ video.style.width = "100%";
+ video.style.height = "100%";
+ mark.appendChild(video);
+ mark.addEventListener("click", ()=>{
+ video.remove();
+ mark.style.display = "none";
+ window.isplayHello = true;
+ })
}
let getAiData = async (msg) => {
@@ -232,12 +255,17 @@ window.playOver=()=>{
window.hello();
}
window.timer=-1;
+window.isplayHello=true;
window.hello=()=>{
clearTimeout(window.timer);
window.timer = setTimeout(()=>{
clearTimeout(window.timer);
- window.isHello=true;
- window.startTTS("您好呀，我是德基广场数字客服小德，请问有什么需要帮助的吗？");
+ if(window.isplayHello){
+ window.isHello=true;
+ window.startTTS("您好呀，我是德基广场数字客服小德，请问有什么需要帮助的吗？");
+ }else{
+ window.hello();
+ }
},60000);
}
window.isHello=true;
diff --git a/package-lock.json b/package-lock.json
index 9e8a0eb..2309aa3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,9 +8,7 @@
"name": "frontend",
"version": "0.0.0",
"dependencies": {
- "@better-scroll/core": "^2.5.1",
- "alova": "^3.2.10",
- "better-scroll": "^2.5.1"
+ "alova": "^3.2.10"
},
"devDependencies": {
"@wailsio/runtime": "latest",
@@ -22,123 +20,6 @@
"resolved": "https://registry.npmmirror.com/@alova/shared/-/shared-1.1.2.tgz",
"integrity": "sha512-8q/gMHFpzm7XYcaUlsyTCMDRRhFnewwheTeObMjPl1+bFdr+wZuBEHEPYIyd8tyzLwfrqpBeonaMN2tlngM8EA=="
},
- "node_modules/@better-scroll/core": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/core/-/core-2.5.1.tgz",
- "integrity": "sha512-koKOuYA55dQ04FJRIVUpMGDr1hbCfWmfX0MGp1hKagkQSWSRpwblqACiwtggVauoj9aaJRJZ9hDsTM4weaavlg==",
- "dependencies": {
- "@better-scroll/shared-utils": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/indicators": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/indicators/-/indicators-2.5.1.tgz",
- "integrity": "sha512-Hk+Y00pR6fTsu6C9HGg1yYZtsu1gAcTgcs4C9aM5h6fQANX/T2YIYrOSjZmdL+js2PTcXJWZS8VM4Xjoi1PbfQ==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/infinity": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/infinity/-/infinity-2.5.1.tgz",
- "integrity": "sha512-GKHrrasIh0KlGzhASHDo5hEEBJcDFpP4XaZGPH9Ey8+QBH6/O1ykAXS2ixkVAOTkBrv+KgFXoCUr4oN1xWeM+g==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/mouse-wheel": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/mouse-wheel/-/mouse-wheel-2.5.1.tgz",
- "integrity": "sha512-DGnrirRMY6zMM7xwgx09D/cA9A//3J1/uDkq8iBVEyE5p0sEr/keQpjEfFHGkBRa505BnbBwdbN6f5lugEDSPw==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/movable": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/movable/-/movable-2.5.1.tgz",
- "integrity": "sha512-8bLPRY15bbK4K5+tjrtdaKsFFKmJx72wRdg+xz3xQGFcTD940HFkJiORSOcz8Ufue7eOJfcmreQJBw6XY+TqTw==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/nested-scroll": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/nested-scroll/-/nested-scroll-2.5.1.tgz",
- "integrity": "sha512-3cRsARxf9tq1VWBq7YAaET0xGAmgY1ERMmnXDo2gHFrmsJoNOionlpAeHdZvKQp2jG7JrzJ1O27nGCXf40gnkw==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/observe-dom": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/observe-dom/-/observe-dom-2.5.1.tgz",
- "integrity": "sha512-TCMGFLRfpXBPIwtUV/efliUmfmrhSNI7NXdSyjdWjsLOS7dh3eFkmcom5ERVWMaXVELSmujGXLqobT+dT0C/jg==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/observe-image": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/observe-image/-/observe-image-2.5.1.tgz",
- "integrity": "sha512-0Lhfj83o8EESwOxr8bfStCzNOokTm3KB7JeyMS8u/xl+3tyTuls9889cyAukYk4Yly1cS49pCGfj2P8YOiwtUg==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/pull-down": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/pull-down/-/pull-down-2.5.1.tgz",
- "integrity": "sha512-Y6XcGu2NlevPg3k9VBRRFvpmfoTA+rO96JGdog2qKHclIPNXnsVwsIHtZfAm9weE/f9UuC4BnB+VUFRlucfupg==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/pull-up": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/pull-up/-/pull-up-2.5.1.tgz",
- "integrity": "sha512-1hu3xSMxdB8T391KffpNZ7g93lMwZEHjfb1F1Y4KvIkciDt8nXqkGpqrZF+YwR+EJTgYcWqUO8kgmI6XXu7Pkg==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/scroll-bar": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/scroll-bar/-/scroll-bar-2.5.1.tgz",
- "integrity": "sha512-i6r60pWG/ztkFK2j5Gj54I0LJb2jGh5TWJNQBoW0gUkp28B+0JvBFTwZn9tF7beZCBorKR7Hvvu4O9A1TJy94Q==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/shared-utils": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/shared-utils/-/shared-utils-2.5.1.tgz",
- "integrity": "sha512-AplkfSjXVYP9LZiD6JsKgmgQJ/mG4uuLmBuwLz8W5OsYc7AYTfN8kw6GqZ5OwCGoXkVhBGyd8NeC4xwYItp0aw=="
- },
- "node_modules/@better-scroll/slide": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/slide/-/slide-2.5.1.tgz",
- "integrity": "sha512-aDOrfsmjAcz6DXN7mDX3tPieAn195R43Yn9e3waI19TIEok/mQlI1a/kb5quqWOoxkiaZQ8xe3vx5ZTj9C+F6Q==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/wheel": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/wheel/-/wheel-2.5.1.tgz",
- "integrity": "sha512-fYLcEvkh88Z/2L+P5/+SGMunuc+HzAjGOiORIa/x21qb/knO2RFH4A/V1Rt3OIW4QluWzuFnU6jJRPlsQVZ4fg==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
- "node_modules/@better-scroll/zoom": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/@better-scroll/zoom/-/zoom-2.5.1.tgz",
- "integrity": "sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1"
- }
- },
"node_modules/@esbuild/aix-ppc64": {
"version": "0.21.5",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -791,27 +672,6 @@
"node": ">= 18.0.0"
}
},
- "node_modules/better-scroll": {
- "version": "2.5.1",
- "resolved": "https://registry.npmmirror.com/better-scroll/-/better-scroll-2.5.1.tgz",
- "integrity": "sha512-OiF3cQroRfTzf+CRQH2z1G52ZAlNHINI6lCAvDmyFu0o0nRuTaV9F+fmBGIU2BL5p5IplUQ4E7sYa1TLfZarzQ==",
- "dependencies": {
- "@better-scroll/core": "^2.5.1",
- "@better-scroll/indicators": "^2.5.1",
- "@better-scroll/infinity": "^2.5.1",
- "@better-scroll/mouse-wheel": "^2.5.1",
- "@better-scroll/movable": "^2.5.1",
- "@better-scroll/nested-scroll": "^2.5.1",
- "@better-scroll/observe-dom": "^2.5.1",
- "@better-scroll/observe-image": "^2.5.1",
- "@better-scroll/pull-down": "^2.5.1",
- "@better-scroll/pull-up": "^2.5.1",
- "@better-scroll/scroll-bar": "^2.5.1",
- "@better-scroll/slide": "^2.5.1",
- "@better-scroll/wheel": "^2.5.1",
- "@better-scroll/zoom": "^2.5.1"
- }
- },
"node_modules/esbuild": {
"version": "0.21.5",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
diff --git a/util.js b/util.js
index 4e24fc2..72109c0 100644
--- a/util.js
+++ b/util.js
@@ -36,8 +36,6 @@ function initDate(){
document.getElementById("weekTxt").innerText = weekName;
}
-setInterval(initDate,60000);
-
function onchangeSize(){
scaleW = window.innerHeight/(1248/704);
document.getElementById("bg").style.width = scaleW+"px";
@@ -138,25 +136,27 @@ function addItemSmallImg(imgUrl){
let w = (scaleW/(1080/200));
li_img.innerHTML = `
`;
}
-function addItemBigImg(imgUrl,clickFun){
+function addItemBigImg(imgUrl, videoUrl, clickFun){
let li_img = document.createElement("img");
document.getElementById("cont").appendChild(li_img);
let w = (scaleW/(1080/535));
li_img.style.width = w+"px";
li_img.src = imgUrl;
li_img.width = w;
+ li_img.dataset.video = videoUrl;
if(clickFun){
li_img.addEventListener("click", clickFun);
}
}
-function addClickItemImg(div,url,width,height,clickFun){
+function addClickItemImg(div,url,popUrl,width,height,clickFun){
let img = document.createElement("img");
img.className = "scroll-img";
img.width = width;
img.height = height;
img.src = url;
+ img.dataset.pop = popUrl;
if(clickFun){
img.addEventListener("click", clickFun);
}