三明修改

src/containers/center/market/index.vue

@@ -72,7 +72,8 @@
     </el-dialog>
 
 
-    <el-dialog title="申请开通课程"  :visible.sync="buyCourseDialog" :append-to-body="true" width="750px" align="center">
+    <el-dialog title="申请开通课程"  :visible.sync="buyCourseDialog" :append-to-body="true"
+    width="800px" top="20px" align="center">
       <el-form label-width="80px" label-position="right" :inline="true" :model="buyForm" status-icon :rules="rules" ref="elForm">
         <el-row align="left">
           <el-col :lg="12" class="pl20 pr20">
@@ -104,7 +105,7 @@
 
           <el-col :span="12" class="pl20 pr20">
             <el-form-item lable="订单号" prop="payNo">
-              <label slot="label">订单号</label>
+              <label slot="label">订单编号</label>
               <el-input v-model="buyForm.payNo" placeholder="输入订单编号后6位" style="width: 220px;" :minlength="6" :maxlength="6" show-word-limit ></el-input>
             </el-form-item>
           </el-col>
@@ -113,13 +114,13 @@
            <el-col :span="12" class="pl20 pr20">
              <el-form-item lable="工作单位" prop="company">
                <label slot="label">工作单位</label>
-               <el-input v-model="buyForm.company" type="text" placeholder="工作单位" style="width: 220px;"></el-input>
+               <el-input v-model="buyForm.company" type="textarea" placeholder="工作单位" style="width: 220px;"></el-input>
              </el-form-item>
            </el-col>
           <el-col :span="12" class="pl20 pr20">
             <el-form-item lable="备注信息" prop="marks">
               <label slot="label">备注信息</label>
-              <el-input v-model="buyForm.marks" type="textarea" placeholder="姓名+工种名称，例：张三+土建施工员" style="width: 573px;"></el-input>
+              <el-input v-model="buyForm.marks" type="textarea" placeholder="姓名+工种名称，例：张三+土建施工员" style="width: 220px;"></el-input>
             </el-form-item>
           </el-col>
 
@@ -235,7 +236,7 @@
         stage: 0,
         isCompanyPay: 0,
         width: "",
-        type: this.$route.query.type || '继续教育',
+        type: '',
         list: [],
         showData: [],
         isCommitment: "",
@@ -246,6 +247,7 @@
           marks: '',
           rzCode: '',
           payNo:'',
+          email:'',
           company:'',
           courseName: ''
         },
@@ -295,6 +297,10 @@
               }
             }
           ],
+          company: [{
+            required: true,
+            message: '请输入所在企业'
+          }],
           courseName: [{
             required: true,
             message: '请输入报考岗位'
@@ -325,6 +331,7 @@
       }
     },
     beforeMount() {
+      this.type = this.$route.query.type||'继续教育'
       if (!this.type && this.typeList.length > 0) {
         this.type = this.typeList[0].name
         this.getData()
@@ -367,31 +374,15 @@
       buyCourse() {
         this.$refs["elForm"].validate((valid) => {
           if (!valid) return;
-          let {
-            marks,
-            payNo,
-            course_id,
-            courseName,
-            rzCode,
-            name,
-            email
-          } = this.buyForm;
+          let { marks, company, payNo, course_id, courseName, rzCode, name,  email} = this.buyForm;
           if (courseName != name) {
             this.$message.errorMsg("报考岗位有误", 1)
             return;
           }
-          let param = {
-            marks,
-            payNo,
-            courseId: course_id,
-            courseName,
-            rzCode,
-            email
-          }
+          let param = { marks,payNo, company,courseId: course_id, courseName,rzCode,email }
           httpServer("course.buyCourse", param).then((res) => {
             if (res.code == 200) {
               this.$message.successMsg("申请购买成功", 1);
-              this.buyForm.temp.buyImg = this.buyForm.buyImg
               this.buyForm.temp.marks = this.buyForm.marks
               this.buyForm.temp.is_pay = 0
               this.buyForm.temp.courseName = this.buyForm.courseName;
@@ -418,6 +409,7 @@
         // this.isCompanyPay = 0;
         // this.isCommitment=''
         // this.buyForm.rzCode = item.rzCode;
+        // this.buyForm.company = 'ssss';
         // this.buyForm.courseName = item.courseName;
         // this.commitmentDialog = true;
         // 检查
@@ -428,8 +420,7 @@
             this.stage = 2;
             this.isCompanyPay = 0;
             this.isCommitment=''
-            this.buyForm.rzCode = res.data.certificateNum;
-            this.buyForm.courseName = res.data.positionName;
+            Object.assign( this.buyForm, res.data);
             this.commitmentDialog = true;
           }
         });

src/containers/center/myOrder/index.vue

@@ -39,11 +39,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="订单状态" min-width="100">
+          <el-table-column label="订单状态" min-width="120">
             <template slot-scope="{row}">
               <span v-if="row.isPay==1" style="color: green;">支付完成</span>
               <span v-if="row.isPay==0" >待审核</span>
-              <span v-if="row.isPay==2" style="color: red;">{{row.marks||'拒绝'}}</span>
+              <span v-if="row.isPay==2" style="color: red;" @click="rebuyInfo(row)">{{row.marks||'拒绝'}}
+                <el-button  type="text">修改</el-button>
+              </span>
             </template>
           </el-table-column>
         </el-table>
@@ -56,26 +58,34 @@
            :total="total">
         </el-pagination>
 
+        <el-dialog title="申请开通课程"  :visible.sync="buyCourseDialog" :append-to-body="true"
+        width="800px" top="20px" align="center">
+          <IBuyCourse :courseId="courseId" @finish="reload"></IBuyCourse>
+        </el-dialog>
+
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import {
-    httpServer
-  } from "@/components/httpServer/httpServer.js";
+  import {httpServer } from "@/components/httpServer/httpServer.js";
   import {str2time} from '@/utils/date.js'
 
+  import IBuyCourse from '../components/pay/IBuyCourse.vue'
+
 
   export default {
     name: "Index",
+    components:{IBuyCourse},
     data() {
       return {
         page: 1,
         size: 12,
         total: 1,
+        courseId:0,
         list: [],
+        buyCourseDialog: false,
         listLoading: false
       };
     },
@@ -98,6 +108,14 @@
       }
     },
     methods: {
+      rebuyInfo(row){
+        this.courseId = row.courseId||0;
+        this.buyCourseDialog = true;
+      },
+      reload(){
+        this.buyCourseDialog = false;
+        this.getData();
+      },
       getData() {
         let param = {from: (this.page - 1) * this.size,size:this.size}
         httpServer('course.GetSmPayCourseList', param).then(({