diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index 9c0937f..8fb9063 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/src/components/PublicComponent/PublicComponent.vue @@ -76,12 +76,12 @@ onMounted(() => { send(`type:online`) }, 30000) - store.SET_CURRENT_THEME('highend') - let i = 0 - setInterval(() => { - i++ - store.SET_CURRENT_THEME(['main', 'fashion', 'highend'][i % 3]) - }, 5000) + store.SET_CURRENT_THEME('luxury') + // let i = 0 + // setInterval(() => { + // i++ + // store.SET_CURRENT_THEME(['main', 'fashion', 'highend'][i % 3]) + // }, 5000) window.addEventListener('touchend', checkHandleScreen) }) onBeforeUnmount(() => { diff --git a/src/themes/fashion/loc.png b/src/themes/fashion/loc.png new file mode 100644 index 0000000..eb3e38c Binary files /dev/null and b/src/themes/fashion/loc.png differ diff --git a/src/themes/fashion/style.json b/src/themes/fashion/style.json index 23e41f7..855fb6b 100644 --- a/src/themes/fashion/style.json +++ b/src/themes/fashion/style.json @@ -43,6 +43,8 @@ "guideBorder": "2px solid rgba(255, 255, 255, 0.6)", "guideTopBg": "linear-gradient(180deg, #6257d7 0%, #f191c0 100%)", "guideQrcodeBg": "#ffffff", + "guideColor": "#000000", + "guideMetaColor": "rgba(0, 0, 0, 0.6)", "foodBg": "rgba(255, 255, 255, 0.6)", "recBg": "rgba(255, 255, 255, 0.6)", "recBorder": "2px solid rgba(255, 255, 255, 0.6)" diff --git a/src/themes/highend/loc.png b/src/themes/highend/loc.png new file mode 100644 index 0000000..eb3e38c Binary files /dev/null and b/src/themes/highend/loc.png differ diff --git a/src/themes/highend/style.json b/src/themes/highend/style.json index 7fde472..5ab1841 100644 --- a/src/themes/highend/style.json +++ b/src/themes/highend/style.json @@ -43,6 +43,8 @@ "guideBorder": "none", "guideTopBg": "linear-gradient(180deg, #64554D 0%, #B39B85 100%)", "guideQrcodeBg": "rgba(255, 255, 255, 0.4)", + "guideColor": "#000000", + "guideMetaColor": "rgba(0, 0, 0, 0.6)", "foodBg": "linear-gradient(180deg, #64554D 0%, #B39B85 100%)", "foodBorder": "4px solid #6E5E54", "recBg": "linear-gradient(180deg, #64554D 0%, #B39B85 100%)", diff --git a/src/themes/index.js b/src/themes/index.js index 4312c21..8baa8b7 100644 --- a/src/themes/index.js +++ b/src/themes/index.js @@ -1,5 +1,6 @@ import main from './main/index' import fashion from './fashion/index' import highend from './highend/index' +import luxury from './luxury/index' -export default { main, fashion, highend } +export default { main, fashion, highend, luxury } diff --git a/src/themes/luxury/activity.png b/src/themes/luxury/activity.png new file mode 100644 index 0000000..d44d216 Binary files /dev/null and b/src/themes/luxury/activity.png differ diff --git a/src/themes/luxury/back.png b/src/themes/luxury/back.png new file mode 100644 index 0000000..bef6a88 Binary files /dev/null and b/src/themes/luxury/back.png differ diff --git a/src/themes/luxury/backgroundImg.png b/src/themes/luxury/backgroundImg.png new file mode 100644 index 0000000..73b3005 Binary files /dev/null and b/src/themes/luxury/backgroundImg.png differ diff --git a/src/themes/luxury/billBoardBg.png b/src/themes/luxury/billBoardBg.png new file mode 100644 index 0000000..660e896 Binary files /dev/null and b/src/themes/luxury/billBoardBg.png differ diff --git a/src/themes/luxury/billboardBackgroundImg.png b/src/themes/luxury/billboardBackgroundImg.png new file mode 100644 index 0000000..73b3005 Binary files /dev/null and b/src/themes/luxury/billboardBackgroundImg.png differ diff --git a/src/themes/luxury/grid.png b/src/themes/luxury/grid.png new file mode 100644 index 0000000..098b5cf Binary files /dev/null and b/src/themes/luxury/grid.png differ diff --git a/src/themes/luxury/gridActive.png b/src/themes/luxury/gridActive.png new file mode 100644 index 0000000..368f960 Binary files /dev/null and b/src/themes/luxury/gridActive.png differ diff --git a/src/themes/luxury/index.js b/src/themes/luxury/index.js new file mode 100644 index 0000000..e11fdbc --- /dev/null +++ b/src/themes/luxury/index.js @@ -0,0 +1,10 @@ +import style from './style.json' +function importAll(r) { + const obj = {} + r.keys().forEach(key => { + obj[key.replace('./', '').replace('.png', '')] = r(key) + }) + return obj +} +const images = importAll(require.context('./', false, /\.(png|jpe?g|svg)$/)) +export default { ...style, images } diff --git a/src/themes/luxury/loc.png b/src/themes/luxury/loc.png new file mode 100644 index 0000000..2c6910d Binary files /dev/null and b/src/themes/luxury/loc.png differ diff --git a/src/themes/luxury/mall.png b/src/themes/luxury/mall.png new file mode 100644 index 0000000..2428b8b Binary files /dev/null and b/src/themes/luxury/mall.png differ diff --git a/src/themes/luxury/member.png b/src/themes/luxury/member.png new file mode 100644 index 0000000..3ce4775 Binary files /dev/null and b/src/themes/luxury/member.png differ diff --git a/src/themes/luxury/movie.png b/src/themes/luxury/movie.png new file mode 100644 index 0000000..9d2ca56 Binary files /dev/null and b/src/themes/luxury/movie.png differ diff --git a/src/themes/luxury/parking.png b/src/themes/luxury/parking.png new file mode 100644 index 0000000..28005a9 Binary files /dev/null and b/src/themes/luxury/parking.png differ diff --git a/src/themes/luxury/row.png b/src/themes/luxury/row.png new file mode 100644 index 0000000..e310d9d Binary files /dev/null and b/src/themes/luxury/row.png differ diff --git a/src/themes/luxury/rowActive.png b/src/themes/luxury/rowActive.png new file mode 100644 index 0000000..a9a6359 Binary files /dev/null and b/src/themes/luxury/rowActive.png differ diff --git a/src/themes/luxury/searchClear.png b/src/themes/luxury/searchClear.png new file mode 100644 index 0000000..840894a Binary files /dev/null and b/src/themes/luxury/searchClear.png differ diff --git a/src/themes/luxury/searchClose.png b/src/themes/luxury/searchClose.png new file mode 100644 index 0000000..6858c98 Binary files /dev/null and b/src/themes/luxury/searchClose.png differ diff --git a/src/themes/luxury/searchIcon.png b/src/themes/luxury/searchIcon.png new file mode 100644 index 0000000..277cae7 Binary files /dev/null and b/src/themes/luxury/searchIcon.png differ diff --git a/src/themes/luxury/style.json b/src/themes/luxury/style.json new file mode 100644 index 0000000..5ab8060 --- /dev/null +++ b/src/themes/luxury/style.json @@ -0,0 +1,94 @@ +{ + "global": { + "background": "bottom / cover no-repeat", + "appBackground": "#E7E7E7" + }, + "weather": { + "iconColor": "#000", + "textColor": "#000" + }, + "time": { + "timeColor": "#000", + "monthColor": "#000", + "weekColor": "#D3AB80" + }, + "searchBar": { + "backBorderRadius": "24px", + "background": "#fff", + "border": "2px solid rgba(210, 169, 126, 1)", + "borderRadius": "24px", + "placeholderColor": "rgba(0, 0, 0, 0.2)", + "stickBg": "#D3AB80", + "color": "rgba(0, 0, 0, 0.8)" + }, + "menu": { + "bg1": "rgba(255, 255, 255, 0.4)", + "bg2": "rgba(255, 255, 255, 0.4)", + "bg3": "rgba(255, 255, 255, 0.4)", + "bg4": "rgba(255, 255, 255, 0.4)", + "bg5": "rgba(255, 255, 255, 0.4)", + "activeBg1": "#ffffff", + "activeBg2": "#ffffff", + "activeBg3": "#ffffff", + "activeBg4": "#ffffff", + "activeBg5": "#ffffff", + "color": "rgba(0, 0, 0, 0.4)", + "activeColor": "rgba(0, 0, 0, 0.8)", + "indexColor": "rgba(0, 0, 0, 0.8)", + "barBg": "#D3AB80" + }, + "index": { + "recTitleColor": "rgba(0, 0, 0, 0.8)", + "guideBackground": "#6E5E54", + "guideBorder": "none", + "guideTopBg": "linear-gradient(180deg, #D2A97E 0%, #EDD59E 100%)", + "guideQrcodeBg": "rgba(255, 255, 255, 0.2)", + "guideColor": "#fff", + "guideMetaColor": "rgba(255, 255, 255, 0.8)", + "foodBg": "linear-gradient(180deg, #ffffff 0%, #f2f4f8 100%)", + "recBg": "linear-gradient(180deg, #ffffff 0%, #f2f4f8 100%)", + "recBorder": "none" + }, + "brand": { + "background": "rgba(255, 255, 255, 0.6)", + "floorNameColor": "rgba(0, 0, 0, 0.8)", + "floorMetaColor": "rgba(0, 0, 0, 0.6)" + }, + "food": { + "background": "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.5) 100%)" + }, + "carousel": { + "titleColor": "rgba(0, 0, 0, 0.8)", + "introColor": "rgba(0, 0, 0, 0.6)" + }, + "map": { + "background": "#E7E7E7" + }, + "billboard": { + "background": "center / cover no-repeat", + "arrowRadius": "100px", + "titleColor": "#000000", + "metaColor": "rgba(0, 0, 0, 0.6)" + }, + "guide": { + "floorBg": "#FFFFFF", + "allFloorBg": "left / 150px 100% no-repeat linear-gradient(180deg, #D2A97E 0%, #EDD59E 100%), #E7E7E7", + "arrowRadius": "100px", + "floorColor": "rgba(0, 0, 0, 0.8)", + "floorActiveColor": "#FFFFFF", + "floorActiveBg": "linear-gradient(180deg, #D2A97E 0%, #EDD59E 100%)" + }, + "search": { + "background": "linear-gradient(180deg, #E9E9E9 0%, #C9C9C9 100%)", + "barBackground": "#fff", + "placeholderMetaColor": "rgba(211, 171, 128, 1)", + "keyboardActiveBg": "linear-gradient(180deg, #D2A97E 0%, #EDD59E 100%)", + "writeColor": "#D3AB80" + }, + "activities": { + "btnBg": "#D3AB80", + "btnColor": "#FFFFFF", + "detailBg": "#FFFFFF", + "radius": "16px" + } +} diff --git a/src/themes/main/loc.png b/src/themes/main/loc.png new file mode 100644 index 0000000..eb3e38c Binary files /dev/null and b/src/themes/main/loc.png differ diff --git a/src/themes/main/style.json b/src/themes/main/style.json index a4d8adb..2b6630e 100644 --- a/src/themes/main/style.json +++ b/src/themes/main/style.json @@ -43,6 +43,8 @@ "guideBorder": "none", "guideTopBg": "linear-gradient(180deg, #435acd 0%, #749cf3 100%)", "guideQrcodeBg": "rgba(255, 255, 255, 0.2)", + "guideColor": "#000000", + "guideMetaColor": "rgba(0, 0, 0, 0.6)", "foodBg": "linear-gradient(180deg, #ffffff 0%, #f2f4f8 100%)", "recBg": "linear-gradient(180deg, #ffffff 0%, #f2f4f8 100%)", "recBorder": "none" diff --git a/src/views/Billboard/Billboard.vue b/src/views/Billboard/Billboard.vue index 3f0f2f2..7f054b7 100644 --- a/src/views/Billboard/Billboard.vue +++ b/src/views/Billboard/Billboard.vue @@ -1,5 +1,5 @@