Browse Source

no message

xiaoxin 2 years ago
parent
commit
e7a04fc2b6
99 changed files with 2916 additions and 1771 deletions
  1. 19 7
      pages.json
  2. 33 19
      pages/detail/detail.vue
  3. 95 13
      pages/index/index.vue
  4. 52 0
      pages/login/login.vue
  5. 59 13
      pages/my/my.vue
  6. 0 28
      pages/photo/photo.vue
  7. 63 6
      pages/set/set.vue
  8. 202 0
      pages/shouquan/shouquan.vue
  9. BIN
      static/index/logo.png
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/common/common.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailInfo/detailInfo.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  19. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderManage/orderManage.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/photo/photo.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/set/set.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/setMeal/setMeal.js.map
  29. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shouquan/shouquan.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map
  45. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  46. 538 498
      unpackage/dist/dev/mp-weixin/common/vendor.js
  47. 119 119
      unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.js
  48. 23 23
      unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js
  49. 169 169
      unpackage/dist/dev/mp-weixin/pages/common/common.js
  50. 70 56
      unpackage/dist/dev/mp-weixin/pages/detail/detail.js
  51. 21 21
      unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.js
  52. 45 45
      unpackage/dist/dev/mp-weixin/pages/home/home.js
  53. 107 26
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  54. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  55. 200 0
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  56. 5 0
      unpackage/dist/dev/mp-weixin/pages/login/login.json
  57. 1 0
      unpackage/dist/dev/mp-weixin/pages/login/login.wxml
  58. 57 0
      unpackage/dist/dev/mp-weixin/pages/login/login.wxss
  59. 71 33
      unpackage/dist/dev/mp-weixin/pages/my/my.js
  60. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/my.wxml
  61. 7 0
      unpackage/dist/dev/mp-weixin/pages/my/my.wxss
  62. 21 21
      unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js
  63. 21 21
      unpackage/dist/dev/mp-weixin/pages/orderManage/orderManage.js
  64. 18 18
      unpackage/dist/dev/mp-weixin/pages/pay/pay.js
  65. 16 16
      unpackage/dist/dev/mp-weixin/pages/payStatus/payStatus.js
  66. 1 198
      unpackage/dist/dev/mp-weixin/pages/photo/photo.js
  67. 19 19
      unpackage/dist/dev/mp-weixin/pages/search/search.js
  68. 82 23
      unpackage/dist/dev/mp-weixin/pages/set/set.js
  69. 1 1
      unpackage/dist/dev/mp-weixin/pages/set/set.wxml
  70. 1 0
      unpackage/dist/dev/mp-weixin/pages/set/set.wxss
  71. 18 18
      unpackage/dist/dev/mp-weixin/pages/setMeal/setMeal.js
  72. 317 0
      unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.js
  73. 5 0
      unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.json
  74. 1 0
      unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.wxml
  75. 75 0
      unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.wxss
  76. 1 1
      unpackage/dist/dev/mp-weixin/project.config.json
  77. 2 1
      unpackage/dist/dev/mp-weixin/project.private.config.json
  78. BIN
      unpackage/dist/dev/mp-weixin/static/index/56.png.png
  79. BIN
      unpackage/dist/dev/mp-weixin/static/index/logo.png
  80. BIN
      unpackage/dist/dev/mp-weixin/static/index/画板 1 (1).png
  81. BIN
      unpackage/dist/dev/mp-weixin/static/index/画板 1.png
  82. 21 21
      unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js
  83. 10 10
      unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js
  84. 22 22
      unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js
  85. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js
  86. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js
  87. 23 23
      unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js
  88. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js
  89. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.js
  90. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js
  91. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js
  92. 18 18
      unpackage/dist/dev/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js
  93. 22 22
      unpackage/dist/dev/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js
  94. 17 17
      unpackage/dist/dev/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js
  95. 21 21
      unpackage/dist/dev/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js
  96. 19 19
      unpackage/dist/dev/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js
  97. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js
  98. 17 17
      unpackage/dist/dev/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js
  99. 13 13
      unpackage/dist/dev/mp-weixin/uni_modules/uv-transition/components/uv-transition/uv-transition.js

