refactor(订单模块): 1.统一订单状态和地址相关术语;2.增加心理论坛内容管理
将"发货"相关术语统一改为"发出",包括订单状态、按钮文字、提示信息等 将"收货"相关术语统一改为"收件",包括地址信息、表单标签、提示信息等 新增心理论坛模块,包含列表和新增/修改功能 调整订单状态显示为"待发出"和"已发出" 修改地址相关字段为"收件人"和"收件地址" 添加psychologicalForum.vue和psychologicalForum-add-or-update.vue文件
This commit is contained in:
@@ -6,10 +6,10 @@
|
||||
>待付款</span
|
||||
>
|
||||
<span v-if="orderDetails.orderStatus == 1" class="item hightLight1"
|
||||
>待发货</span
|
||||
>待发出</span
|
||||
>
|
||||
<span v-if="orderDetails.orderStatus == 2" class="item hightLight2"
|
||||
>已发货</span
|
||||
>已发出</span
|
||||
>
|
||||
<span v-if="orderDetails.orderStatus == 3" class="item hightLight3"
|
||||
>已完成</span
|
||||
@@ -48,15 +48,15 @@
|
||||
>待付款</span
|
||||
>
|
||||
<span v-if="orderDetails.orderStatus == 1" class="hightLight"
|
||||
>待发货</span
|
||||
>待发出</span
|
||||
>
|
||||
<span v-if="orderDetails.orderStatus == 2" class="hightLight"
|
||||
>已发货</span
|
||||
>已发出</span
|
||||
>
|
||||
<span v-if="orderDetails.orderStatus == 3" class="hightLight"
|
||||
>已完成</span
|
||||
>
|
||||
<!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button> -->
|
||||
<!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发出</el-button> -->
|
||||
</li>
|
||||
<!-- <li><span class="infoTitle">商品总数:</span><span>{{orderDetails.}}</span></li> -->
|
||||
<!-- <li>
|
||||
@@ -394,19 +394,19 @@
|
||||
href="#"
|
||||
@click="changeAddressShow"
|
||||
v-if="orderDetails.orderStatus <= 1 && pageType != 'user'"
|
||||
><i class="el-icon-edit"></i>修改收货信息</a
|
||||
><i class="el-icon-edit"></i>修改收件信息</a
|
||||
>
|
||||
</div>
|
||||
<div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
|
||||
<li>
|
||||
<span class="infoTitle">收货人:</span
|
||||
<span class="infoTitle">收件人:</span
|
||||
><span>{{ orderDetails.consignee.consigneeName }}</span
|
||||
> <span>{{
|
||||
orderDetails.consignee.consigneeMobile
|
||||
}}</span>
|
||||
</li>
|
||||
<li>
|
||||
<span class="infoTitle">收货地址:</span
|
||||
<span class="infoTitle">收件地址:</span
|
||||
><span
|
||||
>{{ orderDetails.consignee.province }}-{{
|
||||
orderDetails.consignee.city
|
||||
@@ -570,7 +570,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
title="修改收货信息"
|
||||
title="修改收件信息"
|
||||
:visible.sync="changeAddVisible"
|
||||
width="500"
|
||||
:close="changeAddHandleClose"
|
||||
@@ -583,13 +583,13 @@
|
||||
label-width="120px"
|
||||
:rules="addressFormRule"
|
||||
>
|
||||
<el-form-item label="收货人:" prop="name">
|
||||
<el-form-item label="收件人:" prop="name">
|
||||
<el-input v-model="addressForm.name"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="收货联系电话:" prop="tel">
|
||||
<el-form-item label="收件联系电话:" prop="tel">
|
||||
<el-input v-model="addressForm.tel"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="收货地址:">
|
||||
<el-form-item label="收件地址:">
|
||||
<!-- <el-input v-model="addressForm.address"></el-input> -->
|
||||
<!-- 省市区-->
|
||||
<!-- 省 -->
|
||||
@@ -740,21 +740,21 @@ export default {
|
||||
name: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入收货人信息",
|
||||
message: "请输入收件人信息",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
tel: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入收货联系电话信息",
|
||||
message: "请输入收件联系电话信息",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
county: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择收货地址",
|
||||
message: "请选择收件地址",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
@@ -931,13 +931,13 @@ export default {
|
||||
console.log(e, "e");
|
||||
});
|
||||
this.changeAddVisible = true;
|
||||
// console.log('显示修改收货地址')
|
||||
// console.log('显示修改收件地址')
|
||||
},
|
||||
// 修改收货信息
|
||||
// 修改收件信息
|
||||
changeAddress() {
|
||||
this.$refs["addressFormRef"].validate(valid => {
|
||||
if (valid) {
|
||||
// console.log('修改收货地址')
|
||||
// console.log('修改收件地址')
|
||||
this.$http({
|
||||
url: this.$http.adornUrl("/book/buyOrder/modifyConsigneeAddress"),
|
||||
method: "post",
|
||||
@@ -1056,7 +1056,7 @@ export default {
|
||||
this.setDeliverVisible = false;
|
||||
this.getData();
|
||||
},
|
||||
// 去发货
|
||||
// 去发出
|
||||
godeliver() {
|
||||
this.orderList[0] = this.query.orderSn;
|
||||
this.setDeliverVisible = true;
|
||||
|
||||
Reference in New Issue
Block a user