Skip to content

M
mallapp
Commit e683e766 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 337412c8
Show whitespace changes
Inline Side-by-side
Showing with 902 additions and 901 deletions
components/goods/style1.vue
View file @ e683e766
<template>
<div
:style="{
<div :style="{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
<div
v-for="(item, gli) in goodList"
:key="gli"
class="good-one"
@click="openGood(item)"
:style="{
}">
<div v-for="(item, gli) in goodList" :key="gli" class="good-one" @click="openGood(item)" :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<div class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></div>
<image
style="width: calc(100vw - 24px); height: 66vw;"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
v-if="goodsInfo.goodsCoverProportion == '3-2'"
/>
<image
style="
}">
<div class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" />
</div>
<image style="width: calc(100vw - 24px); height: 66vw;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl" v-if="goodsInfo.goodsCoverProportion == '3-2'" />
<image style="
width: calc(100vw - 24px);
height: 100vw;
border-radius: 10rpx 10rpx 0 0;
"
v-if="goodsInfo.goodsCoverProportion == '1-1'"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
v-if="goodsInfo.goodsCoverProportion == '1-1'" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
<div class="good-info">
<div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</div>
<div class="good-price-info">
......@@ -42,20 +28,12 @@
<span class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="{
<u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="{
'backgroundColor':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ?'#FFF' : goodsInfo.buttonColor ,
'color':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
}"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else>
{{ goodsInfo.buyBtnText }}
</u-button>
......@@ -63,17 +41,21 @@
</div>
</div>
</div>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</div>
</template>
<script>
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
components: {
goodSku,
goodSku2,
......@@ -96,7 +78,9 @@ export default {
},
methods: {
openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
uni.navigateTo({
url: '/pages/goods/goods?GoodsId=' + item.id
});
},
showSkuHandler(g) {
this.sku = g;
......@@ -120,59 +104,67 @@ export default {
this.showAuth = false;
}
}
};
};
</script>
<style>
.good-one {
.good-one {
margin: 12px;
position: relative;
border: 1rpx solid transparent;
border-radius: 10rpx;
padding-bottom: 10rpx;
overflow: hidden;
}
.good-one .tips {
}
.good-one .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good-one .guding {
}
.good-one .guding {
position: relative;
}
.good-one .guding .img-box {
}
.good-one .guding .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
}
.good-one .good-info {
}
.good-one .good-info {
padding: 12rpx;
padding-bottom: 0;
margin-top: -5px;
}
.good-one .good-info .good-name {
}
.good-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-one .good-info .good-price-info {
}
.good-one .good-info .good-price-info {
display: flex;
}
.good-one .good-info .good-price-info .price {
}
.good-one .good-info .good-price-info .price {
color: #ff4544;
font-size: 14px;
flex: 1;
}
.good-one .good-info .good-price-info .buy {
}
.good-one .good-info .good-price-info .buy {
/* width: 24px; */
text-align: right;
}
}
</style>
components/goods/style2.vue
View file @ e683e766
<template>
<view
style="padding: 12px; padding-bottom: 0;"
:style="{
<view style="padding: 12px; padding-bottom: 0;" :style="{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
}">
<u-row gutter="24">
<u-col span="6" v-for="(item, gli) in goodList" :key="gli">
<view
class="good-two"
@click="openGood(item)"
:style="{
<view class="good-two" @click="openGood(item)" :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></view>
}">
<view class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" />
</view>
<view class="img-box">
<view class="img-show">
<image
style="
<image style="
width: 100%;
height: 100%;
border-radius: 10rpx 10rpx 0 0;
"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
</view>
</view>
<view class="good-info">
......@@ -40,19 +32,12 @@
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="{
<u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="{
'backgroundColor':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ?'#FFF' : goodsInfo.buttonColor ,
'color':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
}"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else>
{{ goodsInfo.buyBtnText }}
</u-button>
</view>
......@@ -62,16 +47,20 @@
</u-col>
</u-row>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
components: {
goodSku,
goodSku2,
......@@ -94,7 +83,9 @@ export default {
},
methods: {
openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
uni.navigateTo({
url: '/pages/goods/goods?GoodsId=' + item.id
});
},
showSkuHandler(g) {
this.sku = g;
......@@ -118,33 +109,36 @@ export default {
this.showAuth = false;
}
}
};
};
</script>
<style>
.good-two {
.good-two {
position: relative;
margin-bottom: 12px;
border: 1rpx solid transparent;
border-radius: 10rpx;
overflow: hidden;
padding-bottom: 10rpx;
}
.good-two .tips {
}
.good-two .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good-two .img-box {
}
.good-two .img-box {
width: 100%;
height: 0;
padding-top: 100%;
position: relative;
}
.good-two .img-box .img-show {
}
.good-two .img-box .img-show {
position: absolute;
left: 0;
top: 0;
......@@ -153,23 +147,27 @@ export default {
width: 100%;
height: 100%;
overflow: hidden;
}
.good-two .guding {
}
.good-two .guding {
position: relative;
}
.good-two .guding .img-box {
}
.good-two .guding .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
}
.good-two .good-info {
}
.good-two .good-info {
padding: 6rpx;
margin-top: -5px;
padding-bottom: 0;
}
.good-two .good-info .good-name {
}
.good-two .good-info .good-name {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -178,17 +176,20 @@ export default {
margin: 3px 0;
font-size: 13px;
height: 37px;
}
.good-two .good-info .good-price-info {
}
.good-two .good-info .good-price-info {
display: flex;
}
.good-two .good-info .good-price-info .price {
}
.good-two .good-info .good-price-info .price {
color: #ff4544;
flex: 1;
font-size: 14px;
}
.good-two .good-info .good-price-info .buy {
}
.good-two .good-info .good-price-info .buy {
/* width: 24px; */
text-align: right;
}
}
</style>
components/goods/style3.vue
View file @ e683e766
<template>
<div
style="padding: 12px; padding-bottom: 0;"
:style="{
<div style="padding: 12px; padding-bottom: 0;" :style="{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
}">
<u-row gutter="24">
<u-col span="4" v-for="(item, gli) in goodList" :key="gli">
<div
class="good-three"
@click="openGood(item)"
:style="{
<div class="good-three" @click="openGood(item)" :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<div class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></div>
}">
<div class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" />
</div>
<div class="img-box">
<div class="img-show">
<image
style="
<image style="
width: 100%;
height: 100%;
border-radius: 10rpx 10rpx 0 0;
"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
</div>
</div>
<div class="good-info">
......@@ -41,20 +33,13 @@
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="
<u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="
`backgroundColor:${goodsInfo.buttonColor},color:${
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'
}`
"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else>
{{ goodsInfo.buyBtnText }}
</u-button>
</view>
......@@ -63,17 +48,21 @@
</div>
</u-col>
</u-row>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</div>
</template>
<script>
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
components: {
goodSku,
goodSku2,
......@@ -96,7 +85,9 @@ export default {
},
methods: {
openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
uni.navigateTo({
url: '/pages/goods/goods?GoodsId=' + item.id
});
},
showSkuHandler(g) {
this.sku = g;
......@@ -120,33 +111,36 @@ export default {
this.showAuth = false;
}
}
};
};
</script>
<style>
.good-three {
.good-three {
position: relative;
margin-bottom: 12px;
border: 1rpx solid transparent;
border-radius: 10rpx;
overflow: hidden;
padding-bottom: 5px;
}
.good-three .tips {
}
.good-three .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good-three .img-box {
}
.good-three .img-box {
width: 100%;
height: 0;
padding-top: 100%;
position: relative;
}
.good-three .img-box .img-show {
}
.good-three .img-box .img-show {
position: absolute;
left: 0;
top: 0;
......@@ -155,23 +149,27 @@ export default {
width: 100%;
height: 100%;
overflow: hidden;
}
.good-three .guding {
}
.good-three .guding {
position: relative;
}
.good-three .guding .img-box {
}
.good-three .guding .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
}
.good-three .good-info {
}
.good-three .good-info {
padding: 6rpx;
margin-top: -5px;
padding-bottom: 0;
}
.good-three .good-info .good-name {
}
.good-three .good-info .good-name {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -181,13 +179,15 @@ export default {
font-size: 13px;
word-break: break-all;
height: 37px;
}
.good-three .good-info .good-price-info {
}
.good-three .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: center;
}
.good-three .good-info .good-price-info .price {
}
.good-three .good-info .good-price-info .price {
color: #ff4544;
flex: 1;
font-size: 14px;
......@@ -196,9 +196,10 @@ export default {
overflow: hidden;
display: flex;
flex-direction: column;
}
.good-three .good-info .good-price-info .buy {
}
.good-three .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
}
</style>
components/goods/style4.vue
View file @ e683e766
<template>
<view
style="padding: 12px; padding-bottom: 0;width:100%;min-height:450rpx;"
:style="{
<view style="padding: 12px; padding-bottom: 0;width:100%;min-height:450rpx;" :style="{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
<view
class="good-four"
v-for="(item, gli) in goodList"
:key="gli"
@click="openGood(item)"
:style="{
}">
<view class="good-four" v-for="(item, gli) in goodList" :key="gli" @click="openGood(item)" :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></view>
<view class="img-box"><image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" /></view>
}">
<view class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" />
</view>
<view class="img-box">
<image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
</view>
<view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
<view class="good-price-info">
......@@ -26,35 +21,32 @@
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="
<u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="
`backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else>
{{ goodsInfo.buyBtnText }}
</u-button>
</view>
</view>
</view>
</view>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
components: {
goodSku,
goodSku2,
......@@ -77,7 +69,9 @@ export default {
},
methods: {
openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
uni.navigateTo({
url: '/pages/goods/goods?GoodsId=' + item.id
});
},
showSkuHandler(g) {
this.sku = g;
......@@ -114,11 +108,11 @@ export default {
// return html = '￥'+_val[0]+'.'+_val[1];
// }
}
};
};
</script>
<style>
.good-four {
.good-four {
position: relative;
margin-bottom: 14px;
display: flex;
......@@ -128,20 +122,23 @@ export default {
box-sizing: border-box;
padding: 0 1px 1px 0;
overflow: hidden;
}
.good-four .tips {
}
.good-four .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good-four .img-box {
}
.good-four .img-box {
width: 100px;
height: 100px;
}
.good-four .good-info {
}
.good-four .good-info {
padding: 12px;
flex: 1;
width: 1rpx;
......@@ -150,8 +147,9 @@ export default {
display: flex;
flex-direction: column;
/* width:20%; */
}
.good-four .good-info .good-name {
}
.good-four .good-info .good-name {
font-size: 13px;
height: 34px;
overflow: hidden;
......@@ -159,25 +157,28 @@ export default {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.good-four .good-info .good-price-info {
}
.good-four .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: flex-end;
height: 22px;
flex: 1;
padding-bottom: 10rpx;
}
.good-four .good-info .good-price-info .price {
}
.good-four .good-info .good-price-info .price {
color: #ff4544;
flex: 1;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.good-four .good-info .good-price-info .buy {
}
.good-four .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
}
</style>
components/goods/style5.vue
View file @ e683e766
<template>
<view
class="her-scoller"
:style="{
<view class="her-scoller" :style="{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
<view
class="good-five"
@click="openGood(item)"
v-for="(item, gli) in goodList"
:key="gli"
:style="{
}">
<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodList" :key="gli" :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></view>
}">
<view class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" />
</view>
<view class="img-box">
<view class="img-show">
<image style="width: 100%; height: 100%; border-radius: 10rpx 10rpx 0 0;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
<image style="width: 100%; height: 100%; border-radius: 10rpx 10rpx 0 0;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl" />
</view>
</view>
<view class="good-info">
......@@ -35,34 +29,31 @@
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="
<u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="
`backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else>
{{ goodsInfo.buyBtnText }}
</u-button>
</view>
</view>
</view>
</view>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
import goodSku2 from '../goods/goodsku2';
export default {
import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue';
import goodSku2 from '../goods/goodsku2';
export default {
components: {
goodSku,
goodSku2,
......@@ -85,7 +76,9 @@ export default {
},
methods: {
openGood(item) {
uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
uni.navigateTo({
url: '/pages/goods/goods?GoodsId=' + item.id
});
},
showSkuHandler(g) {
this.sku = g;
......@@ -109,46 +102,50 @@ export default {
this.showAuth = false;
}
}
};
};
</script>
<style>
.her-scoller {
.her-scoller {
overflow-x: auto !important;
padding: 12px;
/* display: flex; */
white-space: nowrap;
}
/* .her-scoller::after {
}
/* .her-scoller::after {
clear: both;
content: " ";
display: block;
} */
.her-scoller .good-five {
.her-scoller .good-five {
position: relative;
margin-right: 12px;
width: 30%;
border: 1rpx solid transparent;
border-radius: 10rpx;
padding-bottom: 10rpx;
display:inline-block;
display: inline-block;
/* float: left; */
}
.her-scoller .good-five .tips {
}
.her-scoller .good-five .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.her-scoller .good-five .img-box {
}
.her-scoller .good-five .img-box {
width: 100%;
height: 0;
padding-top: 100%;
position: relative;
}
.her-scoller .good-five .img-box .img-show {
}
.her-scoller .good-five .img-box .img-show {
position: absolute;
left: 0;
top: 0;
......@@ -158,22 +155,26 @@ export default {
height: 100%;
overflow: hidden;
z-index: 2;
}
.her-scoller .good-five .guding {
}
.her-scoller .good-five .guding {
position: relative;
}
.her-scoller .good-five .guding .img-box {
}
.her-scoller .good-five .guding .img-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
}
.her-scoller .good-five .good-info {
}
.her-scoller .good-five .good-info {
padding: 6rpx;
padding-bottom: 0;
}
.her-scoller .good-five .good-info .good-name {
}
.her-scoller .good-five .good-info .good-name {
overflow: hidden;
text-overflow: ellipsis;
display: block;
......@@ -182,13 +183,15 @@ export default {
margin-bottom: 4rpx;
font-size: 13px;
width: 100%;
}
.her-scoller .good-five .good-info .good-price-info {
}
.her-scoller .good-five .good-info .good-price-info {
display: flex;
justify-items: center;
align-items: center;
}
.her-scoller .good-five .good-info .good-price-info .price {
}
.her-scoller .good-five .good-info .good-price-info .price {
color: #ff4544;
flex: 1;
font-size: 14px;
......@@ -197,9 +200,10 @@ export default {
overflow: hidden;
display: flex;
flex-direction: column;
}
.her-scoller .good-five .good-info .good-price-info .buy {
}
.her-scoller .good-five .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
}
</style>
components/goods/style6.vue
View file @ e683e766
......@@ -46,8 +46,12 @@
</view>
</view>
</view>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
......
components/goods/style7.vue
View file @ e683e766
<template>
<view
style="padding:0 12px;width:100%;"
:style="{
<view style="padding:0 12px;width:100%;" :style="{
'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}"
>
<view
class="good-seven"
v-for="(item, gli) in goodList"
:key="gli"
@click="openGood(item)"
:style="{
}">
<view class="good-seven" v-for="(item, gli) in goodList" :key="gli" @click="openGood(item)" :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}"
>
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></view>
<view class="img-box"><image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" /></view>
}">
<view class="tips" v-if="goodsInfo.showGoodsTag">
<image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" />
</view>
<view class="img-box">
<image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
</view>
<view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
<view class="good-price-info">
<view>
<u-rate
:current="item.courseScore!=null &&item.courseScore>0?item.courseScore:'5'"
:active-color="mainColor" inactive-color="#DDDDDD"
active-icon="star"
inactive-icon="star-o"
size="20"
:disabled="true"
></u-rate>
<u-rate :current="item.courseScore!=null &&item.courseScore>0?item.courseScore:'5'" :active-color="mainColor"
inactive-color="#DDDDDD" active-icon="star" inactive-icon="star-o" size="20" :disabled="true"></u-rate>
<text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text>
</view>
<view class="price" :style="{ color: mainColor }" v-if="item.price>0">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
......@@ -40,35 +29,32 @@
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="
<u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="
`backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else
>
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
v-else>
{{ goodsInfo.buyBtnText }}
</u-button>
</view>
</view>
</view>
</view>
<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
<template v-if="u&&u.TenantId==27">
<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
</template>
<template v-else>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
</template>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</view>
</template>
<script>
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
import goodSku from '../goods/goodsku';
import goodSku2 from '../goods/goodsku2';
import auth from '@/components/auth/index.vue';
export default {
components: {
goodSku,
goodSku2,
......@@ -83,22 +69,27 @@ export default {
sku: {},
showAuth: false,
u: {},
IsEducation:1
IsEducation: 1
};
},
created() {
this.u = uni.getStorageSync('mall_UserInfo');
this.mainColor = this.$uiConfig.mainColor;
this.IsEducation = uni.getStorageSync('basedata')
? (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation?uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation:0)
:0;
this.IsEducation = uni.getStorageSync('basedata') ?
(uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation ? uni.getStorageSync('basedata').mall.setting.mallStyle
.IsEducation : 0) :
0;
},
methods: {
openGood(item) {
if(this.IsEducation==1){
uni.navigateTo({ url: '/pages/school/courseInfo?GoodsId='+item.id });
}else{
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id });
if (this.IsEducation == 1) {
uni.navigateTo({
url: '/pages/school/courseInfo?GoodsId=' + item.id
});
} else {
uni.navigateTo({
url: '/pages/goods/goods?GoodsId=' + item.id
});
}
},
showSkuHandler(g) {
......@@ -123,11 +114,11 @@ export default {
this.showAuth = false;
}
}
};
};
</script>
<style>
.good-seven {
.good-seven {
position: relative;
margin-bottom: 14px;
display: flex;
......@@ -137,23 +128,26 @@ export default {
box-sizing: border-box;
padding: 0 1px 1px 0;
overflow: hidden;
}
.good-seven .tips {
}
.good-seven .tips {
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
}
.good-seven .img-box {
}
.good-seven .img-box {
width: 125px;
height: 70px;
border-radius:4px;
border-radius: 4px;
overflow: hidden;
box-shadow:0 4px 10px 1px #D2D2D2;
}
.good-seven .good-info {
box-shadow: 0 4px 10px 1px #D2D2D2;
}
.good-seven .good-info {
padding-left: 12px;
flex: 1;
width: 1rpx;
......@@ -162,8 +156,9 @@ export default {
display: flex;
flex-direction: column;
/* width:20%; */
}
.good-seven .good-info .good-name {
}
.good-seven .good-info .good-name {
font-size: 13px;
height: 34px;
overflow: hidden;
......@@ -171,8 +166,9 @@ export default {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.good-seven .good-info .good-price-info {
}
.good-seven .good-info .good-price-info {
display: flex;
justify-items: center;
justify-content: space-between;
......@@ -180,23 +176,25 @@ export default {
height: 10px;
flex: 1;
padding-bottom: 10rpx;
}
.good-seven .good-rb-text {
}
.good-seven .good-rb-text {
font-size: 11px;
color: #999999;
margin-top: 3px;
margin-left: 2px;
}
}
.good-seven .good-info .good-price-info .price {
.good-seven .good-info .good-price-info .price {
color: #ff4544;
font-size: 14px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.good-seven .good-info .good-price-info .buy {
}
.good-seven .good-info .good-price-info .buy {
width: 24px;
text-align: right;
}
}
</style>
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