公交和陆岛

App.vue

@@ -55,8 +55,8 @@
 		},
 		globalData: {
 			// baseUrl: 'http://27.223.104.50:8001',//接口前缀
-			// baseUrl: 'https://jtxx.qdjtcx.cn:8001',//接口前缀
+			baseUrl: 'https://jtxx.qdjtcx.cn:8001',//接口前缀
-			baseUrl: 'http://10.50.3.103:8086',//接口前缀
+			// baseUrl: 'http://10.50.3.103:8086',//接口前缀
 			mobile: '66007587'
 		},
 		methods: {

pages/bus/busDataInfo/form.vue

@@ -379,10 +379,10 @@
 				console.log('landNameIndex', index)
 			},
 			//陆岛列表
-			getPermiss() {
+			getPermiss(type) {
 				this.$request(getApp().globalData.baseUrl + '/api/biz/bizBusAuthority/findList',{},"GET").then(res =>{
 					this.landList = res.data;
-					if (this.pageType == 'add') {
+					if (type == 'add') {
 						this.landList.map(item => {
 							item.isFinish = false;
 							this.form.bizBusDataDetailVOList.push({
@@ -689,7 +689,7 @@
 				// this.form.bizBusDataBodySaveOrUpdateDTOList.map(item =>{
 				// 	item.isPassengerCountConvert = 0
 				// })
-				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/saveOrUpdate', this
+				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/saveOrUpdateV2', this
 					.form,
 					'POST').then(res => {
 					uni.hideLoading();

pages/water/waterWay/form.vue

@@ -113,6 +113,12 @@
 				</view>
 				{{item.stationName || ''}}
 			</view>
+		</view>
+		<view v-if="landList.length > 9" class="station_act" @click="showLand = !showLand">
+			<uni-icons v-if="!showLand" type="bottom" size="14" color="#2D8CF0" style="margin-right:10rpx;">
+			</uni-icons>
+			<uni-icons v-if="showLand" type="top" size="14" color="#2D8CF0" style="margin-right:10rpx;"></uni-icons>
+			{{showLand?'收起':'展开'}}
 		</view>
 		<view class="form_item_box">
 			<!-- 陆岛 -->
@@ -553,7 +559,7 @@
 				console.log(this.form.id)
 				uni.showModal({
 					title: '提示',
-					content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
+					content: this.pageType == 'add' ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
 					success: (res) => {
 						if (res.confirm) {
 							this.submitForm();
@@ -566,7 +572,7 @@
 					title: '提交中...',
 					mask: true
 				})
-				this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/saveOrUpdate', this
+				this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/saveOrUpdateV2', this
 					.form,
 					'POST').then(res => {
 					uni.hideLoading();