whx hai 9 meses
pai
achega
0b89b5cf06
Modificáronse 100 ficheiros con 925 adicións e 206 borrados
  1. 6 1
      virgo.wzfrontend/yui_wx/components/common/upload.vue
  2. 1 1
      virgo.wzfrontend/yui_wx/components/house/houseItem.vue
  3. 7 2
      virgo.wzfrontend/yui_wx/manifest.json
  4. 1 1
      virgo.wzfrontend/yui_wx/pages/contractDetail/contractDetail.vue
  5. 58 4
      virgo.wzfrontend/yui_wx/pages/highseas/highseas.vue
  6. 2 1
      virgo.wzfrontend/yui_wx/pages/pdf/pdf.vue
  7. 21 10
      virgo.wzfrontend/yui_wx/pages/project/project.vue
  8. 19 66
      virgo.wzfrontend/yui_wx/pages/search/search.vue
  9. 18 21
      virgo.wzfrontend/yui_wx/pages/searchlist/searchlist.vue
  10. 22 0
      virgo.wzfrontend/yui_wx/request/api/house.js
  11. BIN=BIN
      virgo.wzfrontend/yui_wx/static/icon_img/del.png
  12. BIN=BIN
      virgo.wzfrontend/yui_wx/static/icon_img/del2.png
  13. BIN=BIN
      virgo.wzfrontend/yui_wx/static/icon_img/search.png
  14. BIN=BIN
      virgo.wzfrontend/yui_wx/static/icon_img/yan_close.png
  15. BIN=BIN
      virgo.wzfrontend/yui_wx/static/icon_img/yan_open.png
  16. 4 2
      virgo.wzfrontend/yui_wx/store/getters.js
  17. 23 2
      virgo.wzfrontend/yui_wx/store/modules/app.js
  18. 10 0
      virgo.wzfrontend/yui_wx/uni_modules/d-search-log/changelog.md
  19. 336 0
      virgo.wzfrontend/yui_wx/uni_modules/d-search-log/components/d-search-log/d-search-log.vue
  20. 85 0
      virgo.wzfrontend/yui_wx/uni_modules/d-search-log/components/d-search-log/pages/index/index.vue
  21. 89 0
      virgo.wzfrontend/yui_wx/uni_modules/d-search-log/package.json
  22. 110 0
      virgo.wzfrontend/yui_wx/uni_modules/d-search-log/readme.md
  23. 8 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/app.json
  24. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/common/runtime.js
  25. 5 5
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/common/vendor.js
  26. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/bill.json
  27. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/upload.js
  28. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/contract/clauseDetail.json
  29. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/house/houseItem.js
  30. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/house/houseItem.wxml
  31. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/sin-signature/sin-signature.json
  32. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.js
  33. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.wxml
  34. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/highseas/highseas.js
  35. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/highseas/highseas.wxml
  36. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/index/index.js
  37. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/index/index.wxml
  38. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/message/message.js
  39. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/pdf/pdf.js
  40. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/project/project.js
  41. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/project/project.wxml
  42. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/project/project.wxss
  43. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.js
  44. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.json
  45. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.wxml
  46. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.wxss
  47. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.js
  48. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.json
  49. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.wxml
  50. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.wxss
  51. BIN=BIN
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/del.png
  52. BIN=BIN
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/del2.png
  53. BIN=BIN
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/search.png
  54. BIN=BIN
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/yan_close.png
  55. BIN=BIN
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/yan_open.png
  56. 10 0
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.js
  57. 4 0
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.json
  58. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.wxml
  59. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.wxss
  60. 0 10
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.js
  61. 0 6
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.json
  62. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.wxml
  63. 0 1
      virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.wxss
  64. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  65. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  66. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/common/upload.js.map
  67. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/house/houseItem.js.map
  68. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/contractDetail/contractDetail.js.map
  69. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/highseas/highseas.js.map
  70. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pdf/pdf.js.map
  71. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/project.js.map
  72. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  73. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/searchlist/searchlist.js.map
  74. 1 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.js.map
  75. 8 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json
  76. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/runtime.js
  77. 4 4
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/vendor.js
  78. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/bill.js
  79. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/process.js
  80. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/upload.js
  81. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/contract/clauseDetail.js
  82. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/house/houseItem.wxml
  83. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/sin-signature/sin-signature.js
  84. 2 2
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.js
  85. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-list/uni-mall-list.js
  86. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billDetail/billDetail.js
  87. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billInvoice/billInvoice.js
  88. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billRecord/billRecord.js
  89. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/contractDetail/contractDetail.js
  90. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/contractDetail/contractDetail.wxml
  91. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/highseas/highseas.js
  92. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/highseas/highseas.wxml
  93. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/invoiceDetail/invoiceDetail.js
  94. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js
  95. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderHandle/orderHandle.js
  96. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/pdf/pdf.js
  97. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/project/project.js
  98. 1 1
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/project/project.wxml
  99. 5 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/project/project.wxss
  100. 0 0
      virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/search/search.js

