Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel into master

node_modules/uview-ui/ali-iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 1830471 */
-  src: url('//at.alicdn.com/t/font_1830471_b1q5b9z71n.woff2?t=1622518908789') format('woff2'),
-       url('//at.alicdn.com/t/font_1830471_b1q5b9z71n.woff?t=1622518908789') format('woff'),
-       url('//at.alicdn.com/t/font_1830471_b1q5b9z71n.ttf?t=1622518908789') format('truetype');
+  src: url('//at.alicdn.com/t/font_1830471_9s93fs3i7o.woff2?t=1622777058762') format('woff2'),
+       url('//at.alicdn.com/t/font_1830471_9s93fs3i7o.woff?t=1622777058762') format('woff'),
+       url('//at.alicdn.com/t/font_1830471_9s93fs3i7o.ttf?t=1622777058762') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconshenhezhong:before {
+  content: "\e606";
+}
+
+.iconquxiao:before {
+  content: "\e60e";
+}
+
+.icondaizhifu-:before {
+  content: "\e618";
+}
+
+.iconzhengchang:before {
+  content: "\e783";
+}
+
 .iconartboard9-copy:before {
   content: "\e726";
 }

pages/hotel/detail.vue

@@ -63,7 +63,10 @@
 						</view>
 						<!-- 关注 -->
 						<view class="op-box">
-							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_709.png" style="margin-right: 17rpx;"></image>
+							<view style="position: relative;margin-right: 17rpx;width:32px;height:32px;display:inline-block;">
+								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_709.png"></image>
+								<button class="detail_ShareBtn" open-type="share"></button>
+							</view>
 							<image v-if="!islike" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_61.png"
 							 @click="changeLike"></image>
 							<image v-if="islike" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1621940804000_953.png"
@@ -268,7 +271,8 @@
 				dayObj:{},
 				hotelData:{} ,//传递到房间预订组件
 				startDay:'',
-				endDay:''
+				endDay:'',
+				Up:0
 			}
 		},
 		components: {
@@ -278,7 +282,7 @@
 			canlendar
 		},
 		created() {
-
+			this.Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
 		},
 		onLoad(options) {
 			this.id = options.id;
@@ -550,7 +554,52 @@
 						}
 					}
 				);
-			}
+			},
+			//分享朋友圈
+			onShareTimeline() {
+			  let uid = uni.getStorageSync("mall_UserInfo")
+			    ? uni.getStorageSync("mall_UserInfo").UserId
+			    : 0;
+				  if(uid==0){
+				  	uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
+				  }
+				  let SmallShopId = uni.getStorageSync("mall_UserInfo")
+				    ? uni.getStorageSync("mall_UserInfo").SmallShopId
+				    : 0;
+					if(SmallShopId == 0){//如果微店id为0 去找所属微店id
+						SmallShopId = uni.getStorageSync("mall_UserInfo")
+						  ? uni.getStorageSync("mall_UserInfo").UserSmallShopId
+						  : 0;
+					}
+			  let title =this.dataList.HotelName?this.dataList.HotelName:'帖子';
+			  let imageUrl =this.dataList.HotelImg && this.dataList.HotelImg.length>0?this.dataList.HotelImg[0]:'';
+			  let id = this.id;
+			  return {
+			    title: title,
+			    query: "id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + this.Up + 
+						'&JumpType=18' + '&dayObj=' + JSON.stringify(this.dayObj) + '&searchObj=' + JSON.stringify(this.searchObj),
+			    imageUrl: imageUrl,
+			  };
+			},
+			
+			//分享给朋友
+			onShareAppMessage(res) {
+			  let u = uni.getStorageSync("mall_UserInfo");
+			  let uid = u.UserId ? u.UserId : 0;
+				if(uid==0){
+					uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
+				}
+			  let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
+				if(SmallShopId == 0){//如果微店id为0 去找所属微店id
+					SmallShopId = u.UserSmallShopId? u.UserSmallShopId:0
+				}
+			  return {
+			    title:this.dataList.HotelName?this.dataList.HotelName:'帖子',
+			    path: "/pages/index/index?id=" + this.id + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ 
+					"&Up=" + this.Up+'&JumpType=18' + '&dayObj=' + JSON.stringify(this.dayObj) + '&searchObj=' + JSON.stringify(this.searchObj),
+			    imageUrl:this.dataList.HotelImg && this.dataList.HotelImg.length>0?this.dataList.HotelImg[0]:'',
+			  };
+			},
 		},
 	}
 </script>
