Skip to content

M
mallapp
Commit 36797e48 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

parents b993b097 b210fa05
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 792 additions and 244 deletions
pages/kotra/activeSignUp.vue
View file @ 36797e48
This diff is collapsed.
pages/kotra/billboard/billboarddetails.vue
View file @ 36797e48
......@@ -144,6 +144,31 @@
}
}
.cans_c{
width: 100%;
display: flex;
align-items: flex-start;
margin-bottom: 15px;
.cans_c_l{
width: 100px;
font-size: 12px;
color: #FFFFFF;
}
.cans_c_r{
width: 1px;
flex:1;
font-size: 13px;
color: #FFFFFF;
font-weight: bold;
}
}
.img{
width: 190rpx ;
height: 190rpx ;
margin-bottom: 10px;
margin: 0 5px;
}
}
}
.btn_bm{
......@@ -210,7 +235,7 @@
</view>
</view>
<view class="box_conent_basic" v-if="detailsData.ListState==3">
<view class="box_conent_basic" v-if="detailsData && detailsData.ListState==3">
<view class="box_conent_basic_img">
<view class="box_conent_basic_img_t">评比结果</view>
</view>
......@@ -242,10 +267,70 @@
</view>
</view>
</view>
<view v-if="detailsData && detailsData.ListState==1 &&type==2 && detailsData.EnrollList.length>0">
<view class="box_conent_basic" v-for="(x,y) in detailsData.EnrollList">
<view class="box_conent_basic_img">
<view class="box_conent_basic_img_t">参数内容</view>
</view>
<view class="box_conent_basic_c" style="padding: 0 5px;" >
<view class="cans_c">
<view class="cans_c_l">参与品牌:</view>
<view class="cans_c_r">{{x.ObjectName}}</view>
</view>
<view v-for="(item,index) in x.Content" :key='index' class="cans_c">
<!-- 图片 -->
<view v-if="item.CompKey=='ImageUploadComp' && item.CompData.FileList && item.CompData.FileList.length>0">
<view style="display: flex;flex-wrap: wrap;"
v-for="(src, sindex) in item.CompData.FileList"
:key="sindex"
>
<image
:src="src"
class="img"
mode="aspectFill"
@click="previewImage(sindex,item.CompData.FileList)"
style="border-radius: 10rpx"
></image>
</view>
</view>
<!-- 视频 -->
<view v-if="item.CompKey=='VideoUploadComp'&& item.CompData.FileList && item.CompData.FileList.length>0">
<view style="width:100%; height: 320rpx;position: relative;margin-bottom: 10px;" v-for="(x,y) in FileList" :key="y">
<video class="mmyVideo" :id="'myVideo'+y" :src="x" controls='true'
></video>
<!-- <view
style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;"
@click="enlarge('myVideo'+y)">
<u-icon name="play-circle-o" :size="70" color="#FFF"></u-icon>
</view> -->
</view>
</view>
<view style="display: flex;align-items: flex-start;width: 100%;" v-if="(item.CompKey=='SingleLineText' || item.CompKey=='MultiLineText')&& item.CompData.TextValue && item.CompData.TextValue!=''">
<view class="cans_c_l">{{item.CompData.Name}}:</view>
<view class="cans_c_r">{{item.CompData.TextValue}}</view>
</view>
<view style="display: flex;align-items: flex-start;width: 100%;" v-if="(item.CompKey=='DorpDownList' )&& item.CompData.OptionValue && item.CompData.OptionValue!=''">
<view class="cans_c_l">{{item.CompData.Name}}:</view>
<view class="cans_c_r">{{getDorpDownData(item.CompData.OptionValue,item.CompData.OptionList)}}</view>
</view>
</view>
<view class="btn_bm" v-if="detailsData.ListState==1" @click="goeditsignUp(x)">编辑</view>
</view>
</view>
</view>
<view v-if='type==1 && detailsData'>
<view class="btn_bm" v-if="detailsData.ListState==1" @click="gosignUp">立即报名</view>
<view class="btn_bm" style="background: #CCCCCC;" v-if="detailsData.ListState!=1">报名已截止</view>
</view>
<view style="width: 100%;height: 20px;"></view>
<view class="btn_bm" v-if="detailsData.ListState==1" @click="gosignUp">立即报名</view>
<view class="btn_bm" style="background: #CCCCCC;" v-if="detailsData.ListState!=1">报名已截止</view>
</view>
......@@ -258,29 +343,8 @@
return{
Id:0,
detailsData:null,
RankList:[//放榜的模拟数据
{ObjectName:'第一啥子啥子',ObjectIcon:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
{ObjectName:'第一啥子啥子',ObjectIcon:'',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
{ObjectName:'第一啥子啥子',ObjectIcon:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
{ObjectName:'第一啥子啥子',ObjectIcon:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
{ObjectName:'第一啥子啥子',ObjectIcon:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
{ObjectName:'第一啥子啥子',ObjectIcon:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
{ObjectName:'第一啥子啥子',ObjectIcon:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
Reviews:'评语傻还是得',MedalImage:'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616569835000_708.png',
},
]
RankList:[],
type:1,//1位列表过来的 2 为自己报名列表过来的
}
},
onLoad(options) {
......@@ -299,6 +363,9 @@
this.Id = options.Id
this.getDetails()
}
if(options && options.type){
this.type = options.type
}
},
methods:{
getDetails(){
......@@ -315,6 +382,13 @@
uni.hideLoading()
if (res.resultCode == 1) {
this.detailsData = res.data
if(this.detailsData.EnrollList && this.detailsData.EnrollList.length>0){
this.detailsData.EnrollList.forEach(x=>{
x.Content = JSON.parse(x.Content)
})
console.log(this.detailsData.EnrollList)
}
}
})
},
......@@ -328,6 +402,51 @@
url: "/pages/kotra/billboard/listsignUp?formData="+encodeURIComponent(JSON.stringify(data)),
});
},
goeditsignUp(data){
data.template_message_list = this.detailsData.template_message_list;
data.ListId = this.detailsData.Id;
console.log(data)
uni.navigateTo({//编码
url: "/pages/kotra/billboard/listsignUp?formData="+encodeURIComponent(JSON.stringify(data)),
});
},
previewImage(i,list) {
console.log(i);
uni.previewImage({
urls: list,
current: i,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
success: function (data) {},
fail: function (err) {
console.log(err.errMsg);
},
},
});
},
getDorpDownData(value,list){
let data = value.split(',')
console.log(data,list)
let text = ''
data.forEach((x,y)=>{
list.map(j=>{
if(j.Id==x){
if(y+1==data.length){
text =text+ j.Name
}else{
text = text+j.Name+'、'
}
return
}
})
})
console.log(text)
return text
}
}
}
......
pages/kotra/billboard/components/ld-select.vue
View file @ 36797e48
......@@ -107,7 +107,8 @@
created() {
if(this.multiple == true){
this.value = []
}
}
console.log(this.list,'list')
},
methods: {
get_value(val){ // 将数组值转换为以,隔开的字符串
......@@ -228,10 +229,10 @@
background-color: #FFFFFF;
}
.text-blue{
color: #0081ff;
color: #606266;
}
.text-green{
color: #39b54a;
color: #2979ff;
}
.input {
display: flex;
......
pages/kotra/billboard/listsignUp.vue
View file @ 36797e48
This diff is collapsed.
pages/kotra/billboard/mybillbordList.vue
View file @ 36797e48
......@@ -216,7 +216,7 @@
},
godetails(x){//跳转到详情
uni.navigateTo({
url: "/pages/kotra/billboard/billboarddetails?Id="+x.Id,
url: "/pages/kotra/billboard/billboarddetails?Id="+x.Id+"&type=2",
});
}
}
......
pages/kotra/billboard/plugin/pictureUpload.vue
View file @ 36797e48
......@@ -11,6 +11,7 @@
:file-list="fileList"
@on-success="uploadSuccessHandler"
></u-upload>
<view style="width: 100%;height: 1px;background: #e2e2e2;"></view>
<view class="single_Remark" v-if="CompData.Remark">{{CompData.Remark}}</view>
</view>
</template>
......@@ -28,7 +29,17 @@
created() {
let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId : 1;
this.action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
if(this.CompData.FileList.length>0){
this.fileList=[]
this.CompData.FileList.forEach(x=>{
let obj={
url:x
}
this.fileList.push(obj)
})
}
},
methods:{
uploadSuccessHandler(data, index, lists) {
......
pages/kotra/billboard/plugin/videoUpload.vue
View file @ 36797e48
......@@ -24,7 +24,7 @@
<u-icon class="u-icon" name="cross" size="30" color="#ffffff"></u-icon>
</view>
</view>
<view>
<view style="border-bottom: 1px solid #e2e2e2;padding-bottom: 10px;">
<view slot="addBtn" class="slot-btn" @click="upvideo()" v-if="FileList.length<CompData.FileCount">
<image class="image"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616573063000_398.png"
......
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