t

pages.json

@@ -196,6 +196,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/estate/libPre",
+			"style": {
+				"navigationBarTitleText": "选择区域",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/estate/lib",
 			"style": {

pages/cust/myrecord.vue

@@ -12,7 +12,7 @@
 						<view>
 							<view class="u-order-title" v-if="item.estate_name">{{item.action}}了<navigator :url="`/pages/estate/dtl?id=${item.estate_id}`" class="c">【{{item.estate_name}}】</navigator></view>
 							<view class="u-order-title" v-else>日常维护:<view v-if="item.action" class="c2">{{item.action}}</view></view>
-							<view class="u-order-desc">{{item.record_remark}}</view>
+							<view class="u-order-desc">({{item.remind_state ? rsObj[item.remind_state] : ''}}){{item.record_remark}}</view>
 							<view class="u-order-img" v-if="item.recordImgArr && item.recordImgArr.length > 0">
 								<image v-for="(url, urlIndex) in item.recordImgArr" :key="urlIndex" class="img" :src="url" mode="aspectFill" @click="previewImgHandle(url, item.recordImgArr)"></image>
 							</view>
@@ -27,9 +27,11 @@
 	</view>
 </template>
 <script>
+import { arrToObj } from '@/utils'
 export default {
 	data() {
 		return {
+			rsObj: {},
 			curId: '',
 			custTips: '',
 			detail: {
@@ -40,6 +42,8 @@ export default {
 	onLoad(params) {
 		this.curId = params.id
 		this.custTips = params.str
+		const dictObj = uni.getStorageSync('MD_dict')
+		this.rsObj = arrToObj(dictObj.remind_state)
 	},
 	onShow() {
 		this.getData()

pages/estate/lib.vue

@@ -93,10 +93,11 @@ export default {
 			areaTypeObj: {},
 			curEid: '',
 			curEname: '',
+			curAreaType: '',
 		};
 	},
 	onLoad(params) {
-		
+		if (params.v) this.curAreaType = params.v
 		
 		this.userInfo2 = uni.getStorageSync('MD_userInfo2')
 		this.curRoles = uni.getStorageSync('MD_userInfo2') ? uni.getStorageSync('MD_userInfo2').roles : ''
@@ -152,10 +153,12 @@ export default {
 			if (this.userInfo2.roles == 1 || this.userInfo2.roles == 5 || this.userInfo2.roles == 7) {
 				const that = this
 				let params = {
-					// page_size: 1000,
+					page_size: 30,
 					...this.searchFormData
 				}
-				
+				if (this.curAreaType) {
+					params.area_type = this.curAreaType
+				}
 				if (that.orderMethod > 0) {
 					if (that.orderMethod === 1) {
 						params.order_by = JSON.stringify([{

pages/estate/libPre.vue

@@ -0,0 +1,63 @@
+<template>
+	<view class="scoped-box">
+		<view @click="linkList(item.val)" class="op" v-for="(item, i) in areaType" :key="i">{{item.key}}</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			colorArr: ['#fb7366', '#ff9a59', '#9f7df5', '#60c68b', '#4da4ee', '#e77ad4'],
+			areaType: [],
+		};
+	},
+	onLoad(params) {
+		const dictObj = uni.getStorageSync('MD_dict')
+		this.areaType = dictObj.area_type
+	},
+	onReachBottom() {},
+	onPullDownRefresh() {
+		// 防止频繁刷新
+	},
+	methods: {
+		linkList (v) {
+			uni.navigateTo({
+				url: `/pages/estate/lib?v=${v}`
+			})
+		}
+	}
+};
+</script>
+<style lang="scss">
+.scoped-box {
+	display: flex;
+	flex-wrap: wrap;
+	.op {
+		width: 33.33%;
+		text-align: center;
+		color: #fff;
+		height: 120rpx;
+		line-height: 120rpx;
+		font-size: 34rpx;
+		font-weight: bold;
+		&:nth-child(6n+1) {
+			background: #fb7366;
+		}
+		&:nth-child(6n+2) {
+			background: #ff9a59;
+		}
+		&:nth-child(6n+3) {
+			background: #e77ad4;
+		}
+		&:nth-child(6n+4) {
+			background: #9f7df5;
+		}
+		&:nth-child(6n+5) {
+			background: #4da4ee;
+		}
+		&:nth-child(6n) {
+			background: #60c68b;
+		}
+	}
+}
+</style>

pages/user/setting/setting.vue

@@ -61,7 +61,7 @@
 			</view>
 			<!-- #endif -->
 			
-			<view v-if="userInfo2.roles == 1 || userInfo2.roles == 5 || userInfo2.roles == 7" class="menu-item" @click="pageTo('/pages/estate/lib')">
+			<view v-if="userInfo2.roles == 1 || userInfo2.roles == 5 || userInfo2.roles == 7" class="menu-item" @click="pageTo('/pages/estate/libPre')">
 				<view class="menu-title-wrap">
 					<view class="title">
 						<u-icon class="u-m-r-10" name="/static/icon/notebook.png" size="36"></u-icon>

unpackage/dist/build/mp-weixin/app.json

@@ -28,6 +28,7 @@
     "pages/agreement/agreement2",
     "pages/estate/list",
     "pages/estate/dtl",
+    "pages/estate/libPre",
     "pages/estate/lib",
     "pages/agent/report/buycheck",
     "pages/agent/report/deal",

unpackage/dist/build/mp-weixin/pages/estate/libPre.js

@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/estate/libPre"],{"019e":function(e,t,n){"use strict";n.r(t);var a=n("4e71"),u=n.n(a);for(var c in a)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(c);t["default"]=u.a},"1d81":function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return u})),n.d(t,"a",(function(){}));var a=function(){var e=this.$createElement;this._self._c},u=[]},"27de":function(e,t,n){"use strict";n.r(t);var a=n("1d81"),u=n("019e");for(var c in u)["default"].indexOf(c)<0&&function(e){n.d(t,e,(function(){return u[e]}))}(c);n("872d");var o=n("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=r.exports},"468d":function(e,t,n){},"4e71":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={data:function(){return{colorArr:["#fb7366","#ff9a59","#9f7df5","#60c68b","#4da4ee","#e77ad4"],areaType:[]}},onLoad:function(t){var n=e.getStorageSync("MD_dict");this.areaType=n.area_type},onReachBottom:function(){},onPullDownRefresh:function(){},methods:{linkList:function(t){e.navigateTo({url:"/pages/estate/lib?v=".concat(t)})}}};t.default=n}).call(this,n("543d")["default"])},"872d":function(e,t,n){"use strict";var a=n("468d"),u=n.n(a);u.a},e169:function(e,t,n){"use strict";(function(e,t){var a=n("4ea4");n("b159");a(n("66fd"));var u=a(n("27de"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(u.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])}},[["e169","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/estate/libPre.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "选择区域",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/build/mp-weixin/pages/estate/libPre.wxml

@@ -0,0 +1 @@
+<view class="scoped-box"><block wx:for="{{areaType}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view data-event-opts="{{[['tap',[['linkList',['$0'],[[['areaType','',i,'val']]]]]]]}}" class="op" bindtap="__e">{{item.key}}</view></block></view>

unpackage/dist/build/mp-weixin/pages/estate/libPre.wxss

@@ -0,0 +1 @@
+.page{background-color:#f3f4f6;padding:20rpx}.empty-wrap{margin-top:200rpx;width:100%;display:flex;justify-content:center;align-items:center}.content-page{min-height:100vh;background-color:#fff}.footer{display:flex;align-items:center;color:#909399;width:100%;padding:20rpx 0;justify-content:center}.box-shadow{box-shadow:0rpx 2rpx 4rpx 0 rgba(0,0,0,.2)}.flex-empty{visibility:hidden;width:120rpx;height:0rpx}.bwin-btn-100{width:100%}.bwin-popup{display:flex;flex-direction:column;width:100%;position:relative;min-height:100%;overflow:hidden}.bwin-popup .popup-header{z-index:2;width:80%;position:fixed;padding:20rpx 0;text-align:center;font-size:32rpx;color:#fff;font-weight:700;background-color:#2080f0;border-top-left-radius:20rpx;border-top-right-radius:20rpx}.bwin-popup .popup-body{z-index:1;position:relative;top:90rpx;margin-bottom:90rpx;padding:20rpx;font-size:32rpx;overflow-y:scroll}.bwin-popup .popup-footer{position:relative;left:0;bottom:20rpx;width:100%;display:flex;justify-content:space-around}.scoped-box{display:flex;flex-wrap:wrap}.scoped-box .op{width:33.33%;text-align:center;color:#fff;height:120rpx;line-height:120rpx;font-size:34rpx;font-weight:700}.scoped-box .op:nth-child(6n+1){background:#fb7366}.scoped-box .op:nth-child(6n+2){background:#ff9a59}.scoped-box .op:nth-child(6n+3){background:#e77ad4}.scoped-box .op:nth-child(6n+4){background:#9f7df5}.scoped-box .op:nth-child(6n+5){background:#4da4ee}.scoped-box .op:nth-child(6n){background:#60c68b}

unpackage/dist/dev/mp-weixin/app.json

@@ -28,6 +28,7 @@
     "pages/agreement/agreement2",
     "pages/estate/list",
     "pages/estate/dtl",
+    "pages/estate/libPre",
     "pages/estate/lib",
     "pages/agent/report/buycheck",
     "pages/agent/report/deal",

unpackage/dist/dev/mp-weixin/pages/cust/myrecord.js

@@ -196,6 +196,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
+var _utils = __webpack_require__(/*! @/utils */ 65);
 //
 //
 //
@@ -227,6 +228,7 @@ var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/
 var _default = {
   data: function data() {
     return {
+      rsObj: {},
       curId: '',
       custTips: '',
       detail: {},
@@ -237,6 +239,8 @@ var _default = {
   onLoad: function onLoad(params) {
     this.curId = params.id;
     this.custTips = params.str;
+    var dictObj = uni.getStorageSync('MD_dict');
+    this.rsObj = (0, _utils.arrToObj)(dictObj.remind_state);
   },
   onShow: function onShow() {
     this.getData();

unpackage/dist/dev/mp-weixin/pages/estate/lib.js

@@ -254,10 +254,12 @@ var _default = {
       userInfo2: {},
       areaTypeObj: {},
       curEid: '',
-      curEname: ''
+      curEname: '',
+      curAreaType: ''
     };
   },
   onLoad: function onLoad(params) {
+    if (params.v) this.curAreaType = params.v;
     this.userInfo2 = uni.getStorageSync('MD_userInfo2');
     this.curRoles = uni.getStorageSync('MD_userInfo2') ? uni.getStorageSync('MD_userInfo2').roles : '';
     this.getDataList();
@@ -313,7 +315,12 @@ var _default = {
     getDataList: function getDataList(bc) {
       if (this.userInfo2.roles == 1 || this.userInfo2.roles == 5 || this.userInfo2.roles == 7) {
         var that = this;
-        var params = _objectSpread({}, this.searchFormData);
+        var params = _objectSpread({
+          page_size: 30
+        }, this.searchFormData);
+        if (this.curAreaType) {
+          params.area_type = this.curAreaType;
+        }
         if (that.orderMethod > 0) {
           if (that.orderMethod === 1) {
             params.order_by = JSON.stringify([{

unpackage/dist/dev/mp-weixin/pages/estate/libPre.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "选择区域",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/estate/libPre.wxml

@@ -0,0 +1 @@
+<view class="scoped-box"><block wx:for="{{areaType}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view data-event-opts="{{[['tap',[['linkList',['$0'],[[['areaType','',i,'val']]]]]]]}}" class="op" bindtap="__e">{{item.key}}</view></block></view>

unpackage/dist/dev/mp-weixin/pages/estate/libPre.wxss

@@ -0,0 +1,106 @@
+@charset "UTF-8";
+/* 这里是你自己写的全局css样式 */
+.page {
+  background-color: #f3f4f6;
+  padding: 20rpx;
+}
+.empty-wrap {
+  margin-top: 200rpx;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.content-page {
+  min-height: 100vh;
+  background-color: #fff;
+}
+.footer {
+  display: flex;
+  align-items: center;
+  color: #909399;
+  width: 100%;
+  padding: 20rpx 0;
+  justify-content: center;
+}
+.box-shadow {
+  box-shadow: 0rpx 2rpx 4rpx 0 rgba(0, 0, 0, 0.2);
+}
+.flex-empty {
+  visibility: hidden;
+  width: 120rpx;
+  height: 0rpx;
+}
+.bwin-btn-100 {
+  width: 100%;
+}
+.bwin-popup {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  position: relative;
+  min-height: 100%;
+  overflow: hidden;
+}
+.bwin-popup .popup-header {
+  z-index: 2;
+  width: 80%;
+  position: fixed;
+  padding: 20rpx 0;
+  text-align: center;
+  font-size: 32rpx;
+  color: #fff;
+  font-weight: bold;
+  background-color: #2080f0;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+.bwin-popup .popup-body {
+  z-index: 1;
+  position: relative;
+  top: 90rpx;
+  margin-bottom: 90rpx;
+  padding: 20rpx;
+  font-size: 32rpx;
+  overflow-y: scroll;
+}
+.bwin-popup .popup-footer {
+  position: relative;
+  left: 0;
+  bottom: 20rpx;
+  width: 100%;
+  display: flex;
+  justify-content: space-around;
+}
+.scoped-box {
+  display: flex;
+  flex-wrap: wrap;
+}
+.scoped-box .op {
+  width: 33.33%;
+  text-align: center;
+  color: #fff;
+  height: 120rpx;
+  line-height: 120rpx;
+  font-size: 34rpx;
+  font-weight: bold;
+}
+.scoped-box .op:nth-child(6n+1) {
+  background: #fb7366;
+}
+.scoped-box .op:nth-child(6n+2) {
+  background: #ff9a59;
+}
+.scoped-box .op:nth-child(6n+3) {
+  background: #e77ad4;
+}
+.scoped-box .op:nth-child(6n+4) {
+  background: #9f7df5;
+}
+.scoped-box .op:nth-child(6n+5) {
+  background: #4da4ee;
+}
+.scoped-box .op:nth-child(6n) {
+  background: #60c68b;
+}
+

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

@@ -23,8 +23,15 @@
         },
         {
           "name": "",
-          "pathName": "pages/cust/myrecord",
-          "query": "id=81&str=abc-18700001111",
+          "pathName": "pages/estate/lib",
+          "query": "v=qypq",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/estate/libPre",
+          "query": "",
           "launchMode": "default",
           "scene": null
         }