|  | @@ -55,23 +55,45 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              <div class="options" v-if="result.payMethod == 21 || result.payMethod == 22 || result.payMethod > 26 || (result.payMethod == 25 && !result.isCopperPipe)">
 | 
	
		
			
				|  |  |                  <div v-for="(con, index) in instrument.config" :key="con.name" :class="[ instrument.config.length > 1 ? 'oc' : '' ]" @click="instrumentF(index)">
 | 
	
		
			
				|  |  | -                    <div class="option">
 | 
	
		
			
				|  |  | -                        <div class="o_"><i class="check_default" :class="[ con.checked ? 'check_active' : '' ]"></i></div>
 | 
	
		
			
				|  |  | -                        <div class="o_bd" v-if="con.marketPrice > 0" key="name">{{ instrument.name }}-<span class="c">{{ con.name }} </span></div>
 | 
	
		
			
				|  |  | -                        <div class="o_bd" v-else key="name">{{ con.name }}</div>
 | 
	
		
			
				|  |  | -                        <span class="o_ft" v-if="con.marketPrice > 0">
 | 
	
		
			
				|  |  | -                            <del>原价:¥{{ con.marketPrice }}</del> 现价:¥{{ con.referencePrice }}
 | 
	
		
			
				|  |  | -                        </span>
 | 
	
		
			
				|  |  | -                    </div>
 | 
	
		
			
				|  |  | +                    <!-- 判断是否是单乐器 -->
 | 
	
		
			
				|  |  | +                    <template v-if="isSingle == 1">
 | 
	
		
			
				|  |  | +                        <div class="option" v-if="con.marketPrice <= 0 || con.default">
 | 
	
		
			
				|  |  | +                            <div class="o_"><i class="check_default" :class="[ con.checked ? 'check_active' : '' ]"></i></div>
 | 
	
		
			
				|  |  | +                            <div class="o_bd" v-if="con.marketPrice > 0" key="name">{{ instrument.name }}-<span class="c">{{ con.name }} </span></div>
 | 
	
		
			
				|  |  | +                            <div class="o_bd" v-else key="name">{{ con.name }}</div>
 | 
	
		
			
				|  |  | +                            <span class="o_ft" v-if="con.marketPrice > 0">
 | 
	
		
			
				|  |  | +                                <del>原价:¥{{ con.marketPrice }}</del> 现价:¥{{ con.referencePrice }}
 | 
	
		
			
				|  |  | +                            </span>
 | 
	
		
			
				|  |  | +                        </div>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -                    <div class="configuration" v-if="con.marketPrice > 0">
 | 
	
		
			
				|  |  | -                        <div class="config">
 | 
	
		
			
				|  |  | -                            <div class="title"><span>配置参数</span></div>
 | 
	
		
			
				|  |  | -                            <div class="content">
 | 
	
		
			
				|  |  | -                                <p>{{ instrument.configuration }} {{ con.texture}}</p>
 | 
	
		
			
				|  |  | +                        <div class="configuration" v-if="con.marketPrice > 0 && con.default">
 | 
	
		
			
				|  |  | +                            <div class="config">
 | 
	
		
			
				|  |  | +                                <div class="title"><span>配置参数</span></div>
 | 
	
		
			
				|  |  | +                                <div class="content">
 | 
	
		
			
				|  |  | +                                    <p>{{ instrument.configuration }} {{ con.texture}}</p>
 | 
	
		
			
				|  |  | +                                </div>
 | 
	
		
			
				|  |  |                              </div>
 | 
	
		
			
				|  |  |                          </div>
 | 
	
		
			
				|  |  | -                    </div>
 | 
	
		
			
				|  |  | +                    </template>
 | 
	
		
			
				|  |  | +                    <template v-else>
 | 
	
		
			
				|  |  | +                        <div class="option">
 | 
	
		
			
				|  |  | +                            <div class="o_"><i class="check_default" :class="[ con.checked ? 'check_active' : '' ]"></i></div>
 | 
	
		
			
				|  |  | +                            <div class="o_bd" v-if="con.marketPrice > 0" key="name">{{ instrument.name }}-<span class="c">{{ con.name }} </span></div>
 | 
	
		
			
				|  |  | +                            <div class="o_bd" v-else key="name">{{ con.name }}</div>
 | 
	
		
			
				|  |  | +                            <span class="o_ft" v-if="con.marketPrice > 0">
 | 
	
		
			
				|  |  | +                                <del>原价:¥{{ con.marketPrice }}</del> 现价:¥{{ con.referencePrice }}
 | 
	
		
			
				|  |  | +                            </span>
 | 
	
		
			
				|  |  | +                        </div>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                        <div class="configuration" v-if="con.marketPrice > 0">
 | 
	
		
			
				|  |  | +                            <div class="config">
 | 
	
		
			
				|  |  | +                                <div class="title"><span>配置参数</span></div>
 | 
	
		
			
				|  |  | +                                <div class="content">
 | 
	
		
			
				|  |  | +                                    <p>{{ instrument.configuration }} {{ con.texture}}</p>
 | 
	
		
			
				|  |  | +                                </div>
 | 
	
		
			
				|  |  | +                            </div>
 | 
	
		
			
				|  |  | +                        </div>
 | 
	
		
			
				|  |  | +                    </template>
 | 
	
		
			
				|  |  |                  </div>
 | 
	
		
			
				|  |  |              </div>
 | 
	
		
			
				|  |  |              <div class="options" v-if="(result.payMethod == 25 && result.isCopperPipe) || result.payMethod == 26"> 
 | 
	
	
		
			
				|  | @@ -204,12 +226,15 @@ export default {
 | 
	
		
			
				|  |  |                  signType: '',
 | 
	
		
			
				|  |  |                  timestamp: '',
 | 
	
		
			
				|  |  |                  version: '',
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  | +            },
 | 
	
		
			
				|  |  | +            isSingle: this.$route.query.isSingle // 是否是双乐器
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      mounted() {
 | 
	
		
			
				|  |  |          this.baseInfo = baseInfo
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        // console.log(this.isSingle)
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          /**
 | 
	
		
			
				|  |  |           * 21 1.0
 | 
	
		
			
				|  |  |           * 22 2.0
 | 
	
	
		
			
				|  | @@ -222,6 +247,7 @@ export default {
 | 
	
		
			
				|  |  |              this.result = {
 | 
	
		
			
				|  |  |                  userId: r.id_, // 学生编号
 | 
	
		
			
				|  |  |                  payMethod: r.fee_type_,
 | 
	
		
			
				|  |  | +                // payMethod: 21,
 | 
	
		
			
				|  |  |                  subName: r.sub_name_,
 | 
	
		
			
				|  |  |                  grade: r.grade_,
 | 
	
		
			
				|  |  |                  voicyPart: r.sub_name_.split('.').reverse()[0],
 |