t

pages/agent/recommend/list.vue

@@ -268,32 +268,17 @@ export default {
 		}
 
 		// 项目筛选
-		// let propertyList = [] // xxxx.vuex.get('$app.propertyList');
-		// if (propertyList.length > 0) {
-		// 	that.filterData[1]['submenu'] = propertyList.map(function(val, index) {
-		// 		return { name: val.label, value: val.value };
-		// 	});
-		// 	that.filterData[1]['submenu'].unshift({ value: 999, name: '全部' });
-		// }
+		uni.api.estate.apiestatelist({page_size: 100}).then(res => {
+			let propertyList = res.list || []
+			console.log(res)
+			if (propertyList.length > 0) {
+				that.filterData[1]['submenu'] = propertyList.map(function(val, index) {
+					return { name: val.estate_name, value: val.estate_id };
+				});
+				that.filterData[1]['submenu'].unshift({ value: 999, name: '全部' });
+			}
+		})
 		
-		// xxxx.callFunction({
-		// 	url: 'client/agent/kh/getRecommendLogList',
-		// 	title: '请求中...',
-		// 	data: {
-		// 		pageIndex: that.loadmore.currnetPage,
-		// 		filterHours: that.filterHours,
-		// 		filterPropertyId: that.filterPropertyId,
-		// 		filterVerifyStatus: that.filterVerifyStatus,
-		// 		filterStepStatus: that.filterStepStatus,
-		// 		orderMethod: that.orderMethod,
-		// 		agent_id: xxxxx.vuex.get('$user.agentInfo._id')
-		// 	}
-		// }).then(res => {
-		// 	if (res.list.length < 10) {
-		// 		that.loadmore.status = 'nomore';
-		// 	}
-		// 	that.customerList = res.list;
-		// });
 		this.getDataList()
 	},
 	onReachBottom() {
@@ -321,6 +306,10 @@ export default {
 			if (that.filterStepStatus < 999) {
 				params.report_step = that.filterStepStatus
 			}
+			if (that.filterPropertyId < 999) {
+				params.estate_id = that.filterPropertyId
+			}
+			
 			if (that.orderMethod > 0) {
 				if (that.orderMethod === 1) {
 					params.order_by = JSON.stringify([{

pages/index/index.vue

@@ -33,8 +33,8 @@
 					立即登录
 				</u-button>
 				<view
-					v-if="userInfo.user_id" style="padding: 20px">
-					<u-icon name="/static/icon/setting.png" size="24" @click="pageTo('/pages/user/setting/setting')"></u-icon>
+					v-if="userInfo.user_id" style="padding: 20px" @click="pageTo('/pages/user/setting/setting')">
+					<u-icon name="/static/icon/setting.png" size="24"></u-icon>
 				</view>
 			</view>
 			<u-line length="650rpx" margin="30rpx 0 0"></u-line>

pages/user/setting/setting.vue

@@ -253,7 +253,7 @@ export default {
 				// 请求完新版本信息的回调
 				console.log(res.hasUpdate);
 				if (!res.hasUpdate) {
-					uni.toast('当前已是最新版本');
+					uni.$msg('当前已是最新版本');
 				}
 			});
 

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

@@ -762,7 +762,7 @@ function populateParameters(result) {var _result$brand =
 
   var parameters = {
     appId: "__UNI__1C40FB4",
-    appName: "mdapp",
+    appName: "房票科技",
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
@@ -871,7 +871,7 @@ var getAppBaseInfo = {
 
     result = sortObject(Object.assign(result, {
       appId: "__UNI__1C40FB4",
-      appName: "mdapp",
+      appName: "房票科技",
       appVersion: "1.0.0",
       appVersionCode: "100",
       appLanguage: getAppLanguage(hostLanguage),
@@ -1400,7 +1400,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_NAME":"mdapp","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -5309,7 +5309,7 @@ function _broadcast(componentName, eventName, params) {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_NAME":"mdapp","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !==
+if (typeof process !== 'undefined' && Object({"VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !==
 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
@@ -13663,7 +13663,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_NAME":"mdapp","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -13684,14 +13684,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_NAME":"mdapp","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_NAME":"mdapp","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -13777,7 +13777,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_NAME":"mdapp","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -14350,18 +14350,23 @@ var Http = function Http() {var options = arguments.length > 0 && arguments[0] !
           case 404:
           case 405:
             uni.removeStorageSync('MD_userInfo');
-            uni.removeStorageSync('MD_token');
-            // 差一个补是否绑定微信
-            if (uni.getStorageSync('APP_token')) {
+            var u2 = uni.getStorageSync('MD_userInfo2');
+            if (u2.bind_wechat === '1' && uni.getStorageSync('MD_token')) {
               uni.login({
                 success: function success(res) {
                   if (res.code) {
                     uni.api.base.apiwxautologin({ code: res.code }).then(function (cData) {
                       if (cData.token === 'error') {
-                        uni.removeStorageSync('APP_token');
+                        uni.removeStorageSync('MD_token');
                       } else {
-                        uni.setStorageSync('APP_userInfo', cData);
-                        uni.setStorageSync('APP_token', cData.token);
+                        uni.setStorageSync('MD_userInfo', cData);
+                        uni.setStorageSync('MD_token', cData.token);
+                        uni.api.base.apiuserinfo().then(function (res2) {
+                          uni.setStorageSync('MD_userInfo2', res2);
+                          uni.reLaunch({
+                            url: '/pages/index/index' });
+
+                        });
                       }
                     });
                   }
@@ -14372,10 +14377,10 @@ var Http = function Http() {var options = arguments.length > 0 && arguments[0] !
                 title: "\u8BF7\u5148\u767B\u5F55~",
                 icon: 'none' });
 
-            }
-            uni.navigateTo({
-              url: '/pages/user/login/login' });
+              uni.navigateTo({
+                url: '/pages/user/login/login' });
 
+            }
             break;
           default:
             uni.showModal({

unpackage/dist/dev/mp-weixin/pages/agent/recommend/list.js

@@ -480,32 +480,17 @@ var that;var _default =
     }
 
     // 项目筛选
-    // let propertyList = [] // xxxx.vuex.get('$app.propertyList');
-    // if (propertyList.length > 0) {
-    // 	that.filterData[1]['submenu'] = propertyList.map(function(val, index) {
-    // 		return { name: val.label, value: val.value };
-    // 	});
-    // 	that.filterData[1]['submenu'].unshift({ value: 999, name: '全部' });
-    // }
-
-    // xxxx.callFunction({
-    // 	url: 'client/agent/kh/getRecommendLogList',
-    // 	title: '请求中...',
-    // 	data: {
-    // 		pageIndex: that.loadmore.currnetPage,
-    // 		filterHours: that.filterHours,
-    // 		filterPropertyId: that.filterPropertyId,
-    // 		filterVerifyStatus: that.filterVerifyStatus,
-    // 		filterStepStatus: that.filterStepStatus,
-    // 		orderMethod: that.orderMethod,
-    // 		agent_id: xxxxx.vuex.get('$user.agentInfo._id')
-    // 	}
-    // }).then(res => {
-    // 	if (res.list.length < 10) {
-    // 		that.loadmore.status = 'nomore';
-    // 	}
-    // 	that.customerList = res.list;
-    // });
+    uni.api.estate.apiestatelist({ page_size: 100 }).then(function (res) {
+      var propertyList = res.list || [];
+      console.log(res);
+      if (propertyList.length > 0) {
+        that.filterData[1]['submenu'] = propertyList.map(function (val, index) {
+          return { name: val.estate_name, value: val.estate_id };
+        });
+        that.filterData[1]['submenu'].unshift({ value: 999, name: '全部' });
+      }
+    });
+
     this.getDataList();
   },
   onReachBottom: function onReachBottom() {
@@ -533,6 +518,10 @@ var that;var _default =
       if (that.filterStepStatus < 999) {
         params.report_step = that.filterStepStatus;
       }
+      if (that.filterPropertyId < 999) {
+        params.estate_id = that.filterPropertyId;
+      }
+
       if (that.orderMethod > 0) {
         if (that.orderMethod === 1) {
           params.order_by = JSON.stringify([{

unpackage/dist/dev/mp-weixin/pages/user/setting/setting.js

@@ -438,7 +438,7 @@ var that;var _default =
         // 请求完新版本信息的回调
         console.log(res.hasUpdate);
         if (!res.hasUpdate) {
-          uni.toast('当前已是最新版本');
+          uni.$msg('当前已是最新版本');
         }
       });
 

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

@@ -1,14 +1,20 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
     "es6": true,
     "postcss": true,
     "minified": true,
-    "checkSiteMap": false
+    "checkSiteMap": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -31,5 +37,9 @@
       "current": -1,
       "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

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

@@ -9,14 +9,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/user/setting/setting",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/user/setting/bank",
+          "pathName": "pages/agent/recommend/list",
           "query": "",
           "launchMode": "default",
           "scene": null

utils/http.js

@@ -52,19 +52,24 @@ const Http = (options = { data: {} }) => {
 					case 401:
 					case 404:
 					case 405:
-					uni.removeStorageSync('MD_userInfo')
-					uni.removeStorageSync('MD_token')
-					// 差一个补是否绑定微信
-						if (uni.getStorageSync('APP_token')) {
+						uni.removeStorageSync('MD_userInfo')
+						const u2 = uni.getStorageSync('MD_userInfo2')
+						if (u2.bind_wechat === '1' && uni.getStorageSync('MD_token')) {
 							uni.login({
 								success: function (res) {
 									if (res.code) {
 										uni.api.base.apiwxautologin({code: res.code}).then(cData => {
 											if (cData.token === 'error') {
-												uni.removeStorageSync('APP_token')
+												uni.removeStorageSync('MD_token')
 											} else {
-												uni.setStorageSync('APP_userInfo', cData)
-												uni.setStorageSync('APP_token', cData.token)
+												uni.setStorageSync('MD_userInfo', cData)
+												uni.setStorageSync('MD_token', cData.token)
+												uni.api.base.apiuserinfo().then(res2 => {
+													uni.setStorageSync('MD_userInfo2', res2)
+													uni.reLaunch({
+														url: '/pages/index/index'
+													})
+												})
 											}
 										})
 									}
@@ -74,11 +79,11 @@ const Http = (options = { data: {} }) => {
 							uni.showToast({
 								title: `请先登录~`,
 								icon: 'none',
+							})							
+							uni.navigateTo({
+								url: '/pages/user/login/login'
 							})
 						}
-						uni.navigateTo({
-							url: '/pages/user/login/login'
-						})
 					  break
 					default:
 						uni.showModal({