From 269fa3579cf74d244b46f8fadb5923645939f67b Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Thu, 9 Feb 2023 09:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=9C=E4=BA=8B=20?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/request.js            | 2 +-
 pages/massif/add_farming.vue | 4 ++--
 store/index.js               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/request.js b/common/request.js
index b09e111..2d6f4b0 100644
--- a/common/request.js
+++ b/common/request.js
@@ -3,7 +3,7 @@ import store from "@/store"
 export function host(host='default',suffix='/plant_manage'){
 	var url=process.env.NODE_ENV === 'development'?{
 			// default:`http://dpe74u.natappfree.cc` //陈
-			default:`http://7xa7q2.natappfree.cc` //马
+			default:`http://nys8cm.natappfree.cc` //马
 			// default:`http://7r39sr.natappfree.cc` //何
 			// default:`http://192.168.0.116:8080` //孙
 		}:{
diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue
index 827d499..a7506ac 100644
--- a/pages/massif/add_farming.vue
+++ b/pages/massif/add_farming.vue
@@ -118,7 +118,7 @@
 			<view class="title">农事类型</view>
 			<view class="content">
 				<text :class="{active:formData.farmingType==v.value}" v-for="(v,k) in typeList" :key="k" @click="formData.farmingType=v.value">{{v.label}}</text>
-				<text>自定义+</text>
+				<text @click="isShow=true">自定义+</text>
 			</view>
 		</view>
 
@@ -144,7 +144,7 @@
 			</u-form>
 		</view>
 		<u-popup :show="isShow" closeOnClickOverlay @close="isShow=false">
-			<input placeholder="请输入" confirm-type="done" v-model="tempType" @confirm=""/>
+			<input placeholder="请输入" :focus="isShow" confirm-type="done" v-model="tempType" @confirm=""/>
 		</u-popup>
 	</view>
 </template>
diff --git a/store/index.js b/store/index.js
index 43769c6..fd19034 100644
--- a/store/index.js
+++ b/store/index.js
@@ -23,9 +23,9 @@ export default new Vuex.Store({
 		outLogin(state){
 			state.userInfo={}
 			state.token=''
-			// uni.reLaunch({
-			// 	url:"/pages/home/login",
-			// })
+			uni.reLaunch({
+				url:"/pages/home/login",
+			})
 		},
 		setHeadImg(state,val){
 			state.userInfo.avatar=val