|
|
@@ -492,125 +492,47 @@
|
|
|
</van-grid>
|
|
|
|
|
|
<view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
|
|
|
- <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
|
|
|
- <van-collapse-item name="{{index+1}}" value="展开">
|
|
|
- <view slot="title">
|
|
|
- <view style="display: flex;">
|
|
|
- <view>商品明细</view>
|
|
|
- <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view wx:for="{{item.goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
|
|
|
-
|
|
|
- <van-card data-item="{{item}}" data-index="{{index}}">
|
|
|
-
|
|
|
- <view slot="thumb">
|
|
|
- <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
|
|
|
- </view>
|
|
|
- <view slot="title" style="display: flex;">
|
|
|
-
|
|
|
- <view style="display: flex;">
|
|
|
-
|
|
|
- <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
|
|
|
- </view>
|
|
|
+ <view style="display: flex; justify-content: space-between;margin: 10rpx 25rpx;font-size: 12px;" catchtap="handleExpandItem" data-type="order-out" data-item="{{item}}" data-index="{{index}}">
|
|
|
+ <view>商品明细</view>
|
|
|
+ <view style="display: flex; align-items: center;">{{!item.showDetailFlag?'展开':'收缩'}}
|
|
|
+ <van-icon style="margin-left: 8rpx;" name="{{!item.showDetailFlag?'arrow-down':'arrow-up'}}" />
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
|
|
|
+ <view wx:if="{{item.showDetailFlag}}" wx:for="{{item.goodsList}}" data-item="{{cItem}}" wx:for-item="cItem" wx:key="childindex" wx:for-index="childindex" border="{{ true }}">
|
|
|
|
|
|
- </view>
|
|
|
+ <van-card data-item="{{cItem}}" data-index="{{childindex}}">
|
|
|
|
|
|
- <view slot="desc">
|
|
|
- <view style="display:flex;width: 100%;">
|
|
|
- <view style="width: 80%;">
|
|
|
- <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
|
|
|
+ <view slot="thumb">
|
|
|
+ <van-image radius="5px" width="80" height="80" src="{{cItem.imagesUrl }}" />
|
|
|
+ </view>
|
|
|
+ <view slot="title" style="display: flex;">
|
|
|
|
|
|
- </view>
|
|
|
+ <view style="display: flex;">
|
|
|
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view slot="price">
|
|
|
- <view style="display: flex;width: 100%;flex-direction: row;">
|
|
|
- <view style="color: red;font-size: 4vw;width: 100%;">
|
|
|
- <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.priceOut}}"></dk-cell>
|
|
|
- </view>
|
|
|
- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.outQty}}</span></view>
|
|
|
- </view>
|
|
|
+ <dk-title titleTag="{{cItem.brandName}}" title="{{cItem.skuModel}}"></dk-title>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view slot="desc">
|
|
|
+ <view style="display:flex;width: 100%;">
|
|
|
+ <view style="width: 80%;">
|
|
|
+ <dk-text fontWeight="nomal" value="{{cItem.skuName}}"></dk-text>
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <view slot="footer">
|
|
|
- <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
|
|
|
- <view style="width: 100%;display: flex;">
|
|
|
- <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
|
|
|
- 明细
|
|
|
- </view>
|
|
|
- <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
|
|
|
- {{item.packageDetailsFlag ? '收起' :'展开'}}
|
|
|
- <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view wx:if="{{item.packageDetailsFlag}}">
|
|
|
-
|
|
|
- <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
|
|
|
- <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
|
|
|
- <view style="display: flex;">
|
|
|
- <view>
|
|
|
- <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
|
|
|
- </view>
|
|
|
- <view style="margin-left:5px;width: 66vw;">
|
|
|
-
|
|
|
- <view style="display: flex;">
|
|
|
-
|
|
|
-
|
|
|
- <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view style="display: flex;font-size:3.2vw; ">
|
|
|
- <text decode>{{item2.skuName}}</text>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view style="display: flex;font-size:3.2vw; ">
|
|
|
- <text decode>{{' '}}</text>
|
|
|
- </view>
|
|
|
- <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
|
|
|
- <view style="display: flex;width: 100%;flex-direction: row;">
|
|
|
- <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
|
|
|
- <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
|
|
|
- </view>
|
|
|
- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="hr"></view>
|
|
|
- <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
|
|
|
- <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
|
|
|
- 备注:<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
-
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view slot="price">
|
|
|
+ <view style="display: flex;width: 100%;flex-direction: row;">
|
|
|
+ <view style="color: red;font-size: 4vw;width: 100%;">
|
|
|
+ <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceOut}}"></dk-cell>
|
|
|
</view>
|
|
|
-
|
|
|
- </van-card>
|
|
|
-
|
|
|
- <van-divider />
|
|
|
+ <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty}}</span></view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
-
|
|
|
- </van-collapse-item>
|
|
|
- </van-collapse>
|
|
|
-
|
|
|
+ </van-card>
|
|
|
+ <van-divider />
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
</view>
|
|
|
|
|
|
<van-empty wx:if="{{orderOutList.length==0}}" description="暂无数据" />
|
|
|
@@ -666,121 +588,49 @@
|
|
|
</van-grid>
|
|
|
|
|
|
<view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
|
|
|
- <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
|
|
|
- <van-collapse-item name="{{index+1}}" value="展开">
|
|
|
- <view slot="title">
|
|
|
- <view style="display: flex;">
|
|
|
- <view>商品明细</view>
|
|
|
- <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view wx:for="{{item.goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
|
|
|
-
|
|
|
- <van-card data-item="{{item}}" data-index="{{index}}">
|
|
|
-
|
|
|
- <view slot="thumb">
|
|
|
- <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
|
|
|
- </view>
|
|
|
- <view slot="title" style="display: flex;">
|
|
|
+ <view style="display: flex; justify-content: space-between;margin: 10rpx 25rpx;font-size: 12px;" catchtap="handleExpandItem" data-type="order-return" data-item="{{item}}" data-index="{{index}}">
|
|
|
+ <view>商品明细</view>
|
|
|
+ <view style="display: flex; align-items: center;">{{!item.showReturnDetailFlag?'展开':'收缩'}}
|
|
|
+ <van-icon style="margin-left: 8rpx;" name="{{!item.showReturnDetailFlag?'arrow-down':'arrow-up'}}" />
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view wx:if="{{item.showReturnDetailFlag}}" wx:for="{{item.goodsList}}" data-item="{{cItem}}" wx:for-item="cItem" wx:key="index" wx:for-index="childindex" border="{{ true }}">
|
|
|
|
|
|
- <view style="display: flex;">
|
|
|
+ <van-card data-item="{{cItem}}" data-index="{{index}}">
|
|
|
|
|
|
- <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
|
|
|
- </view>
|
|
|
+ <view slot="thumb">
|
|
|
+ <van-image radius="5px" width="80" height="80" src="{{cItem.imagesUrl }}" />
|
|
|
+ </view>
|
|
|
+ <view slot="title" style="display: flex;">
|
|
|
|
|
|
+ <view style="display: flex;">
|
|
|
|
|
|
- </view>
|
|
|
+ <dk-title titleTag="{{cItem.brandName}}" title="{{cItem.skuModel}}"></dk-title>
|
|
|
+ </view>
|
|
|
|
|
|
- <view slot="desc">
|
|
|
- <view style="display:flex;width: 100%;">
|
|
|
- <view style="width: 80%;">
|
|
|
- <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
|
|
|
+ </view>
|
|
|
|
|
|
- </view>
|
|
|
+ <view slot="desc">
|
|
|
+ <view style="display:flex;width: 100%;">
|
|
|
+ <view style="width: 80%;">
|
|
|
+ <dk-text fontWeight="nomal" value="{{cItem.skuName}}"></dk-text>
|
|
|
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view slot="price">
|
|
|
- <view style="display: flex;width: 100%;flex-direction: row;">
|
|
|
- <view style="color: red;font-size: 4vw;width: 100%;">
|
|
|
- <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.priceOut}}"></dk-cell>
|
|
|
- </view>
|
|
|
- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.outQty}}</span></view>
|
|
|
- </view>
|
|
|
</view>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <view slot="footer">
|
|
|
- <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
|
|
|
- <view style="width: 100%;display: flex;">
|
|
|
- <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
|
|
|
- 明细
|
|
|
- </view>
|
|
|
- <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
|
|
|
- {{item.packageDetailsFlag ? '收起' :'展开'}}
|
|
|
- <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view wx:if="{{item.packageDetailsFlag}}">
|
|
|
-
|
|
|
- <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
|
|
|
- <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
|
|
|
- <view style="display: flex;">
|
|
|
- <view>
|
|
|
- <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
|
|
|
- </view>
|
|
|
- <view style="margin-left:5px;width: 66vw;">
|
|
|
-
|
|
|
- <view style="display: flex;">
|
|
|
-
|
|
|
-
|
|
|
- <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view style="display: flex;font-size:3.2vw; ">
|
|
|
- <text decode>{{item2.skuName}}</text>
|
|
|
- </view>
|
|
|
-
|
|
|
- <view style="display: flex;font-size:3.2vw; ">
|
|
|
- <text decode>{{' '}}</text>
|
|
|
- </view>
|
|
|
- <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
|
|
|
- <view style="display: flex;width: 100%;flex-direction: row;">
|
|
|
- <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
|
|
|
- <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
|
|
|
- </view>
|
|
|
- <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="hr"></view>
|
|
|
- <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
|
|
|
- <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
|
|
|
- 备注:<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
-
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view slot="price">
|
|
|
+ <view style="display: flex;width: 100%;flex-direction: row;">
|
|
|
+ <view style="color: red;font-size: 4vw;width: 100%;">
|
|
|
+ <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceOut}}"></dk-cell>
|
|
|
</view>
|
|
|
-
|
|
|
- </van-card>
|
|
|
-
|
|
|
- <van-divider />
|
|
|
+ <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty}}</span></view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
+ </van-card>
|
|
|
|
|
|
- </van-collapse-item>
|
|
|
- </van-collapse>
|
|
|
-
|
|
|
+ <van-divider />
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|