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

更新

Browse Source
KongDuo
xiaozhiyong 2 years ago
parent 71e8a5c851
commit a8249b5de8
13 changed files with 51 additions and 51 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. 2
      App.vue
  2. 18
      BagAuth/pages/login/login.vue
  3. 4
      BagStation/pages/SeparateProcess/payResult.vue
  4. 4
      BagStation/pages/components/price-tab.vue
  5. 4
      BagStation/pages/makeOrder/payResult.vue
  6. 2
      BagStation/pages/routePlainMap/routePlainMap.vue
  7. 4
      components/order-item.vue
  8. 4
      components/order-itemUrea.vue
  9. 6
      components/site-item/site-item.vue
  10. 8
      pages/index/startPage/startPage.vue
  11. 12
      pages/tabbar/home/home.vue
  12. 10
      pages/tabbar/station/stationList.vue
  13. 24
      utils/request.js

2
App.vue
Unescape View File

@ -81,7 +81,7 @@
onShareAppMessage(e) { onShareAppMessage(e) {
let that = this let that = this
wx.onAppRoute((res) => { wx.onAppRoute((res) => {
console.log(res, '当前页面路由发生变化 触发该事件onShareAppMessage'); // console.log(res, '当前页面路由发生变化 触发该事件onShareAppMessage');
const pages = getCurrentPages() //获取加载的页面 const pages = getCurrentPages() //获取加载的页面
const view = pages[pages.length - 1] //获取当前页面的对象 const view = pages[pages.length - 1] //获取当前页面的对象
if (!view) return false //如果不存在页面对象 则返回 if (!view) return false //如果不存在页面对象 则返回

18
BagAuth/pages/login/login.vue
Unescape View File

@ -104,13 +104,13 @@
this.otherUser = true this.otherUser = true
uni.clearStorageSync() uni.clearStorageSync()
this.weChatLogin(option) this.weChatLogin(option)
console.log('当前为卡力用户') // console.log('当前为卡力用户')
return return
} }
} }
let IsOtherUser = uni.getStorageSync('isOther') let IsOtherUser = uni.getStorageSync('isOther')
console.log('这里是onload',IsOtherUser) // console.log('这里是onload',IsOtherUser)
if(IsOtherUser){ if(IsOtherUser){
uni.showToast({ uni.showToast({
title:'卡力用户仅支持跳转登录', title:'卡力用户仅支持跳转登录',
@ -121,13 +121,13 @@
} else{ } else{
this.weChatLogin() this.weChatLogin()
} }
console.log('小程序跳转参数接收onLoad----') // console.log('小程序跳转参数接收onLoad----')
console.log('姓名:',option.driverName) // console.log('姓名:',option.driverName)
console.log('公司ID:',option.companyId) // console.log('公司ID:',option.companyId)
console.log('车牌号:',option.plateNumber) // console.log('车牌号:',option.plateNumber)
console.log('油站Id:',option.siteId) // console.log('油站Id:',option.siteId)
console.log('--------------------------') // console.log('--------------------------')
console.log('这里是登录') // console.log('这里是登录')
}, },
methods: { methods: {
weChatLogin(option){ weChatLogin(option){

4
BagStation/pages/SeparateProcess/payResult.vue
Unescape View File

@ -353,9 +353,9 @@
}, },
moneyFormat(value) { moneyFormat(value) {
if (value != 'xxx.x') { if (value != 'xxx.x') {
console.log('old:',value) // console.log('old:',value)
let realAmount =(parseInt(value * 100) / 100).toFixed(2) let realAmount =(parseInt(value * 100) / 100).toFixed(2)
console.log('new:',realAmount) // console.log('new:',realAmount)
return realAmount return realAmount
} else { } else {
return value return value

4
BagStation/pages/components/price-tab.vue
Unescape View File

@ -156,9 +156,9 @@
}, },
moneyFormat(value) { moneyFormat(value) {
if (value != 'xxx.x') { if (value != 'xxx.x') {
console.log('old:', value) // console.log('old:', value)
let realAmount = Math.floor(value * 100) / 100 let realAmount = Math.floor(value * 100) / 100
console.log('new:', realAmount) // console.log('new:', realAmount)
// return realAmount // return realAmount
return Number(value).toFixed(2) return Number(value).toFixed(2)
} else { } else {

4
BagStation/pages/makeOrder/payResult.vue
Unescape View File

@ -354,9 +354,9 @@
}, },
moneyFormat(value) { moneyFormat(value) {
if (value != 'xxx.x') { if (value != 'xxx.x') {
console.log('old:',value) // console.log('old:',value)
let realAmount =(parseInt(value * 100) / 100).toFixed(2) let realAmount =(parseInt(value * 100) / 100).toFixed(2)
console.log('new:',realAmount) // console.log('new:',realAmount)
return realAmount return realAmount
} else { } else {
return value return value

2
BagStation/pages/routePlainMap/routePlainMap.vue
Unescape View File

@ -651,7 +651,7 @@
}) })
}, },
getFilterData(v, c) { //v:油站油品 c:油站渠道 getFilterData(v, c) { //v:油站油品 c:油站渠道
console.log('111111111111111111111111111111111111111111111111111111111111111') // console.log('111111111111111111111111111111111111111111111111111111111111111')
oilSiteApi.getCheckInfo().then(res => { oilSiteApi.getCheckInfo().then(res => {
if (res.code == 20000) { if (res.code == 20000) {
let channelCodes = [] let channelCodes = []

4
components/order-item.vue
Unescape View File

@ -207,9 +207,9 @@
}, },
numberFilter(value) { numberFilter(value) {
if (value != 'xxx.x') { if (value != 'xxx.x') {
console.log('old:',value) // console.log('old:',value)
let realAmount =(Math.round(value * 100) / 100).toFixed(2) let realAmount =(Math.round(value * 100) / 100).toFixed(2)
console.log('new:',realAmount) // console.log('new:',realAmount)
return realAmount return realAmount
} else { } else {
// console.log('old:',value) // console.log('old:',value)

4
components/order-itemUrea.vue
Unescape View File

@ -210,9 +210,9 @@
}, },
numberFilter(value) { numberFilter(value) {
if (value != 'xxx.x') { if (value != 'xxx.x') {
console.log('old:',value) // console.log('old:',value)
let realAmount =(Math.round(value * 100) / 100).toFixed(2) let realAmount =(Math.round(value * 100) / 100).toFixed(2)
console.log('new:',realAmount) // console.log('new:',realAmount)
return realAmount return realAmount
} else { } else {
return value return value

6
components/site-item/site-item.vue
Unescape View File

@ -84,7 +84,7 @@
query.select('.activity-cu').boundingClientRect(data => {undefined query.select('.activity-cu').boundingClientRect(data => {undefined
console.log(data,'1111111111111111111') // console.log(data,'1111111111111111111')
if(data){ if(data){
this.mHeight = this.mHeight + data.height*2 this.mHeight = this.mHeight + data.height*2
} }
@ -108,7 +108,7 @@
} }
}, },
speedMark(val,data){ speedMark(val,data){
console.log(val,data,'qqqqqqqqqqqqqqqqqqqqqq') // console.log(val,data,'qqqqqqqqqqqqqqqqqqqqqq')
if(val == 0){ if(val == 0){
if(data == '0'){ if(data == '0'){
return '普通' return '普通'
@ -127,7 +127,7 @@
}, },
filters: { filters: {
channelCodeFamt(value) { channelCodeFamt(value) {
console.log(value) // console.log(value)
if (value == null || value == '' ) { if (value == null || value == '' ) {
return '未知' return '未知'
// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) // 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)

8
pages/index/startPage/startPage.vue
Unescape View File

@ -53,7 +53,7 @@
} }
}, },
mounted() { mounted() {
console.log('mounted') // console.log('mounted')
}, },
onLoad(option) { onLoad(option) {
this.option = option; this.option = option;
@ -62,7 +62,7 @@
onReady(option) {}, onReady(option) {},
methods: { methods: {
versionUpdate() { versionUpdate() {
console.log('versionUpdate') // console.log('versionUpdate')
let that = this let that = this
const updateManager = uni.getUpdateManager(); const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) { updateManager.onCheckForUpdate(function(res) {
@ -94,8 +94,8 @@
}); });
}, },
initFn(option) { initFn(option) {
console.log(option, '启动页'); // console.log(option, '启动页');
console.log(`%c 二维码进入 ${option.scene}`, 'color:red;font-size:50px') // console.log(`%c 二维码进入 ${option.scene}`, 'color:red;font-size:50px')
const token = uni.getStorageSync('Authorization') const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid') const openid = uni.getStorageSync('openid')
this.key = '' this.key = ''

12
pages/tabbar/home/home.vue
Unescape View File

@ -358,8 +358,8 @@
onLoad(e) { onLoad(e) {
let _that = this let _that = this
let IsOtherUser = _that.isOther let IsOtherUser = _that.isOther
console.log(IsOtherUser, '这里是判断是否为卡力') // console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是onLoad', IsOtherUser, '++++++') // console.log('这里是onLoad', IsOtherUser, '++++++')
if (IsOtherUser) { if (IsOtherUser) {
console.log('首页 卡力 进入') console.log('首页 卡力 进入')
uni.showToast({ uni.showToast({
@ -371,7 +371,7 @@
}) })
return return
} }
console.log('首页 非卡力 进入测试++') // console.log('首页 非卡力 进入测试++')
this.reverseGeocoder(this.location); this.reverseGeocoder(this.location);
setTimeout(()=>{ setTimeout(()=>{
let startParamsData = uni.getStorageSync('isJump')||null; let startParamsData = uni.getStorageSync('isJump')||null;
@ -527,8 +527,8 @@
if (res.code === 20000) { if (res.code === 20000) {
let _that = this let _that = this
let IsOtherUser = _that.isOther let IsOtherUser = _that.isOther
console.log(IsOtherUser, '这里是判断是否为卡力') // console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是getUserAuthInfo', IsOtherUser, '++++++') // console.log('这里是getUserAuthInfo', IsOtherUser, '++++++')
if (IsOtherUser) { if (IsOtherUser) {
uni.showToast({ uni.showToast({
title: '卡力用户只支持跳转登录', title: '卡力用户只支持跳转登录',
@ -785,9 +785,7 @@
} }
}, },
toDetail(item) { toDetail(item) {
console.log(item)
let itemS = JSON.stringify(item) let itemS = JSON.stringify(item)
console.log('进入油站详情items', itemS)
if (uni.getStorageSync('user')) { if (uni.getStorageSync('user')) {
if (item.channelCode === 'TY') { if (item.channelCode === 'TY') {
uni.setStorageSync('OtherSiteInfo', item) uni.setStorageSync('OtherSiteInfo', item)

10
pages/tabbar/station/stationList.vue
Unescape View File

@ -245,9 +245,9 @@
onLoad() { onLoad() {
if (!uni.getStorageSync('filterDatas')) { if (!uni.getStorageSync('filterDatas')) {
this.getFilterData() this.getFilterData()
console.log('dhgiuhihqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq') // console.log('dhgiuhihqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq')
} else{ } else{
console.log('dhgiuhihiiiiiiiiiiiiiiiiiiiiiiiiiiiii') // console.log('dhgiuhihiiiiiiiiiiiiiiiiiiiiiiiiiiiii')
} }
this.findPriceDetails() this.findPriceDetails()
if (uni.getStorageSync('productCodeList')) { if (uni.getStorageSync('productCodeList')) {
@ -343,6 +343,7 @@
} }
}, },
ureaToDetail(list){ ureaToDetail(list){
let itemS = JSON.stringify(list) let itemS = JSON.stringify(list)
if (uni.getStorageSync('user')) { if (uni.getStorageSync('user')) {
uni.navigateTo({ uni.navigateTo({
@ -606,9 +607,10 @@
// }, // },
toDetail(item) { toDetail(item) {
console.log(item) // console.log(item)
console.log('这里是进入前') // console.log('这里是进入前')
let itemS = JSON.stringify(item) let itemS = JSON.stringify(item)
if (uni.getStorageSync('user')) { if (uni.getStorageSync('user')) {
if(item.channelCode==='TY'){ if(item.channelCode==='TY'){
uni.setStorageSync('OtherSiteInfo',item) uni.setStorageSync('OtherSiteInfo',item)

24
utils/request.js
Unescape View File

@ -3,16 +3,16 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV // const env = process.env.NODE_ENV
// const env = 'production'/* */ // const env = 'production'/* */
// const env = 'test' // const env = 'test'
const env = 'production' const env = 'test'
// 45 // 45
const testUrl = 'http://192.168.0.23:38080' const testUrl = 'http://192.168.110.230:38080'
// const productUrl = 'https://www.xingoil.com/adminapi' // const productUrl = 'https://www.xingoil.com/adminapi'
const productUrl = 'http://uat.xingoil.com/adminapi' const productUrl = 'http://uat.xingoil.com/adminapi'
// const productUrl = 'http://192.168.0.191:38080' // const productUrl = 'http://192.168.0.191:38080'
// const productUrl = 'http://121.196.213.68/adminapi' // const productUrl = 'http://121.196.213.68/adminapi'
const service = axios.create({ const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl, baseURL: env == 'production' ? productUrl : testUrl,,
// baseURL: testUrl, // baseURL: testUrl,
timeout: 5000 timeout: 5000
}) })
@ -22,7 +22,7 @@ service.interceptors.request.use(
config => { config => {
// 拦截请求 // 拦截请求
closeShowLoading = config?.closeShowLoading||false; closeShowLoading = config?.closeShowLoading||false;
console.log(closeShowLoading,'isLoadingisLoadingisLoading') // console.log(closeShowLoading,'isLoadingisLoadingisLoading')
if(!closeShowLoading){ if(!closeShowLoading){
//判断是否自动开始请求loading //判断是否自动开始请求loading
uni.showLoading({ uni.showLoading({
@ -44,7 +44,7 @@ service.interceptors.request.use(
config.headers['dataSources'] = 'MP' config.headers['dataSources'] = 'MP'
if (env === 'production') { if (env === 'production') {
console.log("这里是生产") // console.log("这里是生产")
// 生产环境，加密，不输出任何东西 // 生产环境，加密，不输出任何东西
// 设置jsessionid和token // 设置jsessionid和token
const JSESSIONID = utils.uuid() const JSESSIONID = utils.uuid()
@ -58,13 +58,13 @@ service.interceptors.request.use(
} }
// 要加密 // 要加密
data.params = utils.encrypt(JSON.stringify(config.data)) data.params = utils.encrypt(JSON.stringify(config.data))
console.log('参数', config.url, '参数加密前', config.data, '加密：', data) // console.log('参数', config.url, '参数加密前', config.data, '加密：', data)
config.data = data config.data = data
// } // }
} else { } else {
console.log("这里是测试") // console.log("这里是测试")
console.log('\n\n-----------------------') // console.log('\n\n-----------------------')
console.log('参数', config.url, '参数加密前', config.data) // console.log('参数', config.url, '参数加密前', config.data)
url = config.url url = config.url
} }
@ -91,11 +91,11 @@ service.interceptors.response.use(
// 加密的数据，需要解密 // 加密的数据，需要解密
const dataParam = JSON.parse(utils.decrypt(res.data)) const dataParam = JSON.parse(utils.decrypt(res.data))
res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
console.log(res.data) // console.log(res.data)
// console.log('返回', response.config.url, '返回结果',res) // console.log('返回', response.config.url, '返回结果',res)
} }
} else { } else {
console.log('返回', response.config.url, '返回结果未加密', res) // console.log('返回', response.config.url, '返回结果未加密', res)
// console.log('-------------------------------------------\n\n') // console.log('-------------------------------------------\n\n')
} }
if(!closeShowLoading){ if(!closeShowLoading){
@ -104,7 +104,7 @@ service.interceptors.response.use(
} }
if (response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1) { if (response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1) {
if (response.config.url.indexOf('/oil-site/oilSiteAppInfo/getSiteDetails') != -1) { if (response.config.url.indexOf('/oil-site/oilSiteAppInfo/getSiteDetails') != -1) {
console.log('这里是getSiteDetails 拦截处') // console.log('这里是getSiteDetails 拦截处')
// if (res.code != 20000&&res.msg!='令牌为空，不允许操作'&&res.msg!='您的ip已经更改，请重新登录'&&res.msg!='登录与操作设备不同') { // if (res.code != 20000&&res.msg!='令牌为空，不允许操作'&&res.msg!='您的ip已经更改，请重新登录'&&res.msg!='登录与操作设备不同') {
// uni.showToast({ // uni.showToast({
// title: res.msg, // title: res.msg,

Write Preview
Loading…
Cancel
Save