caoliancun
/
LSM_OIL_SITE_zhongping
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1212

Browse Source
pull/1/head
caolc 2 years ago
parent 8874f28bd4
commit fea1c29b96
10 changed files with 302 additions and 302 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      api/cloud-site.js
  2. 2
      api/oil-finance.js
  3. 8
      api/oil-identity.js
  4. 6
      api/oli-site.js
  5. 2
      api/oli-user.js
  6. 459
      packageOrders/pages/orderList/orderList.vue
  7. 35
      pages/home/home.vue
  8. 32
      pages/index/index.vue
  9. 45
      pages/setup/setup.vue
  10. 7
      utils/request.js

8
api/cloud-site.js
Unescape View File

@ -21,11 +21,17 @@ export default {
// 小程序加油订单列表 // 小程序加油订单列表
getNewItemSiteOrder(data) { getNewItemSiteOrder(data) {
return request({ return request({
url: `/${service_name}/${group_name}/getNewItemSiteOrder`, url: `/xkhl-site/cloudApi/getOrderInfoCloudList`,
method: 'post', method: 'post',
data: data data: data
}) })
}, },
logout(data) {
return request({
url: `/xkhl-identity/unionAuth/logout`,
method: 'GET',
})
},
// 换手机号提交 // 换手机号提交
updatePhone(data) { updatePhone(data) {
return request({ return request({

2
api/oil-finance.js
Unescape View File

@ -10,7 +10,7 @@ export default {
}, },
getOrderInfo(data) { getOrderInfo(data) {
return request({ return request({
url: `/${service_name}/${group_name}/getNewOrderInfo`, url: `/xkhl-site/cloudApi/getNewOrderInfo`,
method: 'post', method: 'post',
data: data data: data
}) })

8
api/oil-identity.js
Unescape View File

@ -15,7 +15,7 @@ export default{
// 获取用户信息 // 获取用户信息
sendCode(code){ sendCode(code){
return request({ return request({
url: `/${service_name}/${group_name}/sendCode`, url: `/xkhl-identity/unionAuth/sendCode`,
method: 'post', method: 'post',
data:{ data:{
code:code, code:code,
@ -43,7 +43,7 @@ export default{
//切换油站 //切换油站
changeChannelLogin(data){ changeChannelLogin(data){
return request({ return request({
url: `/${service_name}/${group_name}/changeChannelLogin`, url: `/xkhl-identity/unionAuth/changeSiteLogin`,
method: 'post', method: 'post',
data:data, data:data,
@ -52,7 +52,7 @@ export default{
//微信一键登录 new //微信一键登录 new
loginPersonal(data){ loginPersonal(data){
return request({ return request({
url: `/${service_name}/${WchatLogin_name}/loginPersonal`, url: `/xkhl-identity/unionAuth/loginPersonal`,
method: 'post', method: 'post',
data:data, data:data,
@ -61,7 +61,7 @@ export default{
//首次登录绑定手机号 绑定微信手机号 new //首次登录绑定手机号 绑定微信手机号 new
bindLoginByPhonePersonal(data){ bindLoginByPhonePersonal(data){
return request({ return request({
url: `/${service_name}/${WchatLogin_name}/bindLoginByPhonePersonal`, url: `/xkhl-identity/unionAuth/bindLoginByPhonePersonal`,
method: 'post', method: 'post',
data:data, data:data,

6
api/oli-site.js
Unescape View File

@ -71,7 +71,7 @@ export default{
// 获取订单列表 // 获取订单列表
getNewItemSiteOrder(data) { getNewItemSiteOrder(data) {
return request({ return request({
url: `/${service_name}/${group_name}/getNewItemSiteOrder`, url: `/xkhl-site/cloudApi/getOrderInfoCloudList`,
method: 'post', method: 'post',
data: data data: data
}) })
@ -79,13 +79,13 @@ export default{
// 获取用户基础信息 // 获取用户基础信息
getSiteBasicData(id) { getSiteBasicData(id) {
return request({ return request({
url: `/${service_name}/${info_name}/getSiteBasicData/`+id, url: `/xkhl-site/cloudApi/getSiteBasicData`,
method: 'get' method: 'get'
}) })
},// 获取油站信息 },// 获取油站信息
getSiteDetail(id) { getSiteDetail(id) {
return request({ return request({
url: `/${service_name}/${info_name}/getSiteDetail/`+id, url: `/xkhl-site/cloudApi/getSiteDetail`,
method: 'get' method: 'get'
}) })
}, },

2
api/oli-user.js
Unescape View File

@ -6,7 +6,7 @@ export default{
//根据用户手机查询油站 //根据用户手机查询油站
getByPhone(phone){ getByPhone(phone){
return request({ return request({
url: `/${service_name}/${group_name}/getByPhone/${phone}`, url: `/xkhl-user/saasCustomerSiteRelation/getByPhone/${phone}`,
method: 'get' method: 'get'
}) })
}, },

459
packageOrders/pages/orderList/orderList.vue
Unescape View File

@ -20,78 +20,24 @@
</view> </view>
<scroll-view scroll-x class="bg-white nav"> <scroll-view scroll-x class="bg-white nav">
<view class="flex text-center"> <view class="flex text-center">
<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''" <view class="cu-item flex-sub" :class="getData.params.istate===tabList[index].value?'text-orange cur':''"
v-for="(item,index) in tabList" :key="index" @tap="tabSelect" :data-id="index">{{item}}</view> v-for="(item,index) in tabList" :key="index" @tap="tabSelect(item.value)" :data-id="index">{{item.label}}</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<!-- <view class="placeholder-hidden">
<view class="flex bg-main-oil padding solid-bottom">
<view class="flex-sub">
订单来源
</view>
<view class="flex-treble text-right">
<picker @change="pickSource" mode="selector" :value="indexSource" :range="sources">
<view class="picker">
{{sources[indexSource]}}
<text class="cuIcon-right"></text>
</view>
</picker>
</view>
</view>
<scroll-view scroll-x class="bg-white nav">
<view class="flex text-center">
<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''"
v-for="(item,index) in tabList" :key="index" @tap="" :data-id="index">{{item}}</view>
</view>
</scroll-view>
</view> -->
<view class="padding　 padding-bottom-0" style="padding-top: 200upx;"> <view class="padding　 padding-bottom-0" style="padding-top: 200upx;">
<!-- 0 全部 1 待支付 2 已支付 3退款 --> <!-- 0 全部 1 待支付 2 已支付 3退款 -->
<view v-show="TabCur==2" class="order-list"> <view class="order-list">
<view 　v-for="(item,index) in allOrder" v-if="allOrder.length" :key='index'> <view 　v-for="(item,index) in orderList" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" /> <OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view> </view>
<view v-if="allOrder.length<1"> <view >
<Empty /> <Empty />
</view> </view>
<view v-show="load.isLoadMore1"> <!-- <view v-show="load.isLoadMore1">
<uni-load-more :status="load.loadStatus1"></uni-load-more> <uni-load-more :status="load.loadStatus1"></uni-load-more>
</view> </view> -->
</view> </view>
<view v-show="TabCur==1" class="order-list">
<view v-for="(item,index) in payingOrder" v-if="payingOrder.length" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="payingOrder.length<1">
<Empty />
</view>
<view v-show="load.isLoadMore2">
<uni-load-more :status="load.loadStatus2"></uni-load-more>
</view>
</view>
<view v-show="TabCur==0" class="order-list">
<view 　 v-for="(item,index) in finishedOrder" v-if="finishedOrder.length" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="finishedOrder.length<1">
<Empty />
</view>
<view v-show="load.isLoadMore3">
<uni-load-more :status="load.loadStatus3"></uni-load-more>
</view>
</view>
<view v-show="TabCur==3" class="order-list">
<view 　 v-for="(item,index) in refundOrder" v-if="refundOrder.length" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="refundOrder.length<1">
<Empty />
</view>
<view v-show="load.isLoadMore4">
<uni-load-more :status="load.loadStatus4"></uni-load-more>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -109,15 +55,34 @@
UniLoadMore UniLoadMore
}, },
data() { data() {
return { return {
orderList:[],
getData: {
pageSize: 15,
currentPage: 1,
params: {
istate:''
}
},
startTime:'', startTime:'',
endTime:"", endTime:"",
activeSource: '小程序', activeSource: '小程序',
indexSource: 1, indexSource: 1,
sources: ['网页版', '小程序'], sources: ['网页版', '小程序'],
tabList: [ tabList: [
'全部','待支付', '已支付 ', '退款' {
label:'全部',
value:'',
},{
label:'待支付',
value:'0'
}, {
label:'已支付',
value:'1'
}, {
label:'退款',
value:'3'
}
], ],
TabCur: 0, TabCur: 0,
pageNumber: 1, pageNumber: 1,
@ -159,18 +124,35 @@
}, },
created() { created() {
this.getTime() // this.getTime()
this.loadList(-3, this.pageNumber1, 'created') // this.loadList(0, this.pageNumber2, 'created')
this.loadList(0, this.pageNumber2, 'created') // this.loadList(1, this.pageNumber3, 'created')
this.loadList(1, this.pageNumber3, 'created') // this.loadList(-2, this.pageNumber4, 'created')
this.loadList(-2, this.pageNumber4, 'created')
}, },
onLoad() { onLoad(e) {
let {type=null} = e;
console.log(type,type=='today','=============')
if( type=='today'){
console.log(type,'today')
this.getTime()
}
this.loadList()
console.log(type,'*******');
uni.setStorageSync('orderType', 1) uni.setStorageSync('orderType', 1)
}, },
onReachBottom() { //上拉触底函数 onReachBottom() { //上拉触底函数
// console.log('触底函数') console.log('触底函数');
this.loadMoreOrder('onReachBottom') this.getData.currentPage+=1;
this.loadList()
// this.loadMoreOrder('onReachBottom')
},
watch:{
// getData:{
// handler(){
// this.loadList()
// },
// deep:true
// }
}, },
methods: { methods: {
getTime(){ getTime(){
@ -181,8 +163,8 @@
let hr = nowDate.getHours() let hr = nowDate.getHours()
let mf = nowDate.getMinutes() < 10 ? '0' + nowDate.getMinutes() : nowDate.getMinutes() let mf = nowDate.getMinutes() < 10 ? '0' + nowDate.getMinutes() : nowDate.getMinutes()
let ss =nowDate.getSeconds() < 10 ? '0' + nowDate.getSeconds() :nowDate.getSeconds() let ss =nowDate.getSeconds() < 10 ? '0' + nowDate.getSeconds() :nowDate.getSeconds()
this.startTime = year + "-" + month + "-" + day+" " + '00:00:00'; this.getData.params.startTime = year + "-" + month + "-" + day+" " + '00:00:00';
this.endTime = year + "-" + month + "-" + day+" " +hr+':'+mf+':'+ss this.getData.params.endTime = year + "-" + month + "-" + day+" " +hr+':'+mf+':'+ss
}, },
loadMoreOrder(from) { loadMoreOrder(from) {
// console.log(from,'loadMoreOrder时间') // console.log(from,'loadMoreOrder时间')
@ -214,10 +196,13 @@
} }
}, },
tabSelect(e) { tabSelect(e) {
this.TabCur = e.currentTarget.dataset.id; this.getData.currentPage = 1
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60 this.getData.params.istate = e;
this.loadList()
// this.TabCur = e.currentTarget.dataset.id;
// this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
// console.log('tabSelect时间') // console.log('tabSelect时间')
this.loadMoreOrder('tabSelect') // this.loadMoreOrder('tabSelect')
}, },
pickSource(e) { pickSource(e) {
console.log(e) console.log(e)
@ -264,167 +249,173 @@
break break
} }
}, },
loadList(istate, pageNumber, from) { loadList() {
// console.log(istate) oliSiteApi.getNewItemSiteOrder(this.getData ).then(res=>{
// console.log(pageNumber) if(res.code==20000){
// console.log(from) if(this.getData.currentPage==1){
console.log( this.startTime) this.orderList = res.data.list
console.log( this.endTime) }else{
let that = this this.orderList = this.orderList.concat(res.data.list)
const data2 = { }
istate: istate, //类型：Number 必有字段 备注：订单状态 0待支付 1支付成功 查所有传 ''
pageIndex: pageNumber ,//类型：Number 必有字段 备注：查询第几页,默认一页10条
// startTime: that.startTime,
// endTime: that.endTime
}
console.log('这里是this.indexSource',this.indexSource)
if (this.indexSource == 0) {
// 网页版
if (data2.istate == -3) {
data2.istate = ''
} else if (data2.istate == -2) {
data2.istate = 3
} }
console.log(data2) console.log(res,'============')
oliSiteApi.getNewItemSiteOrder(data2).then(res => { })
console.log(res) // // console.log(istate)
console.log('-----------------------------------------') // // console.log(pageNumber)
// console.log('参数', data2.istate, '页码', data2.pageIndex, '来源', from) // // console.log(from)
if (res.code === 20000) { // console.log( this.startTime)
switch (istate) { // console.log( this.endTime)
case -3: // let that = this
console.log('获取全部') // const data2 = {
console.log(res.data) // istate: istate, //类型：Number 必有字段 备注：订单状态 0待支付 1支付成功 查所有传 ''
console.log(this.allOrder) // pageIndex: pageNumber ,//类型：Number 必有字段 备注：查询第几页,默认一页10条
this.allOrder = this.allOrder.concat(res.data) // // startTime: that.startTime,
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // // endTime: that.endTime
this.load.isLoadMore1 = true // }
this.load.loadStatus1 = 'nomore' // console.log('这里是this.indexSource',this.indexSource)
} else if (res.data.length == 10) { // if (this.indexSource == 0) {
this.pageNumber1++ // // 网页版
this.load.isLoadMore1 = false // if (data2.istate == -3) {
} // data2.istate = ''
break // } else if (data2.istate == -2) {
case -2: // data2.istate = 3
console.log('退款') // }
console.log(res.data) // console.log(data2)
console.log(this.allOrder) // oliSiteApi.getNewItemSiteOrder(data2).then(res => {
this.refundOrder = this.refundOrder.concat(res.data) // // console.log('参数', data2.istate, '页码', data2.pageIndex, '来源', from)
// if (res.code === 20000) {
// switch (istate) {
// case -3:
// console.log('获取全部')
// console.log(res.data)
// console.log(this.allOrder)
// this.allOrder = this.allOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
// this.load.isLoadMore1 = true
// this.load.loadStatus1 = 'nomore'
// } else if (res.data.length == 10) {
// this.pageNumber1++
// this.load.isLoadMore1 = false
// }
// break
// case -2:
// console.log('退款')
// console.log(res.data)
// console.log(this.allOrder)
// this.refundOrder = this.refundOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.load.isLoadMore4 = true // this.load.isLoadMore4 = true
this.load.loadStatus4 = 'nomore' // this.load.loadStatus4 = 'nomore'
} else { // } else {
this.pageNumber4++ // this.pageNumber4++
this.load.isLoadMore4 = false // this.load.isLoadMore4 = false
} // }
break // break
case 0: // case 0:
console.log('待支付') // console.log('待支付')
console.log(res.data) // console.log(res.data)
console.log(this.allOrder) // console.log(this.allOrder)
this.payingOrder = this.payingOrder.concat(res.data) // this.payingOrder = this.payingOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // this.load.isLoadMore2 = true
this.load.isLoadMore2 = true // this.load.loadStatus2 = 'nomore'
this.load.loadStatus2 = 'nomore' // } else {
} else { // this.pageNumber2++
this.pageNumber2++ // this.load.isLoadMore2 = false
this.load.isLoadMore2 = false // }
} // break
break // case 1:
case 1: // console.log('已支付')
console.log('已支付') // console.log(res.data)
console.log(res.data) // console.log(this.allOrder)
console.log(this.allOrder) // this.finishedOrder = this.finishedOrder.concat(res.data)
this.finishedOrder = this.finishedOrder.concat(res.data) // if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // this.load.isLoadMore3 = true
this.load.isLoadMore3 = true // this.load.loadStatus3 = 'nomore'
this.load.loadStatus3 = 'nomore' // } else {
} else { // this.pageNumber3++
this.pageNumber3++ // this.load.isLoadMore3 = false
this.load.isLoadMore3 = false // }
} // break
break // }
// }
} // })
}
})
} else if (this.indexSource == 1) { // } else if (this.indexSource == 1) {
// 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款 // // 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
// 小程序 // // 小程序
if (data2.istate == -3) { // if (data2.istate == -3) {
data2.istate = '' // data2.istate = ''
} else if (data2.istate == -2) { // } else if (data2.istate == -2) {
data2.istate = 3 // data2.istate = 3
} // }
console.log(data2) // console.log(data2)
oliSiteApi.getNewItemSiteOrder(data2).then(res => { // oliSiteApi.getNewItemSiteOrder(data2).then(res => {
console.log(res) // console.log(res)
console.log('+++++++++++++++++++++++++++++++++++++++++') // console.log('+++++++++++++++++++++++++++++++++++++++++')
// console.log(data2.istate, data2.pageIndex) // // console.log(data2.istate, data2.pageIndex)
if (res.code === 20000) { // if (res.code === 20000) {
switch (istate) { // switch (istate) {
case 1: // case 1:
console.log('获取全部') // console.log('获取全部')
console.log(res.data) // console.log(res.data)
console.log(this.allOrder) // console.log(this.allOrder)
this.allOrder = this.allOrder.concat(res.data) // this.allOrder = this.allOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.load.isLoadMore1 = true // this.load.isLoadMore1 = true
this.load.loadStatus1 = 'nomore' // this.load.loadStatus1 = 'nomore'
} else { // } else {
this.pageNumber1++ // this.pageNumber1++
this.load.isLoadMore1 = false // this.load.isLoadMore1 = false
} // }
break // break
case -2: // case -2:
console.log('退款') // console.log('退款')
console.log(res.data) // console.log(res.data)
console.log(this.allOrder) // console.log(this.allOrder)
this.refundOrder = this.refundOrder.concat(res.data) // this.refundOrder = this.refundOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.load.isLoadMore4 = true // this.load.isLoadMore4 = true
this.load.loadStatus4 = 'nomore' // this.load.loadStatus4 = 'nomore'
} else { // } else {
this.pageNumber4++ // this.pageNumber4++
this.load.isLoadMore4 = false // this.load.isLoadMore4 = false
} // }
break // break
case 0: // case 0:
console.log('待支付') // console.log('待支付')
console.log(res.data) // console.log(res.data)
console.log(this.allOrder) // console.log(this.allOrder)
this.payingOrder = this.payingOrder.concat(res.data) // this.payingOrder = this.payingOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.load.isLoadMore2 = true // this.load.isLoadMore2 = true
this.load.loadStatus2 = 'nomore' // this.load.loadStatus2 = 'nomore'
} else { // } else {
this.pageNumber2++ // this.pageNumber2++
this.load.isLoadMore2 = false // this.load.isLoadMore2 = false
} // }
break // break
case -3: // case -3:
console.log('全部') // console.log('全部')
console.log(res.data) // console.log(res.data)
console.log(this.allOrder) // console.log(this.allOrder)
this.finishedOrder = this.finishedOrder.concat(res.data) // this.finishedOrder = this.finishedOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 // if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.load.isLoadMore3 = true // this.load.isLoadMore3 = true
this.load.loadStatus3 = 'nomore' // this.load.loadStatus3 = 'nomore'
} else if (res.data.length == 10) { // } else if (res.data.length == 10) {
this.pageNumber3++ // this.pageNumber3++
this.load.isLoadMore3 = false // this.load.isLoadMore3 = false
} // }
break // break
} // }
} // }
}) // })
} // }
} }
} }
} }

35
pages/home/home.vue
Unescape View File

@ -21,7 +21,7 @@
<view class="bg-white radius margin-left margin-right to-top"> <view class="bg-white radius margin-left margin-right to-top">
<view class=" flex "> <view class=" flex ">
<view class="padding text-center flex-sub" <view class="padding text-center flex-sub"
@tap="routerTo('/packageOrders/pages/orderList/dailyOrder/dailyOrder')"> @tap="routerTo('/packageOrders/pages/orderList/orderList?type=today')">
<text>今日收款笔数</text> <text>今日收款笔数</text>
<view class="padding-sm"> <view class="padding-sm">
<text class="oil-main-color">{{userAccount.totalCount}}</text> <text class="oil-main-color">{{userAccount.totalCount}}</text>
@ -75,6 +75,15 @@
</view> </view>
<text>{{ cuIconList[0].name }}</text> <text>{{ cuIconList[0].name }}</text>
</view> </view>
<view class="cu-item" @tap="routerTo('/packageOrders/pages/orderList/orderList')">
<view :class="['cuIcon-' + cuIconList[4].cuIcon, 'text-' + cuIconList[4].color]" class="text-sl">
<view class="cu-tag badge" v-if="cuIconList[4].badge != 0">
<block v-if="cuIconList[4].badge != 1">
{{ cuIconList[4].badge > 99 ? '99+' : cuIconList[4].badge }}</block>
</view>
</view>
<text>{{ cuIconList[4].name }}</text>
</view>
<view class="cu-item" v-for="(item,index) in menusList" :key="index" @tap="routerTo(item.path)" v-if=' item.name != "星油云站超级管理员"' > <view class="cu-item" v-for="(item,index) in menusList" :key="index" @tap="routerTo(item.path)" v-if=' item.name != "星油云站超级管理员"' >
<view :class="['cuIcon-' + item.cuIcon, 'text-' + cuIconList[index+1].color]" class="text-sl"> <view :class="['cuIcon-' + item.cuIcon, 'text-' + cuIconList[index+1].color]" class="text-sl">
<view class="cu-tag badge" v-if="item.badge != 0"> <view class="cu-tag badge" v-if="item.badge != 0">
@ -92,18 +101,12 @@
</view> </view>
<text>{{ cuIconList[1].name }}</text> <text>{{ cuIconList[1].name }}</text>
</view> </view>
<view style="height: 180rpx;display: flex;justify-content: flex-end;" class="cu-item" @tap="routerTo('/pages/escalation/escalation')"> <!-- <view style="height: 180rpx;display: flex;justify-content: flex-end;" class="cu-item" @tap="routerTo('/pages/escalation/escalation')">
<!-- <view :class="['cuIcon-' + cuIconList[2].cuIcon, 'text-' + cuIconList[2].color]" class="text-sl">
<view class="cu-tag badge" v-if="cuIconList[2].badge != 0">
<block v-if="cuIconList[2].badge != 1">
{{ cuIconList[2].badge > 99 ? '99+' : cuIconList[2].badge }}</block>
</view>
</view> -->
<view> <view>
<image style="width: 50rpx;height: 50rpx;" src="/static/img/dzsb.png"></image> <image style="width: 50rpx;height: 50rpx;" src="/static/img/dzsb.png"></image>
</view> </view>
<text>{{ cuIconList[2].name }}</text> <text>{{ cuIconList[2].name }}</text>
</view> </view> -->
<!-- <view class="cu-item" @tap="routerTo('/pages/TransactionStatistics/TransactionStatistics')"> <!-- <view class="cu-item" @tap="routerTo('/pages/TransactionStatistics/TransactionStatistics')">
<view :class="['cuIcon-' + 'new', 'text-' + cuIconList[0].color]" class="text-sl"> <view :class="['cuIcon-' + 'new', 'text-' + cuIconList[0].color]" class="text-sl">
<view class="cu-tag badge" v-if="cuIconList[0].badge != 0"> <view class="cu-tag badge" v-if="cuIconList[0].badge != 0">
@ -142,7 +145,7 @@
</view> </view>
<view class="text-left padding-xl padding-bottom padding-top bg-white"> <view class="text-left padding-xl padding-bottom padding-top bg-white">
<view class="flex align-center justify-between margin-bottom-sm " v-for="(list,i) in oliList" :key='list'> <view class="flex align-center justify-between margin-bottom-sm " v-for="(list,i) in oliList" :key='list'>
<view class=""> {{list.otherSiteName}}</view> <view class=""> {{list.siteName}}</view>
<view class=""> <view class="">
<view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm" @tap="checkLists(list)"> <view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm" @tap="checkLists(list)">
进入 进入
@ -164,7 +167,7 @@
</view> </view>
<view class="text-left padding-xl padding-bottom padding-top bg-white"> <view class="text-left padding-xl padding-bottom padding-top bg-white">
<view class="flex align-center justify-between margin-bottom-sm " v-for="(list,i) in oliList" :key='list'> <view class="flex align-center justify-between margin-bottom-sm " v-for="(list,i) in oliList" :key='list'>
<view class=""> {{list.otherSiteName}}</view> <view class=""> {{list.siteName}}</view>
<view class=""> <view class="">
<view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm" @tap="checkLists(list)"> <view class=" bg-red cu-btn text-white text-center btn-radius-10 text-sm" @tap="checkLists(list)">
进入 进入
@ -439,16 +442,16 @@
}, },
checkLists(items){ checkLists(items){
// //console.log(items) // //console.log(items)
let id = items.channelId let id = items.id
this.changeChannel.channelId = items.channelId this.changeChannel.siteId = items.id
this.changeChannel.unionId = uni.getStorageSync('unionId') this.changeChannel.unionId = uni.getStorageSync('unionId')
this.changeChannel.username = this.loginUser.userPhone this.changeChannel.username = this.loginUser.userPhone
uni.setStorageSync('channelId',items.channelId) uni.setStorageSync('channelId',items.id)
oilIdentityApi.changeChannelLogin(this.changeChannel).then((res)=>{ oilIdentityApi.changeChannelLogin(this.changeChannel).then((res)=>{
// //console.log(res) // //console.log(res)
if(res.code == 20000){ if(res.code == 20000){
uni.setStorageSync('siteOli',items.otherSiteName) uni.setStorageSync('siteOli',items.siteName)
this.accountName = items.otherSiteName this.accountName = items.siteName
this.checkList = '' this.checkList = ''
this.checkFirst = false this.checkFirst = false
uni.setStorageSync('checkFirst',false) uni.setStorageSync('checkFirst',false)

32
pages/index/index.vue
Unescape View File

@ -11,8 +11,7 @@
<text :class="PageCur=='home'?'text-red':'text-gray'"> <text :class="PageCur=='home'?'text-red':'text-gray'">
加油站 加油站
</text> </text>
</view> </view>
<view class="action text-gray add-action" @tap="NavChange" data-cur="scan"> <view class="action text-gray add-action" @tap="NavChange" data-cur="scan">
<button class="cu-btn cuIcon-scan sl shadow" :class="PageCur=='scan'?'bg-main-oil':'bg-gradual-orange'"></button> <button class="cu-btn cuIcon-scan sl shadow" :class="PageCur=='scan'?'bg-main-oil':'bg-gradual-orange'"></button>
<text :class="PageCur=='scan'?'text-red':'text-gray'"> <text :class="PageCur=='scan'?'text-red':'text-gray'">
@ -63,22 +62,10 @@
url: '../../packageOrders/pages/printTicket/printTicket' url: '../../packageOrders/pages/printTicket/printTicket'
}) })
}, },
onShow() { onShow() {
// uni.showToast({
// title:'这里是show'
// })
//console.log('这里是indexonshow')
uni.setStorageSync('orderType',null)
// uni.preloadPage({url: "/pages/station-info/scan-camera/scan-camera"});
const token = uni.getStorageSync('Authorization') const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('device') const openid = uni.getStorageSync('device')
// //console.log('++++++++++++') if (token && openid) {
// //console.log(token)
// //console.log(openid)
// //console.log('++++++++++++')
if (token && openid) {
// this.getUserInfo()
// this.getSiteInfo()
} else { } else {
uni.showToast({ uni.showToast({
title: '您还没有登录哦', title: '您还没有登录哦',
@ -87,11 +74,9 @@
setTimeout(function() { setTimeout(function() {
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/boforeLogin/boforeLogin', url: '/pages/login/boforeLogin/boforeLogin',
success: () => { success: () => {
//console.log('跳转成功')
}, },
fail: (err) => { fail: (err) => {
//console.log(err)
} }
}) })
}, 1500); }, 1500);
@ -253,6 +238,11 @@
NavChange: function(e) { NavChange: function(e) {
this.PageCur = e.currentTarget.dataset.cur this.PageCur = e.currentTarget.dataset.cur
if (this.PageCur == "scan") { if (this.PageCur == "scan") {
uni.showToast({
title:'功能开发中',
icon:'none'
});
return
this.scanQr() this.scanQr()
} }
}, },

45
pages/setup/setup.vue
Unescape View File

@ -3,18 +3,21 @@
<cu-custom class="main-totextbar bg-main-oil" bgColor="bg-main-oil"> <cu-custom class="main-totextbar bg-main-oil" bgColor="bg-main-oil">
<block slot="content">个人中心</block> <block slot="content">个人中心</block>
</cu-custom> </cu-custom>
<view class="bg-img flex align-center" :style="'background-image: url('+mainURL+'user-info-bg.png);height:250upx;width:750upx'"> <view class="bg-img flex align-center"
:style="'background-image: url('+mainURL+'user-info-bg.png);height:250upx;width:750upx'">
<view class="position-re card-view"> <view class="position-re card-view">
<view class="position-ab"> <view class="position-ab">
<view class="cu-list text-white menu-avatar padding bg-transparent no-border"> <view class="cu-list text-white menu-avatar padding bg-transparent no-border">
<view class="cu-item bg-transparent no-border"> <view class="cu-item bg-transparent no-border">
<view class="cu-avatar round xl " :style="'background-image: url('+mainURL+'default-avator.png)'"> <view class="cu-avatar round xl "
:style="'background-image: url('+mainURL+'default-avator.png)'">
</view> </view>
<view class="content userInfoList padding-left"> <view class="content userInfoList padding-left">
<view class="margin-left-xs">{{userInfo.name}}</view> <view class="margin-left-xs">{{userInfo.name}}</view>
<view class=" showIds " > <text class="text-sm"> {{userInfo.id}}</text></view> <view class=" showIds "> <text class="text-sm"> {{userInfo.id}}</text></view>
<view class="cu-tag round bg-dark-main-color sm "> <text class="text-sm"> {{userInfo.userPhone}}</text></view> <view class="cu-tag round bg-dark-main-color sm "> <text class="text-sm">
{{userInfo.userPhone}}</text></view>
</view> </view>
</view> </view>
</view> </view>
@ -78,9 +81,9 @@
return { return {
mainURL: this.global.mainURL, mainURL: this.global.mainURL,
userInfo: {}, userInfo: {},
channel:{}, channel: {},
accountName:'' accountName: ''
} }
}, },
created() { created() {
@ -95,16 +98,18 @@
} }
}) })
}, },
loginOut() { async loginOut() {
// await cloudSiteApi.logout();
uni.clearStorage() uni.clearStorage()
uni.reLaunch({ uni.reLaunch({
url: '/pages/login/boforeLogin/boforeLogin?type=1' // url: '/pages/login/boforeLogin/boforeLogin?type=1' //
}) })
}, },
getInfo() { getInfo() {
this.userInfo = uni.getStorageSync('loginUser') this.userInfo = uni.getStorageSync('loginUser')
this.accountName=uni.getStorageSync('siteOli'), this.accountName = uni.getStorageSync('siteOli'),
console.log(this.userInfo) console.log(this.userInfo)
// cloudSiteApi.personCenter().then(res => { // cloudSiteApi.personCenter().then(res => {
// if (res.code == 20000) { // if (res.code == 20000) {
// this.userInfo = res.data // this.userInfo = res.data
@ -131,20 +136,22 @@
</script> </script>
<style scoped> <style scoped>
.userInfoList{ .userInfoList {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: flex-start; align-items: flex-start;
flex-direction: column; flex-direction: column;
} }
.showIds{
border-radius: 27rpx; .showIds {
padding: 0rpx 14rpx; border-radius: 27rpx;
font-size: 15rpx; padding: 0rpx 14rpx;
line-height: 1.5; font-size: 15rpx;
margin-bottom: 3px; line-height: 1.5;
margin-bottom: 3px;
margin-bottom: 10upx; margin-bottom: 10upx;
} }
.cu-list+.cu-list { .cu-list+.cu-list {
margin-top: 0; margin-top: 0;
} }
@ -172,4 +179,4 @@
.bg-img .cu-list.menu>.cu-item::after { .bg-img .cu-list.menu>.cu-item::after {
border-bottom: 0; border-bottom: 0;
} }
</style> </style>

7
utils/request.js
Unescape View File

@ -7,7 +7,7 @@ import utils from '@/utils/encode'
//42 洛超 /29 孙志华 /40 阿浩 //42 洛超 /29 孙志华 /40 阿浩
// 测试日日顺时需要连阿浩 // 测试日日顺时需要连阿浩
const testUrl = 'http://192.168.23:38080' const testUrl = 'http://192.168.26:38080'
// const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
@ -39,13 +39,16 @@ service.interceptors.request.use(
const openId = uni.getStorageSync('openid') const openId = uni.getStorageSync('openid')
const unionId = uni.getStorageSync('unionid') const unionId = uni.getStorageSync('unionid')
const accountSources = 'LOGIN_MP_WECHAT' const accountSources = 'LOGIN_MP_WECHAT'
// console.log(unionId) // console.log(unionId)
// 原本为 openid // 原本为 openid
config.headers['Authorization'] = token config.headers['Authorization'] = token
config.headers['imei'] = unionId config.headers['imei'] = unionId
config.headers['openId'] = openId config.headers['openId'] = openId
config.headers['dataSources'] = 'MP' config.headers['dataSources'] = 'MP'
config.headers['accountSources'] = accountSources config.headers['accountSources'] = accountSources ;
config.headers['loginSystem'] = 'OIL_MINI_CLOUD'
config.headers['loginDevice'] = 'LOGIN_MP_WECHAT'
if (env === 'production') { if (env === 'production') {
// 生产环境，加密，不输出任何东西 // 生产环境，加密，不输出任何东西
// 设置jsessionid和token // 设置jsessionid和token

Write Preview
Loading…
Cancel
Save