Procházet zdrojové kódy

Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_manage_app

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopInfo/shopInfo.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js
#	unpackage/dist/dev/mp-weixin/pages/detail/detail.js
#	unpackage/dist/dev/mp-weixin/pages/detail/detail.wxml
#	unpackage/dist/dev/mp-weixin/pages/index/index.js
#	unpackage/dist/dev/mp-weixin/pages/pay/pay.js
#	unpackage/dist/dev/mp-weixin/pages/payStatus/payStatus.js
#	unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.js
xiaoxin před 2 roky
rodič
revize
f421f3c2bb
100 změnil soubory, kde provedl 150 přidání a 21370 odebrání
  1. 1 0
      .gitignore
  2. 1 0
      pages/login/login.vue
  3. 2 2
      pages/my/my.vue
  4. 47 28
      pages/orderDetail/orderDetail.vue
  5. 48 3
      pages/orderManage/orderManage.vue
  6. 51 9
      pages/set/set.vue
  7. 0 0
      unpackage/dist/dev/.automator/mp-weixin/.automator.json
  8. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  9. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  10. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  11. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map
  12. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map
  13. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
  14. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/common/common.js.map
  15. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map
  16. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailInfo/detailInfo.js.map
  17. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  18. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  19. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  20. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  21. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map
  22. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderManage/orderManage.js.map
  23. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map
  24. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map
  25. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/photo/photo.js.map
  26. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/push/push.js.map
  27. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  28. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/set/set.js.map
  29. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/setMeal/setMeal.js.map
  30. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shop.js.map
  31. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop2/shop2.js.map
  32. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopInfo/shopInfo.js.map
  33. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shouquan/shouquan.js.map
  34. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  35. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  36. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js.map
  37. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
  38. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map
  39. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map
  40. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map
  41. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map
  42. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map
  43. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.js.map
  44. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map
  45. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map
  46. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map
  47. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js.map
  48. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js.map
  49. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map
  50. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-col/uv-col.js.map
  51. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js.map
  52. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map
  53. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map
  54. 0 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-transition/components/uv-transition/uv-transition.js.map
  55. 0 4
      unpackage/dist/dev/mp-weixin/app.js
  56. 0 62
      unpackage/dist/dev/mp-weixin/app.json
  57. 0 3
      unpackage/dist/dev/mp-weixin/app.wxss
  58. 0 142
      unpackage/dist/dev/mp-weixin/common/main.js
  59. 0 14
      unpackage/dist/dev/mp-weixin/common/main.wxss
  60. 0 273
      unpackage/dist/dev/mp-weixin/common/runtime.js
  61. 0 15017
      unpackage/dist/dev/mp-weixin/common/vendor.js
  62. 0 386
      unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.js
  63. 0 5
      unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.json
  64. 0 1
      unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.wxml
  65. 0 81
      unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.wxss
  66. 0 508
      unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js
  67. 0 8
      unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.json
  68. 0 1
      unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.wxml
  69. 0 298
      unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.wxss
  70. 0 481
      unpackage/dist/dev/mp-weixin/pages/binding/binding.js
  71. 0 5
      unpackage/dist/dev/mp-weixin/pages/binding/binding.json
  72. 0 1
      unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
  73. 0 111
      unpackage/dist/dev/mp-weixin/pages/binding/binding.wxss
  74. 0 386
      unpackage/dist/dev/mp-weixin/pages/common/common.js
  75. 0 8
      unpackage/dist/dev/mp-weixin/pages/common/common.json
  76. 0 1
      unpackage/dist/dev/mp-weixin/pages/common/common.wxml
  77. 0 96
      unpackage/dist/dev/mp-weixin/pages/common/common.wxss
  78. 0 653
      unpackage/dist/dev/mp-weixin/pages/detail/detail.js
  79. 0 8
      unpackage/dist/dev/mp-weixin/pages/detail/detail.json
  80. 0 1
      unpackage/dist/dev/mp-weixin/pages/detail/detail.wxml
  81. 0 437
      unpackage/dist/dev/mp-weixin/pages/detail/detail.wxss
  82. 0 344
      unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.js
  83. 0 6
      unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.json
  84. 0 1
      unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.wxml
  85. 0 153
      unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.wxss
  86. 0 499
      unpackage/dist/dev/mp-weixin/pages/home/home.js
  87. 0 7
      unpackage/dist/dev/mp-weixin/pages/home/home.json
  88. 0 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxml
  89. 0 175
      unpackage/dist/dev/mp-weixin/pages/home/home.wxss
  90. 0 301
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  91. 0 5
      unpackage/dist/dev/mp-weixin/pages/index/index.json
  92. 0 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  93. 0 31
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  94. 0 261
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  95. 0 5
      unpackage/dist/dev/mp-weixin/pages/login/login.json
  96. 0 1
      unpackage/dist/dev/mp-weixin/pages/login/login.wxml
  97. 0 57
      unpackage/dist/dev/mp-weixin/pages/login/login.wxss
  98. 0 436
      unpackage/dist/dev/mp-weixin/pages/my/my.js
  99. 0 6
      unpackage/dist/dev/mp-weixin/pages/my/my.json
  100. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/my.wxml

+ 1 - 0
.gitignore

@@ -1 +1,2 @@
 node_modules
 node_modules
+/unpackage

+ 1 - 0
pages/login/login.vue

