Skip to content

M
mallapp
Commit 2d2b0d92 authored by Mac's avatar Mac
Browse files
Options

1

parent 15c735d1
Show whitespace changes
Inline Side-by-side
Showing with 524 additions and 4 deletions
components/miaiactivityCustom/index.vue 0 → 100644
View file @ 2d2b0d92
<template>
<div class="goods-box" :class="{ flex: goods.catPosition == 'left' }">
<div :class="{ 'right-slider': goods.catPosition == 'top' }">
<!-- 只是商品 -->
<template>
<!--列表模式-->
<style6 v-if="goods.listStyle == -1" :goods-info="goods"></style6>
<!--左右滚动-->
<style5 v-if="goods.listStyle == 0" :goods-info="goods"></style5>
<!--一行一个-->
<style1 v-if="goods.listStyle == 1" :goods-info="goods"></style1>
</template>
</div>
</div>
</template>
<script>
import style1 from './style1';
import style5 from './style5';
import style6 from './style6';
export default {
props: ['goods'],
components: {
style1,
style5,
style6,
},
data() {
return {
mainColor: '',
currentList: [],
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
if (this.goods.showCat) {
this.currentList = this.goods.catList[0].goodsList;
} else {
this.currentList = this.goods.list;
}
},
methods: {
}
};
</script>
<style>
.style4View {
display: inline-block;
width: 100%;
padding-left: 80px;
box-sizing: border-box;
}
.goods-box {
/* margin: 20rpx 0; */
}
.goods-box .tips {
z-index: 50 !important;
}
.goods-box.flex {
display: flex;
}
.goods-box.flex .left-slider {
width: 80px;
position: absolute;
}
.goods-box.flex .right-slider {
flex: 1;
width: 1rpx;
}
.defaultz .van-sticky {
z-index: 1 !important;
}
.goods-box .van-tabs__scroll {
background: none;
}
.goods-box ._div {
width: 100%;
}
</style>
components/miaiactivityCustom/style1.vue 0 → 100644
View file @ 2d2b0d92
<template>
<div :style="{
'background-color': goodsInfo.backgroundColor,
'paddingLeft':goodsInfo.PaddingLeft+'px',
'paddingRight':goodsInfo.PaddingRight+'px',
'paddingTop':goodsInfo.PaddingTop+'px',
'paddingBottom':goodsInfo.PaddingBottom+'px'
}">
<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
}">
<image style="
width: calc(100vw - 24px);
height: 100vw;
border-radius: 10rpx 10rpx 0 0;
"
mode='aspectFill' :src="item.picUrl" />
<div class="good-info">
<div class="good-name" v-if="item.name">{{ item.name }}</div>
<div>
<view style="display:inline-block;padding: 2px 4px;border-radius: 2px;font-size: 10px;color: #FAF8F9;margin-right:5px"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
</view>
</div>
</div>
</div>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</div>
</template>
<script>
import auth from '@/components/auth/index.vue';
export default {
components: {
auth
},
props: ['goodsInfo'],
data() {
return {
mainColor: '',
showSku: false,
sku: {},
showAuth: false,
u: {},
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
methods: {
openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) {
uni.navigateTo({
url: item.linkUrl,
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
<style>
.good_study_one {
margin: 12px;
position: relative;
border: 1rpx solid transparent;
border-radius: 10rpx;
/* border: 1px solid rgb(226, 226, 226); */
overflow: hidden;
}
.good_study_one .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good_study_one .guding {
position: relative;
}
.good_study_one .guding .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
}
.good_study_one .good-info {
padding: 12rpx;
margin-top: -5px;
}
.good_study_one .good-info .good-name {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin-bottom: 13px;
}
.good_study_one .good-info .good-price-info {
display: flex;
}
.good_study_one .good-info .good-price-info .price {
color: #999999;
font-size: 11px;
flex: 1;
}
.good_study_one .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
</style>
components/miaiactivityCustom/style5.vue 0 → 100644
View file @ 2d2b0d92
<template>
<view style="width:100%;padding: 12px;" :style="{
'background-color': goodsInfo.backgroundColor,
}">
<view class="her_Two_study" :style="{
'padding-top':goodsInfo.PaddingTop+'px',
'padding-right':goodsInfo.PaddingRight+'px',
'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px'
}">
<view class="good-five-stydy" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)">
<view class="img-box">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
</view>
<view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view>
<view style="width: 130px;">
<view class="style_five_label"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
</view>
</view>
</view>
</view>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default {
components: {
auth
},
props: ['goodsInfo'],
data() {
return {
mainColor: '',
showAuth: false,
u: {},
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
mounted(){
},
methods: {
openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) {
uni.navigateTo({
url: item.linkUrl,
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
<style>
.good-five-stydy {
position: relative;
margin-bottom: 14px;
display: flex;
box-sizing: border-box;
padding: 0 1px 1px 0;
width:600px;
}
.good-five-stydy:last-child{
margin-bottom:0!important;
}
.good-five-stydy .img-box {
width: 110px;
height: 70px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-five-stydy .good-info {
height: 70px;
padding: 0 12px ;
flex: 1;
border: 10rpx;
padding-bottom: 0;
display: flex;
flex-direction: column;
justify-content: space-between;
/* width:20%; */
}
.good-five-stydy .good-info .good-name {
font-size: 13px;
margin-bottom:5px;
white-space:pre-wrap;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
width:130px;
}
.good-five-stydy .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: flex-end;
height: 22px;
flex: 1;
padding-bottom: 10rpx;
}
.good-five-stydy .good-info .good-price-info .price {
color: #999999;
flex: 1;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.good-five-stydy .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
.her_Two_study { overflow-x: auto !important; display: flex; white-space: nowrap; }
.style_five_label{
float:left;
padding: 0px 5px;
border-radius: 2px;
height: 18px;
line-height: 18px;
font-size: 10px;
color: #FAF8F9;
margin:0 5px 5px 0;
}
</style>
components/miaiactivityCustom/style6.vue 0 → 100644
View file @ 2d2b0d92
<template>
<view style="width:100%;padding: 12px;" :style="{
'background-color': goodsInfo.backgroundColor,
}">
<view :style="{
'padding-top':goodsInfo.PaddingTop+'px',
'padding-right':goodsInfo.PaddingRight+'px',
'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px'
}">
<view class="good-four-study" v-for="(item, gli) in goodsInfo.list" :key="gli" :style="{'borderRadius':goodsInfo.SearchFilletPX+'px'}" @click="openGood(item)">
<view class="img-box">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
</view>
<view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view>
<view>
<view style="display:inline-block;padding: 2px 4px;border-radius: 2px;font-size: 10px;color: #FAF8F9;margin-right:5px"
:style="{background:mainColor}" v-for="(subItem,subIndex) in item.lableNameList" :key="subIndex">
{{subItem}}
</view>
</view>
</view>
</view>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
export default {
components: {
auth
},
props: ['goodsInfo'],
data() {
return {
mainColor: '',
showAuth: false,
u: {},
};
},
created() {
this.mainColor = this.$uiConfig.mainColor;
},
mounted(){
},
methods: {
openGood(item) {
this.u = uni.getStorageSync('mall_UserInfo');
if (item.linkUrl) {
uni.navigateTo({
url: item.linkUrl,
});
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
}
};
</script>
<style>
.good-four-study {
position: relative;
margin-bottom: 14px;
display: flex;
box-sizing: border-box;
padding: 0 1px 1px 0;
overflow: hidden;
}
.good-four-study:last-child{
margin-bottom:0!important;
}
.good-four-study .img-box {
width: 125px;
height: 70px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-four-study .good-info {
padding: 0 12px 12px 12px;
flex: 1;
width: 1rpx;
border: 10rpx;
padding-bottom: 0;
display: flex;
flex-direction: column;
/* width:20%; */
}
.good-four-study .good-info .good-name {
font-size: 13px;
margin-bottom:5px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.good-four-study .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: flex-end;
height: 22px;
flex: 1;
padding-bottom: 10rpx;
}
.good-four-study .good-info .good-price-info .price {
color: #999999;
flex: 1;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.good-four-study .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
</style>
pages/index/index.vue
View file @ 2d2b0d92
......@@ -18,7 +18,7 @@
<u-icon name="arrow-left" size="44"></u-icon>
</view>
</view>
<view @click='yj' style="width: 200px;height: 50px;">活动</view>
<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> -->
<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
:is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<template v-for="(item, i) in myPageData.home_pages.navs">
......@@ -63,6 +63,8 @@
<matchmaking v-if="d.id == 'miaiuser'" :navs="d.data" :key="di"></matchmaking>
<!-- 相亲活动 -->
<miaiactivitytype v-if="d.id == 'miaiactivitytype'" :goods="d.data"></miaiactivitytype>
<!-- 相亲活动自定义 -->
<miaiactivityCustom v-if="d.id == 'miaiactivityCustom'" :goods="d.data"></miaiactivityCustom>
</template>
</view>
......@@ -123,7 +125,7 @@
import navpage from "@/components/navpage/index";
import matchmaking from "@/components/matchmaking/index"
import miaiactivitytype from "@/components/miaiactivitytype/index"
import miaiactivityCustom from "@/components/miaiactivityCustom/index"
const innerAudioContext = uni.createInnerAudioContext();
export default {
data() {
......@@ -194,7 +196,8 @@
educationteacher,
navpage,
matchmaking,
miaiactivitytype
miaiactivitytype,
miaiactivityCustom
},
onLoad(options) {
let that = this;
......@@ -1129,7 +1132,7 @@
},
yj(){
uni.navigateTo({
url: '/pages/kotra/baomingorder'
url: '/pages/blindDate/personal/mydate'
})
}
},
......
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