Merge branch 'online' into LAO_MO

dist/static/css/chunk-5ec46df2.641b676e.css → dist/static/css/chunk-7761544f.e9bc4ea2.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-2215eeb0]{display:inline-block;margin-right:10px}.right-code .title[data-v-2215eeb0]{font-size:18px;text-align:center;padding-bottom:8px}

src/views/studentManager/studentList.vue

@@ -7,6 +7,8 @@
       <div class="newBand"
            v-permission="'studentManage/register'"
            @click="addStudent">新增学员</div>
+      <div class="newBand"
+           @click="onCreateQRCode">学员激活列表</div>
       <!-- 搜索标题 -->
       <el-form :inline="true"
                class="searchForm"
@@ -43,8 +45,8 @@
           <el-input placeholder="学生姓名"
                     @keyup.enter.native='onSearch'
                     v-model="searchForm.studentName"></el-input>
-        </el-form-item>
-        <el-form-item> -->
+        </el-form-item> -->
+        <el-form-item>
         <el-button @click="onSearch"
                    type="danger">搜索</el-button>
         <el-button @click="onReSet"
@@ -182,12 +184,27 @@
                    @click="resetStudentSubmie">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="qrcodeStatus"
+               center
+               width="300px">
+      <div class="right-code">
+        <h2 class="title">学员激活列表</h2>
+        <div id="qrcode"
+             class="qrcode code"
+             ref="qrCodeUrl"></div>
+        <!-- <p class="code-url"
+           v-if="codeUrl2">{{ codeUrl2 }}</p> -->
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
 import { queryStudentList, getStudentInfoByPhone, registerStudent, updateStudent } from '@/api/studentManager'
+import { vaildStudentUrl } from '@/utils/validate'
 import { getEmployeeOrgan } from '@/api/buildTeam'
+import QRCode from 'qrcodejs2'
 import store from '@/store'
 export default {
   name: 'studentList',
@@ -229,7 +246,10 @@ export default {
       },
       isNew: false,
       active: null,
-      maskName: '新增学员'
+      maskName: '新增学员',
+      qrcodeStatus: false,
+      qrcodes: true,
+      activeRow: null
     }
   },
   mounted () {
@@ -251,6 +271,28 @@ export default {
       this.pageInfo.page = 1;
       this.getList()
     },
+     onCreateQRCode () { // 生成报名二维码
+      this.qrcodeStatus = true
+      // let id = this.$route.query.id
+      // let teamName = this.$route.query.name
+
+      setTimeout(() => {
+        if (this.qrcodes) {
+          this.qrcodes = false
+          this.qrcode = new QRCode('qrcode', {
+            width: 250,
+            height: 250,
+            colorDark: '#000000',
+            colorLight: '#ffffff',
+            correctLevel: QRCode.CorrectLevel.H
+          })
+        }
+        // vaildStudentUrl() + `/#/sporadicLogin?id=${刷刷刷}`
+        this.qrcode.clear();
+        this.qrcode.makeCode(vaildStudentUrl() + `/#/queryStudentPer`)
+        // this.codeUrl = vaildStudentUrl() + '/#/login?musicGroupId=' + id
+      }, 500)
+    },
     getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
@@ -376,5 +418,18 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+.newBand {
+  display: inline-block;
+  margin-right: 10px;
+}
+.right-code {
+  // width: 50%;
+  // float: left;
+  .title {
+    font-size: 18px;
+    text-align: center;
+    padding-bottom: 8px;
+  }
+}
 </style>

src/views/teamBuild/signupList.vue

@@ -32,9 +32,8 @@
                @click="onCreateQRCode">报名链接</div>
           <div class='newBand'
                @click="onCreateQRCode2">缴费详情</div>
-          <div class='newBand'
+          <div class='newBand' v-permission="'studentRegistration/queryStudentApplyDetailExport'"
                @click='onDownLoadExecl'>报表导出</div>
-
         </div>
       </div>
       <!--  stepImgs: {
@@ -388,6 +387,7 @@ import { vaildStudentUrl, vaildTeacherUrl } from '@/utils/validate'
 import QRCode from 'qrcodejs2'
 import axios from 'axios'
 import { getToken } from '@/utils/auth'
+import qs from 'qs'
 export default {
   components: {
     pagination
@@ -643,7 +643,7 @@ export default {
         headers: {
           'Authorization': getToken() 
         },
-        data: (data),
+        data: qs.stringify(data),
         url,
         responseType: 'blob'
       }

src/views/teamDetail/teamDetailedList.vue

@@ -57,9 +57,9 @@
     </div>
     <div class="btnWrap"
          style="margin-top:20px;">
-      <el-button type="primary" @click="musicalListExport">发放清单</el-button>
-      <el-button type="primary" @click="musicalListDetailExport">分发清单</el-button>
-      <el-button type="warning" v-permission="'order/verifyMusicalList'" @click="okDetailList">确认</el-button>
+      <el-button type="primary" v-permission="'order/musicalListExport'" @click="musicalListExport">发放清单导出</el-button>
+      <el-button type="primary" v-permission="'order/musicalListDetailExport'" @click="musicalListDetailExport">分发清单导出</el-button>
+      <el-button type="warning okBtn" v-permission="'order/verifyMusicalList'" @click="okDetailList">确认</el-button>
       <!-- <div class="okBtn" v-permission="'order/verifyMusicalList'"
            @click="okDetailList">确认</div> -->
     </div>