+ 6 - 1
virgo.wzfrontend/yui_wx/components/common/upload.vue

@@ -34,7 +34,12 @@
 		},
 		created() {
 			this.fileList = this.list.map(node => {
-				node['isImage'] = this.image(node.type.toLowerCase());
+				if (node.type) {
+					node['isImage'] = this.image(node.type.toLowerCase());
+				} else {
+					let name = node.name.split('.');
+					node['isImage'] = this.image(name[name.length - 1].toLowerCase());
+				}
 				return node;
 			});
 		},

+ 1 - 1
virgo.wzfrontend/yui_wx/components/house/houseItem.vue

@@ -18,7 +18,7 @@
 				<text class="number">{{house.price}}</text>
 				<text class="label">/月</text>
 			</view>
-			<view class="location">2km</view>
+			<view class="location">{{house.distance || '-'}}km</view>
 		</view>
 	</view>
 </template>

+ 7 - 2
virgo.wzfrontend/yui_wx/manifest.json

@@ -56,8 +56,13 @@
             "postcss" : true
         },
         "usingComponents" : true,
-        "permission" : {},
-        "lazyCodeLoading" : "requiredComponents"
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "用于位置"
+            }
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredPrivateInfos" : [ "getLocation" ]
     },
     "vueVersion" : "2"
 }

+ 1 - 1
virgo.wzfrontend/yui_wx/pages/contractDetail/contractDetail.vue

@@ -165,7 +165,7 @@
 						<text class="sub-label">合同附件</text>
 					</view>
 					<view class="other">
-						<upload :list="documentFileList.attachment"></upload>
+						<upload type="preview" :list="documentFileList.attachment"></upload>
 					</view>
 				</view>
 			</view>

+ 58 - 4
virgo.wzfrontend/yui_wx/pages/highseas/highseas.vue

@@ -16,7 +16,9 @@
 			</view>
 		</navbar>
 		<mescroll-body :top="getNavBarHeight()" bottom="20" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			:option="{}">
+			:down="{
+				auto:false
+			}">
 			<view class="house-list">
 				<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
 			</view>
@@ -38,9 +40,10 @@
 				boundingClientRect: {},
 				list: [],
 				activeCity: {
-					cityName: '上海市',
-					cityCode: '310100'
+					cityName: '',
+					cityCode: ''
 				},
