4.1版本

This commit is contained in:
A1300399510 2024-03-18 19:06:37 +08:00
parent 7b8de0d120
commit 16ac41dba3
29 changed files with 552 additions and 135 deletions

27
css/common.wxss Normal file
View File

@ -0,0 +1,27 @@
/* 公共的flex 布局方法 */
.flexflex {
display: flex;
}
.flexcenter {
display: flex;
justify-content: center;
align-items: center;
}
.flexacenter {
display: flex;
align-items: center;
}
.flex1 {
flex: 1;
}
/* 文字一行显示 */
.one-line-display {
word-break: keep-all;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

BIN
img/consult-icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
img/load.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
img/wechat-name-icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

11
img/wechat-name-icon.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="22px" height="22px" xmlns="http://www.w3.org/2000/svg">
<defs>
<filter x="-50.00%" y="-50.00%" width="200.00%" height="200.00%" filterUnits="objectBoundingBox" id="filter696">
<feColorMatrix type="matrix" values="0.933333333333333 0 0 0 0.0777777777777778 0 0.933333333333333 0 0 0.0777777777777778 0 0 0.933333333333333 0 0.0777777777777778 0 0 0 1 0 " in="SourceGraphic" />
</filter>
</defs>
<g transform="matrix(1 0 0 1 -929 -806 )">
<image preserveAspectRatio="none" style="overflow:visible" width="22" height="22" xlink:href="data:image/png;base64,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" x="929px" y="806px" filter="url(#filter696)" />
</g>
</svg>

View File

@ -584,7 +584,8 @@
<view bindtap="publicJumps" data-url="/pages/show/show?uniqid={{ item.uniqid }}" hover-class="none">
<view class="pinterest-list-item general">
<view wx:if="{{ item['isintermediary'] == 1 }}" class="top-right-corner top-right-corner-authentication flexcenter">认证中介</view>
<!-- <view wx:if="{{ item['isintermediary'] == 1 }}" class="top-right-corner top-right-corner-authentication flexcenter">认证中介</view> -->
<image wx:if="{{ item['isintermediary'] == 1 }}" class="top-right-corner top-right-corner-authentication flexcenter" mode="heightFix" src="/img/certifying-agent.png"></image>
<view wx:else class="top-right-corner flexcenter">{{ item.intermediarytext || '其他' }}</view>
<image class="general-img" mode="widthFix" mode="aspectFill" bindload="pinterestImgLoad" src="{{ item.imageLocal || item.image }}" lazy-load="{{ true }}"></image>
@ -619,11 +620,11 @@
<view class="apartment-top flexflex">
<view class="apartment-top-collect flexcenter" catch:tap="bindCollect" data-index="{{ index }}">
<image wx:if="{{ isUser }}" class="apartment-top-collect-icon" style="width: 66rpx;height: 66rpx;" mode="widthFix" src="https://app.gter.net/image/miniApp/HKRenting/collecting-yellow-shadows.svg"></image>
<image wx:if="{{ isUser }}" class="apartment-top-collect-ico" style="width: 66rpx;height: 66rpx;" mode="widthFix" src="https://app.gter.net/image/miniApp/HKRenting/collecting-yellow-shadows.svg"></image>
<block wx:else>
<image wx:if="{{ item.iscollect == 1 }}" class="apartment-top-collect-icon" style="width: 66rpx;height: 66rpx;" mode="widthFix" src="https://app.gter.net/image/miniApp/HKRenting/collecting-yellow-shadows.svg"></image>
<image wx:if="{{ item.iscollect == 1 }}" class="apartment-top-collect-ico" style="width: 66rpx;height: 66rpx;" mode="widthFix" src="https://app.gter.net/image/miniApp/HKRenting/collecting-yellow-shadows.svg"></image>
<image wx:else class="apartment-top-collect-icon" mode="widthFix" src="https://app.gter.net/image/miniApp/HKRenting/collecting-shadows.svg"></image>
{{ item.collectnum == 0 ? '' : item.collectnum }}
<!-- {{ item.collectnum == 0 ? '' : item.collectnum }} -->
</block>
</view>

View File

@ -874,7 +874,9 @@
}
.pinterest-list .pinterest-list-item.general .top-right-corner-authentication {
background-color: rgba(59, 106, 238, 0.7);
/* background-color: rgba(59, 106, 238, 0.7); */
background-color: transparent !important;
height: 30rpx;
}
.pinterest-list .pinterest-list-item.general .general-img {

View File

@ -121,7 +121,7 @@ Page({
if (el['select']) listType = el['type']
})
data.apartment = data.apartment.slice(0, 5)
console.log("data", data.apartment);
// console.log("data", data.apartment);
this.setData({
...data,

View File

@ -499,7 +499,6 @@
}
.apartment-block .apartment-list .apartment-item {
/* flex: 0 0 300rpx; */
width: 322.5rpx;
height: 246rpx;
border-radius: 24rpx;

View File

@ -35,31 +35,36 @@
<view class="room-type-tab-item highlight" wx:if="{{ item.allowance }}">剩余{{ item.allowance }}间</view>
<view class="room-type-tab-item" wx:for="{{ item.tags }}" wx:for-item="it" wx:key="index">{{ it }}</view>
</view>
<!-- <view class="room-type-media" wx:if="{{ item.videos.length != 0 || item.images.length != 0 }}"> -->
<!-- <scroll-view class="scroll" scroll-x="{{ true }}" show-scrollbar="{{ false }}"> -->
<view class="room-type-media" wx:if="{{ item.videos.length != 0 || item.images.length != 0 }}">
<block wx:if="{{ item.videos.length != 0 }}">
<view class="room-type-media-item flexcenter" bindtap="mediaItem" data-current="{{ i }}" data-index="{{ index }}" wx:for="{{ item.videos }}" wx:for-item="it" wx:for-index="i">
<view class="room-type-media-item lexcenter" bindtap="mediaItem" data-current="{{ i }}" data-index="{{ index }}" wx:for="{{ item.videos }}" wx:for-item="it" wx:for-index="i">
<image class="room-type-media-image" mode="heightFix" src="{{ it.thumbnail }}"></image>
<image class="room-type-videoplay" src="/img/videoplay.png"></image>
</view>
</block>
<block wx:if="{{ item.images.length != 0 }}">
<view class="room-type-media-item flexcenter" bindtap="mediaItem" data-current="{{ item.videos.length ? i + item.videos.length : i }}" data-index="{{ index }}" wx:for="{{ item.images }}" wx:for-item="it" wx:for-index="i">
<view class="room-type-media-item lexcenter" bindtap="mediaItem" data-current="{{ item.videos.length ? i + item.videos.length : i }}" data-index="{{ index }}" wx:for="{{ item.images }}" wx:for-item="it" wx:for-index="i">
<image class="room-type-media-image" mode="heightFix" src="{{ it.thumbnail }}"></image>
</view>
</block>
</view>
<!-- </scroll-view> -->
<view class="room-type-bottom flexacenter">
<view class="room-type-bottom-left flexacenter">
HK$<view class="room-type-price">{{ item.discountprice || item.price }}</view>
<view class="room-type-symbol">HK$</view>
<view class="room-type-price">{{ item.discountprice || item.price }}</view>
<view class="room-type-month">/月</view>
<view class="room-type-worn-price" wx:if="{{ item.discountprice }}">HK$ {{ item.price }} / 月</view>
</view>
<!-- <view wx:if="{{ item.status == 1 }}" class="room-type-bottom-right flexcenter" catchtap="send_form_id">咨询</view> -->
<view wx:if="{{ item.status == 1 }}" class="room-type-bottom-right flexcenter" catchtap="send_form_id">
<image class=""></image>
<image class="consult-icon" mode="widthFix" src="/img/consult-icon.png"></image>
咨询
</view>
<view wx:else class="room-type-bottom-right already flexcenter">已租满</view>
</view>
</view>

View File

@ -945,6 +945,21 @@ map .clickmap {
border: 1rpx solid rgba(80, 227, 194, 1);
}
.room-type-box .scroll {
overflow: hidden;
margin-bottom: 30rpx;
}
/* 在对应的wxss文件中 */
.room-type-media::-webkit-scrollbar {
display: none;
/* 隐藏滚动条适用于iOS */
}
.room-type-media {
scrollbar-width: none;
/* 隐藏滚动条适用于Chrome等 */
}
.room-type-box .room-type-media {
padding: 0 24rpx;
@ -955,11 +970,12 @@ map .clickmap {
}
.room-type-box .room-type-media-item {
width: 114rpx;
height: 120rpx;
/* width: 114rpx; */
height: 200rpx;
margin-right: 15rpx;
position: relative;
overflow: hidden;
/* display: inline-block; */
}
.room-type-box .room-type-media-image {
@ -986,10 +1002,16 @@ map .clickmap {
.room-type-box .room-type-bottom-left {
color: #000000;
font-weight: 900;
font-family: Arial, Helvetica, sans-serif;
/* font-weight: 900; */
/* font-family: Arial, Helvetica, sans-serif; */
font-size: 24rpx;
/* font-family: 'Arial-Black', 'Arial Black', sans-serif; */
}
.room-type-box .room-type-bottom .room-type-symbol {
font-family: 'Arial-Black', 'Arial Black', sans-serif;
font-weight: 900;
}
@ -998,6 +1020,7 @@ map .clickmap {
font-size: 43rpx;
margin: 0 10rpx;
font-family: 'Arial-Black', 'Arial Black', sans-serif;
font-weight: 900;
}
@ -1005,7 +1028,7 @@ map .clickmap {
margin-left: 18rpx;
color: #727272;
font-size: 24rpx;
font-weight: 200;
/* font-weight: 200; */
text-decoration: line-through;
}
@ -1018,17 +1041,29 @@ map .clickmap {
.room-type-box .room-type-bottom .room-type-bottom-right {
/* width: 144rpx; */
height: 60rpx;
padding: 0 30rpx;
line-height: 60rpx;
padding: 0 24rpx;
border-radius: 54rpx;
background-color: rgba(98, 177, 255, 1);
font-size: 24rpx;
color: #fff;
/* background-color: rgba(98, 177, 255, 1); */
background-color: rgba(253, 223, 109, 0.235294117647059);
/* font-size: 24rpx; */
/* color: #fff; */
font-size: 27rpx;
color: #000000;
}
.room-type-box .room-type-bottom .room-type-bottom-right .consult-icon {
width: 36rpx;
height: 36rpx;
margin-right: 6rpx;
font-weight: 400;
}
.room-type-box .room-type-bottom .room-type-bottom-right.already {
background-color: #fff;
border: 1rpx solid rgba(215, 215, 215, 1);
color: #aaaaaa;
font-size: 24rpx;
}
.apartment-block .apartment-block-text {
@ -1187,13 +1222,16 @@ map .clickmap {
position: fixed;
bottom: 0;
left: 0;
width: 100vw;
width: calc(100vw - 75rpx);
height: 135rpx;
background-color: #fff;
z-index: 11;
border-top: 1rpx solid #d7d7d7;
justify-content: space-between;
box-sizing: content-box;
/* padding: 30rpx; */
padding-right: 30rpx;
padding-left: 45rpx;
}
.bottom-bar .register-btn {
@ -1203,7 +1241,6 @@ map .clickmap {
border-radius: 69rpx;
background-color: rgba(98, 177, 255, 1);
color: #fff;
margin-right: 30rpx;
}
.bottom-bar .bottom-bar-item {
@ -1212,7 +1249,7 @@ map .clickmap {
color: #000000;
/* margin-left: 45rpx; */
justify-content: center;
flex: 1;
/* flex: 1; */
}
.bottom-bar .bottom-bar-item .bottom-bar-icon {

View File

@ -65,6 +65,7 @@ Page({
topTitle: "",
consultState: false, // 咨询弹窗状态
schoolScrollLeft: 100,
QRCodePopState: false, // 二维码弹窗状态
},
headerSearchTopHeight: 10,
@ -204,6 +205,7 @@ Page({
get_config() {
var that = this;
if (app.globalData.config.lists) {
console.log("app", app.globalData.wechat);
config = app.globalData.config;
that.setData({
user: app.globalData.user,
@ -550,8 +552,11 @@ Page({
consultStateCut() {
this.setData({
consultState: !this.data.consultState
QRCodePopState: !this.data.QRCodePopState
})
// this.setData({
// consultState: !this.data.consultState
// })
},
toTop() {
@ -564,7 +569,7 @@ Page({
bindCollect(e) {
let index = e.currentTarget.dataset.index
const target = this.data.data[index]
const baseURL = app.globalData.baseURL
miucms.request(baseURL + '/tenement/v2/api/user/apartmentCollection', {
token: target.token

View File

@ -12,7 +12,8 @@
"list-item": "./listItem/listItem",
"announcement-popup": "../../template/announcementPopup/announcementPopup",
"list-operations": "/template/listOperations/listOperations",
"xin-head-swiper": "/template/xinHeadSwiper/xinHeadSwiper"
"xin-head-swiper": "/template/xinHeadSwiper/xinHeadSwiper",
"QRCodePop": "/template/QRCodePop/QRCodePop"
},
"enablePullDownRefresh": false
}

View File

@ -86,5 +86,5 @@
</view>
</view>
<QRCodePop wx:if="{{ QRCodePopState }}" bindclosePop="consultStateCut" typee="irent"></QRCodePop>
</view>

View File

@ -72,6 +72,7 @@ Page({
rent_max: ''
},
requestData: {}, // 请求参数
QRCodePopState: false, // 二维码弹窗状态
},
headerSearchTopHeight: 10,
@ -654,4 +655,9 @@ Page({
url: "/pages/search/search?isAskingSearch=true",
})
},
consultStateCut() {
this.setData({
QRCodePopState: !this.data.QRCodePopState
})
},
})

View File

@ -15,6 +15,7 @@
"house-item": "./houseItem/houseItem",
"xin-head-swiper": "/template/xinHeadSwiper/xinHeadSwiper",
"list-operations": "/template/listOperations/listOperations",
"common-list": "/template/commonList/commonList"
"common-list": "/template/commonList/commonList",
"QRCodePop": "/template/QRCodePop/QRCodePop"
}
}

View File

@ -58,4 +58,15 @@
<!-- 不能用搜索功能弹窗 -->
<template wx:if="{{ authenticationPopState }}" is="asking-housing-authentication-pop"></template>
<!-- 右边的咨询按钮 -->
<view class="consult-btn flexcenter" bindtap="consultStateCut">
<view class="consult-inside flexcenter">
<image class="consult-inside-bj" src="/img/green-circle.svg"></image>
<image class="consult-semicircle" src="/img/green-semicircle.svg"></image>
<image class="consult-icon" mode="widthFix" src="/img/consult.png"></image>
<view class="consult-text">咨询</view>
</view>
</view>
<QRCodePop wx:if="{{ QRCodePopState }}" bindclosePop="consultStateCut" typee="irent"></QRCodePop>
</view>

View File

@ -136,4 +136,54 @@
font-weight: 650;
margin: 0 8rpx;
font-family: 'Arial-Black';
}
.consult-btn {
position: fixed;
bottom: 500rpx;
right: 10rpx;
background-color: #50e3c2;
width: 96rpx;
height: 96rpx;
border-radius: 50%;
box-shadow: 0px 0px 12rpx rgba(0, 0, 0, 0.0784313725490196);
z-index: 1000;
}
.consult-btn .consult-inside {
flex-direction: column;
width: 81rpx;
height: 81rpx;
/* background-color: rgba(190, 245, 233, 0.8); */
font-size: 22.5rpx;
border-radius: 50%;
position: relative;
}
.consult-btn .consult-inside-bj {
width: 81rpx;
height: 81rpx;
top: 0;
left: 0;
position: absolute;
}
.consult-btn .consult-icon {
width: 30rpx;
height: 27rpx;
z-index: 1111;
}
.consult-btn .consult-text {
z-index: 1111;
}
.consult-btn .consult-semicircle {
width: 81rpx;
height: 40.5rpx;
position: absolute;
top: 0;
transform-origin: 50% 100%;
transform: rotate(45deg);
z-index: 2;
}

View File

@ -117,7 +117,8 @@ Page({
identityObj: {
1: {
text: "中介认证",
bgcolor: "rgba(46, 207, 226, 1)",
// bgcolor: "rgba(46, 207, 226, 1)",
bgcolor: "#9EB1F6",
},
0: {
text: "发布房源",
@ -133,9 +134,7 @@ Page({
newmessagenum: 0,
validityidentity: "", // 中介有效日期
failPopState: false, // 提交失败的弹窗状态
QRCodePopState: false, // 客服弹窗的状态
},
launchAppError(e) {
@ -861,7 +860,7 @@ Page({
landlordcertification: data.landlordcertification,
user: data.user,
newmessagenum: data.newmessagenum,
validityidentity: data.validityidentity,
validityidentity: data.validityidentity || '',
initState: true,
loding: false,
tab
@ -1165,7 +1164,6 @@ Page({
const index = e.currentTarget.dataset.index || 0
let target = this.data.fav.data[index]
console.log("index", index, "target", target);
const baseURL = app.globalData.baseURL
miucms.request(baseURL + '/tenement/v2/api/user/apartmentCollection', {
@ -1176,18 +1174,21 @@ Page({
target['collectnum'] = data.count
this.data.fav.data.splice(index, 1)
this.data.fav.count = this.data.fav.count - 1
this.setData({
fav: this.data.fav
})
wx.showToast({
icon: "none",
title: res.message,
})
})
},
// 切换客服状态
CutQRCodePopState() {
this.setData({
QRCodePopState: !this.data.QRCodePopState
})
},
})

View File

@ -7,6 +7,7 @@
"fix-footer": "../../template/fixFooter/fixFooter",
"announcement-popup": "../../template/announcementPopup/announcementPopup",
"common-list": "/template/commonList/commonList",
"choice-type-release": "/template/choiceTypeRelease/choiceTypeRelease"
"choice-type-release": "/template/choiceTypeRelease/choiceTypeRelease",
"QRCodePop": "/template/QRCodePop/QRCodePop"
}
}

View File

@ -26,9 +26,14 @@
<view class="header-user-uid flexacenter">UID{{ user.uid }}</view>
</view>
</view>
<view class="service-box flexacenter" bind:tap="CutQRCodePopState">
<image class="service-icon" src="https://app.gter.net/image/miniApp/HKRenting/service-icon.png" mode="widthFix"></image>
客服
</view>
<!-- <button open-type="contact" class='contact' bindcontact="bindcontact">
<image class="contact-icon" src="/img/u1872.png" mode="widthFix"></image>
反馈</button> -->
<image class="contact-icon" src="/img/u1872.png" mode="widthFix"></image>
反馈
</button> -->
</view>
<view class="header-btn flexacenter">
<view class="header-btn-item flex1 flexcenter" bindtap="goMessageReminding" data-url="/pages/messageCenter/messageCenter">
@ -146,4 +151,6 @@
<!-- <fix-footer user="1" unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer> -->
<fix-footer user="1" unreadMessages="{{ newmessagenum }}" bottomLift="{{ bottomLift }}"></fix-footer>
<choice-type-release bindsetValue="setValue" choiceTypeState="{{ choiceTypeState }}" housingnum="{{ housingnum }}" identityList="{{ identityList }}"></choice-type-release>
<choice-type-release bindsetValue="setValue" choiceTypeState="{{ choiceTypeState }}" housingnum="{{ housingnum }}" identityList="{{ identityList }}"></choice-type-release>
<QRCodePop wx:if="{{ QRCodePopState }}" bindclosePop="CutQRCodePopState" typee="user"></QRCodePop>

View File

@ -771,4 +771,20 @@
.empty-box {
margin-bottom: 24rpx;
}
.service-box {
width: 108rpx;
height: 52rpx;
background-color: rgba(242, 242, 242, 1);
border-radius: 42rpx 0 0 42rpx;
font-size: 21rpx;
padding-left: 19.5rpx;
}
.service-box .service-icon {
width: 27rpx;
height: 27rpx;
margin-right: 7.5rpx;
vertical-align: middle;
}

View File

@ -28,7 +28,8 @@ Page({
liveIndex: 0,
tab: 'video',
currentTime: 0,
loop: false
loop: false,
videoLoading: true, // 视频组件 是否加载中
},
/**
@ -150,5 +151,12 @@ Page({
})
},
bindloadedmetadata(e) {
console.log(e, "e");
this.setData({
videoLoading: false
})
}
})

View File

@ -27,7 +27,10 @@
<block wx:for="{{ attachment }}" wx:key="index">
<swiper-item>
<view class="img-box">
<video src="{{ item.video || item.videourl }}" id="video{{ index }}" data-index="{{ index }}" wx:if="{{ (item.video || item.videourl) && index == current }}"></video>
<video src="{{ item.video || item.videourl }}" class="flexcenter" id="video{{ index }}" data-index="{{ index }}" wx:if="{{ (item.video || item.videourl) && index == current }}" bindloadedmetadata="bindloadedmetadata" show-center-play-btn="{{ false }}" autoplay="{{ true }}">
<cover-image wx:if="{{videoLoading}}" class="load" src="/img/load.png"></cover-image>
</video>
<image wx:else show-menu-by-longpress src="{{ current == index ? item.image : '' }}" bindload='load' lazy-load class="slide-image" mode="widthFix" />
<!-- <image wx:if="{{ !(item.video || item.videourl) }}" src="{{ item.image }}" bindload='load' class="slide-image" mode="widthFix" />

View File

@ -1,108 +1,142 @@
/* pages/video_show/video_show.wxss */
.video-box{
width: 100vw;
height: 100vh;
z-index: 100000;
background: rgba(0,0,0,0.8);
position: fixed;
left: 0;
top:0;
.video-box {
width: 100vw;
height: 100vh;
z-index: 100000;
background: rgba(0, 0, 0, 0.8);
position: fixed;
left: 0;
top: 0;
}
.video-box .close{
position: fixed;
left: 20rpx;
top: 20rpx;
width: 50rpx;
height: 50rpx;
z-index: 1000000
.video-box .close {
position: fixed;
left: 20rpx;
top: 20rpx;
width: 50rpx;
height: 50rpx;
z-index: 1000000
}
.video-box video{
/* margin: calc(50vh - 120px) auto;
.video-box video {
/* margin: calc(50vh - 120px) auto;
display: block; */
width: 100vw;
height: 100vh;
}
.cover{
position: fixed;
left: 5px;
top: 0;
display: flex;
justify-content: center;
align-items: center;
box-sizing: border-box;
}
.image{
width: 30rpx;
height: 30rpx;
}
.inner{
border:1px solid #aaa;
background: rgba(0,0,0,0.2);
display: inline-flex;
justify-content: center;
align-items: center;
border-radius: 50%;
width: 100vw;
height: 100vh;
}
.video-img-box{
background: #000;
width: 100vw;
height: 100vh;
color: #fff;
overflow: hidden;
/* position: fixed; */
left: 0;
top: 0
.cover {
position: fixed;
left: 5px;
top: 0;
display: flex;
justify-content: center;
align-items: center;
box-sizing: border-box;
}
.video-img-box .tab{
display: flex;
font-size: 28rpx;
height: 100rpx;
.image {
width: 30rpx;
height: 30rpx;
}
.video-img-box .tab .item{
display: inline-flex;
flex: 1;
color: #e8e8e8;
align-items: center;
justify-content: center;
font-weight: 400
.inner {
border: 1px solid #aaa;
background: rgba(0, 0, 0, 0.2);
display: inline-flex;
justify-content: center;
align-items: center;
border-radius: 50%;
}
.video-img-box .tab .item.active{
font-weight: bold;
font-size: 32rpx;
color: #fff;
.video-img-box {
background: #000;
width: 100vw;
height: 100vh;
color: #fff;
overflow: hidden;
/* position: fixed; */
left: 0;
top: 0
}
.video-img-box .content{
/* position: absolute; */
left: 0;
top: 50%;
/* transform: translateY(-50%); */
width: 100vw;
}
.img-box{
width: 100vw;
height: 100%;
display: flex;
align-items: center;
.video-img-box .tab {
display: flex;
font-size: 28rpx;
height: 100rpx;
}
.img-box image{
display: block;
width: 100vw;
.video-img-box .tab .item {
display: inline-flex;
flex: 1;
color: #e8e8e8;
align-items: center;
justify-content: center;
font-weight: 400
}
.img-box video{
display: block;
margin: 0 auto;
width: 100vw;
/* max-height: 70vh; */
/* position: static !important; */
position: fixed;
/* top: 50%;
.video-img-box .tab .item.active {
font-weight: bold;
font-size: 32rpx;
color: #fff;
}
.video-img-box .content {
/* position: absolute; */
left: 0;
top: 50%;
/* transform: translateY(-50%); */
width: 100vw;
}
.img-box {
width: 100vw;
height: 100%;
display: flex;
align-items: center;
}
.img-box image {
display: block;
width: 100vw;
}
.img-box video {
display: block;
margin: 0 auto;
width: 100vw;
/* max-height: 70vh; */
/* position: static !important; */
position: fixed;
/* top: 50%;
left: 50%; */
/* transform: translate(-50%,-50%); */
/* transform: translate(-50%,-50%); */
}
.img-box .load {
z-index: 9999999;
width: 80rpx;
height: 80rpx;
color: #fff;
position: absolute;
top: calc(50% - 40rpx);
left: calc(50% - 40rpx);
/* transform: translate(-50%, -50%); */
animation: rotate 3s linear infinite;
/* 使用动画效果实现无限旋转 */
/* background: aquamarine; */
}
@keyframes rotate {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

View File

@ -0,0 +1,57 @@
// template/QRCodePop/QRCodePop.js
const app = getApp()
Component({
/**
* 组件的属性列表
*/
properties: {
typee: {
type: String,
observer(res) {
const wechat = app.globalData.wechat || {}
let name = ""
let titleUrl = ""
let QRCodeUrl = ""
let nameUrl = ""
if (res == "irent") {
name = wechat.nickname
titleUrl = "https://app.gter.net/image/miniApp/HKRenting/welcome-icon.png"
nameUrl = "https://app.gter.net/image/miniApp/HKRenting/wechat-name-icon.svg"
QRCodeUrl = wechat.wechatqrcode
} else {
name = wechat.MrFang.name
titleUrl = "https://app.gter.net/image/miniApp/HKRenting/service-title.png"
nameUrl = "https://app.gter.net/image/miniApp/HKRenting/service-name-icon.png"
QRCodeUrl = wechat.MrFang.qrcode
}
this.setData({
name,
titleUrl,
QRCodeUrl,
nameUrl,
})
}
}
},
/**
* 组件的初始数据
*/
data: {
name: "",
nameUrl: "",
titleUrl: "",
QRCodeUrl: "",
},
/**
* 组件的方法列表
*/
methods: {
closePop() {
this.triggerEvent("closePop")
}
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -0,0 +1,19 @@
<!--template/QRCodePop/QRCodePop.wxml-->
<view class="pop flexflex" bind:tap="closePop">
<view class="pop-box flexacenter" catch:tap="return">
<image class="pop-title" src="{{ titleUrl }}" mode="widthFix"></image>
<view class="pop-wechat-name flexcenter">
<image wx:if="{{ typee == 'irent' }}" class="pop-wechat-icon" mode="widthFix" src="/img/wechat-name-icon.png"></image>
<image wx:else class="pop-wechat-icon1" mode="widthFix" src="https://app.gter.net/image/miniApp/HKRenting/service-name-icon.png"></image>
{{ name }}
</view>
<view class="pop-code-box flexcenter {{ typee=='user' ? 'pop-code-box1' : ''}}">
<view class="pop-code flexcenter">
<image class="pop-code-img" mode="widthFix" src="{{ QRCodeUrl }}" show-menu-by-longpress></image>
</view>
<view class="pop-text">长按识别二维码</view>
</view>
<image class="pop-bottom1" src="https://app.gter.net/image/miniApp/HKRenting/bottom2.svg" mode="widthFix"></image>
<image class="pop-bottom2" src="https://app.gter.net/image/miniApp/HKRenting/bottom1.svg" mode="widthFix"></image>
</view>
</view>

View File

@ -0,0 +1,111 @@
@import '/css/common.wxss';
.pop {
position: fixed;
top: 0;
width: 100vw;
height: 100vh;
background-color: rgba(0, 0, 0, 0.717647058823529);
z-index: 1004;
flex-direction: column;
justify-content: flex-end;
}
.pop .pop-box {
align-items: center;
flex-direction: column;
/* height: 891rpx; */
padding-top: 90rpx;
background: -webkit-linear-gradient(270deg, rgba(244, 244, 244, 1) -1%, rgba(247, 250, 255, 1) 100%);
background: -moz-linear-gradient(180deg, rgba(244, 244, 244, 1) -1%, rgba(247, 250, 255, 1) 100%);
background: linear-gradient(180deg, rgba(244, 244, 244, 1) -1%, rgba(247, 250, 255, 1) 100%);
border-radius: 30rpx 30rpx 0 28.5rpx;
-moz-box-shadow: 0 0 22.5rpx rgba(0, 0, 0, 0.101960784313725);
-webkit-box-shadow: 0 0 22.5rpx rgba(0, 0, 0, 0.101960784313725);
box-shadow: 0 0 22.5rpx rgba(0, 0, 0, 0.101960784313725);
}
.pop .pop-box .pop-title {
width: 331.5rpx;
height: 72rpx;
margin-bottom: 27rpx;
}
.pop .pop-box .pop-wechat-name {
color: #333;
font-size: 27rpx;
font-weight: 400;
margin-bottom: 54rpx;
}
.pop .pop-box .pop-wechat-icon {
width: 33rpx;
height: 33rpx;
margin-right: 6rpx;
}
.pop .pop-box .pop-wechat-icon1 {
width: 27rpx;
height: 27rpx;
margin-right: 6rpx;
}
.pop .pop-box .pop-code-box {
flex-direction: column;
padding: 30rpx;
background: -webkit-linear-gradient(90deg, rgba(44, 25, 109, 1) -1%, rgba(253, 223, 109, 1) 99%);
background: -moz-linear-gradient(0deg, rgba(44, 25, 109, 1) -1%, rgba(253, 223, 109, 1) 99%);
background: linear-gradient(0deg, rgba(44, 25, 109, 1) -1%, rgba(253, 223, 109, 1) 99%);
border-radius: 30rpx;
-moz-box-shadow: 0 0 22.5rpx rgba(0, 0, 0, 0.176470588235294);
-webkit-box-shadow: 0 0 22.5rpx rgba(0, 0, 0, 0.176470588235294);
box-shadow: 0 0 22.5rpx rgba(0, 0, 0, 0.176470588235294);
position: relative;
z-index: 1;
margin-bottom: 121.5rpx;
}
.pop .pop-box .pop-code-box.pop-code-box1 {
background: -webkit-linear-gradient(90deg, rgba(41, 24, 108, 1) -1%, rgba(146, 120, 212, 1) 101%);
background: -moz-linear-gradient(-1.4210854715202E-14deg, rgba(41, 24, 108, 1) -1%, rgba(146, 120, 212, 1) 101%);
background: linear-gradient(-1.4210854715202E-14deg, rgba(41, 24, 108, 1) -1%, rgba(146, 120, 212, 1) 101%);
}
.pop .pop-box .pop-code {
width: 360rpx;
height: 360rpx;
background-color: #fff;
border-radius: 9rpx;
margin-bottom: 30rpx;
}
.pop .pop-box .pop-code .pop-code-img {
width: 330rpx;
height: 330rpx;
}
.pop .pop-box .pop-text {
color: #fff;
letter-spacing: 1rpx;
font-size: 24rpx;
line-height: 42rpx;
}
.pop .pop-box .pop-bottom1,
.pop .pop-box .pop-bottom2 {
width: 750rpx;
position: fixed;
left: 0;
bottom: 0;
}
.pop .pop-box .pop-bottom1 {
height: 232.5rpx;
}
.pop .pop-box .pop-bottom2 {
height: 226.5rpx;
}