+ 19 - 7
pages.json

@@ -94,14 +94,26 @@
 				"navigationBarTitleText": "支付订单",
 				"navigationBarTitleText": "支付订单",
 				"enablePullDownRefresh": false
 				"enablePullDownRefresh": false
 			}
 			}
-		}, {
-			"path": "pages/photo/photo",
-			"style": {
-				"navigationBarTitleText": "个人头像",
-				"enablePullDownRefresh": false
-			}
 		}
 		}
-	],
+	    ,{
+            "path" : "pages/shouquan/shouquan",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/login/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"tabBar": {
 	"tabBar": {
 		"color": "#A6A6A6",
 		"color": "#A6A6A6",
 		"selectedColor": "#096562",
 		"selectedColor": "#096562",

+ 33 - 19
pages/detail/detail.vue

@@ -280,29 +280,43 @@ export default {
 				url: '/pages/detailInfo/detailInfo'
 				url: '/pages/detailInfo/detailInfo'
 			})
 			})
 		},
 		},
-		// 点击 订 按钮回调
+		// 点击 订 预定 按钮回调
 		goPageAffOrder(item) {
 		goPageAffOrder(item) {
-			if (item.active) {
-				this.$refs.popup.close()
-				this.showPage = false
-				let info = JSON.stringify({
-					nightNum: this.nightNum,
-					startTimeDay: this.startTimeDay,
-					startTimeMonth: this.startTimeMonth,
-					startTimeWeek: this.startTimeWeek,
-					endTimeDay: this.endTimeDay,
-					endTimeMonth: this.endTimeMonth,
-					endTimeWeek: this.endTimeWeek,
-					price: item.price
-				})
-				uni.navigateTo({
-					url: `/pages/affirmOrder/affirmOrder?info=${info}`
-				})
+			let flag = uni.getStorageSync('login')
+			if (flag) {
+				if (item.active) {
+					this.$refs.popup.close()
+					this.showPage = false
+					let info = JSON.stringify({
+						nightNum: this.nightNum,
+						startTimeDay: this.startTimeDay,
+						startTimeMonth: this.startTimeMonth,
+						startTimeWeek: this.startTimeWeek,
+						endTimeDay: this.endTimeDay,
+						endTimeMonth: this.endTimeMonth,
+						endTimeWeek: this.endTimeWeek,
+						price: item.price
+					})
+					uni.navigateTo({
+						url: `/pages/affirmOrder/affirmOrder?info=${info}`
+					})
+				} else {
+					uni.showToast({
+						title: '该房间已售罄',
+						icon: 'none'
+					})
+				}
 			} else {
 			} else {
 				uni.showToast({
 				uni.showToast({
-					title: '该房间已售罄',
-					icon: 'none'
+					title: '请先登录',
+					icon: 'none',
+					mask: true
 				})
 				})
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}, 1500)
 			}
 			}
 		},
 		},
 		// 点击日期区域回调
 		// 点击日期区域回调

+ 95 - 13
pages/index/index.vue

@@ -1,32 +1,114 @@
 <template>
 <template>
