Skip to content

E
east-nanjing-new
Commit a41c5207 authored by zhangrui123's avatar zhangrui123
Browse files
Options

增加来福士的专题屏

parent b5ae21a9
Show whitespace changes
Inline Side-by-side
Showing with 262 additions and 45 deletions
package-lock.json
View file @ a41c5207
......@@ -265,7 +265,8 @@
"@babel/helper-validator-identifier": {
"version": "7.12.11",
"resolved": "https://registry.npm.taobao.org/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.12.11.tgz",
"integrity": "sha1-yaHwIZF9y1zPDU5FPjmQIpgfye0="
"integrity": "sha1-yaHwIZF9y1zPDU5FPjmQIpgfye0=",
"dev": true
},
"@babel/helpers": {
"version": "7.12.5",
......@@ -311,7 +312,8 @@
"@babel/parser": {
"version": "7.12.11",
"resolved": "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.12.11.tgz?cache=0&sync_timestamp=1608076801657&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.12.11.tgz",
"integrity": "sha1-nONZW810vFxGaQXobFNbiyUBHnk="
"integrity": "sha1-nONZW810vFxGaQXobFNbiyUBHnk=",
"dev": true
},
"@babel/plugin-syntax-import-meta": {
"version": "7.10.4",
......@@ -391,6 +393,7 @@
"version": "7.12.12",
"resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.12.12.tgz?cache=0&sync_timestamp=1608732917055&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.12.12.tgz",
"integrity": "sha1-Rgim7DE6u9h6+lUATTc60EqWwpk=",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.12.11",
"lodash": "^4.17.19",
......@@ -700,6 +703,7 @@
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/compiler-core/download/@vue/compiler-core-3.0.5.tgz",
"integrity": "sha1-puVMq+lTbnTGUTrNJknzEa8dQ6w=",
"dev": true,
"requires": {
"@babel/parser": "^7.12.0",
"@babel/types": "^7.12.0",
......@@ -712,6 +716,7 @@
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/compiler-dom/download/@vue/compiler-dom-3.0.5.tgz",
"integrity": "sha1-eIWhPm0Y9k3ejrzuwFLtLBAmlsI=",
"dev": true,
"requires": {
"@vue/compiler-core": "3.0.5",
"@vue/shared": "3.0.5"
......@@ -752,36 +757,143 @@
}
},
"@vue/reactivity": {
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/reactivity/download/@vue/reactivity-3.0.5.tgz",
"integrity": "sha1-43ieTVI9hF+a4LTXcOK0VZR0L9I=",
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.37.tgz",
"integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
"requires": {
"@vue/shared": "3.0.5"
"@vue/shared": "3.2.37"
},
"dependencies": {
"@vue/shared": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}
}
},
"@vue/reactivity-transform": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
"integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
"requires": {
"@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.37",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
},
"dependencies": {
"@babel/parser": {
"version": "7.18.9",
"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.9.tgz",
"integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="
},
"@vue/compiler-core": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": {
"@babel/parser": "^7.16.4",
"@vue/shared": "3.2.37",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/shared": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}
}
},
"@vue/runtime-core": {
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/runtime-core/download/@vue/runtime-core-3.0.5.tgz",
"integrity": "sha1-2mMx1fMA1XlOng69yKi9cqnhmWI=",
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
"integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
"requires": {
"@vue/reactivity": "3.0.5",
"@vue/shared": "3.0.5"
"@vue/reactivity": "3.2.37",
"@vue/shared": "3.2.37"
},
"dependencies": {
"@vue/shared": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}
}
},
"@vue/runtime-dom": {
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/runtime-dom/download/@vue/runtime-dom-3.0.5.tgz",
"integrity": "sha1-HOLJxEniarBpY9oAZAluiCp6iTU=",
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
"integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
"requires": {
"@vue/runtime-core": "3.0.5",
"@vue/shared": "3.0.5",
"@vue/runtime-core": "3.2.37",
"@vue/shared": "3.2.37",
"csstype": "^2.6.8"
},
"dependencies": {
"@vue/shared": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}
}
},
"@vue/server-renderer": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
"integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
"requires": {
"@vue/compiler-ssr": "3.2.37",
"@vue/shared": "3.2.37"
},
"dependencies": {
"@babel/parser": {
"version": "7.18.9",
"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.9.tgz",
"integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="
},
"@vue/compiler-core": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": {
"@babel/parser": "^7.16.4",
"@vue/shared": "3.2.37",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/compiler-dom": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"requires": {
"@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.37"
}
},
"@vue/compiler-ssr": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
"integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
"requires": {
"@vue/compiler-dom": "3.2.37",
"@vue/shared": "3.2.37"
}
},
"@vue/shared": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}
}
},
"@vue/shared": {
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/@vue/shared/download/@vue/shared-3.0.5.tgz",
"integrity": "sha1-wTHYi9ZxPMTZOzuxNy7bGYMiX/A="
"integrity": "sha1-wTHYi9ZxPMTZOzuxNy7bGYMiX/A=",
"dev": true
},
"@vuedx/analyze": {
"version": "0.4.1",
......@@ -1420,9 +1532,9 @@
"dev": true
},
"csstype": {
"version": "2.6.14",
"resolved": "https://registry.npm.taobao.org/csstype/download/csstype-2.6.14.tgz?cache=0&sync_timestamp=1610107151406&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcsstype%2Fdownload%2Fcsstype-2.6.14.tgz",
"integrity": "sha1-AEgipAUDRbVa1NzAC+HZzy9Clt4="
"version": "2.6.20",
"resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz",
"integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
},
"dayjs": {
"version": "1.10.4",
......@@ -2519,7 +2631,6 @@
"version": "0.25.7",
"resolved": "https://registry.npm.taobao.org/magic-string/download/magic-string-0.25.7.tgz",
"integrity": "sha1-P0l9b9NMZpxnmNy4IfLvMfVEUFE=",
"dev": true,
"requires": {
"sourcemap-codec": "^1.4.4"
}
......@@ -2799,6 +2910,11 @@
"integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
"dev": true
},
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
},
"picomatch": {
"version": "2.2.2",
"resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz",
......@@ -3183,6 +3299,11 @@
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
},
"source-map-js": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
},
"source-map-resolve": {
"version": "0.5.3",
"resolved": "https://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.3.tgz",
......@@ -3205,8 +3326,7 @@
"sourcemap-codec": {
"version": "1.4.8",
"resolved": "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz",
"integrity": "sha1-6oBL2UhXQC5pktBaOO8a41qatMQ=",
"dev": true
"integrity": "sha1-6oBL2UhXQC5pktBaOO8a41qatMQ="
},
"spdx-correct": {
"version": "3.1.1",
......@@ -3423,7 +3543,8 @@
"to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz",
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
"dev": true
},
"to-regex-range": {
"version": "5.0.1",
......@@ -3570,13 +3691,88 @@
"dev": true
},
"vue": {
"version": "3.0.5",
"resolved": "https://registry.npm.taobao.org/vue/download/vue-3.0.5.tgz",
"integrity": "sha1-3huC66JKv+ceCXD8m41LK6vcP+E=",
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.37.tgz",
"integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
"requires": {
"@vue/compiler-dom": "3.0.5",
"@vue/runtime-dom": "3.0.5",
"@vue/shared": "3.0.5"
"@vue/compiler-dom": "3.2.37",
"@vue/compiler-sfc": "3.2.37",
"@vue/runtime-dom": "3.2.37",
"@vue/server-renderer": "3.2.37",
"@vue/shared": "3.2.37"
},
"dependencies": {
"@babel/parser": {
"version": "7.18.9",
"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.9.tgz",
"integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="
},
"@vue/compiler-core": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": {
"@babel/parser": "^7.16.4",
"@vue/shared": "3.2.37",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/compiler-dom": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"requires": {
"@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.37"
}
},
"@vue/compiler-sfc": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
"integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
"requires": {
"@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.37",
"@vue/compiler-dom": "3.2.37",
"@vue/compiler-ssr": "3.2.37",
"@vue/reactivity-transform": "3.2.37",
"@vue/shared": "3.2.37",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
"source-map": "^0.6.1"
}
},
"@vue/compiler-ssr": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
"integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
"requires": {
"@vue/compiler-dom": "3.2.37",
"@vue/shared": "3.2.37"
}
},
"@vue/shared": {
"version": "3.2.37",
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
},
"nanoid": {
"version": "3.3.4",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
},
"postcss": {
"version": "8.4.14",
"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.14.tgz",
"integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
"requires": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
}
}
},
"vue-eslint-parser": {
......
src/store/state.ts
View file @ a41c5207
......@@ -27,6 +27,7 @@ export default {
{ name: '第一工作站', type: 'work1', id: '01001' },
{ name: '第二工作站', type: 'work2', id: '01002' },
{ name: '第三工作站', type: 'work3', id: '01003' },
{ name: '来福士专题屏', type: 'lfs' },
// {name: "振兴小区", type: url: "/community?id=527635870583459840"}
// {name: "威海路62弄", type: url: "/community?id=527635870583459841"}
],
......
src/view/community/site-selector.vue
View file @ a41c5207
......@@ -3,7 +3,11 @@
id="site-selector"
class="site-selector"
:style="`left:${
isNaN(+curViewType) ? 'calc(20vw + .1rem)' : 'calc(16vw + .1rem)'
isNaN(+curViewType) && curViewType != 'lfs'
? 'calc(20vw + .1rem)'
: isNaN(+curViewType) && curViewType == 'lfs'
? 'calc(32vw + .1rem)'
: 'calc(16vw + .1rem)'
}`"
>
<a-select
......@@ -26,6 +30,7 @@
import { computed, defineComponent } from 'vue'
import store from '@/store'
import { useRouter } from 'vue-router'
import { log } from 'console'
export default defineComponent({
name: 'SiteSelector',
......@@ -44,11 +49,16 @@ export default defineComponent({
if (store.state.curView.id) {
store.dispatch('initStationData', store.state.curView.id)
}
if (isNaN(+type)) {
console.log(type)
if (isNaN(+type) && type != 'lfs') {
// 小区以外的屏
router.push({
name: 'main',
})
} else if (isNaN(+type) && type == 'lfs') {
router.push({
name: 'raffles',
})
} else {
router.push({
name: 'community',
......@@ -67,20 +77,18 @@ export default defineComponent({
<style lang="stylus">
@import '../../components/MyComponent/main.styl'
$bg = rgba(13, 39, 76, .7)
$size = .1rem
$height = .26rem
$bg = rgba(13, 39, 76, 0.7)
$size = 0.1rem
$height = 0.26rem
#site-selector.site-selector
position fixed
top .45rem
top 0.45rem
z-index 99
.ant-select
background $bg
min-width .9rem
min-width 0.9rem
.ant-select-selector
min-width .9rem
min-width 0.9rem
border-top none
border-left none
border-right none
......
src/view/raffles/index.vue
View file @ a41c5207
......@@ -10,19 +10,32 @@
<m-animate enter="fadeInLeft" leave="fadeOutLeft">
<LeftSection :info="rafflesDetail" area="left" />
</m-animate>
<SiteSelector />
<m-animate enter="fadeInRight" leave="fadeOutRight">
<RightSection :info="rafflesDetail" area="right" />
</m-animate>
</m-grid>
</template>
<script lang="ts" setup>
<script lang="ts">
import Title from './title.vue'
import LeftSection from './left.vue'
import RightSection from './right.vue'
import { ajax, api } from '@/ajax'
import { ref } from 'vue'
import { ref, defineComponent } from 'vue'
import SiteSelector from '@/view/community/site-selector.vue'
export default defineComponent({
name: 'Raffles',
components: {
SiteSelector,
},
setup() {
return {}
},
})
</script>
<script lang="ts" setup>
const rafflesDetail = ref<any>({})
ajax
.get({
......@@ -32,5 +45,4 @@ ajax
rafflesDetail.value = res?.data?.content?.[0] || {}
})
</script>
<style lang="stylus" scoped></style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment