t

api/base.js

@@ -39,4 +39,7 @@ export default {
 	apiuploadcloudpiv: (params) => { // 图片上传云接口
 	  return request('api/upload/cloudpiv', params, 'loading')
 	},
+	apidicttree: (params) => { // 字典
+	  return request('api/dict/tree', params, 'loading')
+	},
 }

pages/index/index.vue

@@ -129,11 +129,13 @@
 			<view :class="'property-row-wrap'">
 				<view class="property-body u-skeleton-fillet box-shadow" v-for="(item, index) in propertyList" :key="index" @click="showDetail(index)">
 					<view class="image-wrap">
-						<text class="tag u-skeleton-rect">{{ '热销推荐' }}</text>
+						<text class="tag u-skeleton-rect">{{ item.estate_tag }}</text>
 						<image class="u-skeleton-rect" :src="item.pri_image" mode="aspectFill"></image>
 					</view>
 					<view class="property-info-wrap">
-						<view class="title u-skeleton-rect">{{ item.estate_name }}</view>
+						<view class="title u-skeleton-rect">{{ item.estate_name }}
+							<text class="s">{{areaTypeObj[item.area_type]}}</text>
+						</view>
 						<view class="commission u-line-1 u-skeleton-rect">{{ item.commissionText}}</view>
 					</view>
 				</view>
@@ -153,7 +155,7 @@
 			<view class="bwin-popup">
 				<view class="popup-header">{{ propertyList[currentPropertyIndex].estate_name + '佣金政策' }}</view>
 				<view class="popup-body">
-					<u-parse :html="'全号报备，过期重新报备，提供带访二维码，需提前30分钟以上带看'"></u-parse>
+					<u-parse :html="propertyList[currentPropertyIndex].introduce"></u-parse>
 					<u-divider marginTop="20" marginBottom="20">详情</u-divider>
 					<view class="property-info">
 						<view class="item">
@@ -162,11 +164,11 @@
 						</view>
 						<view class="item">
 							<view class="item-title">销售热线：</view>
-							<view class="item-info">{{ propertyList[currentPropertyIndex].tel || '00000000' }}</view>
+							<view class="item-info">{{ propertyList[currentPropertyIndex].marketing_phone || '00000000' }}</view>
 						</view>
 						<view class="item">
 							<view class="item-title">带看需收集：</view>
-							<view class="item-info">{{ '三方水印+带看单' }}</view>
+							<view class="item-info">{{ propertyList[currentPropertyIndex].report_visit }}</view>
 						</view>
 						<view class="item">
 							<view class="item-title">报备保护期：</view>
@@ -188,6 +190,7 @@
 
 <script>
 var that;
