mo 4 年之前
父节点
当前提交
273fb07182
共有 36 个文件被更改,包括 13 次插入11 次删除
  1. 0 0
      dist/index.html
  2. 0 0
      dist/static/css/app.6af2cdc2.css
  3. 0 0
      dist/static/css/chunk-13bb56f4.eb1a5e24.css
  4. 0 0
      dist/static/css/chunk-3bc574e4.06cf5e65.css
  5. 1 0
      dist/static/css/chunk-4a8123fe.6ce08374.css
  6. 0 0
      dist/static/css/chunk-4b815175.80f14b06.css
  7. 1 0
      dist/static/css/chunk-680b82b4.eb6d7041.css
  8. 0 0
      dist/static/css/chunk-b6b1d956.358c6cd8.css
  9. 1 0
      dist/static/css/chunk-c23ebfc6.48b76034.css
  10. 0 0
      dist/static/css/chunk-de9a801e.103cfe18.css
  11. 0 0
      dist/static/js/app.79629525.js
  12. 0 0
      dist/static/js/app.8a294b0e.js
  13. 0 0
      dist/static/js/chunk-00e01cbe.e1dae8f9.js
  14. 0 0
      dist/static/js/chunk-053cc0f4.5735d58e.js
  15. 0 0
      dist/static/js/chunk-08a5bd4e.09dca136.js
  16. 0 0
      dist/static/js/chunk-1341b691.2651e045.js
  17. 0 0
      dist/static/js/chunk-13bb56f4.c10d5933.js
  18. 0 0
      dist/static/js/chunk-13bb56f4.e068ba38.js
  19. 0 0
      dist/static/js/chunk-15770507.3920e884.js
  20. 0 0
      dist/static/js/chunk-2e3062be.3ace2c9f.js
  21. 0 0
      dist/static/js/chunk-3910a1eb.f4e332a1.js
  22. 0 0
      dist/static/js/chunk-3bc574e4.b0c88db5.js
  23. 0 0
      dist/static/js/chunk-4a8123fe.bc9ad23d.js
  24. 0 0
      dist/static/js/chunk-4b815175.bc350027.js
  25. 0 0
      dist/static/js/chunk-680b82b4.90db2823.js
  26. 0 0
      dist/static/js/chunk-7f91ee0d.cd156909.js
  27. 0 0
      dist/static/js/chunk-933bb68e.fbbd98f9.js
  28. 0 0
      dist/static/js/chunk-b6b1d956.706cd255.js
  29. 0 0
      dist/static/js/chunk-c23ebfc6.8d629f01.js
  30. 0 0
      dist/static/js/chunk-de9a801e.2bfc3425.js
  31. 0 0
      dist/static/js/chunk-e60d0406.63158a9b.js
  32. 3 3
      src/layout/components/Navbar.vue
  33. 3 3
      src/views/reaplceMusicPlayer/index.vue
  34. 1 2
      src/views/reaplceMusicPlayer/modals/addUrl.vue
  35. 2 2
      src/views/studentManager/studentList.vue
  36. 1 1
      src/views/teamDetail/componentCourse/studentRollCall.vue

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.6af2cdc2.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-13bb56f4.eb1a5e24.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-3bc574e4.06cf5e65.css


+ 1 - 0
dist/static/css/chunk-4a8123fe.6ce08374.css

@@ -0,0 +1 @@
+.dialog-footer[data-v-d04b6434]{margin-top:20px;display:block;text-align:right}.alert[data-v-d04b6434]{margin-bottom:10px}.dialog-footer[data-v-a1d07d02]{margin-top:20px;display:block;text-align:right}.alert[data-v-a1d07d02]{margin-bottom:10px}.dialog-footer[data-v-23a41d36]{margin-top:20px;display:block;text-align:right}.alert[data-v-23a41d36]{margin-bottom:10px}.dialog-footer[data-v-5d97ee36]{margin-top:20px;display:block;text-align:right}.alert[data-v-5d97ee36]{margin-bottom:10px}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-4b815175.80f14b06.css


+ 1 - 0
dist/static/css/chunk-680b82b4.eb6d7041.css

@@ -0,0 +1 @@
+[data-v-5bd2dce3] .el-select{width:100%!important}[data-v-7f80e971] .el-table th{background:#edeef0}.btnList[data-v-77a1e4ad]{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:start;-ms-flex-pack:start;justify-content:flex-start}.code-url[data-v-77a1e4ad]{margin-top:10px}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-b6b1d956.358c6cd8.css


+ 1 - 0
dist/static/css/chunk-c23ebfc6.48b76034.css

@@ -0,0 +1 @@
+[data-v-298dcf9b] .dialog-footer{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:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-a631f796] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-a631f796] .current.is-selected{border:2px solid #137f79}[data-v-a631f796] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-a631f796]{background-color:#2aaea6}.teamDot[data-v-a631f796],.vipDot[data-v-a631f796]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-a631f796]{background-color:#5a79f6}.newDot[data-v-a631f796]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-de9a801e.103cfe18.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.79629525.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.8a294b0e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-00e01cbe.e1dae8f9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-053cc0f4.5735d58e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-08a5bd4e.09dca136.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-1341b691.2651e045.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-13bb56f4.c10d5933.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-13bb56f4.e068ba38.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-15770507.3920e884.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-2e3062be.3ace2c9f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-3910a1eb.f4e332a1.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-3bc574e4.b0c88db5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-4a8123fe.bc9ad23d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-4b815175.bc350027.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-680b82b4.90db2823.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-7f91ee0d.cd156909.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-933bb68e.fbbd98f9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-b6b1d956.706cd255.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-c23ebfc6.8d629f01.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-de9a801e.2bfc3425.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-e60d0406.63158a9b.js


+ 3 - 3
src/layout/components/Navbar.vue

@@ -324,9 +324,9 @@ export default {
     }
     &:hover,
     &.active{
-      color: #fff;
+      color: #14928A;
       span {
-        background: #14928A;
+        background: #fff;
         border-radius: 6px;
       }
     }
@@ -354,7 +354,7 @@ export default {
   height: 90px;
   overflow: hidden;
   position: relative;
-  background: #363D55;
+  background: #14928A;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;

+ 3 - 3
src/views/reaplceMusicPlayer/index.vue

@@ -145,7 +145,7 @@
               <div>
                 <el-button type="text" @click="lookDetail(scope.row)" v-if="permission('replacementInstrumentActivity/queryPage')">问卷详情</el-button>
                 <el-button type="text" @click="lookDetail(scope.row, 'answer')" v-if="permission('/reaplceMusicPlayer/answer')">问答详情</el-button>
-                <el-button type="text" @click="makeUrl('update', scope.row)" v-if="permission('replacementInstrumentCooperation/update')">修改活动主题</el-button>
+                <el-button type="text" @click="makeUrl('update', scope.row)" v-if="permission('replacementInstrumentCooperation/update')">修改主题</el-button>
                 <el-button
                   type="text"
                   @click="openPay(scope.row)"
@@ -185,7 +185,7 @@
       </div>
     </div>
     <el-dialog
-      :title="makeType == 'create' ? '生成链接' : '修改链接'"
+      :title="makeType == 'create' ? '生成链接' : '修改主题'"
       :visible.sync="makeUrlVisible"
       width="500px"
       v-if="makeUrlVisible"
@@ -193,7 +193,7 @@
       <addUrl ref="addUrl" @close="close" :makeType="makeType" :makeDetail="makeDetail" @getList="getList" />
       <div slot="footer">
         <el-button @click="makeUrlVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addurl">{{ makeType == 'create' ? '生成链接' : '修改链接' }}</el-button>
+        <el-button type="primary" @click="addurl">保存</el-button>
       </div>
     </el-dialog>
 

+ 1 - 2
src/views/reaplceMusicPlayer/modals/addUrl.vue

@@ -147,13 +147,12 @@ export default {
                 organId: form.organId,
                 topicId: form.topicId,
                 title: form.title})
-              this.$message.success('生成链接成功')
             } else if(this.makeType == 'update') {
               const res = await updateReplacement({
                 id: this.makeDetail.id,
                 title: form.title})
-              this.$message.success('修改链接成功')
             }
+            this.$message.success('保存成功')
             this.$emit('getList')
             this.$emit('close')
           }catch(e){

+ 2 - 2
src/views/studentManager/studentList.vue

@@ -186,11 +186,11 @@
             prop="parentsPhone"
             label="家长联系电话"
           ></el-table-column>
-              <el-table-column
+              <!-- <el-table-column
             align="center"
             prop="leaveNum"
             label="本月请假次数"
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column align="center">
             <template slot="header">
               <p style="position: relative">

+ 1 - 1
src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -72,7 +72,7 @@
             <div>{{ scope.row.visitFlag | yesOrNo }}</div>
           </template>
         </el-table-column>
-                <el-table-column align="center" prop="leaveNum" label="本月请假次数"></el-table-column>
+                <!-- <el-table-column align="center" prop="leaveNum" label="本月请假次数"></el-table-column> -->
         <el-table-column
           align="center"
           prop="ctrls"

部分文件因为文件数量过多而无法显示