@@ -37,6 +37,7 @@ export default {
 			if (res.code === 200) {
 			if (res.code === 200) {
 				uni.setStorageSync('openid', res.data.openid)
 				uni.setStorageSync('openid', res.data.openid)
 				uni.setStorageSync('userInfo', res.data)
 				uni.setStorageSync('userInfo', res.data)
+				uni.setStorageSync('userId', res.data.id)
 				uni.showToast({
 				uni.showToast({
 					title: '授权成功',
 					title: '授权成功',
 					icon: 'success',
 					icon: 'success',

+ 2 - 2
pages/my/my.vue

@@ -6,8 +6,8 @@
 			<!-- 页面标题 -->
 			<!-- 页面标题 -->
 			<view class="title">我的</view>
 			<view class="title">我的</view>
 			<!-- 头像区域 -->
 			<!-- 头像区域 -->
-			<img class="img" src="../../static/my/portrait.png" />
-
+			<img class="img" v-if="flag" :src="userInfo.headPhoto" />
+			<img class="img" v-else src="../../static/my/portrait.png" />
 			<!-- 姓名区域 -->
 			<!-- 姓名区域 -->
 			<view class="name" v-if="flag">{{ userInfo.user_name || '游客' }}</view>
 			<view class="name" v-if="flag">{{ userInfo.user_name || '游客' }}</view>
 			<!-- 用户id区域 -->
 			<!-- 用户id区域 -->

+ 47 - 28
pages/orderDetail/orderDetail.vue

@@ -31,10 +31,11 @@
 			<view class="header_info" v-if="info.orderStatus === '10'">正在退款中...</view>
 			<view class="header_info" v-if="info.orderStatus === '10'">正在退款中...</view>
 
 
 			<view class="header_btn">
 			<view class="header_btn">
+				<!-- hotelIsCanorder  1可取消,0不可 -->
 				<view class="btn_box" v-if="info.orderStatus === '1'" @click="handlePay">去支付 ¥{{ info.houseTotalPrice }}.00</view>
 				<view class="btn_box" v-if="info.orderStatus === '1'" @click="handlePay">去支付 ¥{{ info.houseTotalPrice }}.00</view>
-				<view class="btn_box" v-if="info.orderStatus === '2' || info.orderStatus === '3'" @click="handleCancel">取消订单</view>
+				<view class="btn_box" v-if="((info.orderStatus === '2' || info.orderStatus === '3') && info.hotelIsCanorder=='1') || info.orderStatus === '1'" @click="handleCancel">取消订单</view>
 				<view class="btn_box" v-if="info.orderStatus * 1 > 3" @click="handleAgain">再次预定</view>
 				<view class="btn_box" v-if="info.orderStatus * 1 > 3" @click="handleAgain">再次预定</view>
-				<view class="btn_box" @click="handleDelete">删除订单</view>
+				<view class="btn_box" @click="handleDelete" v-if="info.orderStatus === '5' || info.orderStatus === '7' || info.orderStatus === '8' || info.orderStatus === '9'">删除订单</view>
 			</view>
 			</view>
 
 
 			<view class="header_msg" v-if="info.orderStatus === '1'">预定成功后,07月26日12:00前可免费取消</view>
 			<view class="header_msg" v-if="info.orderStatus === '1'">预定成功后,07月26日12:00前可免费取消</view>
@@ -81,23 +82,23 @@
 			<!-- 房型信息和用户信息区域 -->
 			<!-- 房型信息和用户信息区域 -->
 			<view class="body_box2">
 			<view class="body_box2">
 				<view class="info_time">
 				<view class="info_time">
-					7月26
-					<text class="gap">今天</text>
+					{{info.orderStartTime.slice(5,7)}}月{{info.orderStartTime.slice(8,10)}}
+					<!-- <text class="gap">今天</text> -->
 					<view class="time_line"></view>
 					<view class="time_line"></view>
-					<view class="time_num">1晚</view>
+					<view class="time_num">{{info.houseOrderNumber}}晚</view>
 					<view class="time_line"></view>
 					<view class="time_line"></view>
-					<view class="gap">7月26日</view>
-					<text>明天</text>
+					<view class="gap">{{info.checkOutTime.slice(5,7)}}月{{info.checkOutTime.slice(8,10)}}日</view>
+					<!-- <text>明天</text> -->
 				</view>
 				</view>
-				<view class="info_msg">大床房</view>
+				<view class="info_msg">{{info.houseName}}</view>
 				<view class="info_type">
 				<view class="info_type">
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 				</view>
 				</view>
 				<view class="info_tag">
 				<view class="info_tag">
-					<view class="tag_item">16-20㎡</view>
-					<view class="tag_item">双人床</view>
+					<view class="tag_item">{{info.houseAreas}}㎡</view>
+					<view class="tag_item">{{info.houseName}}</view>
 					<view class="tag_item">窗户位于走廊/窗户较小</view>
 					<view class="tag_item">窗户位于走廊/窗户较小</view>
 				</view>
 				</view>
 				<view class="info_box">
 				<view class="info_box">
@@ -119,8 +120,8 @@
 				<view class="box_title">订单信息</view>
 				<view class="box_title">订单信息</view>
 				<view class="box_container">
 				<view class="box_container">
 					<view class="container_key">订单号</view>
 					<view class="container_key">订单号</view>
-					<view class="container_value">2626262626260660606</view>
-					<view class="container_copy" @click="handleCopy('2626262626260660606')">复制</view>
+					<view class="container_value">{{info.orderNum}}</view>
+					<view class="container_copy" @click="handleCopy(info.orderNum)">复制</view>
 				</view>
 				</view>
 				<view class="box_container">
 				<view class="box_container">
 					<view class="container_key">下单时间</view>
 					<view class="container_key">下单时间</view>
@@ -211,17 +212,26 @@ export default {
 			uni.showModal({
 			uni.showModal({
 				title: '提示',
 				title: '提示',
 				content: '确定取消该订单吗?',
 				content: '确定取消该订单吗?',
-				success: (res) => {
+				success: async (res) => {
 					if (res.confirm) {
 					if (res.confirm) {
-						uni.showToast({
-							title: '取消成功',
-							icon: 'success'
+						const result = await this.$myRequest({
+							url: '/mhotel/abkcancelBooking.action',
+							data: {
+								bookingId:this.info.id,
+							}
 						})
 						})
-						setTimeout(() => {
-							uni.redirectTo({
-								url: '/pages/orderManage/orderManage'
+						if (result.code === 200) {
+							uni.showToast({
+								title: '取消成功',
+								icon: 'success',
+								mask: true
 							})
 							})
-						}, 1500)
+							setTimeout(() => {
+								uni.redirectTo({
+									url: '/pages/orderManage/orderManage'
+								})
+							}, 1500)
+						}
 					}
 					}
 				}
 				}
 			})
 			})
@@ -237,17 +247,26 @@ export default {
 			uni.showModal({
 			uni.showModal({
 				title: '提示',
 				title: '提示',
 				content: '确定删除该订单吗?',
 				content: '确定删除该订单吗?',
-				success: (res) => {
+				success: async (res) => {
 					if (res.confirm) {
 					if (res.confirm) {
-						uni.showToast({
-							title: '删除成功',
-							icon: 'success'
+						const result = await this.$myRequest({
+							url: '/mhotel/abkdelBooking.action',
+							data: {
+								bookingId:this.info.id,
+							}
 						})
 						})
-						setTimeout(() => {
-							uni.redirectTo({
-								url: '/pages/orderManage/orderManage'
+						if (result.code === 200) {
+							uni.showToast({
+								title: '删除成功',
+								icon: 'success',
+								mask: true
 							})
 							})
-						}, 1500)
+							setTimeout(() => {
+								uni.redirectTo({
+									url: '/pages/orderManage/orderManage'
+								})
+							}, 1500)
+						}
 					}
 					}
 				}
 				}
 			})
 			})

+ 48 - 3
pages/orderManage/orderManage.vue

@@ -16,7 +16,8 @@
 						<view class="title">{{ item.hotelName }}</view>
 						<view class="title">{{ item.hotelName }}</view>
 						<view class="type type2" v-if="item.orderStatus === '1'">
 						<view class="type type2" v-if="item.orderStatus === '1'">
 							待支付,剩余
 							待支付,剩余
-							<uv-count-down :time="countDownTime" format="mm:ss" @change="change" @finish="finish"></uv-count-down>
+							<uni-countdown :show-day="false" :second="countDownTime" @timeup="timeup(item.createTime)" />
+							<!-- <uv-count-down :time="countDownTime" format="mm:ss" @change="change" @finish="finish"></uv-count-down> -->
 						</view>
 						</view>
 						<view class="type" v-if="item.orderStatus === '2'">已支付</view>
 						<view class="type" v-if="item.orderStatus === '2'">已支付</view>
 						<view class="type" v-if="item.orderStatus === '3'">待入住</view>
 						<view class="type" v-if="item.orderStatus === '3'">待入住</view>
@@ -33,7 +34,7 @@
 					<view class="box_info">
 					<view class="box_info">
 						<img class="img" :src="item.imgUrl || '../../static/my/test.png'" />
 						<img class="img" :src="item.imgUrl || '../../static/my/test.png'" />
 						<view class="info_right">
 						<view class="info_right">
-							<view class="info_right_item">{{ item.houseOrderNumber }}间,{{ item.houseName }}</view>
+							<view class="info_right_item">{{ item.houseOrderNumber }}间,{{ item.houseName }}</view>
 							<view class="info_right_item">{{ item.orderStartTime }} - {{ item.orderEndTime }}</view>
 							<view class="info_right_item">{{ item.orderStartTime }} - {{ item.orderEndTime }}</view>
 							<view class="info_right_item">总价:¥{{ item.houseTotalPrice }}.00</view>
 							<view class="info_right_item">总价:¥{{ item.houseTotalPrice }}.00</view>
 						</view>
 						</view>
@@ -57,7 +58,7 @@ export default {
 			// 订单列表
 			// 订单列表
 			orderList: [],
 			orderList: [],
 			// 倒计时时间(毫秒)
 			// 倒计时时间(毫秒)
-			countDownTime: 1000 * 60 * 15,
+			countDownTime: null,
 			// 当前页
 			// 当前页
 			page: 1,
 			page: 1,
 			// 每页多少条数据
 			// 每页多少条数据
@@ -69,6 +70,9 @@ export default {
 	onLoad() {
 	onLoad() {
 		this.getOrderList()
 		this.getOrderList()
 	},
 	},
+	onUnload: function () {
+	  clearInterval(this.timer);
+	},
 	// 下拉刷新
 	// 下拉刷新
 	onPullDownRefresh() {
 	onPullDownRefresh() {
 		setTimeout(() => {
 		setTimeout(() => {
@@ -127,6 +131,47 @@ export default {
 				}
 				}
 			})
 			})
 		},
 		},
+		// 倒计时
+		timeup(createTime) {
+			    var that = this;
+			    /**setInterval间歇调用 */
+			    that.timer = setInterval(function () {
+				//订单下单时间
+				var buy_time = createTime;
+				//计算剩余下单时间
+				var time = (new Date(buy_time).getTime() + 15* 60 * 1000) - (new Date().getTime());
+				if(time>0){
+				  //计算剩余的分钟
+				  var minutes = parseInt(time / 1000 / 60 % 60, 10);
+				  //计算剩余的秒数
+				  var seconds = parseInt(time / 1000 % 60, 10);
+				  that.countDownTime=parseInt(time / 1000);
+				  // console.log(that.countDownTime)
+				  //判断分钟和秒数小于10要在前面加个0.
+				  if(minutes<10){
+					minutes = '0' + minutes;
+				  }
+				  if (seconds < 10) {
+					seconds = '0' + seconds;
+				  }
+				  var timer = minutes + ":" + seconds;
+				}
+			}, 1000);
+			if(that.countDownTime==0) {
+				uni.showModal({
+					title: '提示',
+					content: '订单已超过可支付时间,请重新下单',
+					showCancel: false,
+					success: (res) => {
+						if (res.confirm) {
+							uni.switchTab({
+								url: '/pages/home/home'
+							})
+						}
+					}
+				})
+			}
+		},
 		// 点击预定按钮回调
 		// 点击预定按钮回调
 		goPagePay() {
 		goPagePay() {
 			uni.navigateTo({
 			uni.navigateTo({

+ 51 - 9
pages/set/set.vue

@@ -24,7 +24,7 @@
 			<view class="body_box">
 			<view class="body_box">
 				ID
 				ID
 				<view class="box_right">
 				<view class="box_right">
-					<view class="msg">1925689</view>
+					<view class="msg">{{id}}</view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -38,7 +38,9 @@ export default {
 			// 头像
 			// 头像
 			imgUrl: '',
 			imgUrl: '',
 			// 账号名
 			// 账号名
-			name: ''
+			name: '',
+			//用户id
+			id:'',
 		}
 		}
 	},
 	},
 	onLoad() {
 	onLoad() {
@@ -49,6 +51,7 @@ export default {
 			let userInfo = uni.getStorageSync('userInfo')
 			let userInfo = uni.getStorageSync('userInfo')
 			this.name = userInfo.user_name
 			this.name = userInfo.user_name
 			this.imgUrl = userInfo.headPhoto
 			this.imgUrl = userInfo.headPhoto
+			this.id=userInfo.id
 		},
 		},
 		// 点击头像图片回调
 		// 点击头像图片回调
 		handleClickPhoto() {
 		handleClickPhoto() {
@@ -67,9 +70,26 @@ export default {
 				count: 1,
 				count: 1,
 				sizeType: ['compressed'],
 				sizeType: ['compressed'],
 				sourceType: ['album'], //从相册选择
 				sourceType: ['album'], //从相册选择
-				success: (res) => {
-					// console.log(res.tempFilePaths)
-					this.imgUrl = res.tempFilePaths[0]
+				success: async (res) => {
+					// this.imgUrl = res.tempFilePaths[0]
+					const result = await this.$myRequest({
+						url: '/mhotel/ampupdateUserInfo.action',
+						data: {
+							userId: this.id,
+							userName: this.name,
+							headPhoto: res.tempFilePaths[0]
+						}
+					})
+					if (result.code === 200) {
+						uni.showToast({
+							title: '头像修改成功',
+							icon: 'success',
+							mask: true
+						})
+						setTimeout(() => {
+							this.getUser()
+						}, 1500)
+					}
 				}
 				}
 			})
 			})
 		},
 		},
@@ -103,17 +123,39 @@ export default {
 							const result = await this.$myRequest({
 							const result = await this.$myRequest({
 								url: '/mhotel/ampupdateUserInfo.action',
 								url: '/mhotel/ampupdateUserInfo.action',
 								data: {
 								data: {
-									userId: uni.getStorageSync('userInfo').id,
+									userId: this.id,
 									userName: res.content,
 									userName: res.content,
-									headPhoto: ''
+									headPhoto: this.imgUrl
 								}
 								}
 							})
 							})
-							console.log(result)
+							if (result.code === 200) {
+								uni.showToast({
+									title: '账号修改成功',
+									icon: 'success',
+									mask: true
+								})
+								setTimeout(() => {
+									this.getUser()
+								}, 1500)
+							}
 						}
 						}
 					}
 					}
 				}
 				}
 			})
 			})
-		}
+		},
+		//获取个人信息
+		async getUser(){
+			const res = await this.$myRequest({
+				url: '/mhotel/ampqueryUsersById.action',
+				data: {
+					userId:uni.getStorageSync('userId')
+				}
+			})
+			if (res.code === 200) {
+				this.name = res.data.user_name
+				this.imgUrl = res.data.headPhoto
+			}
+		},
 	}
 	}
 }
 }
 </script>
 </script>

