Browse Source

feat: 导航店铺样式更新

ShangHai_LongXiang
jiannibang 2 years ago
parent
commit
ca105b3df1
  1. 2
      public/static/offline/JSON/getBackTime.json
  2. 30
      public/static/offline/JSON/getDevCoordinateByIP.json
  3. 53
      src/base/ShopItem/ShopItem.vue
  4. 2
      src/composables/useHandleScreen.js

2
public/static/offline/JSON/getBackTime.json

@ -1 +1 @@
{"code":200,"msg":"操作成功","data":[20,20]}
{ "code": 200, "msg": "操作成功", "data": [120, 120] }

30
public/static/offline/JSON/getDevCoordinateByIP.json

@ -1 +1,29 @@
{"code":200,"msg":"success","data":{"machineCode":"MLnMzBjQdwVKysWyz1RG0","machineName":"111","machineTypeName":"导视","label":"windows","screenAttribute":"1080*1920竖屏","building":"A栋","buildingCode":"DLvmtzN2qodUq_oYr7vyM","buildingOrder":0,"floor":"1F","floorCode":"nL3E-j25zxxkag_HMSGsR","floorOrder":2,"ip":"192.168.1.21","mac":"E0D55E1B2B17","location":"16","angle":"0","projectCode":"project-zert3dski8fqmgr4zhusea","regionCode":"","lensCoordinate":"","orientationCoordinate":"","deployType":"saas","xfyunIp":"","xfyunPort":"","style":"0"}}
{
"code": 200,
"msg": "success",
"data": {
"machineCode": "MLnMzBjQdwVKysWyz1RG0",
"machineName": "111",
"machineTypeName": "导视",
"label": "windows",
"screenAttribute": "1080*1920竖屏",
"building": "A栋",
"buildingCode": "DLvmtzN2qodUq_oYr7vyM",
"buildingOrder": 0,
"floor": "1F",
"floorCode": "nL3E-j25zxxkag_HMSGsR",
"floorOrder": 2,
"ip": "192.168.1.21",
"mac": "E0D55E1B2B17",
"location": "16",
"angle": "270",
"projectCode": "project-zert3dski8fqmgr4zhusea",
"regionCode": "",
"lensCoordinate": "",
"orientationCoordinate": "",
"deployType": "saas",
"xfyunIp": "",
"xfyunPort": "",
"style": "0"
}
}

53
src/base/ShopItem/ShopItem.vue

@ -21,9 +21,13 @@
></QRCodeFromText>
<div class="qrcode-meta1">手机扫码导航</div>
</div>
<div v-if="isFood" class="foodActiveName">立即导航</div>
<div v-if="isFood" class="foodActiveName">
<div class="name-left">{{ switchLanguage(shop, 'shopName') }}</div>
<div class="nav-right">导航</div>
</div>
<div class="name" v-else>
<div class="shop-name">立即导航</div>
<div class="shop-name">{{ switchLanguage(shop, 'shopName') }}</div>
<div class="nav-right">导航</div>
</div>
</div>
@ -206,16 +210,38 @@ const deactivate = () => store.SET_SHOP(null)
}
.foodActiveName {
display: flex;
justify-content: center;
justify-content: space-between;
align-items: center;
padding-left: 16px;
padding-right: 8px;
width: calc(100% - 32px);
height: 45px;
border-radius: 100px;
background: var(--VI--, linear-gradient(99deg, #f0b92b 0%, #f9d556 100%));
color: var(--b-80, rgba(0, 0, 0, 0.8));
text-align: center;
font-size: 14px;
font-weight: 700;
margin-top: 9px;
.name-left {
flex: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: var(--b-80, rgba(0, 0, 0, 0.8));
font-size: 14px;
font-weight: 700;
}
.nav-right {
flex: 0 0 62px;
width: 62px;
height: 37px;
border-radius: 100px;
background: var(--w-60, rgba(255, 255, 255, 0.6));
color: var(--b-80, rgba(0, 0, 0, 0.8));
text-align: center;
font-family: 'HarmonyOS Sans SC';
font-size: 14px;
font-style: normal;
font-weight: 700;
line-height: 37px;
}
}
.name-right {
display: block;
@ -264,9 +290,20 @@ const deactivate = () => store.SET_SHOP(null)
text-align: center;
line-height: 40px;
}
.shop-name {
.nav-right {
flex: 0 0 62px;
width: 62px;
height: 31px;
border-radius: 100px;
background: var(--w-60, rgba(255, 255, 255, 0.6));
color: var(--b-80, rgba(0, 0, 0, 0.8));
text-align: center;
font-size: 14px;
font-style: normal;
font-weight: 700;
line-height: 31px;
}
&.isFood {
.qrcode-wrapper {
background: #ffffff;

2
src/composables/useHandleScreen.js

@ -11,7 +11,7 @@ export const useHandleScreen = (callback, screenSaveCallback) => {
const { currentFloor: device, mapStatus, path } = toRefs(store)
const nativeMethods = computed(() => {
return !device.value ? {} : device.value.label === DEVICE.ANDROID ? window.android : window.chrome.webview.hostObjects.sync.csobj
return !device.value ? {} : device.value.label === DEVICE.ANDROID ? window.android : window.chrome?.webview?.hostObjects?.sync?.csobj
})
const state = reactive({

Loading…
Cancel
Save