6075调整

pages/6075/BJQ6075.vue

@@ -305,8 +305,10 @@
 				popupBorder: '1rpx solid rgba(255, 200, 78, 0.3)',
 				showCancel: true
 			},
+				
 			confirm() {
-				return true;
+				console.log('这是确定按钮吗');
+				//return true;
 			}
 		}
 
@@ -1424,7 +1426,7 @@
 		border-radius: 40rpx;
 		padding: 40rpx;
 		box-sizing: border-box;
-		border: 1px solid rgba(255, 200, 78, 1);
+		border: 3rpx solid rgba(255, 200, 78, 0.3);
 	}
 
 	.popup-Title {
@@ -1503,14 +1505,14 @@
 	.disagree {
 		background-color: transparent;
 		color: rgba(255, 255, 255, 0.87);
-		border: 1px solid rgba(255, 200, 78, 0.7);
+		border: 1px solid rgba(255, 200, 78, 1);
 		font-size: 24rpx;
 		color: rgba(255, 200, 78, 1);
 	}
 
 	/* 同意按钮 */
 	.agreeBtn {
-		background-color: rgba(255, 200, 78, 1);
+		background: rgba(255, 200, 78, 1);
 		color: #232323;
 		border: none;
 		font-size: 24rpx;

pages/common/index/index.vue

@@ -18,8 +18,7 @@
 					<image src="/static/images/common/more.png" mode="aspectFit" class="more"></image>
 				</view>
 			</view>
-			<view class="sendFlex"
+			<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
-				v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 && activeTabInfo.typeName=='BJQ6170'">
 				<view class="callpolice" @click="callpolice">报警</view>
 				<view class="Sendmessage" @click="location">位置</view>
 				<view class="Sendmessage" @click="handleSend">发送信息</view>