Skip to content

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

商城修改

parent 47ce8df3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1505 additions and 1282 deletions
components/cats/style3.vue
View file @ ee9fdc4b
...@@ -11,65 +11,67 @@ ...@@ -11,65 +11,67 @@
padding: 10px; padding: 10px;
padding-bottom: 0px; padding-bottom: 0px;
"> ">
<u-row gutter="20"> <u-row gutter="12">
<u-col span="6" v-for="(cx, ci) in g" :key="ci"> <view class="layout">
<view class="good" @click="clickHandler(cx)"> <u-col span="6" v-for="(cx, ci) in g" :key="ci">
<view class="good-img" style="position: relative;"> <view class="good" @click="clickHandler(cx)">
<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%"> <view class="good-img" style="position: relative;">
<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/plugins-out.png"
v-if="cx.totalStock==0"
style="width: 100%; height: 100%;position: absolute;left:0;top:0;background: #000;opacity: 0.6;" />
</image>
</view>
<view class="good-name">
<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 <image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/plugins-out.png" v-if="cx.marketingLogo.iswords&&cx.marketingLogo.iswords==2&& cx.marketingLogo.ico!=''"
v-if="cx.totalStock==0" mode="heightFix" :src="cx.marketingLogo.ico"
style="width: 100%; height: 100%;position: absolute;left:0;top:0;background: #000;opacity: 0.6;" /> style=" height: 12px;margin-right: 5px" />
</image>
</view> <view
<view class="good-name"> style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;"
<view v-if="cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0">
v-if="cx.marketingLogo.iswords && cx.marketingLogo.iswords==1&& cx.marketingLogo.words!=''" {{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?cx.freeShippingFullMoneyPinkage+'元包邮':''}}
class="Logo" {{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?cx.freeShippingFullNumPinkage+'件包邮':''}}
:style="{color: cx.marketingLogo.wordsColor,background:cx.marketingLogo.wordsBack ,}"> </view>
{{cx.marketingLogo.words}}</view> {{ cx.name }}
<image
v-if="cx.marketingLogo.iswords&&cx.marketingLogo.iswords==2&& cx.marketingLogo.ico!=''"
mode="heightFix" :src="cx.marketingLogo.ico"
style=" height: 12px;margin-right: 5px" />
<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> </view>
{{ cx.name }} <!-- 新增上课日期 -->
</view> <view v-if="u.TenantId==27" class="rqi">
<!-- 新增上课日期 --> <view v-if="u.TenantId==27&&cx.edudata.ClassTime" class="have">
<view v-if="u.TenantId==27"> {{cx.edudata.ClassTime}}</view>
<view v-if="u.TenantId==27&&cx.edudata.ClassTime" class="have"> <!-- 新增次数 -->
{{cx.edudata.ClassTime}}</view> <view v-if="cx.edudata.ClassNum&&u.TenantId==27" class="have">{{cx.edudata.ClassNum}}次
<!-- 新增次数 -->
<div v-if="cx.edudata.ClassNum&&u.TenantId==27" class="have">{{cx.edudata.ClassNum}}次
</div>
<!-- 新增老师相片资料 -->
<view class="price-box">
<view class="portrait-box">
<image v-if="cx.edudata.TeacherIcon" class="portrait" mode="aspectFit"
:src="cx.edudata.TeacherIcon" />
<view v-if="cx.edudata.TeacherName" class="sell2">{{cx.edudata.TeacherName}}
</view>
</view> </view>
<view class="good-info2" > <!-- 新增老师相片资料 -->
<view class="price" :style="{ color: mainColor }">{{cx.price_content}}</view> <view class="price-box">
<view class="portrait-box">
<image v-if="cx.edudata.TeacherIcon" class="portrait" mode="aspectFit"
:src="cx.edudata.TeacherIcon" />
<view v-if="cx.edudata.TeacherName" class="sell2">{{cx.edudata.TeacherName}}
</view>
</view>
<view class="good-info2" >
<view class="price" :style="{ color: mainColor }">{{cx.price_content}}</view>
</view>
</view> </view>
</view> </view>
<!-- 新增上课日期结束 -->
</view> <view class="good-info" v-if="u.TenantId!=27">
<!-- 新增上课日期结束 --> <view class="price" :style="{ color: mainColor }">{{cx.price_content}}</view>
<view class="good-info" v-if="u.TenantId!=27"> <view class="sell">{{ cx.sales }}</view>
<view class="price" :style="{ color: mainColor }">{{cx.price_content}}</view> </view>
<view class="sell">{{ cx.sales }}</view>
</view> </view>
</view> </u-col>
</u-col> </view>
</u-row> </u-row>
<u-divider v-if="isover" bg-color="#F5f5f5" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider> <u-divider v-if="isover" bg-color="#F5f5f5" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
&nbsp; &nbsp;
...@@ -222,6 +224,15 @@ ...@@ -222,6 +224,15 @@
</script> </script>
<style> <style>
.layout{
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.rqi{
/* background: red; */
/* width: 130px; */
}
.good-info2 { .good-info2 {
display: flex; display: flex;
margin: 0px 10px; margin: 0px 10px;
...@@ -233,6 +244,7 @@ ...@@ -233,6 +244,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 60rpx;
} }
.portrait-box { .portrait-box {
display: flex; display: flex;
...@@ -281,6 +293,7 @@ ...@@ -281,6 +293,7 @@
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
margin-bottom: 10px; margin-bottom: 10px;
width: 345rpx;
} }
.catstyle3 .good .good-img { .catstyle3 .good .good-img {
......
components/goods/goodsku2.vue
View file @ ee9fdc4b
...@@ -713,5 +713,6 @@ ...@@ -713,5 +713,6 @@
align-items: center; align-items: center;
border-top: 1px solid #eee; border-top: 1px solid #eee;
padding: 5px 10px; padding: 5px 10px;
margin-top: 20rpx;
} }
</style> </style>
pages/goods/goods.vue
View file @ ee9fdc4b
This diff is collapsed.
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