Browse Source

fix: 解决冲突

pull/2/head
deepblues 3 years ago
parent
commit
b9f97ad5d1
  1. 2
      public/static/offline/JSON/GetDevCoordinateByIP.json
  2. 3
      src/components/ShopItem/ShopItem.vue
  3. 2
      src/plugins/index.ts
  4. 2
      src/views/Brand/Brand.vue

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

@ -1 +1 @@
{"code":200,"msg":"success","data":{"machineCode":"fOjdaZJ0kCfJ2WCgszOKr","machineName":"12132","machineTypeName":"信发","label":"windows","screenAttribute":"1920*1080横屏","building":"主楼","buildingCode":"h-8eWvLqbPZP5cuWHY-vA","buildingOrder":0,"floor":"L1","floorCode":"p6U4SCkoJf9Xq5gBGpa3L","floorOrder":0,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}}
{"code":200,"msg":"success","data":{"machineCode":"fOjdaZJ0kCfJ2WCgszOKr","machineName":"12132","machineTypeName":"信发","label":"windows","screenAttribute":"1920*1080横屏","building":"主楼","buildingCode":"h-8eWvLqbPZP5cuWHY-vA","buildingOrder":0,"floor":"L1","floorCode":"p6U4SCkoJf9Xq5gBGpa3L","floorOrder":3,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}}

3
src/components/ShopItem/ShopItem.vue

@ -3,7 +3,8 @@
<div :key="shop.shopCode" class="shop-li"> <div :key="shop.shopCode" class="shop-li">
<!-- 图片 --> <!-- 图片 -->
<div class="banner-wrapper"> <div class="banner-wrapper">
<img v-lazy="shop.logoUrl" alt="" />
<img v-if="shop.logoUrl" :src="shop.logoUrl" alt="" />
<img v-else src="@/assets/images/header/logo.svg" alt="" />
</div> </div>
<!-- 文字 --> <!-- 文字 -->
<div class="bottom"> <div class="bottom">

2
src/plugins/index.ts

@ -4,6 +4,6 @@ import type { App } from 'vue'
export function setupPlugins(app: App) { export function setupPlugins(app: App) {
app.use(switchLanguage).use(VueLazyLoad, { app.use(switchLanguage).use(VueLazyLoad, {
error: require('@/assets/images/stay_tuned.svg')
error: require('@/assets/images/header/logo.svg')
}) })
} }

2
src/views/Brand/Brand.vue

@ -139,6 +139,8 @@ getBrandInfo().then(({ data }) => {
// //
function changeType(item: any) { function changeType(item: any) {
currentTypeId.value = item.order currentTypeId.value = item.order
formatIdx.value = 0
copyShopList.value = [...shopList.value]
} }
function resetIdx() { function resetIdx() {
formatIdx.value = 0 formatIdx.value = 0

Loading…
Cancel
Save