Commit e3b20a34 authored by Mac's avatar Mac

修改

parent f1a6bbbe
......@@ -7,9 +7,9 @@
<view class="title">
{{details.BrandName}}
</view>
<view class="tag-box">
<text class="tag1" style="width: 30px;">2021</text>
<text class="tag2" style="width: 30px;">首店</text>
<view class="tag-box" v-if="details.FirstShopYear!=null && details.FirstShopYear!=''">
<view class="tag1" style="width: 30px;">{{details.FirstShopYear}}</view>
<view class="tag2" style="width: 30px;">首店</view>
</view>
</view>
<view class="score-box flex item-center" v-if="details.OpenShopWish!=-1">
......@@ -23,49 +23,53 @@
</view>
<view style="width: 100%;" >
<view v-if="!details.VideoUrl || details.VideoUrl==''" class="img-box">
<view v-if="details.BannerList.length==1" v-for="(src,index) in details.BannerList" :key="index" style="width: 100%;">
<image :src="src" style="width: 100%;height: 226rpx;" mode="aspectFill" @click="previewImage(0)"></image>
<view v-if="details.BannerList.length==1" v-for="(src,index) in details.BannerList" :key="index" style="width: 100%;height: 226rpx;">
<image :src="src" style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill" @click="previewImage(0)"></image>
</view>
<view v-if="details.BannerList.length==2" v-for="(src,index) in details.BannerList" :key="index" style="width: calc((100vw - 80rpx - 10rpx)/2);">
<image :src="src" style="width: 100%;height: 226rpx;" mode="aspectFill" @click="previewImage(index)"></image>
<view v-if="details.BannerList.length==2" v-for="(src,index) in details.BannerList" :key="index" style="width: calc((100vw - 80rpx - 10rpx)/2);height: 226rpx;">
<image :src="src" v-if='index==0' style="width: 100%;height: 100%;border-radius: 20rpx 0 0 20rpx" mode="aspectFill" @click="previewImage(index)"></image>
<image :src="src" v-if='index==1' style="width: 100%;height: 100%;border-radius: 0 20rpx 20rpx 0" mode="aspectFill" @click="previewImage(index)"></image>
</view>
<view v-for="(src,index) in details.BannerList" :key="index" v-if="details.BannerList.length>2">
<image :src="src" class="img" mode="aspectFill" v-if="index<3" @click="previewImage(index)"></image>
<view v-for="(src,index) in details.BannerList" :key="index" v-if="details.BannerList.length>2" style="height: 226rpx;">
<image :src="src" class="img" mode="aspectFill" v-if="index==0" @click="previewImage(index)" style="border-radius: 20rpx 0 0 20rpx"></image>
<image :src="src" class="img" mode="aspectFill" v-if="index==1" @click="previewImage(index)"></image>
<image :src="src" class="img" mode="aspectFill" v-if="index==2" @click="previewImage(index)" style="border-radius:0 20rpx 20rpx 0"></image>
</view>
</view>
<view v-else>
<view v-if="details.BannerList.length==1" class="img-box">
<view style="width: calc((100vw - 80rpx - 10rpx)/2);height: 226rpx;position: relative;">
<video id="myVideo" :src="details.VideoUrl" style="width: 100%;height: 100%;"
<video id="myVideo" :src="details.VideoUrl" style="width: 100%;height: 100%;border-radius: 20rpx 0 0 20rpx"
:controls='controls'
:show-center-play-btn='false'
:show-fullscreen-btn='false'
@fullscreenchange='videoControl'
></video>
<view @click="enlarge(details.VideoUrl)" style="position: absolute;left: 50%;top: 50%;margin-top: -15rpx;margin-left: -15rpx;width: 30rpx;height: 30rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
<view @click="enlarge(details.VideoUrl)" style="position: absolute;left: 50%;top: 50%;margin-top: -30rpx;margin-left: -30rpx;width: 60rpx;height: 60rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616471847000_345.png" style="width: 37rpx;height: 44rpx;" mode=""></image>
</view>
</view>
<view v-for="(src,index) in details.BannerList" :key="index" style="width: calc((100vw - 80rpx - 10rpx)/2);">
<image :src="src" style="width: 100%;height: 226rpx;" mode="aspectFill" @click="previewImage(index)"></image>
<view v-for="(src,index) in details.BannerList" :key="index" style="width: calc((100vw - 80rpx - 10rpx)/2);height: 226rpx;">
<image :src="src" style="width: 100%;height: 100%;border-radius: 0 20rpx 20rpx 0" mode="aspectFill" @click="previewImage(index)"></image>
</view>
</view>
<view v-if="details.BannerList.length>1" class="img-box">
<view style="width: calc((100vw - 80rpx - 20rpx)/3);height: 226rpx;position: relative;">
<video id="myVideo" :src="details.VideoUrl" style="width: 100%;height: 100%;"
<video id="myVideo" :src="details.VideoUrl" style="width: 100%;height: 100%;border-radius: 20rpx 0 0 20rpx"
:controls='controls'
:show-center-play-btn='false'
:show-fullscreen-btn='false'
@fullscreenchange='videoControl'
></video>
<view @click="enlarge(details.VideoUrl)" style="position: absolute;left: 50%;top: 50%;margin-top: -15rpx;margin-left: -15rpx;width: 30rpx;height: 30rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
<view @click="enlarge(details.VideoUrl)" style="position: absolute;left: 50%;top: 50%;margin-top: -30rpx;margin-left: -30rpx;width: 60rpx;height: 60rpx;border-radius: 20rpx;background-color: rgba(255,255,255,.4);display: flex;align-items: center;justify-content: center;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616471847000_345.png" style="width: 37rpx;height: 44rpx;" mode=""></image>
</view>
</view>
<view v-for="(src,index) in details.BannerList" :key="index" style="width: calc((100vw - 80rpx - 10rpx)/3);" v-if="index<2">
<image :src="src" style="width: 100%;height: 226rpx;" mode="aspectFill" @click="previewImage(index)"></image>
<view v-for="(src,index) in details.BannerList" :key="index" style="width: calc((100vw - 80rpx - 10rpx)/3);height: 226rpx;" v-if="index<2">
<image :src="src" style="width: 100%;height: 100%;" v-if="index==0" mode="aspectFill" @click="previewImage(index)"></image>
<image :src="src" style="width: 100%;height: 100%;border-radius:0 20rpx 20rpx 0" v-if="index==1" mode="aspectFill" @click="previewImage(index)"></image>
</view>
</view>
</view>
......@@ -471,7 +475,8 @@
direction: 0
})
},
videoControl(e) {
brandvideoControl(e) {
console.log(e)
if (e.detail.fullScreen == false) {
this.videoContext.stop()
this.controls = false
......
......@@ -14,7 +14,7 @@
width: 54rpx;
height: auto;
}
#myVideo{
#myVideo2{
width: 150px; height: 200px;
}
.bottom-border{
......@@ -153,19 +153,19 @@
</u-upload>
</view>
<view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;">
<text>载体视频</text>
<text>品牌视频</text>
</view>
<view style="margin-bottom: 30rpx;">
<view style="width: 150px; height: 200px;position: relative;margin-right: 20px;" v-if="model.VideoUrl!=''">
<video id="myVideo" :src="model.VideoUrl" style="width: 150px; height: 200px;"
<video id="myVideo2" :src="model.VideoUrl" style="width: 150px; height: 200px;"
:controls='controls'
:show-center-play-btn='false'
:show-fullscreen-btn='false'
@fullscreenchange='videoControl' ></video>
:show-center-play-btn='true'
:show-fullscreen-btn='true'
></video>
<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;" @click="enlarge()">
<!-- <view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;" @click="enlarge(model.VideoUrl)">
<u-icon name="play-circle-o" :size="70" color="#FFF"></u-icon>
</view>
</view> -->
<view style="width: 50rpx;height: 50rpx;position: absolute;right: 10rpx;top:10rpx;
border-radius: 25rpx;
background: #F30329;
......@@ -345,6 +345,7 @@
mainColor:'',
action: this.host2 + "/api/File/UploadTencent",
fileList:[],
controls:true,
params: {
year: true,
month: true,
......@@ -520,20 +521,23 @@
});
},
enlarge(file) {
// 全屏
this.videoContext = uni.createVideoContext('myVideo');
this.videoContext = uni.createVideoContext('myVideo2');
this.videoContext.requestFullScreen({
direction:0
})
},
videoControl(e){
console.log(e)
if(e.detail.fullScreen==false){
this.videoContext.stop()
this.controls=false
// this.controls=false
}else{
this.videoContext.play()
this.controls=true
// this.controls=true
}
},
upvideo() {
......
......@@ -106,13 +106,12 @@
<view style="width: 150px; height: 200px;position: relative;margin-right: 20px;" v-if="model.VideoUrl!=''">
<video id="myVideo" :src="model.VideoUrl" style="width: 150px; height: 200px;"
:controls='controls'
:show-center-play-btn='false'
:show-fullscreen-btn='false'
@fullscreenchange='videoControl' ></video>
:show-center-play-btn='true'
:show-fullscreen-btn='true' ></video>
<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;" @click="enlarge()">
<!-- <view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;" @click="enlarge()">
<u-icon name="play-circle-o" :size="70" color="#FFF"></u-icon>
</view>
</view> -->
<view style="width: 50rpx;height: 50rpx;position: absolute;right: 10rpx;top:10rpx;
border-radius: 25rpx;
background: #F30329;
......@@ -233,6 +232,7 @@
data(){
return{
mainColor:'',
controls:true,
action: this.host2 + "/api/File/UploadTencent",
fileList:[],
params: {
......
......@@ -104,7 +104,11 @@
methods: {
// 获取载体分页列表
getCarrierPageList(){
getCarrierPageList(type=0){
if(type==1 || type==2){
this.msg.pageIndex=1;
this.dataList = []
}
let parms = {
url: "/api/AppletTrade/GetMyWishPageList",
data:this.msg
......@@ -112,6 +116,7 @@
this.request2(parms, (res) => {
this.loading = false;
if (res.resultCode == 1) {
this.dataList = this.dataList.concat(res.data.pageData);
this.pageCount = res.data.pageCount
if (this.pageCount == 1) {
......@@ -132,7 +137,6 @@
}
},
goDetail(id){
console.log(id)
uni.navigateTo({
url: '/pages/kotra/wish/detail?Id='+id
})
......
......@@ -228,7 +228,9 @@
if(that.type==3){//1列表为新增时 2列表修改 3详情修改
beforePage.$vm.getdetails(); // 执行前一个页面的方法
}else if(that.type==1){
beforePage.$vm.getCarrierPageList();
beforePage.$vm.getCarrierPageList(that.type);
}else if(that.type==2){
beforePage.$vm.getCarrierPageList(that.type);
}
}
});
......
......@@ -191,6 +191,7 @@
.jz_TripMain {
position: relative;
overflow: hidden;
margin-bottom: 50px;
}
.jz_TripTitle {
......
......@@ -16,7 +16,7 @@
<view class='topheard' :style="{'margin-top':modelstype==0?'52px':(modelstype==1?'37px':(modelstype==2)?'33px':0) }"
v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" shape="circle" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx">
<view style="display: flex;flex-direction: column;justify-content: center;height: 60px;margin-left: 20rpx">
<Text class="nickname" style="color: #FFF;font-size: 40rpx;font-weight:800;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
@click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<!-- 判断是甲鹤小程序 -->
......@@ -63,6 +63,25 @@
<view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag text="甲鹤学员" bg-color='#40766E' color='#FFF' size='mini' border-color='#40766E'/>
</view>
<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea==1 && user_info.nickname">
<view class="renzhen" v-if="companyStatus==1 " >
未认证
</view>
<view class="renzhen" v-if="companyStatus==2 " >
认证未完善
</view>
<view class="renzhen" v-if="companyStatus==3" :style="{'border':'1px solid '+mainColor,'color':mainColor}">
认证审核中
</view>
<view class="renzhen" v-if="companyStatus==4 " >
未通过
</view>
<view style="margin-top: 10px;" v-if="companyStatus==5">
<image v-if="FirstShopType==1" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image>
<image v-if="FirstShopType==2" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image>
</view>
</view>
</view>
<view class="top_b">
<view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/favorite/favorite')">
......
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