|
|
@@ -2,23 +2,23 @@
|
|
|
<view class="goods-template">
|
|
|
<!-- 商品列表 -->
|
|
|
<view class="goods-list clearfix">
|
|
|
- <view v-for="(item, index) in dataList" :key="index" class="goods-item clearfix">
|
|
|
+ <view class="goods-item clearfix">
|
|
|
<view class="shoptitle">
|
|
|
- <view v-if="item.shopPromotion" class="floor-item-act">
|
|
|
- <view class="floor-tags" @click.stop="clickPopupShow(item.shopPromotion)">{{
|
|
|
- item.shopPromotion.name
|
|
|
+ <view v-if="orderInfo.shopPromotion" class="floor-item-act">
|
|
|
+ <view class="floor-tags" @click.stop="clickPopupShow(orderInfo.shopPromotion)">{{
|
|
|
+ orderInfo.shopPromotion.name
|
|
|
}}</view>
|
|
|
</view>
|
|
|
<view class="title-text" v-if="orderInfo.secondHandOrderFlag == 1"
|
|
|
- >{{ item.shopName }}
|
|
|
+ >{{ orderInfo.shopName }}
|
|
|
<label class="paymenttext" v-if="orderInfo.affirmPaymentFlag == 1">已确认打款供应商</label>
|
|
|
</view>
|
|
|
- <view class="title-text" v-else @click="goShophome(item)">
|
|
|
- {{ item.shopName }} <label class="iconfont icon-jinrudianpu"></label>
|
|
|
+ <view class="title-text" v-else @click="goShophome(orderInfo)">
|
|
|
+ {{ orderInfo.shopName }} <label class="iconfont icon-jinrudianpu"></label>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="productlist">
|
|
|
- <view class="goods-pros-t " @click="details(item)">
|
|
|
+ <view class="goods-pros-t" v-for="(item, index) in dataList" :key="index" @click="details(item)">
|
|
|
<view class="pros-left">
|
|
|
<view class="pros-img">
|
|
|
<image :src="item.image" alt="" />
|
|
|
@@ -72,28 +72,36 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class=" product-info clearfix">
|
|
|
- <view class="product-view" v-if="item.returnedNum > 0 || item.actualCancelNum > 0">
|
|
|
- <view class="view-num">已退货/已取消：<text class="text">{{ item.returnedNum }}/{{ item.actualCancelNum }}</text></view>
|
|
|
+ <!-- <view class=" product-info clearfix">
|
|
|
+ <view class="product-view" v-if="orderInfo.returnedNum > 0 || orderInfo.actualCancelNum > 0">
|
|
|
+ <view class="view-num"
|
|
|
+ >已退货/已取消：<text class="text"
|
|
|
+ >{{ orderInfo.returnedNum }}/{{ orderInfo.actualCancelNum }}</text
|
|
|
+ ></view
|
|
|
+ >
|
|
|
</view>
|
|
|
-<!-- <view class="product-view" v-if="item.svipPriceType != 1">
|
|
|
+ <view class="product-view" v-if="item.svipPriceType != 1">
|
|
|
<view class="view-num">折扣：<text class="text">{{ item.discount == null ? '0' : item.discount }}%</text></view>
|
|
|
- </view> -->
|
|
|
+ </view>
|
|
|
<view class="product-view">
|
|
|
- <view class="view-num">税率：<text class="text">{{ item.taxRate }}%</text></view>
|
|
|
+ <view class="view-num"
|
|
|
+ >税率：<text class="text">{{ orderInfo.taxRate }}%</text></view
|
|
|
+ >
|
|
|
</view>
|
|
|
- <!-- <view class="product-view">
|
|
|
+ <view class="product-view">
|
|
|
<view class="view-num">折后单价：<text class="text">￥{{ item.discountPrice | NumFormat }}</text></view>
|
|
|
- </view> -->
|
|
|
+ </view>
|
|
|
<view class="product-view allPrice">
|
|
|
- <view class="view-num">合计：<text class="text">￥{{ item.totalFee | NumFormat }}</text></view>
|
|
|
+ <view class="view-num"
|
|
|
+ >合计：<text class="text">￥{{ orderInfo.totalFee | NumFormat }}</text></view
|
|
|
+ >
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
- <view class="goods-pros-m" v-if="item.note">
|
|
|
+ <view class="goods-pros-m" v-if="orderInfo.note">
|
|
|
<view class="m-text">留言:</view>
|
|
|
<view class="m-input">
|
|
|
- <view class="text">{{ item.note ? item.note : '' }}</view>
|
|
|
+ <view class="text">{{ orderInfo.note ? orderInfo.note : '' }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -101,14 +109,14 @@
|
|
|
<view class="goods-pros-b clearfix">
|
|
|
<view class="pros-price-view">
|
|
|
<view class="price-view-le">商品总额：</view>
|
|
|
- <view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>
|
|
|
+ <view class="price-view-ri">￥{{ orderInfo.productAmount | NumFormat }}</view>
|
|
|
</view>
|
|
|
<view class="pros-price-view">
|
|
|
<view class="price-view-le">运费：</view>
|
|
|
<view class="price-view-ri">{{ orderInfo.postageInfo }}</view>
|
|
|
</view>
|
|
|
- <view class="pros-price-view"v-if="orderInfo.eachDiscount > 0">>
|
|
|
- <view class="price-view-le">优惠：</view>
|
|
|
+ <view class="pros-price-view" v-if="orderInfo.eachDiscount > 0"
|
|
|
+ >> <view class="price-view-le">优惠：</view>
|
|
|
<view class="price-view-ri">￥{{ orderInfo.eachDiscount | NumFormat }}</view>
|
|
|
</view>
|
|
|
<view class="pros-price-view">
|
|
|
@@ -119,7 +127,9 @@
|
|
|
<view class="price-view-le">已付金额：</view>
|
|
|
<view class="price-view-ri">
|
|
|
￥{{ orderInfo.receiptAmount | NumFormat }}
|
|
|
- <text v-if="orderInfo.accountAmount > 0">(余额抵扣：￥{{ orderInfo.accountAmount | NumFormat }})</text>
|
|
|
+ <text v-if="orderInfo.accountAmount > 0"
|
|
|
+ >(余额抵扣：￥{{ orderInfo.accountAmount | NumFormat }})</text
|
|
|
+ >
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="pros-price-view">
|
|
|
@@ -136,7 +146,6 @@
|
|
|
export default {
|
|
|
name: 'goods',
|
|
|
props: {
|
|
|
-
|
|
|
list: {
|
|
|
type: Array
|
|
|
},
|
|
|
@@ -146,9 +155,9 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- dataList: [],
|
|
|
- isHandelShow:false,
|
|
|
- vipFlag: 0,
|
|
|
+ dataList: [],
|
|
|
+ isHandelShow: false,
|
|
|
+ vipFlag: 0
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -176,11 +185,11 @@ export default {
|
|
|
this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
|
|
|
this.dataList = list
|
|
|
},
|
|
|
- handelShowDetails(){
|
|
|
+ handelShowDetails() {
|
|
|
this.isHandelShow = !this.isHandelShow
|
|
|
},
|
|
|
goShophome(shop) {
|
|
|
- if(shop.shopType === 2){
|
|
|
+ if (shop.shopType === 2) {
|
|
|
return
|
|
|
}
|
|
|
this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)
|
|
|
@@ -227,7 +236,7 @@ export default {
|
|
|
padding: 24rpx;
|
|
|
height: auto;
|
|
|
background: #ffffff;
|
|
|
- border-bottom: 1px solid #E1E1E1;
|
|
|
+ border-bottom: 1px solid #e1e1e1;
|
|
|
float: left;
|
|
|
&:last-child {
|
|
|
border-bottom: none;
|
|
|
@@ -239,27 +248,27 @@ export default {
|
|
|
height: 56rpx;
|
|
|
line-height: 56rpx;
|
|
|
margin-bottom: 12rpx;
|
|
|
- .floor-item-act{
|
|
|
- height: 56rpx;
|
|
|
- text-align: center;
|
|
|
- box-sizing: border-box;
|
|
|
- float: left;
|
|
|
- padding: 10rpx 0;
|
|
|
- margin-right: 12rpx;
|
|
|
- .floor-tags{
|
|
|
- height: 28rpx;
|
|
|
- border-radius: 6rpx;
|
|
|
- background-color: #FFFFFF;
|
|
|
- line-height: 28rpx;
|
|
|
- color: $color-system;
|
|
|
- text-align: center;
|
|
|
- display: inline-block;
|
|
|
- padding:0 6rpx;
|
|
|
- font-size: $font-size-20;
|
|
|
- border: 1px solid #FF5B00;
|
|
|
- float: left;
|
|
|
- }
|
|
|
- }
|
|
|
+ .floor-item-act {
|
|
|
+ height: 56rpx;
|
|
|
+ text-align: center;
|
|
|
+ box-sizing: border-box;
|
|
|
+ float: left;
|
|
|
+ padding: 10rpx 0;
|
|
|
+ margin-right: 12rpx;
|
|
|
+ .floor-tags {
|
|
|
+ height: 28rpx;
|
|
|
+ border-radius: 6rpx;
|
|
|
+ background-color: #ffffff;
|
|
|
+ line-height: 28rpx;
|
|
|
+ color: $color-system;
|
|
|
+ text-align: center;
|
|
|
+ display: inline-block;
|
|
|
+ padding: 0 6rpx;
|
|
|
+ font-size: $font-size-20;
|
|
|
+ border: 1px solid #ff5b00;
|
|
|
+ float: left;
|
|
|
+ }
|
|
|
+ }
|
|
|
.title-text {
|
|
|
width: 400rpx;
|
|
|
overflow: hidden;
|
|
|
@@ -294,6 +303,9 @@ export default {
|
|
|
width: 100%;
|
|
|
height: auto;
|
|
|
margin: 20rpx 0;
|
|
|
+ &:last-child{
|
|
|
+ margin-bottom: 0;
|
|
|
+ }
|
|
|
.pros-left {
|
|
|
width: 210rpx;
|
|
|
height: 100%;
|
|
|
@@ -338,7 +350,7 @@ export default {
|
|
|
width: 50%;
|
|
|
.view-num {
|
|
|
float: left;
|
|
|
- .text{
|
|
|
+ .text {
|
|
|
color: #333333;
|
|
|
}
|
|
|
}
|
|
|
@@ -480,29 +492,29 @@ export default {
|
|
|
.goods-pros-b {
|
|
|
width: 100%;
|
|
|
float: left;
|
|
|
- .pros-price-view{
|
|
|
+ .pros-price-view {
|
|
|
width: 100%;
|
|
|
height: 44rpx;
|
|
|
font-size: 24rpx;
|
|
|
line-height: 44rpx;
|
|
|
- .price-view-le{
|
|
|
+ .price-view-le {
|
|
|
float: left;
|
|
|
color: #999999;
|
|
|
text-align: left;
|
|
|
}
|
|
|
- .price-view-ri{
|
|
|
+ .price-view-ri {
|
|
|
float: right;
|
|
|
color: #333333;
|
|
|
text-align: right;
|
|
|
- &.red{
|
|
|
- color: #F94B4B;
|
|
|
+ &.red {
|
|
|
+ color: #f94b4b;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- .pros-price-btn{
|
|
|
+ .pros-price-btn {
|
|
|
width: 100%;
|
|
|
height: 48rpx;
|
|
|
- .btn{
|
|
|
+ .btn {
|
|
|
width: 168rpx;
|
|
|
height: 48rpx;
|
|
|
line-height: 46rpx;
|
|
|
@@ -514,7 +526,6 @@ export default {
|
|
|
margin: 0 auto;
|
|
|
font-size: $font-size-24;
|
|
|
.iconfont {
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
