1、提货点
2、客服(腾讯云智服)
3、接口权限控制
4、复制第三方商品可配置
4、优化附件上传配置
5、手机端核销订单
6、手机端订单统计、订单管理
7、短信优化
8、订阅消息全自动化
This commit is contained in:
张乐
2020-09-15 16:13:25 +08:00
parent aee9c1d692
commit db2c3b44a6
245 changed files with 19900 additions and 994 deletions

View File

@@ -0,0 +1,30 @@
<template>
<div
class="Loads acea-row row-center-wrapper"
v-if="loading && !loaded"
style="margin-top: .2rem;font-size: 12px"
>
<template v-if="loading">
<div
class="iconfont icon-jiazai loading acea-row row-center-wrapper"
></div>
正在加载中
</template>
<template v-else>
上拉加载更多
</template>
</div>
</template>
<script>
export default {
name: "Loading",
props: {
loaded: Boolean,
loading: Boolean
},
created() {
import('@/assets/js/media_750')
}
};
</script>

View File

@@ -0,0 +1,257 @@
<template>
<div>
<div class="priceChange" :class="change === true ? 'on' : ''">
<div class="priceTitle">
{{
status === 0 || status === 2
? orderInfo.refundStatus === 1
? "立即退款"
: "一键改价"
: "订单备注"
}}
<span class="iconfont icon-guanbi" @click="close"></span>
</div>
<div class="listChange" v-if="status === 0 || status === 2">
<div
class="item acea-row row-between-wrapper"
v-if="orderInfo.refundStatus === 0"
>
<div>商品总价(¥)</div>
<div class="money">
{{ orderInfo.totalPrice }}<span class="iconfont icon-suozi"></span>
</div>
</div>
<div
class="item acea-row row-between-wrapper"
v-if="orderInfo.refundStatus === 0"
>
<div>原始邮费(¥)</div>
<div class="money">
{{ orderInfo.payPostage }}<span class="iconfont icon-suozi"></span>
</div>
</div>
<div
class="item acea-row row-between-wrapper"
v-if="orderInfo.refundStatus === 0"
>
<div>实际支付(¥)</div>
<div class="money">
<input
type="text"
v-model="price"
:class="focus === true ? 'on' : ''"
@focus="priceChange"
/>
</div>
</div>
<div
class="item acea-row row-between-wrapper"
v-if="orderInfo.refundStatus === 1"
>
<div>实际支付(¥)</div>
<div class="money">
{{ orderInfo.payPrice }}<span class="iconfont icon-suozi"></span>
</div>
</div>
<div
class="item acea-row row-between-wrapper"
v-if="orderInfo.refundStatus === 1"
>
<div>退款金额(¥)</div>
<div class="money">
<input
type="text"
v-model="refundPrice"
:class="focus === true ? 'on' : ''"
@focus="priceChange"
/>
</div>
</div>
</div>
<div class="listChange" v-else>
<textarea
:placeholder="
orderInfo.remark ? orderInfo.remark : '请填写备注信息...'
"
v-model="remark" maxlength="100"
></textarea>
</div>
<div class="modify" @click="save">
{{ orderInfo.refundStatus === 0 || status === 1 ? "立即修改" : "确认退款" }}
</div>
<div class="modify1" @click="refuse" v-if="orderInfo.refundStatus === 1 && status === 2">
拒绝退款
</div>
</div>
<div class="maskModel" @touchmove.prevent v-show="change === true"></div>
</div>
</template>
<script>
import {required, num} from "@/utils/validate";
import {validatorDefaultCatch} from "@/libs/dialog";
import { orderMarkApi, editPriceApi, orderRefundApi } from '@/api/order';
export default {
name: "PriceChange",
components: {},
props: {
change: Boolean,
orderInfo: {
type: Object,
default: null
},
status: {
type: Number,
default: 0
}
},
data: function () {
return {
focus: false,
price: 0,
refundPrice: 0,
remark: ""
};
},
watch: {
orderInfo: function () {
this.price = this.orderInfo.payPrice;
this.refundPrice = this.orderInfo.payPrice;
this.remark = this.orderInfo.remark;
}
},
created() {
import('@/assets/js/media_750')
},
methods: {
priceChange: function () {
this.focus = true;
},
close: function () {
this.price = this.orderInfo.payPrice;
this.$emit("closechange", false);
},
save() {
this.savePrice({
price: this.price,
refundPrice: this.refundPrice,
type: 1,
remark: this.remark,
id: this.orderInfo.id,
orderId: this.orderInfo.orderId
})
},
async savePrice(opt) {
let that = this,
data = {},
price = opt.price,
refundPrice = opt.refundPrice,
refundStatus = that.orderInfo.refundStatus,
remark = opt.remark;
if (that.status == 0 && refundStatus === 0) {
try {
await this.$validator({
price: [
required(required.message("金额")),
num(num.message("金额"))
]
}).validate({price});
} catch (e) {
return validatorDefaultCatch(e);
}
data.price = price;
data.orderId = opt.orderId;
editPriceApi(data).then(() => {
// that.change = false;
this.$emit("closechange", false);
that.$dialog.success("改价成功");
// that.$emit('init');
// that.init();
}).catch((error) => {
that.$dialog.error(error.message);
});
} else if (that.status == 2 && refundStatus === 1) {
try {
await this.$validator({
refundPrice: [
required(required.message("金额")),
num(num.message("金额"))
]
}).validate({refundPrice});
} catch (e) {
return validatorDefaultCatch(e);
}
data.amount = refundPrice;
data.type = opt.type;
data.orderId = opt.id;
orderRefundApi(data).then(
res => {
this.$emit("closechange", false);
// that.change = false;
that.$dialog.success('退款成功');
// that.init();
// that.$emit('init');
},
err => {
this.$emit("closechange", false);
that.$dialog.error(err.message);
}
);
} else {
try {
await this.$validator({
remark: [required(required.message("备注"))]
}).validate({remark});
} catch (e) {
return validatorDefaultCatch(e);
}
data.mark = remark;
data.id = opt.id;
orderMarkApi(data).then(
res => {
this.$emit("closechange", false);
// that.change = false;
that.$dialog.success('提交成功');
// that.$emit('init');
// that.init();
},
err => {
this.$emit("closechange", false);
// that.change = false;
that.$dialog.error(err.message);
}
);
}
},
refuse: function () {
let that = this;
that.$emit("getRefuse", this.orderInfo.id);
}
}
};
</script>
<style scoped>
@import '../../../styles/reset.css';
.priceChange{position:fixed;width:5.8rem;height:6.7rem;background-color:#fff;border-radius:0.1rem;top:50%;left:50%;margin-left:-2.9rem;margin-top:-3.35rem;z-index:99;transition:all 0.3s ease-in-out 0s;-webkit-transition:all 0.3s ease-in-out 0s;-o-transition:all 0.3s ease-in-out 0s;-moz-transition:all 0.3s ease-in-out 0s;-webkit-transform:scale(0);-o-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);
transform: scale(0);opacity:0;}
.priceChange.on{opacity:1;transform: scale(1);-webkit-transform:scale(1);-o-transform:scale(1);-moz-transform:scale(1);-ms-transform:scale(1);}
.priceChange .priceTitle{background:url("../../../assets/imgs/pricetitle.jpg") no-repeat;background-size:100% 100%;width:100%;height:1.6rem;border-radius:0.1rem 0.1rem 0 0;text-align:center;font-size:0.4rem;color:#fff;line-height:1.6rem;position:relative;}
.priceChange .priceTitle .iconfont{position:absolute;font-size:0.4rem;right:0.26rem;top:0.23rem;width:0.4rem;height:0.4rem;line-height:0.4rem;}
.priceChange .listChange{padding:0 0.4rem;}
.priceChange .listChange .item{height:1.03rem;border-bottom:1px solid #e3e3e3;font-size:0.32rem;color:#333;}
.priceChange .listChange .item .money{color:#666;width:3rem;text-align:right;}
.priceChange .listChange .item .money .iconfont{font-size:0.32rem;margin-left:0.2rem;}
.priceChange .listChange .item .money input{width:100%;height:100%;text-align:right;color:#ccc;}
.priceChange .listChange .item .money input.on{color:#666;}
.priceChange .modify{font-size:0.32rem;color:#fff;width:4.9rem;height:0.9rem;text-align:center;line-height:0.9rem;border-radius:0.45rem;background-color:#2291f8;margin:0.53rem auto 0 auto;}
.priceChange .modify1{font-size:0.32rem;color:#312b2b;width:4.9rem;height:0.9rem;text-align:center;line-height:0.9rem;border-radius:0.45rem;background-color:#eee;margin:0.3rem auto 0 auto;}
.priceChange .listChange textarea {
border: 1px solid #eee;
width: 100%;
height: 2rem;
margin-top: 0.5rem;
border-radius: 0.1rem;
color: #333;
padding: 0.2rem;
font-size: 0.3rem;
}
</style>

View File

@@ -0,0 +1,150 @@
<template>
<div v-show="iShidden === false">
<div class="WriteOff">
<div class="pictrue"><img :src="orderInfo.storeOrderInfoVos[0].info.productInfo.image" /></div>
<div class="num acea-row row-center-wrapper">
{{ orderInfo.orderId }}
<div class="views" @click="toDetail(orderInfo)">
查看<span class="iconfont icon-jiantou views-jian"></span>
</div>
</div>
<div class="tip">确定要核销此订单吗</div>
<div class="sure" @click="confirm">确定核销</div>
<div class="sure cancel" @click="cancel">取消</div>
</div>
<div class="maskModel" @touchmove.prevent></div>
</div>
</template>
<script>
export default {
name: "WriteOff",
props: {
iShidden: {
type: Boolean,
default: true
},
orderInfo: {
type: Object,
default: null
}
},
data: function() {
return {};
},
created() {
import('@/assets/js/media_750')
},
methods: {
toDetail: function(item) {
this.$router.push({
path: "/javaMobile/orderDetail/" + item.id + "/looks"
});
},
cancel: function() {
this.$emit("cancel", true);
},
confirm: function() {
this.$emit("confirm", true);
}
}
};
</script>
<style scoped>
.views {
font-size: 0.16rem;
background: #c68937;
border-radius: 4px;
color: #fff;
padding: 0.05rem 0.02rem 0.05rem 0.08rem;
margin-left: 0.1rem;
}
.views-jian {
font-size: 0.1rem;
}
.WriteOff {
width: 5.6rem;
height: 8rem;
background-color: #fff;
border-radius: 0.2rem;
position: fixed;
top: 50%;
left: 50%;
margin-top: -4rem;
margin-left: -2.8rem;
z-index: 99;
padding-top: 0.55rem;
}
.WriteOff .pictrue {
width: 3.4rem;
height: 3.4rem;
margin: 0 auto;
}
.WriteOff .pictrue img {
width: 100%;
height: 100%;
display: block;
border-radius: 0.1rem;
}
.WriteOff .num {
font-size: 0.3rem;
color: #666;
margin: 0.28rem 0 0.3rem 0;
}
.WriteOff .num .see {
font-size: 0.16rem;
color: #fff;
border-radius: 0.04rem;
background-color: #c68937;
padding-left: 0.05rem;
margin-left: 0.12rem;
}
.WriteOff .num .see .iconfont {
font-size: 0.15rem;
}
.WriteOff .tip {
font-size: 0.36rem;
color: #282828;
text-align: center;
border-top: 1px dashed #ccc;
padding-top: 0.4rem;
position: relative;
}
.WriteOff .tip:after {
content: "";
position: absolute;
width: 0.25rem;
height: 0.25rem;
border-radius: 50%;
background-color: #7f7f7f;
right: -0.125rem;
top: -0.125rem;
}
.WriteOff .tip:before {
content: "";
position: absolute;
width: 0.25rem;
height: 0.25rem;
border-radius: 50%;
background-color: #7f7f7f;
left: -0.125rem;
top: -0.125rem;
}
.WriteOff .sure {
font-size: 0.32rem;
color: #fff;
text-align: center;
line-height: 0.82rem;
height: 0.82rem;
width: 4.6rem;
border-radius: 0.41rem;
margin: 0.4rem auto 0 auto;
background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -webkit-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
background-image: -moz-linear-gradient(to right, #f67a38 0%, #f11b09 100%);
}
.WriteOff .sure.cancel {
background-image: none;
color: #999;
margin-top: 0.1rem;
}
</style>

View File

@@ -0,0 +1,68 @@
<template>
<div ref="container">
<div class="public-wrapper">
<div class="title">
<span class="iconfont icon-xiangxishuju"></span>详细数据
</div>
<div class="nav acea-row row-between-wrapper">
<div class="data">日期</div>
<div class="browse">订单数</div>
<div class="turnover">成交额</div>
</div>
<div class="conter">
<div
class="item acea-row row-between-wrapper"
v-for="(item, index) in list"
:key="index"
>
<div class="data">{{ item.time }}</div>
<div class="browse">{{ item.count }}</div>
<div class="turnover">{{ item.price }}</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { statisticsDataApi } from '@/api/order';
export default {
name: "statisticsData",
props: {
list:{
type: Array,
default: ()=> []
}
},
components: {
// Loading
},
data() {
return {
// list: [],
where: {
page: 1,
limit: 10
},
loaded: false,
loading: false
}
},
created() {
import('@/assets/js/media_750')
}
}
</script>
<style scoped lang="scss">
.public-wrapper .title{font-size:0.3rem;color:#282828;padding:0 0.3rem;margin-bottom:0.2rem;}
.public-wrapper .title .iconfont{color:#2291f8;font-size:0.4rem;margin-right:0.13rem;vertical-align:middle;}
.public-wrapper{margin:0.18rem auto 0 auto;width:6.9rem;background-color:#fff;border-radius:0.1rem;padding-top:0.25rem;}
.public-wrapper .nav{padding:0 0.3rem;height:0.7rem;line-height:0.7rem;font-size:0.24rem;color:#999;}
.public-wrapper .data{width:2.1rem;text-align:left;}
.public-wrapper .browse{width:1.92rem;text-align:right;}
.public-wrapper .turnover{width:2.27rem;text-align:right;}
.public-wrapper .conter{padding:0 0.3rem;}
.public-wrapper .conter .item{border-bottom:1px solid #f7f7f7;height:0.7rem;font-size:0.24rem;}
.public-wrapper .conter .item .turnover{color:#d84242;}
</style>