1.修改对接接口问题

pages/home/oderDetails/oderDetails.vue

@@ -63,22 +63,22 @@
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">加油折扣</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasDiscount">{{oilorderdetails.gasDiscount}}</view>
+			<view class="width80p fotrt" v-if="oilorderdetails.gasDiscount">¥{{oilorderdetails.gasDiscount}}</view>
 			<view class="width80p fotrt" v-else>0折</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">加油补贴</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasOilSubsidy">{{oilorderdetails.gasOilSubsidy}}</view>
+			<view class="width80p fotrt" v-if="oilorderdetails.gasOilSubsidy">¥{{oilorderdetails.gasOilSubsidy}}</view>
 			<view class="width80p fotrt" v-else>¥0</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">每升优惠</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasLitersPreferences">{{oilorderdetails.gasLitersPreferences}}</view>
+			<view class="width80p fotrt" v-if="oilorderdetails.gasLitersPreferences">¥{{oilorderdetails.gasLitersPreferences}}</view>
 			<view class="width80p fotrt" v-else>¥0</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">优惠价格</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasPricePreferences">{{oilorderdetails.gasPricePreferences}}</view>
+			<view class="width80p fotrt" v-if="oilorderdetails.gasPricePreferences">¥{{oilorderdetails.gasPricePreferences}}</view>
 			<view class="width80p fotrt" v-else>¥0</view>
 		</view>
 		<view class="width92 line1 mart15"></view>

pages/tabBar/home/home.vue

@@ -12,6 +12,9 @@
 			<view class="width33" :class="[type=='3' ? 'fcor089' : 'fcor333']" @click="updateStu(3)">已完成</view>
 			<view class="width33" :class="[type=='4' ? 'fcor089' : 'fcor333']" @click="updateStu(4)">已退款</view>
 		</view>
+		<view v-if="orderList == ''" class="mart40 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+		</view>
 		<view class="width94 backcorfff headcont mart10" v-for="(item,index) in orderList" :key="index"
 			@click="jumpDetails(item.orderNo)">
 			<view class="alijusstart width94 height30 fcor333 paddtop5">
@@ -88,10 +91,7 @@
 			})
 		},
 		onLoad() {
-			let innerAudioContext = uni.createInnerAudioContext(); //创建音频文件
+
-			innerAudioContext.autoplay = false; //不自动播放
-			innerAudioContext.src = 'https://hsgcs.dctpay.com/filesystem/wxApplets/player.mp3'; //音频文件链接
-			this.innerAudioContext = innerAudioContext;
 			this.socketio();
 		},
 		onReachBottom() { //上拉触底函数
@@ -102,16 +102,30 @@
 			}
 		},
 		methods: {
+			//链接socket
 			socketio() {
+				let that = this;
 				uni.connectSocket({
-					url: 'ws://localhost:9302/brest/WebSocket/111'
+					url: 'ws://139.159.177.244:9302/brest/WebSocket/' + app.globalData.userInfo.merchantStore.id
 				});
-
 				uni.onSocketOpen(function(res) {
 					console.log('WebSocket连接已打开！');
 				});
 				uni.onSocketError(function(res) {
 					console.log('WebSocket连接打开失败，请检查！');
+					uni.closeSocket();
+					that.socketio();
+				});
+				uni.onSocketMessage(function(res) {
+					let innerAudioContext = uni.createInnerAudioContext(); //创建音频文件
+					innerAudioContext.autoplay = false; //不自动播放
+					innerAudioContext.src = res.data; //音频文件链接
+					that.innerAudioContext = innerAudioContext;
+					that.startAudio();
+					console.log('收到服务器内容：' + res.data);
+				});
+				uni.onSocketClose(function(res) {
+					console.log('WebSocket 已关闭！');
 				});
 			},
 			//搜索条件
@@ -236,6 +250,7 @@
 
 	.counimgs {
 		width: 60px;
+		max-height: 60px;
 	}
 
 	.counscou {

pages/user/oil-list/oil-list.vue

@@ -1,6 +1,9 @@
 <template>
 	<view>
 		<view class="width90 mart15 font15 fcor666">选择油品</view>
+		<view v-if="oilpriceList == ''" class="mart40 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+		</view>
 		<view class="activeRefuel" v-for="(item,index) in oilpriceList" :key="index"
 			@click="jumpupdatePrice(item)">
 			{{item.oilNoName}}
@@ -171,6 +174,6 @@
 	.imgcha {
 		position: absolute;
 		margin-top: -15px;
-		margin-left: 30px;
+		margin-left: 25px;
 	}
 </style>

pages/user/updateOilgun/updateOilgun.vue

@@ -1,5 +1,8 @@
 <template>
 	<view>
+		<view v-if="oilgunList == ''" class="mart40 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+		</view>
 		<view class="activeRefuel" v-for="(item,index) in oilgunList" :key="index">
 			{{item.gunNo}}号枪
 			<image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw" @click.stop="delGunNo(item.id)">