This commit is contained in:
parent
bc4a352a2d
commit
e9a8aed642
|
@ -139,7 +139,7 @@
|
||||||
|
|
||||||
// 关闭
|
// 关闭
|
||||||
handleClose() {
|
handleClose() {
|
||||||
if (this.$parent.$parent.load) this.$parent.$parent.load = false;
|
this.$emit('change')
|
||||||
this.$refs.popup.close();
|
this.$refs.popup.close();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,7 @@
|
||||||
<view class="list-one_right-c">
|
<view class="list-one_right-c">
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="list-one_right-b">待发货</view>
|
<view class="list-one_right-b">{{item.order_type == 0?'待发货':'待核销'}} </view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view class="">
|
||||||
|
@ -194,9 +194,7 @@
|
||||||
style="color: #F84221;">{{g.cart_info.productAttr.price.split('.')[1] }}</span>(含快递:¥0.00)
|
style="color: #F84221;">{{g.cart_info.productAttr.price.split('.')[1] }}</span>(含快递:¥0.00)
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="list-three">
|
<view class="list-three">
|
||||||
<view class="list-three-one">
|
<view class="list-three-one">
|
||||||
|
@ -219,7 +217,9 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="list-four">
|
<view class="list-four">
|
||||||
<view class="btn" @click="refundModify(item,1)">备注</view>
|
<view class="btn" @click="refundModify(item,1)">备注</view>
|
||||||
<view class="btn1" @click="shopdetail(item)">去发货</view>
|
<view class="btn1" @click="shopdetail(item)">
|
||||||
|
{{item.order_type == 0?'去发货':'去核销'}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
@ -231,10 +231,7 @@
|
||||||
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
|
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
|
||||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view>
|
<view>
|
||||||
<view class="priceChange" :class="refundMark === true ? 'on' : ''">
|
<view class="priceChange" :class="refundMark === true ? 'on' : ''">
|
||||||
|
@ -551,11 +548,11 @@
|
||||||
// type: 3,
|
// type: 3,
|
||||||
// image: require('@/static/images/index4.png')
|
// image: require('@/static/images/index4.png')
|
||||||
// },
|
// },
|
||||||
// {
|
{
|
||||||
// name: '扫码付款',
|
name: '扫码付款',
|
||||||
// type: 18,
|
type: 18,
|
||||||
// image: require('@/static/images/index25.png')
|
image: require('@/static/images/index25.png')
|
||||||
// },
|
},
|
||||||
// {
|
// {
|
||||||
// name: '进货管理',
|
// name: '进货管理',
|
||||||
// type: 4,
|
// type: 4,
|
||||||
|
@ -652,11 +649,11 @@
|
||||||
type: 2,
|
type: 2,
|
||||||
image: require('@/static/images/index1.png')
|
image: require('@/static/images/index1.png')
|
||||||
},
|
},
|
||||||
// {
|
{
|
||||||
// name: '扫码付款',
|
name: '扫码付款',
|
||||||
// type: 18,
|
type: 18,
|
||||||
// image: require('@/static/images/index25.png')
|
image: require('@/static/images/index25.png')
|
||||||
// },
|
},
|
||||||
{
|
{
|
||||||
name: '提现管理',
|
name: '提现管理',
|
||||||
type: 5,
|
type: 5,
|
||||||
|
@ -761,11 +758,11 @@
|
||||||
type: 23,
|
type: 23,
|
||||||
image: require('@/static/images/index26.png')
|
image: require('@/static/images/index26.png')
|
||||||
},
|
},
|
||||||
// {
|
{
|
||||||
// name: '扫码付款',
|
name: '扫码付款',
|
||||||
// type: 18,
|
type: 18,
|
||||||
// image: require('@/static/images/index25.png')
|
image: require('@/static/images/index25.png')
|
||||||
// },
|
},
|
||||||
// {
|
// {
|
||||||
// name: '进货管理',
|
// name: '进货管理',
|
||||||
// type: 4,
|
// type: 4,
|
||||||
|
@ -805,7 +802,7 @@
|
||||||
where: {
|
where: {
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 3,
|
limit: 3,
|
||||||
status: 2
|
status: 9
|
||||||
},
|
},
|
||||||
where1: {
|
where1: {
|
||||||
product_type: 0
|
product_type: 0
|
||||||
|
@ -1263,10 +1260,16 @@
|
||||||
},
|
},
|
||||||
//界面跳转
|
//界面跳转
|
||||||
shopdetail(item) {
|
shopdetail(item) {
|
||||||
|
if (item.order_type == 0) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/admin/orderDetail/index?id=' + item.order_id + '&mer_id=' + this.userInfoData
|
url: '/pages/admin/orderDetail/index?id=' + item.order_id + '&mer_id=' + this.userInfoData
|
||||||
.service.mer_id
|
.service.mer_id
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: '/pages/admin/order_cancellation/index?mer_id=' + this.userInfoData.service.mer_id
|
||||||
|
})
|
||||||
|
}
|
||||||
},
|
},
|
||||||
//获取订单数据
|
//获取订单数据
|
||||||
getindex() {
|
getindex() {
|
||||||
|
|
|
@ -575,7 +575,8 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
handleClear() {},
|
handleClear() {},
|
||||||
handleChange() {
|
handleChange(val) {
|
||||||
|
if (!val)
|
||||||
this.load = false;
|
this.load = false;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue