02/04 23:32

预览完成

src/views/teamBuild/components/teamSoundMoney.vue

@@ -217,7 +217,7 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column label="预览"
+        <!-- <el-table-column label="预览"
                          align="center"
                          prop="sound">
           <template slot-scope="scope">
@@ -226,7 +226,7 @@
                          @click="lookPreview(scope.row)">预览</el-button>
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <div class="floor">
         <div class="remove"
@@ -347,19 +347,6 @@
               </span>
             </div>
           </div>
-          <!-- <div class="options" v-else key="class-list">
-                <div class="option">
-                    <div class="0_hd"><i class="check_default check_active"></i></div>
-                    <div class="o_bd">乐团课</div>
-                    
-                    <span class="o_ft" v-if="result.payMethod == 21 || result.payMethod == 25" key="class-price">
-                        <del>原价:￥23520</del> 现价:免费
-                    </span>
-                    <span class="o_ft" v-else key="class-price">
-                        <del>原价:￥23520</del> 现价:￥{{ result.classAmount }}
-                    </span>
-                </div>
-            </div> -->
           <div class="coutInfo"
                v-if="courseScheduleInfo.submit.ischeck">
             <i class="trumpet_icon"></i>{{ courseScheduleInfo.submit.value }}
@@ -367,53 +354,97 @@
         </div>
 
         <div class="section"
-             v-if="instrumentResult.length > 0">
+             v-if="lookPreviewRow&&lookPreviewRow.goodsList.length > 0">
           <h2 class="title line_bottom">乐器</h2>
           <div class="options">
-            <div v-for="(con, index) in instrumentResult"
+            <!--    @click="instrumentF(con)" -->
+            <div v-for="(con, index) in lookPreviewRow.fangshi"
                  :key="index"
-                 @click="instrumentF(con)"
-                 :class="[ instrumentResult.length > 1 ? 'oc' : '' ]">
-              <div class="option">
+              
+                 :class="[ lookPreviewRow.fangshi.length > 1 ? 'oc' : '' ]">
+              <div class="option" v-if="con.mode.isGROUP">
+                <!-- :class="[ con.checked ? 'check_active' : '' ]" -->
                 <div class="o_"><i class="check_default"
-                     :class="[ con.checked ? 'check_active' : '' ]"></i></div>
+                     ></i></div>
                 <div class="o_bd">
-                  {{ con.name }}
+                  {{ con.shopName }}
                 </div>
-                <template v-if="(con.kitType == 'LEASE')">
+                <span class="o_ft"
+                      >
+                  <del>原价:￥{{ con.mode.price }}</del> 现价:￥{{ (con.mode.price - con.mode.GROUP).toFixed(2) }}
+                </span>
+              </div>
+              <!--   v-if="con.marketPrice" -->
+              <div v-if="con.mode.isGROUP" class="configuration"
+                 >
+                <div class="config">
+                  <div class="title"><span>配置参数</span></div>
+                  <div class="content">
+                    <p>{{ lookPreviewRow.goodsList[index].specification }}</p>
+                  </div>
+                </div>
+              </div>
+                 <div class="option"  v-if="(con.mode.isLEASE)">
+                <!-- :class="[ con.checked ? 'check_active' : '' ]" -->
+                <div class="o_"><i class="check_default"
+                     ></i></div>
+                <div class="o_bd">
+                  {{ con.shopName }}
+                </div>
+                    <template>
                   <span class="o_ft">
-                    押金:￥{{ con.depositFee }}
+                     <del>减免金额:￥{{ con.mode.LEASE }}</del>
+                      押金:￥{{ (con.mode.depositFee - con.mode.LEASE).toFixed(2) }}
                   </span>
+                 
                 </template>
-                <template v-if="con.kitType == 'FREE'">
+              </div>
+              <!--   v-if="con.marketPrice" -->
+              <div class="configuration"  v-if="(con.mode.isLEASE)"
+                 >
+                <div class="config">
+                  <div class="title"><span>配置参数</span></div>
+                  <div class="content">
+                    <p>{{ lookPreviewRow.goodsList[index].specification }}</p>
+                  </div>
+                </div>
+              </div>
+                 <div class="option" v-if="con.mode.isFREE">
+                <!-- :class="[ con.checked ? 'check_active' : '' ]" -->
+                <div class="o_"><i class="check_default"
+                     ></i></div>
+                <div class="o_bd">
+                  {{ con.shopName }}
+                </div>
+                <template >
                   <span class="o_ft">
-                    <del>原价:￥{{ con.marketPrice }}</del> 免费领用
+                    <del>原价:￥{{ con.mode.price }}</del> 
+                    免费领用
                   </span>
                 </template>
-                <span class="o_ft"
-                      v-if="con.price && con.kitType == 'GROUP'">
-                  <del>原价:￥{{ con.marketPrice }}</del> 现价:￥{{ con.price }}
-                </span>
               </div>
-              <div class="configuration"
-                   v-if="con.marketPrice">
+              <!--   v-if="con.marketPrice" -->
+              <div class="configuration" v-if="con.mode.isFREE"
+                 >
                 <div class="config">
                   <div class="title"><span>配置参数</span></div>
                   <div class="content">
-                    <p>{{ con.goodsList[0].specification }}</p>
+                    <p>{{ lookPreviewRow.goodsList[index].specification }}</p>
                   </div>
                 </div>
               </div>
+                
+             
             </div>
           </div>
         </div>
 
         <div class="section"
-             v-if="accessOries.length > 0"
+             v-if="lookPreviewRow&&lookPreviewRow.markList&&lookPreviewRow.markList.length > 0"
              key="accessOries">
           <h2 class="title line_bottom">辅件</h2>
           <div class="options"
-               v-for="(instr, index) in accessOries"
+               v-for="(instr, index) in lookPreviewRow.markList"
                :key="index">
             <div class="option">
               <div class="o_hd"><i class="check_default"
@@ -428,11 +459,11 @@
               <div class="config">
                 <div class="title"><span>配置</span></div>
                 <div class="content"
-                     v-for="item in instr.goodsList"
-                     :key="item.id">
+                     v-for="item in instr.goods"
+                     :key="item">
                   <div class="option">
-                    <div class="o_bd">{{ item.name }}</div>
-                    <span class="o_ft">￥{{ item.marketPrice }}</span>
+                    <div class="o_bd">{{ item | AccessoryName(lookPreviewRow)}}</div>
+                    <span class="o_ft">￥{{ item | AccessoryPrice(lookPreviewRow)}}</span>
                   </div>
                 </div>
               </div>
@@ -1284,6 +1315,28 @@ export default {
     }
   },
   filters: {
+    AccessoryName(val,lookPreviewRow){
+      if( lookPreviewRow&&lookPreviewRow.markChioseList){
+        for(let i in lookPreviewRow.markChioseList){
+        if(lookPreviewRow.markChioseList[i].id == val){
+          return lookPreviewRow.markChioseList[i].name
+        }
+        }
+      }
+        
+      
+      return ''
+    },
+    AccessoryPrice(val,lookPreviewRow){
+       if( lookPreviewRow&&lookPreviewRow.markChioseList){
+      for(let i in lookPreviewRow.markChioseList){
+        if(lookPreviewRow.markChioseList[i].id == val){
+          return lookPreviewRow.markChioseList[i].marketPrice
+        }
+      }
+       }
+      return ''
+    },
     zhongleiFilter (val, list) {
       if (list.length <= 0) {
         return;
@@ -1570,7 +1623,7 @@ export default {
   }
   .section {
     width: 375px;
-    padding: 16px 22px 10px;
+    padding:  0 22px ;
     background: #fff;
     margin-bottom: 10px;
     .line_bottom {
@@ -1627,6 +1680,7 @@ export default {
       line-height: 14px;
     }
     .option {
+      width: 100%;
       line-height: 26px;
       font-size: 15px;
       display: flex;
@@ -1800,7 +1854,7 @@ export default {
   }
 
   .section {
-    padding: 16px 22px 10px;
+    padding: 0 22px;
     background: #fff;
     margin-bottom: 10px;
     .line_bottom {