XiaoMo/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
luJianJun
2023-07-28 11:53:08 +08:00
parent a98e3280d5 043fba6262
commit 5522645b5b
6 changed files with 191 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/detail/imageWatch.vue
View File

@@ -6,10 +6,10 @@
<el-carousel-item v-for="(item, i) in list" :key="i">
<div class="dis-f jus-x al-item" v-if="item">
<div class="img-box dis-f jus-x" style="width:600px" v-if="item['type'] != 'attachment'">
<video autoplay controls :src="item.url || item['videourl']"></video>
<video autoplay="false" controls :src="item.url || item['videourl']"></video>
</div>
<div class="img-box dis-f jus-x" v-else>
<img :src="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
<img v-lazy="item && item.url || item['imageurl'] || item['image']" class="img" alt="">
</div>
</div>
</el-carousel-item>
@@ -31,7 +31,7 @@
</div>
<div class="img-box-s dis-f jus-x"
:class="[{ 'select-box': imageTab === i && item.thumbnail }, { 'voide-img': !item.thumbnail }]">
<img :src="item.thumbnail || item.image" alt="" class="img-s" style="object-fit: cover;">
<img v-lazy="item.thumbnail || item.image" alt="" class="img-s" style="object-fit: cover;">
</div>
</div>
</div>
@@ -61,11 +61,6 @@ const props = defineProps({
}
})
setTimeout(() => {
console.log("list1111", props.list);
}, 5000);
let show = props.show
let list = ref([])
let close = props.close

85
src/components/public/group-QRcode.vue Normal file
View File

@@ -0,0 +1,85 @@
<template>
<div class="QRcode-box group-QRcode flexflex" v-if="true">
<img class="group-title" src="@/assets/img/apartmentDetail/group-title.png">
<div class="QRcode-case flexcenter">
<img class="QRcode-img" :src="wechat['wechatqrcode']" alt="">
</div>
<div class="group-QRcode-hint flexacenter">
<img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
入群请添加
<b>方同学的小助手</b>
<!-- <b>{{ wechat['nickname'] }}</b> -->
</div>
</div>
</template>
<script setup>
import { toRefs } from 'vue';
import { useStore } from 'vuex';
const store = useStore();
const { wechat } = toRefs(store.state);
</script>
<style lang="less" scoped>
.QRcode-box {
width: 304px;
// height: 304px;
background-color: rgba(255, 255, 255, 1);
border: 1px solid rgba(235, 235, 235, 1);
border-radius: 16px;
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
flex-direction: column;
align-items: center;
margin-bottom: 20px;
.scan-icon {
width: 14px;
height: 14px;
margin-right: 7px;
}
&.group-QRcode {
padding: 40px 0;
.group-title {
width: 140px;
height: 26px;
margin-bottom: 26px;
}
.QRcode-case {
width: 120px;
height: 120px;
background-color: rgba(255, 255, 255, 1);
border-radius: 15px;
-moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
-webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
margin-bottom: 28px;
.QRcode-img {
width: 100px;
height: 100px;
}
}
.group-QRcode-hint {
color: #555555;
font-size: 14px;
b {
font-size: 14px;
color: #000;
font-weight: 650;
margin-left: 5px;
}
}
}
}
</style>

2
src/components/public/login.vue
View File

@@ -108,7 +108,7 @@ const executeScripts = () => {
}
.htmlCode .registerNewApp {
.htmlCode #registerNewApp {
color: #000;
}

74
src/components/public/phoneQRcode.vue Normal file
View File

@@ -0,0 +1,74 @@
<template>
<div class="QRcode-box apartment-QRcode flexflex" v-if="true">
<img class="mini-program-title" src="@/assets/img/apartmentDetail/mini-program-title.png">
<div class="QRcode-case flexcenter">
<img class="QRcode-img" :src="props['qrcode']" alt="">
</div>
<div class="apartment-QRcode-hint flexacenter">
<img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
手机查看该{{ props['type'] == 'apartment' ? '公寓' : '房源' }}
</div>
</div>
</template>
<script setup>
import { defineProps } from 'vue';
const props = defineProps({
qrcode: String,
type: String,
})
</script>
<style lang="less" scoped>
.QRcode-box {
width: 304px;
background-color: rgba(255, 255, 255, 1);
border: 1px solid rgba(235, 235, 235, 1);
border-radius: 16px;
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
flex-direction: column;
align-items: center;
margin-bottom: 20px;
.scan-icon {
width: 14px;
height: 14px;
margin-right: 7px;
}
&.apartment-QRcode {
padding: 40px 0;
.mini-program-title {
width: 201px;
height: 24px;
margin-bottom: 28px;
}
.QRcode-case {
width: 130px;
height: 130px;
background-color: rgba(255, 255, 255, 1);
// border-radius: 50%;
// overflow: hidden;
// -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
// -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
// box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
margin-bottom: 33px;
.QRcode-img {
width: 110px;
// height: 110px;
}
}
.apartment-QRcode-hint {
font-size: 14px;
color: #000000;
}
}
}
</style>