+				coordinates: ''
 			}
 		},
 		onShow() {
@@ -50,8 +53,56 @@
 			uni.$on('changeCity', data => {
 				this.activeCity = data;
 			})
+			uni.getLocation({
+				type: 'wgs84',
+				success: res => {
+					this.coordinates = res.longitude + ',' + res.latitude;
+					this.$store.dispatch('app/changeCoordinates', this.coordinates);
+					uni.setStorageSync('vuex_state', this.$store.state);
+					this.getLocation();
+				},
+				fail: () => {
+					this.coordinates = this.$store.getters.coordinates;
+					this.getLocation();
+				}
+			});
 		},
 		methods: {
+			getLocation() {
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo', // 服务器url
+					method: 'GET', // 请求方法,默认为GET
+					data: {
+						key: '8d6519155e085eb1b83d1de7953b2414',
+						location: this.coordinates
+					},
+					success: (res) => {
+						if (res.statusCode === 200) {
+							let data = res.data;
+							if (data.info == 'OK') {
+								let regeocode = data.regeocode;
+								this.activeCity = {
+									cityName: regeocode.addressComponent.city,
+									cityCode: regeocode.addressComponent.adcode
+								}
+								this.$store.dispatch('app/changeActiveCity', this.activeCity);
+								uni.setStorageSync('vuex_state', this.$store.state);
+								this.mescroll.resetUpScroll();
+							} else {
+								this.activeCity = this.$store.getters.activeCity;
+								this.mescroll.resetUpScroll();
+							}
+						} else {
+							this.activeCity = this.$store.getters.activeCity;
+							this.mescroll.resetUpScroll();
+						}
+					},
+					fail: () => {
+						this.activeCity = this.$store.getters.activeCity;
+						this.mescroll.resetUpScroll();
+					}
+				});
+			},
 			// 获取状态栏高度
 			geStatusBarHeight() {
 				return uni.getSystemInfoSync()['statusBarHeight']
@@ -71,9 +122,12 @@
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
+				if (!this.coordinates) return this.mescroll.endErr();
 				getOpenHouseListByPage({
 					currPage: page.num,
-					pageSize: 10
+					pageSize: 10,
+					coordinates: this.coordinates,
+					code: this.activeCity.cityCode
 				}).then(res => {
 					if (res.code === 200) {
 						this.mescroll.endBySize(res.data.dataList.length, res.data.totalCount);

+ 2 - 1
virgo.wzfrontend/yui_wx/pages/pdf/pdf.vue

@@ -5,6 +5,7 @@
 </template>
 
 <script>
+	import config from "@/config";
 	export default {
 		data() {
 			return {
@@ -15,7 +16,7 @@
 			uni.setNavigationBarTitle({
 				title: body.titleName
 			});
-			this.fileUrl = 'http://127.0.0.1:8848/webview/pdf/web/viewer.html?file=' + body.fileUrl;
+			this.fileUrl = config.baseUrl + '/webview/pdf/web/viewer.html?file=' + body.fileUrl;
 		},
 		methods: {
 

+ 21 - 10
virgo.wzfrontend/yui_wx/pages/project/project.vue

@@ -9,7 +9,10 @@
 		<view class="project-title">
 			<view class="project-name">{{detail.name}}</view>
 			<view class="project-label">距离您2km</view>
-			<uni-icons class="wx-icon" type="weixin" size="38" color="#43b156"></uni-icons>
+			<button type="default" class="wx-icon" open-type="share">
+				<uni-icons type="weixin" open-type="share" size="38" color="#43b156">
+				</uni-icons>
+			</button>
 		</view>
 		<view class="project-label project-article">{{detail.comment}}</view>
 		<view class="project-content">
@@ -50,11 +53,12 @@
 				responsibility: [],
 				coordinates: [],
 				latitude: 39.90923,
-				longitude: 116.397428
+				longitude: 116.397428,
+				projectId: ''
 			}
 		},
 		onLoad(body) {
-			console.log(body);
+			this.projectId = body.projectId;
 			this.init();
 		},
 		onReady() {
@@ -65,7 +69,7 @@
 		},
 		methods: {
 			init() {
-				getProjectDetailById(9).then(res => {
+				getProjectDetailById(this.projectId).then(res => {
 					if (res.code === 200) {
 						this.detail = res.data;
 						if (this.detail.picture) this.responsibility = JSON.parse(this.detail.picture);
@@ -80,7 +84,8 @@
 				})
 				getOpenHouseListByPage({
 					currPage: 1,
-					pageSize: 10
+					pageSize: 100,
+					projectId: parseInt(this.projectId)
 				}).then(res => {
 					if (res.code === 200) {
 						this.list = this.list.concat(res.data.dataList); //追加新数据
@@ -152,11 +157,17 @@
 				margin-top: 6rpx;
 			}
 
-			.wx-icon {
-				position: absolute;
-				top: 0;
-				right: 30rpx;
-				transform: translateY(50%);
+			.wx-icon {
+				position: absolute;
+				top: 0;
+				right: 30rpx;
+				transform: translateY(50%);
+				line-height: 1;
+				background: transparent;
+			
+				&::after {
+					display: none;
+				}
 			}
 		}
 

+ 19 - 66
virgo.wzfrontend/yui_wx/pages/search/search.vue

@@ -1,85 +1,38 @@
 <template>
 	<view class="search-container">
-		<view class="search-box">
-			<uv-search :showAction="true" actionText="搜索" placeholder="请输入房源或项目名称" :animation="false"
-				v-model="searchValue" @search="search" @custom="search">
-			</uv-search>
-		</view>
-		<view class="search-tag">
-			<view class="tag-title">标签列表</view>
-			<view class="tag-list">
-				<view class="tag-item" @click="search">
-					标签1
-				</view>
-				<view class="tag-item" @click="search">
-					标签2
-				</view>
-				<view class="tag-item" @click="search">
-					标签3
-				</view>
-			</view>
-			<view class="tag-title">历史搜索</view>
-			<view class="tag-list">
-				<view class="tag-item" @click="search">
-					维绿大厦
-				</view>
-			</view>
-		</view>
+		<d-search-log :search_list_hot="search_list_hot" :store_key="store_key" @onClickDelAllApi="onClickDelAll"
+			@onSearchNameApi="onSearchName"></d-search-log>
 	</view>
 </template>
 
 <script>
+	import {
+		getTagByCode
+	} from '@/request/api/house.js'
 	export default {
 		data() {
 			return {
-				searchValue: ''
+				search_list_hot: []
 			}
 		},
-		onShow() {},
+		onShow() {
+			getTagByCode(this.$store.getters.activeCity.cityCode).then(res => {
+				if (res.code == 200) {
+					this.search_list_hot = res.data.map(node => node.name);
+				}
+			})
+		},
 		methods: {
-			search() {
-				this.$navigateTo('/pages/searchlist/searchlist?searchValue=' + this.searchValue);
+			onClickDelAll() {
+				console.log('[父级接收事件]:删除全部搜索记录')
+			},
+			onSearchName(e) {
+				this.$navigateTo('/pages/searchlist/searchlist?searchValue=' + e);
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.search-container {
-		.search-box {
-			border-top: 1px solid $uni-border-1;
-			background: #Fff;
-			margin-bottom: 20rpx;
-			padding: 20rpx 10rpx;
-			padding-left: 20rpx;
-		}
-
-		.search-tag {
-			background: #fff;
-			padding: 30rpx 0 0 30rpx;
-
-			.tag-title {
-				font-size: 24rpx;
-				font-weight: bold;
-				color: $uni-base-color;
-				margin-bottom: 20rpx;
-			}
-
-			.tag-list {
-				display: flex;
-				flex-wrap: wrap;
-			}
-
-			.tag-item {
-				background: $uni-background-color;
-				padding: 10rpx 20rpx;
-				color: $uni-base-color;
-				font-weight: 300;
-				margin-right: 30rpx;
-				margin-bottom: 30rpx;
-				font-size: 24rpx;
-				border-radius: 8rpx;
-			}
-		}
-	}
+	.search-container {}
 </style>

+ 18 - 21
virgo.wzfrontend/yui_wx/pages/searchlist/searchlist.vue

@@ -1,16 +1,13 @@
 <template>
 	<view class="search-list">
-		<view class="search-top">
+		<mescroll-empty v-if="projectList.length == 0 && houseList.length == 0">>
+		</mescroll-empty>
+		<view class="search-top" v-if="projectList.length > 0">
 			<swiper class="swiper" circular :indicator-dots="true">
-				<swiper-item>
-					<view class="project-item">
+				<swiper-item v-for="(item,index) in projectList" :key="item.id">
+					<view class="project-item" @click="$navigateTo('/pages/project/project?projectId='+item.id)">
 						<view class="title">
-							<view class="name">
-								维绿大厦
-							</view>
-							<view class="to" @click="$navigateTo('/pages/project/project')">
-								进入项目
-							</view>
+							<view class="name">{{item.name}}</view>
 						</view>
 						<image class="image"
 							src="https://assets.api.uizard.io/api/cdn/stream/0ba939e8-082b-42f9-a314-be3e195b3b25.png"
@@ -20,8 +17,8 @@
 				</swiper-item>
 			</swiper>
 		</view>
-		<view class="house-list">
-			<house-item v-for="(item,index) in list" :house="item" :key="item.id"></house-item>
+		<view class="house-list" v-if="houseList.length > 0">
+			<house-item v-for="(item,index) in houseList" :house="item" :key="item.id"></house-item>
 		</view>
 	</view>
 </template>
@@ -29,26 +26,27 @@
 <script>
 	import houseItem from "@/components/house/houseItem.vue";
 	import {
-		getOpenHouseListByPage
+		search
 	} from '@/request/api/house.js'
 	export default {
 		data() {
 			return {
-				list: []
+				houseList: [],
+				projectList: [],
+				searchValue: ''
 			}
 		},
 		onLoad(body) {
-			console.log(body);
+			this.searchValue = body.searchValue;
 			this.init();
 		},
 		methods: {
 			init() {
-				getOpenHouseListByPage({
-					currPage: 1,
-					pageSize: 10
-				}).then(res => {
+				search(this.searchValue).then(res => {
 					if (res.code === 200) {
-						this.list = this.list.concat(res.data.dataList); //追加新数据
+						let data = res.data;
+						this.projectList = data.projectList;
+						this.houseList = data.houseList;
 					}
 				})
 			}
@@ -62,7 +60,7 @@
 <style lang="scss">
 	.search-list {
 		.search-top {
-			padding: 30rpx;
+			padding: 30rpx 30rpx 0rpx 30rpx;
 
 			.swiper {
 				border-radius: 16rpx;
@@ -108,7 +106,6 @@
 
 		.house-list {
 			padding: 30rpx;
-			padding-top: 0;
 		}
 	}
 </style>

+ 22 - 0
virgo.wzfrontend/yui_wx/request/api/house.js

@@ -128,4 +128,26 @@ export function getCollectionHouseListByPage(currPage, pageSize) {
 		url: `/api/roomOperation/collection/${currPage}/${pageSize}`,
 		method: 'get'
 	})
+}
+/* 
+ * 根据code获取标签
+ * 
+ * 
+ */
+export function getTagByCode(code) {
+	return request({
+		url: `/api/tag/code/${code}`,
+		method: 'post'
+	})
+}
+/* 
+ * 根据code获取标签
+ * 
+ * 
+ */
+export function search(keyWord) {
+	return request({
+		url: `/api/projectItemTargetRoom/query/${keyWord}`,
+		method: 'get'
+	})
 }

BIN=BIN
virgo.wzfrontend/yui_wx/static/icon_img/del.png


BIN=BIN
virgo.wzfrontend/yui_wx/static/icon_img/del2.png


BIN=BIN
virgo.wzfrontend/yui_wx/static/icon_img/search.png


BIN=BIN
virgo.wzfrontend/yui_wx/static/icon_img/yan_close.png


BIN=BIN
virgo.wzfrontend/yui_wx/static/icon_img/yan_open.png


+ 4 - 2
virgo.wzfrontend/yui_wx/store/getters.js

@@ -2,7 +2,9 @@ const getters = {
 	codeNumber: state => state.app.codeNumber, //获取验证码倒计时-防止刷新页面重置倒计时
 	user: state => state.app.user, //用户基本信息
 	organization: state => state.app.organization, //所属组织信息
-	project: state => state.app.project, //项目
-	identity: state => state.app.identity, //项目
+	project: state => state.app.project, //项目
+	identity: state => state.app.identity, //角色
+	coordinates: state => state.app.identity, //经纬度
+	activeCity: state => state.app.activeCity, //位置信息
 }
 export default getters

+ 23 - 2
virgo.wzfrontend/yui_wx/store/modules/app.js

@@ -7,7 +7,12 @@ const state = {
 	organization: {},
 	project: {},
 	codeNumber: 60,
-	identity: {}
+	identity: {},
+	coordinates: '116.38,39.9',
+	activeCity: {
+		cityName: '北京市',
+		cityCode: '110100'
+	}
 }
 
 const mutations = {
@@ -25,7 +30,13 @@ const mutations = {
 	},
 	CHANGE_IDENTITY: (state, identity) => {
 		state.identity = identity;
-	}
+	},
+	CHANGE_COORDINATES: (state, coordinates) => {
+		state.coordinates = coordinates;
+	},
+	CHANGE_ACTIVECITY: (state, activeCity) => {
+		state.activeCity = activeCity;
+	},
 }
 
 const actions = {
@@ -54,6 +65,16 @@ const actions = {
 	}, identity) {
 		commit('CHANGE_IDENTITY', identity);
 	},
+	changeCoordinates({
+		commit,
+	}, coordinates) {
+		commit('CHANGE_COORDINATES', coordinates);
+	},
+	changeActiveCity({
+		commit,
+	}, activeCity) {
+		commit('CHANGE_ACTIVECITY', activeCity);
+	},
 }
 
 export default {

+ 10 - 0
virgo.wzfrontend/yui_wx/uni_modules/d-search-log/changelog.md

@@ -0,0 +1,10 @@
+## 1.0.2(2022-06-15)
+1.增加:组件接收上个页面传递的参数 进行搜索。
+## 1.0.1(2022-06-14)
+1.优化逻辑 
+2.增加完整说明文档 +案例
+## 1.0.0(2022-05-29)
+````
+1.重构整个搜索页面
+2.只测了vue2的微信小程序+h5端,v3没测
+````

+ 336 - 0
virgo.wzfrontend/yui_wx/uni_modules/d-search-log/components/d-search-log/d-search-log.vue

@@ -0,0 +1,336 @@
+<template>
+	<view class="dSLComVue">
+		<view class="dSLComVueTop">
+			<view class="dSLComVueTopLeft">
+				<image src="/static/icon_img/search.png" class="dSLComVueTopLeftImg"
+					style="width: 30rpx;height: 30rpx;flex: none;"></image>
+				<input class="dSLComVueTopLeftInput" v-model="search_input" type="text" :placeholder="placeholder"
+					@blur="onClickInput" />
+				<view class="dSLComVueTopLeftDel" v-if="search_input" @click="onClickDel">
+					<image src="/static/icon_img/del.png" class="dSLComVueTopLeftDelImg"
+						style="width: 35rpx;height: 35rpx;flex: none;"></image>
+				</view>
+			</view>
+			<view class="dSLComVueTopRight">
+				<view class="dSLComVueTopRightBtn" @click="onClickInput"
+					:style="'border: 1rpx solid '+color_border+';color: '+color_text+';'">
+					{{search_name?search_name:'搜索'}}
+				</view>
+			</view>
+		</view>
+
+		<view v-if="is_show_more" class="dSLComVues">
+			<view class="dSLComVueTitle">
+				<text>搜索历史</text>
+				<view style="width: 100rpx;height: 60rpx;display: flex;align-items: center;justify-content: flex-end;"
+					@click="onClickDelAll">
+					<image src="/static/icon_img/del2.png" style="width: 36rpx;height: 36rpx;margin-right: 35rpx;">
+					</image>
+				</view>
+			</view>
+
+			<view v-if="search_list_old.length==0" class="mytext">暂无</view>
+			<view class="dSLComVueLog" v-if="search_list_old.length>0">
+				<text class="dSLComVueLogBox mytext" v-for="(item,index) in search_list_old" :key="index"
+					@click="onClickInputValue(item)">
+					{{item?item:'无'}}
+				</text>
+			</view>
+
+			<view class="dSLComVueTitle" v-if="search_list_hot.length>0" style="margin-top: 20rpx;">
+				<text>热门搜索</text>
+				<view style="width: 100rpx;height: 60rpx;display: flex;align-items: center;justify-content: flex-end;"
+					@click="onClickShowHot">
+					<image :src="is_hot_show?'/static/icon_img/yan_open.png':'/static/icon_img/yan_close.png'"
+						style="width: 36rpx;height: 36rpx;margin-right: 35rpx;"></image>
+				</view>
+			</view>
+
+			<view class="dSLComVueLog" v-if="search_list_hot.length>0 && is_hot_show">
+				<text class="dSLComVueLogBox mytext" v-for="(item,index) in search_list_hot" :key="index"
+					@click="onClickInputValue(item)">
+					{{item?item:'无'}}
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	export default {
+		data() {
+			return {
+				search_list_old: [],
+				search_input: '',
+				is_hot_show: true,
+			}
+		},
+		created() {
+			this._init_search()
+
+		},
+		props: {
+			is_show_more: {
+				value: Boolean,
+				default: true
+			},
+			search_list_old_man_num: {
+				value: Number,
+				default: 10
+			},
+			search_list_hot: {
+				value: Array,
+				default: []
+			},
+			//HM修改 定义默认搜索关键词(水印文字)
+			placeholder: {
+				value: String,
+				default: '请输入搜索内容'
+			},
+			store_key: {
+				value: String,
+				default: 'search_list'
+			},
+			color_border: {
+				value: String,
+				default: '#08979c'
+			},
+			color_text: {
+				value: String,
+				default: '#08979c'
+			},
+			search_name: {
+				value: String,
+				default: '搜索'
+			},
+			input_text: {
+				value: String,
+				default: ''
+			},
+		},
+		watch: {
+			search_list_hot(newVal) {
+				if (newVal) {
+					this.search_list_hot = newVal
+				}
+			},
+			input_text(newVal) {
+				if (newVal) {
+					this.search_input = newVal
+					this.saveKeyword()
+				}
+			},
+		},
+		methods: {
+			onClickInput() {
+				this.saveKeyword()
+			},
+			onClickInputValue(search_input) {
+				if (!search_input) {
+					return false;
+				}
+				this.search_input = search_input.toLowerCase()
+				this.saveKeyword()
+			},
+			_init_search() {
+				var that = this;
+				var store_key = that.store_key;
+				uni.getStorage({
+					key: store_key,
+					success: (res) => {
+						var old_data = JSON.parse(res.data);
+						that.search_list_old = old_data;
+					}
+				});
+			},
+			saveKeyword() {
+				var that = this
+				if (!this.search_input) {
+					return false;
+				}
+				this.search_input = this.search_input.toLowerCase()
+				var search_input = this.search_input
+				var store_key = that.store_key
+				uni.getStorage({
+					key: store_key,
+					success: (res) => {
+						var old_data = JSON.parse(res.data);
+						var findIndex = old_data.indexOf(search_input);
+						if (findIndex == -1) {
+							old_data.unshift(search_input);
+						} else {
+							old_data.splice(findIndex, 1);
+							old_data.unshift(search_input);
+						}
+						//最多10个纪录
+						old_data.length > that.search_list_old_man_num && old_data.pop();
+						uni.setStorage({
+							key: store_key,
+							data: JSON.stringify(old_data)
+						});
+						that.search_list_old = old_data; //更新历史搜索
+					},
+					fail: (e) => {
+						var old_data = [search_input];
+						uni.setStorage({
+							key: store_key,
+							data: JSON.stringify(old_data)
+						});
+						that.search_list_old = old_data; //更新历史搜索
+					}
+				});
+				//	向父级发送搜索的事件
+				that.$emit('onSearchNameApi', this.search_input);
+				//
+			},
+			onClickDel() {
+				this.search_input = ''
+				this.$emit('onSearchNameApi', '');
+			},
+
+			onClickDelAll() {
+				var that = this
+				console.log('---全部删除-log--')
+				uni.showModal({
+					title: '提示',
+					content: '确定全部删除',
+					success(res) {
+						if (res.confirm) {
+							uni.removeStorageSync(that.store_key)
+							that.search_list_old = []
+							that.$emit('onClickDelAllApi', '');
+						}
+					}
+				})
+			},
+			onClickShowHot() {
+				this.is_hot_show = this.is_hot_show == true ? false : true
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.myborder {
+		border: 1rpx solid #60DF9D;
+		color: #30c66c;
+	}
+
+	.mytext {
+		color: #8799a3;
+	}
+
+	.dSLComVue {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 10rpx 20rpx;
+		box-sizing: border-box;
+
+		.dSLComVues {
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 10rpx 0;
+			box-sizing: border-box;
+		}
+
+		.dSLComVueTop {
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-radius: 40rpx;
+
+			.dSLComVueTopLeft {
+				flex: 1;
+				width: 0;
+				height: 60rpx;
+				background-color: #e8e8e8;
+				border-radius: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 3%;
+				// background-color: #ccc;
+				border: 1rpx solid #f2f2f2;
+
+				.dSLComVueTopLeftImg {
+					flex: 1;
+					height: 80rpx;
+				}
+
+				.dSLComVueTopLeftInput {
+					flex: 1;
+					height: 60rpx;
+					padding: 0 20rpx;
+
+				}
+
+				.dSLComVueTopLeftDel {
+					width: 70rpx;
+					height: 60rpx;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+				}
+			}
+
+			.dSLComVueTopRight {
+				width: 120rpx;
+				margin-left: 20rpx;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+
+				.dSLComVueTopRightBtn {
+					width: 120rpx;
+					height: 56rpx;
+					border-radius: 30rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+				}
+			}
+
+		}
+
+		.dSLComVueTitle {
+			width: 100%;
+			height: 80rpx;
+			display: flex;
+			font-weight: 600;
+			font-size: 26rpx;
+			align-items: center;
+			// background-color: #30c66c;
+			align-items: center;
+			justify-content: space-between;
+			padding-left: 30rpx;
+		}
+
+		.dSLComVueLog {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: flex-start;
+
+			.dSLComVueLogBox {
+				line-height: 55rpx;
+				background-color: #e8e8e8;
+				padding: 0rpx 30rpx;
+				border-radius: 30rpx;
+				flex: none;
+				margin: 10rpx 25rpx 15rpx 0;
+				// border: 1rpx solid #ccc
+			}
+
+
+		}
+	}
+</style>

+ 85 - 0
virgo.wzfrontend/yui_wx/uni_modules/d-search-log/components/d-search-log/pages/index/index.vue

@@ -0,0 +1,85 @@
+
+<template>
+	<view>
+		
+		<cu-custom bgColor="my-theme-bg" :isBack="false">
+			<block slot="backText">返回</block>
+			<block slot="content">搜索页面</block>
+		</cu-custom>
+		
+		<d-search-log 
+		:color_border="color_border"
+		:color_text="color_border"
+		:search_list_hot="search_list_hot"
+		:store_key="store_key"
+		:input_text="input_text"
+		@onClickDelAllApi="onClickDelAll"
+		@onSearchNameApi="onSearchName"
+		></d-search-log>
+		
+		
+		
+	</view>
+</template>
+
+<script>
+	import dSearchLog from '@/uni_modules/d-search-log/components/d-search-log/d-search-log.vue'
+	import dAlert from '@/uni_modules/d-alert/components/d-alert/d-alert.vue'
+	
+	export default {
+		components: {
+			"dSearchLog": dSearchLog,
+			"dAlert": dAlert,
+		},
+		computed:{
+			
+		},
+
+		data() {
+			return {
+				color_border:"#ff00ff",
+				search_list_hot:[],
+				store_key:'search_list',
+				input_text:''
+			}
+		},
+		onLoad() {
+			var that = this
+			if (true) {
+				setTimeout(function(){
+					that.input_text = 'dev'
+				},1000)
+			}
+			
+			
+			this.search_list_hot = [
+				'手机','电脑','河南老君山','三亚一游','北京环球影城','杭州西湖','保定驴肉火烧','保定狼牙山玻璃栈道'
+			]
+			
+			// this._open_tan()
+		},
+		methods: {
+			onClickDelAll() {
+				console.log('[父级接收事件]:删除全部搜索记录')
+			},
+			onSearchName(e) {
+				console.log('[父级接收事件]:点击搜索:'+e)
+			},
+			
+		
+			 
+			// 
+		}
+	}
+</script>
+
+<style>
+	page {
+		/* background-color: #f2f2f2; */
+	}
+	.my-theme-bg {
+		background: linear-gradient(117deg,#60DF9D,#31CB7B);
+		color:#fff;
+
+	}
+</style>

+ 89 - 0
virgo.wzfrontend/yui_wx/uni_modules/d-search-log/package.json

@@ -0,0 +1,89 @@
+{
+  "id": "d-search-log",
+  "displayName": "2023_超好用的_搜索页面 【已亲测】search",
+  "version": "1.0.2",
+  "description": "2023_超好用的_搜索页面 【已亲测】",
+  "keywords": [
+    "uni_modules",
+    "搜索",
+    "搜索框",
+    "搜索栏",
+    "search"
+],
+  "repository": "https://github.com/qq1415551519/uniapp-d-search-log",
+  "engines": {
+    "HBuilderX": "^3.1.21"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "缓存权限"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y",
+          "小红书": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}

+ 110 - 0
virgo.wzfrontend/yui_wx/uni_modules/d-search-log/readme.md

@@ -0,0 +1,110 @@
+## 【2023-搜索页面-可能是最好用的插件】
+## d-search-log
+
+
+````
+
+弹框插件: https://ext.dcloud.net.cn/plugin?id=2708
+
+日历插件: https://ext.dcloud.net.cn/plugin?id=2779
+
+````
+
+
+
+````
+
+1. /pages/index/index.vue 为案例文件
+
+2. 素材图片的话 复制到   /static/目录下
+
+
+````
+
+### 或者直接复制下边代码
+
+
+````
+
+
+
+<template>
+	<view>
+		
+		<cu-custom bgColor="my-theme-bg" :isBack="false">
+			<block slot="backText">返回</block>
+			<block slot="content">搜索页面</block>
+		</cu-custom>
+		
+		<d-search-log 
+		:color_border="color_border"
+		:color_text="color_border"
+		:search_list_hot="search_list_hot"
+		:store_key="store_key"
+		@onClickDelAllApi="onClickDelAll"
+		@onSearchNameApi="onSearchName"
+		></d-search-log>
+		
+		
+	</view>
+</template>
+
+<script>
+	import dSearchLog from '@/uni_modules/d-search-log/components/d-search-log/d-search-log.vue'
+	
+	export default {
+		components: {
+			"dSearchLog": dSearchLog
+		},
+		computed:{
+			
+		},
+
+		data() {
+			return {
+				color_border:"#ff00ff",
+				search_list_hot:[],
+				store_key:'search_list',
+			}
+		},
+		onLoad() {
+			
+			this.search_list_hot = [
+				'手机','电脑','河南老君山','三亚一游','北京环球影城','杭州西湖','保定驴肉火烧','保定狼牙山玻璃栈道'
+			]
+		},
+		methods: {
+			onClickDelAll() {
+				console.log('[父级接收事件]:删除全部搜索记录')
+			},
+			onSearchName(e) {
+				console.log('[父级接收事件]:点击搜索:'+e)
+			}
+		}
+	}
+</script>
+
+<style>
+	
+	.my-theme-bg {
+		background: linear-gradient(117deg,#60DF9D,#31CB7B);
+		color:#fff;
+		/* background: linear-gradient(117deg,#23C0F7,#ff661e); */
+		/* background: linear-gradient(90deg, #FFAA57, #23C0F7); */
+		/* background: linear-gradient(90deg, #F37749, #FFAA57); */
+		/* #FFAA57 */
+		/* background-image: linear-gradient(45deg, #39b54a, #8dc63f); */
+		/* color: #ffffff; */
+		/* background-color: #f37b1d; */
+		/* color: #ffffff; */
+		/* background-color: #ffffff; */
+		/* color: #666666; */
+		/* linear-gradient(-27deg, #33CB80, #28D0AF) */
+		/* background-image: line=ar-gradient(-27deg,#33CB80,#28D0AF); */
+		/* color: #ffffff; */
+		/* background-image: line=ar-gradient(-27deg,#fff,#fff); */
+		/* background-image: line=ar-gradient(-27deg,#23C0F7,#23C0F7); */
+		/* color: #000; */
+	}
+</style>
+````

+ 8 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/app.json

@@ -87,7 +87,14 @@
       }
     ]
   },
-  "permission": {},
+  "permission": {
+    "scope.userLocation": {
+      "desc": "用于位置"
+    }
+  },
   "lazyCodeLoading": "requiredComponents",
+  "requiredPrivateInfos": [
+    "getLocation"
+  ],
   "usingComponents": {}
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/common/runtime.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 5 - 5
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/common/vendor.js


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/bill.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
     "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item"
-  },
-  "component": true
+  }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/common/upload.js


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/contract/clauseDetail.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/house/houseItem.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/house/houseItem.wxml


+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/components/sin-signature/sin-signature.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/contractDetail/contractDetail.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/highseas/highseas.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/highseas/highseas.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/index/index.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/index/index.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/message/message.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/pdf/pdf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/project/project.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/project/project.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/project/project.wxss


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.js


+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "搜索",
   "usingComponents": {
-    "uv-search": "/uni_modules/uv-search/components/uv-search/uv-search"
+    "d-search-log": "/uni_modules/d-search-log/components/d-search-log/d-search-log"
   }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/search/search.wxss


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.js


+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "搜索列表",
   "usingComponents": {
+    "mescroll-empty": "/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty",
     "house-item": "/components/house/houseItem"
   }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/pages/searchlist/searchlist.wxss


BIN=BIN
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/del.png


BIN=BIN
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/del2.png


BIN=BIN
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/search.png


BIN=BIN
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/yan_close.png


BIN=BIN
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/static/icon_img/yan_open.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 10 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.js


+ 4 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.wxss


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 10
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.js


+ 0 - 6
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  },
-  "component": true
-}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-search/components/uv-search/uv-search.wxss


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/common/upload.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/components/house/houseItem.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/contractDetail/contractDetail.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/highseas/highseas.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pdf/pdf.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/project/project.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/pages/searchlist/searchlist.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/d-search-log/components/d-search-log/d-search-log.js.map


+ 8 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -87,7 +87,14 @@
       }
     ]
   },
-  "permission": {},
+  "permission": {
+    "scope.userLocation": {
+      "desc": "用于位置"
+    }
+  },
   "lazyCodeLoading": "requiredComponents",
+  "requiredPrivateInfos": [
+    "getLocation"
+  ],
   "usingComponents": {}
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/runtime.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 4 - 4
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/common/vendor.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/bill.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/process.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/common/upload.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/contract/clauseDetail.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/house/houseItem.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/sin-signature/sin-signature.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-head/uni-mall-head.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/components/uni-mall-list/uni-mall-list.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billDetail/billDetail.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billInvoice/billInvoice.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/billRecord/billRecord.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/contractDetail/contractDetail.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/contractDetail/contractDetail.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/highseas/highseas.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/highseas/highseas.wxml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/invoiceDetail/invoiceDetail.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/orderHandle/orderHandle.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/pdf/pdf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/project/project.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/project/project.wxml


+ 5 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/project/project.wxss

@@ -43,6 +43,11 @@
   right: 30rpx;
   -webkit-transform: translateY(50%);
           transform: translateY(50%);
+  line-height: 1;
+  background: transparent;
+}
+.project-detail .project-title .wx-icon::after {
+  display: none;
 }
 .project-detail .content-map {
   width: 100%;

+ 0 - 0
virgo.wzfrontend/yui_wx/unpackage/dist/dev/mp-weixin/pages/search/search.js


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio