添加乐团收费模式和下载协议样式

src/App.vue

@@ -67,7 +67,7 @@ body {
 <style lang="scss">
 $--color-primary: teal;
 .el-table {
-  width: 99.9% !important;
+  width: 99% !important;
   border-left: 1px solid #EBEEF5;
   border-right: 1px solid #EBEEF5;
 }

src/views/studentManager/studentList.vue

@@ -597,6 +597,49 @@
         <el-button type="primary" @click="submitResetPassWord">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      title="协议下载"
+      :visible.sync="protocolVisible"
+      width="600px"
+    >
+      <div v-if="protocolVisible">
+        <!-- <el-alert
+          title="点击下载"
+          :closable="false"
+          type="info">
+        </el-alert>
+        <p style="font-size: 14px; color: #14928A; line-height: 1.5; padding: 8px 16px; cursor: pointer;" v-for="item in protocolVersions" :key="item.id" @click="onDownloadProtocol(item)">
+          产品与服务协议{{ item.version == 2 ? "（含课程）" : "（含系统）" }}
+        </p> -->
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="protocolVersions"
+        >
+          <el-table-column align="center" prop="studentId" label="协议名称">
+            <template slot-scope="scope">
+              产品与服务协议{{ scope.row.version == 2 ? "（含课程）" : "（含系统）" }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="签署时间" prop="createTime">
+          </el-table-column>
+          <el-table-column align="center"
+                           width="150px"
+                           label="操作">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text"
+                           @click="onDownloadProtocol(scope.row)">下载</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="protocolVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -696,6 +739,8 @@ export default {
         password2: "",
       },
       activatedRow: null,
+      protocolVisible: false,
+      protocolVersions: []
     };
   },
   mounted() {
@@ -1004,14 +1049,19 @@ export default {
         }
       });
     },
-    lookContracts(row) {
-      getLatest({ userId: row.userId }).then((res) => {
+    async lookContracts(row) {
+      await getLatest({ userId: row.userId }).then((res) => {
         if (res.code == 200) {
-          window.location.href = res.data.url
-          // window.open(res.data.url);
+          if(res.data) {
+            this.protocolVersions = res.data
+            this.protocolVisible = true
+          }
         }
       });
     },
+    onDownloadProtocol(item) {
+      window.location.href = item.url
+    }
   },
 };
 </script>

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -534,6 +534,7 @@ export default {
         applyExpireDate: dayjs(this.topfor.time).format("YYYY-MM-DD HH:mm:ss"),
         chargeTypeId: this.topfor.type,
         cooperationOrganId: this.topfor.school,
+        courseViewType: this.topfor.courseViewType,
         teamTeacherId: this.topfor.boss,
         educationalTeacherId: this.topfor.teacher,
         enrollClasses,

src/views/teamBuild/components/teamBaseInfo.vue

@@ -51,6 +51,22 @@
         </el-form-item>
 
         <el-form-item
+          label="收费模式"
+          prop="courseViewType"
+          :rules="[{ required: true, message: '收费模式不能为空' }]"
+        >
+          <el-select
+            v-model.trim="topFrom.courseViewType"
+            filterable
+            :disabled="basdisabled"
+            clearable
+          >
+            <el-option label="课程收费" :value="0"></el-option>
+            <el-option label="系统收费" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
           label="合作单位"
           prop="school"
           :rules="[{ required: true, message: '合作单位不能为空' }]"
@@ -349,6 +365,7 @@ export default {
       topFrom: {
         type: "", // 收费类型
         section: "", //所属分部
+        courseViewType: "", // 收费模式
         school: "", // 合作单位
         teacher: "", // 乐团主管
         name: "", //乐团名称
@@ -551,6 +568,7 @@ export default {
             this.topFrom.paymentValidEndDate =
               res.data.musicGroup.paymentValidEndDate;
             this.topFrom.section = res.data.musicGroup.organId;
+            this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
             this.topFrom.school = res.data.musicGroup.cooperationOrganId;
             this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
             this.topFrom.boss = res.data.musicGroup.teamTeacherId;
@@ -613,6 +631,7 @@ export default {
           type: "", // 收费类型
           section: "", //所属分部
           school: "", // 合作单位
+          courseViewType: "",
           teacher: "", // 乐团主管
           name: "", //乐团名称
           boss: "", // 运营主管
@@ -741,6 +760,7 @@ export default {
             ),
             chargeTypeId: this.topFrom.type,
             cooperationOrganId: this.topFrom.school,
+            courseViewType: this.topFrom.courseViewType,
             teamTeacherId: this.topFrom.boss,
             educationalTeacherId: this.topFrom.teacher,
             enrollClasses: this.topFrom.startClass.join(","),

vue.config.js

@@ -21,7 +21,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+let target = 'http://47.114.176.40:8000' // 测试服
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -62,7 +62,7 @@ module.exports = {
       // http://47.99.212.176:8000
       // http://192.168.3.28:8000
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
+        target: 'http://47.114.176.40:8000',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''