+ 0 - 0
unpackage/dist/dev/.automator/mp-weixin/.automator.json


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/common/common.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailInfo/detailInfo.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderManage/orderManage.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/photo/photo.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/push/push.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/set/set.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/setMeal/setMeal.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shop.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop2/shop2.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopInfo/shopInfo.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shouquan/shouquan.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-col/uv-col.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-transition/components/uv-transition/uv-transition.js.map


+ 0 - 4
unpackage/dist/dev/mp-weixin/app.js

@@ -1,4 +0,0 @@
-
-require('./common/runtime.js')
-require('./common/vendor.js')
-require('./common/main.js')

+ 0 - 62
unpackage/dist/dev/mp-weixin/app.json

@@ -1,62 +0,0 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/home/home",
-    "pages/my/my",
-    "pages/search/search",
-    "pages/setMeal/setMeal",
-    "pages/set/set",
-    "pages/common/common",
-    "pages/addOrEdit/addOrEdit",
-    "pages/orderManage/orderManage",
-    "pages/detail/detail",
-    "pages/detailInfo/detailInfo",
-    "pages/pay/pay",
-    "pages/affirmOrder/affirmOrder",
-    "pages/orderDetail/orderDetail",
-    "pages/payStatus/payStatus",
-    "pages/shouquan/shouquan",
-    "pages/login/login",
-    "pages/shop/shop",
-    "pages/binding/binding",
-    "pages/shopInfo/shopInfo",
-    "pages/push/push",
-    "pages/shop2/shop2"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "靖安民宿",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#A6A6A6",
-    "selectedColor": "#096562",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/home/home",
-        "iconPath": "static/images/index.png",
-        "selectedIconPath": "static/images/index-active.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/my/my",
-        "iconPath": "static/images/my.png",
-        "selectedIconPath": "static/images/my-active.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "permission": {
-    "scope.userLocation": {
-      "desc": "获取用户位置已展示距离民宿的距离"
-    }
-  },
-  "requiredPrivateInfos": [
-    "getLocation"
-  ],
-  "usingComponents": {}
-}

