Commit 29b527e057b23d003a4a8a5cd3d17bb418e9b0f9

Authored by 夏洋涛
1 parent d2a35000
Exists in master

fix:价格,基地信息

1 { 1 {
2 - "name": "sxh_personal_center", 2 + "name": "zlb",
3 "version": "0.1.0", 3 "version": "0.1.0",
4 "private": true, 4 "private": true,
5 "scripts": { 5 "scripts": {
src/views/Service/AbroadDetail.vue
@@ -13,14 +13,6 @@ @@ -13,14 +13,6 @@
13 <count-down v-if="detailData&&packageArr[packageActive]" :productId="detailData.id" :packageArr="packageArr" :day="packageArr[packageActive].day" :bindId="packageArr[packageActive].comboInfoList[packageTypeActive].bindId" :comboId="packageArr[packageActive].comboInfoList[packageTypeActive].id"></count-down> 13 <count-down v-if="detailData&&packageArr[packageActive]" :productId="detailData.id" :packageArr="packageArr" :day="packageArr[packageActive].day" :bindId="packageArr[packageActive].comboInfoList[packageTypeActive].bindId" :comboId="packageArr[packageActive].comboInfoList[packageTypeActive].id"></count-down>
14 14
15 <div class="uni_text" v-if="initPackageArr"> 15 <div class="uni_text" v-if="initPackageArr">
16 - <!-- <div class="course_price" v-if="packageArr.length>0">  
17 - <span>¥ {{ detailData.showPrice }}</span><span class="redmini">起/{{detailData.unitName}}</span><span class="tint">{{ detailData.productPrice }}</span>  
18 - </div>  
19 - <div class="course_price_free" v-else>  
20 - <span>¥ {{ detailData.price }}</span>  
21 - <span class="des">正在排期</span>  
22 - </div> -->  
23 - <!-- 优惠券 -->  
24 <abroad-coupon v-if="detailData&&centerNo" :detailDataId="detailData.id" :centerNo="centerNo"></abroad-coupon> 16 <abroad-coupon v-if="detailData&&centerNo" :detailDataId="detailData.id" :centerNo="centerNo"></abroad-coupon>
25 17
26 <p class="course_name">{{ detailData.course_name }}</p> 18 <p class="course_name">{{ detailData.course_name }}</p>
@@ -51,7 +43,7 @@ @@ -51,7 +43,7 @@
51 <div class="package_item" :class="packageActive==index?'active':''" v-for="(item, index) in packageArr" :key="index" @click="handlePackageDay(index)"> 43 <div class="package_item" :class="packageActive==index?'active':''" v-for="(item, index) in packageArr" :key="index" @click="handlePackageDay(index)">
52 <p class="date">{{ item.day }}</p> 44 <p class="date">{{ item.day }}</p>
53 <p class="week">{{ item.week }}</p> 45 <p class="week">{{ item.week }}</p>
54 - <p class="price"><span>¥</span>{{ item.marketPrice }}<span class="des">起</span></p> 46 + <!-- <p class="price"><span>¥</span>{{ item.marketPrice }}<span class="des">起</span></p> -->
55 <img class="select" src="@/assets/service/select.png" alt="" /> 47 <img class="select" src="@/assets/service/select.png" alt="" />
56 </div> 48 </div>
57 </div> 49 </div>
@@ -66,7 +58,7 @@ @@ -66,7 +58,7 @@
66 <div class="package_box"> 58 <div class="package_box">
67 <div style="overflow:auto;"> 59 <div style="overflow:auto;">
68 <div class="package_item package_item_type" :class="packageTypeActive==index?'active':''" v-for="(item, index) in packageArr[packageActive].comboInfoList" :key="index" @click="packageTypeActive=index"> 60 <div class="package_item package_item_type" :class="packageTypeActive==index?'active':''" v-for="(item, index) in packageArr[packageActive].comboInfoList" :key="index" @click="packageTypeActive=index">
69 - <p class="price"><span class="index">套餐{{index+1}}</span><span>¥</span>{{ item.actualPrice }}</p> 61 + <p class="price"><span class="index">套餐{{index+1}}</span></p>
70 <p class="name">{{item.comboName}}</p> 62 <p class="name">{{item.comboName}}</p>
71 <img class="select" src="@/assets/service/select.png" alt="" /> 63 <img class="select" src="@/assets/service/select.png" alt="" />
72 </div> 64 </div>
@@ -153,22 +145,16 @@ export default { @@ -153,22 +145,16 @@ export default {
153 145
154 // 点击预约 146 // 点击预约
155 checkDatePackage () { 147 checkDatePackage () {
156 - // if (this.packageArr[0].date == date) {  
157 - // if (this.detailData.applyCount >= this.detailData.stockCount && this.packageArr[0].date == date) {  
158 - // this.$toast('已满团')  
159 - // return;  
160 - // }  
161 - // }  
162 const tagIndex = this.packageArr[this.packageActive].comboInfoList[this.packageTypeActive].tagIndex 148 const tagIndex = this.packageArr[this.packageActive].comboInfoList[this.packageTypeActive].tagIndex
163 console.log(this.packageArr[this.packageActive]) 149 console.log(this.packageArr[this.packageActive])
164 let query = { date: this.packageArr[this.packageActive].date, Index1: tagIndex[0], Index2: tagIndex[1] }; 150 let query = { date: this.packageArr[this.packageActive].date, Index1: tagIndex[0], Index2: tagIndex[1] };
165 this.PackageQuery = query 151 this.PackageQuery = query
166 const AbroadDetailTipChecked = localStorage.getItem('AbroadDetailTipChecked'); 152 const AbroadDetailTipChecked = localStorage.getItem('AbroadDetailTipChecked');
167 - if (AbroadDetailTipChecked) {  
168 - this.$router.push({ name: "ServiceDatePackage", query: query });  
169 - } else { 153 + // if (AbroadDetailTipChecked) {
  154 + // this.$router.push({ name: "ServiceDatePackage", query: query });
  155 + // } else {
170 this.showTip = true; 156 this.showTip = true;
171 - } 157 + // }
172 }, 158 },
173 tipConfirm () { 159 tipConfirm () {
174 if (this.tipChecked) { 160 if (this.tipChecked) {
src/views/Service/component/AbroadDetail/AbroadBase.vue
@@ -25,7 +25,7 @@ export default { @@ -25,7 +25,7 @@ export default {
25 }, 25 },
26 methods: { 26 methods: {
27 // 获取单个基地 27 // 获取单个基地
28 - GetOneBase (baseId) { 28 + GetOneBase () {
29 this.mgop({ 29 this.mgop({
30 api: 'mgop.sz.hswsy.GetOneBase', // 必须 30 api: 'mgop.sz.hswsy.GetOneBase', // 必须
31 host: 'https://mapi.zjzwfw.gov.cn/', 31 host: 'https://mapi.zjzwfw.gov.cn/',
@@ -36,7 +36,7 @@ export default { @@ -36,7 +36,7 @@ export default {
36 // 'isTestUrl': '1' 36 // 'isTestUrl': '1'
37 }, 37 },
38 data: { 38 data: {
39 - "id": baseId, 39 + "id": this.baseId,
40 }, 40 },
41 onSuccess: res => { 41 onSuccess: res => {
42 if (res.data.data) { 42 if (res.data.data) {