+import { arrToObj } from '@/utils'
 export default {
 	data() {
 		// 页面数据变量
@@ -214,7 +217,8 @@ export default {
 			// 表单请求数据
 			form1: {},
 			scrollTop: 0,
-			reportStepCountObj: {}
+			reportStepCountObj: {},
+			areaTypeObj: {},
 		};
 	},
 	onPageScroll(e) {
@@ -233,6 +237,8 @@ export default {
 	// 监听 - 页面每次【显示时】执行(如：前进和返回) (页面每次出现在屏幕上都触发，包括从下级页面点返回露出当前页面)
 	onShow() {
 		this.init()
+		const dictObj = uni.getStorageSync('MD_dict')
+		this.areaTypeObj = arrToObj(dictObj.area_type)
 	},
 	// 监听 - 页面每次【隐藏时】执行(如：返回)
 	onHide() {},
@@ -581,6 +587,10 @@ export default {
 					font-weight: bold;
 					color: $u-main-color;
 					font-size: $u-p;
+					.s {
+						font-weight: normal;
+						padding-left: 10rpx;
+					}
 				}
 
 				.commission {

pages/user/login/login.vue

@@ -191,6 +191,21 @@ export default {
 			// });
 		},
 		getUserInfo () {
+			uni.api.base.apidicttree().then(res => {
+				const cObj = res || {}
+				let newDict = {}
+				for (let k in cObj) {
+					const cArr = cObj[k].map(item => {
+						return {
+							...item,
+							key: item.dict_label,
+							val: item.dict_value
+						}
+					})
+					newDict[k] = cArr
+				}
+				uni.setStorageSync('MD_dict', newDict)
+			})
 			uni.api.base.apiuserinfo().then(res => {
 				uni.setStorageSync('MD_userInfo2', res)
 				uni.reLaunch({

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -14283,6 +14283,9 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   },
   apiuploadcloudpiv: function apiuploadcloudpiv(params) {// 图片上传云接口
     return (0, _http.request)('api/upload/cloudpiv', params, 'loading');
+  },
+  apidicttree: function apidicttree(params) {// 字典
+    return (0, _http.request)('api/dict/tree', params, 'loading');
   } };exports.default = _default;
 
 /***/ }),
@@ -14361,6 +14364,21 @@ var Http = function Http() {var options = arguments.length > 0 && arguments[0] !
                       } else {
                         uni.setStorageSync('MD_userInfo', cData);
                         uni.setStorageSync('MD_token', cData.token);
+                        uni.api.base.apidicttree().then(function (res) {
+                          var cObj = res || {};
+                          var newDict = {};
+                          for (var _k in cObj) {
+                            var cArr = cObj[_k].map(function (item) {
+                              return _objectSpread(_objectSpread({},
+                              item), {}, {
+                                key: item.dict_label,
+                                val: item.dict_value });
+
+                            });
+                            newDict[_k] = cArr;
+                          }
+                          uni.setStorageSync('MD_dict', newDict);
+                        });
                         uni.api.base.apiuserinfo().then(function (res2) {
                           uni.setStorageSync('MD_userInfo2', res2);
                           uni.reLaunch({

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

@@ -187,7 +187,199 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _utils = __webpack_require__(/*! @/utils */ 44);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} //
 //
 //
 //
@@ -375,101 +567,30 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-
-var that;var _default =
-{
-  data: function data() {
-    // 页面数据变量
-    return {
-      userInfo: {},
-      skeletonLoading: true,
-      agentTypeList: ['', '自由经纪人', '渠道经纪人', '老业主'],
-      propertyList: [
-      {
-        estate_name: '在售项目1',
-        pri_image: 'https://zdcdn.2bwin.cn/uploads/20220501/af6eb9c2a5d462be10a15c2302e5e6b5.jpg',
-        sale_tag: '刚需好盘',
-        rulesInfo: {
-          des: '内容加载中1....',
-          des_content: '内容加载中2....' } }],
-
-
-
-      commonRulesShow: false,
-      propertyPopupShow: false,
-      currentPropertyIndex: 0,
-      // init请求返回的数据
-      data: {},
-      // 表单请求数据
-      form1: {},
-      scrollTop: 0,
-      reportStepCountObj: {} };
-
-  },
-  onPageScroll: function onPageScroll(e) {
-    this.scrollTop = e.scrollTop;
-  },
-  // 监听 - 页面每次【加载时】执行(如：前进)
-  onLoad: function onLoad() {
-    // that = this;
+//
+//
+var that;var _default = { data: function data() {// 页面数据变量
+    return { userInfo: {}, skeletonLoading: true, agentTypeList: ['', '自由经纪人', '渠道经纪人', '老业主'], propertyList: [{ estate_name: '在售项目1', pri_image: 'https://zdcdn.2bwin.cn/uploads/20220501/af6eb9c2a5d462be10a15c2302e5e6b5.jpg', sale_tag: '刚需好盘', rulesInfo: { des: '内容加载中1....', des_content: '内容加载中2....' } }], commonRulesShow: false, propertyPopupShow: false, currentPropertyIndex: 0, // init请求返回的数据
+      data: {}, // 表单请求数据
+      form1: {}, scrollTop: 0, reportStepCountObj: {}, areaTypeObj: {} };}, onPageScroll: function onPageScroll(e) {this.scrollTop = e.scrollTop;}, // 监听 - 页面每次【加载时】执行(如：前进)
+  onLoad: function onLoad() {// that = this;
     // this.options = options;
     // this.init(options);
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};},
-  // 监听 - 页面【首次渲染完成时】执行。注意如果渲染速度快，会在页面进入动画完成前触发
-  onReady: function onReady() {
-
-  },
-  // 监听 - 页面每次【显示时】执行(如：前进和返回) (页面每次出现在屏幕上都触发，包括从下级页面点返回露出当前页面)
-  onShow: function onShow() {
-    this.init();
-  },
-  // 监听 - 页面每次【隐藏时】执行(如：返回)
-  onHide: function onHide() {},
-  // 监听 - 页面触底部
-  onReachBottom: function onReachBottom() {},
-  // 监听 - 窗口尺寸变化(仅限:App、微信小程序)
-  onResize: function onResize() {},
-  // 监听 - 点击右上角转发时
-  onShareAppMessage: function onShareAppMessage(options) {},
-  // 监听 - 页面创建时
-  created: function created() {},
-  // 函数
-  methods: {
-    scanHandle: function scanHandle() {
-      uni.scanCode({
-        success: function success(res) {
-          uni.navigateTo({
-            url: "/pages/agent/recommend/detail2?id=".concat(res.result) });
-
-        } });
-
-    },
-    // 页面数据初始化函数
-    init: function init(options) {var _this = this;
-      var userInfo2 = uni.getStorageSync('MD_userInfo2');
-      this.userInfo = userInfo2 || {};
-      uni.api.estate.apireportcount().then(function (res) {
-        var reportStepCount = res.report_step_count || [];
-        var reportStepCountObj = {};
-        reportStepCount.forEach(function (item) {
-          reportStepCountObj[item.report_step] = item.total || 0;
-        });
-        _this.reportStepCountObj = _objectSpread({}, reportStepCountObj);
-      });
-      uni.api.estate.apiestatelist().then(function (res) {
-        var list = res.list || [];
-        // let oneObj = list[0] || {}
-        _this.propertyList = [list[0], list[1], list[2]];
-      });
-
-      // let currentTime = Date.parse(new Date()) / 1000; // 秒级
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};}, // 监听 - 页面【首次渲染完成时】执行。注意如果渲染速度快，会在页面进入动画完成前触发
+  onReady: function onReady() {}, // 监听 - 页面每次【显示时】执行(如：前进和返回) (页面每次出现在屏幕上都触发，包括从下级页面点返回露出当前页面)
+  onShow: function onShow() {this.init();var dictObj = uni.getStorageSync('MD_dict');this.areaTypeObj = (0, _utils.arrToObj)(dictObj.area_type);}, // 监听 - 页面每次【隐藏时】执行(如：返回)
+  onHide: function onHide() {}, // 监听 - 页面触底部
+  onReachBottom: function onReachBottom() {}, // 监听 - 窗口尺寸变化(仅限:App、微信小程序)
+  onResize: function onResize() {}, // 监听 - 点击右上角转发时
+  onShareAppMessage: function onShareAppMessage(options) {}, // 监听 - 页面创建时
+  created: function created() {}, // 函数
+  methods: { scanHandle: function scanHandle() {uni.scanCode({ success: function success(res) {uni.navigateTo({ url: "/pages/agent/recommend/detail2?id=".concat(res.result) });} });}, // 页面数据初始化函数
+    init: function init(options) {var _this = this;var userInfo2 = uni.getStorageSync('MD_userInfo2');this.userInfo = userInfo2 || {};uni.api.estate.apireportcount().then(function (res) {var reportStepCount = res.report_step_count || [];var reportStepCountObj = {};reportStepCount.forEach(function (item) {reportStepCountObj[item.report_step] = item.total || 0;});_this.reportStepCountObj = _objectSpread({}, reportStepCountObj);});uni.api.estate.apiestatelist().then(function (res) {var list = res.list || []; // let oneObj = list[0] || {}
+        _this.propertyList = [list[0], list[1], list[2]];}); // let currentTime = Date.parse(new Date()) / 1000; // 秒级
       // // 初始化平台数据
       // let systemConfig = vk.vuex.get('$app.systemConfig');
-
       // if (!systemConfig.use_skeleton) {
-      this.skeletonLoading = false;
-      // }
-
+      this.skeletonLoading = false; // }
       // if (vk.pubfn.isNull(systemConfig._id)) {
       // 	// 不存在则直接初始化
       // 	vk.callFunction({
@@ -491,7 +612,6 @@ var that;var _default =
       // 		});
       // 	}
       // }
-
       // // 请求经纪人个人数据
       // let lastInitAgentDataTime = vk.vuex.get('$user.history.lastInitAgentDataTime');
       // if (currentTime - lastInitAgentDataTime >= 60 && vk.checkToken()) {
@@ -510,7 +630,6 @@ var that;var _default =
       // 		vk.vuex.set('$user.history.lastInitAgentDataTime', currentTime);
       // 	});
       // }
-
       // // 请求未读消息数量
       // // 最快1分钟请求一次
       // let lastGetUnreadMsgTime = vk.vuex.get('$user.history.lastGetUnreadMsgTime');
@@ -522,14 +641,12 @@ var that;var _default =
       // 		vk.vuex.set('$user.history.lastGetUnreadMsgTime', currentTime);
       // 	});
       // }
-
       // // 请求在售项目列表
       // vk.callFunction({
       // 	url: 'client/agent/pub/getPropertyList',
       // 	needAlert: false
       // }).then(res => {
       // 	that.propertyList = res.list;
-
       // 	// 存储到vuex，方便其他页面调用
       // 	if (res.list.length < 5) {
       // 		// 若大于等于5则可能有更多项目，则不缓存
@@ -538,7 +655,6 @@ var that;var _default =
       // 		});
       // 		vk.vuex.set('$app.propertyList', list);
       // 	}
-
       // 	// 拼接佣金政策
       // 	// 非经纪人身份时显示佣金政策简介
       // 	// 否则显示最高可获得的佣金额度
@@ -554,28 +670,11 @@ var that;var _default =
       // 			that.propertyList[i].commissionText = '您最高可获得佣金' + item.amount + '元';
       // 		}
       // 	}
-
       // 	that.skeletonLoading = false;
       // });
-    },
-    pageTo: function pageTo(path) {
-      if (path === 'dev') {
-        uni.$msg('开发中~');
-        return;
-      }
-      uni.navigateTo({
-        url: path });
-
-    },
-    // 弹窗展示项目佣金详情
-    showDetail: function showDetail(index) {
-      this.currentPropertyIndex = index;
-      this.propertyPopupShow = true;
-    } },
-
-  // 监听器
-  watch: {},
-  // 计算属性
+    }, pageTo: function pageTo(path) {if (path === 'dev') {uni.$msg('开发中~');return;}uni.navigateTo({ url: path });}, // 弹窗展示项目佣金详情
+    showDetail: function showDetail(index) {this.currentPropertyIndex = index;this.propertyPopupShow = true;} }, // 监听器
+  watch: {}, // 计算属性
   computed: {} };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -234,6 +234,10 @@
   color: #303133;
   font-size: 32rpx;
 }
+.card-list-wrap .property-row-wrap .property-body .property-info-wrap .title .s.data-v-57280228 {
+  font-weight: normal;
+  padding-left: 10rpx;
+}
 .card-list-wrap .property-row-wrap .property-body .property-info-wrap .commission.data-v-57280228 {
   margin-top: 10rpx;
   font-size: 24rpx;

utils/http.js

@@ -64,6 +64,21 @@ const Http = (options = { data: {} }) => {
 											} else {
 												uni.setStorageSync('MD_userInfo', cData)
 												uni.setStorageSync('MD_token', cData.token)
+												uni.api.base.apidicttree().then(res => {
+													const cObj = res || {}
+													let newDict = {}
+													for (let k in cObj) {
+														const cArr = cObj[k].map(item => {
+															return {
+																...item,
+																key: item.dict_label,
+																val: item.dict_value
+															}
+														})
+														newDict[k] = cArr
+													}
+													uni.setStorageSync('MD_dict', newDict)
+												})
 												uni.api.base.apiuserinfo().then(res2 => {
 													uni.setStorageSync('MD_userInfo2', res2)
 													uni.reLaunch({