Merge branch '01/21VipReset' into pre_online

src/views/businessManager/orderManager/financeManager.vue

@@ -317,10 +317,10 @@
               scope.row.status | dealStatus
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
-            <template slot-scope="scope">{{
-              scope.row.memo ? scope.row.memo : "-"
-            }}</template>
+          <el-table-column align="center" label="备注" width="220px">
+           <template slot-scope="scope">
+                       <overflow-text width="200px" :text="scope.row.memo"/>
+                     </template>
           </el-table-column>
           <el-table-column
             align="center"

src/views/businessManager/orderManager/income.vue

@@ -290,10 +290,10 @@
               scope.row.status | dealStatus
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
-            <template slot-scope="scope">{{
-              scope.row.memo ? scope.row.memo : "-"
-            }}</template>
+          <el-table-column align="center" label="备注" width="220px">
+            <template slot-scope="scope">
+                       <overflow-text width="200px" :text="scope.row.memo"/>
+                     </template>
           </el-table-column>
           <el-table-column align="center" width="150px" label="操作">
             <template slot-scope="scope">

src/views/studentManager/components/studentOrder.vue

@@ -158,7 +158,14 @@
           label="订单说明"
           align="center"
           prop="memo"
-        ></el-table-column>
+          width="220px"
+        >
+         <template slot-scope="scope">
+                       <overflow-text width="200px" :text="scope.row.memo"/>
+                     </template>
+        </el-table-column>
+        <el-table-column>
+        </el-table-column>
       </el-table>
       <pagination
         sync

src/views/vipClass/vipList.vue

@@ -339,6 +339,9 @@
                   @click="resetVip(scope.row)"
                   >修改</el-button
                 >
+                <el-button type='text'  v-if="
+                    scope.row.vipGroupActivityId <=0 &&
+                    permission('vipGroupManage/update')&&scope.row.status==1" @click="isStartCourse(scope.row)">确认成课</el-button>
               </div>
             </template>
           </el-table-column>
@@ -362,7 +365,7 @@ import {
   getVipList,
   vipGroupActivity,
   closeVip,
-  getVipGroupDetail,
+  vipGroupManageUpdate,
   deleteVipGroup,
 } from "@/api/vipSeting";
 import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
@@ -671,6 +674,25 @@ export default {
     permission(str) {
       return permission(str);
     },
+    isStartCourse(row){
+      // row.id
+        this.$confirm("确定开启乐理课", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    })
+      .then(() => {
+            vipGroupManageUpdate({id:row.id,status:'PROGRESS'}).then(res=>{
+        if(res.code == 200){
+          this.$message.success('提交成功')
+          this.getList()
+        }
+      })
+      })
+      .catch(() => { });
+
+
+    }
   },
   filters: {
     formatterTime(val) {