Skip to content

M
mallapp
Commit 2ae1dac6 authored by 罗超's avatar 罗超
Browse files
Options

调整部分样式

parent e4a71330
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 101 deletions
components/goods/list.vue
View file @ 2ae1dac6
......@@ -4,40 +4,35 @@
<u-col span="6" v-for="(cx, ci) in g" :key="ci">
<view class="good" @click="clickHandler(cx)">
<view class="good-img">
<image mode="aspectFill" :src="cx.cover_pic" style="width: 100%; height: 100%;" />
</view>
<view class="good-name" v-if="setting.is_show_goods_name==1">
<view
v-if="cx.marketingLogo.iswords && cx.marketingLogo.iswords==1&& cx.marketingLogo.words!=''"
class="Logo"
:style="{color: cx.marketingLogo.wordsColor,
background:cx.marketingLogo.wordsBack ,}"
>{{cx.marketingLogo.words}}</view>
<image
mode="aspectFill"
:src="cx.cover_pic"
style="width: 100%; height: 100%;"
v-if="cx.marketingLogo.iswords&&cx.marketingLogo.iswords==2&& cx.marketingLogo.ico!=''"
mode="heightFix"
:src="cx.marketingLogo.ico"
style=" height: 11px;"
/>
<view
style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;"
v-if="cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0"
>
{{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?cx.freeShippingFullMoneyPinkage+'元包邮':''}}
{{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?cx.freeShippingFullNumPinkage+'件包邮':''}}
</view>
{{ cx.name }}
</view>
<view class="good-name" v-if="setting.is_show_goods_name==1">
<view v-if="cx.marketingLogo.iswords && cx.marketingLogo.iswords==1&& cx.marketingLogo.words!=''" class="Logo" :style=
"{color: cx.marketingLogo.wordsColor,
background:cx.marketingLogo.wordsBack ,}">
{{cx.marketingLogo.words}}
</view>
<image
v-if="cx.marketingLogo.iswords&&cx.marketingLogo.iswords==2&& cx.marketingLogo.ico!=''"
mode="heightFix"
:src="cx.marketingLogo.ico"
style=" height: 16px;"
/>
<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;"
v-if="cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0"
>
{{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?cx.freeShippingFullMoneyPinkage+'元包邮':''}}
{{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?cx.freeShippingFullNumPinkage+'件包邮':''}}
</view>
{{ cx.name }}
</view>
<view class="good-info">
<view class="price" :style="{ color: mainColor }">
￥{{cx.price}}</view>
<!-- v-if="setting.is_show_sales_num=='1'" -->
<view class="price" :style="{ color: mainColor }">￥{{cx.price}}</view>
<!-- v-if="setting.is_show_sales_num=='1'" -->
<view class="sell">{{ cx.sales }}</view>
<view v-if="setting.is_show_cart==1" class="cart" @click.stop="showSkuHandler(cx)">
<u-icon name="cart-o" size="40" :color="mainColor" />
......@@ -46,41 +41,35 @@
</view>
</u-col>
</u-row>
<good-sku
v-if="showSku"
:option-type="2"
borderRadius="20"
v-model="showSku"
:good="sku"
></good-sku>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
<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 auth from "@/components/auth/index.vue";
export default {
components: {
goodSku,
auth
auth,
},
props: ["list"],
data() {
return {
g: [],
showSku: false,
showAuth:false,
u:{},
showAuth: false,
u: {},
sku: {},
mainColor: "",
setting:{}
setting: {},
};
},
mounted() {
this.g = this.list;
this.mainColor = this.$uiConfig.mainColor;
this.initConfig()
this.initConfig();
},
watch: {
list: {
......@@ -93,33 +82,33 @@ export default {
},
methods: {
initConfig() {
this.setting = uni.getStorageSync("basedata").mall.setting
this.setting = uni.getStorageSync("basedata").mall.setting;
},
clickHandler(item) {
console.log("GoodsId",item)
uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id });
console.log("GoodsId", item);
uni.navigateTo({ url: "/pages/goods/goods?GoodsId=" + item.id });
},
showSkuHandler(g) {
this.sku = g;
this.u = uni.getStorageSync('mall_UserInfo');
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
nickName: '未登录',
avatarUrl: ''
};
this.showAuth = true;
this.u = {
nickName: "未登录",
avatarUrl: "",
};
this.showAuth = true;
} else {
this.showSku = true;
this.showSku = true;
}
},
reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo');
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
}
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth = false;
},
//关闭登录窗口
gbAuth() {
this.showAuth = false;
},
},
};
</script>
......@@ -137,34 +126,32 @@ export default {
display: block;
position: relative;
}
.u-good-list .good .good-img .shipping{
width: 100%;
height: 30px;
font-size: 11px;
color: #FFFFFF;
padding: 0 10px;
.u-good-list .good .good-img .shipping {
width: 100%;
height: 30px;
font-size: 11px;
color: #ffffff;
padding: 0 10px;
background-image: linear-gradient(
to bottom ,
rgb(0, 0, 0, 0),
rgb(0, 0, 0, 1)
);
position: absolute;
left: 0;
bottom: 0;
line-height: 30px;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
line-clamp: 1;
-webkit-box-orient: vertical;
background-image: linear-gradient(
to bottom,
rgb(0, 0, 0, 0),
rgb(0, 0, 0, 1)
);
position: absolute;
left: 0;
bottom: 0;
line-height: 30px;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
line-clamp: 1;
-webkit-box-orient: vertical;
}
.u-good-list .good .good-name {
height: 37px;
height: 37px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -195,7 +182,11 @@ export default {
width: 40rpx;
text-align: right;
}
.u-good-list .Logo{
padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;line-height: 32rpx;
.u-good-list .Logo {
padding: 1px 5px;
display: inline-block;
font-size: 22rpx;
margin-right: 5rpx;
border-radius: 4px;
}
</style>
components/gridnav/index.vue
View file @ 2ae1dac6
......@@ -34,7 +34,7 @@ export default {
return {
cols: [],
formatStyle: "",
height: 186,
height: 160,
bg:""
};
},
......
components/swiper/index.vue
View file @ 2ae1dac6
......@@ -18,16 +18,18 @@
</swiper-item>
</block>
</swiper> -->
<view :style="{marginTop:swipers.topAndBottom+'px',marginBottom:(swipers.topAndBottom<0?0:swipers.topAndBottom)+'px',marginLeft:swipers.leftAndRight+'px',marginRight:swipers.leftAndRight+'px',background:swipers.background}">
<u-swiper
:list="banners"
:effect3d="swipers.style == 2"
:height="swipers.height"
:interval="5000"
name="picUrl"
:border-radius="swipers.radius"
@click="clickHandler"
></u-swiper>
<view :style="{background:swipers.background}">
<view :style="{marginTop:swipers.topAndBottom+'px',marginBottom:(swipers.topAndBottom<0?0:swipers.topAndBottom)+'px',marginLeft:swipers.leftAndRight+'px',marginRight:swipers.leftAndRight+'px'}">
<u-swiper
:list="banners"
:effect3d="swipers.style == 2"
:height="swipers.height"
:interval="5000"
name="picUrl"
:border-radius="swipers.radius"
@click="clickHandler"
></u-swiper>
</view>
</view>
</template>
......
pages/index/index.vue
View file @ 2ae1dac6
......@@ -299,7 +299,7 @@ export default {
if (x.id == "background") {
let t = "";
if (x.data.showImg) {
y.templateBg += `background-color:#${x.data.backgroundColor};`;
y.templateBg += `background-color:${x.data.backgroundColor};`;
y.templateBg = `background-image:url('${backgroundPicUrl}');`;
y.templateBg += `background-position:${x.data.positionText};`;
y.templateBg += `background-repeat:${x.data.repeatText};`;
......
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