|
|
@@ -57,17 +57,20 @@
|
|
|
class="tui-order-item"
|
|
|
v-for="(order, orderIndex) in orderList"
|
|
|
:key="orderIndex"
|
|
|
- @click.stop="detail(order.orderId)"
|
|
|
+ @click.stop="detail(order.shopOrderId)"
|
|
|
>
|
|
|
<view class="order-title">
|
|
|
<view class="order-title-t">
|
|
|
+ <view class="order-title-tip tui-skeleton-fillet">
|
|
|
+ {{ order.status | statusFilters }}
|
|
|
+ </view>
|
|
|
<text
|
|
|
- class="bage-buss tui-skeleton-fillet"
|
|
|
+ class="bage buss tui-skeleton-fillet"
|
|
|
v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
|
|
|
>协销</text
|
|
|
>
|
|
|
<text
|
|
|
- class="bage-auto tui-skeleton-fillet"
|
|
|
+ class="bage auto tui-skeleton-fillet"
|
|
|
v-if="
|
|
|
order.orderSubmitType == 0 ||
|
|
|
order.orderSubmitType == 1 ||
|
|
|
@@ -75,7 +78,6 @@
|
|
|
"
|
|
|
>自主</text
|
|
|
>
|
|
|
- <text class="bage-text tui-skeleton-fillet">订单编号：{{ order.orderNo }}</text>
|
|
|
<image
|
|
|
class="bage-icon"
|
|
|
src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
|
|
|
@@ -83,102 +85,91 @@
|
|
|
v-if="order.secondHandOrderFlag == 1"
|
|
|
></image>
|
|
|
</view>
|
|
|
- <view class="order-title-b">
|
|
|
- <view class="order-title-btxt tui-skeleton-fillet"
|
|
|
- >下单时间：{{ order.orderTime }}</view
|
|
|
- >
|
|
|
- <view class="order-title-tip tui-skeleton-fillet">{{
|
|
|
- order.status | StateExpFormat
|
|
|
- }}</view>
|
|
|
- </view>
|
|
|
</view>
|
|
|
- <block v-for="(shop, index) in order.shopOrderList" :key="index">
|
|
|
+ <view
|
|
|
+ class="goods-item"
|
|
|
+ v-for="(pros, prosIndex) in order.orderProductList"
|
|
|
+ :key="prosIndex"
|
|
|
+ >
|
|
|
<view class="goods-title">
|
|
|
- <view v-if="shop.shopPromotion" class="floor-item-act">
|
|
|
- <view class="floor-tags">{{ shop.shopPromotion.name }}</view>
|
|
|
+ <view v-if="pros.shopPromotion" class="floor-item-act">
|
|
|
+ <view class="floor-tags">{{ pros.shopPromotion.name }}</view>
|
|
|
+ </view>
|
|
|
+ <view class="title-text tui-skeleton-fillet">
|
|
|
+ {{ pros.shopName }}
|
|
|
</view>
|
|
|
- <view class="title-text tui-skeleton-fillet">{{ shop.shopName }}</view>
|
|
|
</view>
|
|
|
- <view
|
|
|
- class="goods-item"
|
|
|
- v-for="(pros, prosIndex) in shop.orderProductList"
|
|
|
- :key="prosIndex"
|
|
|
- >
|
|
|
- <view class="goods-pros-t">
|
|
|
- <view class="pros-img tui-skeleton-fillet">
|
|
|
- <image :src="pros.image" alt="" />
|
|
|
- <text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1"
|
|
|
- >赠品</text
|
|
|
- >
|
|
|
- </view>
|
|
|
- <view class="pros-product">
|
|
|
- <view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
|
|
|
+ <view class="goods-pros-t">
|
|
|
+ <view class="pros-img tui-skeleton-fillet">
|
|
|
+ <image :src="pros.image" alt="" />
|
|
|
+ <text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1"
|
|
|
+ >赠品</text
|
|
|
+ >
|
|
|
+ </view>
|
|
|
+ <view class="pros-product clearfix">
|
|
|
+ <view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
|
|
|
+ <view
|
|
|
+ class="productspec tui-skeleton-fillet"
|
|
|
+ v-if="pros.productCategory != 2"
|
|
|
+ >规格:{{ pros.productUnit }}</view
|
|
|
+ >
|
|
|
+ <view class="productprice">
|
|
|
<view
|
|
|
- class="productspec tui-skeleton-fillet"
|
|
|
- v-if="pros.productCategory != 2"
|
|
|
- >规格:{{ pros.productUnit }}</view
|
|
|
+ class="price tui-skeleton-fillet"
|
|
|
+ :class="
|
|
|
+ pros.svipPriceFlag == 1 ||
|
|
|
+ PromotionsFormat(pros.productPromotion)
|
|
|
+ ? 'none'
|
|
|
+ : ''
|
|
|
+ "
|
|
|
>
|
|
|
- <view class="productprice">
|
|
|
+ <text>￥{{ pros.price | NumFormat }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="count tui-skeleton-fillet">
|
|
|
+ <text class="small">x</text>{{ pros.num }}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="floor-item-act">
|
|
|
+ <template v-if="pros.productPromotion">
|
|
|
<view
|
|
|
- class="price tui-skeleton-fillet"
|
|
|
- :class="
|
|
|
- pros.svipPriceFlag == 1 ||
|
|
|
- PromotionsFormat(pros.productPromotion)
|
|
|
- ? 'none'
|
|
|
- : ''
|
|
|
- "
|
|
|
+ v-if="PromotionsFormat(pros.productPromotion)"
|
|
|
+ class="floor-tags"
|
|
|
+ @click.stop="clickPopupShow(pros.productPromotion)"
|
|
|
>
|
|
|
- <text>￥{{ pros.price | NumFormat }}</text>
|
|
|
+ {{ pros.productPromotion.name }}
|
|
|
+ <text
|
|
|
+ v-if="
|
|
|
+ pros.productPromotion != null &&
|
|
|
+ pros.productPromotion.type != 3
|
|
|
+ "
|
|
|
+ >
|
|
|
+ :￥{{
|
|
|
+ pros.productPromotion == null
|
|
|
+ ? '0.00'
|
|
|
+ : pros.productPromotion.touchPrice | NumFormat
|
|
|
+ }}
|
|
|
+ </text>
|
|
|
</view>
|
|
|
- <view class="count tui-skeleton-fillet">
|
|
|
- <text class="small">x</text>{{ pros.num }}
|
|
|
+ <view
|
|
|
+ v-else-if="pros.productPromotion.type != 3"
|
|
|
+ class="floor-tags"
|
|
|
+ @click.stop="clickPopupShow(pros.productPromotion)"
|
|
|
+ >{{ pros.productPromotion.name }}</view
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+ <template v-if="pros.svipPriceFlag == 1">
|
|
|
+ <view class="svip-tags">
|
|
|
+ <view class="tags">SVIP</view>
|
|
|
+ <view class="price">{{ pros.svipPriceTag }}</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
- <view class="floor-item-act">
|
|
|
- <template v-if="pros.productPromotion">
|
|
|
- <view
|
|
|
- v-if="PromotionsFormat(pros.productPromotion)"
|
|
|
- class="floor-tags"
|
|
|
- @click.stop="clickPopupShow(pros.productPromotion)"
|
|
|
- >
|
|
|
- {{ pros.productPromotion.name }}
|
|
|
- <text
|
|
|
- v-if="
|
|
|
- pros.productPromotion != null &&
|
|
|
- pros.productPromotion.type != 3
|
|
|
- "
|
|
|
- >
|
|
|
- :￥{{
|
|
|
- pros.productPromotion == null
|
|
|
- ? '0.00'
|
|
|
- : pros.productPromotion.touchPrice | NumFormat
|
|
|
- }}
|
|
|
- </text>
|
|
|
- </view>
|
|
|
- <view
|
|
|
- v-else-if="pros.productPromotion.type != 3"
|
|
|
- class="floor-tags"
|
|
|
- @click.stop="clickPopupShow(pros.productPromotion)"
|
|
|
- >{{ pros.productPromotion.name }}</view
|
|
|
- >
|
|
|
- </template>
|
|
|
- <template v-if="pros.svipPriceFlag == 1">
|
|
|
- <view class="svip-tags">
|
|
|
- <view class="tags">SVIP</view>
|
|
|
- <view class="price">{{ pros.svipPriceTag }}</view>
|
|
|
- </view>
|
|
|
- </template>
|
|
|
- </view>
|
|
|
+ </template>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </block>
|
|
|
+ </view>
|
|
|
<view class="order-footer">
|
|
|
- <view class="order-footer-top" v-if="order.discountFee != 0"
|
|
|
- >经理折扣：¥{{ order.discountFee | NumFormat }}</view
|
|
|
- >
|
|
|
<view class="order-footer-bot">
|
|
|
- <view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
|
|
|
+ <view class="count tui-skeleton-fillet">共{{ order.itemCount }}件商品</view>
|
|
|
<view
|
|
|
class="money tui-skeleton-fillet"
|
|
|
v-if="order.status == 31 || order.status == 32 || order.status == 33"
|
|
|
@@ -189,7 +180,7 @@
|
|
|
</view>
|
|
|
<view class="money tui-skeleton-fillet" v-else>
|
|
|
待付总额：<label style="color:#f94b4b ;"
|
|
|
- >¥{{ order.pendingPayments | NumFormat }}</label
|
|
|
+ >¥{{ order.obligation | NumFormat }}</label
|
|
|
>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -204,8 +195,8 @@
|
|
|
/>
|
|
|
</view>
|
|
|
<!--加载loadding-->
|
|
|
- <tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
|
|
|
- <tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
|
|
|
+ <tui-loadmore :visible="loadding" :index="3" type="black" />
|
|
|
+ <tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
|
|
|
<!--加载loadding-->
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -220,7 +211,7 @@
|
|
|
@paymentConfirm="hanldPaymentConfirm"
|
|
|
/>
|
|
|
<!-- 分享弹窗 -->
|
|
|
- <cm-share-popup :orderId="btnoRderID" v-if="isShareModal" @shareConfirm="onShareAppMessage" />
|
|
|
+ <cm-share-popup :shopOrderId="handleShopOrderId" v-if="isShareModal" @shareConfirm="onShareAppMessage" />
|
|
|
<!-- 采美豆提示弹窗 -->
|
|
|
<activityBean
|
|
|
v-if="isActivityBean"
|
|
|
@@ -331,8 +322,8 @@ export default {
|
|
|
//处理金额
|
|
|
return Number(value).toFixed(2)
|
|
|
},
|
|
|
- StateExpFormat(state) {
|
|
|
- //订单状态文字和颜色
|
|
|
+ statusFilters(value) {
|
|
|
+ //处理订单状态显示
|
|
|
const map = {
|
|
|
0: '待确认',
|
|
|
2: '交易完成',
|
|
|
@@ -349,8 +340,8 @@ export default {
|
|
|
32: '已付款部分发货',
|
|
|
33: '已付款已发货'
|
|
|
}
|
|
|
- return map[state]
|
|
|
- },
|
|
|
+ return map[value]
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
subMitSearch() {
|
|
|
@@ -654,7 +645,7 @@ export default {
|
|
|
}
|
|
|
return {
|
|
|
title: '您有新的分享订单，快来查看吧~',
|
|
|
- path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userId=${this.listQuery.userId}`,
|
|
|
+ path: `/pages/user/order/order-sharelogin?shopOrderId=${this.handleShopOrderId}&userId=${this.listQuery.userId}`,
|
|
|
imageUrl: 'https://static.caimei365.com/app/img/bg/min-banner.jpg'
|
|
|
}
|
|
|
},
|
|
|
@@ -927,56 +918,34 @@ page {
|
|
|
height: 50rpx;
|
|
|
display: block;
|
|
|
position: absolute;
|
|
|
- right: 0;
|
|
|
- top: 9rpx;
|
|
|
+ right: 110rpx;
|
|
|
+ top: 12rpx;
|
|
|
}
|
|
|
- .bage-buss {
|
|
|
+ .bage{
|
|
|
display: inline-block;
|
|
|
width: 72rpx;
|
|
|
- height: 30rpx;
|
|
|
- background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
|
|
|
+ height: 32rpx;
|
|
|
+ margin: 19rpx 10rpx 0 10rpx;
|
|
|
border-radius: 4rpx;
|
|
|
- line-height: 30rpx;
|
|
|
+ line-height: 32rpx;
|
|
|
font-size: $font-size-22;
|
|
|
text-align: center;
|
|
|
color: #ffffff;
|
|
|
- }
|
|
|
- .bage-auto {
|
|
|
- display: inline-block;
|
|
|
- width: 72rpx;
|
|
|
- height: 30rpx;
|
|
|
- background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
|
|
|
- border-radius: 4rpx;
|
|
|
- line-height: 30rpx;
|
|
|
- font-size: $font-size-22;
|
|
|
- text-align: center;
|
|
|
- color: #ffffff;
|
|
|
- }
|
|
|
- .bage-text {
|
|
|
- display: inline-block;
|
|
|
- font-size: $font-size-28;
|
|
|
- line-height: 68rpx;
|
|
|
- text-align: left;
|
|
|
- color: $color-system;
|
|
|
- margin-left: 10rpx;
|
|
|
- }
|
|
|
- }
|
|
|
- .order-title-b {
|
|
|
- width: 100%;
|
|
|
- height: 40rpx;
|
|
|
- float: left;
|
|
|
- margin-top: 8rpx;
|
|
|
- .order-title-btxt {
|
|
|
- float: left;
|
|
|
- font-size: $font-size-28;
|
|
|
- line-height: 40rpx;
|
|
|
- color: #999999;
|
|
|
- text-align: lef;
|
|
|
+ float: right;
|
|
|
+ &.buss{
|
|
|
+ background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
|
|
|
+ }
|
|
|
+ &.auto{
|
|
|
+ background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
|
|
|
+ }
|
|
|
+ &.ebate{
|
|
|
+ background: #ff7a51;
|
|
|
+ }
|
|
|
}
|
|
|
.order-title-tip {
|
|
|
- float: right;
|
|
|
+ float: left;
|
|
|
font-size: $font-size-28;
|
|
|
- line-height: 40rpx;
|
|
|
+ line-height: 68rpx;
|
|
|
text-align: right;
|
|
|
color: #ff2a2a;
|
|
|
}
|
xiebaomin