ccj 3 năm trước cách đây
mục cha
commit
45d356a5a0

+ 0 - 1
components/upload.vue

@@ -283,7 +283,6 @@
 				immediate: true,
 				immediate: true,
 				handler(val) {
 				handler(val) {
 					val.map(value => {
 					val.map(value => {
-						console.log(1111)
 						this.lists.push({
 						this.lists.push({
 							url: value.url,
 							url: value.url,
 							error: false,
 							error: false,

+ 1 - 0
pages.json

@@ -151,6 +151,7 @@
 			"path": "pages/grain_pulse/editcompany",
 			"path": "pages/grain_pulse/editcompany",
 			"style": {
 			"style": {
 				"enablePullDownRefresh": true,
 				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "我的粮脉"
 				"navigationBarTitleText": "我的粮脉"
 			}
 			}
 		},
 		},

+ 2 - 2
pages/grain_pulse/editcompany.vue

@@ -260,10 +260,11 @@
 				this.position=JSON.parse(options.position)
 				this.position=JSON.parse(options.position)
 				this.position.city=this.position.city.toString()
 				this.position.city=this.position.city.toString()
 			}
 			}
+			this.getList()
+			
 		},
 		},
 		onShow() {
 		onShow() {
 			console.log(11111)
 			console.log(11111)
-			this.getList()
 			if(this.$store.state.enter){
 			if(this.$store.state.enter){
 				this.deptList.compName=this.$store.state.enter.compName
 				this.deptList.compName=this.$store.state.enter.compName
 				this.deptList.title=this.$store.state.enter.title
 				this.deptList.title=this.$store.state.enter.title
@@ -281,7 +282,6 @@
 					this.deptList.companyProfile=this.$store.state.enter.companyProfile
 					this.deptList.companyProfile=this.$store.state.enter.companyProfile
 				}
 				}
 			}
 			}
-			
 		},
 		},
 		computed: {
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 			...mapState(['hasLogin', 'userInfo'])

+ 12 - 10
pages/grain_pulse/localtion/coordinate.nvue

@@ -162,16 +162,18 @@
 				// console.log("this.position",this.position)
 				// console.log("this.position",this.position)
 					// this.position.selectLocation = this.position.longitude+","+this.position.latitude
 					// this.position.selectLocation = this.position.longitude+","+this.position.latitude
 					// console.log("this.position",this.position)
 					// console.log("this.position",this.position)
-					if(this.$store.state.enter.id){
-						uni.navigateTo({
-							url:"/pages/grain_pulse/editcompany?position="+JSON.stringify(this.position)
-						})
-					}else{
-						uni.navigateTo({
-							url:"/pages/grain_pulse/enter?position="+JSON.stringify(this.position)
-						})
-					}
-				
+					// if(this.$store.state.enter.id){
+					// 	uni.navigateTo({
+					// 		url:"/pages/grain_pulse/editcompany?position="+JSON.stringify(this.position)
+					// 	})
+					// }else{
+					// 	uni.navigateTo({
+					// 		url:"/pages/grain_pulse/enter?position="+JSON.stringify(this.position)
+					// 	})
+					// }
+				uni.navigateBack({
+					
+				})
 			}
 			}
 		}
 		}
 	}
 	}

+ 4 - 4
pages/grain_pulse/position/position.vue

@@ -132,8 +132,8 @@
 						key: 'setPosition',
 						key: 'setPosition',
 						data: item,
 						data: item,
 						success: (res) => {
 						success: (res) => {
-							uni.navigateTo({
-								url: '../localtion/coordinate'
+							uni.navigateBack({
+								
 							})
 							})
 						}
 						}
 					})
 					})
@@ -325,8 +325,8 @@
 						key: 'setPosition',
 						key: 'setPosition',
 						data: item,
 						data: item,
 						success: (res) => {
 						success: (res) => {
-							uni.navigateTo({
-								url: '../localtion/coordinate'
+							uni.navigateBack({
+								
 							})
 							})
 						}
 						}
 					})
 					})