订单列表,订单详情修改

This commit is contained in:
THK3121 2023-07-11 18:01:46 +08:00
parent 893ca1ed81
commit b8178bdf2b
5 changed files with 2298 additions and 2173 deletions

File diff suppressed because it is too large Load Diff

View File

@ -207,7 +207,7 @@
data: { data: {
product_id: '', product_id: '',
unique: "", unique: "",
number: '' number: 1
}, },
on_line: '' on_line: ''
} }
@ -256,19 +256,27 @@
}, },
// //
creat() { creat() {
if (this.on_line == 1) { if (this.on_line == 1) {
postImport(this.mer_id, this.data).then(res => { if(this.data.number <1){
console.log(res); this.show=false
this.show = false
this.$util.Tips({ this.$util.Tips({
title: res.message title: '入库数量不得小于一件'
})
}else{
postImport(this.mer_id, this.data).then(res => {
console.log(res);
this.show = false
this.$util.Tips({
title: res.message
})
}).catch(err=>{
this.show=false
this.$util.Tips({
title: err.message
})
}) })
}).catch(err=>{ }
this.show=false
this.$util.Tips({
title: err.message
})
})
} }
if (this.on_line == 0) { if (this.on_line == 0) {
console.log('12'); console.log('12');
@ -722,6 +730,7 @@
width: 100%; width: 100%;
margin: auto; margin: auto;
padding: 10px; padding: 10px;
z-index: 0;
h4 { h4 {
font-weight: 400; font-weight: 400;

View File

@ -3,7 +3,7 @@
<view class="top"> <view class="top">
<!-- --> <!-- -->
</view> </view>
<view class="bgc_img" v-if="!this.shopList"> <view class="bgc_img" v-if="this.shopList == ![]">
<image src="@/static/images/empty-box.png" mode="widthFix"></image> <image src="@/static/images/empty-box.png" mode="widthFix"></image>
<view class="txt"> <view class="txt">
暂无商品订单~ 暂无商品订单~

File diff suppressed because it is too large Load Diff

View File

@ -65,7 +65,7 @@
<text class='pColor' v-if="cartArr[4].payStatus == 1">0.00</text> <text class='pColor' v-if="cartArr[4].payStatus == 1">0.00</text>
<text class='pColor' v-else>{{couponData.orderList[0].pay_price}}</text> <text class='pColor' v-else>{{couponData.orderList[0].pay_price}}</text>
</view> </view>
<view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0"> <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 ">
可结算周期到期后再付款{{totalPrice}} 可结算周期到期后再付款{{totalPrice}}
</view> </view>
</view> </view>
@ -176,12 +176,14 @@
groupOrderDetail(this.order_id, this.product_type).then(res => { groupOrderDetail(this.order_id, this.product_type).then(res => {
this.couponData = res.data this.couponData = res.data
this.$nextTick(()=>{ this.$nextTick(()=>{
this.moerTime(this.couponData.interest.start_time) if(this.couponData.interest !== null){
this.moerTime(this.couponData.interest.start_time)
}
}) })
}) })
}, },
SubOrder() { SubOrder() {
if (this.product_type == 98) { if (this.couponData.pay_type == 8) {
postsettle( postsettle(
this.mer_id, { this.mer_id, {
id:this.order_id, id:this.order_id,