Web/daimp-front
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

备份前

Browse Source
This commit is contained in:
“13713575202” 2025-04-14 16:47:58 +08:00
parent df05725495
commit b49ee49312
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sub-operation-service/src/views/userCenter/shoppingCart.vue
View File

@ -249,12 +249,12 @@ const doSingleDel = (indexP, index) => {
width: 100%; width: 100%;
.page-content-warp { .page-content-warp {
width: 100%; width: 100%;
height: calc(100vh - 116px); height: calc(100vh - 135px);
position: relative; position: relative;
background: $color-fff; background: $color-fff;
border-radius: 16px; border-radius: 16px;
overflow: hidden; overflow: hidden;
margin: 16px 0; margin: 16px 0 0 16px;
.fix-top, .fix-top,
.fix-bottom { .fix-bottom {
position: absolute; position: absolute;

57
sub-operation-service/src/views/userCenter/userOrders.vue
View File

@ -32,23 +32,23 @@
<div v-if="o.goodlist && o.goodlist.length > 0" class="order-item-content"> <div v-if="o.goodlist && o.goodlist.length > 0" class="order-item-content">
<div class="content-list"> <div class="content-list">
<div v-for="(g, indexg) in o.goodlist" :key="indexg" class="good-item"> <div v-for="(g, indexg) in o.goodlist" :key="indexg" class="good-item">
<div class="good-img" @click="toCheckGood(index, indexg)"> <div class="good-img">
<costomImg <costomImg
:url="'images/ecommerce/' + 'pic.png'" :url="'images/ecommerce/' + 'pic.png'"
:preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']" :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')?.href ?? '']"
:is-view="false" :is-view="false"
></costomImg> ></costomImg>
</div> </div>
<div class="good-info" @click="toCheckGood(index, indexg)"> <div class="good-info">
<div class="good-info-pos"> <div class="good-info-pos">
<div class="txt-ellipsis clamp2">{{ g.title || '--' }}</div> <div class="txt-ellipsis clamp2">{{ g.title || '--' }}</div>
</div> </div>
</div> </div>
<div class="good-price-num"> <div class="good-price-num">
<div class="good-price-num-pos"> <div class="good-price-num-pos">
<div class="price" @click="toCheckGood(index, indexg)">{{ g.price }} / {{ g.unit }} * {{ g.num }}</div> <div class="price">{{ g.price }} / {{ g.unit }} * {{ g.num }}</div>
<div class="total" @click="toCheckGood(index, indexg)"> <div class="total">
<div class="amount">{{ (g.price * g.num).toFixed(2) }}</div> <div class="amount">{{ (g.price * g.num + g.carriage).toFixed(2) }}</div>
<div class="carriage">( 含运费{{ g.carriage.toFixed(2) }})</div> <div class="carriage">( 含运费{{ g.carriage.toFixed(2) }})</div>
</div> </div>
</div> </div>
@ -56,7 +56,17 @@
</div> </div>
</div> </div>
<div class="content-right"> <div class="content-right">
<div class="content-right-pos"></div> <div class="content-right-pos">
<div v-if="o.status == 0" class="right-item do-btn">
<el-button type="primary" @click="doPay">立即付款</el-button>
</div>
<div v-if="o.status == 0" class="right-item do-btn">
<el-button @click="doPay">取消订单</el-button>
</div>
<div v-if="o.status != 0" class="right-item">已发货</div>
<div v-if="o.status != 0" class="right-item text-link">快递单号</div>
<div class="right-item text-link">订单详情</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -88,7 +98,8 @@ let orderList = reactive([
id: '1', id: '1',
orderNo: 'YH8888888888', orderNo: 'YH8888888888',
createTime: '2025.01.01 10:00:00', createTime: '2025.01.01 10:00:00',
payAmount: 147, payAmount: 81,
status: 0,
goodlist: [ goodlist: [
{ id: '001', title: '耿马镇 原生态 有机 西红柿', price: 4.9, unit: '份', num: 10, carriage: 6 }, { id: '001', title: '耿马镇 原生态 有机 西红柿', price: 4.9, unit: '份', num: 10, carriage: 6 },
{ id: '002', title: '耿马镇 原生态 有机 西蓝花', price: 2.6, unit: '份', num: 10, carriage: 0 }, { id: '002', title: '耿马镇 原生态 有机 西蓝花', price: 2.6, unit: '份', num: 10, carriage: 0 },
@ -98,14 +109,28 @@ let orderList = reactive([
id: '2', id: '2',
orderNo: 'YH8888888889', orderNo: 'YH8888888889',
createTime: '2025.02.01 10:00:00', createTime: '2025.02.01 10:00:00',
payAmount: 147, payAmount: 110,
status: 1,
goodlist: [ goodlist: [
{ id: '001', title: '耿马镇 原生态 有机 西红柿', price: 4.8, unit: '份', num: 10, carriage: 6 }, { id: '001', title: '耿马镇 原生态 有机 西红柿', price: 4.8, unit: '份', num: 10, carriage: 6 },
{ id: '002', title: '耿马镇 原生态 有机 西蓝花', price: 2.5, unit: '份', num: 10, carriage: 6 }, { id: '002', title: '耿马镇 原生态 有机 西蓝花', price: 2.5, unit: '份', num: 10, carriage: 6 },
{ id: '002', title: '耿马镇 原生态 有机 茄子', price: 2.5, unit: '份', num: 10, carriage: 0 }, { id: '002', title: '耿马镇 原生态 有机 茄子', price: 2.5, unit: '份', num: 10, carriage: 0 },
], ],
}, },
{
id: '3',
orderNo: 'YH8888888899',
createTime: '2025.02.01 10:00:00',
payAmount: 85,
status: 2,
goodlist: [
{ id: '001', title: '勐简镇 原生态 有机 西红柿', price: 4.8, unit: '份', num: 10, carriage: 6 },
{ id: '002', title: '勐简镇 原生态 有机 西蓝花', price: 2.5, unit: '份', num: 10, carriage: 6 },
],
},
]); ]);
const doPay = () => {};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.user-orders-warp { .user-orders-warp {
@ -202,7 +227,7 @@ let orderList = reactive([
vertical-align: top; vertical-align: top;
} }
.content-list { .content-list {
width: 100%; width: calc(100% - 160px);
.good-item { .good-item {
display: inline-flex; display: inline-flex;
width: 100%; width: 100%;
@ -265,10 +290,24 @@ let orderList = reactive([
} }
} }
.content-right { .content-right {
width: 160px;
display: inline-flex; display: inline-flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
text-align: center;
.content-right-pos { .content-right-pos {
.text-normal {
cursor: pointer;
font-size: 16px;
}
.text-link {
color: $color-main;
cursor: pointer;
font-size: 16px;
}
}
.do-btn {
margin-top: 8px;
} }
} }
} }