|
@@ -29,13 +29,13 @@
|
|
<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
|
|
<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
|
|
<view class="productspec">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
|
|
<view class="productspec">规格:{{pros.productUnit ? pros.productUnit : ''}}</view>
|
|
<view class="product-view">
|
|
<view class="product-view">
|
|
- <view class="view-num price">¥{{ pros.price1 | NumFormat }}</view>
|
|
|
|
|
|
+ <view class="view-num price">¥{{ pros.price | NumFormat }}</view>
|
|
<view class="view-num num"> <text class="small">X</text> {{pros.num+pros.presentNum}}</view>
|
|
<view class="view-num num"> <text class="small">X</text> {{pros.num+pros.presentNum}}</view>
|
|
</view>
|
|
</view>
|
|
<view class="product-view">
|
|
<view class="product-view">
|
|
<view class="view-num">已发货:{{pros.shipmentsNum}}</view>
|
|
<view class="view-num">已发货:{{pros.shipmentsNum}}</view>
|
|
<view class="view-num">已退货:{{pros.returnedNum}}</view>
|
|
<view class="view-num">已退货:{{pros.returnedNum}}</view>
|
|
- <view class="view-num">已退货:{{pros.actualCancelNum}}</view>
|
|
|
|
|
|
+ <view class="view-num">已取消:{{pros.actualCancelNum}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -96,7 +96,7 @@
|
|
<view class="record-list" v-if="payShopRecord.length>0">
|
|
<view class="record-list" v-if="payShopRecord.length>0">
|
|
<view class="record-item" v-for="(item,index) in payShopRecord" :key="index">
|
|
<view class="record-item" v-for="(item,index) in payShopRecord" :key="index">
|
|
<view class="item-time mm">¥{{item.payAmount | NumFormat}}</view>
|
|
<view class="item-time mm">¥{{item.payAmount | NumFormat}}</view>
|
|
- <view class="item-time tt">{{item.payTime}}</view>
|
|
|
|
|
|
+ <view class="item-time tt">{{item.payTime ? item.payTime : '无'}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="record-empty" v-else>
|
|
<view class="record-empty" v-else>
|
|
@@ -210,8 +210,7 @@
|
|
this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.shopOrderId)
|
|
this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.shopOrderId)
|
|
break
|
|
break
|
|
case 'deliver':
|
|
case 'deliver':
|
|
- this.$api.setStorage('shopOrderId',this.shopOrderId)
|
|
|
|
- this.$api.navigateTo('/supplier/pages/deliver/deliver-goods')
|
|
|
|
|
|
+ this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
|
|
break
|
|
break
|
|
}
|
|
}
|
|
},
|
|
},
|