update
This commit is contained in:
ylj20011123
parent
35e40eb558
commit
b59c3ed264
@ -25,7 +25,7 @@
|
||||
@click="handleGoDetail(item)">
|
||||
<view class="imageWrapper">
|
||||
<image class="productImg" :src="item.IMAGE_PATH || '/static/images/home/defultImg.png'"
|
||||
mode="aspectFill" />
|
||||
mode="aspectFit" />
|
||||
</view>
|
||||
<view class="productInfo">
|
||||
<view class="productTitle">{{ item.COMMODITY_NAME }}</view>
|
||||
@ -256,35 +256,44 @@ export default {
|
||||
.productItem {
|
||||
width: 345rpx;
|
||||
background: #fff;
|
||||
border-radius: 16rpx;
|
||||
border-radius: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
|
||||
|
||||
.imageWrapper {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 345rpx;
|
||||
height: 320rpx;
|
||||
background: #fff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 20rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.productImg {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 12rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.productInfo {
|
||||
padding: 16rpx;
|
||||
padding: 20rpx;
|
||||
|
||||
.productTitle {
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
height: 80rpx;
|
||||
height: 76rpx;
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
line-clamp: 2;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
margin-bottom: 12rpx;
|
||||
margin-bottom: 16rpx;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.productBottom {
|
||||
|
||||
@ -70,6 +70,9 @@
|
||||
|
||||
<view class="orderItemFooter">
|
||||
<view class="descText" v-if="order.SALEBILL_DESC">{{ order.SALEBILL_DESC }}</view>
|
||||
<view class="actionBtns">
|
||||
<view class="btn confirm" @click.stop="handleConfirmReceipt(order)">验收确认</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="noMore" v-if="isOver">我是有底线的</view>
|
||||
@ -237,6 +240,20 @@ export default {
|
||||
uni.navigateTo({
|
||||
url: `/pages/ownWater/waterOrderDetail?id=${order.PURCHASE_ID || order.SALEBILL_ID}`
|
||||
});
|
||||
},
|
||||
// 验收确认
|
||||
handleConfirmReceipt(order) {
|
||||
uni.showModal({
|
||||
title: '验收确认',
|
||||
content: '确认已收到该订单的商品吗？',
|
||||
confirmColor: '#F83D3D',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
// TODO: 调用后端验收确认接口
|
||||
uni.showToast({ title: '已确认验收', icon: 'success' });
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -344,7 +361,7 @@ export default {
|
||||
position: relative;
|
||||
|
||||
&.active {
|
||||
color: #1890FF;
|
||||
color: #F83D3D;
|
||||
font-weight: bold;
|
||||
|
||||
&::after {
|
||||
@ -353,7 +370,7 @@ export default {
|
||||
bottom: 0;
|
||||
width: 48rpx;
|
||||
height: 6rpx;
|
||||
background: #1890FF;
|
||||
background: #F83D3D;
|
||||
border-radius: 4rpx;
|
||||
}
|
||||
}
|
||||
@ -404,7 +421,7 @@ export default {
|
||||
|
||||
.orderStatus {
|
||||
font-size: 28rpx;
|
||||
color: #1890FF;
|
||||
color: #F83D3D;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
@ -492,6 +509,7 @@ export default {
|
||||
|
||||
.actionBtns {
|
||||
display: flex;
|
||||
margin-left: auto;
|
||||
|
||||
.btn {
|
||||
height: 60rpx;
|
||||
@ -509,8 +527,16 @@ export default {
|
||||
}
|
||||
|
||||
&.active {
|
||||
border: 1rpx solid #1890FF;
|
||||
color: #1890FF;
|
||||
border: 1rpx solid #F83D3D;
|
||||
color: #F83D3D;
|
||||
}
|
||||
|
||||
&.confirm {
|
||||
background: #F2F5F6;
|
||||
color: #E84D38;
|
||||
font-weight: 500;
|
||||
padding: 0 32rpx;
|
||||
border-radius: 4rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -573,16 +599,16 @@ export default {
|
||||
color: #333;
|
||||
|
||||
&.active {
|
||||
background: #E7F3FF;
|
||||
color: #1890FF;
|
||||
border: 1rpx solid #1890FF;
|
||||
background: rgba(248, 61, 61, 0.1);
|
||||
color: #F83D3D;
|
||||
border: 1rpx solid #F83D3D;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.confirmBtn {
|
||||
height: 88rpx;
|
||||
background: #1890FF;
|
||||
background: #F83D3D;
|
||||
color: #fff;
|
||||
border-radius: 44rpx;
|
||||
display: flex;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<view class="swiperBox">
|
||||
<swiper class="swiper" circular indicator-dots indicator-active-color="#4BCB7E">
|
||||
<swiper-item v-for="(img, index) in swiperImgs" :key="index">
|
||||
<image class="swiperImg" :src="img" mode="aspectFill" @click="handlePreview(index)" />
|
||||
<image class="swiperImg" :src="img" mode="aspectFit" @click="handlePreview(index)" />
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
</view>
|
||||
@ -119,7 +119,7 @@ export default {
|
||||
|
||||
<style lang="less" scoped>
|
||||
.main {
|
||||
background: #f8f9fa;
|
||||
background: #f0f2f5;
|
||||
min-height: 100vh;
|
||||
position: relative;
|
||||
}
|
||||
@ -170,8 +170,10 @@ export default {
|
||||
|
||||
.swiperBox {
|
||||
width: 100%;
|
||||
height: 650rpx;
|
||||
background: #fff;
|
||||
height: 600rpx;
|
||||
background: linear-gradient(160deg, #f8faf9, #e8f0ec);
|
||||
padding: 20rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.swiper {
|
||||
width: 100%;
|
||||
@ -180,54 +182,62 @@ export default {
|
||||
.swiperImg {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 16rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.infoSection {
|
||||
background: #fff;
|
||||
padding: 30rpx;
|
||||
margin-bottom: 20rpx;
|
||||
padding: 32rpx 30rpx;
|
||||
margin: 20rpx;
|
||||
border-radius: 20rpx;
|
||||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
|
||||
|
||||
.priceBox {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
color: #ff4d4f;
|
||||
margin-bottom: 16rpx;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
.unit {
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
color: #ff4d4f;
|
||||
}
|
||||
|
||||
.price {
|
||||
font-size: 48rpx;
|
||||
font-size: 52rpx;
|
||||
font-weight: bold;
|
||||
margin: 0 4rpx;
|
||||
color: #ff4d4f;
|
||||
}
|
||||
|
||||
.commodityUnit {
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
margin-left: 4rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.productName {
|
||||
font-size: 34rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
line-height: 1.4;
|
||||
color: #222;
|
||||
line-height: 1.5;
|
||||
}
|
||||
}
|
||||
|
||||
.detailSection {
|
||||
background: #fff;
|
||||
padding: 10rpx 30rpx;
|
||||
margin: 0 20rpx 20rpx;
|
||||
border-radius: 20rpx;
|
||||
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
|
||||
|
||||
.detailItem {
|
||||
display: flex;
|
||||
padding: 24rpx 0;
|
||||
border-bottom: 1rpx solid #f0f0f0;
|
||||
padding: 28rpx 0;
|
||||
border-bottom: 1rpx solid #f5f5f5;
|
||||
font-size: 28rpx;
|
||||
|
||||
&:last-child {
|
||||
@ -237,22 +247,17 @@ export default {
|
||||
.label {
|
||||
width: 140rpx;
|
||||
color: #999;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex: 1;
|
||||
color: #333;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.descriptionTip {
|
||||
padding: 40rpx 0;
|
||||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.bottomBar {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
@ -264,21 +269,22 @@ export default {
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.05);
|
||||
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
|
||||
z-index: 100;
|
||||
|
||||
.addBtn {
|
||||
flex: 1;
|
||||
height: 80rpx;
|
||||
background: #4BCB7E;
|
||||
height: 88rpx;
|
||||
background: linear-gradient(135deg, #4BCB7E, #36b068);
|
||||
color: #fff;
|
||||
border-radius: 40rpx;
|
||||
border-radius: 44rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 30rpx;
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
box-shadow: 0 6rpx 12rpx rgba(75, 203, 126, 0.2);
|
||||
letter-spacing: 4rpx;
|
||||
box-shadow: 0 8rpx 20rpx rgba(75, 203, 126, 0.3);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -8,12 +8,19 @@
|
||||
"condition": {
|
||||
"miniprogram": {
|
||||
"list": [
|
||||
{
|
||||
"name": "pages/complaints/addComplaints",
|
||||
"pathName": "pages/complaints/addComplaints",
|
||||
"query": "",
|
||||
"scene": null,
|
||||
"launchMode": "default"
|
||||
},
|
||||
{
|
||||
"name": "pages/eventRegistration/registration",
|
||||
"pathName": "pages/eventRegistration/registration",
|
||||
"query": "eventId=37",
|
||||
"scene": null,
|
||||
"launchMode": "default"
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
},
|
||||
{
|
||||
"name": "pages/eventRegistration/index",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user