1.修改文字描述

2.修改websocket 的正式链接

App.vue

@@ -5,19 +5,21 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/brest',
+			url: 'https://hsg.dctpay.com/brest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+			imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
-			// wsssocket:'wss://hsgcs.dctpay.com/msg/WebSocket/',
+			wsssocket:'wss://hsg.dctpay.com/msg/WebSocket/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/brest',
+			// url: 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
-			wsssocket:'wss://hsgcs.dctpay.com/msg/WebSocket/',
+			// wsssocket: 'wss://hsgcs.dctpay.com/msg/WebSocket/',
 			userInfo: "",
 			openId: '',
 			code: '',
-			token: ''
+			token: '',
+			//角色权限
+			positionType:0
 		},
 		onLaunch: function() {
 			console.log('App Launch')

Utils/Request.js

@@ -44,6 +44,13 @@ function request(method, url, data) {
 					title: '请求失败',
 					icon: 'none',
 					duration: 1500,
+					success() {
+						setTimeout(() => {
+							uni.reLaunch({
+								url:'/pages/login/login/login'
+							})
+						}, 2000);
+					}
 				})
 			}
 		})

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "high-mini-manage",
+    "name" : "嗨森逛商家端",
     "appid" : "__UNI__309E2E8",
     "description" : "",
     "versionName" : "1.0.0",

pages.json

@@ -112,7 +112,7 @@
 				"pagePath": "pages/tabBar/home/home",
 				"iconPath": "static/img/tabBar/home.png",
 				"selectedIconPath": "static/img/tabBar/home-on.png",
-				"text": "嗨森逛"
+				"text": "订单"
 			},
 			{
 				"pagePath": "pages/tabBar/user/user",

pages/home/oderDetails/oderDetails.vue

@@ -50,7 +50,7 @@
 			<view class="width80p fotrt">¥{{oilorderdetails.gasPriceGun}}</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
-			<view class="width80p">加油升数<text class="fcor999">实际升数以油站加油机为准</text></view>
+			<view class="width80p">加油升数<text class="fcor999 font13">实际升数以油站加油机为准</text></view>
 			<view class="width20 fotrt">{{oilorderdetails.gasOilLiters}}升</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">

pages/login/login/login.vue

@@ -65,14 +65,6 @@
 					});
 					return;
 				}
-				if (this.passData.length < 5) {
-					uni.showToast({
-						icon: 'none',
-						position: 'bottom',
-						title: '密码不正确'
-					});
-					return;
-				}
 				this.isRotate = true
 				let params = {
 					loginName: this.phoneData,
@@ -84,6 +76,9 @@
 					if (res.return_code == '000000' && res.return_data) {
 						app.globalData.userInfo = res.return_data
 							.object;
+						if (res.return_data.object.gasStaff) {
+							app.globalData.positionType = res.return_data.object.gasStaff.positionType;
+						}
 						app.globalData.token = res.return_data.uniqueCode;
 						uni.setStorage({
 							key: "oiluser",

pages/tabBar/user/user.vue

@@ -123,6 +123,7 @@
 								if (res.return_code == '000000') {
 									app.globalData.userInfo = '';
 									app.globalData.token = '';
+									app.globalData.positionType = 0;
 									uni.setStorage({
 										key: "oiluser",
 										data: ''

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

@@ -4,13 +4,12 @@
 		<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"
+		<view class="activeRefuel" v-for="(item,index) in oilpriceList" :key="index" @click="jumpupdatePrice(item)">
-			@click="jumpupdatePrice(item)">
 			{{item.oilNoName}}
 			<image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw"
-				@click.stop="delOilPrice(item.oilNo)"></image>
+				@click.stop="delOilPrice(item.oilNo)" v-if="positionType != 1"></image>
 		</view>
-		<view class="btn mart50" @click="jumpaddoil()">新 增 油 品</view>
+		<view class="btn mart50" @click="jumpaddoil()" v-if="positionType != 1">新 增 油 品</view>
 	</view>
 </template>
 
@@ -25,7 +24,8 @@
 			return {
 				oilpriceList: [],
 				typeid: '', //跳转类型
-				userinfo: '' //用户信息
+				userinfo: '', //用户信息
+				positionType: app.globalData.positionType // 角色权限
 			}
 		},
 		onLoad(Option) {

pages/user/updateOilgun/updateOilgun.vue

@@ -5,10 +5,10 @@
 		</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)">
+			<image src="../../../static/img/6.png" mode="widthFix" v-if="positionType != 1" class="imgcha iconw" @click.stop="delGunNo(item.id)">
 			</image>
 		</view>
-		<view class="btn mart50" @click="addgasoilPrice()">新 增 油 枪</view>
+		<view class="btn mart50" @click="addgasoilPrice()" v-if="positionType != 1">新 增 油 枪</view>
 	</view>
 </template>
 
@@ -23,7 +23,8 @@
 		data() {
 			return {
 				oilgunList: [], //油枪列表
-				oilNo: '' //油品
+				oilNo: '' ,//油品
+				positionType: app.globalData.positionType // 角色权限
 			}
 		},
 		onLoad(options) {

pages/user/updateOilprice/updateOilprice.vue

@@ -15,7 +15,7 @@
 			<input placeholder="请输入优惠幅度" v-model="discountPrice" type="text"
 				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 		</view>
-		<view class="btn mart50" @click="editGasOilPrice()">修 改</view>
+		<view class="btn mart50" @click="editGasOilPrice()" v-if="positionType != 1">修 改</view>
 	</view>
 </template>
 
@@ -33,7 +33,8 @@
 				discountPrice: '', //优惠价
 				oilNo: '', //油品
 				oilDetails: '', //油品详情
-				userinfo: '' //个人信息
+				userinfo: '' ,//个人信息
+				positionType: app.globalData.positionType // 角色权限
 			}
 		},
 		onLoad(options) {