1

pages/jiuzhai/jz_LineDetail.vue

@@ -981,7 +981,7 @@ export default {
         that.titleStyle = {
           height: "45px",
           paddingTop: `${res.statusBarHeight}px`,
-          opacity: "0%",
+          opacity: "0",
         };
       },
     });
@@ -1042,11 +1042,13 @@ export default {
     },
     scroll(e) {
       this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
-
       this.titleStyle.opacity =
-        (e.detail.scrollTop - 100 < 0
+        e.detail.scrollTop - 100 < 0
           ? 0
-          : Math.floor(e.detail.scrollTop - 100)) + "%";
+          : Math.floor(e.detail.scrollTop - 100) / 100 > 1
+          ? 1
+          : Math.floor(e.detail.scrollTop - 100) / 100;
+      console.log("1051", this.titleStyle.opacity);
       this.$forceUpdate();
     },
     //获取详情
@@ -1055,14 +1057,11 @@ export default {
         "b2b_get_GetB2BTravelInfoNoDesV1",
         this.delMsg,
         (res) => {
-          console.log(res, "详情");
-
           if (res.resultCode == 1) {
             res.data.tempImgCover = JSON.parse(res.data.imgCover);
             // let tempPrice= res.data.priceList.filter(x=>x.remainNum>0)
             // res.data.priceList=tempPrice
             this.dataList = res.data;
-
             this.scenicNum = 0;
             this.dataList.dayList.forEach((x) => {
               x.dayArray.forEach((y) => {
@@ -1098,21 +1097,31 @@ export default {
             this.finishFirstLoad = true;
 
             // #ifdef MP-ALIPAY
+            if (this.dataList.feature.feeInclude) {
               this.dataList.feature.feeInclude = parseHtml(
                 this.dataList.feature.feeInclude
               );
+            }
+            if (this.dataList.feature.feeNonInclude) {
               this.dataList.feature.feeNonInclude = parseHtml(
                 this.dataList.feature.feeNonInclude
               );
+            }
+            if (this.dataList.feature.importantTip) {
               this.dataList.feature.importantTip = parseHtml(
                 this.dataList.feature.importantTip
               );
+            }
+            if (this.dataList.feature.warmTip) {
               this.dataList.feature.warmTip = parseHtml(
                 this.dataList.feature.warmTip
               );
+            }
+            if (this.dataList.feature.visaRemark) {
               this.dataList.feature.visaRemark = parseHtml(
                 this.dataList.feature.visaRemark
               );
+            }
             // #endif
           } else {
           }

pages/restaurant/components/buyNotice.vue

@@ -3,8 +3,8 @@
     <view class="meal-info">
       <image :src="mealData.MealPic" mode="aspectFit" class="MealPic"></image>
       <view class="right">
-				<view class="name">{{mealData.MealName}}</view>
-				<view class="sale">已售 {{mealData.SaleCount}}</view>
+        <view class="name">{{ mealData.MealName }}</view>
+        <view class="sale">已售 {{ mealData.SaleCount }}</view>
       </view>
     </view>
     <view class="ticket-title">
@@ -12,7 +12,7 @@
       <text class="ticket-title-bg"></text>
     </view>
     <view class="meal-con">
-			<text v-if="mealData.MealDesc">{{mealData.MealDesc}}</text>
+      <text v-if="mealData.MealDesc">{{ mealData.MealDesc }}</text>
       <text v-else class="zanwu">暂无</text>
     </view>
     <view class="ticket-title">
@@ -20,71 +20,75 @@
       <text class="ticket-title-bg"></text>
     </view>
     <view class="buy-notice-con">
-			<rich-text :nodes="mealData.OtherTag" v-if="mealData.OtherTag"></rich-text>
+      <rich-text
+        :nodes="mealData.OtherTag"
+        v-if="mealData.OtherTag"
+      ></rich-text>
       <text v-else class="zanwu">暂无</text>
     </view>
     <view class="btn-box">
       <view class="price">
         <text class="price-pre">￥</text>
-				{{$utils.getretailer()==true? mealData.LPriceB:mealData.LPriceC}}
-			</view>
-			<view class="btn" @click="subscribe">
-				立即预订
+        {{ $utils.getretailer() == true ? mealData.LPriceB : mealData.LPriceC }}
       </view>
+      <view class="btn" @click="subscribe"> 立即预订 </view>
     </view>
   </view>
 </template>
 
 <script>
-	export default{
-		props:{
-			mealData:{
-				type:Object,
-				default:{}
-			}
+// #ifdef MP-ALIPAY
+import parseHtml from "../../../plugin/htmlparse.js";
+// #endif
+export default {
+  props: {
+    mealData: {
+      type: Object,
+      default: {},
     },
-		data(){
-			return{
-				
-			}
   },
-		methods:{
-			subscribe(){
-				this.$emit("success")
-			}
-		}
-	}
+  mounted() {
+    // #ifdef MP-ALIPAY
+    this.mealData.OtherTag = parseHtml(this.mealData.OtherTag);
+    // #endif
+  },
+  methods: {
+    subscribe() {
+      this.$emit("success");
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.buy-notice-restaurant{
+.buy-notice-restaurant {
   height: 70vh;
   padding: 45rpx 45rpx 120rpx 45rpx;
   overflow-y: scroll;
   overflow-x: hidden;
-		.meal-info{
+  .meal-info {
     display: flex;
     padding-bottom: 50rpx;
-			border-bottom: 1rpx solid #E7E7E7;
-			.MealPic{
+    border-bottom: 1rpx solid #e7e7e7;
+    .MealPic {
       width: 129rpx;
       height: 129rpx;
-				background-color: #DFBE6E;
+      background-color: #dfbe6e;
       border-radius: 20rpx;
     }
-			.right{
+    .right {
       flex-grow: 5;
       margin-left: 35rpx;
-				.name{
+      .name {
         font-size: 34rpx;
         font-family: PingFang SC;
         font-weight: bold;
-					color: #1B1D1E;
+        color: #1b1d1e;
       }
-				.sale{
+      .sale {
         width: 120rpx;
         height: 40rpx;
-					background-color: #ECF1F4;
+        background-color: #ecf1f4;
         border-radius: 4rpx;
         font-size: 22rpx;
         font-family: PingFang SC;
@@ -102,7 +106,7 @@
     font-size: 34rpx;
     font-family: PingFang SC;
     font-weight: bold;
-			color: #1F1F1F;
+    color: #1f1f1f;
     background-color: transparent;
     // line-height: 44rpx;
     position: relative;
@@ -111,7 +115,7 @@
     .ticket-title-bg {
       width: 70rpx;
       height: 10rpx;
-				background-color: #DFBE6E;
+      background-color: #dfbe6e;
       border-radius: 4px;
       position: absolute;
       left: 0;
@@ -120,37 +124,37 @@
       opacity: 0.6;
     }
   }
-		.meal-con{
+  .meal-con {
     white-space: pre-wrap;
     font-size: 28rpx;
     font-family: PingFang SC;
     font-weight: 500;
     color: #111111;
   }
-		.buy-notice-con{
+  .buy-notice-con {
     font-size: 28rpx;
     font-family: PingFang SC;
     font-weight: 600;
     color: #111111;
   }
-		.btn-box{
+  .btn-box {
     position: fixed;
     right: 55rpx;
-			bottom:100rpx;
+    bottom: 100rpx;
     display: flex;
     justify-content: flex-end;
     align-items: center;
-			.price{
+    .price {
       font-size: 40rpx;
       font-family: PingFang SC;
       font-weight: 500;
-				color: #D91818;
+      color: #d91818;
       // line-height: 38rpx;
-				.price-pre{
+      .price-pre {
         font-size: 22rpx;
       }
     }
-			.btn{
+    .btn {
       width: 300rpx;
       height: 80rpx;
       background-color: #111111;
@@ -158,17 +162,17 @@
       font-size: 28rpx;
       font-family: PingFang SC;
       font-weight: bold;
-				color: #FFFFFF;
+      color: #ffffff;
       text-align: center;
       line-height: 78rpx;
       margin-left: 45rpx;
     }
   }
-	}
-	.zanwu{
+}
+.zanwu {
   font-size: 28rpx;
   font-family: PingFang SC;
   font-weight: 400;
   color: #999999;
-	}
+}
 </style>

plugin/api.js

@@ -2,8 +2,8 @@ export default {
 	install(Vue, options) {
 		Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
 
-		Vue.prototype.host2 = "http://192.168.20.17:8020"
-		// Vue.prototype.host2 = "https://erpmallapi.oytour.com"
+		// Vue.prototype.host2 = "http://192.168.20.17:8020"
+		Vue.prototype.host2 = "https://erpmallapi.oytour.com"
 		//Vue.prototype.host3 = "http://192.168.20.24"
 		Vue.prototype.host3 = "https://reborn.oytour.com"
 
@@ -182,7 +182,14 @@ export default {
 			let appObj = {};
 			let appType = 2;
 			switch (appType) {
-				case 2: //旅小友
+				case 1: //旅小友-支付宝
+					appObj = {
+						AppId: '2021002181604459',
+						TenantId: 12,
+						MallBaseId: 2,
+					};
+					break;
+				case 2: //旅小友-微信
 					appObj = {
 						AppId: 'wxcf0727a7c78b501e',
 						TenantId: 12,