-	<view class="container"></view>
+	<view class="container">
+		<button @click="handleLogin">登录获取code</button>
+		<button @click="handleToken">获取access_token</button>
+		<button @click="handleUserInfo">获取用户信息</button>
+		<button @click="handleClick">订阅</button>
+		<button @click="handleClick2">设置</button>
+		<button @click="handleGo">跳转</button>
+	</view>
 </template>
 </template>
 
 
 <script>
 <script>
 export default {
 export default {
 	data() {
 	data() {
-		return {}
+		return {
+			// 订单进度模版id
+			templateOrder: 'ERU1ZY9IqwNkDxWyFJvo5VSE7ua-wey3SqhZgjqLDtU',
+			// 小程序Id
+			appid: 'wx2fc3f45732fae5d3',
+			// 小程序密钥
+			screct: '7eee4a49a4470a77f9222995e8511547',
+			access_token: '',
+			code: ''
+		}
 	},
 	},
 	onLoad() {
 	onLoad() {
-		// this.shouquan()
 		uni.switchTab({
 		uni.switchTab({
 			url: '/pages/home/home'
 			url: '/pages/home/home'
 		})
 		})
 	},
 	},
 	methods: {
 	methods: {
-		//授权
-		shouquan() {
+		handleGo() {
+			uni.navigateTo({
+				url: '/pages/shouquan/shouquan'
+			})
+		},
+		handleLogin() {
 			uni.login({
 			uni.login({
 				provider: 'weixin', //使用微信登录
 				provider: 'weixin', //使用微信登录
-				success: function (loginRes) {
+				success: (loginRes) => {
 					console.log(loginRes)
 					console.log(loginRes)
-					console.log(loginRes.authResult)
-					uni.getUserProfile({
-						desc: '用于完善用户资料',
-						success: function (res) {
-							console.log('res', res)
+					this.code = loginRes.code
+				}
+			})
+		},
+		handleToken() {
+			uni.request({
+				url: 'https://api.weixin.qq.com/sns/jscode2session',
+				data: {
+					grant_type: 'authorization_code',
+					appid: this.appid,
+					appsecret: this.screct,
+					js_code: this.code
+				},
+				success: (res) => {
+					console.log(res)
+					if (res.statusCode === 200) {
+						// this.access_token = res.data.
+					}
+				}
+			})
+		},
+
+		handleUserInfo() {
+			uni.getUserProfile({
+				desc: '用于完善用户资料',
+				lang: 'zh_CN',
+				success: (res) => {
+					console.log('res', res)
+				}
+			})
+		},
+		// 订阅方法
+		handleClick() {
+			if (uni.requestSubscribeMessage) {
+				uni.requestSubscribeMessage({
+					tmplIds: [this.templateOrder],
+					success: (res) => {
+						console.log(1)
+						console.log(res)
+						for (let key in res) {
+							console.log(key)
+							if (res[key] === 'accept') {
+								uni.showToast({
+									title: '订阅成功',
+									icon: 'success'
+								})
+							} else if (res[key] === 'reject') {
+							}
 						}
 						}
-					})
+					},
+					fail: (res) => {
+						console.log(2)
+						console.log(res)
+					}
+				})
+			} else {
+				uni.showToast({
+					title: '请更新您的微信版本来获取订阅消息功能',
+					icon: 'none'
+				})
+			}
+		},
+		// 设置方法
+		handleClick2() {
+			// 获取用户订阅消息设置
+			uni.getSetting({
+				withSubscriptions: true,
+				success: (res) => {
+					console.log(res)
+					console.log(res.subscriptionsSetting)
 				}
 				}
 			})
 			})
 		}
 		}
@@ -39,4 +121,4 @@ export default {
 	height: 100vh;
 	height: 100vh;
 	background-color: #fff;
 	background-color: #fff;
 }
 }
-</style>
+</style>

+ 52 - 0
pages/login/login.vue

@@ -0,0 +1,52 @@
+<template>
+	<view class="container">
+		<img src="../../static/index/logo.png" />
+		<view class="msg">靖安乡村民宿</view>
+		<view class="btn">授权登录</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	height: 100vh;
+	background-color: #fff;
+
+	img {
+		margin-top: 116rpx;
+		width: 138rpx;
+		height: 138rpx;
+	}
+
+	.msg {
+		margin-top: 32rpx;
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.btn {
+		position: absolute;
+		// left: 20rpx;
+		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;
+	}
+}
+</style>

+ 59 - 13
pages/my/my.vue

@@ -9,18 +9,20 @@
 			<img class="img" src="../../static/my/portrait.png" />
 			<img class="img" src="../../static/my/portrait.png" />
 
 
 			<!-- 姓名区域 -->
 			<!-- 姓名区域 -->
-			<view class="name">张三</view>
+			<view class="name" v-if="flag">张三</view>
 			<!-- 用户id区域 -->
 			<!-- 用户id区域 -->
-			<view class="number">ID:1925689</view>
+			<view class="number" v-if="flag">ID:1925689</view>
 			<!-- 是否实名认证区域 -->
 			<!-- 是否实名认证区域 -->
 			<view class="real" v-if="real">
 			<view class="real" v-if="real">
 				<img src="../../static/my/true.png" />
 				<img src="../../static/my/true.png" />
 				已实名认证
 				已实名认证
 			</view>
 			</view>
-			<view class="real2" v-else @click="goPageCommon">
+			<view class="real2" v-if="flag" v-else @click="goPageCommon">
 				去认证
 				去认证
 				<img src="../../static/my/right2.png" />
 				<img src="../../static/my/right2.png" />
 			</view>
 			</view>
+
+			<view class="login" v-if="!flag" @click="goPageLogin">去登录</view>
 		</view>
 		</view>
 
 
 		<!-- 内容区域 -->
 		<!-- 内容区域 -->
@@ -51,27 +53,63 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			// 是否实名认证
 			// 是否实名认证
-			real: false
+			real: false,
+			// 是否登录标识
+			flag: false
 		}
 		}
 	},
 	},
