cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.dayouqiantu.cn/develop/yshop-uniapp

Browse Source
This commit is contained in:
Gaoxs
2021-01-12 15:21:38 +08:00
parent dec56d700e 1a9d9bcb1d
commit 349229b3be
10 changed files with 176 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/order/OrderSubmission/index.vue
View File

@ -125,6 +125,12 @@
</view>
<view class="tip">可用余额：{{ userInfo.nowMoney || 0 }}</view>
</view>
<view class="payItem acea-row row-middle" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')">
<view class="name acea-row row-center-wrapper">
<view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付
</view>
<view class="tip">可用积分：{{ userInfo.integral || 0 }}</view>
</view>
</view>
</view>
</view>

63
pages/orderAdmin/AdminOrder/index.vue
View File

@ -135,7 +135,9 @@
v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
@click="offlinePay"
>确认付款</view>
<view class="bnt delivery" v-if="types == 1" @click="goGoodsDeliver(orderInfo)">去发货</view>
<view class="bnt delivery" v-if="title=='未发货' && types == 1" @click="goGoodsDeliver(orderInfo)">去发货</view>
<view class="bnt quick" v-if="title=='待核销' && types == 1" @click="storeCancellation(0)">快速核销</view>
<view class="bnt delivery" v-if="title=='待核销' && types == 1" @click="storeCancellation(1)">立即核销</view>
</view>
<PriceChange
:change="change"
@ -156,6 +158,7 @@ import {
setOfflinePay,
setOrderRefund
} from "@/api/admin";
import {orderVerific} from "@/api/order";
import { required, num } from "@/utils/validate";
import { validatorDefaultCatch } from "@/utils/dialog";
import { copyClipboard } from "@/utils";
@ -190,7 +193,7 @@ export default {
}
}
},
mounted: function() {
onShow: function() {
this.order_id = this.$yroute.query.oid;
this.getIndex();
},
@ -349,7 +352,63 @@ export default {
});
}
);
},
storeCancellation(index) {
const that = this;
that.check = true;
if (index == 0) {
uni.showModal({
title: "确定核销订单?",
content: "注意:请务必核对核销码的与客户正确性",
success(res) {
if (res.confirm) {
uni.showLoading({
title: "查询中"
});
orderVerific(that.orderInfo.verifyCode, 1)
.then(res => {
console.log(res)
uni.hideLoading();
that.iShidden = false;
uni.showToast({
title: res.msg,
icon: 'none',
duration: 1000
});
//最后就是返回上一个页面。
setTimeout(function() {
uni.navigateBack({
delta: 1, // 返回上一级页面。
success: function() {
console.log('成功！')
}
})
}, 1000);
})
.catch((err) => {
console.log(err)
uni.hideLoading();
uni.showToast({
title: err.data.msg,
icon: "none",
duration: 2000
});
});
}
}
});
} else {
that.$yrouter.push({
path: '/pages/orderAdmin/OrderCancellation/index'
})
}
}
}
};
</script>
<style lang="less">
.quick {
background: #F25555;
}
</style>

65
pages/orderAdmin/AdminOrderList/index.vue
View File

@ -31,7 +31,7 @@
<view class="money">
<view class="x-money">￥{{ val.productInfo.price }}</view>
<view class="num">x{{ val.cartNum }}</view>
<view class="y-money">￥{{ val.productInfo.otPrice }}</view>
<view class="y-money" v-if="val.productInfo.otPrice">￥{{ val.productInfo.otPrice }}</view>
</view>
</view>
</view>
@ -54,7 +54,9 @@
<view class="bnt" @click="modify(item, 0)" v-if="where.status == 0">一键改价</view>
<view class="bnt" @click="modify(item, 0)" v-if="where.status == -3 && item.refundStatus === 1">立即退款</view>
<view class="bnt cancel" v-if="item.pay_type === 'offline' && item.paid === 0" @click="offlinePay(item)">确认付款</view>
<view class="bnt" v-if="where.status == 1" @click="goGoodsDeliver(item)">去发货</view>
<view class="bnt" v-if="where.status == 1 && item._status._title=='未发货'" @click="goGoodsDeliver(item)">去发货</view>
<view class="bnt cancel" v-if="item._status._title=='待核销' && where.status == 1" @click="storeCancellation(0,item.verifyCode)">快速核销</view>
<view class="bnt" v-if="item._status._title=='待核销' && where.status == 1" @click="storeCancellation(1,item.verifyCode)">立即核销</view>
</view>
</view>
</view>
@ -75,6 +77,7 @@
setOfflinePay,
setOrderRefund
} from "@/api/admin";
import {orderVerific} from "@/api/order";
import {
required,
num
@ -119,7 +122,7 @@
this.getIndex();
}
},
mounted: function() {
onShow: function() {
let that = this;
that.where.status = that.$yroute.query.types;
that.current = "";
@ -318,10 +321,64 @@
});
}
);
}
},
storeCancellation(index,verifyCode) {
const that = this;
that.check = true;
if (index == 0) {
uni.showModal({
title: "确定核销订单?",
content: "注意:请务必核对核销码的与客户正确性",
success(res) {
if (res.confirm) {
uni.showLoading({
title: "查询中"
});
orderVerific(verifyCode, 1)
.then(res => {
console.log(res)
uni.hideLoading();
that.iShidden = false;
uni.showToast({
title: res.msg,
icon: 'none',
duration: 1000
});
//最后就是返回上一个页面。
setTimeout(function() {
uni.navigateBack({
delta: 1, // 返回上一级页面。
success: function() {
console.log('成功！')
}
})
}, 1000);
})
.catch((err) => {
console.log(err)
uni.hideLoading();
uni.showToast({
title: err.data.msg,
icon: "none",
duration: 2000
});
});
}
}
});
} else {
that.$yrouter.push({
path: '/pages/orderAdmin/OrderCancellation/index'
})
}
}
}
};
</script>
<style lang="less">
.quick {
background: #F25555;
}
</style>

1
pages/shop/GoodsCon/index.vue
View File

@ -1061,3 +1061,4 @@
overflow: hidden;
}
</style>