xiaoxin hace 2 años
padre
commit
8e9b1c5e30
Se han modificado 100 ficheros con 2248 adiciones y 443 borrados
  1. 7 0
      main.js
  2. 9 1
      manifest.json
  3. 31 19
      pages.json
  4. 148 0
      pages/binding/binding.vue
  5. 157 58
      pages/home/home.vue
  6. 3 3
      pages/index/index.vue
  7. 45 2
      pages/login/login.vue
  8. 12 0
      pages/my/my.vue
  9. 61 0
      pages/shop/shop.vue
  10. 130 0
      pages/shopInfo/shopInfo.vue
  11. BIN
      static/images/noData.png
  12. BIN
      static/my/shop.png
  13. BIN
      static/my/shopImg.png
  14. BIN
      static/my/shopImg2.png
  15. BIN
      static/my/shopImg3.png
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map
  20. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/common/common.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailInfo/detailInfo.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderManage/orderManage.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/set/set.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/setMeal/setMeal.js.map
  35. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shop.js.map
  36. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopInfo/shopInfo.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shouquan/shouquan.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map
  53. 12 1
      unpackage/dist/dev/mp-weixin/app.json
  54. 2 0
      unpackage/dist/dev/mp-weixin/common/main.js
  55. 284 148
      unpackage/dist/dev/mp-weixin/common/vendor.js
  56. 1 1
      unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js
  57. 237 0
      unpackage/dist/dev/mp-weixin/pages/binding/binding.js
  58. 1 1
      unpackage/dist/dev/mp-weixin/pages/photo/photo.json
  59. 1 0
      unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
  60. 110 0
      unpackage/dist/dev/mp-weixin/pages/binding/binding.wxss
  61. 2 2
      unpackage/dist/dev/mp-weixin/pages/common/common.js
  62. 2 2
      unpackage/dist/dev/mp-weixin/pages/detail/detail.js
  63. 169 47
      unpackage/dist/dev/mp-weixin/pages/home/home.js
  64. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxml
  65. 13 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxss
  66. 3 3
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  67. 83 19
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  68. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/login.wxml
  69. 15 1
      unpackage/dist/dev/mp-weixin/pages/my/my.js
  70. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/my.wxml
  71. 3 3
      unpackage/dist/dev/mp-weixin/pages/orderManage/orderManage.js
  72. 1 1
      unpackage/dist/dev/mp-weixin/pages/pay/pay.js
  73. 0 1
      unpackage/dist/dev/mp-weixin/pages/photo/photo.js
  74. 0 1
      unpackage/dist/dev/mp-weixin/pages/photo/photo.wxml
  75. 213 0
      unpackage/dist/dev/mp-weixin/pages/shop/shop.js
  76. 5 0
      unpackage/dist/dev/mp-weixin/pages/shop/shop.json
  77. 1 0
      unpackage/dist/dev/mp-weixin/pages/shop/shop.wxml
  78. 24 3
      unpackage/dist/dev/mp-weixin/pages/photo/photo.wxss
  79. 231 0
      unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.js
  80. 5 0
      unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.json
  81. 1 0
      unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.wxml
  82. 98 0
      unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.wxss
  83. 1 1
      unpackage/dist/dev/mp-weixin/project.private.config.json
  84. BIN
      unpackage/dist/dev/mp-weixin/static/images/noData.png
  85. BIN
      unpackage/dist/dev/mp-weixin/static/images/暂无数据.png
  86. BIN
      unpackage/dist/dev/mp-weixin/static/index/56.png.png
  87. BIN
      unpackage/dist/dev/mp-weixin/static/my/3afb9a9c31c333636a7699ffd226c06e.png.png
  88. BIN
      unpackage/dist/dev/mp-weixin/static/my/5f763f75ffac42005945b25bd5653909.png.png
  89. BIN
      unpackage/dist/dev/mp-weixin/static/my/c83174fd2392d77ff4fca7917b88d21a.png.png
  90. BIN
      unpackage/dist/dev/mp-weixin/static/my/shop.png
  91. BIN
      unpackage/dist/dev/mp-weixin/static/my/shopImg.png
  92. BIN
      unpackage/dist/dev/mp-weixin/static/my/shopImg2.png
  93. BIN
      unpackage/dist/dev/mp-weixin/static/my/shopImg3.png
  94. BIN
      unpackage/dist/dev/mp-weixin/static/my/画板 1.png
  95. 21 21
      unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js
  96. 10 10
      unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js
  97. 22 22
      unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js
  98. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js
  99. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js

+ 7 - 0
main.js

@@ -3,6 +3,13 @@ import App from './App'
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
+
+import {
+	myRequest
+} from "./util/api"
+
+Vue.prototype.$myRequest = myRequest
+
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({

+ 9 - 1
manifest.json

@@ -57,7 +57,15 @@
 			"postcss": true,
 			"minified": true
 		},
-		"usingComponents": true
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "获取用户位置已展示距离民宿的距离"
+			}
+		},
+		"requiredPrivateInfos": [
+			"getLocation"
+		]
 	},
 	"mp-alipay": {
 		"usingComponents": true

+ 31 - 19
pages.json

@@ -94,26 +94,38 @@
 				"navigationBarTitleText": "支付订单",
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/shouquan/shouquan",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/shop/shop",
+			"style": {
+				"navigationBarTitleText": "我是商户",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/binding/binding",
+			"style": {
+				"navigationBarTitleText": "账户绑定",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/shopInfo/shopInfo",
+			"style": {
+				"navigationBarTitleText": "我是商户",
+				"enablePullDownRefresh": false
+			}
 		}
-	    ,{
-            "path" : "pages/shouquan/shouquan",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/login/login",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"tabBar": {
 		"color": "#A6A6A6",
 		"selectedColor": "#096562",

+ 148 - 0
pages/binding/binding.vue

@@ -0,0 +1,148 @@
+<template>
+	<view class="container">
+		<!-- 图片区域 -->
+		<img src="../../static/my/shopImg2.png" />
+
+		<!-- 表格区域 -->
+		<view class="form">
+			<view class="form_title">{{ type === '2' ? '账户解绑' : '账户绑定' }}</view>
+			<view class="form_name">
+				账户
+				<view class="name_input">
+					<input type="text" placeholder="请输入商户超级管理员账号" />
+				</view>
+			</view>
+			<view class="form_password">
+				密码
+				<view class="password_input">
+					<input type="text" placeholder="请输入商户超级管理员密码" />
+				</view>
+			</view>
+			<view class="form_msg">{{ info }}</view>
+			<view class="form_btn" @click="handleClickBtn">{{ type === '2' ? '解绑' : '绑定' }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			type: '',
+			info: '绑定失败,请输入正确的账号或者密码'
+		}
+	},
+	onLoad(options) {
+		if (options.type) {
+			this.type = options.type
+			uni.setNavigationBarTitle({
+				title: '验证解绑'
+			})
+		}
+	},
+	methods: {
+		handleClickBtn() {
+			uni.navigateTo({
+				url: '/pages/shopInfo/shopInfo'
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	height: 100vh;
+	background-color: #fff;
+
+	img {
+		margin-top: 20rpx;
+		width: 347rpx;
+		height: 387rpx;
+	}
+
+	.form {
+		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);
+
+		.form_title {
+			line-height: 120rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.form_name {
+			display: flex;
+			align-items: center;
+			font-size: 28rpx;
+
+			.name_input {
+				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;
+
+				input {
+					width: 100%;
+				}
+			}
+		}
+
+		.form_password {
+			display: flex;
+			align-items: center;
+			margin-top: 46rpx;
+			font-size: 28rpx;
+
+			.password_input {
+				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;
+
+				input {
+					width: 100%;
+				}
+			}
+		}
+
+		.form_msg {
+			margin-top: 23rpx;
+			color: #d43030;
+			font-size: 24rpx;
+			text-align: center;
+		}
+
+		.form_btn {
+			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;
+		}
+	}
+}
+</style>

+ 157 - 58
pages/home/home.vue

@@ -14,29 +14,35 @@
 					<image class="img" src="../../static/index/search.png" mode="aspectFit"></image>
 				</view>
 				<input class="inp" type="text" v-model="keywords" placeholder="请输入关键字搜索" />
-				<view class="btnSearch" @click="searchHandler()">搜索</view>
+				<view class="btnSearch" @click="searchHandler">搜索</view>
 			</view>
 		</uv-row>
 
 		<!-- 名宿列表区域 -->
-		<view class="body">
+		<view class="body" v-if="hotelList.length">
 			<!-- 每一个名宿区域 -->
 			<view class="item" v-for="item in hotelList" :key="item.id" @click="goPageDetail(item)">
-				<image class="item-img" :src="item.imgUrl" mode="scaleToFill"></image>
+				<image class="item-img" :src="item.coverImg || '../../static/search/img.png'" mode="scaleToFill"></image>
 				<view class="descrition">
-					<text class="title">{{ item.hotelName }}</text>
-					<text class="type">{{ item.type }}</text>
-					<text class="distance">距您直线{{ item.distance }}公里</text>
+					<text class="title">{{ item.hname || '默认名字' }}</text>
+					<text class="type">{{ item.htype || '默认' }}</text>
+					<text class="distance" v-if="showdDistance">距您直线{{ item.distance || 0 }}公里</text>
 					<view class="detail">
 						<img class="img" src="../../static/index/hotel.png" />
 						<view class="price">
-							<text class="txt1">¥{{ item.price }}</text>
+							<text class="txt1">¥{{ item.min_price || 180 }}</text>
 							<text class="txt2">起</text>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+
+		<!-- 没有数据时展示的页面 -->
+		<view class="noData" v-else>
+			<img src="../../static/images/noData.png" />
+			暂无数据
+		</view>
 	</view>
 </template>
 
@@ -44,67 +50,145 @@
 export default {
 	data() {
 		return {
+			// 是否显示距离差
+			showdDistance: false,
 			// 搜索框绑定数据
 			keywords: '',
-			// 名宿列表数组
-			hotelList: [
-				{
-					id: 1,
-					imgUrl: '../../static/search/img.png',
-					hotelName: '双溪镇抱朴小院',
-					type: '舒适型',
-					distance: '7.2',
-					price: 180,
-					phone: '18320846714'
-				},
-				{
-					id: 2,
-					imgUrl: '../../static/index/banner.png',
-					hotelName: '幸福乡宿',
-					type: '舒适型',
-					distance: '3.2',
-					price: 190,
-					phone: '18320846714'
-				},
-				{
-					id: 3,
-					imgUrl: '../../static/index/banner.png',
-					hotelName: '健康乡宿',
-					type: '舒适型',
-					distance: '8.6',
-					price: 150,
-					phone: '18320846714'
-				},
-				{
-					id: 4,
-					imgUrl: '../../static/search/img.png',
-					hotelName: '开心乡宿',
-					type: '舒适型',
-					distance: '6.2',
-					price: 180,
-					phone: '18320846714'
-				},
-				{
-					id: 5,
-					imgUrl: '../../static/index/banner.png',
-					hotelName: '快乐乡宿',
-					type: '舒适型',
-					distance: '3.9',
-					price: 280,
-					phone: '18320846714'
-				}
-			],
+			// 民宿列表数组
+			hotelList: [],
 			// 地区数组
 			placeList: ['靖安县', '宝峰镇', '三爪乡'],
 			// 当前选择地区索引
-			placeIndex: 0
+			placeIndex: 0,
+			// 当前页
+			page: 1,
+			// 每页多少条
+			rows: 6,
+			// 总条数
+			total: null,
+			// 当前用户定位经度
+			myLng: 0,
+			// 当前用户定位纬度
+			myLat: 0,
+
+			// 签到点中心经度
+			centerLng: 0,
+			// 签到点中心纬度
+			centerLat: 0,
+			// 距离签到点的距离
+			distance: 0
 		}
 	},
-	onLoad() {},
+	onLoad() {
+		this.getLocation()
+		// this.getHotelList()
+	},
 	methods: {
+		// 获取用户当前位置
+		getLocation() {
+			uni.getSetting({
+				success: (res) => {
+					if (!res.authSetting['scope.userLocation']) {
+						uni.authorize({
+							scope: 'scope.userLocation',
+							success: (res) => {
+								// 授权成功
+								uni.getLocation({
+									type: 'gcj02',
+									success: (res) => {
+										this.myLat = res.latitude
+										this.myLng = res.longitude
+										this.showdDistance = true
+										this.getHotelList()
+										console.log('2当前位置的经度:' + res.longitude)
+										console.log('2当前位置的纬度:' + res.latitude)
+									}
+								})
+							},
+							fail: () => {
+								uni.showModal({
+									content: '获取定位权限失败将会影响使用部分功能,是否去设置打开?',
+									confirmText: '确认',
+									cancelText: '取消',
+									success: (res) => {
+										if (res.confirm) {
+											uni.openSetting({
+												success: (res) => {
+													console.log(res)
+													this.getLocation()
+												}
+											})
+										} else {
+											this.showdDistance = false
+											this.getHotelList()
+											uni.showToast({
+												title: '获取定位权限失败',
+												icon: 'none'
+											})
+										}
+									}
+								})
+							}
+						})
+					} else {
+						uni.getLocation({
+							type: 'gcj02',
+							success: (res) => {
+								this.myLat = res.latitude
+								this.myLng = res.longitude
+								this.showdDistance = true
+								this.getHotelList()
+								console.log('当前位置的经度:' + res.longitude)
+								console.log('当前位置的纬度:' + res.latitude)
+							}
+						})
+					}
+				}
+			})
+		},
+		// 获取民宿列表
+		async getHotelList() {
+			const res = await this.$myRequest({
+				url: '/mhotel/ahphomePage.action',
+				data: {
+					queryValue: this.keywords,
+					page: this.page,
+					rows: this.rows
+				}
+			})
+			// console.log(res)
+			this.hotelList = res.pageList
+			console.log(this.myLat)
+			console.log(this.myLng)
+			if (this.showdDistance && this.hotelList.length) {
+				this.hotelList.forEach((ele) => {
+					ele.distance = this.calculateDistance(28.86054, 115.361744)
+				})
+			}
+			console.log(this.hotelList)
+			this.total = res.total
+		},
+		// 计算两个点之间的距离
+		calculateDistance(lat, lng) {
+			let centerLat = lat
+			let centerLng = lng
+
+			let red1 = (this.myLat * Math.PI) / 180.0
+			let red2 = (centerLat * Math.PI) / 180.0
+			let a = red1 - red2
+			let b = (this.myLng * Math.PI) / 180.0 - (centerLng * Math.PI) / 180.0
+			let R = 6378137
+			let distance = R * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(red1) * Math.cos(red2) * Math.pow(Math.sin(b / 2), 2)))
+			let res = (distance / 1000).toFixed(2) * 1
+
+			return res
+		},
+
 		// 搜索按钮点击回调
 		searchHandler() {
 			console.log(this.keywords)
+			// this.page = 1
+			// this.getHotelList()
 		},
 		// 点击每一个名宿卡片回调
 		goPageDetail(item) {
@@ -114,6 +198,7 @@ export default {
 				url: `/pages/detail/detail?info=${info}`
 			})
 		},
+		// 选择地区时的回调
 		bindPickerChange(e) {
 			console.log('picker发送选择改变,携带值为', e.detail.value)
 			this.placeIndex = e.detail.value
@@ -127,9 +212,10 @@ export default {
 	display: flex;
 	flex-direction: column;
 	width: 750rpx;
+	min-height: 100vh;
 	padding: 0 30rpx;
 	box-sizing: border-box;
-	background-color: #ebeced;
+	background-color: #f7f7f7;
 
 	.address {
 		display: flex;
@@ -280,5 +366,18 @@ export default {
 			}
 		}
 	}
+
+	.noData {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		img {
+			margin-top: 150rpx;
+			width: 600rpx;
+			height: 600rpx;
+		}
+	}
 }
 </style>

+ 3 - 3
pages/index/index.vue

@@ -24,9 +24,9 @@ export default {
 		}
 	},
 	onLoad() {
-		uni.switchTab({
-			url: '/pages/home/home'
-		})
+		// uni.switchTab({
+		// 	url: '/pages/home/home'
+		// })
 	},
 	methods: {
 		handleGo() {

+ 45 - 2
pages/login/login.vue

@@ -2,14 +2,57 @@
 	<view class="container">
 		<img src="../../static/index/logo.png" />
 		<view class="msg">靖安乡村民宿</view>
-		<view class="btn">授权登录</view>
+		<view class="btn" @click="handleLogin">授权登录</view>
 	</view>
 </template>
 
 <script>
 export default {
 	data() {
-		return {}
+		return {
+			code: '',
+			encryptedData: '',
+			iv: ''
+		}
+	},
+	methods: {
+		// 授权登录按钮回调
+		handleLogin() {
+			// 获取code
+			uni.login({
+				//使用微信登录
+				provider: 'weixin',
+				success: (loginRes) => {
+					this.code = loginRes.code
+					// 获取用户加密信息
+					uni.getUserInfo({
+						provider: 'weixin',
+						lang: 'zh_CN',
+						success: (res) => {
+							console.log(res)
+							this.encryptedData = res.encryptedData
+							this.iv = res.iv
+							// 发送请求到后端解密用户信息
+							this.loginReq()
+						}
+					})
+				}
+			})
+		},
+
+		// 解密用户信息请求
+		async loginReq() {
+			const res = await this.$myRequest({
+				url: '/mhotel2/appcode.action',
+				method: 'post',
+				data: {
+					code: this.code,
+					encryptedData: this.encryptedData,
+					iv: this.iv
+				}
+			})
+			console.log(res)
+		}
 	}
 }
 </script>

+ 12 - 0
pages/my/my.vue

@@ -39,6 +39,12 @@
 				常用旅客
 			</view>
 
+			<!-- 我是商户区域 -->
+			<view class="body_item" @click="goPageShop">
+				<img class="img2" src="../../static/my/shop.png" />
+				我是商户
+			</view>
+
 			<!-- 设置区域 -->
 			<view class="body_item" @click="goPageSet">
 				<img class="img3" src="../../static/my/set.png" />
@@ -65,6 +71,12 @@ export default {
 		// console.log(121)
 	},
 	methods: {
+		// 我是商户点击按钮回调
+		goPageShop() {
+			uni.navigateTo({
+				url: '/pages/shop/shop'
+			})
+		},
 		// 去登录文字回调
 		goPageLogin() {
 			uni.navigateTo({

+ 61 - 0
pages/shop/shop.vue

@@ -0,0 +1,61 @@
+<template>
+	<view class="container">
+		<!-- 图片区域 -->
+		<img src="../../static/my/shopImg.png" />
+
+		<!-- 文字信息区域 -->
+		<view class="msg">您暂未绑定账户,请前往绑定</view>
+		<!-- 按钮区域 -->
+		<view class="btn" @click="handleBinding">前往绑定</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {}
+	},
+	methods: {
+		// 前往绑定按钮回调
+		handleBinding() {
+			uni.navigateTo({
+				url: '/pages/binding/binding'
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	height: 100vh;
+	background-color: #fff;
+
+	img {
+		width: 499rpx;
+		height: 499rpx;
+	}
+
+	.msg {
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.btn {
+		position: absolute;
+		bottom: 74rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 690rpx;
+		height: 96rpx;
+		color: #fff;
+		font-size: 32rpx;
+		border-radius: 64rpx;
+		background-color: #096562;
+	}
+}
+</style>

+ 130 - 0
pages/shopInfo/shopInfo.vue

@@ -0,0 +1,130 @@
+<template>
+	<view class="container">
+		<!-- 图片区域 -->
+		<img src="../../static/my/shopImg3.png" />
+
+		<!-- 账户信息区域 -->
+		<view class="box">
+			<view class="box_title">账户信息</view>
+			<view class="box_hotel">
+				<view class="totel_left">民宿名称</view>
+				<view class="">靖安民宿</view>
+			</view>
+			<view class="box_name">
+				<view class="name_left">用户名</view>
+				<view class="">dbhsbjh</view>
+			</view>
+			<view class="box_btn">
+				<view class="btn_item type" @click="handleUnbind">去解绑</view>
+				<view class="btn_item type2" @click="handleAgain">重新绑定</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {}
+	},
+	methods: {
+		// 去解绑按钮回调
+		handleUnbind() {
+			uni.navigateTo({
+				url: '/pages/binding/binding?type=2'
+			})
+		},
+		// 重新绑定按钮回调
+		handleAgain() {
+			uni.navigateTo({
+				url: '/pages/binding/binding'
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	height: 100vh;
+	background-color: #fff;
+
+	img {
+		margin-top: 31rpx;
+		width: 390rpx;
+		height: 390rpx;
+	}
+
+	.box {
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		margin-top: 20rpx;
+		width: 690rpx;
+		height: 548rpx;
+		border-radius: 23rpx;
+		box-shadow: 0px 0px 9px rgba(0, 0, 0, 0.25);
+
+		.box_title {
+			line-height: 113rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.box_hotel {
+			display: flex;
+			height: 75rpx;
+			font-size: 28rpx;
+			border-bottom: 1rpx solid #e6e6e6;
+
+			.totel_left {
+				margin-right: 34rpx;
+				color: #808080;
+			}
+		}
+
+		.box_name {
+			display: flex;
+			align-items: center;
+			height: 107rpx;
+			font-size: 28rpx;
+			border-bottom: 1rpx solid #e6e6e6;
+
+			.name_left {
+				margin-right: 62rpx;
+				color: #808080;
+			}
+		}
+
+		.box_btn {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 102rpx;
+			height: 96rpx;
+
+			.btn_item {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 300rpx;
+				height: 96rpx;
+				font-size: 32rpx;
+				border-radius: 64rpx;
+			}
+
+			.type {
+				color: #096562;
+				background-color: #fff;
+				border: 1rpx solid #096562;
+			}
+
+			.type2 {
+				color: #fff;
+				background-color: #096562;
+			}
+		}
+	}
+}
+</style>

BIN
static/images/noData.png


BIN
static/my/shop.png


BIN
static/my/shopImg.png


BIN
static/my/shopImg2.png


BIN
static/my/shopImg3.png


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/common/common.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailInfo/detailInfo.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderManage/orderManage.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/set/set.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/setMeal/setMeal.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shop.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopInfo/shopInfo.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shouquan/shouquan.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map


+ 12 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -16,7 +16,10 @@
     "pages/orderDetail/orderDetail",
     "pages/payStatus/payStatus",
     "pages/shouquan/shouquan",
-    "pages/login/login"
+    "pages/login/login",
+    "pages/shop/shop",
+    "pages/binding/binding",
+    "pages/shopInfo/shopInfo"
   ],
   "subPackages": [],
   "window": {
@@ -45,5 +48,13 @@
       }
     ]
   },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "获取用户位置已展示距离民宿的距离"
+    }
+  },
+  "requiredPrivateInfos": [
+    "getLocation"
+  ],
   "usingComponents": {}
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 0
unpackage/dist/dev/mp-weixin/common/main.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 284 - 148
unpackage/dist/dev/mp-weixin/common/vendor.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uvDatetimePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue */ 264))
+      return Promise.all(/*! import() | uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue */ 273))
     },
   }
 } catch (e) {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 237 - 0
unpackage/dist/dev/mp-weixin/pages/binding/binding.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/photo/photo.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "个人头像",
+  "navigationBarTitleText": "账户绑定",
   "enablePullDownRefresh": false,
   "usingComponents": {}
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml


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

@@ -0,0 +1,110 @@
+@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;
+  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;
+}
+

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/common/common.js

@@ -271,10 +271,10 @@ var components
 try {
   components = {
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 221))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 230))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 226))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 235))
     },
   }
 } catch (e) {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/detail/detail.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uvCalendar: function () {
-      return Promise.all(/*! import() | uni_modules/uv-calendar/components/uv-calendar/uv-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-calendar/components/uv-calendar/uv-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue */ 247))
+      return Promise.all(/*! import() | uni_modules/uv-calendar/components/uv-calendar/uv-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-calendar/components/uv-calendar/uv-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue */ 256))
     },
     uvPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uv-popup/components/uv-popup/uv-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-popup/components/uv-popup/uv-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-popup/components/uv-popup/uv-popup.vue */ 257))
+      return Promise.all(/*! import() | uni_modules/uv-popup/components/uv-popup/uv-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-popup/components/uv-popup/uv-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-popup/components/uv-popup/uv-popup.vue */ 266))
     },
   }
 } catch (e) {

+ 169 - 47
unpackage/dist/dev/mp-weixin/pages/home/home.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uvRow: function () {
-      return Promise.all(/*! import() | uni_modules/uv-row/components/uv-row/uv-row */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-row/components/uv-row/uv-row")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-row/components/uv-row/uv-row.vue */ 204))
+      return Promise.all(/*! import() | uni_modules/uv-row/components/uv-row/uv-row */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-row/components/uv-row/uv-row")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-row/components/uv-row/uv-row.vue */ 213))
     },
   }
 } catch (e) {
@@ -126,13 +126,26 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/index/bottom.png */ 46)
-  var m1 = __webpack_require__(/*! ../../static/index/hotel.png */ 47)
+  var g0 = _vm.hotelList.length
+  var l0 = g0
+    ? _vm.__map(_vm.hotelList, function (item, __i0__) {
+        var $orig = _vm.__get_orig(item)
+        var m1 = __webpack_require__(/*! ../../static/index/hotel.png */ 47)
+        return {
+          $orig: $orig,
+          m1: m1,
+        }
+      })
+    : null
+  var m2 = !g0 ? __webpack_require__(/*! ../../static/images/noData.png */ 401) : null
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
-        m1: m1,
+        g0: g0,
+        l0: l0,
+        m2: m2,
       },
     }
   )