+ 0 - 3
unpackage/dist/dev/mp-weixin/app.wxss

@@ -1,3 +0,0 @@
-@import './common/main.wxss';
-
-[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 142
unpackage/dist/dev/mp-weixin/common/main.js


+ 0 - 14
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-/*每个页面公共css */
-page {
-	background: rgba(234, 234, 234, 1);
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 273
unpackage/dist/dev/mp-weixin/common/runtime.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 15017
unpackage/dist/dev/mp-weixin/common/vendor.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 386
unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "添加旅客",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.wxml


+ 0 - 81
unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.wxss

@@ -1,81 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-74872a38 {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  background-color: #f2f2f2;
-}
-.container .box.data-v-74872a38 {
-  margin-top: 20rpx;
-  height: calc(100vh - 20rpx);
-  background-color: #fff;
-}
-.container .box .body.data-v-74872a38 {
-  box-sizing: border-box;
-  padding: 0 20rpx;
-  height: calc(100vh - 236rpx);
-  background-color: #fff;
-}
-.container .box .body .body_box.data-v-74872a38 {
-  display: flex;
-  align-items: center;
-  margin-top: 30rpx;
-  height: 80rpx;
-}
-.container .box .body .body_box .body_box_key.data-v-74872a38 {
-  width: 152rpx;
-  color: #808080;
-  font-size: 28rpx;
-}
-.container .box .body .body_box .body_box_value.data-v-74872a38 {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  padding: 0 28rpx;
-  width: 559rpx;
-  height: 80rpx;
-  font-size: 28rpx;
-  border-radius: 15rpx;
-  background-color: #f2f2f2;
-}
-.container .box .body .body_box .body_box_value .input.data-v-74872a38 {
-  width: 100%;
-}
-.container .box .btn.data-v-74872a38 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 45rpx auto;
-  width: 710rpx;
-  height: 96rpx;
-  font-size: 32rpx;
-  border-radius: 64rpx;
-  color: #fff;
-  background-color: #096562;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 508
unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js


+ 0 - 8
unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.json

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "民宿名称",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {
-    "uv-datetime-picker": "/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker"
-  }
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.wxml


+ 0 - 298
unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.wxss

@@ -1,298 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-36d90744 {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  overflow: hidden;
-  background-color: #ebeced;
-}
-.container .header.data-v-36d90744 {
-  position: relative;
-  height: 145rpx;
-  overflow: hidden;
-}
-.container .header ._img.data-v-36d90744 {
-  width: 100%;
-}
-.container .header .header_title.data-v-36d90744 {
-  position: absolute;
-  top: 65rpx;
-  left: 308rpx;
-  color: #fff;
-  font-size: 28rpx;
-}
-.container .header .header_icon.data-v-36d90744 {
-  position: absolute;
-  top: 76rpx;
-  left: 5rpx;
-  width: 47rpx;
-  height: 47rpx;
-}
-.container .body.data-v-36d90744 {
-  height: calc(100vh - 271rpx);
-  overflow-y: auto;
-}
-.container .body .info.data-v-36d90744 {
-  display: flex;
-  flex-direction: column;
-  box-sizing: border-box;
-  padding: 0 30rpx;
-  margin: 0 auto;
-  margin-top: 18rpx;
-  width: 710rpx;
-  border-radius: 15rpx;
-  background-color: #fff;
-}
-.container .body .info .info_time.data-v-36d90744 {
-  display: flex;
-  align-items: center;
-  margin-top: 20rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-}
-.container .body .info .info_time .time_line.data-v-36d90744 {
-  width: 17rpx;
-  height: 1rpx;
-  background-color: #096562;
-}
-.container .body .info .info_time .time_num.data-v-36d90744 {
-  box-sizing: border-box;
-  padding: 0 15rpx;
-  height: 46rpx;
-  line-height: 46rpx;
-  font-size: 24rpx;
-  font-weight: 400;
-  border-radius: 66rpx;
-  border: 1rpx solid #096562;
-  background-color: #f0f2f5;
-}
-.container .body .info .info_time .gap.data-v-36d90744 {
-  margin: 0 10rpx;
-}
-.container .body .info .info_time text.data-v-36d90744 {
-  font-size: 24rpx;
-  font-weight: 400;
-}
-.container .body .info .info_msg.data-v-36d90744 {
-  margin-top: 15rpx;
-  font-size: 28rpx;
-  font-weight: bold;
-}
-.container .body .info .info_type.data-v-36d90744 {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 15rpx;
-}
-.container .body .info .info_type .type_item.data-v-36d90744 {
-  box-sizing: border-box;
-  padding: 0 15rpx;
-  margin-right: 20rpx;
-  height: 41rpx;
-  line-height: 41rpx;
-  font-size: 24rpx;
-  color: #fff;
-  border-radius: 34rpx;
-  background-color: #096562;
-}
-.container .body .info .info_tag.data-v-36d90744 {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 18rpx 0 30rpx;
-  color: #808080;
-  font-size: 24rpx;
-}
-.container .body .info .info_tag .tag_item.data-v-36d90744 {
-  margin-right: 20rpx;
-}
-.container .body .msg.data-v-36d90744 {
-  box-sizing: border-box;
-  padding-left: 26rpx;
-  margin: auto;
-  margin-top: 20rpx;
-  width: 710rpx;
-  border-radius: 15rpx;
-  background-color: #fff;
-}
-.container .body .msg .msg_title.data-v-36d90744 {
-  height: 87rpx;
-  line-height: 87rpx;
-  font-size: 28rpx;
-  font-weight: bold;
-  border-bottom: 1rpx solid #e6e6e6;
-}
-.container .body .msg .msg_box.data-v-36d90744 {
-  display: flex;
-  align-items: center;
-  height: 97rpx;
-  font-size: 28rpx;
-  border-bottom: 1rpx solid #e6e6e6;
-}
-.container .body .msg .msg_box .box_key.data-v-36d90744 {
-  width: 120rpx;
-  color: #808080;
-}
-.container .body .msg .msg_box .box_value.data-v-36d90744 {
-  margin-left: 30rpx;
-  flex: 1;
-}
-.container .body .msg .msg_box .box_value input.data-v-36d90744 {
-  box-sizing: border-box;
-  padding-right: 30rpx;
-  width: 100%;
-}
-.container .body .msg .msg_box .color.data-v-36d90744 {
-  color: #808080;
-}
-.container .body .msg .msg_box .box_icon.data-v-36d90744 {
-  display: flex;
-  align-items: center;
-}
-.container .body .msg .msg_box .box_icon .img.data-v-36d90744 {
-  width: 47rpx;
-  height: 47rpx;
-}
-.container .body .msg .msg_box .box_icon .img2.data-v-36d90744 {
-  margin: 0 30rpx;
-  width: 37rpx;
-  height: 37rpx;
-}
-.container .body .msg .msg_box .box_icon .img3.data-v-36d90744 {
-  margin: 0 30rpx;
-  width: 40rpx;
-  height: 40rpx;
-}
-.container .body .price.data-v-36d90744 {
-  box-sizing: border-box;
-  padding-left: 26rpx;
-  margin: 20rpx auto;
-  width: 710rpx;
-  height: 197rpx;
-  border-radius: 15rpx;
-  background-color: #fff;
-}
-.container .body .price .price_title.data-v-36d90744 {
-  line-height: 92rpx;
-  font-size: 28rpx;
-  font-weight: bold;
-  border-bottom: 1rpx solid #e6e6e6;
-}
-.container .body .price .price_box.data-v-36d90744 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 92rpx;
-  font-size: 28rpx;
-}
-.container .body .price .price_box .box_key.data-v-36d90744 {
-  color: #808080;
-}
-.container .body .price .price_box .box_value.data-v-36d90744 {
-  display: flex;
-  align-items: center;
-}
-.container .body .price .price_box .box_value text.data-v-36d90744 {
-  color: #ff5733;
-  font-size: 24rpx;
-}
-.container .body .price .price_box .box_value ._span.data-v-36d90744 {
-  margin-right: 30rpx;
-  color: #ff5733;
-}
-.container .body .all.data-v-36d90744 {
-  box-sizing: border-box;
-  padding-left: 26rpx;
-  margin: 0 auto 60rpx;
-  width: 710rpx;
-  border-radius: 15rpx;
-  background-color: #fff;
-}
-.container .body .all .all_title.data-v-36d90744 {
-  display: flex;
-  height: 92rpx;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 28rpx;
-  font-weight: bold;
-  border-bottom: 1rpx solid #e6e6e6;
-}
-.container .body .all .all_title .mr_30.data-v-36d90744 {
-  margin-right: 30rpx;
-}
-.container .body .all .all_box.data-v-36d90744 {
-  box-sizing: border-box;
-  padding-right: 26rpx;
-  display: flex;
-  justify-content: space-between;
-  font-size: 28rpx;
-}
-.container .body .all .all_box .box_list.data-v-36d90744 {
-  margin-bottom: 28rpx;
-  color: #808080;
-}
-.container .body .all .all_box .box_list .list_item.data-v-36d90744 {
-  margin-top: 30rpx;
-}
-.container .body .all .all_box .box_total.data-v-36d90744 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.container .foot.data-v-36d90744 {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 0 20rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 126rpx;
-  background-color: #fff;
-}
-.container .foot .foot_left.data-v-36d90744 {
-  margin-top: -10rpx;
-  font-size: 40rpx;
-  color: #ff5733;
-}
-.container .foot .foot_left text.data-v-36d90744 {
-  font-size: 24rpx;
-}
-.container .foot .foot_right.data-v-36d90744 {
-  margin-top: -10rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 238rpx;
-  height: 80rpx;
-  color: #fff;
-  font-size: 32rpx;
-  border-radius: 64rpx;
-  background-color: #096562;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 481
unpackage/dist/dev/mp-weixin/pages/binding/binding.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/binding/binding.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "账户绑定",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml


+ 0 - 111
unpackage/dist/dev/mp-weixin/pages/binding/binding.wxss

@@ -1,111 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-18847812 {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100vh;
-  background-color: #fff;
-}
-.container ._img.data-v-18847812 {
-  margin-top: 20rpx;
-  width: 347rpx;
-  height: 387rpx;
-}
-.container .form.data-v-18847812 {
-  box-sizing: border-box;
-  padding: 0 30rpx;
-  margin-top: 35rpx;
-  width: 690rpx;
-  height: 548rpx;
-  border-radius: 23rpx;
-  box-shadow: 0px 0px 9px rgba(0, 0, 0, 0.25);
-}
-.container .form .form_title.data-v-18847812 {
-  line-height: 120rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-}
-.container .form .form_name.data-v-18847812 {
-  display: flex;
-  align-items: center;
-  font-size: 28rpx;
-}
-.container .form .form_name .name_input.data-v-18847812 {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  padding: 0 24rpx;
-  margin-left: 25rpx;
-  width: 545rpx;
-  height: 80rpx;
-  border-radius: 15rpx;
-  border: 1rpx solid #a6a6a6;
-}
-.container .form .form_name .name_input input.data-v-18847812 {
-  width: 100%;
-}
-.container .form .form_password.data-v-18847812 {
-  display: flex;
-  align-items: center;
-  margin-top: 46rpx;
-  font-size: 28rpx;
-}
-.container .form .form_password .password_input.data-v-18847812 {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  padding: 0 24rpx;
-  margin-left: 25rpx;
-  width: 545rpx;
-  height: 80rpx;
-  border-radius: 15rpx;
-  border: 1rpx solid #a6a6a6;
-}
-.container .form .form_password .password_input input.data-v-18847812 {
-  width: 100%;
-}
-.container .form .form_msg.data-v-18847812 {
-  margin-top: 23rpx;
-  height: 32rpx;
-  color: #d43030;
-  font-size: 24rpx;
-  text-align: center;
-}
-.container .form .form_btn.data-v-18847812 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 28rpx;
-  width: 624rpx;
-  height: 96rpx;
-  border-radius: 64rpx;
-  color: #fff;
-  font-size: 32rpx;
-  background-color: #096562;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 386
unpackage/dist/dev/mp-weixin/pages/common/common.js


+ 0 - 8
unpackage/dist/dev/mp-weixin/pages/common/common.json

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "常用旅客",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "uni-swipe-action": "/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action",
-    "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item"
-  }
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/common/common.wxml


+ 0 - 96
unpackage/dist/dev/mp-weixin/pages/common/common.wxss

@@ -1,96 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-a790a134 {
-  box-sizing: border-box;
-  padding: 0 20rpx;
-  height: 100vh;
-  background-color: #ebeced;
-}
-.container .list.data-v-a790a134 {
-  height: calc(100vh - 186rpx);
-  overflow-y: auto;
-}
-.container .list .list_item_right.data-v-a790a134 {
-  display: flex;
-  margin-top: 20rpx;
-  width: 252rpx;
-  height: 236rpx;
-}
-.container .list .list_item_right .list_item_right_box.data-v-a790a134 {
-  flex: 1;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.container .list .list_item_right .list_item_right_box .img.data-v-a790a134 {
-  width: 50rpx;
-  height: 50rpx;
-}
-.container .list .list_item_right .edit.data-v-a790a134 {
-  background-color: #096562;
-}
-.container .list .list_item_right .delete.data-v-a790a134 {
-  background-color: #d43030;
-}
-.container .list .list_item.data-v-a790a134 {
-  display: flex;
-  flex-direction: column;
-  box-sizing: border-box;
-  margin-top: 20rpx;
-  padding-left: 27rpx;
-  width: 710rpx;
-  height: 236rpx;
-  opacity: 0.9;
-  border-radius: 15rpx;
-  background-color: #fff;
-}
-.container .list .list_item .item_box.data-v-a790a134 {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  font-size: 28rpx;
-}
-.container .list .list_item .item_box .box_key.data-v-a790a134 {
-  width: 120rpx;
-  color: #808080;
-}
-.container .list .list_item .item_box .box_value.data-v-a790a134 {
-  margin-left: 30rpx;
-}
-.container .btn.data-v-a790a134 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 45rpx 0;
-  width: 710rpx;
-  height: 96rpx;
-  font-size: 32rpx;
-  border-radius: 64rpx;
-  color: #fff;
-  background-color: #096562;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 653
unpackage/dist/dev/mp-weixin/pages/detail/detail.js


+ 0 - 8
unpackage/dist/dev/mp-weixin/pages/detail/detail.json

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "民宿详情",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "uv-calendar": "/uni_modules/uv-calendar/components/uv-calendar/uv-calendar",
-    "uv-popup": "/uni_modules/uv-popup/components/uv-popup/uv-popup"
-  }
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/detail/detail.wxml


+ 0 - 437
unpackage/dist/dev/mp-weixin/pages/detail/detail.wxss

@@ -1,437 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-3e159eb4 {
-  display: flex;
-  flex-direction: column;
-  position: relative;
-  min-height: 100vh;
-  background-color: #ebeced;
-}
-.container .banner.data-v-3e159eb4 {
-  position: relative;
-  margin-top: 20rpx;
-  width: 750rpx;
-  height: 422rpx;
-}
-.container .banner .img.data-v-3e159eb4 {
-  width: 100%;
-  height: 100%;
-}
-.container .banner .slogan.data-v-3e159eb4 {
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 163rpx;
-  height: 60rpx;
-  background-color: rgba(255, 255, 255, 0.4);
-}
-.container .banner .slogan ._img.data-v-3e159eb4 {
-  width: 125rpx;
-  height: 44rpx;
-}
-.container .detail.data-v-3e159eb4 {
-  position: absolute;
-  top: 265rpx;
-  left: 20rpx;
-  box-sizing: border-box;
-  padding: 0 30rpx;
-  width: 710rpx;
-  height: 254rpx;
-  border-radius: 10rpx;
-  background-color: #fff;
-}
-.container .detail .detail_name.data-v-3e159eb4 {
-  margin-top: 25rpx;
-  font-size: 34rpx;
-  font-weight: bold;
-}
-.container .detail .detail_info.data-v-3e159eb4 {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 10rpx;
-}
-.container .detail .detail_info .info_left.data-v-3e159eb4 {
-  color: #999999;
-  font-size: 20rpx;
-}
-.container .detail .detail_info .info_right.data-v-3e159eb4 {
-  display: flex;
-  align-items: center;
-  color: #096562;
-  font-size: 24rpx;
-}
-.container .detail .detail_info .info_right ._img.data-v-3e159eb4 {
-  margin-left: 6rpx;
-  width: 10rpx;
-  height: 20rpx;
-}
-.container .detail .detail_group.data-v-3e159eb4 {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 5rpx;
-}
-.container .detail .detail_group .group_item.data-v-3e159eb4 {
-  display: flex;
-  align-items: center;
-  margin-right: 10rpx;
-  color: #999999;
-  font-size: 20rpx;
-}
-.container .detail .detail_group .group_item ._img.data-v-3e159eb4 {
-  margin-right: 5rpx;
-  width: 22rpx;
-  height: 22rpx;
-}
-.container .detail .address.data-v-3e159eb4 {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 8rpx;
-  font-size: 28rpx;
-  font-weight: bold;
-}
-.container .detail .address .address_left.data-v-3e159eb4 {
-  width: 480rpx;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.container .detail .address .address_right.data-v-3e159eb4 {
-  display: flex;
-}
-.container .detail .address .address_right .right_box.data-v-3e159eb4 {
-  margin-left: 28rpx;
-  width: 50rpx;
-  height: 78rpx;
-}
-.container .detail .address .address_right .right_box ._img.data-v-3e159eb4 {
-  width: 100%;
-  height: 100%;
-}
-.container .detail .distance.data-v-3e159eb4 {
-  margin-top: -35rpx;
-  color: #999999;
-  font-size: 24rpx;
-}
-.container .body.data-v-3e159eb4 {
-  position: absolute;
-  top: 539rpx;
-  left: 20rpx;
-  padding-bottom: 30rpx;
-  width: 710rpx;
-  border-radius: 10rpx;
-  background-color: #fff;
-}
-.container .body .body_header.data-v-3e159eb4 {
-  display: flex;
-  justify-content: space-around;
-  box-sizing: border-box;
-  padding: 0 30rpx;
-  height: 150rpx;
-}
-.container .body .body_header .header_start.data-v-3e159eb4 {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  width: 213rpx;
-  height: 150rpx;
-}
-.container .body .body_header .header_start .header_top.data-v-3e159eb4 {
-  margin-bottom: 10rpx;
-  color: #999999;
-  font-size: 24rpx;
-}
-.container .body .body_header .header_start .header_bottom.data-v-3e159eb4 {
-  font-size: 34rpx;
-  font-weight: bold;
-}
-.container .body .body_header .header_night.data-v-3e159eb4 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.container .body .body_header .header_night .night_line.data-v-3e159eb4 {
-  width: 17rpx;
-  height: 1rpx;
-  background-color: #296de3;
-}
-.container .body .body_header .header_night .night_box.data-v-3e159eb4 {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 81rpx;
-  height: 46rpx;
-  font-size: 24rpx;
-  border-radius: 66rpx;
-  border: 1rpx solid #296de3;
-}
-.container .body .body_header .header_end.data-v-3e159eb4 {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  width: 213rpx;
-  height: 150rpx;
-}
-.container .body .body_header .header_end .header_top.data-v-3e159eb4 {
-  margin-bottom: 10rpx;
-  color: #999999;
-  font-size: 24rpx;
-}
-.container .body .body_header .header_end .header_bottom.data-v-3e159eb4 {
-  font-size: 34rpx;
-  font-weight: bold;
-}
-.container .body .body_content .body_box.data-v-3e159eb4 {
-  box-sizing: border-box;
-  padding: 0 30rpx;
-  margin-bottom: 30rpx;
-  display: flex;
-  height: 193rpx;
-  border-bottom: 1rpx solid #cccccc;
-}
-.container .body .body_content .body_box .box_left.data-v-3e159eb4 {
-  width: 213rpx;
-  height: 161rpx;
-  border-radius: 5rpx;
-}
-.container .body .body_content .body_box .box_left ._img.data-v-3e159eb4 {
-  width: 100%;
-  height: 100%;
-}
-.container .body .body_content .body_box .box_center.data-v-3e159eb4 {
-  margin-left: 16rpx;
-}
-.container .body .body_content .body_box .box_center .center_top.data-v-3e159eb4 {
-  font-size: 34rpx;
-  font-weight: bold;
-}
-.container .body .body_content .body_box .box_center .center_center.data-v-3e159eb4 {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10rpx;
-  color: #999999;
-  font-size: 24rpx;
-}
-.container .body .body_content .body_box .box_center .center_center .center_item.data-v-3e159eb4 {
-  margin-right: 15rpx;
-}
-.container .body .body_content .body_box .box_center .center_bottom.data-v-3e159eb4 {
-  margin-top: 25rpx;
-}
-.container .body .body_content .body_box .box_center .center_bottom .img.data-v-3e159eb4 {
-  margin-right: 15rpx;
-  width: 30rpx;
-  height: 30rpx;
-}
-.container .body .body_content .body_box .box_right.data-v-3e159eb4 {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  margin-left: auto;
-  margin-top: 20rpx;
-}
-.container .body .body_content .body_box .box_right .right_price.data-v-3e159eb4 {
-  color: #ff5733;
-  font-size: 42rpx;
-}
-.container .body .body_content .body_box .box_right .right_price text.data-v-3e159eb4 {
-  font-size: 24rpx;
-}
-.container .body .body_content .body_box .box_right .right_btn.data-v-3e159eb4 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: 10rpx;
-  width: 100rpx;
-  height: 66rpx;
-  color: #fff;
-  font-size: 36rpx;
-  border-radius: 11rpx;
-  background-color: #096562;
-}
-.container .body .body_content .body_box .box_right .inactive.data-v-3e159eb4 {
-  background-color: #cccccc;
-}
-.container .body .body_content .body_pop.data-v-3e159eb4 {
-  position: relative;
-  height: 955rpx;
-  border-radius: 22rpx 22rpx 0 0;
-  background-color: #fff;
-  overflow-y: auto;
-}
-.container .body .body_content .body_pop .pop_swiper.data-v-3e159eb4 {
-  height: 422rpx;
-  border-radius: 22rpx 22rpx 0 0;
-}
-.container .body .body_content .body_pop .pop_swiper .pop_swiper_item.data-v-3e159eb4 {
-  width: 100%;
-  height: 100%;
-}
-.container .body .body_content .body_pop .pop_swiper .pop_swiper_item .img.data-v-3e159eb4 {
-  width: 100%;
-  height: 100%;
-  border-radius: 22rpx 22rpx 0 0;
-}
-.container .body .body_content .body_pop .pop_icon.data-v-3e159eb4 {
-  position: absolute;
-  top: 20rpx;
-  right: 30rpx;
-  width: 58rpx;
-  height: 58rpx;
-}
-.container .body .body_content .body_pop .pop_body.data-v-3e159eb4 {
-  box-sizing: border-box;
-  padding: 0 20rpx 30rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_title.data-v-3e159eb4 {
-  margin-top: 30rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-}
-.container .body .body_content .body_pop .pop_body .body_tags.data-v-3e159eb4 {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 20rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_tags .tags_item.data-v-3e159eb4 {
-  display: flex;
-  align-items: center;
-  margin-right: 76rpx;
-  margin-bottom: 20rpx;
-  color: #383838;
-  font-size: 24rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_tags .tags_item .img.data-v-3e159eb4 {
-  margin-right: 5rpx;
-  width: 28rpx;
-  height: 28rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_title2.data-v-3e159eb4 {
-  margin-top: 20rpx;
-  font-size: 28rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_detail.data-v-3e159eb4 {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  box-sizing: border-box;
-  padding: 20rpx 30rpx;
-  margin-top: 18rpx;
-  width: 710rpx;
-  height: 266rpx;
-  font-size: 24rpx;
-  border-radius: 7rpx;
-  background-color: #f2f2f2;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_old.data-v-3e159eb4 {
-  text-align: end;
-  text-decoration: line-through;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_box.data-v-3e159eb4 {
-  display: flex;
-  justify-content: space-between;
-  color: #808080;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_box text.data-v-3e159eb4 {
-  color: #ff5733;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_new.data-v-3e159eb4 {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  font-size: 24rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_new .color.data-v-3e159eb4 {
-  color: #ff5733;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_new .price.data-v-3e159eb4 {
-  font-size: 36rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_detail .detail_new .ml_10.data-v-3e159eb4 {
-  margin-left: 10rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom.data-v-3e159eb4 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 250rpx;
-  height: 80rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom .bottom_left.data-v-3e159eb4 {
-  display: flex;
-  align-items: center;
-  color: #333333;
-  font-size: 24rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom .bottom_left .img.data-v-3e159eb4 {
-  margin-right: 10rpx;
-  width: 48rpx;
-  height: 48rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom .bottom_right.data-v-3e159eb4 {
-  display: flex;
-  align-items: center;
-  color: #ff5733;
-  font-size: 40rpx;
-  font-weight: bold;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom .bottom_right text.data-v-3e159eb4 {
-  font-size: 24rpx;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom .bottom_right .btn.data-v-3e159eb4 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-left: 30rpx;
-  width: 238rpx;
-  height: 80rpx;
-  color: #fff;
-  font-size: 32rpx;
-  font-weight: 400;
-  border-radius: 64rpx;
-  background-color: #096562;
-}
-.container .body .body_content .body_pop .pop_body .body_bottom .bottom_right .inactive.data-v-3e159eb4 {
-  background-color: #cccccc;
-}
-.container .body .noData.data-v-3e159eb4 {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  padding-bottom: 20rpx;
-}
-.container .body .noData ._img.data-v-3e159eb4 {
-  margin-top: 60rpx;
-  width: 600rpx;
-  height: 600rpx;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 344
unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.js


+ 0 - 6
unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "设施详情",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.wxml


+ 0 - 153
unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.wxss

@@ -1,153 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-c0575434 {
-  position: relative;
-  height: 100vh;
-  overflow: hidden;
-  background-color: #fff;
-}
-.container .header.data-v-c0575434 {
-  position: relative;
-  height: 480rpx;
-  color: #fff;
-  overflow: hidden;
-}
-.container .header ._img.data-v-c0575434 {
-  width: 100%;
-}
-.container .header .header_title.data-v-c0575434 {
-  position: absolute;
-  top: 65rpx;
-  left: 308rpx;
-  color: #fff;
-  font-size: 28rpx;
-}
-.container .header .header_icon.data-v-c0575434 {
-  position: absolute;
-  top: 76rpx;
-  left: 5rpx;
-  width: 47rpx;
-  height: 47rpx;
-}
-.container .header .header_name.data-v-c0575434 {
-  position: absolute;
-  top: 155rpx;
-  left: 30rpx;
-  font-size: 40rpx;
-  font-weight: bold;
-}
-.container .header .header_info.data-v-c0575434 {
-  position: absolute;
-  top: 230rpx;
-  left: 30rpx;
-  font-size: 24rpx;
-}
-.container .header .header_types.data-v-c0575434 {
-  position: absolute;
-  top: 281rpx;
-  left: 30rpx;
-  display: flex;
-  font-size: 20rpx;
-}
-.container .header .header_types .types_item.data-v-c0575434 {
-  box-sizing: border-box;
-  padding: 0 10rpx;
-  margin-right: 15rpx;
-  height: 30rpx;
-  border-radius: 9rpx;
-  background-color: rgba(255, 255, 255, 0.2);
-}
-.container .body.data-v-c0575434 {
-  position: absolute;
-  top: 350rpx;
-  left: 0;
-  right: 0;
-  box-sizing: border-box;
-  padding: 0 30rpx 50rpx;
-  height: calc(100vh - 350rpx);
-  border-radius: 20rpx 20rpx 0 0;
-  background-color: #fff;
-  overflow-y: auto;
-}
-.container .body .body_title.data-v-c0575434 {
-  line-height: 90rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-}
-.container .body .body_towns.data-v-c0575434 {
-  line-height: 55rpx;
-  font-size: 28rpx;
-}
-.container .body .body_address.data-v-c0575434 {
-  display: flex;
-  height: auto;
-  line-height: 55rpx;
-}
-.container .body .body_address ._img.data-v-c0575434 {
-  margin-left: 20rpx;
-  width: 28rpx;
-  height: 28rpx;
-}
-.container .body .body_phone.data-v-c0575434 {
-  line-height: 55rpx;
-  font-size: 28rpx;
-}
-.container .body .body_box.data-v-c0575434 {
-  display: flex;
-  align-items: center;
-}
-.container .body .body_box .box_icon.data-v-c0575434 {
-  width: 36rpx;
-  height: 36rpx;
-}
-.container .body .body_box .box_icon2.data-v-c0575434 {
-  margin-top: 4rpx;
-  width: 40rpx;
-  height: 40rpx;
-}
-.container .body .body_box .box_text.data-v-c0575434 {
-  margin-left: 16rpx;
-  font-size: 28rpx;
-}
-.container .body .body_time.data-v-c0575434 {
-  display: flex;
-  align-items: center;
-  margin: 20rpx 0;
-  color: #808080;
-  font-size: 24rpx;
-}
-.container .body .body_time .time_start.data-v-c0575434 {
-  margin-left: 50rpx;
-  margin-right: 60rpx;
-}
-.container .body .body_desc.data-v-c0575434 {
-  margin: 10rpx 0 0 50rpx;
-  line-height: 45rpx;
-  color: #808080;
-  font-size: 24rpx;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 499
unpackage/dist/dev/mp-weixin/pages/home/home.js


+ 0 - 7
unpackage/dist/dev/mp-weixin/pages/home/home.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "靖安民宿",
-  "enablePullDownRefresh": true,
-  "usingComponents": {
-    "uv-row": "/uni_modules/uv-row/components/uv-row/uv-row"
-  }
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxml


+ 0 - 175
unpackage/dist/dev/mp-weixin/pages/home/home.wxss

@@ -1,175 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-92bb8f34 {
-  display: flex;
-  flex-direction: column;
-  width: 750rpx;
-  min-height: 100vh;
-  padding: 0 30rpx;
-  box-sizing: border-box;
-  background-color: #f7f7f7;
-}
-.container .address.data-v-92bb8f34 {
-  display: flex;
-  width: 152rpx;
-  font-size: 28rpx;
-}
-.container .address .address_text.data-v-92bb8f34 {
-  width: 104rpx;
-  text-align: center;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.container .address ._img.data-v-92bb8f34 {
-  width: 48rpx;
-  height: 48rpx;
-}
-.container .search.data-v-92bb8f34 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 538rpx;
-  height: 80rpx;
-  opacity: 1;
-  border-radius: 70px;
-  background-color: #fff;
-}
-.container .search .add.data-v-92bb8f34 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-left: 10rpx;
-  width: 60rpx;
-  font-size: 50rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  color: #1e7dfb;
-}
-.container .search .add .img.data-v-92bb8f34 {
-  width: 30rpx;
-  height: 30rpx;
-}
-.container .search .inp.data-v-92bb8f34 {
-  height: 60rpx;
-  line-height: 60rpx;
-  flex-grow: 1;
-  font-size: 28rpx;
-}
-.container .search .btnSearch.data-v-92bb8f34 {
-  width: 100rpx;
-  text-align: center;
-  margin-right: 10rpx;
-  height: 60rpx;
-  line-height: 60rpx;
-  opacity: 1;
-  font-size: 28rpx;
-  font-weight: 400;
-  height: 2rem;
-  color: #096562;
-}
-.container .body.data-v-92bb8f34 {
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-.container .body .item.data-v-92bb8f34 {
-  width: 335rpx;
-  box-sizing: border-box;
-  margin-bottom: 20rpx;
-}
-.container .body .item .item-img.data-v-92bb8f34 {
-  width: 100%;
-  height: 223rpx;
-  border-radius: 18rpx 18rpx 0 0;
-  box-sizing: border-box;
-}
-.container .body .item .descrition.data-v-92bb8f34 {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  border-radius: 0 0 18rpx 18rpx;
-  box-sizing: border-box;
-  background: white;
-  margin-top: -10rpx;
-}
-.container .body .item .descrition .title.data-v-92bb8f34 {
-  font-size: 28rpx;
-  font-weight: 600;
-  padding: 20rpx 20rpx 10rpx;
-  color: black;
-}
-.container .body .item .descrition .type.data-v-92bb8f34 {
-  padding: 5rpx 20rpx;
-  font-size: 24rpx;
-  color: #a6a6a6;
-}
-.container .body .item .descrition .distance.data-v-92bb8f34 {
-  padding: 10rpx 20rpx;
-  font-size: 24rpx;
-  color: #a6a6a6;
-}
-.container .body .item .descrition .detail.data-v-92bb8f34 {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 20rpx 20rpx 20rpx;
-  color: black;
-}
-.container .body .item .descrition .detail .img.data-v-92bb8f34 {
-  width: 40rpx;
-  height: 40rpx;
-}
-.container .body .item .descrition .detail .price .txt1.data-v-92bb8f34 {
-  font-size: 36rpx;
-  font-weight: 600;
-  color: #ff5733;
-}
-.container .body .item .descrition .detail .price .txt2.data-v-92bb8f34 {
-  font-size: 24rpx;
-  font-weight: 400;
-  color: #a6a6a6;
-}
-.container .body .item .descrition .detail .score.data-v-92bb8f34 {
-  font-size: 24rpx;
-  font-weight: 400;
-  padding-top: 10rpx;
-  color: #a6a6a6;
-}
-.container .noData.data-v-92bb8f34 {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-.container .noData ._img.data-v-92bb8f34 {
-  margin-top: 150rpx;
-  width: 600rpx;
-  height: 600rpx;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 301
unpackage/dist/dev/mp-weixin/pages/index/index.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "授权中",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 0 - 31
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1,31 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-57280228 {
-  height: 100vh;
-  background-color: #fff;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 261
unpackage/dist/dev/mp-weixin/pages/login/login.js


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -1 +0,0 @@
-<view class="container data-v-b237504c"><image src="{{$root.m0}}" class="_img data-v-b237504c"></image><view class="msg data-v-b237504c">靖安乡村民宿</view><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="btn data-v-b237504c" bindtap="__e">授权登录</view></view>

+ 0 - 57
unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -1,57 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.container.data-v-b237504c {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100vh;
-  background-color: #fff;
-}
-.container ._img.data-v-b237504c {
-  margin-top: 116rpx;
-  width: 138rpx;
-  height: 138rpx;
-}
-.container .msg.data-v-b237504c {
-  margin-top: 32rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-}
-.container .btn.data-v-b237504c {
-  position: absolute;
-  bottom: 74rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 710rpx;
-  height: 96rpx;
-  color: #fff;
-  font-size: 32rpx;
-  border-radius: 64rpx;
-  background-color: #096562;
-}
-

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 436
unpackage/dist/dev/mp-weixin/pages/my/my.js


+ 0 - 6
unpackage/dist/dev/mp-weixin/pages/my/my.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "我的",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/my.wxml


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů