This commit is contained in:
2025-03-19 15:05:33 +08:00
parent a2bf3311f9
commit d1b9024fb1
9 changed files with 1721 additions and 1109 deletions

View File

@@ -43,27 +43,100 @@
<view class="commodityContent">
<view
class="commodityPrice"
style="padding-top: 4px !important"
v-if="productInfo.activityPrice && productInfo.activityPrice > 0"
>
<span style="font-size: 28rpx"></span
><em>{{ productInfo.activityPrice }}</em>
><span
v-if="
productInfo.isVipPrice == 1 &&
productInfo.vipPrice != 0 &&
productInfo.vipPrice != null
"
style="
margin-right: 10px;
text-align: center;
font-size: 18rpx;
background-color: #f94f04;
color: #fff;
font-weight: bold;
border-radius: 4px;
width: 120rpx;
padding: 2px 4px;
box-sizing: border-box;
"
>VIP优惠图书</span
>
<span style="font-size: 28rpx">¥</span>
<em
v-if="
productInfo.isVipPrice == 1 &&
productInfo.vipPrice != 0 &&
productInfo.vipPrice != null
"
>{{ productInfo.vipPrice }}</em
>
<em v-else>{{ productInfo.activityPrice }}</em>
<span class="oldPrice"
>原价<span style="font-size: 20rpx; padding-left: 10rpx">¥</span
>{{ productInfo.price }}</span
>
</view>
<view class="commodityPrice" v-else>
<span style="font-size: 28rpx"></span><em>{{ productInfo.price }}</em>
<view class="commodityPrice" v-else style="padding-top: 4px !important">
<span
v-if="
productInfo.isVipPrice == 1 &&
productInfo.vipPrice != 0 &&
productInfo.vipPrice != null
"
style="
margin-right: 10px;
text-align: center;
font-size: 18rpx;
background-color: #f94f04;
color: #fff;
font-weight: bold;
border-radius: 4px;
width: 120rpx;
padding: 2px 4px;
box-sizing: border-box;
"
>VIP优惠图书</span
>
<template
v-if="
productInfo.isVipPrice == 1 &&
productInfo.vipPrice != 0 &&
productInfo.vipPrice != null
"
><span style="font-size: 28rpx">¥</span>
<em>{{ productInfo.vipPrice }}</em
><span class="oldPrice"
>原价<span style="font-size: 20rpx; padding-left: 10rpx">¥</span
>{{ productInfo.price }}</span
></template
>
<template v-else>
<span style="font-size: 28rpx">¥</span
><em>{{ productInfo.price }}</em>
</template>
</view>
<view class="commodityyName">
{{ productInfo.productName }}
<span
v-if="productInfo.productStock == 0"
style="color: #aaa; font-size: 26rpx"
style="color: #aaa; font-size: 28rpx"
>(无货)</span
>
<view
><text class="SoldNumber"
style="
display: flex;
align-items: center;
justify-content: space-between;
"
>
<text class="SoldNumber"
>已售<span style="padding-left: 10rpx">{{
productInfo.sumSales
}}</span
@@ -86,7 +159,7 @@
itemClass="itemCouponClass"
>
</common-coupon>
</view>
</view>
</view>
</template>
@@ -102,6 +175,7 @@
<view v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
<view
class="spbh"
style="margin-top: 10px"
v-for="(item, index) in linkProducts"
:key="item.id"
>
@@ -112,13 +186,91 @@
<view class="spbhimg">
<image :src="item.productImages" mode="aspectFit"></image>
</view>
<text class="username nowrap">{{ item.productName }}</text>
<text
<view>
<text class="username">{{ item.productName }} </text>
<br />
<!-- <text
class="price"
v-if="item.activityPrice && item.activityPrice > 0"
>¥{{ item.activityPrice }}</text
>
<text class="price" v-else>{{ item.price }}</text>
<text class="price" v-else>¥{{ item.price }}</text> -->
<text
class="price"
v-if="
item.isVipPrice == 1 &&
item.vipPrice != 0 &&
item.vipPrice != null
"
>
<text
style="color: #e97512; font-size: 15px; font-weight: bold"
>¥{{ item.vipPrice.toFixed(2) }}</text
>
<!-- <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
>VIP到手价</text
> -->
<text
style="
color: #8a8a8a;
font-size: 14px;
margin-left: 4px;
font-weight: bold;
text-decoration: line-through;
"
>¥{{ Number(item.price).toFixed(2) }}</text
>
</text>
<text
v-else-if="item.activityPrice && item.activityPrice > 0"
class="price"
>
<text
style="color: #e97512; font-size: 15px; font-weight: bold"
>¥{{ item.activityPrice.toFixed(2) }}</text
>
<!-- <text style="color: #613804; font-size: 10px; margin-left: 4px"
>活动价</text
> -->
<text
style="
color: #8a8a8a;
font-size: 14px;
margin-left: 4px;
font-weight: bold;
text-decoration: line-through;
"
>¥{{ Number(item.price).toFixed(2) }}</text
>
</text>
<text
v-else
class="price"
style="color: #e97512; font-size: 15px"
>¥{{ Number(item.price).toFixed(2) }}</text
>
<text
v-if="
item.isVipPrice == 1 &&
item.vipPrice != 0 &&
item.vipPrice != null
"
style="
z-index: 10;
margin-left: 10rpx;
font-size: 20rpx;
color: #f94f04;
font-weight: bold;
"
>VIP优惠</text
>
</view>
</view>
</view>
</view>
@@ -396,7 +548,7 @@
<u-popup :show="upoShow" :round="10" @close="closeUpo" style="z-index: 2">
<view class="tanchu">
<view class="list">
<view class="imgBox">
<view class="imgBox" style="position: relative">
<image
v-if="linkimg == ''"
src="../../static/icon/wufeng.jpg"
@@ -430,13 +582,95 @@
<view class="spbhimg">
<image :src="item.productImages" mode="aspectFit"></image>
</view>
<text class="username nowrap">{{ item.productName }}</text>
<text
<view>
<text class="username">{{ item.productName }} </text>
<br />
<!-- <text
class="price"
v-if="item.activityPrice && item.activityPrice > 0"
>¥{{ item.activityPrice }}</text
>
<text class="price" v-else>{{ item.price }}</text>
<text class="price" v-else>¥{{ item.price }}</text> -->
<text
class="price"
v-if="
item.isVipPrice == 1 &&
item.vipPrice != 0 &&
item.vipPrice != null
"
>
<text
style="color: #e97512; font-size: 15px; font-weight: bold"
>¥{{ item.vipPrice.toFixed(2) }}</text
>
<!-- <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
>VIP到手价</text
> -->
<text
style="
color: #8a8a8a;
font-size: 14px;
margin-left: 4px;
font-weight: bold;
text-decoration: line-through;
"
>¥{{ Number(item.price).toFixed(2) }}</text
>
</text>
<text
v-else-if="item.activityPrice && item.activityPrice > 0"
class="price"
>
<text
style="
color: #e97512;
font-size: 15px;
font-weight: bold;
"
>¥{{ item.activityPrice.toFixed(2) }}</text
>
<!-- <text style="color: #613804; font-size: 10px; margin-left: 4px"
>活动价</text
> -->
<text
style="
color: #8a8a8a;
font-size: 14px;
margin-left: 4px;
font-weight: bold;
text-decoration: line-through;
"
>¥{{ Number(item.price).toFixed(2) }}</text
>
</text>
<text
v-else
class="price"
style="color: #e97512; font-size: 15px;"
>¥{{ Number(item.price).toFixed(2) }}</text
>
<text
v-if="
item.isVipPrice == 1 &&
item.vipPrice != 0 &&
item.vipPrice != null
"
style="
z-index: 10;
margin-left: 10rpx;
font-size: 20rpx;
color: #f94f04;
font-weight: bold;
"
>VIP优惠</text
>
</view>
</view>
</view>
</view>
@@ -476,7 +710,7 @@ import loginVue from "../user/login.vue";
export default {
data() {
return {
canGetCouponList:[],
canGetCouponList: [],
qunyiList: [
{
name: "打卡",
@@ -583,8 +817,8 @@ export default {
musicPlay,
},
methods: {
// 获取购买后可获得优惠券列表
async getCanGetCouponList() {
// 获取购买后可获得优惠券列表
async getCanGetCouponList() {
await this.$http
.request({
url: "common/coupon/couponToProductList",
@@ -600,7 +834,7 @@ export default {
},
})
.then(async (res) => {
if (res.code != 0) return ;
if (res.code != 0) return;
console.log("res优惠券", res);
this.canGetCouponList = res.couponToShopproductPage.records;
})
@@ -1262,6 +1496,7 @@ export default {
}
.spbh {
margin-top: 10px;
border: 2rpx solid #fff;
.spbhimg {
@@ -1382,7 +1617,7 @@ export default {
.spbh {
padding-bottom: 10rpx;
font-size: 26rpx;
font-size: 28rpx;
padding: 0 10rpx;
}
@@ -1402,7 +1637,8 @@ export default {
}
.username {
margin-left: 10rpx;
padding-left: 20rpx;
text-align: justify;
}
.price {
@@ -1432,7 +1668,7 @@ export default {
}
.username {
font-size: 24rpx;
font-size: 26rpx;
color: #999;
margin-top: 6rpx;
}
@@ -1474,7 +1710,7 @@ export default {
// padding: 20px 10px;
// line-height: 30rpx;
// background-color: #fff;
font-size: 26rpx;
font-size: 28rpx;
color: #555;
// border-radius: 20rpx 20rpx 0 0
}
@@ -1500,7 +1736,7 @@ export default {
background-color: #fff;
padding: 30rpx 30rpx 10rpx 30rpx;
height: auto;
font-size: 26rpx;
font-size: 28rpx;
.commodityPrice {
// background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
@@ -1633,7 +1869,7 @@ export default {
}
.quanyi_item {
font-size: 26rpx;
font-size: 28rpx;
width: auto;
border-radius: 10rpx;

View File

@@ -33,8 +33,11 @@
<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
</view>
<template v-if="orderContet.orderType == 'order' && orderContet.goodsList.length > 0">
<view class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
<view style="position: relative;" class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
@click="goDetail(item.productId)" >
<!-- <span v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null"
style="position: absolute;z-index: 10;top: 4px;left: 0px;margin-right: 10px;text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff;font-weight: bold;border-radius:4px;width: 80rpx; padding:2px 4px;box-sizing: border-box;">VIP优惠</span>
-->
<image :src="item.productImage" mode=""></image>
<view class="itemJian">
<view class="orderTitle">
@@ -94,6 +97,15 @@
<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
<span></span>{{orderContet.shippingPrice}}
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.districtPrice&&orderContet.districtPrice>0">
<span style="color: #666;margin-right: 10rpx;float: left;"> 活动立减: </span>
<span style="color: #fa2d12">- {{orderContet.districtPrice}}</span>
</view>
<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.vipDiscountAmount&&orderContet.vipDiscountAmount>0">
<span style="color: #666;margin-right: 10rpx;float: left;"> <span style="color: #f94f04;font-weight: bold;margin-right: 2px;">VIP</span> 专享立减: </span>
<span style="color: #fa2d12">- {{orderContet.vipDiscountAmount}}</span>
</view>
<!-- <view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
<b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-</span>{{orderContet.coupon.couponAmount}}</b>

View File

@@ -32,7 +32,11 @@
<view class="orderstatus" v-show="item.orderStatus == 4">交易失败</view>
<view class="orderstatus" v-show="item.orderStatus == 5">过期</view>
<template v-if="item.orderType == 'order'">
<view v-for="(item1,index1) in item.productList" :key="index1" class="bookinfolist">
<view style="position: relative;" v-for="(item1,index1) in item.productList" :key="index1" class="bookinfolist">
<!--
<span v-if="item1.product.isVipPrice==1&&item1.product.vipPrice!=0&&item1.vipPrice!=null"
style="position: absolute;z-index: 10;top: 4px;left: 0px;margin-right: 10px;text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff;font-weight: bold;border-radius:4px;width: 80rpx; padding:2px 4px;box-sizing: border-box;">VIP优惠</span>
-->
<image class="feng" v-if="item1.product.productImages" :src="item1.product.productImages" mode="aspectFill"></image>
<!-- <view class="description" v-html="item.content">
</view> -->
@@ -317,6 +321,8 @@ import { data } from 'jquery';
"limit": 10,
"page": this.newestpage
}
console.log('params at line 324:', params)
$http.request({
url: "book/buyOrder/getUserOrderList",
method: "POST", // POST、GET、PUT、DELETE具体说明查看官方文档

File diff suppressed because it is too large Load Diff