修改

src/components/education/addteacherCourse.vue

@@ -25,7 +25,7 @@
         <el-form-item label="直播房间" >
           <el-select class="w400" style="margin-right: 10px;" v-model="addMsg.RoomId" size="small"
                      placeholder="请选择" >
-            <el-option v-for="item in LiveList" :key="item.roomid" :label="item.anchor_name" :value="item.roomid">
+            <el-option v-for="item in LiveList" :key="item.roomid" :label="item.name" :value="item.roomid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -33,14 +33,15 @@
           <el-date-picker
             v-model="addMsg.StudyDate"
             type="date"
+            size="small"
             value-format="yyyy-MM-dd"
-
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="开始时间" prop="StudyStartDate" class="is-required" >
           <el-time-picker
             v-model="addMsg.StudyStartDate"
+            size="small"
             format="HH:mm"
             value-format="HH:mm"
             @change="getTime()"
@@ -55,6 +56,7 @@
           <el-time-picker
             :disabled="jiesushow"
             v-model="addMsg.StudyEndDate"
+            size="small"
             format="HH:mm"
             value-format="HH:mm"
             :picker-options="{
@@ -216,7 +218,7 @@
         this.apipost("/api/LiveHouse/GetLiveListByLiveStatus", {pageIndex: 1,
           pageSize: 9999999,}, res => {
           if (res.data.resultCode == 1) {
-            this.LiveList = res.data.data
+            this.LiveList = res.data.data;
           } else {
             this.Error(res.data.message);
           }
@@ -236,7 +238,6 @@
         this.apipost("/api/Point/GetDurationUnitEnumList", {}, res => {
           if(res.data.resultCode==1){
             this.DurationList = res.data.data;
-            console.log(res,'小时');
           }else {
             this.Info(res.data.message);
           }

src/components/education/pointOrderList.vue

@@ -109,10 +109,9 @@
                       </div>
                     </div>
                   </div>
-
                 </div>
               </div>
-              <div flex="cross:center" class="app-order-info" style="width: 25%;">
+              <div flex="cross:center" class="app-order-info" style="width: 17%;">
                 <div flex="dir:top">
                   <div style="width:200px;text-align:left;margin:auto;line-height:28px;margin-top:-30px;padding-left:20px;">
                     <div>总点数：{{item.TotalPointNum}}</div>
@@ -121,13 +120,9 @@
                   </div>
                 </div>
               </div>
-
-              <div class="app-order-info" style="padding: 10px; border-right: 0px; width: 6%;">
-                <div flex="wrap:wrap cross:center" style="display:none;">
-                  <el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
-                    <img class="app-order-icon" src="../../assets/img/userman/detail.png" alt="">
-                  </el-tooltip>
-                </div>
+              <div class="app-order-info" style="padding: 10px; border-right: 0px; width: 10%;">
+                <el-button size="small" type="primary" v-if="item.OrderStaus==2" @click="editOrderIn(item)">确认</el-button>
+                <el-button size="small" type="primary" v-if="item.OrderStaus==3" @click="sureWancheng(item)">确认完成</el-button>
               </div>
             </div>
             <div class="card-footer" v-if="item.Remark && item.Remark!=''">
@@ -250,6 +245,33 @@
       </span>
     </el-dialog>
 
+    <!-- 修改房间信息 -->
+    <el-dialog title="修改房间信息" :visible.sync="roomDialog" width="600px">
+      <el-form label-width="80px">
+        <el-form-item label="房间信息">
+          <el-input type="textarea" :rows="4" v-model="sureMsg.RoomInfo">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="roomDialog = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="querenOrder()">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 确认完成-->
+    <el-dialog title="修改点数" :visible.sync="sureDialog" width="400px">
+      <el-form label-width="80px">
+        <el-form-item label="点数">
+          <el-input v-model="comMsg.ActualPointNum" @keyup.native="checkInteger(comMsg,'ActualPointNum')">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="sureDialog = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="querenScore()">确 定</el-button>
+      </span>
+    </el-dialog>
+
 
 
   </div>
@@ -260,6 +282,8 @@
     name: "pointOrderList",
     data() {
       return {
+        roomDialog:false, //修改房间信息弹窗
+        sureDialog:false,
         importFileUrl: this.domainManager().UploadFileUrl,
         priceType: 1,
         priceMsg: {
@@ -399,7 +423,17 @@
           MemberGrade: 0,
           Id: 0,
           Moblie: ''
-        }
+        },
+        sureMsg:{
+          CourseId:0,
+					TeacherId:0,
+					RoomInfo:'',
+					ID:0
+        },
+        comMsg:{
+					ActualPointNum:0,
+					ID:0
+				},
       }
     },
     created() {
@@ -848,8 +882,8 @@
             this.total = res.data.data.count;
             let pageData = res.data.data.pageData;
             this.tableData = pageData;
+            console.log(res,'数据来也');
           }
-
         })
       },
       handleCurrentChange(val) {
@@ -937,6 +971,50 @@
           {},
           "约课订单.xls"
         );
+      },
+
+      editOrderIn(item){
+        this.roomDialog=true;
+        this.sureMsg.CourseId = item.CourseId;
+				this.sureMsg.TeacherId = item.TeacherId;
+				this.sureMsg.ID = item.ID;
+      },
+      //确认订单
+      querenOrder(){
+        if(this.sureMsg.RoomInfo==''){
+          this.Error('请填写房间信息');
+          return;
+        }
+        this.apipost("/api/Point/GetConfirmTeacherCourseOrder", this.sureMsg, res => {
+          if(res.data.resultCode==1){
+            this.getList();
+            this.roomDialog=false;
+            this.Success(res.data.message);
+          }else{
+            this.Error(res.data.message);
+          }
+        })
+      },
+      //确认完成
+      sureWancheng(item){
+        this.sureDialog=true;
+        this.comMsg.ActualPointNum = item.TotalPointNum;
+        this.comMsg.ID = item.ID;
+      },
+      querenScore(){
+        if(this.comMsg.ActualPointNum==''){
+          this.Error('请填写分数');
+          return;
+        }
+        this.apipost("/api/Point/GetCompleteTeacherCourseOrder", this.comMsg, res => {
+          if(res.data.resultCode==1){
+            this.getList();
+            this.sureDialog=false;
+            this.Success(res.data.message);
+          }else{
+            this.Error(res.data.message);
+          }
+        })
       }
     },
   };
@@ -990,9 +1068,6 @@
     margin: 15px 0;
   }
 
-  .app-order-list .app-order-item .el-button {
-    padding: 0;
-  }
 
   .app-order-list .card-footer .address-box {
     margin-right: 10px;
@@ -1171,27 +1246,6 @@
     box-sizing: border-box;
   }
 
-  .pointOrderList .billStyle {
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    border: 1px solid #EBEEF5;
-    margin-top: 20px;
-  }
-
-  .pointOrderList .billStyle .billStyle_item {
-    width: 50%;
-    padding: 5px;
-  }
-
-  .pointOrderList .billStyle .billtext {
-    font-size: 14px;
-    cursor: pointer;
-    margin-right: 5px;
-    text-decoration: underline;
-  }
-
   .pointOrderList .el-dropdown-link {
     height: 30px;
     line-height: 30px;
@@ -1204,19 +1258,4 @@
     cursor: pointer;
     display: inline-block;
   }
-
-  .pointOrderList .fkbox {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    margin-right: 15px;
-  }
-
-  .pointOrderList .fkbox .fkbox_item {
-    width: 10px;
-    height: 10px;
-    border-radius: 2px;
-    margin-right: 4px;
-  }
-
 </style>