@@ -988,4 +1037,12 @@
 	.hotel-detail .media .media-info .mi-left {
 		flex: 1;
 	}
+	.detail_ShareBtn{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		opacity: 0
+	}
 </style>

pages/index/index.vue

@@ -169,6 +169,9 @@
 				orderPopupdata:{},//离线收益的弹窗
 				showorder:false,//显示弹出
 				carMsg:'',//景点专车分享带过来的字段
+				id:0, //酒店带过来字段
+				dayObj:'',  //酒店带过来字段
+				searchObj:'' //酒店带过来字段
 			};
 		},
 		components: {
@@ -285,6 +288,7 @@
 					CounponPassword: options.CounponPassword
 				});
 			}
+			
 			if (options && options.KeyWord) {//口令
 				uni.setStorageSync("KeyWord", {
 					KeyWord: options.KeyWord
@@ -353,6 +357,15 @@
 			if (options && options.money) { //储值卡
 				this.cardsmoney = options.money;
 			}
+			if(options && options.id){
+				this.id = options.id
+			}
+			if(options && options.dayObj){
+				this.dayObj = options.dayObj
+			}
+			if(options && options.searchObj){
+				this.searchObj = options.searchObj
+			}
 			if (options && options.OrderId) { //代付订单id
 				this.OrderId = options.OrderId;
 			}
@@ -512,6 +525,11 @@
 		},
 
 		methods: {
+			// goOrderDetails(){
+			// 	uni.navigateTo({
+			// 		url:"/pages/jiuzhai/jz_SureOrder?orderId=42389"
+			// 	})
+			// },
 			getunilogin(res){
 				let that = this
 				//静默登录操作
@@ -803,6 +821,8 @@
 						uni.navigateTo({ url: "/pages/restaurant/details?id"+that.GoodsId});
 					}else if(that.JumpType == 17){//景点专车
 					    uni.navigateTo({ url: '/pages/guidecar/bookaCarList?carMsg='+that.carMsg})
+					}else if(that.JumpType == 18){ //酒店详情					
+						uni.navigateTo({ url: '/pages/hotel/detail?id=' + that.id + '&dayObj=' + that.dayObj+'&searchObj='+that.searchObj})
 					}
 				}, 500);
 			},

pages/jiuzhai/jz_MyOrder.vue

@@ -191,8 +191,9 @@
 		},
 		methods: {
 			goOrderDetail(item){
+				console.log(item)
 				uni.redirectTo({
-					url: "/pages/jiuzhai/jz_SureOrder?orderData="+encodeURIComponent(JSON.stringify(item))
+					url: "/pages/jiuzhai/jz_SureOrder?orderId="+item.orderId
 				});
 			},
 			change(i) {

pages/jiuzhai/jz_Reserve.vue

@@ -612,11 +612,11 @@
 					},
 					res => {
 						this.orderInfo = JSON.parse(res.data);
-						this.Pay()
+						this.Pay(OrderId)
 					}
 				);
 			},
-			Pay(){
+			Pay(OrderId){
 				let that=this;
 				uni.requestPayment({
 					provider: 'wxpay',
@@ -643,7 +643,7 @@
 						})
 						setTimeout(()=>{
 							uni.redirectTo({
-								url: "/pages/jiuzhai/jz_SureOrder?orderData="+this.orderData
+								url: "/pages/jiuzhai/jz_SureOrder?orderId="+OrderId
 							});
 						}, 100 )
 					}

plugin/api.js

@@ -2,10 +2,10 @@ export default {
 	install(Vue, options) {
 		Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
 		
-		//Vue.prototype.host2 = "https://localhost:5001"
-		 Vue.prototype.host2 = "https://erpmallapi.oytour.com"
-		//Vue.prototype.host3 = "http://192.168.20.24"
-		Vue.prototype.host3 = "https://reborn.oytour.com"
+		Vue.prototype.host2 = "http://192.168.20.24:8400"
+		// Vue.prototype.host2 = "https://erpmallapi.oytour.com"
+		Vue.prototype.host3 = "http://192.168.20.24"
+		//Vue.prototype.host3 = "https://reborn.oytour.com"
 	    
 		Vue.prototype.request = function(param, success, failed) {
 			//网络请求