commit

src/main/resources/views/platform/welfare/mine.html

@@ -16,11 +16,12 @@ layout("/layouts/platform.html"){
     }
 
     .descriptionClass {
+        height: 80px;
+        overflow-y: auto;
         padding: 10px;
         display: -webkit-box;
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 3;
-        overflow: hidden;
         text-overflow: ellipsis;
         font-size: 13px;
         color: #868282;
@@ -103,7 +104,7 @@ layout("/layouts/platform.html"){
                         <template scope="{row}" v-else-if="column.prop=='gist_list'">
                             <template v-if="!projectInfo.flexible">{{projectInfo.gift}}</template>
                             <template v-if="row.gist_list">
-                                {{row.gifts.map(v=>v.name + '（'+v.num+'份）').join('，')}}
+                                {{row.gist_list}}
                             </template>
                         </template>
 
@@ -201,7 +202,7 @@ layout("/layouts/platform.html"){
                                 <el-col :key="oidx" :span="6"
                                         v-for="(option, oidx) in subject.options">
                                     <el-card shadow="never"
-                                             style="margin: 5px;">
+                                             style="margin: 5px">
 
                                         <div slot="header"
                                              style="display: flex;justify-content: space-between">
@@ -235,10 +236,15 @@ layout("/layouts/platform.html"){
                                             </el-col>
                                         </el-row>
 
-                                        <el-row style="">
-                                            <el-input-number disabled
+                                        <el-row>
+                                            <div style="display: flex; justify-content: space-between">
+                                                <span v-if="option.selectSpecs">规格参数：{{option.selectSpecs}}</span>
+                                                <span v-if="option.selectNum" style="color: #0a84ff">选择份数：{{option.selectNum}}</span>
+                                                <span v-else style="color: #bc2a25">{{ '未选择此项' }}</span>
+                                            </div>
+                                            <!--<el-input-number disabled
                                                              style="width: 100%"
-                                                             v-model="option.selectNum"></el-input-number>
+                                                             v-model="option.selectNum"></el-input-number>-->
                                         </el-row>
 
                                     </el-card>
@@ -489,6 +495,9 @@ layout("/layouts/platform.html"){
                     const option = this.userSelection.find(x => x.selectOptionId === v.id)
                     if (option) {
                         v.selectNum = option.selectNum
+                        if (option.selectSpecs) {
+                            v.selectSpecs = option.selectSpecs
+                        }
                     } else {
                         v.selectNum = 0
                     }