mo %!s(int64=3) %!d(string=hai) anos
pai
achega
8598f4dc49

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
dist/index.html


+ 0 - 1
dist/static/css/chunk-6a8bd03e.54fc8ffd.css

@@ -1 +0,0 @@
-.box-card[data-v-27669ce8]{margin-bottom:10px}[data-v-27669ce8] .el-collapse-item__header{background:#edeef0;color:#444;padding:0 10px}[data-v-27669ce8] .el-collapse-item__wrap{border:0}[data-v-27669ce8] .el-collapse-item__content{padding-bottom:0}.demo-table-expand[data-v-27669ce8]{font-size:0}.demo-table-expand label[data-v-27669ce8]{width:90px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-27669ce8]{margin-right:0;margin-bottom:0;width:300px}.demo-table-expand .el-form-item span[data-v-27669ce8]{width:200px}

+ 1 - 0
dist/static/css/chunk-707bcb4d.59394272.css

@@ -0,0 +1 @@
+.box-card[data-v-325b273a]{margin-bottom:10px}[data-v-325b273a] .el-collapse-item__header{background:#edeef0;color:#444;padding:0 10px}[data-v-325b273a] .el-collapse-item__wrap{border:0}[data-v-325b273a] .el-collapse-item__content{padding-bottom:0}.demo-table-expand[data-v-325b273a]{font-size:0}.demo-table-expand label[data-v-325b273a]{width:90px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-325b273a]{margin-right:0;margin-bottom:0;width:300px}.demo-table-expand .el-form-item span[data-v-325b273a]{width:200px}.imgWrap[data-v-325b273a]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.moreImg[data-v-325b273a]{width:50px;height:50px;background-color:#999;line-height:50px;text-align:center;color:#fff}.el-image-viewer__close{top:40px;right:40px;width:40px;height:40px;font-size:24px;color:#fff;background-color:#606266}

+ 1 - 0
dist/static/css/chunk-b0bbf3f8.866e1837.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-e4c873b8],.el-button--primary[data-v-e4c873b8]:active,.el-button--primary[data-v-e4c873b8]:focus,.el-button--primary[data-v-e4c873b8]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-e4c873b8] .el-image-viewer__close{color:#fff;opacity:1}[data-v-e4c873b8] .el-date-editor.el-input,[data-v-e4c873b8] .el-select{width:100%!important}[data-v-e4c873b8] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

+ 0 - 1
dist/static/css/chunk-cc11236c.63647321.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-25cd7b92],.el-button--primary[data-v-25cd7b92]:active,.el-button--primary[data-v-25cd7b92]:focus,.el-button--primary[data-v-25cd7b92]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-25cd7b92] .el-image-viewer__close{color:#fff;opacity:1}[data-v-25cd7b92] .el-date-editor.el-input,[data-v-25cd7b92] .el-select{width:100%!important}[data-v-25cd7b92] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.cd3839cf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-6a8bd03e.f2b8d5d5.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-707bcb4d.4a513c32.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/chunk-b0bbf3f8.0ff1cca7.js


+ 1 - 0
src/router/notKeepAliveList.js

@@ -105,6 +105,7 @@ export default [
   '/setSilder/setSilder',
   '/downList', //下载列表
   '/business/reaplceMusicPlayer', // 乐器置换
+  '/operateManager/userAskList',
   // '/business/feeAudit',
   '/baseRulersManager',
   '/courseRulersManager'

+ 1 - 1
src/views/levelManager/levelManager.vue

@@ -191,7 +191,7 @@
             width="150px"
           >
             <template slot-scope="scope">
-              {{ scope.row.level }} / {{ scope.row.money | moneyFormat }}元
+              <div v-if="scope.row.level">{{ scope.row.level }} / {{ scope.row.money | moneyFormat }}元</div>
             </template>
           </el-table-column>
           <el-table-column

+ 36 - 7
src/views/setQuestions/userAskList.vue

@@ -63,19 +63,21 @@
                     <a :href="url.url">{{ url.name }}</a>
                   </p>
                 </div>
-                <div v-if="scope.row.questionnaireResultDtoList[index].type == 'image'">
-                  <div v-if="JSON.parse(scope.row.questionnaireResultDtoList[index].additionalValue).length > 0">
+                <div v-if="scope.row.questionnaireResultDtoList[index].type == 'image'" >
+                  <div v-if="JSON.parse(scope.row.questionnaireResultDtoList[index].additionalValue).length > 0" class="imgWrap">
                     <el-image
-
-                      v-for="(item,index) in JSON.parse(scope.row.questionnaireResultDtoList[index].additionalValue)"
-                      :key="index"
+                    class="refImg"
+                    ref='refImg'
                       style="width: 50px; height: 50px;margin-right:5px"
-                      :src="item.url"
+                      :src="JSON.parse(scope.row.questionnaireResultDtoList[index].additionalValue)[0].url"
                       :preview-src-list="[
-                        item.url,
+                       ...JSON.parse(scope.row.questionnaireResultDtoList[index].additionalValue).map(item=>{return item.url})
                       ]"
                     >
                     </el-image>
+                    <div class="moreImg">
+                      +{{JSON.parse(scope.row.questionnaireResultDtoList[index].additionalValue).length-1}}
+                    </div>
                   </div>
 
                   <span v-else>--</span>
@@ -200,4 +202,31 @@ export default {
     width: 200px;
   }
 }
+.imgWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+.moreImg {
+  width: 50px;
+  height: 50px;
+  background-color: #999;
+  line-height: 50px;
+  text-align: center;
+  color: #fff;
+}
+
+
+</style>
+<style lang="css">
+.el-image-viewer__close {
+    top: 40px;
+    right: 40px;
+    width: 40px;
+    height: 40px;
+    font-size: 24px;
+    color: #fff;
+    background-color: #606266;
+}
 </style>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio