yangjie
/
high-mini-manage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改文字描述

Browse Source 
2.修改websocket 的正式链接
dev
杨杰 2 years ago
parent 1eec54bbc3
commit 2f8e532c07
10 changed files with 69 additions and 62 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      App.vue
  2. 9
      Utils/Request.js
  3. 2
      manifest.json
  4. 2
      pages.json
  5. 2
      pages/home/oderDetails/oderDetails.vue
  6. 65
      pages/login/login/login.vue
  7. 3
      pages/tabBar/user/user.vue
  8. 16
      pages/user/oil-list/oil-list.vue
  9. 7
      pages/user/updateOilgun/updateOilgun.vue
  10. 5
      pages/user/updateOilprice/updateOilprice.vue

20
App.vue
Unescape View File

@ -5,19 +5,21 @@
// brestUrl: 'http://192.168.3.4:9302/brest', // brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // 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: "", userInfo: "",
openId: '', openId: '',
code: '', code: '',
token: '' token: '',
//角色权限
positionType:0
}, },
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch')

9
Utils/Request.js
Unescape View File

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

2
manifest.json
Unescape View File

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

2
pages.json
Unescape View File

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

2
pages/home/oderDetails/oderDetails.vue
Unescape View File

@ -50,7 +50,7 @@
<view class="width80p fotrt">¥{{oilorderdetails.gasPriceGun}}</view> <view class="width80p fotrt">¥{{oilorderdetails.gasPriceGun}}</view>
</view> </view>
<view class="width92 fcor666 font14 mart20 alijusstart"> <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 class="width20 fotrt">{{oilorderdetails.gasOilLiters}}升</view>
</view> </view>
<view class="width92 fcor666 font14 mart20 alijusstart"> <view class="width92 fcor666 font14 mart20 alijusstart">

65
pages/login/login/login.vue
Unescape View File

@ -28,25 +28,25 @@
passData: '', //密码 passData: '', //密码
isRotate: false, //是否加载旋转 isRotate: false, //是否加载旋转
} }
}, },
mounted() { mounted() {
this.isLogin(); this.isLogin();
}, },
methods: { methods: {
//判断缓存中是否登录过，直接登录 //判断缓存中是否登录过，直接登录
isLogin() { isLogin() {
uni.getStorage({ uni.getStorage({
key: 'oilaccount', key: 'oilaccount',
success: (res) => { success: (res) => {
this.phoneData = res.data this.phoneData = res.data
} }
}); });
uni.getStorage({ uni.getStorage({
key: 'oilpass', key: 'oilpass',
success: (res) => { success: (res) => {
this.passData = res.data this.passData = res.data
} }
}); });
}, },
//登录 //登录
startLogin(e) { startLogin(e) {
@ -65,14 +65,6 @@
}); });
return; return;
} }
if (this.passData.length < 5) {
uni.showToast({
icon: 'none',
position: 'bottom',
title: '密码不正确'
});
return;
}
this.isRotate = true this.isRotate = true
let params = { let params = {
loginName: this.phoneData, loginName: this.phoneData,
@ -84,6 +76,9 @@
if (res.return_code == '000000' && res.return_data) { if (res.return_code == '000000' && res.return_data) {
app.globalData.userInfo = res.return_data app.globalData.userInfo = res.return_data
.object; .object;
if (res.return_data.object.gasStaff) {
app.globalData.positionType = res.return_data.object.gasStaff.positionType;
}
app.globalData.token = res.return_data.uniqueCode; app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({ uni.setStorage({
key: "oiluser", key: "oiluser",
@ -93,17 +88,17 @@
uni.setStorage({ uni.setStorage({
key: "oiltoken", key: "oiltoken",
data: res.return_data.uniqueCode data: res.return_data.uniqueCode
}) })
uni.setStorage({ uni.setStorage({
key: "oilaccount", key: "oilaccount",
data: this.phoneData data: this.phoneData
}) })
uni.setStorage({ uni.setStorage({
key: "oilpass", key: "oilpass",
data: this.passData data: this.passData
}) })
uni.reLaunch({ uni.reLaunch({
url: '../../tabBar/home/home' url: '../../tabBar/home/home'
}) })
} else { } else {
uni.showToast({ uni.showToast({

3
pages/tabBar/user/user.vue
Unescape View File

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

16
pages/user/oil-list/oil-list.vue
Unescape View File

@ -1,16 +1,15 @@
<template> <template>
<view> <view>
<view class="width90 mart15 font15 fcor666">选择油品</view> <view class="width90 mart15 font15 fcor666">选择油品</view>
<view v-if="oilpriceList == ''" class="mart40 fotct font14 fcor666"> <view v-if="oilpriceList == ''" class="mart40 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image> <image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
</view> </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}} {{item.oilNoName}}
<image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw" <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>
<view class="btn mart50" @click="jumpaddoil()">新 增 油 品</view> <view class="btn mart50" @click="jumpaddoil()" v-if="positionType != 1">新 增 油 品</view>
</view> </view>
</template> </template>
@ -25,7 +24,8 @@
return { return {
oilpriceList: [], oilpriceList: [],
typeid: '', //跳转类型 typeid: '', //跳转类型
userinfo: '' //用户信息 userinfo: '', //用户信息
positionType: app.globalData.positionType // 角色权限
} }
}, },
onLoad(Option) { onLoad(Option) {

7
pages/user/updateOilgun/updateOilgun.vue
Unescape View File

@ -5,10 +5,10 @@
</view> </view>
<view class="activeRefuel" v-for="(item,index) in oilgunList" :key="index"> <view class="activeRefuel" v-for="(item,index) in oilgunList" :key="index">
{{item.gunNo}}号枪 {{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> </image>
</view> </view>
<view class="btn mart50" @click="addgasoilPrice()">新 增 油 枪</view> <view class="btn mart50" @click="addgasoilPrice()" v-if="positionType != 1">新 增 油 枪</view>
</view> </view>
</template> </template>
@ -23,7 +23,8 @@
data() { data() {
return { return {
oilgunList: [], //油枪列表 oilgunList: [], //油枪列表
oilNo: '' //油品 oilNo: '' ,//油品
positionType: app.globalData.positionType // 角色权限
} }
}, },
onLoad(options) { onLoad(options) {

5
pages/user/updateOilprice/updateOilprice.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save