Skip to content

S
shop-new
提交 c70fbeea authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

售后bug修复，资产优化，打包测试

上级 dfee5f27
显示空白字符变更
内嵌 并排
正在显示 包含 60 行增加 和 44 行删除
src/views/system/asset/myAsset/index.vue
浏览文件 @ c70fbeea
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
</div> </div>
</div> </div>
<div v-if="bankcardList.length < 3" class="hh-card-con" :class="{ 'only-add-con' : bankcardList.length == 0 ? true: false }"> <div v-if="bankcardList.length < 3" class="hh-card-con" :class="{ 'only-add-con' : bankcardList.length == 0 ? true: false }">
<div class="add-card-con"> <div class="add-card-con">
<div class="add-card-btn" @click="addBankcard">+</div> <div class="add-card-btn" @click="addBankcard">+</div>
...@@ -90,7 +89,7 @@ ...@@ -90,7 +89,7 @@
</el-form-item> </el-form-item>
<el-form-item label="银行名称：" prop="bank_name" > <el-form-item label="银行名称：" prop="bank_name" >
<el-select v-model="bankcardForm.bank_name" placeholder="请选择" style="width: 70%;" ref="bankSelect"> <el-select v-model="bankcardForm.bank_name" placeholder="请选择" style="width: 70%;">
<el-option <el-option
v-for="item in bankOptions" v-for="item in bankOptions"
:key="item.code" :key="item.code"
...@@ -241,9 +240,7 @@ ...@@ -241,9 +240,7 @@
/** 添加 银行卡信息 */ /** 添加 银行卡信息 */
addBankcard() { addBankcard() {
// this.resetAddBankcardForm();
this.bankcardTitle = '添加账户' this.bankcardTitle = '添加账户'
this.bankcardForm.bankAccountName = this.bankAccountName
this.addBankcardInfoDialog = true; this.addBankcardInfoDialog = true;
this.indexId = 0; this.indexId = 0;
}, },
...@@ -298,13 +295,14 @@ ...@@ -298,13 +295,14 @@
/** 取消 提交 添加银行卡信息*/ /** 取消 提交 添加银行卡信息*/
cancelSubmitBankcard() { cancelSubmitBankcard() {
this.addBankcardInfoDialog = false;
this.resetAddBankcardForm(); this.resetAddBankcardForm();
this.addBankcardInfoDialog = false;
}, },
/** 初始化 添加 银行卡 数据 */ /** 初始化 添加 银行卡 数据 */
resetAddBankcardForm() { resetAddBankcardForm() {
this.$refs['bankcardForm'].resetFields(); this.$refs['bankcardForm'].resetFields();
//this.bankcardForm.bankAccountName = this.bankAccountName
}, },
/** 提现 操作 */ /** 提现 操作 */
......
src/views/system/retreat/address.vue
浏览文件 @ c70fbeea
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
/> />
</el-card> </el-card>
<!-- 新增、修改 --> <!-- 新增、修改 -->
<el-dialog :title="addTitle" :visible.sync="isOpen" width="50%" class="add-edit"> <el-dialog :title="addTitle" :visible.sync="isOpen" width="40%" class="add-edit" center :before-close="cancel">
<el-form v-if="isOpen" :model="addressForm" :rules="addressRules" ref="addressForm" label-width="100px"> <el-form v-if="isOpen" :model="addressForm" :rules="addressRules" ref="addressForm" label-width="100px" size="small">
<el-row> <el-row>
<el-col :span="16" :offset="3"> <el-col :span="16" :offset="3">
<el-form-item label="联系人：" prop="contact_person"> <el-form-item label="联系人：" prop="contact_person">
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer" > <div slot="footer" class="dialog-footer" >
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel" size="small">取 消</el-button>
<el-button type="primary" @click="save('addressForm')">确 定</el-button> <el-button type="primary" @click="save('addressForm')" size="small">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
}, },
// 售后地址列表 // 售后地址列表
addressList:[], addressList:[],
addTitle: '新增/修改', // 新增，修改 弹窗名 addTitle: '', // 新增，修改 弹窗名
// 新增、修改表单 // 新增、修改表单
addressForm: { addressForm: {
id: 0, id: 0,
...@@ -239,10 +239,9 @@ ...@@ -239,10 +239,9 @@
handleAdd() { handleAdd() {
this.isOpen = true; this.isOpen = true;
this.addTitle = "新增地址"; this.addTitle = "新增地址";
this.areaList = [];
this.resetForm('addressForm');
}, },
/** 删除 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.id || this.ids; const roleIds = row.id || this.ids;
this.$confirm('是否确认删除编号为"' + roleIds + '"的数据项？', '确认信息', { this.$confirm('是否确认删除编号为"' + roleIds + '"的数据项？', '确认信息', {
...@@ -257,13 +256,13 @@ ...@@ -257,13 +256,13 @@
}).catch(action => {}); }).catch(action => {});
}, },
// 修改 /** 修改 */
handleUpdate(row) { handleUpdate(row) {
this.areaList = [];
const roleIds = row.id || this.ids; const roleIds = row.id || this.ids;
this.loading = true; this.loading = true;
getAddressDetails(roleIds).then(res => { getAddressDetails(roleIds).then(res => {
if(res.data) { if(res.data) {
this.addTitle = "编辑地址";
this.isOpen = true; this.isOpen = true;
// 处理 三级联动回显 // 处理 三级联动回显
let areaListAry = res.data.address_ids ? res.data.address_ids.split(",") : []; let areaListAry = res.data.address_ids ? res.data.address_ids.split(",") : [];
...@@ -275,11 +274,14 @@ ...@@ -275,11 +274,14 @@
this.loading = false; this.loading = false;
}); });
}, },
/** 取消 新增售后地址 */
cancel() { cancel() {
this.areaList = []; //
this.resetForm('addressForm'); this.resetAddressForm();
this.isOpen = false; this.isOpen = false;
}, },
/** 保存 */
save(form) { save(form) {
if(typeof this.addressForm.address_ids === "string") { if(typeof this.addressForm.address_ids === "string") {
let areaListAry = this.addressForm.address_ids.split(","); let areaListAry = this.addressForm.address_ids.split(",");
...@@ -299,7 +301,8 @@ ...@@ -299,7 +301,8 @@
}else { }else {
this.$message({ message: '修改成功', type: 'success'}); this.$message({ message: '修改成功', type: 'success'});
} }
this.resetAddressForm();
this.isOpen = false;
this.getList(); this.getList();
}else if( res.code === 0){ }else if( res.code === 0){
if(res.msg) { if(res.msg) {
...@@ -308,12 +311,21 @@ ...@@ -308,12 +311,21 @@
this.$message({ message: '新增失败', type: 'error'}); this.$message({ message: '新增失败', type: 'error'});
} }
} }
this.resetForm('addressForm');
this.isOpen = false;
}); });
} }
}); });
}, },
/** 初始化 添加 地址 表单 数据 */
resetAddressForm() {
this.addressForm = {
id: 0,
contact_person: '',
contact_phone: '',
address_ids: [],
address: ''
}
this.areaList = [];
},
// //
handleChanges(value) { handleChanges(value) {
//this.areaList = value; //this.areaList = value;
......
src/views/system/retreat/edit.vue
浏览文件 @ c70fbeea
...@@ -141,16 +141,16 @@ ...@@ -141,16 +141,16 @@
<!-- 售后 操作按钮 --> <!-- 售后 操作按钮 -->
<div class="as-handle-btn" v-if="onlyOrRefundBtnType == 1"> <div class="as-handle-btn" v-if="onlyOrRefundBtnType == 1">
<el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="onlyButtonDisabled">同意退款</el-button> <el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled">同意退款</el-button>
<el-button class="as-btn" type="primary" @click="refuseHandle(2)">拒绝退款</el-button> <el-button class="as-btn" type="primary" @click="refuseHandle(2)" :disabled="isFinishedButtonDisabled">拒绝退款</el-button>
</div> </div>
<div class="as-handle-btn" v-if="onlyOrRefundBtnType == 2"> <div class="as-handle-btn" v-if="onlyOrRefundBtnType == 2">
<el-button class="as-btn" type="primary" @click="agreeHandle(3)">同意退货退款</el-button> <el-button class="as-btn" type="primary" @click="agreeHandle(3)" :disabled="isFinishedButtonDisabled">同意退货退款</el-button>
<el-button class="as-btn" type="primary" @click="refuseHandle(4)">拒绝退货退款</el-button> <el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒绝退货退款</el-button>
</div> </div>
<div class="as-handle-btn" v-if="onlyOrRefundBtnType == 3"> <div class="as-handle-btn" v-if="onlyOrRefundBtnType == 3">
<el-button class="as-btn" type="primary" @click="refuseHandle(4)">拒收包裹</el-button> <el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒收包裹</el-button>
<el-button class="as-btn" type="primary" @click="agreeHandle(1)">确定退款</el-button> <el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled">确定退款</el-button>
</div> </div>
</el-card> </el-card>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
sellerId: 0, sellerId: 0,
asAddressOptions: [], asAddressOptions: [],
order_refund_address:'', order_refund_address:'',
onlyButtonDisabled: false isFinishedButtonDisabled: false
} // return end } // return end
}, },
watch: { watch: {
...@@ -401,23 +401,23 @@ ...@@ -401,23 +401,23 @@
this.cdHour = this.asOrderDetail.dead_line_hour this.cdHour = this.asOrderDetail.dead_line_hour
this.cdMinute = this.asOrderDetail.dead_line_minute this.cdMinute = this.asOrderDetail.dead_line_minute
// this.timer = setInterval(() => { this.timer = setInterval(() => {
// if (this.cdHour <= 0) { if (this.cdHour <= 0) {
// this.cdHour = 0 this.cdHour = 0
// } }
//
// if (this.cdMinute <= 0) { if (this.cdMinute <= 0) {
// this.cdMinute = 0 this.cdMinute = 0
// } }
//
// if (this.cdMinute && this.cdHour) { if (this.cdMinute && this.cdHour) {
// this.cdMinute-- this.cdMinute--
// if (this.cdMinute <= 0) { if (this.cdMinute <= 0) {
// this.cdMinute = 59 this.cdMinute = 59
// this.cdHour-- this.cdHour--
// } }
// } }
// }, 60000) }, 60000)
// 根据售后订单信息，判断 订单状态，显示对应按钮操作 // 根据售后订单信息，判断 订单状态，显示对应按钮操作
this.asHandleBtnType(this.asOrderDetail) this.asHandleBtnType(this.asOrderDetail)
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
/** 仅退款 /** 仅退款
* 操作按钮 类型 * 操作按钮 类型
* onlyOrRefundBtnType：// 1-显示 仅退款 按钮； 2-显示 退货退款中（同意/拒绝 退货退款）按钮； 3-显示 退货退款中 （拒收包裹 / 确定退款） 按钮 * onlyOrRefundBtnType：// 1-显示 仅退款 按钮； 2-显示 退货退款中（同意/拒绝 退货退款）按钮； 3-显示 退货退款中 （拒收包裹 / 确定退款） 按钮
* disabledOnlyBtn: true-售后结束-不能点击；false-可以点击 * isFinishedButtonDisabled: true-售后结束-不能点击；false-可以点击
* 每次 订单详情更新，被调用 * 每次 订单详情更新，被调用
* */ * */
asHandleBtnType(row) { asHandleBtnType(row) {
...@@ -473,6 +473,12 @@ ...@@ -473,6 +473,12 @@
}else { }else {
this.onlyOrRefundBtnType = 0; this.onlyOrRefundBtnType = 0;
} }
//
if(row.status == 5 || row.status == -1) {
this.isFinishedButtonDisabled = true
}else {
this.isFinishedButtonDisabled = false
}
} }
}, },
/** 同意 */ /** 同意 */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论