Commit 3276cd93 authored by 罗超's avatar 罗超

1

parent 1bf62075
...@@ -626,13 +626,7 @@ ...@@ -626,13 +626,7 @@
></span> ></span>
</span> </span>
<view class="jz_TripMain"> <view class="jz_TripMain">
<!-- <rich-text :nodes="dataList.feature.feeNonInclude"></rich-text> -->
<!-- #ifdef MP-WEIXIN -->
<rich-text :nodes="dataList.feature.feeNonInclude"></rich-text> <rich-text :nodes="dataList.feature.feeNonInclude"></rich-text>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view v-html="dataList.feature.feeNonInclude"></view>
<!-- #endif -->
</view> </view>
</view> </view>
<view class="jz_TripDays"> <view class="jz_TripDays">
...@@ -928,6 +922,9 @@ ...@@ -928,6 +922,9 @@
<script> <script>
import hParse from "@/components/u-parse/parse.vue"; import hParse from "@/components/u-parse/parse.vue";
import canlendar from "./components/sign/index.vue"; import canlendar from "./components/sign/index.vue";
// #ifdef MP-ALIPAY
import parseHtml from "../../plugin/htmlparse.js";
// #endif
export default { export default {
components: { components: {
canlendar, canlendar,
...@@ -1065,6 +1062,7 @@ export default { ...@@ -1065,6 +1062,7 @@ export default {
// let tempPrice= res.data.priceList.filter(x=>x.remainNum>0) // let tempPrice= res.data.priceList.filter(x=>x.remainNum>0)
// res.data.priceList=tempPrice // res.data.priceList=tempPrice
this.dataList = res.data; this.dataList = res.data;
this.scenicNum = 0; this.scenicNum = 0;
this.dataList.dayList.forEach((x) => { this.dataList.dayList.forEach((x) => {
x.dayArray.forEach((y) => { x.dayArray.forEach((y) => {
...@@ -1098,6 +1096,24 @@ export default { ...@@ -1098,6 +1096,24 @@ export default {
} }
}); });
this.finishFirstLoad = true; this.finishFirstLoad = true;
// #ifdef MP-ALIPAY
this.dataList.feature.feeInclude = parseHtml(
this.dataList.feature.feeInclude
);
this.dataList.feature.feeNonInclude = parseHtml(
this.dataList.feature.feeNonInclude
);
this.dataList.feature.importantTip = parseHtml(
this.dataList.feature.importantTip
);
this.dataList.feature.warmTip = parseHtml(
this.dataList.feature.warmTip
);
this.dataList.feature.visaRemark = parseHtml(
this.dataList.feature.visaRemark
);
// #endif
} else { } else {
} }
}, },
...@@ -1194,7 +1210,7 @@ export default { ...@@ -1194,7 +1210,7 @@ export default {
encodeURIComponent(this.dataList.feature.importantTipText), encodeURIComponent(this.dataList.feature.importantTipText),
}); });
}, },
// #ifdef MP-WEIXIN
//分享朋友圈 //分享朋友圈
onShareTimeline() { onShareTimeline() {
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo")
...@@ -1271,6 +1287,7 @@ export default { ...@@ -1271,6 +1287,7 @@ export default {
: "", : "",
}; };
}, },
// #endif
}, },
}; };
</script> </script>
......
This diff is collapsed.
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