+	onLoad() {
+		this.flag = false
+	},
+	onShow() {
+		// console.log(121)
+	},
 	methods: {
 	methods: {
-		// 点击订单管理按钮回调
-		goPageOrder() {
+		// 去登录文字回调
+		goPageLogin() {
 			uni.navigateTo({
 			uni.navigateTo({
-				url: '/pages/orderManage/orderManage'
+				url: '/pages/login/login'
 			})
 			})
 		},
 		},
+		// 点击订单管理按钮回调
+		goPageOrder() {
+			if (this.isLogin()) {
+				uni.navigateTo({
+					url: '/pages/orderManage/orderManage'
+				})
+			}
+		},
 		// 点击常用旅客按钮回调
 		// 点击常用旅客按钮回调
 		goPageCommon() {
 		goPageCommon() {
-			uni.navigateTo({
-				url: '/pages/common/common'
-			})
+			if (this.isLogin()) {
+				uni.navigateTo({
+					url: '/pages/common/common'
+				})
+			}
 		},
 		},
 		// 点击设置按钮回调
 		// 点击设置按钮回调
 		goPageSet() {
 		goPageSet() {
-			uni.navigateTo({
-				url: '/pages/set/set'
-			})
+			if (this.isLogin()) {
+				uni.navigateTo({
+					url: '/pages/set/set'
+				})
+			}
+		},
+		isLogin() {
+			if (this.flag) {
+				return true
+			} else {
+				uni.showToast({
+					title: '请先登录',
+					icon: 'none',
+					mask: true
+				})
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}, 1500)
+			}
 		}
 		}
 	}
 	}
 }
 }
@@ -167,6 +205,14 @@ export default {
 				height: 24rpx;
 				height: 24rpx;
 			}
 			}
 		}
 		}
