12

App.vue

@@ -2,6 +2,7 @@
 export default {
   onLaunch: function () {
     let that = this;
+	this.$queue.connectSocket()
 	that.$queue.changeTabbar(that.$queue.getData('userType')||1)
 	uni.removeStorageSync('filter')
     // #ifdef APP

common/config.js

@@ -26,7 +26,7 @@ if (process.env.NODE_ENV !== 'development'||mobile) {
 	const ROOTPATH = "/sqx_fast";
 	const ROOTPATH1 = "/sqx_fast";
 	const ROOTPATH2 = "wss://www.bosszan.com/wss/websocket/"; //联系客服
-	const ROOTPATH3 = "wss://www.bosszan.com/wss/chatSocket/"; //聊天
+	const ROOTPATH3 = "ws://192.168.0.10:7155/sqx_fast/chatSocket/"; //聊天
 	const ROOTPATH4 = "";
 	module.exports = {
 		APIHOST: ROOTPATH,

common/queue.js

@@ -619,4 +619,31 @@ module.exports = {
 			}
 		});
 	},
+	connectSocket() {
+		let that = this
+		let userId = this.getData('userId');
+		if(!userId)
+			return;
+		uni.closeSocket()
+		uni.connectSocket({
+			url: configdata.WSHOST1 + '' + userId,
+			data() {
+				return {
+					msg: 'Hello'
+				}
+			},
+			header: {
+				'content-type': 'application/json'
+			},
+			method: 'GET',
+			success(res) {
+				// 这里是接口调用成功的回调，不是连接成功的回调，请注意
+				console.log('连接成功',res)
+			},
+			fail(err) {
+				console.log('连接失败',res)
+				// 这里是接口调用失败的回调，不是连接失败的回调，请注意
+			}
+		})
+	}
 };

manifest.json

@@ -2,8 +2,8 @@
     "name" : "亿职赞",
     "appid" : "__UNI__0B0096D",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

pages/index/game/order.vue

@@ -172,25 +172,25 @@
 			<!-- 地图区域 -->
 			<view v-if="info&&info.lng" class="enterprise-box flex justify-center">
 				<view class="enterprise-box-c">
-					<!-- #ifndef APP -->
+					
 					<view class="enterprise-box-c-map">
 						<map style="width: 100%; height: 100%;" scale="14" @tap.stop="gotoMap()" :latitude="info.lat"
 							:longitude="info.lng" :markers="covers">
 						</map>
 					</view>
-					<!-- #endif -->
+					
 				</view>
 			</view>
 		</view>
 		<!-- 底部操作 -->
-		<view class="caozuo flex justify-center align-center">
-			<view v-if="info&&info.isDue==1" class="caozuo-box-l flex justify-center align-center" @click="attachmentShow=true">
+		<cover-view class="caozuo flex justify-center align-center">
+			<cover-view v-if="info&&info.isDue==1" class="caozuo-box-l flex justify-center align-center" @click="attachmentShow=true">
 				一键投递
-			</view>
-			<view class="caozuo-box-r flex justify-center align-center" @click="bindphone(2)">
+			</cover-view>
+			<cover-view class="caozuo-box-r flex justify-center align-center" @click="bindphone(2)">
 				立即沟通
-			</view>
-<!-- 			<view class="caozuo-box flex align-center justify-between">
+			</cover-view>
+			<view v-if="false" class="caozuo-box flex align-center justify-between">
 				<view class="caozuo-box-l flex align-center">
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="caozuo-box-l-item flex align-center flex-wrap">
@@ -207,8 +207,8 @@
 							分享
 						</view>
 					</view>
-					#endif
-					#ifdef APP-PLUS
+					<!-- #endif -->
+					<!--#ifdef APP-PLUS -->
 					<view class="caozuo-box-l-item flex align-center flex-wrap" @click="shows = true">
 						<u-icon name="share" color="#333333" size="50"></u-icon>
 						<view class="">
@@ -230,8 +230,8 @@
 						</view>
 					</view>
 				</view>
-			</view> -->
-		</view>
+			</view> 
+		</cover-view>
 
 
 		<u-popup v-model="shows" z-index="99999" mode="bottom" border-radius="14" height="300rpx">
@@ -313,7 +313,7 @@
 					longitude: '',
 					width: 20,
 					height: 20,
-					iconPath: '../../../static/images/mapMarker.png',
+					iconPath: '',
 					callout: {
 						content: '',
 						color: '#000', //文字颜色
@@ -595,13 +595,17 @@
 				}).then(res => {
 					if (res.code == 0) {
 						this.info = res.data
+						let iconPath='../../../static/images/mapMarker.png'
+						//#ifdef APP-PLUS
+						iconPath= '../../../static/images/mapLocation.png',
+						//#endif
 						this.covers = [{
 							id: 1,
 							latitude: this.info.lat,
 							longitude: this.info.lng,
 							width: 20,
 							height: 20,
-							iconPath: '../../../static/images/mapMarker.png',
+							iconPath: iconPath,
 							callout: {
 								content: this.info.city + '' + this.info.county + '' + this.info.address,
 								color: '#000', //文字颜色
@@ -1152,23 +1156,28 @@
 	}
 
 	.caozuo {
-		width: 100%;
+		width: calc(100% - 70rpx);
 		height: 120rpx;
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		background-color: #ffffff;
 		padding: 0 40rpx;
-		gap: 20rpx;
-		
+		z-index: 99999;
 		.caozuo-box-l {
 			flex: 0.8;
 			height: 80rpx;
 			color: #ffffff;
 			border-radius: 45rpx;
 			background: linear-gradient(90deg, rgba(255, 65, 86, 1) 0%, rgba(255, 102, 0, 0.35) 100%);
+			/* #ifdef APP-PLUS */
+			background: rgba(255, 65, 86, 1);
+			/* #endif */
 			font-size: 32rpx;
 			font-weight: 400;
+			line-height: 80rpx;
+			text-align: center;
+			margin-right: 20rpx;
 		}
 		
 		.caozuo-box-r {
@@ -1176,14 +1185,12 @@
 			height: 80rpx;
 			color: #ffffff;
 			border-radius: 45rpx;
-			/* #ifndef APP-PLUS */
 			background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
-			/* #endif */
 			/* #ifdef APP-PLUS */
-			background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
+			background: rgba(13, 39, 247, 1);
+			/* #endif */
 			line-height: 80rpx;
 			text-align: center;
-			/* #endif */
 			font-size: 32rpx;
 			font-weight: 400;
 		}

pages/msg/im.vue

@@ -2466,6 +2466,7 @@
 				uni.showLoading({
 					title: '连接中...'
 				})
+				uni.closeSocket()
 				uni.connectSocket({
 					// url: 'wss://h5.youxb.icu/wss/sqx_fast/chatSocket/' + userId,
 					// url: this.config("WSHOST1") + userId,

pages/public/loginphone.vue

@@ -187,6 +187,7 @@
 								this.getIsVip();
 								uni.hideLoading();
 								this.$queue.setData("userType", res.user.userType);
+								this.$queue.connectSocket()
 								//判断是否开启身份选择 是/否
 								this.$Request.get("/app/common/type/339").then((rest) => {
 									if (rest.code == 0) {