This commit is contained in:
Gao xiaosong
2020-03-16 01:40:52 +08:00
parent 397082cdaf
commit e215701560
216 changed files with 11659 additions and 13905 deletions

View File

@ -134,11 +134,7 @@
v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
@click="offlinePay"
>确认付款</div>
<div
class="bnt delivery"
v-if="types == 1"
@click="$yrouter.push({path:'/pages/orderAdmin/GoodsDeliver/index',query: { id : orderInfo.orderId}})"
>去发货</div>
<div class="bnt delivery" v-if="types == 1" @click="goGoodsDeliver(orderInfo)">去发货</div>
</div>
<PriceChange
:change="change"
@ -198,6 +194,12 @@ export default {
this.getIndex();
},
methods: {
goGoodsDeliver(orderInfo) {
this.$yrouter.push({
path: "/pages/orderAdmin/GoodsDeliver/index",
query: { id: orderInfo.orderId }
});
},
copyClipboard,
more: function() {
this.order = !this.order;
@ -219,7 +221,7 @@ export default {
that.payType = res.data._status._payType;
},
err => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -249,7 +251,7 @@ export default {
setAdminOrderPrice(data).then(
function() {
that.change = false;
wx.showToast({
uni.showToast({
title: "改价成功",
icon: "success",
duration: 2000
@ -258,7 +260,7 @@ export default {
},
function() {
that.change = false;
wx.showToast({
uni.showToast({
title: "改价失败",
icon: "none",
duration: 2000
@ -281,7 +283,7 @@ export default {
setOrderRefund(data).then(
res => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -290,7 +292,7 @@ export default {
},
err => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -310,7 +312,7 @@ export default {
setAdminOrderRemark(data).then(
res => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -319,7 +321,7 @@ export default {
},
err => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -331,7 +333,7 @@ export default {
offlinePay: function() {
setOfflinePay({ order_id: this.orderInfo.order_id }).then(
res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -339,7 +341,7 @@ export default {
this.getIndex();
},
err => {
wx.showToast({
uni.showToast({
title: err.msg,
icon: "none",
duration: 2000

View File

@ -65,11 +65,7 @@
v-if="item.pay_type === 'offline' && item.paid === 0"
@click="offlinePay(item)"
>确认付款</div>
<div
class="bnt"
v-if="where.status == 1"
@click="$yrouter.push({path:'/pages/orderAdmin/GoodsDeliver/index',query: { id:item.orderId }})"
>去发货</div>
<div class="bnt" v-if="where.status == 1" @click="goGoodsDeliver(item)">去发货</div>
</div>
</div>
</div>
@ -144,6 +140,12 @@ export default {
!that.loading && that.getIndex();
},
methods: {
goGoodsDeliver(item) {
this.$yrouter.push({
path: "/pages/orderAdmin/GoodsDeliver/index",
query: { id: item.orderId }
});
},
more: function(index) {
if (this.current === index) this.current = "";
else this.current = index;
@ -179,7 +181,7 @@ export default {
setAdminOrderPrice(data).then(
function() {
that.change = false;
wx.showToast({
uni.showToast({
title: "改价成功",
icon: "success",
duration: 2000
@ -188,7 +190,7 @@ export default {
},
function() {
that.change = false;
wx.showToast({
uni.showToast({
title: "改价失败",
icon: "none",
duration: 2000
@ -211,7 +213,7 @@ export default {
setOrderRefund(data).then(
res => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -220,7 +222,7 @@ export default {
},
err => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -239,7 +241,7 @@ export default {
setAdminOrderRemark(data).then(
res => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -248,7 +250,7 @@ export default {
},
err => {
that.change = false;
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -277,7 +279,7 @@ export default {
that.where.page = that.where.page + 1;
},
err => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -293,14 +295,14 @@ export default {
},
toDetail: function(item) {
this.$yrouter.push({
path: "/pages/orderAdmin/AdminOrder/main",
path: "/pages/orderAdmin/AdminOrder/index",
query: { oid: item.orderId }
});
},
offlinePay: function(item) {
setOfflinePay({ order_id: item.order_id }).then(
res => {
this.$wx.showToast({ title: res.msg, icon: "none", duration: 2000 });
this.$uni.showToast({ title: res.msg, icon: "none", duration: 2000 });
this.init();
},
error => {

View File

@ -121,7 +121,7 @@ export default {
that.delivery = res.data;
},
error => {
wx.showToast({
uni.showToast({
title: error.msg,
icon: "none",
duration: 2000
@ -136,7 +136,7 @@ export default {
that.logistics = res.data;
},
error => {
wx.showToast({
uni.showToast({
title: error.msg,
icon: "none",
duration: 2000
@ -185,7 +185,7 @@ export default {
let that = this;
setAdminOrderDelivery(item).then(
res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -193,7 +193,7 @@ export default {
that.$yrouter.go(-1);
},
error => {
wx.showToast({
uni.showToast({
title: error.msg,
icon: "none",
duration: 2000

View File

@ -94,7 +94,7 @@ export default {
.then(res => {
this.iShidden = true;
this.verify_code = "";
this.$wx.showToast({ title: res.msg, icon: 'none', duration: 2000 });
this.$uni.showToast({ title: res.msg, icon: 'none', duration: 2000 });
})
.catch(res => {
this.$dialog.error(res.msg);
@ -105,15 +105,15 @@ export default {
if (!this.verify_code) return this.$dialog.error("请输入核销码");
if (!ref.test(this.verify_code))
return this.$dialog.error("请输入正确的核销码");
wx.showLoading({ title: "查询中" });
uni.showLoading({ title: "查询中" });
orderVerific(this.verify_code, 0)
.then(res => {
wx.hideLoading();
uni.hideLoading();
this.orderInfo = res.data;
this.iShidden = false;
})
.catch(() => {
wx.hideLoading();
uni.hideLoading();
});
},
openQRCode: function() {
@ -127,7 +127,7 @@ export default {
// that.verify_code = res.resultStr;
// that.storeCancellation();
// } else {
// wx.showToast({
// uni.showToast({
// title: '没有扫描到什么!',
// icon: "none",
// duration: 2000
@ -145,7 +145,7 @@ export default {
// },
// fail: function(res) {
// if (res.errMsg == "scanQRCode:permission denied") {
// wx.showToast({
// uni.showToast({
// title: '没有权限',
// icon: "none",
// duration: 2000

View File

@ -1,38 +1,23 @@
<template>
<div class="order-index" ref="container">
<div class="header acea-row">
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:0}})"
>
<div class="item" @click="goAdminOrderList(0)">
<div class="num">{{ census.orderCount.unpaidCount }}</div>
<div>待付款</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:1}})"
>
<div class="item" @click="goAdminOrderList(1)">
<div class="num">{{ census.orderCount.unshippedCount }}</div>
<div>待发货</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:2}})"
>
<div class="item" @click="goAdminOrderList(2)">
<div class="num">{{ census.orderCount.receivedCount }}</div>
<div>待收货</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:3}})"
>
<div class="item" @click="goAdminOrderList(3)">
<div class="num">{{ census.orderCount.evaluatedCount }}</div>
<div>待评价</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/AdminOrderList/index',query:{types:3}})"
>
<div class="item" @click="goAdminOrderList(3)">
<div class="num">{{ census.orderCount.refundCount }}</div>
<div>退款</div>
</div>
@ -42,45 +27,27 @@
<span class="iconfont icon-shujutongji"></span>数据统计
</div>
<div class="list acea-row">
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'price',time:'today'}})"
>
<div class="item" @click="goStatistics({type:'price',time:'today'})">
<div class="num">{{ census.orderTimeCount.todayPrice }}</div>
<div>今日成交额</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'price',time:'yesterday'}})"
>
<div class="item" @click="goStatistics({type:'price',time:'yesterday'})">
<div class="num">{{ census.orderTimeCount.proPrice }}</div>
<div>昨日成交额</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'price',time:'month'}})"
>
<div class="item" @click="goStatistics({type:'price',time:'month'})">
<div class="num">{{ census.orderTimeCount.monthPrice }}</div>
<div>本月成交额</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'order',time:'today'}})"
>
<div class="item" @click="goStatistics({type:'order',time:'today'})">
<div class="num">{{ census.orderTimeCount.todayCount }}</div>
<div>今日订单数</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'order',time:'yesterday'}})"
>
<div class="item" @click="goStatistics({type:'order',time:'yesterday'})">
<div class="num">{{ census.orderTimeCount.proCount }}</div>
<div>昨日订单数</div>
</div>
<div
class="item"
@click="$yrouter.push({path:'/pages/orderAdmin/Statistics/index',query:{type:'order',time:'month'}})"
>
<div class="item" @click="goStatistics({type:'order',time:'month'})">
<div class="num">{{ census.orderTimeCount.monthCount }}</div>
<div>本月订单数</div>
</div>
@ -142,6 +109,18 @@ export default {
!this.loading && this.getList();
},
methods: {
goStatistics(query) {
this.$yrouter.push({
path: "/pages/orderAdmin/Statistics/index",
query
});
},
goAdminOrderList(types) {
this.$yrouter.push({
path: "/pages/orderAdmin/AdminOrderList/index",
query: { types }
});
},
getIndex: function() {
var that = this;
getStatisticsInfo().then(

View File

@ -238,7 +238,7 @@ export default {
that.time_price = res.data.time;
},
error => {
wx.showToast({
uni.showToast({
title: error.msg,
icon: "none",
duration: 2000