lex 2 سال پیش
والد
کامیت
b00033f8cb
2فایلهای تغییر یافته به همراه35 افزوده شده و 29 حذف شده
  1. 5 2
      src/views/resetTeaming/modals/giveMemberModel.vue
  2. 30 27
      src/views/studentManager/studentGroupPractice.vue

+ 5 - 2
src/views/resetTeaming/modals/giveMemberModel.vue

@@ -129,7 +129,8 @@ export default {
               orderSubject,
               tenantId,
               returnUrl,
-              notifyUrl
+              notifyUrl,
+              wxAppId
             } = res.data.payMap;
             this.orderNo = orderNo;
             this.codeUrl =
@@ -152,7 +153,9 @@ export default {
               "&returnUrl=" +
               returnUrl +
               "&notifyUrl=" +
-              notifyUrl;
+              notifyUrl +
+              "&wxAppId=" +
+              wxAppId;
             console.log(this.codeUrl, "codeUrl");
             this.payMentVisible = true;
           } catch (e) {}

+ 30 - 27
src/views/studentManager/studentGroupPractice.vue

@@ -22,7 +22,13 @@
       <!-- <div class="newBand"
           @click="resetPays"
           v-permission="'musicGroupStudentFee/batchUpdateCourseFee'">修改缴费金额</div> -->
-      <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay/student')" type="primary" style="margin-bottom: 20px">激活云教练</el-button>
+      <el-button
+        @click="addMember"
+        v-if="$helpers.permission('cloudTeacherOrder/pay/student')"
+        type="primary"
+        style="margin-bottom: 20px"
+        >激活云教练</el-button
+      >
 
       <div class="tableWrap">
         <el-table
@@ -47,11 +53,7 @@
             prop="subjectName"
             label="学员声部"
           ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="type"
-            label="云教练类型"
-          >
+          <el-table-column align="center" prop="type" label="云教练类型">
             <template slot-scope="scope">
               {{ scope.row.type | memberEnumType }}
             </template>
@@ -61,10 +63,7 @@
             prop="time"
             label="数量"
           ></el-table-column>
-          <el-table-column
-            align="center"
-            label="缴费金额(元)"
-          >
+          <el-table-column align="center" label="缴费金额(元)">
             <template slot-scope="scope">
               {{ scope.row.amount | hasMoneyFormat }}
             </template>
@@ -98,13 +97,17 @@
       v-if="giveMemberVisible"
       append-to-body
     >
-      <giveMemberModel :tableList="selectStudentList" @getList="getList" @close="giveMemberVisible = false" />
+      <giveMemberModel
+        :tableList="selectStudentList"
+        @getList="getList"
+        @close="giveMemberVisible = false"
+      />
     </el-dialog>
   </div>
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
-import { queryInactive } from '@/views/resetTeaming/api'
+import { queryInactive } from "@/views/resetTeaming/api";
 import giveMemberModel from "@/views/resetTeaming/modals/giveMemberModel";
 export default {
   components: { pagination, giveMemberModel },
@@ -115,7 +118,7 @@ export default {
       giveMemberVisible: false,
       searchForm: {
         queryCondition: "",
-        subjectId: "",
+        subjectId: ""
       },
       soundList: [],
       tableList: [],
@@ -124,13 +127,13 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      selectStudentList: [], // 选中的学生列表
+      selectStudentList: [] // 选中的学生列表
     };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     async getList() {
@@ -138,15 +141,15 @@ export default {
         const res = await queryInactive({
           ...this.searchForm,
           page: this.rules.page,
-          rows: this.rules.limit,
+          rows: this.rules.limit
         });
         this.rules.total = res.data.total;
         this.tableList = res.data.rows;
-      } catch (e) { }
-      queryInactive
+      } catch (e) {}
+      queryInactive;
     },
     handleSelectionChange(val) {
-      this.selectStudentList = val || []
+      this.selectStudentList = val || [];
     },
     search() {
       this.rules.page = 1;
@@ -154,15 +157,15 @@ export default {
     },
     onReSet() {
       this.searchForm = { search: "", subjectId: "" };
-      this.search()
+      this.search();
     },
-    addMember(){
-      if(this.selectStudentList.length <= 0) {
-        this.$message.error('至少选择一名学生')
-        return
+    addMember() {
+      if (this.selectStudentList.length <= 0) {
+        this.$message.error("至少选择一名学生");
+        return;
       }
-      this.giveMemberVisible = true
+      this.giveMemberVisible = true;
     }
-  },
+  }
 };
 </script>