+
+		.login {
+			position: absolute;
+			top: 235rpx;
+			left: 202rpx;
+			font-size: 40rpx;
+			font-weight: bold;
+		}
 	}
 	}
 
 
 	.body {
 	.body {

+ 0 - 28
pages/photo/photo.vue

@@ -1,28 +0,0 @@
-<template>
-	<view class="container">
-		<img mode="aspectFit" src="../../static/my/portrait.png" />
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.container {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	height: 100vh;
-	background-color: #000;
-
-	// .img {
-	// 	width: 100%;
-	// 	height: auto;
-	// }
-}
-</style>

+ 63 - 6
pages/set/set.vue

@@ -5,17 +5,17 @@
 			<view class="body_box">
 			<view class="body_box">
 				个人头像
 				个人头像
 				<view class="box_right" @click="handleClickPhoto">
 				<view class="box_right" @click="handleClickPhoto">
-					<img class="img" src="../../static/my/portrait.png" />
+					<img mode="aspectFill" class="img" :src="imgUrl || '../../static/my/portrait.png'" />
 
 
 					<img class="img2" src="../../static/my/right.png" />
 					<img class="img2" src="../../static/my/right.png" />
 				</view>
 				</view>
 			</view>
 			</view>
 
 
 			<!-- 账号名区域 -->
 			<!-- 账号名区域 -->
-			<view class="body_box">
+			<view class="body_box" @click="handleClickName">
 				账号名
 				账号名
 				<view class="box_right">
 				<view class="box_right">
-					<view class="msg">张三</view>
+					<view class="msg">{{ name }}</view>
 					<img class="img2" src="../../static/my/right.png" />
 					<img class="img2" src="../../static/my/right.png" />
 				</view>
 				</view>
 			</view>
 			</view>
@@ -34,12 +34,68 @@
 <script>
 <script>
 export default {
 export default {
 	data() {
 	data() {
-		return {}
+		return {
+			// 头像
+			imgUrl: '',
+			// 账号名
+			name: '张三'
+		}
 	},
 	},
 	methods: {
 	methods: {
+		// 点击头像图片回调
 		handleClickPhoto() {
 		handleClickPhoto() {
-			uni.navigateTo({
-				url: '/pages/photo/photo'
+			uni.showActionSheet({
+				itemList: ['更换头像'],
+				success: (res) => {
+					if (res.tapIndex === 0) {
+						this.changeImg()
+					}
+				}
+			})
+		},
+		// 更换头像回调
+		changeImg() {
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				sourceType: ['album'], //从相册选择
+				success: (res) => {
+					// console.log(res.tempFilePaths)
+					this.imgUrl = res.tempFilePaths[0]
+				}
+			})
+		},
+		// 点击账号名回调
+		handleClickName() {
+			uni.showActionSheet({
+				itemList: ['修改账号名'],
+				success: (res) => {
+					if (res.tapIndex === 0) {
+						this.changeName()
+					}
+				}
+			})
+		},
+		// 修改账号名回调
+		changeName() {
+			uni.showModal({
+				title: '请输入账号名',
+				editable: true,
+				success: (res) => {
+					if (res.confirm) {
+						if (!res.content) {
+							uni.showToast({
+								title: '账号名不能为空',
+								icon: 'none'
+							})
+							setTimeout(() => {
+								this.changeName()
+							}, 1500)
+						} else {
+							this.name = res.content
+						}
+					}
+				}
 			})
 			})
 		}
 		}
 	}
 	}
@@ -77,6 +133,7 @@ export default {
 				.img {
 				.img {
 					width: 64rpx;
 					width: 64rpx;
 					height: 64rpx;
 					height: 64rpx;
+					border-radius: 50%;
 				}
 				}
 
 
 				.img2 {
 				.img2 {

+ 202 - 0
pages/shouquan/shouquan.vue

@@ -0,0 +1,202 @@
+<template>
+	<view class="containar">
+		<view class="avatarUrl" style="text-align: center">
+			<!-- <image src="../../static/index/shouquan.png" style="width: 180rpx;height: 180rpx;" class="refreshIcon"></image> -->
+			<view style="color: rgba(30, 125, 251, 1); font-weight: 500">新糖宝</view>
+		</view>
+
+		<view class="btn" style="margin-top: 60px; height: 600rpx">
+			<button v-if="qiehuan" @click="denglu" style="background-color: rgba(30, 125, 251, 0.8); color: #fff; width: 650rpx">微信登录</button>
+			<button v-else open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" style="background-color: rgba(30, 125, 251, 0.8); width: 650rpx; color: #fff">
+				微信登录
+			</button>
+
+			<checkbox-group @change="checkboxChange" style="margin-top: 30rpx; margin-left: 50rpx">
+				<checkbox color="rgba(30, 125, 251, 1)" style="transform: scale(0.6)" value="agree" :checked="check" shape="circle" />
+				<text style="color: rgba(166, 166, 166, 1); font-size: 26rpx" bindtap="toprotocol">我已阅读并同意</text>
+				<text style="color: rgba(30, 125, 251, 1); font-size: 26rpx" @click="toptong">《用户协议》</text>
+				、
+				<text style="color: rgba(30, 125, 251, 1); font-size: 26rpx" @click="toptong">《隐私政策》</text>
+			</checkbox-group>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			access_token: '',
+			code: '',
+			nickName: '',
+			encryptedData: '',
+			iv: '',
+			avatarUrl: '',
+			agree: '', //默认勾选状态
+			check: false,
+			qiehuan: true
+		}
+	},
+	onLoad() {
+		// this.shouquan()
+		this.access_token = wx.getStorageSync('access_token')
+
+		uni.login({
+			provider: 'weixin',
+			success: (res) => {
+				// 获取用户信息
+				uni.getUserInfo({
+					provider: 'weixin',
+					success: function (res) {
+						console.log('res', res)
+					}
+				})
+				console.log('res-login', res)
+				//请求登录接口
+				if (res.errMsg == 'login:ok') {
+				}
+			}
+		})
+	},
+	methods: {
+		//勾选协议
+		checkboxChange(e) {
+			console.log(e.detail.value)
+			this.agree = e.detail.value[0]
+			this.qiehuan = this.agree == undefined || this.agree == ''
+		},
+		denglu() {
+			wx.showToast({
+				title: '请先勾选用户协议',
+				icon: 'none',
+				duration: 2000
+			})
+		},
+		//用户协议跳转
+		toptong() {
+			uni.navigateTo({
+				url: '../../packageThree/pages/yonghuxieyi/yonghuxieyi'
+			})
+		},
+		getPhoneNumber(e) {
+			if (this.qiehuan) {
+				wx.showToast({
+					title: '请先勾选用户协议',
+					icon: 'none',
+					duration: 2000
+				})
+			} else {
+				const that = this
+				console.log(e, '信息') //在这里的e里会有code等信息
+				let numberCode = e.detail.code //取出code
+				that.numberCode = numberCode
+				console.log(numberCode)
+
+				this.$axios
+					.get('/mp/user/userAuthorizedLogin', {
+						params: {
+							code: wx.getStorageSync('code'),
+							iv: wx.getStorageSync('iv'),
+							encryptedData: wx.getStorageSync('encryptedData'),
+							numberCode: that.numberCode
+						},
+						headers: {
+							Authorization: 'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
+							'Blade-Auth': wx.getStorageSync('access_token'),
+							'Tenant-Id': '000000'
+						}
+					})
+					.then((response) => {
+						let res = response
+						console.log(res)
+						if (res.success) {
+							var userId = res.data.userId
+							wx.setStorageSync('userId', userId)
+							var huanzheNichen = res.data.name
+							wx.setStorageSync('huanzheNichen', huanzheNichen)
+							var createTime = res.data.createTime
+							wx.setStorageSync('createTime', createTime)
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+						} else {
+							console.log('患者端授权登录失败')
+						}
+					})
+			}
+		},
+		//授权
+		shouquan() {
+			this.$axios
+				.post(
+					`/blade-auth/oauth/token?password=ceb8447cc4ab78d2ec34cd9f11e4bed2&tenantId=000000&username=test`,
+					{},
+					{
+						headers: {
+							Authorization: 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
+						}
+					}
+				)
+				.then((res) => {
+					console.log(res)
+					var access_token = res.access_token
+					this.access_token = res.access_token
+					// localStorage.setItem('access_token',access_token)网页
+					wx.setStorageSync('access_token', access_token) //小程序
+				})
+		}
+	}
+}
+</script>
+<style lang="scss">
+.containar {
+	background: #fff;
+	.avatarUrl {
+		padding: 80rpx 0 40rpx;
+		background: #fff;
+		button {
+			background: #fff;
+			line-height: 80rpx;
+			height: auto;
+			width: auto;
+			padding: 20rpx 30rpx;
+			margin: 0;
+			// display: flex;
+			justify-content: center;
+			align-items: center;
+			.refreshIcon {
+				// width: 160rpx;
+				// height: 160rpx;
+				border-radius: 50%;
+			}
+			.jt {
+				width: 14rpx;
+				height: 28rpx;
+			}
+		}
+	}
+	.nickname {
+		background: #fff;
+		padding: 20rpx 30rpx 80rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.weui-input {
+			padding-left: 60rpx;
+		}
+	}
+	.btn {
+		width: 100%;
+		.btn-sub {
+			width: 670rpx;
+			margin: 80rpx auto 0;
+			height: 90rpx;
+			background: rgba(30, 125, 251, 1);
+			border-radius: 45rpx;
+			line-height: 90rpx;
+			text-align: center;
+			font-size: 36rpx;
+			color: #fff;
+		}
+	}
+}
+</style>

BIN
static/index/logo.png


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/addOrEdit/addOrEdit.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/affirmOrder/affirmOrder.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/common/common.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detail/detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailInfo/detailInfo.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderDetail/orderDetail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderManage/orderManage.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/pay.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/payStatus/payStatus.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/photo/photo.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/set/set.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/setMeal/setMeal.js.map


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shouquan/shouquan.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js.map


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

@@ -15,7 +15,8 @@
     "pages/affirmOrder/affirmOrder",
     "pages/affirmOrder/affirmOrder",
     "pages/orderDetail/orderDetail",
     "pages/orderDetail/orderDetail",
     "pages/payStatus/payStatus",
     "pages/payStatus/payStatus",
-    "pages/photo/photo"
+    "pages/shouquan/shouquan",
+    "pages/login/login"
   ],
   ],
   "subPackages": [],
   "subPackages": [],
   "window": {
   "window": {

File diff suppressed because it is too large
+ 538 - 498
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 119 - 119
unpackage/dist/dev/mp-weixin/pages/addOrEdit/addOrEdit.js


File diff suppressed because it is too large
+ 23 - 23
unpackage/dist/dev/mp-weixin/pages/affirmOrder/affirmOrder.js


File diff suppressed because it is too large
+ 169 - 169
unpackage/dist/dev/mp-weixin/pages/common/common.js


File diff suppressed because it is too large
+ 70 - 56
unpackage/dist/dev/mp-weixin/pages/detail/detail.js


File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/pages/detailInfo/detailInfo.js


File diff suppressed because it is too large
+ 45 - 45
unpackage/dist/dev/mp-weixin/pages/home/home.js


File diff suppressed because it is too large
+ 107 - 26
unpackage/dist/dev/mp-weixin/pages/index/index.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


File diff suppressed because it is too large
+ 200 - 0
unpackage/dist/dev/mp-weixin/pages/login/login.js


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

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

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

@@ -0,0 +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>

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

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

File diff suppressed because it is too large
+ 71 - 33
unpackage/dist/dev/mp-weixin/pages/my/my.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/my.wxml


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

@@ -105,6 +105,13 @@
   width: 24rpx;
   width: 24rpx;
   height: 24rpx;
   height: 24rpx;
 }
 }
+.container .header .login.data-v-0be17cc6 {
+  position: absolute;
+  top: 235rpx;
+  left: 202rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+}
 .container .body.data-v-0be17cc6 {
 .container .body.data-v-0be17cc6 {
   position: absolute;
   position: absolute;
   top: 360rpx;
   top: 360rpx;

File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js


File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/pages/orderManage/orderManage.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/pay/pay.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/payStatus/payStatus.js


File diff suppressed because it is too large
+ 1 - 198
unpackage/dist/dev/mp-weixin/pages/photo/photo.js


File diff suppressed because it is too large
+ 19 - 19
unpackage/dist/dev/mp-weixin/pages/search/search.js


File diff suppressed because it is too large
+ 82 - 23
unpackage/dist/dev/mp-weixin/pages/set/set.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/set/set.wxml


+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/set/set.wxss

@@ -54,6 +54,7 @@
 .container .body .body_box .box_right .img.data-v-21926b68 {
 .container .body .body_box .box_right .img.data-v-21926b68 {
   width: 64rpx;
   width: 64rpx;
   height: 64rpx;
   height: 64rpx;
+  border-radius: 50%;
 }
 }
 .container .body .body_box .box_right .img2.data-v-21926b68 {
 .container .body .body_box .box_right .img2.data-v-21926b68 {
   margin-left: 7rpx;
   margin-left: 7rpx;

File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/setMeal/setMeal.js


File diff suppressed because it is too large
+ 317 - 0
unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.js


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

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

File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.wxml


+ 75 - 0
unpackage/dist/dev/mp-weixin/pages/shouquan/shouquan.wxss

@@ -0,0 +1,75 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.containar {
+  background: #fff;
+}
+.containar .avatarUrl {
+  padding: 80rpx 0 40rpx;
+  background: #fff;
+}
+.containar .avatarUrl button {
+  background: #fff;
+  line-height: 80rpx;
+  height: auto;
+  width: auto;
+  padding: 20rpx 30rpx;
+  margin: 0;
+  justify-content: center;
+  align-items: center;
+}
+.containar .avatarUrl button .refreshIcon {
+  border-radius: 50%;
+}
+.containar .avatarUrl button .jt {
+  width: 14rpx;
+  height: 28rpx;
+}
+.containar .nickname {
+  background: #fff;
+  padding: 20rpx 30rpx 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.containar .nickname .weui-input {
+  padding-left: 60rpx;
+}
+.containar .btn {
+  width: 100%;
+}
+.containar .btn .btn-sub {
+  width: 670rpx;
+  margin: 80rpx auto 0;
+  height: 90rpx;
+  background: #1e7dfb;
+  border-radius: 45rpx;
+  line-height: 90rpx;
+  text-align: center;
+  font-size: 36rpx;
+  color: #fff;
+}
+

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

@@ -19,7 +19,7 @@
     "condition": false
     "condition": false
   },
   },
   "compileType": "miniprogram",
   "compileType": "miniprogram",
-  "libVersion": "3.0.0",
+  "libVersion": "",
   "appid": "wx2fc3f45732fae5d3",
   "appid": "wx2fc3f45732fae5d3",
   "projectname": "Hwxb064310cc85cf115omestay_manage_app",
   "projectname": "Hwxb064310cc85cf115omestay_manage_app",
   "condition": {
   "condition": {

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

@@ -16,5 +16,6 @@
         }
         }
       ]
       ]
     }
     }
