Bläddra i källkod

feat:修改页面状态名称

wangsisi 4 dagar sedan
förälder
incheckning
cee5bbbdf5

+ 1 - 1
src/App.vue

@@ -138,7 +138,7 @@ const router = useRouter();
 // 首页loading加载完才显示底部导航栏
 const showTab = ref(false);
 // 0: 农户, 1: 专家, 2:农资农服
-const curRole = ref(1);
+const curRole = ref(0);
 
 let tabBarHeight = 0;
 onMounted(() => {

+ 18 - 3
src/views/old_mini/create_farm/editMap.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="edit-map">
-        <custom-header name="创建农场" :isGoBack="true" @goback="backgToCreate"></custom-header>
+        <custom-header :name="type === 'edit' ? '编辑农场' : '创建农场'" :isGoBack="true" @goback="backgToCreate"></custom-header>
         <div class="edit-map-content">
             <div class="edit-map-tip">操作提示:拖动圆点,即可调整地块边界</div>
             <div class="map-container" ref="mapContainer"></div>
@@ -51,9 +51,11 @@ const mapData = {
 
 const pointAddress = ref(null)
 const pointName = ref(null)
+const type = ref(null)
 onMounted(() => {
     pointAddress.value = route.query.pointAddress
     pointName.value = route.query.pointName
+    type.value = route.query.type
     const point = route.query.mapCenter || "POINT (113.6142086995688 23.585836479509055)"
     editMap.initMap(point, mapContainer.value);
     // editMap.setAreaGeometry([{ featureWkt: mapData.wkt }]);
@@ -77,17 +79,30 @@ onDeactivated(() => {
 })
 const goBack = () => {
     editMap.clearLayer()
-    router.replace("/create_farm")
+    if (type.value !== 'edit') {
+        router.replace("/create_farm")
+    }else{
+        router.back()
+    }
 };
 
 function backgToCreate() {
     router.replace("/create_farm")
+    if (type.value !== 'edit') {
+        router.replace("/create_farm")
+    }else{
+        router.back()
+    }
 }
 const confirm = () => {
     // getAreaGeometry
     const polygonData = editMap.getAreaGeometry()
     store.commit("home/SET_FARM_POLYGON", polygonData);
-    router.replace("/create_farm")
+    if (type.value !== 'edit') {
+        router.replace("/create_farm")
+    }else{
+        router.back()
+    }
 };
 </script>
 

+ 5 - 7
src/views/old_mini/create_farm/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="create-farm">
-        <custom-header :name="isClient ? '新增用户' : '创建农场'" :isGoBack="true" @goback="backgToHome"></custom-header>
+        <custom-header :name="paramsType === 'client' ? '新增用户' : paramsType === 'edit' ? '编辑农场': '创建农场'" :isGoBack="true" @goback="backgToHome"></custom-header>
         <!-- 地图 -->
         <div class="map-container" ref="mapContainer"></div>
         <div class="farm-content">
@@ -35,7 +35,7 @@
                     <div class="box-content">
                         <div class="create-title">
                             <img class="title-icon" src="@/assets/img/home/create-icon.png" alt="" />
-                            {{ isClient ? "新增用户" : "创建农场" }}
+                            {{ paramsType === 'client' ? "新增用户" : paramsType === 'edit' ?"编辑农场":"创建农场" }}
                         </div>
                         <div class="create-content">
                             <div class="create-from">
@@ -109,7 +109,7 @@
                             <div class="create-btn">
                                 <div class="btn-item sencond-btn" @click="resetForm(ruleFormRef)">取消</div>
                                 <div class="btn-item primary-btn" @click="submitForm(ruleFormRef)">
-                                    {{ isClient ? "添加" : "立即创建" }}
+                                    {{ paramsType === 'client' ? "添加" : paramsType === 'edit' ?"确认修改":"立即创建" }}
                                 </div>
                             </div>
                         </div>
@@ -147,11 +147,9 @@ onMounted(() => {
 });
 
 const polygonArr = ref(null);
-const isClient = ref(false);
+const paramsType = ref(null);
 onActivated(() => {
-    if (route.query.type) {
-        isClient.value = true;
-    }
+    paramsType.value = route.query.type;
     if (route.query.isFromHome) {
         centerPoint.value = store.state.home.miniUserLocationPoint;
         const arr = convertPointToArray(centerPoint.value);

+ 2 - 2
src/views/old_mini/home/components/farmInfoPopup.vue

@@ -52,12 +52,12 @@ const handleShow = () => {
 
 const handleEditMap = () => {
     router.push(
-        `/edit_map?mapCenter=${store.state.home.miniUserLocationPoint}&pointName=${farmInfo.value.address}&pointAddress=${farmInfo.value.address}`
+        `/edit_map?mapCenter=${store.state.home.miniUserLocationPoint}&pointName=${farmInfo.value.address}&pointAddress=${farmInfo.value.address}&type=edit`
     );
 };
 
 const handleEdit = () => {
-    router.push("/create_farm");
+    router.push("/create_farm?type=edit");
 };
 
 const handleCancel = () => {