Commit 31a5a3de authored by 黄奎's avatar 黄奎

1111

parents a608cd0e 111c5e82
This diff is collapsed.
...@@ -170,17 +170,17 @@ ...@@ -170,17 +170,17 @@
<!-- 价格 --> <!-- 价格 -->
<view :style="{ color: mc }" class="the-price"> <view :style="{ color: mc }" class="the-price">
<text class="small22"></text> <text class="small22"></text>
<text class="numfont22" v-if="g.form_id!=1&&!g.edu_data.BookPrice"> <text class="numfont22" v-if="g.form_id!=1&&g.edu_data&&!g.edu_data.BookPrice">
{{ g.price_min == g.price_max ? g.price_min : g.price_min + '-' + g.price_max }} {{ g.price_min == g.price_max ? g.price_min : g.price_min + '-' + g.price_max }}
</text> </text>
<text class="numfont22" v-if="g.form_id!=1&&g.edu_data.BookPrice"> <text class="numfont22" v-if="g.form_id!=1&&g.edu_data&&g.edu_data.BookPrice">
{{ g.price_min == g.price_max ? parseFloat(g.price_min)+parseFloat(g.edu_data.BookPrice) : g.price_min + '-' + g.price_max }} {{ g.price_min == g.price_max ? parseFloat(g.price_min)+parseFloat(g.edu_data.BookPrice) : g.price_min + '-' + g.price_max }}
</text> </text>
<text class="origin" v-if="g.form_id!=1&&!g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price"> <text class="origin" v-if="g.form_id!=1&&g.edu_data&&!g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
¥{{ g.jjxkt_original_price.toFixed(2)}} ¥{{ g.jjxkt_original_price.toFixed(2)}}
</text> </text>
<text class="origin" v-if="g.form_id!=1&& g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price"> <text class="origin" v-if="g.form_id!=1&&g.edu_data&&g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
¥{{parseFloat(g.jjxkt_original_price)+parseFloat(g.edu_data.BookPrice)}} ¥{{parseFloat(g.jjxkt_original_price)+parseFloat(g.edu_data.BookPrice)}}
</text> </text>
<!-- <text class="numfont" v-if="g.form_id==1"> <!-- <text class="numfont" v-if="g.form_id==1">
{{ g.price_min }} {{ g.price_min }}
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
<view class="content">{{ g.goods_marketing.limit }}</view> <view class="content">{{ g.goods_marketing.limit }}</view>
</view> </view>
<!-- 优惠 --> <!-- 优惠 -->
<view class="goods-Discount" v-if="g.goodsPreferentialList&& g.goodsPreferentialList.length>0"> <view class="goods-Discount" v-if="g.goodsPreferentialList&&g.goodsPreferentialList.length>0">
<view class="discount-left"> <view class="discount-left">
优惠 优惠
</view> </view>
...@@ -795,22 +795,19 @@ ...@@ -795,22 +795,19 @@
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.g = res.data.goods; this.g = res.data.goods;
// 报名限制数组 // 报名限制数组
if (res.data.goods && res.data.goods.edu_data && res.data.goods.edu_data.ClassCondition) { res.data.goods.edu_data&&res.data.goods.edu_data.ClassCondition&&res.data.goods.edu_data.ClassCondition.forEach(item2 => {
res.data.goods.edu_data.ClassCondition.forEach(item2 => { if (item2.ItemType == 1) {
if (item2.ItemType == 1) { this.ItemType1.push(item2)
this.ItemType1.push(item2) } else if (item2.ItemType == 2) {
} else if (item2.ItemType == 2) { this.ItemType2.push(item2)
this.ItemType2.push(item2) } else if (item2.ItemType == 3) {
} else if (item2.ItemType == 3) { this.ItemType3.push(item2)
this.ItemType3.push(item2) } else if (item2.ItemType == 4) {
} else if (item2.ItemType == 4) { this.ItemType4.push(item2)
this.ItemType4.push(item2) } else if (item2.ItemType == 5) {
} else if (item2.ItemType == 5) { this.ItemType5.push(item2)
this.ItemType5.push(item2) }
} })
})
}
// 报名限制数组结束 // 报名限制数组结束
this.g.totalStock = 0; this.g.totalStock = 0;
this.g.attr.forEach((x) => { this.g.attr.forEach((x) => {
......
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<view class="content">{{ g.goods_marketing.limit }}</view> <view class="content">{{ g.goods_marketing.limit }}</view>
</view> </view>
<!-- 优惠 --> <!-- 优惠 -->
<view class="goods-Discount" v-if="g.goodsPreferentialList.length>0"> <view class="goods-Discount" v-if="g.goodsPreferentialList&&g.goodsPreferentialList.length>0">
<view class="discount-left"> <view class="discount-left">
优惠 优惠
</view> </view>
......
...@@ -212,7 +212,7 @@ export default { ...@@ -212,7 +212,7 @@ export default {
// 获取小程序APPID // 获取小程序APPID
Vue.prototype.GetMiniAppId = function() { Vue.prototype.GetMiniAppId = function() {
let appObj = {}; let appObj = {};
let appType = 13; let appType = 4;
switch (appType) { switch (appType) {
case 1: //赞羊 case 1: //赞羊
appObj = { appObj = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment