From 2d2756dc0e61ed8cd38c2796daf5cacdfdd49bf2 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期三, 20 八月 2025 18:46:54 +0800
Subject: [PATCH] 更新

---
 constant/url.js                |    1 
 pages/login/login.vue          |   57 ++++++---
 components/index/index-ads.vue |   64 ++++++++--
 manifest.json                  |    4 
 api/owner/ownerApi.js          |   13 +
 pages/index/authOwnerLog.vue   |    3 
 pages/index/authOwner.vue      |  111 +++++++++++-------
 conf/config.js                 |    2 
 api/user/userApi.js            |   89 +++++++++-----
 pages/fee/roomFeeListNew.vue   |    6 
 10 files changed, 228 insertions(+), 122 deletions(-)

diff --git a/api/owner/ownerApi.js b/api/owner/ownerApi.js
index 2d777af..94c2c21 100644
--- a/api/owner/ownerApi.js
+++ b/api/owner/ownerApi.js
@@ -379,8 +379,8 @@
 		msg = "璇烽�夋嫨鎴垮眿";
 	} else if (_data.link == "") {
 		msg = "璇峰~鍐欐墜鏈哄彿";
-	} else if (_data.ownerName == "") {
-		msg = "璇峰~鍐欎汉鍛樺悕绉�";
+	// } else if (_data.ownerName == "") {
+	// 	msg = "璇峰~鍐欎汉鍛樺悕绉�";
 	} else if (_data.ownerTypeCd == "") {
 		msg = "璇烽�夋嫨浜哄憳绫诲瀷";
 	}
@@ -400,12 +400,17 @@
 			data: _data,
 			success: function(res) {
 				let _json = res.data;
-				uni.showToast({
+				wx.showToast({
 					title: _json.msg,
 					icon: 'none',
 					duration: 5000
 				});
 				if (_json.code != 0) {
+					wx.showToast({
+						title: _json.msg,
+						icon: 'none',
+						duration: 5000
+					});
 					reject(_json.msg);
 					return;
 				}
@@ -413,7 +418,7 @@
 			},
 			fail: function(error) {
 				// 鏌ヨ澶辫触
-				reject();
+				reject(error);
 			}
 		});
 	})
diff --git a/api/user/userApi.js b/api/user/userApi.js
index e4702dd..2ce0a99 100644
--- a/api/user/userApi.js
+++ b/api/user/userApi.js
@@ -73,7 +73,7 @@
 					let _json = res.data;
 					if (_json.code == 0) {
 						uni.showToast({
-							title:_json.data,
+							title: _json.data,
 							icon: 'none',
 							duration: 5000
 						});
@@ -112,6 +112,33 @@
 					//鎴愬姛鎯呭喌涓嬭烦杞�
 					let _integral = _json.data;
 					resolve(_integral);
+					return;
+				}
+				reject();
+			},
+			fail: function(e) {
+				reject();
+			}
+		});
+	})
+}
+
+/**
+ * 鏌ヨ骞垮憡淇℃伅
+ * @param {Object} _objData
+ */
+export function advertsListApp(_objData) {
+	return new Promise((resolve, reject) => {
+		request({
+			url: url.queryAdvertsListApp,
+			method: "GET",
+			data: _objData, //鍔ㄦ�佹暟鎹�
+			success: function(res) {
+				console.log('==res==',res.data)
+				let _json = res.data;
+				if (_json.code == 0) {
+					//鎴愬姛鎯呭喌涓嬭烦杞�
+					resolve(_json);
 					return;
 				}
 				reject();
@@ -177,7 +204,7 @@
  * 鍒锋柊鐢ㄦ埛
  * @param {Object} _objData
  */
-export function refreshUserOpenId(_objData){
+export function refreshUserOpenId(_objData) {
 	return new Promise((resolve, reject) => {
 		requestNoAuth({
 			url: url.refreshOpenId,
@@ -199,7 +226,7 @@
 
 
 
-export function getWechatMiniOpenId(_objData){
+export function getWechatMiniOpenId(_objData) {
 	return new Promise((resolve, reject) => {
 		requestNoAuth({
 			url: url.getWechatMiniOpenId,
@@ -222,7 +249,7 @@
  * 鍒锋柊鐢ㄦ埛
  * @param {Object} _objData
  */
-export function getOpenIdFromAliPay(_objData){
+export function getOpenIdFromAliPay(_objData) {
 	return new Promise((resolve, reject) => {
 		requestNoAuth({
 			url: url.getOpenIdFromAliPay,
@@ -245,7 +272,7 @@
  * 鍒锋柊鐢ㄦ埛
  * @param {Object} _objData
  */
-export function queryDict(_objData){
+export function queryDict(_objData) {
 	return new Promise((resolve, reject) => {
 		requestNoAuth({
 			url: url.queryDict,
@@ -268,7 +295,7 @@
 /**
  * 鏌ヨ娲诲姩鍒楄〃
  */
-export function generatorUserQrCode( _that) {
+export function generatorUserQrCode(_that) {
 	let obj = {
 		tel: '123'
 	};
@@ -291,7 +318,7 @@
 		})
 }
 
-export function getCommunityWechatAppId(_objData){
+export function getCommunityWechatAppId(_objData) {
 	return new Promise((resolve, reject) => {
 		requestNoAuth({
 			url: url.getCommunityWechatAppId,
@@ -331,12 +358,12 @@
 						return;
 					}
 					//todo 淇濆瓨涓氫富淇℃伅
-					uni.setStorageSync("userInfo",_json.data);
-					uni.setStorageSync("currentCommunityInfo",{
-						communityId:_json.data.communityId,
-						communityName:_json.data.communityName,
-						sCommunityTel:_json.data.communityTel,
-						communityQrCode:_json.data.communityQrCode
+					uni.setStorageSync("userInfo", _json.data);
+					uni.setStorageSync("currentCommunityInfo", {
+						communityId: _json.data.communityId,
+						communityName: _json.data.communityName,
+						sCommunityTel: _json.data.communityTel,
+						communityQrCode: _json.data.communityQrCode
 					});
 					resolve(_json.data);
 				},
@@ -377,34 +404,34 @@
 		})
 }
 
-export function getUserId(){
+export function getUserId() {
 	let _userInfo = uni.getStorageSync("userInfo");
-	if(!_userInfo){
+	if (!_userInfo) {
 		return null;
 	}
-	
+
 	return _userInfo.userId;
 }
 
-export function getUserName(){
+export function getUserName() {
 	let _userInfo = uni.getStorageSync("userInfo");
-	if(!_userInfo){
+	if (!_userInfo) {
 		return null;
 	}
-	
+
 	return _userInfo.userName;
 }
 
-export function getUserTel(){
+export function getUserTel() {
 	let _userInfo = uni.getStorageSync("userInfo");
-	if(!_userInfo){
+	if (!_userInfo) {
 		return null;
 	}
-	
+
 	return _userInfo.ownerTel;
 }
 
-export function ownerRegiter(_data){
+export function ownerRegiter(_data) {
 	return new Promise(
 		(resolve, reject) => {
 			requestNoAuth({
@@ -447,12 +474,12 @@
 					return;
 				}
 				//todo 淇濆瓨涓氫富淇℃伅
-				uni.setStorageSync("userInfo",_json.data);
-				uni.setStorageSync("currentCommunityInfo",{
-					communityId:_json.data.communityId,
-					communityName:_json.data.communityName,
-					sCommunityTel:_json.data.communityTel,
-					communityQrCode:_json.data.communityQrCode
+				uni.setStorageSync("userInfo", _json.data);
+				uni.setStorageSync("currentCommunityInfo", {
+					communityId: _json.data.communityId,
+					communityName: _json.data.communityName,
+					sCommunityTel: _json.data.communityTel,
+					communityQrCode: _json.data.communityQrCode
 				});
 				resolve(_json.data);
 			},
@@ -461,6 +488,4 @@
 			}
 		});
 	})
-}
-
-
+}
\ No newline at end of file
diff --git a/components/index/index-ads.vue b/components/index/index-ads.vue
index a1c9535..209b0f6 100644
--- a/components/index/index-ads.vue
+++ b/components/index/index-ads.vue
@@ -3,9 +3,9 @@
 		<view class="home_swiper">
 			<swiper class="ad-swiper bg-white" indicator-dots="true" indicator-color="rgba(228,228,228,1)"
 				indicator-active-color="#FECA49" autoplay="true" interval="5000" duration="1000" circular="true">
-				<block v-for="(item, index) in ad" :key="index" @click="_advertJump(item)">
-					<swiper-item>
-						<image style="height:100%;width: 100%" :src="item.url"></image>
+				<block v-for="(item, index) in ad" :key="index">
+					<swiper-item @click="_advertJump(item)">
+						<image style="height:100%;width: 100%" :src="item.ossUrl"></image>
 					</swiper-item>
 				</block>
 			</swiper>
@@ -21,43 +21,75 @@
 		loadActivites,
 		loadAdverts
 	} from '../../api/index/indexApi.js'
+	import {
+		advertsListApp
+	} from '@/api/user/userApi.js';
 	export default {
 		name: "indexAds",
 		data() {
 			return {
 				banner: [{
-						url: this.imgUrl+'/h5/images/serve/banner1.jpg'
+						ossUrl: this.imgUrl + '/h5/images/serve/banner1.jpg'
 					},
 					{
-						url: this.imgUrl+'/h5/images/serve/banner2.jpg'
+						ossUrl: this.imgUrl + '/h5/images/serve/banner2.jpg'
 					}
 				],
-				ad:[],
+				ad: [],
 			};
 		},
 		created() {
+			console.log('==_loadAdvertPhoto==')
 			this._loadAdvertPhoto();
 		},
-		methods:{
+		methods: {
+
+			// _loadAdvertPhoto: function() {
+			// 	let _that = this;
+			// 	let _objData = {
+			// 		page: 1,
+			// 		row: 5,
+			// 		locationTypeCd: '2000',
+			// 		viewType: '8888',
+			// 		clientType: 'H5'
+			// 	};
+			// 	//鏌ヨ 骞垮憡
+			// 	loadAdverts(_objData)
+			// 		.then(function(_aPhotos) {
+			// 			_that.ad = _aPhotos;
+			// 			if(!_aPhotos || _aPhotos.length <1){
+			// 				_that.ad = _that.banner;
+			// 			}
+			// 		});
+			// },
 			_loadAdvertPhoto: function() {
+				// console.log('==_loadAdvertPhoto==')
 				let _that = this;
 				let _objData = {
-					page: 1,
-					row: 5,
-					locationTypeCd: '2000',
-					viewType: '8888',
-					clientType: 'H5'
+					position: '涓氫富灏忕▼搴忛椤佃疆鎾浘',
 				};
 				//鏌ヨ 骞垮憡
-				loadAdverts(_objData)
+				advertsListApp(_objData)
 					.then(function(_aPhotos) {
-						_that.ad = _aPhotos;
-						if(!_aPhotos || _aPhotos.length <1){
+						_that.ad = _aPhotos.data;
+						console.log('==_that.ad==', _that.ad)
+						if (!_aPhotos || _that.ad.length < 1) {
 							_that.ad = _that.banner;
 						}
 					});
 			},
 			_advertJump: function(ad) {
+				if (!ad) return;
+				// 浼樺厛鍒ゆ柇鏄惁鏈夌洿鎺ョ殑澶栭儴閾炬帴
+				if (ad.url) {
+					let url = encodeURIComponent(ad.url)
+					uni.navigateTo({
+						url: '/pages/fee/webview?url=' + url
+					})
+					return;
+				}
+
+
 				if (ad.advertType == 3 || !ad.pageUrl) {
 					return;
 				}
@@ -85,4 +117,4 @@
 	.home_swiper {
 		margin-bottom: 20upx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/conf/config.js b/conf/config.js
index 6c04981..e2c0e44 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -16,7 +16,7 @@
 // #ifndef H5
 //鏈嶅姟鍣ㄥ煙鍚� 灏忕▼搴� 鎴栬�� app 鏃� 鍚庣鍦板潃 
 const baseUrl = 'https://zxshlx.com/';
-// const baseUrl = 'http://192.168.31.137:8008/';
+// const baseUrl = 'http://192.168.31.222:8008/';
 // const baseUrl = 'http://47.92.223.85:8008/';
 // #endif
 
diff --git a/constant/url.js b/constant/url.js
index 52ff486..a2d7a6f 100644
--- a/constant/url.js
+++ b/constant/url.js
@@ -20,6 +20,7 @@
 	listComplaintEvent: baseUrl + 'app/complaint.listPhoneComplaintEvent', //娣诲姞鎶曡瘔寤鸿
 	saveComplaintAppraise: baseUrl + 'app/complaintAppraise.saveComplaintAppraise', //娣诲姞鎶曡瘔寤鸿
 	listComplaintType: baseUrl + 'app/complaint.queryPhoneComplaintType', //鏌ヨ鎶曡瘔绫诲瀷
+	queryAdvertsListApp: baseUrl + 'app/smallProgram.advertsListApp', //鏌ヨ骞垮憡
 	
 	saveComplaint: baseUrl + 'app/complaint.saveComplaint', //鏌ヨ涓氫富鎴块棿
 	queryRoomsByOwner: baseUrl + 'app/room.queryPhoneOwnerRooms', //缁戝畾涓氫富
diff --git a/manifest.json b/manifest.json
index 8ea6990..62557d1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,7 +62,9 @@
         "appid" : "wx780f11f414d30cbf",
         "setting" : {
             "urlCheck" : false,
-            "es6" : false
+            "es6" : false,
+            "postcss" : true,
+            "minified" : true
         },
         "navigateToMiniProgramAppIDList" : [ "wxa4211361ca1e1bfb" ], //鍟嗗煄灏忕▼搴廇ppId
         "permission" : {
diff --git a/pages/fee/roomFeeListNew.vue b/pages/fee/roomFeeListNew.vue
index bb13680..7bdab92 100644
--- a/pages/fee/roomFeeListNew.vue
+++ b/pages/fee/roomFeeListNew.vue
@@ -5,18 +5,18 @@
 				<view class="flex text-center">
 					<view class="cu-item flex-sub" :class="item.roomId==curRoom.roomId?'text-green cur':''" v-for="(item,index) in rooms"
 					 :key="index" @tap="switchRoom(item)" :data-id="index">
-						{{item.floorNum}}鏍媨{item.roomNum}}瀹�
+						{{item.floorNum}}-{{item.unitNum}}-{{item.roomNum}}
 					</view>
 				</view>
 			</scroll-view>
 			<scroll-view v-if="rooms.length >4" scroll-x class="bg-white nav" scroll-with-animation scroll-left="true">
 				<view class="cu-item flex-sub" :class="item.roomId==curRoom.roomId?'text-green cur':''" v-for="(item,index) in rooms"
 				 :key="index" @tap="switchRoom(item)" :data-id="index">
-					{{item.floorNum}}鏍媨{item.roomNum}}瀹�
+					{{item.floorNum}}-{{item.unitNum}}-{{item.roomNum}}
 				</view>
 			</scroll-view>
 		</view>
-		<view v-if="rooms.length == 1" class="block__title">{{rooms[0].floorNum}}鏍媨{rooms[0].roomNum}}瀹�</view>
+		<view v-if="rooms.length == 1" class="block__title">{{rooms[0].floorNum}}-{{rooms[0].unitNum}}-{{rooms[0].roomNum}}</view>
 		<view v-if="rooms.length > 1" class="margin-header-top"></view>
 		<view v-if="noData == false" style="padding-bottom: 200rpx;">
 			<view class="cu-list menu" v-if="moreRooms.length > 0" v-for="(fee, idx) in moreRooms" :key="idx" :data-item="fee"
diff --git a/pages/index/authOwner.vue b/pages/index/authOwner.vue
index 6c11a90..1c8cbed 100644
--- a/pages/index/authOwner.vue
+++ b/pages/index/authOwner.vue
@@ -12,17 +12,18 @@
 		</view>
 		<view class="cu-form-group arrow" v-if="communityId" @tap="chooseRoom">
 			<view class="title">鎴垮眿</view>
-			<input readonly v-model="roomName" class="text-right" placeholder="璇烽�夋嫨鎴垮眿"  icon="arrow"></input>
+			<input readonly v-model="roomName" class="text-right" placeholder="璇烽�夋嫨鎴垮眿" icon="arrow"></input>
 			<text class='cuIcon-right'></text>
 		</view>
 		<view class="block__title">浜哄憳淇℃伅</view>
-		<view class="cu-form-group">
-			<view class="title">浜哄憳鍚嶇О</view>
-			<input v-model="ownerName" placeholder="璇疯緭鍏ュ悕绉�" class="text-right"></input>
-		</view>
+		<!-- <view class="cu-form-group">
+            <view class="title">浜哄憳鍚嶇О</view>
+            <input v-model="ownerName" placeholder="璇疯緭鍏ュ悕绉�" class="text-right"></input>
+        </view> -->
 		<view class="cu-form-group">
 			<view class="title">鎵嬫満鍙�</view>
-			<input v-model="link" disabled="disabled" placeholder="璇疯緭鍏ユ墜鏈哄彿" class="text-right"></input>
+			<input v-model="link" placeholder="璇疯緭鍏ユ墜鏈哄彿" class="text-right"></input>
+			<text v-if="errorMessage" class="error-message">{{ errorMessage }}</text>
 		</view>
 		<view class="cu-form-group">
 			<view class="title">浜哄憳绫诲瀷</view>
@@ -32,33 +33,38 @@
 				</view>
 			</picker>
 		</view>
-		
+
 		<view class="flex flex-direction margin-top margin-bottom">
 			<button class="cu-btn bg-blue margin-tb-sm lg" @click="_doAuthOwner()">鎻愪氦</button>
 		</view>
-
 	</view>
 </template>
 
 <script>
-	import {getCommunitys} from '../../api/community/communityApi.js';
-	import {getUserTel} from '../../api/user/userApi.js';
-	import {authOwner} from '../../api/owner/ownerApi.js';
+	import {
+		getCommunitys
+	} from '../../api/community/communityApi.js';
+	import {
+		getUserTel
+	} from '../../api/user/userApi.js';
+	import {
+		authOwner
+	} from '../../api/owner/ownerApi.js';
+
 	export default {
 		data() {
 			return {
 				communityIndex: 0,
-				communityId:'',
-				roomId:'',
-				roomName:'',
-				link:'',
-				ownerName:'',
+				communityId: '',
+				roomId: '',
+				roomName: '',
+				link: '',
+				ownerName: '',
 				communitys: [{
 					communityId: '',
 					name: '璇烽�夋嫨灏忓尯'
 				}],
-				"typeCds": [
-					{
+				typeCds: [{
 						value: '1001',
 						name: '涓氫富'
 					},
@@ -67,8 +73,9 @@
 						name: '鎴愬憳'
 					}
 				],
-				"typeCdIndex": 0,
-				"ownerTypeCd": "1001",
+				typeCdIndex: 0,
+				ownerTypeCd: "1001",
+				errorMessage: '' // 鏂板涓�涓敤浜庡瓨鏀鹃敊璇俊鎭殑瀛楁
 			}
 		},
 		onLoad(options) {
@@ -77,7 +84,7 @@
 		},
 		onShow() {
 			let _selectRoom = uni.getStorageSync('selectRoom');
-			if(_selectRoom){
+			if (_selectRoom) {
 				this.roomName = _selectRoom.roomName;
 				this.roomId = _selectRoom.roomId;
 				uni.removeStorageSync('selectRoom');
@@ -89,41 +96,56 @@
 				let selected = this.communitys[this.communityIndex] //鑾峰彇閫変腑鐨勬暟缁�
 				this.communityId = selected.communityId; //閫変腑鐨刬d
 			},
-			_loadCommunitys:function(){
-				let _that =this;
+			_loadCommunitys: function() {
+				let _that = this;
 				getCommunitys({
-					page:1,
-					row:500
-				}).then(_communitys=>{
-					_communitys.forEach(_c=>{
+					page: 1,
+					row: 500
+				}).then(_communitys => {
+					_communitys.forEach(_c => {
 						_that.communitys.push(_c);
 					})
-					
 				})
 			},
-			chooseRoom:function(){
+			chooseRoom: function() {
 				uni.navigateTo({
-					url:'/pages/family/selectRoom?communityId='+this.communityId
+					url: '/pages/family/selectRoom?communityId=' + this.communityId
 				})
 			},
-			_changeTypeCd: function(e){
+			_changeTypeCd: function(e) {
 				this.typeCdIndex = e.detail.value;
 				this.ownerTypeCd = this.typeCds[this.typeCdIndex].value;
 			},
-			_doAuthOwner:function(){
+			_doAuthOwner: function() {
+				姝e垯楠岃瘉鎵嬫満鍙锋牸寮�
+				const phoneRegex = /^1[3-9]\d{9}$/; // 姝g‘鐨勬墜鏈哄彿鏍煎紡
+				if (!phoneRegex.test(this.link)) {
+					this.errorMessage = '璇疯緭鍏ユ湁鏁堢殑鎵嬫満鍙�'; // 璁剧疆閿欒淇℃伅
+					return; // 濡傛灉鎵嬫満鍙锋牸寮忎笉瀵癸紝鍋滄鎵ц
+				} else {
+					this.errorMessage = ''; // 娓呴櫎閿欒淇℃伅
+				}
+
 				authOwner({
-					communityId:this.communityId,
-					roomName:this.roomName,
-					roomId:this.roomId,
-					link:this.link,
-					ownerName:this.ownerName,
-					ownerTypeCd:this.ownerTypeCd,
-				}).then(_data=>{
-					//todo 璺宠浆鍒拌璇佸巻鍙查〉闈�
+					communityId: this.communityId,
+					roomName: this.roomName,
+					roomId: this.roomId,
+					link: this.link,
+					ownerName: this.ownerName,
+					ownerTypeCd: this.ownerTypeCd,
+				}).then(_data => {
+					// todo 璺宠浆鍒拌璇佸巻鍙查〉闈�
 					uni.navigateTo({
-						url:'/pages/index/authOwnerLog'
+						url: '/pages/index/authOwnerLog'
 					})
-				})
+				}).catch(err => {
+					// 澶勭悊閿欒鎯呭喌
+					wx.showToast({
+						icon: 'none',
+						title: err || '璁よ瘉澶辫触锛岃閲嶈瘯' // 鎻愪緵涓�涓粯璁ょ殑閿欒鎻愮ず
+					});
+				});
+
 			}
 		}
 	}
@@ -138,7 +160,8 @@
 		padding: 40rpx 30rpx 20rpx;
 	}
 
-	.button_up_blank {
-		height: 40rpx;
+	.error-message {
+		color: red;
+		/* 閿欒淇℃伅鐨勭孩鑹插瓧浣� */
 	}
 </style>
\ No newline at end of file
diff --git a/pages/index/authOwnerLog.vue b/pages/index/authOwnerLog.vue
index 779a847..1a63b5d 100644
--- a/pages/index/authOwnerLog.vue
+++ b/pages/index/authOwnerLog.vue
@@ -5,7 +5,8 @@
 			<view v-for="(item,index) in appUsers" :key="index" class="bg-white margin-bottom margin-right-xs radius margin-left-xs padding padding-bottom-xs">
 				<view class="flex padding-bottom-xs solid-bottom justify-between">
 					<view>{{item.roomName || '-'}}</view>
-					<view class="text-red" v-if="item.state == '10000'">瀹℃牳涓�</view>
+					<view class="text-red" v-if="item.state == '10000'">寰呭鏍�</view>
+					<view class="text-red" v-else-if="item.state == '11000'">寰呰璇�</view>
 					<view class="text-red" v-else-if="item.state == '12000'">璁よ瘉瀹屾垚</view>
 					<view class="text-red" v-else-if="item.state == '13000'">璁よ瘉澶辫触</view>
 					<view class="text-red" v-else>鏈煡鐘舵��</view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7afa7c0..a281738 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -8,7 +8,7 @@
 		<view class="margin-top padding-left padding-right radius" v-if="!loginByPhone">
 			<view class="cu-form-group margin-top">
 				<view class="title">鐢ㄦ埛鍚�</view>
-				<input placeholder="璇疯緭鍏ョ敤鎴峰悕" name="input" v-model="username"></input>
+				<input placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" name="input" v-model="username"></input>
 			</view>
 			<view class="cu-form-group border-bottom">
 				<view class="title">瀵嗙爜</view>
@@ -31,7 +31,7 @@
 		<view class="padding flex flex-direction margin-top">
 			<button class="cu-btn bg-blue lg" @click="_doLogin()">鐧诲綍</button>
 			<!-- #ifdef MP-WEIXIN -->
-			<wechat-login ref="wechatLoginRef"></wechat-login>
+			<!-- <wechat-login ref="wechatLoginRef"></wechat-login> -->
 			<!-- #endif -->
 		</view>
 		<!-- #ifdef H5 -->
@@ -55,10 +55,10 @@
 	import context from '../../lib/java110/Java110Context.js';
 
 	import {
-		
+
 		getLoginCode
 	} from '../../lib/java110/page/Page.js';
-	
+
 	import {
 		saveOwnerStorage,
 		saveUserLoginInfo,
@@ -67,7 +67,7 @@
 		saveWAppId,
 		getLoginFlag
 	} from '@/lib/java110/utils/StorageUtil.js';
-	import wechatLogin from '@/components/user/wechat-login.vue';
+	// import wechatLogin from '@/components/user/wechat-login.vue';
 
 	const constant = context.constant;
 	const factory = context.factory;
@@ -98,14 +98,14 @@
 				uni.setStorageSync(constant.mapping.W_APP_ID, wAppId);
 			}
 			// #ifdef MP-WEIXIN
-			setTimeout(function(){
+			setTimeout(function() {
 				that.$refs.wechatLoginRef._initWechatLogin();
-			},1000)
+			}, 1000)
 			// #endif
 		},
-		components:{
-			wechatLogin
-		},
+		// components: {
+		// 	wechatLogin
+		// },
 		methods: {
 			_doLogin: function() {
 				let _that = this;
@@ -130,17 +130,34 @@
 					appId: this.vc.getWAppId(),
 					loginByPhone: this.loginByPhone
 				};
-				ownerLogin(this,_obj)
+				ownerLogin(this, _obj)
 					.then((_user) => {
 						//todo 淇濆瓨鐧诲綍淇℃伅
-						saveUserLoginInfo(_user.userId, _user.token, _user.key);
-						uni.navigateTo({
-							url:'/pages/login/loginInitWechat?communityId='+_user.communityId
-						})
-					},err=>{
-						uni.showToast({
-							icon:'none',
-							title:err
+						if (_user.auditState == "11000") {
+							saveUserLoginInfo(_user.userId, _user.token, _user.key);
+							uni.navigateTo({
+								url: '/pages/index/authOwnerLog'
+							})
+						} else if (_user.auditState == "10000") {
+							uni.showToast({
+								icon: 'none',
+								title: '鎮ㄦ彁浜ょ殑鎴垮眿璁よ瘉瀹℃牳涓紝璇疯仈绯荤墿涓氱鐞嗕汉鍛�'
+							})
+						} else if (_user.auditState == "13000") {
+							uni.showToast({
+								icon: 'none',
+								title: '鎮ㄦ彁浜ょ殑鎴垮眿璁よ瘉瀹℃牳澶辫触锛岃鑱旂郴鐗╀笟绠$悊浜哄憳'
+							})
+						} else {
+							saveUserLoginInfo(_user.userId, _user.token, _user.key);
+							uni.navigateTo({
+								url: '/pages/login/loginInitWechat?communityId=' + _user.communityId
+							})
+						}
+					}, err => {
+						wx.showToast({
+							icon: 'none',
+							title: err
 						})
 					});
 			},
@@ -193,4 +210,4 @@
 		color: #FFFFFF;
 		font-size: 30upx;
 	}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.8.0