-  }
+  },
+  "libVersion": "3.0.0"
 }
 }

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


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


BIN
unpackage/dist/dev/mp-weixin/static/index/画板 1 (1).png


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


File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js


File diff suppressed because it is too large
+ 10 - 10
unpackage/dist/dev/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js


File diff suppressed because it is too large
+ 22 - 22
unpackage/dist/dev/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/header.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/month.js


File diff suppressed because it is too large
+ 23 - 23
unpackage/dist/dev/mp-weixin/uni_modules/uv-calendar/components/uv-calendar/uv-calendar.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js


File diff suppressed because it is too large
+ 18 - 18
unpackage/dist/dev/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.js


File diff suppressed because it is too large
+ 22 - 22
unpackage/dist/dev/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.js


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/uni_modules/uv-picker/components/uv-toolbar/uv-toolbar.js


File diff suppressed because it is too large
+ 21 - 21
unpackage/dist/dev/mp-weixin/uni_modules/uv-popup/components/uv-popup/uv-popup.js


File diff suppressed because it is too large
+ 19 - 19
unpackage/dist/dev/mp-weixin/uni_modules/uv-row/components/uv-row/uv-row.js


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js


File diff suppressed because it is too large
+ 17 - 17
unpackage/dist/dev/mp-weixin/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.js


File diff suppressed because it is too large
+ 13 - 13
unpackage/dist/dev/mp-weixin/uni_modules/uv-transition/components/uv-transition/uv-transition.js