Merge branch '03/12permission' into dev

src/views/contentManager/components/activity.vue

@@ -52,7 +52,7 @@
                          prop="title"
                          label="标题"></el-table-column>
         <el-table-column align="center"
-                         label="跳转连接">
+                         label="跳转链接">
           <template slot-scope="scope">
             <overflow-text :text="scope.row.linkUrl + '/' + scope.row.id"></overflow-text>
           </template>

src/views/teamBuild/signupList.vue

@@ -574,7 +574,7 @@
       </div>
     </el-dialog> -->
 
-    <!-- 预报名连接 -->
+    <!-- 预报名链接 -->
     <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
 
     <!-- 退团弹窗 -->

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -49,7 +49,7 @@
                width="300px">
       <div class="left-code"
            style="display: flex; flex-direction: column; align-items: center;">
-        <h2>小班课报名连接</h2>
+        <h2>小班课报名链接</h2>
         <div id="qrcode"
              class="qrcode code"
              ref="qrCodeUrl"></div>

src/views/teamDetail/components/studentList.vue

@@ -2230,7 +2230,7 @@ export default {
       let id = this.teamid;
       this.codeStatus = true;
       if (type == "payment") {
-        this.codeTitle = "学员报名连接";
+        this.codeTitle = "学员报名链接";
         this.qrCodeUrl = vaildStudentUrl() + "/#/login?musicGroupId=" + id;
       } else if (type == "detail") {
         let teamName = this.$route.query.name;