Skip to content

M
mallapp
Commit 4fcc96be authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 013a3c55
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 38 deletions
components/goods/style7.vue
View file @ 4fcc96be
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
></u-rate> ></u-rate>
<text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text> <text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text>
</view> </view>
<view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view> <view class="price" :style="{ color: mainColor }" v-if="item.price>0">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
<view class="price" v-else style="font-size:13px;color:#999999">免费</view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <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="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-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
...@@ -76,15 +77,23 @@ export default { ...@@ -76,15 +77,23 @@ export default {
showSku: false, showSku: false,
sku: {}, sku: {},
showAuth: false, showAuth: false,
u: {} u: {},
IsEducation:1
}; };
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; 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;
}, },
methods: { methods: {
openGood(item) { openGood(item) {
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) { showSkuHandler(g) {
this.sku = g; this.sku = g;
......
components/study/style1.vue
View file @ 4fcc96be
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
'paddingBottom':goodsInfo.PaddingBottom+'px' 'paddingBottom':goodsInfo.PaddingBottom+'px'
}"> }">
<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{ <div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
borderRadius:goodsInfo.SearchFilletPX+'px' borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
}"> }">
<image style=" <image style="
width: calc(100vw - 24px); width: calc(100vw - 24px);
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
position: relative; position: relative;
border: 1rpx solid transparent; border: 1rpx solid transparent;
border-radius: 10rpx; border-radius: 10rpx;
border: 1px solid rgb(226, 226, 226);
overflow: hidden; overflow: hidden;
} }
......
components/study/style2.vue
View file @ 4fcc96be
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
}"> }">
<u-row gutter="24"> <u-row gutter="24">
<u-col span="6" v-for="(item, gli) in goodsInfo.list" :key="gli"> <u-col span="6" v-for="(item, gli) in goodsInfo.list" :key="gli">
<view class="good_study_two" @click="openGood(item)" :style="{borderRadius:goodsInfo.SearchFilletPX+'px'}"> <view class="good_study_two" @click="openGood(item)" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}">
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image style=" <image style="
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
border: 1rpx solid transparent; border: 1rpx solid transparent;
border-radius: 10rpx; border-radius: 10rpx;
overflow: hidden; overflow: hidden;
border: 1px solid rgb(226, 226, 226);
box-shadow: 0 4px 10px 1px #e6e5e5; box-shadow: 0 4px 10px 1px #e6e5e5;
background-color: #fff; background-color: #fff;
} }
......
components/study/style5.vue
View file @ 4fcc96be
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
'padding-bottom':goodsInfo.PaddingBottom+'px', 'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px', 'padding-left':goodsInfo.PaddingLeft+'px',
}"> }">
<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX+'px'}" :key="gli"> <view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}" :key="gli">
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" /> <image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
width: 30%; width: 30%;
border-radius: 10rpx; border-radius: 10rpx;
padding-bottom: 10rpx; padding-bottom: 10rpx;
border:1px solid rgb(226, 226, 226);
overflow: hidden; overflow: hidden;
} }
.her-scoller-study .good-five .tips { .her-scoller-study .good-five .tips {
......
components/study/style6.vue
View file @ 4fcc96be
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
</view> </view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="item.name">{{ item.name }}</view> <view class="good-name" v-if="item.name">{{ item.name }}</view>
<view class="good-price-info" v-if="item.lableName"> <view v-if="item.lableName">
<span class="price">{{ item.lableName }}</span> <span style="font-size:12px;">{{ item.lableName }}</span>
</view> </view>
</view> </view>
</view> </view>
...@@ -77,14 +77,14 @@ ...@@ -77,14 +77,14 @@
position: relative; position: relative;
margin-bottom: 14px; margin-bottom: 14px;
display: flex; display: flex;
height: 102px;
border: 1px solid rgb(226, 226, 226);
border-radius: 10rpx; border-radius: 10rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 1px 1px 0; padding: 0 1px 1px 0;
overflow: hidden; overflow: hidden;
} }
.good-four-study:last-child{
margin-bottom:0!important;
}
.good-four-study .tips { .good-four-study .tips {
width: 64rpx; width: 64rpx;
height: 64rpx; height: 64rpx;
...@@ -95,12 +95,15 @@ ...@@ -95,12 +95,15 @@
} }
.good-four-study .img-box { .good-four-study .img-box {
width: 100px; width: 125px;
height: 100px; height: 70px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-four-study .good-info { .good-four-study .good-info {
padding: 12px; padding: 0 12px 12px 12px;
flex: 1; flex: 1;
width: 1rpx; width: 1rpx;
border: 10rpx; border: 10rpx;
...@@ -112,7 +115,7 @@ ...@@ -112,7 +115,7 @@
.good-four-study .good-info .good-name { .good-four-study .good-info .good-name {
font-size: 13px; font-size: 13px;
height: 34px; margin-bottom:5px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
......
components/studyArticle/style1.vue
View file @ 4fcc96be
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
'paddingBottom':goodsInfo.PaddingBottom+'px' 'paddingBottom':goodsInfo.PaddingBottom+'px'
}"> }">
<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{ <div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
borderRadius:goodsInfo.SearchFilletPX+'px' borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
}"> }">
<image style=" <image style="
width: calc(100vw - 24px); width: calc(100vw - 24px);
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
position: relative; position: relative;
border: 1rpx solid transparent; border: 1rpx solid transparent;
border-radius: 10rpx; border-radius: 10rpx;
border: 1px solid rgb(226, 226, 226); /* border: 1px solid rgb(226, 226, 226); */
overflow: hidden; overflow: hidden;
} }
......
components/studyArticle/style5.vue
View file @ 4fcc96be
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
'padding-bottom':goodsInfo.PaddingBottom+'px', 'padding-bottom':goodsInfo.PaddingBottom+'px',
'padding-left':goodsInfo.PaddingLeft+'px', 'padding-left':goodsInfo.PaddingLeft+'px',
}"> }">
<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX+'px'}" :key="gli"> <view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}" :key="gli">
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" /> <image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
...@@ -85,9 +85,8 @@ ...@@ -85,9 +85,8 @@
position: relative; position: relative;
margin-right: 12px; margin-right: 12px;
width: 30%; width: 30%;
border-radius: 10rpx;
padding-bottom: 10rpx; padding-bottom: 10rpx;
border:1px solid rgb(226, 226, 226); /* border:1px solid rgb(226, 226, 226); */
overflow: hidden; overflow: hidden;
} }
.her-scoller-study .good-five .tips { .her-scoller-study .good-five .tips {
......
components/studyArticle/style6.vue
View file @ 4fcc96be
...@@ -80,30 +80,23 @@ ...@@ -80,30 +80,23 @@
position: relative; position: relative;
margin-bottom: 14px; margin-bottom: 14px;
display: flex; display: flex;
height: 102px;
border: 1px solid rgb(226, 226, 226);
border-radius: 10rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 1px 1px 0; padding: 0 1px 1px 0;
overflow: hidden; overflow: hidden;
} }
.good-four-study:last-child{
.good-four-study .tips { margin-bottom:0!important;
width: 64rpx;
height: 64rpx;
position: absolute;
top: 0;
left: 0;
z-index: 4;
} }
.good-four-study .img-box { .good-four-study .img-box {
width: 100px; width: 125px;
height: 100px; height: 70px;
border-radius: 4px;
overflow: hidden;
box-shadow: 0 4px 10px 1px #D2D2D2;
} }
.good-four-study .good-info { .good-four-study .good-info {
padding: 12px; padding: 0 12px 12px 12px;
flex: 1; flex: 1;
width: 1rpx; width: 1rpx;
border: 10rpx; border: 10rpx;
......
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