gjy 2 years ago
parent
commit
b8603eb394

+ 3 - 1
pages/goodSource/index.vue

@@ -25,12 +25,14 @@
 			}
 		},
 		onShow() {
+			console.log(1212)
 			this.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
-				if (res3.data) {
+				if (res3.data||res3.data==0) {
 					let name = 'myTip';
 					let value = res3.data
+					console.log(value)
 					if (value == 0) {
 						uni.removeTabBarBadge({
 							index: 2

+ 1 - 1
pages/mine/cargoowner/cargoowner.vue

@@ -27,7 +27,7 @@
 							:src="personage.authenticationStatus=='已认证'?'../../../static/mine/huozhurenzheng/shenfen2.png':'../../../static/mine/huozhurenzheng/shenfen.png'"
 							width="32px" height="32px"></u--image>
 						<view style='width:100%;'>
-							<view v-if='!personage' style='font-size:21px;'>身份信息</view>
+							<view v-if='!datastatus' style='font-size:21px;'>身份信息</view>
 							<view v-else style='font-size:21px;'>{{personage.name}}</view>
 							<view v-if="personage.authenticationStatus!='已认证'" class='flex flex-space-between'
 								style='width:100%;color:#999999;font-size:14px;'>您的身份信息{{personage.authenticationStatus?personage.authenticationStatus:'未认证'}}状态

+ 29 - 19
pages/mine/company/index.vue

@@ -66,26 +66,36 @@
 				this.goDetailPage('/pages/mine/company/editcompany?id=' + item.id)
 			},
 			del(item) {
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
 				var _this = this
-				this.$request.baseRequest('post', '/companyInfo/api/deleteCompany', {
-						id: item.id
-					}).then(res => {
-						uni.hideLoading()
-						uni.$u.toast('删除成功')
-						this.getList()
-					})
-					.catch(res => {
-						uni.hideLoading()
-						uni.showToast({
-							title: res.message,
-							icon: 'none',
-							duration: 2000
-						})
-					});
+				uni.showModal({ title: '友情提示',
+				    content: '确认删除公司吗?',
+				    success: function (res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
+							
+							_this.$request.baseRequest('post', '/companyInfo/api/deleteCompany', {
+									id: item.id
+								}).then(res => {
+									uni.hideLoading()
+									uni.$u.toast('删除成功')
+									_this.getList()
+								})
+								.catch(res => {
+									uni.hideLoading()
+									uni.showToast({
+										title: res.message,
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						} else if (res.cancel) { 
+							
+						}     
+					} 
+				});
 			},
 			goDetailPage(src) {
 				uni.$u.route(src);

+ 3 - 3
pages/news/index.vue

@@ -98,13 +98,13 @@
 		},
 		onShow() {
 			var that=this
-			console.log(122232)
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
-				if (res3.data) {
+				if (res3.data||res3.data==0) {
 					let name = 'myTip';
 					let value = res3.data
+					console.log(value,111111)
 					if (value == 0) {
 						uni.removeTabBarBadge({
 							index: 2
@@ -130,7 +130,6 @@
 					this.news = res.data.records //追加新数据
 				})
 				.catch(res => {
-					uni.$u.toast(res.message);
 				});
 			// this.mescroll.resetUpScroll()
 		},
@@ -199,6 +198,7 @@
 					if (res3.data || res3.data == 0) {
 						let name = 'myTip';
 						let value = res3.data
+						console.log(value)
 						if (value == 0) {
 							uni.removeTabBarBadge({
 								index: 2

+ 1 - 1
pages/order/index.vue

@@ -340,7 +340,7 @@
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
-				if (res3.data) {
+				if (res3.data||res3.data==0) {
 					let name = 'myTip';
 					let value = res3.data
 					if (value == 0) {

+ 1 - 1
pages/public/login.vue

@@ -167,7 +167,7 @@
 							that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 								reCommonId: this.userInfo.id,
 							}).then(res3 => {
-								if (res3.data) {
+								if (res3.data||res3.data==0) {
 									let name = 'myTip';
 									let value = res3.data
 									if (value == 0) {

+ 1 - 1
pages/public/register.vue

@@ -263,7 +263,7 @@
 										that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 											reCommonId: this.userInfo.id,
 										}).then(res3 => {
-											if (res3.data) {
+											if (res3.data||res3.data==0) {
 												let name = 'myTip';
 												let value = res3.data
 												if (value == 0) {

+ 9 - 0
pages/release/selectAddress.vue

@@ -144,6 +144,15 @@
 			radioChange(n, val) {
 				console.log('radioChange', n);
 				console.log('radioChange', val);
+				for (var i = 0; i < this.dataList.length; i++) {
+					if (this.dataList[i].defaultShipment == 1&&n=='默认装货') {
+						this.dataList[i].radiovalue = ''
+					}
+					if (this.dataList[i].defaultReceipt == 1&&n=='默认卸货') {
+						this.dataList[i].radiovalue = ''
+					}
+				}
+				this.$set(val,'radioChange',n)
 				let _flag;
 				if (n == '默认卸货') {
 					_flag = 2