@@ -171,10 +184,19 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 218));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 220));
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -220,61 +242,160 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
+      // 是否显示距离差
+      showdDistance: false,
       // 搜索框绑定数据
       keywords: '',
-      // 名宿列表数组
-      hotelList: [{
-        id: 1,
-        imgUrl: '../../static/search/img.png',
-        hotelName: '双溪镇抱朴小院',
-        type: '舒适型',
-        distance: '7.2',
-        price: 180,
-        phone: '18320846714'
-      }, {
-        id: 2,
-        imgUrl: '../../static/index/banner.png',
-        hotelName: '幸福乡宿',
-        type: '舒适型',
-        distance: '3.2',
-        price: 190,
-        phone: '18320846714'
-      }, {
-        id: 3,
-        imgUrl: '../../static/index/banner.png',
-        hotelName: '健康乡宿',
-        type: '舒适型',
-        distance: '8.6',
-        price: 150,
-        phone: '18320846714'
-      }, {
-        id: 4,
-        imgUrl: '../../static/search/img.png',
-        hotelName: '开心乡宿',
-        type: '舒适型',
-        distance: '6.2',
-        price: 180,
-        phone: '18320846714'
-      }, {
-        id: 5,
-        imgUrl: '../../static/index/banner.png',
-        hotelName: '快乐乡宿',
-        type: '舒适型',
-        distance: '3.9',
-        price: 280,
-        phone: '18320846714'
-      }],
+      // 民宿列表数组
+      hotelList: [],
       // 地区数组
       placeList: ['靖安县', '宝峰镇', '三爪乡'],
       // 当前选择地区索引
-      placeIndex: 0
+      placeIndex: 0,
+      // 当前页
+      page: 1,
+      // 每页多少条
+      rows: 6,
+      // 总条数
+      total: null,
+      // 当前用户定位经度
+      myLng: 0,
+      // 当前用户定位纬度
+      myLat: 0,
+      // 签到点中心经度
+      centerLng: 0,
+      // 签到点中心纬度
+      centerLat: 0,
+      // 距离签到点的距离
+      distance: 0
     };
   },
-  onLoad: function onLoad() {},
+  onLoad: function onLoad() {
+    this.getLocation();
+    // this.getHotelList()
+  },
+
   methods: {
+    // 获取用户当前位置
+    getLocation: function getLocation() {
+      var _this = this;
+      uni.getSetting({
+        success: function success(res) {
+          if (!res.authSetting['scope.userLocation']) {
+            uni.authorize({
+              scope: 'scope.userLocation',
+              success: function success(res) {
+                // 授权成功
+                uni.getLocation({
+                  type: 'gcj02',
+                  success: function success(res) {
+                    _this.myLat = res.latitude;
+                    _this.myLng = res.longitude;
+                    _this.showdDistance = true;
+                    _this.getHotelList();
+                    console.log('2当前位置的经度:' + res.longitude);
+                    console.log('2当前位置的纬度:' + res.latitude);
+                  }
+                });
+              },
+              fail: function fail() {
+                uni.showModal({
+                  content: '获取定位权限失败将会影响使用部分功能,是否去设置打开?',
+                  confirmText: '确认',
+                  cancelText: '取消',
+                  success: function success(res) {
+                    if (res.confirm) {
+                      uni.openSetting({
+                        success: function success(res) {
+                          console.log(res);
+                          _this.getLocation();
+                        }
+                      });
+                    } else {
+                      _this.showdDistance = false;
+                      _this.getHotelList();
+                      uni.showToast({
+                        title: '获取定位权限失败',
+                        icon: 'none'
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          } else {
+            uni.getLocation({
+              type: 'gcj02',
+              success: function success(res) {
+                _this.myLat = res.latitude;
+                _this.myLng = res.longitude;
+                _this.showdDistance = true;
+                _this.getHotelList();
+                console.log('当前位置的经度:' + res.longitude);
+                console.log('当前位置的纬度:' + res.latitude);
+              }
+            });
+          }
+        }
+      });
+    },
+    // 获取民宿列表
+    getHotelList: function getHotelList() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this2.$myRequest({
+                  url: '/mhotel/ahphomePage.action',
+                  data: {
+                    queryValue: _this2.keywords,
+                    page: _this2.page,
+                    rows: _this2.rows
+                  }
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res)
+                _this2.hotelList = res.pageList;
+                console.log(_this2.myLat);
+                console.log(_this2.myLng);
+                if (_this2.showdDistance && _this2.hotelList.length) {
+                  _this2.hotelList.forEach(function (ele) {
+                    ele.distance = _this2.calculateDistance(28.86054, 115.361744);
+                  });
+                }
+                console.log(_this2.hotelList);
+                _this2.total = res.total;
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 计算两个点之间的距离
+    calculateDistance: function calculateDistance(lat, lng) {
+      var centerLat = lat;
+      var centerLng = lng;
+      var red1 = this.myLat * Math.PI / 180.0;
+      var red2 = centerLat * Math.PI / 180.0;
+      var a = red1 - red2;
+      var b = this.myLng * Math.PI / 180.0 - centerLng * Math.PI / 180.0;
+      var R = 6378137;
+      var distance = R * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(red1) * Math.cos(red2) * Math.pow(Math.sin(b / 2), 2)));
+      var res = (distance / 1000).toFixed(2) * 1;
+      return res;
+    },
     // 搜索按钮点击回调
     searchHandler: function searchHandler() {
       console.log(this.keywords);
+      // this.page = 1
+      // this.getHotelList()
     },
     // 点击每一个名宿卡片回调
     goPageDetail: function goPageDetail(item) {
@@ -284,6 +405,7 @@ var _default = {
         url: "/pages/detail/detail?info=".concat(info)
       });
     },
+    // 选择地区时的回调
     bindPickerChange: function bindPickerChange(e) {
       console.log('picker发送选择改变,携带值为', e.detail.value);
       this.placeIndex = e.detail.value;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxml


+ 13 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxss

@@ -28,9 +28,10 @@
   display: flex;
   flex-direction: column;
   width: 750rpx;
+  min-height: 100vh;
   padding: 0 30rpx;
   box-sizing: border-box;
-  background-color: #ebeced;
+  background-color: #f7f7f7;
 }
 .container .address.data-v-92bb8f34 {
   display: flex;
@@ -160,4 +161,15 @@
   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;
+}
 

+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -166,9 +166,9 @@ var _default = {
     };
   },
   onLoad: function onLoad() {
-    uni.switchTab({
-      url: '/pages/home/home'
-    });
+    // uni.switchTab({
+    // 	url: '/pages/home/home'
+    // })
   },
   methods: {
     handleGo: function handleGo() {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 83 - 19
unpackage/dist/dev/mp-weixin/pages/login/login.js


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

@@ -1 +1 @@
-<view class="container data-v-b237504c"><image src="{{$root.m0}}" class="_img data-v-b237504c"></image><view class="msg data-v-b237504c">靖安乡村民宿</view><view class="btn data-v-b237504c">授权登录</view></view>
+<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>

+ 15 - 1
unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -108,7 +108,8 @@ var render = function () {
   var m3 = _vm.flag ? __webpack_require__(/*! ../../static/my/right2.png */ 59) : null
   var m4 = __webpack_require__(/*! ../../static/my/order.png */ 60)
   var m5 = __webpack_require__(/*! ../../static/my/people.png */ 61)
-  var m6 = __webpack_require__(/*! ../../static/my/set.png */ 62)
+  var m6 = __webpack_require__(/*! ../../static/my/shop.png */ 402)
+  var m7 = __webpack_require__(/*! ../../static/my/set.png */ 62)
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -120,6 +121,7 @@ var render = function () {
         m4: m4,
         m5: m5,
         m6: m6,
+        m7: m7,
       },
     }
   )
@@ -212,6 +214,12 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -228,6 +236,12 @@ var _default = {
     // console.log(121)
   },
   methods: {
+    // 我是商户点击按钮回调
+    goPageShop: function goPageShop() {
+      uni.navigateTo({
+        url: '/pages/shop/shop'
+      });
+    },
     // 去登录文字回调
     goPageLogin: function goPageLogin() {
       uni.navigateTo({

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/my.wxml


+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/orderManage/orderManage.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 221))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 230))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 226))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 235))
     },
     uvCountDown: function () {
-      return Promise.all(/*! import() | uni_modules/uv-count-down/components/uv-count-down/uv-count-down */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-count-down/components/uv-count-down/uv-count-down")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue */ 238))
+      return Promise.all(/*! import() | uni_modules/uv-count-down/components/uv-count-down/uv-count-down */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-count-down/components/uv-count-down/uv-count-down")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue */ 247))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/pay/pay.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uvCountDown: function () {
-      return Promise.all(/*! import() | uni_modules/uv-count-down/components/uv-count-down/uv-count-down */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-count-down/components/uv-count-down/uv-count-down")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue */ 238))
+      return Promise.all(/*! import() | uni_modules/uv-count-down/components/uv-count-down/uv-count-down */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-count-down/components/uv-count-down/uv-count-down")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.vue */ 247))
     },
   }
 } catch (e) {

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/photo/photo.js

@@ -1 +0,0 @@
-Component({})

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

@@ -1 +0,0 @@
-<view class="container data-v-72cf41ac"><image mode="aspectFit" src="{{$root.m0}}" class="_img data-v-72cf41ac"></image></view>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 213 - 0
unpackage/dist/dev/mp-weixin/pages/shop/shop.js


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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "我是商户",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="container data-v-71bf3ec6"><image src="{{$root.m0}}" class="_img data-v-71bf3ec6"></image><view class="msg data-v-71bf3ec6">您暂未绑定账户,请前往绑定</view><view data-event-opts="{{[['tap',[['handleBinding',['$event']]]]]}}" class="btn data-v-71bf3ec6" bindtap="__e">前往绑定</view></view>

+ 24 - 3
unpackage/dist/dev/mp-weixin/pages/photo/photo.wxss

@@ -24,11 +24,32 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.container.data-v-72cf41ac {
+.container.data-v-71bf3ec6 {
   display: flex;
-  justify-content: center;
+  flex-direction: column;
   align-items: center;
   height: 100vh;
-  background-color: #000;
+  background-color: #fff;
+}
+.container ._img.data-v-71bf3ec6 {
+  width: 499rpx;
+  height: 499rpx;
+}
+.container .msg.data-v-71bf3ec6 {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+.container .btn.data-v-71bf3ec6 {
+  position: absolute;
+  bottom: 74rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 690rpx;
+  height: 96rpx;
+  color: #fff;
+  font-size: 32rpx;
+  border-radius: 64rpx;
+  background-color: #096562;
 }
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 231 - 0
unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.js


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

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "我是商户",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.wxml


+ 98 - 0
unpackage/dist/dev/mp-weixin/pages/shopInfo/shopInfo.wxss

@@ -0,0 +1,98 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.container.data-v-aa1199f4 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  height: 100vh;
+  background-color: #fff;
+}
+.container ._img.data-v-aa1199f4 {
+  margin-top: 31rpx;
+  width: 390rpx;
+  height: 390rpx;
+}
+.container .box.data-v-aa1199f4 {
+  box-sizing: border-box;
+  padding: 0 30rpx;
+  margin-top: 20rpx;
+  width: 690rpx;
+  height: 548rpx;
+  border-radius: 23rpx;
+  box-shadow: 0px 0px 9px rgba(0, 0, 0, 0.25);
+}
+.container .box .box_title.data-v-aa1199f4 {
+  line-height: 113rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+}
+.container .box .box_hotel.data-v-aa1199f4 {
+  display: flex;
+  height: 75rpx;
+  font-size: 28rpx;
+  border-bottom: 1rpx solid #e6e6e6;
+}
+.container .box .box_hotel .totel_left.data-v-aa1199f4 {
+  margin-right: 34rpx;
+  color: #808080;
+}
+.container .box .box_name.data-v-aa1199f4 {
+  display: flex;
+  align-items: center;
+  height: 107rpx;
+  font-size: 28rpx;
+  border-bottom: 1rpx solid #e6e6e6;
+}
+.container .box .box_name .name_left.data-v-aa1199f4 {
+  margin-right: 62rpx;
+  color: #808080;
+}
+.container .box .box_btn.data-v-aa1199f4 {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 102rpx;
+  height: 96rpx;
+}
+.container .box .box_btn .btn_item.data-v-aa1199f4 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 300rpx;
+  height: 96rpx;
+  font-size: 32rpx;
+  border-radius: 64rpx;
+}
+.container .box .box_btn .type.data-v-aa1199f4 {
+  color: #096562;
+  background-color: #fff;
+  border: 1rpx solid #096562;
+}
+.container .box .box_btn .type2.data-v-aa1199f4 {
+  color: #fff;
+  background-color: #096562;
+}
+

+ 1 - 1
unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,7 +9,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/set/set",
+          "pathName": "pages/shopInfo/shopInfo",
           "query": "",
           "launchMode": "default",
           "scene": null

BIN
unpackage/dist/dev/mp-weixin/static/images/noData.png


BIN
unpackage/dist/dev/mp-weixin/static/images/暂无数据.png


BIN
unpackage/dist/dev/mp-weixin/static/index/56.png.png


BIN
unpackage/dist/dev/mp-weixin/static/my/3afb9a9c31c333636a7699ffd226c06e.png.png


BIN
unpackage/dist/dev/mp-weixin/static/my/5f763f75ffac42005945b25bd5653909.png.png


BIN
unpackage/dist/dev/mp-weixin/static/my/c83174fd2392d77ff4fca7917b88d21a.png.png


BIN
unpackage/dist/dev/mp-weixin/static/my/shop.png


BIN
unpackage/dist/dev/mp-weixin/static/my/shopImg.png


BIN
unpackage/dist/dev/mp-weixin/static/my/shopImg2.png


BIN
unpackage/dist/dev/mp-weixin/static/my/shopImg3.png


BIN
unpackage/dist/dev/mp-weixin/static/my/画板 1.png


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 21 - 21
unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 10 - 10
unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 22 - 22
unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio