diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index ac289aa..dc40c57 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -247,10 +247,41 @@
商品信息
+
+
+
+
+
+
+ {{ scope.row.productName }}
+
+
+
+
+
+
+
+
+
+
@@ -281,7 +312,7 @@
@@ -935,6 +966,15 @@ export default {
// console.log(data.result,'data.result')
this.orderDetails = data.result;
+ if (this.orderDetails.orderType == "trainingClass") {
+ this.orderDetails.trainingClassData = [
+ {
+ productName: this.orderDetails.remark,
+ productPrice: this.orderDetails.orderPrice,
+ quantity: 1
+ }
+ ];
+ }
if (this.orderDetails.orderType == "relearn") {
this.orderDetails.relearnData = [
{
diff --git a/src/views/modules/user/addJf.vue b/src/views/modules/user/addJf.vue
index add14fd..f1f4eac 100644
--- a/src/views/modules/user/addJf.vue
+++ b/src/views/modules/user/addJf.vue
@@ -90,7 +90,6 @@
@@ -386,6 +385,10 @@ export default {
this.dialogVisible = true;
},
handleSubmit: debounce(async function() {
+ if (this.addPointsForm.score <= 0) {
+ this.$message.error("积分不能小于0");
+ return false;
+ }
this.$refs["addPointsForm"].validate(valid => {
if (valid) {
this.$http({
@@ -399,7 +402,7 @@ export default {
remark: this.addPointsForm.detail
? this.addPointsForm.detail
: "",
- actType: this.addPointsForm.type
+ actType: this.addPointsForm.type
})
}).then(({ data }) => {
if (data && data.code === 0) {
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index ab825f3..846df11 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -6,11 +6,17 @@
@keyup.enter.native="getDataList()"
>
-
+
-
- 查询
- 合并账号 -->
- 批量开通课程
-
+
-
- 课程列表
-
-
+ 课程列表
+
+
@@ -311,16 +324,20 @@
>
-
+
-
- 证书列表
-
-
+ 证书列表
+
+
@@ -578,7 +595,8 @@ export default {
},
pointFormRules: {
pointAmount: [
- { required: true, message: "请输入金额", trigger: "blur" }
+ { required: true, message: "请输入金额", trigger: "blur" },
+
],
pointType: {
required: true,
@@ -886,9 +904,14 @@ export default {
},
huaSheng(point) {
// console.log(this.pointForm.pointAmount, point)
+ if (this.pointForm.pointAmount<=0) {
+ this.$message.error("金额不能小于0");
+ return false
+ }
if (this.pointForm.pointAmount > point && this.pointForm.pointType == 1) {
return this.$message.error("扣除金额不能大于总金额");
}
+
this.$refs["pointForm"].validate(valid => {
this.$http({
url: this.$http.adornUrl(
@@ -975,8 +998,9 @@ export default {
padding: 4px 0 !important;
box-sizing: border-box;
}
-/deep/ .mod-config .el-table .cell, .el-table th div {
- padding: 0 !important;
+/deep/ .mod-config .el-table .cell,
+.el-table th div {
+ padding: 0 !important;
box-sizing: border-box;
}