- 确 定
+
取 消
@@ -320,8 +352,11 @@ export default {
// 用户otc订单表格数据
otcOrderList: [],
feeTypeOptions: [],
- orderStatusOptions: [],
- tradeTypeStatusOptions: [],
+ orderStatusOptions: [],
+ tradeTypeStatusOptions: [],
+ //申诉字典
+ appealStatusOptions:[],
+ cancelTypeOptions:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -388,6 +423,12 @@ export default {
this.getDicts("fee_type").then(response => {
this.feeTypeOptions = response.data;
});
+ this.getDicts("appeal_status").then(response => {
+ this.appealStatusOptions = response.data;
+ });
+ this.getDicts("cancel_type").then(response => {
+ this.cancelTypeOptions = response.data;
+ });
},
@@ -481,7 +522,7 @@ export default {
getOtcOrder(id).then(response => {
this.form = response.data;
this.open = true;
- this.title = "修改用户otc订单";
+ this.title = "查询用户otc订单";
});
},
/** 提交按钮 */
diff --git a/src/views/otc/otcStoreOrder/index.vue b/src/views/otc/otcStoreOrder/index.vue
index 036fdc4..112671f 100644
--- a/src/views/otc/otcStoreOrder/index.vue
+++ b/src/views/otc/otcStoreOrder/index.vue
@@ -11,7 +11,7 @@
/>
- 确 定
+
取 消
+ 确 定
+ 取 消
+
+
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -32,28 +41,28 @@
v-hasPermi="['otc:otcPaymentType:add']"
>新增
-
- 修改
-
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
修改
- 删除
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+ ![]()
+
+
@@ -159,8 +197,9 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
- coinName: null,
paymentType: null,
+ sort: null,
+ icon: null
},
// 表单参数
form: {},
@@ -169,7 +208,12 @@ export default {
paymentType: [
{ required: true, message: "收款类型不能为空", trigger: "change" }
],
- }
+ sort: [
+ { required: true, message: "排序不能为空", trigger: "blur" }
+ ],
+ },
+ // 预览
+ srcList: ["http://118.25.187.239:9099/img/adImg/557097620301025280.jpg"],
};
},
created() {
@@ -185,6 +229,14 @@ export default {
this.loading = false;
});
},
+ uploadUrl(){
+ // 地址
+ return process.env.VUE_APP_BASE_API+"/system/ftpfile/uploadFile"
+ },
+ // 预览图片
+ previewImage(abUrl) {
+ this.srcList[0] = abUrl;
+ },
// 取消按钮
cancel() {
this.open = false;
@@ -194,10 +246,12 @@ export default {
reset() {
this.form = {
id: null,
- coinName: null,
paymentType: null,
createTime: null,
- updateTime: null
+ updateTime: null,
+ remark: null,
+ sort: null,
+ icon: null
};
this.resetForm("form");
},
@@ -239,13 +293,13 @@ export default {
if (valid) {
if (this.form.id != null) {
updateOtcPaymentType(this.form).then(response => {
- this.msgSuccess("修改成功");
+ this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOtcPaymentType(this.form).then(response => {
- this.msgSuccess("新增成功");
+ this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -264,7 +318,7 @@ export default {
return delOtcPaymentType(ids);
}).then(() => {
this.getList();
- this.msgSuccess("删除成功");
+ this.$modal.msgSuccess("删除成功");
})
},
/** 导出按钮操作 */
@@ -279,7 +333,24 @@ export default {
}).then(response => {
this.download(response.msg);
})
- }
+ },
+ // 图片上传组件自带的成功回调函数
+ handleAvatarSuccess(res) {
+ console.log(res);
+ this.form.icon = res.data.url;
+ },
+ beforeAvatarUpload(file) {
+ const isJPG = file.type === 'image/jpeg' || file.type === 'image/png';
+ const isLt2M = file.size / 1024 / 1024 < 20;
+
+ if (!isJPG) {
+ this.$modal.$message.error('上传头像图片只能是 JPG或png 格式!');
+ }
+ if (!isLt2M) {
+ this.$modal.$message.error('上传头像图片大小不能超过 20MB!');
+ }
+ return isJPG && isLt2M;
+ },
}
};
diff --git a/src/views/otc/otcSysDict/index.vue b/src/views/otc/otcSysDict/index.vue
index 503e6da..6655847 100644
--- a/src/views/otc/otcSysDict/index.vue
+++ b/src/views/otc/otcSysDict/index.vue
@@ -1,24 +1,24 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
修改
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
修改
- 删除
+
+
+
+
+
+
+
-
+
-
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index fb3b5ef..796743b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -602,4 +602,4 @@ export default {
}
}
};
-
\ No newline at end of file
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ae87fe4..782d3e2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -667,4 +667,4 @@ export default {
}
}
};
-
\ No newline at end of file
+