limengbo hace 5 años
padre
commit
129e235b0c

+ 4 - 4
src/views/dashboardRowItem/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="dashboard-container">
     <div class="dashboard-text">
-      <el-button type="primary" @click="addList">增加列表</el-button>
+      <el-button type="primary" @click="addList">增加列表</el-button>
       <el-table
         :data="getRowItemData"
         style="width: 100%"
@@ -79,10 +79,10 @@
           <el-form-item label="项目名称" :label-width="formLabelWidth" prop="content">
             <el-input v-model="form.content" autocomplete="off" clearable />
           </el-form-item>
-          <el-form-item v-if="type === 'add'" label="icon" :label-width="formLabelWidth" prop="icon">
+          <el-form-item v-if="type === 'add'" label="icon" :label-width="formLabelWidth">
             <el-input v-model="form.icon" autocomplete="off" clearable />
           </el-form-item>
-          <el-form-item v-if="type === 'add'" label="模板" :label-width="formLabelWidth" prop="targetType">
+          <el-form-item v-if="type === 'add'" label="模板" :label-width="formLabelWidth">
             <el-select v-model="form.targetType" placeholder="请选择">
               <el-option value="LIBRARY" label="图书馆课程" />
               <el-option value="PAY" label="知识付费" />
@@ -94,7 +94,7 @@
           <el-form-item label="排序" :label-width="formLabelWidth" prop="sort">
             <el-input v-model="form.sort" autocomplete="off" clearable />
           </el-form-item>
-          <el-form-item v-if="type === 'add'" label="Code" :label-width="formLabelWidth" prop="targetContent">
+          <el-form-item v-if="type === 'add'" label="Code" :label-width="formLabelWidth">
             <el-input v-model="form.targetContent" autocomplete="off" clearable />
           </el-form-item>
           <el-form-item v-if="type === 'add'" label="状态" :label-width="formLabelWidth" prop="status">

+ 32 - 5
src/views/memberAuth/index.vue

@@ -2,12 +2,16 @@
 <template>
   <div class="school-container">
     <div class="school">
-      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-button type="primary" @click="addEdit">增加</el-button>
+      <el-form ref="rulesFormInline" :inline="true" :model="formInline" :rules="rulesInline" class="demo-form-inline">
+        <el-form-item label="用户Id" prop="uid">
+          <el-input v-model="formInline.uid" placeholder="产品名称" clearable />
+        </el-form-item>
         <el-form-item label="产品名称">
           <el-input v-model="formInline.productName" placeholder="产品名称" clearable />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit('ruleForm')">查询</el-button>
+          <el-button type="primary" @click="onSubmit('rulesFormInline')">查询</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -71,6 +75,9 @@
       </el-table>
       <el-dialog title="增加天数" :visible.sync="dialogFormVisible">
         <el-form ref="ruleForm" :model="form" :rules="rules">
+          <el-form-item label="用户Id" :label-width="formLabelWidth" prop="uid">
+            <el-input v-model="form.uid" autocomplete="off" clearable />
+          </el-form-item>
           <el-form-item label="产品名称" :label-width="formLabelWidth" prop="title">
             <el-input v-model="form.title" autocomplete="off" clearable />
           </el-form-item>
@@ -106,6 +113,11 @@ export default {
         uid: '',
         productName: ''
       },
+      rulesInline: {
+        uid: [
+          { required: true, message: '请输入用户id', trigger: 'blur' }
+        ]
+      },
       page: 1,
       formLabelWidth: '120px',
       form: {
@@ -117,10 +129,12 @@ export default {
         title: [{ required: true, message: '请输入产品', trigger: 'blur' }],
         addDays: [{ required: true, message: '请输入增加天数', trigger: 'blur' }]
       },
-      dialogFormVisible: false
+      dialogFormVisible: false,
+      type: ''
     }
   },
   created() {
+    this.formInline.uid = this.$route.query.uid
     this.$store.dispatch('memberList/getMemberAuthList', {
       uid: this.$route.query.uid,
       productName: ''
@@ -137,14 +151,24 @@ export default {
       return new Date(date * 1).toLocaleString()
     },
     onSubmit(formName) {
-      this.formInline.uid = this.$route.query.uid
-      this.$store.dispatch('memberList/getMemberAuthList', this.formInline)
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('memberList/getMemberAuthList', this.formInline)
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
     handleEdit(index, row) {
       console.log(index, row)
       this.dialogFormVisible = true
       this.form.uid = row.uid
     },
+    addEdit() {
+      this.dialogFormVisible = true
+      this.form.uid = this.$route.query.uid
+    },
     handOk(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -186,4 +210,7 @@ export default {
   text-align: center;
   margin-top: 20px;
 }
+.demo-form-inline {
+  float: right;
+}
 </style>

+ 7 - 1
src/views/memberOrder/index.vue

@@ -3,6 +3,9 @@
   <div class="school-container">
     <div class="school">
       <el-form ref="ruleForm" :inline="true" :model="formInline" :rules="rules" class="demo-form-inline">
+        <el-form-item label="用户Id" prop="uid">
+          <el-input v-model="formInline.uid" placeholder="产品名称" clearable />
+        </el-form-item>
         <el-form-item label="产品名称">
           <el-input v-model="formInline.productName" placeholder="产品名称" clearable />
         </el-form-item>
@@ -96,6 +99,9 @@ export default {
         page: 1
       },
       rules: {
+        uid: [
+          { required: true, message: '请输入用户id', trigger: 'blur' }
+        ],
         productVersion: [
           { required: true, message: '请选择产品', trigger: 'change' }
         ]
@@ -103,6 +109,7 @@ export default {
     }
   },
   created() {
+    this.formInline.uid = this.$route.query.uid
   },
   destroyed() {
     this.$store.commit('memberList/GET_MEMBER_ORDER', [])
@@ -120,7 +127,6 @@ export default {
       return new Date(date * 1).toLocaleString()
     },
     onSubmit(formName) {
-      this.formInline.uid = this.$route.query.uid
       this.$refs[formName].validate((valid) => {
         if (valid) {
           console.log(this.formInline)