Commit ecb92346 authored by 黄奎's avatar 黄奎

页面修改

parent cc2d02df
......@@ -198,7 +198,7 @@
<view class="vip2" :style="{ color: mainColor }">
{{ cx.price_content }}
</view>
<view v-if="cx.original_price_content && cx.original_price > 0 && cx.price_content !== cx.original_price_content" class="origin">
<view v-if="cx.original_price_content && cx.original_price > 0 &&cx.original_price>cx.level_price && cx.price_content !== cx.original_price_content" class="origin">
{{ cx.original_price_content }}
</view>
......
......@@ -9,7 +9,7 @@
<text class="small"></text>
<text>{{ goodprice }}</text>
</view>
<view class="origin" v-if="good_original_price && good_original_price >0 && good_original_price != goodprice">
<view class="origin" v-if="good_original_price && good_original_price >0 && good_original_price > goodprice">
<text class="small"></text>
<text>{{ good_original_price }}</text>
</view>
......
......@@ -14,20 +14,17 @@
<swiper indicator-dots :autoplay="false" :interval="1000" style="height:100vw;">
<block v-for="(item, index) in g.pic_url" :key="index">
<swiper-item>
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo"
v-if="item.type==1" :src="item.pic_url" :autoplay="false" loop muted show-play-btn
:enable-progress-gesture="true" :controls="true" :show-progress="true"
:show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else
:src="item.pic_url" :mode="u.TenantId==27 ? 'scaleToFill' : 'aspectFill'"></image>
<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url"
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true" :controls="true" :show-progress="true"
:show-mute-btn="true" objectFit="cover"></video>
<image @click="previewImage(index)" style="width:100%;height:100%;" v-else :src="item.pic_url" :mode="u.TenantId==27 ? 'scaleToFill' : 'aspectFill'"></image>
</swiper-item>
</block>
</swiper>
<!-- TODO 分销价格未做 is_share_price -->
<view class="is_share" v-if="g.share > 0 && hideshare == false&&setting.is_show_korea==0"
style="top:240px;">
<image src="@/static/images/icon/WechatIMG424.png"
style="width: 20px; margin-left: 12px; opacity: 1;height: auto;" mode="widthFix" />
<view class="is_share" v-if="g.share > 0 && hideshare == false&&setting.is_show_korea==0" style="top:240px;">
<image src="@/static/images/icon/WechatIMG424.png" style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
mode="widthFix" />
<view style="
display: flex;
flex-direction: column;
......@@ -39,12 +36,11 @@
<Text>即刻分享赚</Text>
<Text>{{ g.share }}</Text>
</view>
<u-icon name="close" style='position: absolute;right: 4px;top: 12.5px;z-index: 999;' color="#fff"
size="40" @click='goclose'></u-icon>
<u-icon name="close" style='position: absolute;right: 4px;top: 12.5px;z-index: 999;' color="#fff" size="40" @click='goclose'></u-icon>
</view>
<view class="is_share" v-if="g.myBuyCommission > 0 && hideshare == false&&setting.is_show_korea==0">
<image src="@/static/images/icon/WechatIMG424.png"
style="width: 20px; margin-left: 12px; opacity: 1;height: auto;" mode="widthFix" />
<image src="@/static/images/icon/WechatIMG424.png" style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
mode="widthFix" />
<view style="
display: flex;
flex-direction: column;
......@@ -56,25 +52,23 @@
<Text>即刻购买省</Text>
<Text>{{ g.myBuyCommission }}</Text>
</view>
<u-icon v-if='g.share ==0' name="close" style='position: absolute;right: 4px;top: 12.5px;'
color="#fff" size="40" @click='hideshare=true'></u-icon>
<u-icon v-if='g.share ==0' name="close" style='position: absolute;right: 4px;top: 12.5px;' color="#fff" size="40"
@click='hideshare=true'></u-icon>
</view>
</view>
<!-- 非id27开始 -->
<view class="g-info" v-if="u.TenantId!=27">
<view class="g-name u-skeleton-rect">
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''"
class="Logo" :style="{color: g.marketingLogo.wordsColor,
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''" class="Logo" :style="{color: g.marketingLogo.wordsColor,
background:g.marketingLogo.wordsBack ,}">{{g.marketingLogo.words}}</view>
<image v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==2&& g.marketingLogo.ico!=''"
mode="heightFix" :src="g.marketingLogo.ico" style=" height: 12px;margin-right: 5px" />
<image v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==2&& g.marketingLogo.ico!=''" mode="heightFix" :src="g.marketingLogo.ico"
style=" height: 12px;margin-right: 5px" />
{{ g.name }}
</view>
<view class="g-price-box" v-if="setting.is_show_korea==0">
<view class="left">
<view class="price u-skeleton-rect" :style="{ color: mc }">
<u-tag v-if='g.price_min!=g.original_price' text="心动价" mode="light" size='mini' type="error"
style='font-size: 12px;font-family: aa;margin-right: 10px;' />
<u-tag v-if='g.price_min!=g.original_price' text="心动价" mode="light" size='mini' type="error" style='font-size: 12px;font-family: aa;margin-right: 10px;' />
<text class="small"></text>
<text class="numfont" v-if="g.form_id!=1">
{{ g.price_min == g.price_max ? g.price_min : g.price_min + '-' + g.price_max }}
......@@ -99,8 +93,7 @@
<template v-if="setting.is_show_korea==1">
<view style="height:50px;margin:10px 10px 0 0;display:none;">
<view style="float:right;" @click="openShare" v-if="isAllowShare == 1">
<image src="@/static/images/icon/icon-share.png" style="width:20px;height:20px;"
class="share-icon" />
<image src="@/static/images/icon/icon-share.png" style="width:20px;height:20px;" class="share-icon" />
</view>
</view>
<view class="koarea_Country" style="display:none;">
......@@ -115,13 +108,11 @@
<view style="text-align: left;padding:15px 0;border-bottom:1px solid #F2F3F6;display:none;">
卖点:<text v-if="g.subname">{{g.subname}}</text>
</view>
<view
style="text-align: left;border-bottom:1px solid #F2F3F6;padding:15px 0;display:flex;font-size:13px;color:#737373;">
<view style="text-align: left;border-bottom:1px solid #F2F3F6;padding:15px 0;display:flex;font-size:13px;color:#737373;">
<u-icon name="location" color="#D4D4D4" size="30"></u-icon>
地址:<text v-if="g.fatcode">{{g.fatcode}}</text>
</view>
<view
style="display:flex;text-align: left;padding:10px;background-color: #F3F3F3;color:#404040;min-height:100px;line-height: 25px;font-size:13px;">
<view style="display:flex;text-align: left;padding:10px;background-color: #F3F3F3;color:#404040;min-height:100px;line-height: 25px;font-size:13px;">
<text style="flex-shrink: 0;width:45px;">简介:</text><text v-if="g.goodsurl">{{g.goodsurl}}</text>
</view>
</template>
......@@ -130,9 +121,8 @@
<!-- id27开始 -->
<view class="g-info" v-if="u.TenantId==27" style="position: relative;">
<!-- 标题 -->
<view class="g-name u-skeleton-rect" >
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''"
class="Logo" :style="{color: g.marketingLogo.wordsColor,
<view class="g-name u-skeleton-rect">
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''" class="Logo" :style="{color: g.marketingLogo.wordsColor,
background:g.marketingLogo.wordsBack ,}">{{g.marketingLogo.words}}</view>
{{ g.name }}
</view>
......@@ -186,8 +176,11 @@
<text class="numfont22" v-if="g.form_id!=1&&g.edu_data.BookPrice">
{{ g.price_min == g.price_max ? parseFloat(g.price_min)+parseFloat(g.edu_data.BookPrice) : g.price_min + '-' + g.price_max }}
</text>
<text class="origin" v-if="g.original_price && g.original_price > 0">
{{ g.original_price.toFixed(2)}}
<text class="origin" v-if="g.form_id!=1&&!g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
¥{{ g.jjxkt_original_price.toFixed(2)}}
</text>
<text class="origin" v-if="g.form_id!=1&& g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
¥{{parseFloat(g.jjxkt_original_price)+parseFloat(g.edu_data.BookPrice)}}
</text>
<!-- <text class="numfont" v-if="g.form_id==1">
{{ g.price_min }}
......@@ -195,8 +188,7 @@
</view>
<!-- top切换 -->
<view class="top-switch" id="productId">
<u-tabs :list="list" :is-scroll="false" :current="current" inactive-color='#999' :active-color='mc'
@change="change"></u-tabs>
<u-tabs :list="list" :is-scroll="false" :current="current" inactive-color='#999' :active-color='mc' @change="change"></u-tabs>
</view>
<!-- 内容1 -->
<view v-if="current==0">
......@@ -205,8 +197,7 @@
<text class="introduce2">老师介绍</text>
</view>
<view class="teacher">
<image :src="g.edu_data.TeacherIcon" mode="aspectFill" style="width:30px;height:30px;"
class="share-icon" />
<image :src="g.edu_data.TeacherIcon" mode="aspectFill" style="width:30px;height:30px;" class="share-icon" />
<view class="teacher2">
<view class="teacher3">
<view class="teacher4" v-if='g.edu_data.TeacherName'>{{g.edu_data.TeacherName}}</view>
......@@ -276,34 +267,26 @@
</view> -->
</view>
<!-- id27结束 -->
<view class="sku-box u-skeleton-rect" style="margin: 0;padding: 10px;"
v-if="g.friendUrl!=null && g.friendUrl!=''&&setting.is_show_korea==0 &&u.TenantId!=27"
@click="goCoiling(g.friendUrl)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodsCoiling.png"
style="width: 100%;height: 68px;" />
<view class="sku-box u-skeleton-rect" style="margin: 0;padding: 10px;" v-if="g.friendUrl!=null && g.friendUrl!=''&&setting.is_show_korea==0 &&u.TenantId!=27"
@click="goCoiling(g.friendUrl)">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/goodsCoiling.png" style="width: 100%;height: 68px;" />
</view>
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;"
v-if="(g.goods_marketing_award.integral.title != '')|| (g.goods_marketing_award.PresentFXGradeMsg != '')|| g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;" v-if="(g.goods_marketing_award.integral.title != '')|| (g.goods_marketing_award.PresentFXGradeMsg != '')|| g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)&&u.TenantId!=27">
<view class="label" style="margin-top: 5px;">活动</view>
<view class="content" style="display: flex;flex-direction: column">
<view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;"
v-if="g.goods_marketing_award.integral.title != ''">
<view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;" v-if="g.goods_marketing_award.integral.title != ''">
<u-tag text="送积分" type="error" />
<text
style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.integral.title }}</text>
<text style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.integral.title }}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center"
v-if="g.goods_marketing_award.PresentFXGradeMsg != ''" @click="goVIP">
<view style="display: flex;flex-direction: row;align-items: center" v-if="g.goods_marketing_award.PresentFXGradeMsg != ''"
@click="goVIP">
<u-tag text="送会员" type="error" />
<text
style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.PresentFXGradeMsg }}</text>
<text style="margin-left: 5px; font-size: 12px;">{{ g.goods_marketing_award.PresentFXGradeMsg }}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 5px;"
@click="goUrl(g.FreeShippingUrl)"
v-if="g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)">
<view
style="color: #fa3534;background: #fef0f0;padding: 12rpx 22rpx; font-size: 22rpx;margin-right: 5px;border: 1px solid #fde2e2;border-radius: 6rpx;">
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 5px;" @click="goUrl(g.FreeShippingUrl)"
v-if="g.freeShippingName != null && g.freeShippingName != '' && (g.fullMoneyPinkage > 0 || g.fullNumPinkage > 0)">
<view style="color: #fa3534;background: #fef0f0;padding: 12rpx 22rpx; font-size: 22rpx;margin-right: 5px;border: 1px solid #fde2e2;border-radius: 6rpx;">
{{ g.freeShippingName != null ? g.freeShippingName : '' }}
</view>
{{ g.fullMoneyPinkage > 0 && g.fullNumPinkage == 0 ? g.fullMoneyPinkage + '元包邮' : '' }}
......@@ -319,8 +302,7 @@
</view>-->
</view>
</view>
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;"
v-if="sku.length > 0&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="align-items: flex-start;" v-if="sku.length > 0&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">选择</view>
<view class="content">
<view class="sku-chosen" @click="chosenSku">
......@@ -353,19 +335,16 @@
<view class="label">发货地</view>
<view class="content">{{g.sendArea }}</view>
</view>
<view class="sku-box u-skeleton-rect"
v-if="setting.is_express == '1'&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">快递</view>
<view class="content">{{ g.express == '' ? '免运费' : '¥' + g.express }}</view>
</view>
<view class="sku-box u-skeleton-rect" style="margin-top: -10;"
v-if="g.goods_marketing.shipping != ''&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="margin-top: -10;" v-if="g.goods_marketing.shipping != ''&&u.TenantId!=27">
<view class="label">包邮</view>
<view class="content">{{ g.goods_marketing.shipping }}</view>
</view>
<view class="sku-box u-skeleton-rect" style="margin-top: -10;"
v-if="g.goods_marketing.limit != ''&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" style="margin-top: -10;" v-if="g.goods_marketing.limit != ''&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">限购</view>
<view class="content">{{ g.goods_marketing.limit }}</view>
</view>
......@@ -384,23 +363,21 @@
</view>
</view>
<view class="sku-box u-skeleton-rect"
v-if="comments.length == 0 && setting.is_comment == 1&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="sku-box u-skeleton-rect" v-if="comments.length == 0 && setting.is_comment == 1&&setting.is_show_korea==0&&u.TenantId!=27">
<view class="label">暂无评论信息</view>
</view>
<view class="comment" v-if="comments.length > 0">
<view class="chead">
<u-section :bold="false" :sub-color="secondary" :show-split="false"
:title="`商品评价(${comments.length})`" sub-title="查看更多" @click="clickCommentHandler"
font-size="24"></u-section>
<u-section :bold="false" :sub-color="secondary" :show-split="false" :title="`商品评价(${comments.length})`" sub-title="查看更多"
@click="clickCommentHandler" font-size="24"></u-section>
</view>
<view class="content">
<view class="u-box">
<view class="user">
<u-avatar :src="comments[0].UserPhotoPath" :size="50"></u-avatar>
<text style="margin-left: 10px;">{{ comments[0].UserName }}</text>
<u-rate :current="comments[0].CommentScore" active-color="#FA3534" inactive-color="#b2b2b2"
active-icon="star" inactive-icon="star-o" size="20" :disabled="true"></u-rate>
<u-rate :current="comments[0].CommentScore" active-color="#FA3534" inactive-color="#b2b2b2" active-icon="star"
inactive-icon="star-o" size="20" :disabled="true"></u-rate>
</view>
<view class="timer">{{ comments[0].CreateDate }}</view>
</view>
......@@ -436,7 +413,8 @@
<view style="margin:10px 0;">留言(至少填写10个文字)</view>
<view>
<textarea placeholder="请输入评论信息" style="width: 94.5%;height: 100px;border:1px solid #d1d1d1;
padding:10px;background-color: #fff;" confirm-type='done' v-model="comentMsg.Content">
padding:10px;background-color: #fff;"
confirm-type='done' v-model="comentMsg.Content">
</textarea>
</view>
<view class="goodComentBtn" @click="submitCommit">提交留言</view>
......@@ -449,36 +427,31 @@
</view>
<u-skeleton v-if="loading" :loading="true" :animation="true" bgcolor="#FFF"></u-skeleton>
<template v-if="setting&&setting.is_show_korea==0">
<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite"
:good-id="id" :total-stock="g.totalStock" :status="g.status" :formid='g.form_id' @joincar="joinCar"
@buy="buy"></goodsaction>
<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite" :good-id="id"
:total-stock="g.totalStock" :status="g.status" :formid='g.form_id' @joincar="joinCar" @buy="buy"></goodsaction>
</template>
<template v-if="setting&&setting.is_show_korea==1">
<kotragoodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.pic_url" :favorite="g.favorite"
:good-id="id" :total-stock="g.totalStock" :status="g.status" @buy="buy">
<kotragoodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.pic_url" :favorite="g.favorite" :good-id="id"
:total-stock="g.totalStock" :status="g.status" @buy="buy">
</kotragoodsaction>
</template>
<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku"
:mask-close-able="true" :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku>
<template v-if="u&&u.TenantId==27">
<goodsku2 v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku2>
</template>
<template v-else>
<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku"
@close="closeSkuChosen">
:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
</goodsku>
</template>
</view>
<u-empty text="没有找到商品,或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising"
@close="closeShare"></share>
<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising" @close="closeShare"></share>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<coupon v-if="showCoupons" :coupon-message="couponMessage" @goLook="goLook" @closeBtn="closeBtn"></coupon>
</view>
......@@ -1252,6 +1225,7 @@
font-size: 44rpx;
font-weight: bold;
}
.origin {
font-family: "oswald";
font-size: 28rpx;
......
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