diff --git a/App.vue b/App.vue index 9ed7e68..c04481a 100644 --- a/App.vue +++ b/App.vue @@ -38,10 +38,6 @@ }) this.onShareAppMessage(option.query.scene); - }, - onLoad(e) { - console.log(e,'666666666666666666666666666666') - }, methods: { @@ -131,28 +127,9 @@ onShow: function(option) { const token = uni.getStorageSync('Authorization') const openid = uni.getStorageSync('openid') - let key = '' if (token && openid) { this.getAmount() - key = '真在线' - } else { - key = '离线' } - if (key == '在线') { - - } - setTimeout(() => { - console.log(key) - if (key == '在线') { - - } else { - // uni.redirectTo({ - // url: '/BagAuth/pages/login/login' - // }) - } - }, 2000) - // uni.showShareMenu() - // console.log('App Show') uni.getLocation({ type: 'wgs84', success: function(res) { @@ -163,9 +140,6 @@ } }); }, - onHide: function() { - // console.log('App Hide') - } } diff --git a/BagMoney/pages/oilCards/oilCards.vue b/BagMoney/pages/oilCards/oilCards.vue index 41269e0..4321bb8 100644 --- a/BagMoney/pages/oilCards/oilCards.vue +++ b/BagMoney/pages/oilCards/oilCards.vue @@ -43,7 +43,7 @@ - + @@ -89,15 +89,19 @@ + + - diff --git a/BagStation/pages/components/tki-qrcode/tki-qrcode.vue b/BagStation/pages/components/tki-qrcode/tki-qrcode.vue index 4e6d1c2..b8e5c5a 100644 --- a/BagStation/pages/components/tki-qrcode/tki-qrcode.vue +++ b/BagStation/pages/components/tki-qrcode/tki-qrcode.vue @@ -1,240 +1,248 @@ diff --git a/BagStation/pages/newRoutePlanning/newRoutePlanning.vue b/BagStation/pages/newRoutePlanning/newRoutePlanning.vue index 65bbdd4..91a72da 100644 --- a/BagStation/pages/newRoutePlanning/newRoutePlanning.vue +++ b/BagStation/pages/newRoutePlanning/newRoutePlanning.vue @@ -303,7 +303,7 @@ //坐标解压（返回的点串坐标，通过前向差分进行压缩） var kr = 1000000; for (var i = 2; i < coors.length; i++) { - coors[i] = Number(coors[i - 2]) + Number(coors[i]) / kr; + coors[i] = Number(coors[i - 2]) + Number(coors[i]) / kr; } //将解压后的坐标放入点串数组pl中 for (var i = 0; i < coors.length; i += 2) { diff --git a/BagStation/pages/oilQRcode/index.vue b/BagStation/pages/oilQRcode/index.vue new file mode 100644 index 0000000..4331b72 --- /dev/null +++ b/BagStation/pages/oilQRcode/index.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/BagStation/pages/stationDetail/stieQr.vue b/BagStation/pages/stationDetail/stieQr.vue index e1c01a7..6e5a2ca 100644 --- a/BagStation/pages/stationDetail/stieQr.vue +++ b/BagStation/pages/stationDetail/stieQr.vue @@ -69,7 +69,7 @@ + :usingComponents="usingComponents" showLoading /> @@ -298,9 +298,6 @@ }) }) return target - }, - qrR() { - }, newQrString() { this.getQrString(this.activeCard) diff --git a/api/account.js b/api/account.js index 7801703..268260c 100644 --- a/api/account.js +++ b/api/account.js @@ -3,35 +3,35 @@ const service_name = "oil-site" const group_name = "oilSiteAccountAppInfo" export default { //统计用户油卡总数量、总余额 - getTotalOilCardInfo (data) { - return request({ - url: `/${service_name}/${group_name}/getTotalOilCardInfo`, - method: 'get', - data:data - }) + getTotalOilCardInfo(data) { + return request({ + url: `/${service_name}/${group_name}/getTotalOilCardInfo`, + method: 'get', + data: data + }) }, //查询不可用油卡 - getSyncDeductions (data) { + getSyncDeductions(data) { return request({ - url: `/oil-dict/areaCode/getSyncDeductions`, - method: 'post', - data:data + url: `/oil-dict/areaCode/getSyncDeductions`, + method: 'post', + data: data }) }, //获取用户油卡账户信息 （个人 / 自营 / 外请） - getUserAccount (data) { - return request({ - url: `/${service_name}/${group_name}/getUserAccount`, - method: 'get', - data:data - }) + getUserAccount(data) { + return request({ + url: `/${service_name}/${group_name}/getUserAccount`, + method: 'get', + data: data + }) }, getUserInfo(data) { - return request({ - url: `/${service_name}/${group_name}/getUserSetInfo`, - method: 'get', - data:data - }) + return request({ + url: `/${service_name}/${group_name}/getUserSetInfo`, + method: 'get', + data: data + }) }, // logout(){ // return request({ @@ -39,42 +39,42 @@ export default { // method: 'get' // }) // }, - logout(){ + logout() { return request({ - url: `/${service_name}/${group_name}/logoutAuthSystem/XOIL_DRIVER`, - method: 'get' + url: `/${service_name}/${group_name}/logoutAuthSystem/XOIL_DRIVER`, + method: 'get' }) }, - getCustomerAccount(){ + getCustomerAccount() { return request({ - url: `/${service_name}/${group_name}/getCustomerAccount`, - method: 'get' + url: `/${service_name}/${group_name}/getCustomerAccount`, + method: 'get' }) }, getUserPayInfo(data) { - return request({ - url: `/${service_name}/${group_name}/getUserPayInfo`, - method: 'post', - data:data - }) + return request({ + url: `/${service_name}/${group_name}/getUserPayInfo`, + method: 'post', + data: data + }) }, pollingPayResult(id) { - return request({ - url: `/${service_name}/${group_name}/pollingPayResult/${id}`, - method: 'get' - }) + return request({ + url: `/${service_name}/${group_name}/pollingPayResult/${id}`, + method: 'get' + }) }, getOilCardRecordByPage(data) { - return request({ - url: `/${service_name}/${group_name}/getOilCardRecordByPage`, - method: 'post', - data:data - }) - }, - switchAccountInfo(role){ return request({ - url: `/${service_name}/${group_name}/switchAccountInfo/${role}`, - method: 'get' + url: `/${service_name}/${group_name}/getOilCardRecordByPage`, + method: 'post', + data: data + }) + }, + switchAccountInfo(role) { + return request({ + url: `/${service_name}/${group_name}/switchAccountInfo/${role}`, + method: 'get' }) }, // getByPhone(role){ //old 获取用户信息 @@ -83,31 +83,43 @@ export default { // method: 'get' // }) // }, - getByPhone(role){ //new 获取用户信息 - return request({ - url: `/oil-user/sysCustomerInfo/getByPhoneNoGlobalEnable/${role}`, - method: 'get' - }) + getByPhone(role) { //new 获取用户信息 + return request({ + url: `/oil-user/sysCustomerInfo/getByPhoneNoGlobalEnable/${role}`, + method: 'get' + }) + }, + giveCard(role) { + return request({ + url: `/oil-user/sysCustomerInfo/giveCard`, + method: 'post', + data: role + }) + }, + oilCustomerAccountRecord(role) { + return request({ + url: `/oil-finance/oilCustomerAccountRecord/giveCard`, + method: 'post', + data: role + }) + }, + getNewUserAccount(data) { + return request({ + url: `/oil-site/oilSiteAccountAppInfo/getNewUserAccount`, + method: 'post', + data: data + }) + }, + getQrStr(id, reset) { + return request({ + url: `/oil-user/oilCustomerInfo/getQrStr/${id}?reset=${reset}`, + method: 'get' + }) + }, + checkQrStr(id, qrStr) { + return request({ + url: `/oil-user/oilCustomerInfo/checkQrStr/${id}?qrStr=${qrStr}`, + method: 'get' + }) }, - giveCard(role){ - return request({ - url: `/oil-user/sysCustomerInfo/giveCard`, - method: 'post', - data:role - }) - }, - oilCustomerAccountRecord(role){ - return request({ - url: `/oil-finance/oilCustomerAccountRecord/giveCard`, - method: 'post', - data:role - }) - }, - getNewUserAccount(data){ - return request({ - url: `/oil-site/oilSiteAccountAppInfo/getNewUserAccount`, - method: 'post', - data:data - }) - }, } diff --git a/colorui/components/cu-custom.vue b/colorui/components/cu-custom.vue index 652166d..c8ecab4 100644 --- a/colorui/components/cu-custom.vue +++ b/colorui/components/cu-custom.vue @@ -26,8 +26,8 @@ name: 'cu-custom', computed: { style() { - var StatusBar= this.StatusBar; - var CustomBar= this.CustomBar; + var StatusBar = this.StatusBar; + var CustomBar = this.CustomBar; var bgImage = this.bgImage; var style = `height:${CustomBar}px;padding-top:${StatusBar}px;`; if (this.bgImage) { @@ -37,7 +37,7 @@ } }, props: { - backCard:{ + backCard: { type: Boolean, default: false }, @@ -45,9 +45,9 @@ type: String, default: '' }, - callBack:{ - type:Function, - default:()=>null + callBack: { + type: Function, + default: () => null }, isBack: { type: [Boolean, String], @@ -57,35 +57,35 @@ type: String, default: '' }, - isPay:{ + isPay: { type: Boolean, default: false } }, methods: { - BackPage() { - if(this.callBack){ + BackPage() { + if (this.callBack) { this.callBack() - }else{ - if(this.backCard == true){ + } else { + if (this.backCard == true) { uni.redirectTo({ - url:'/BagMoney/pages/oilCards/oilCards' - }) - return - } - if(this.isPay == true){ - uni.switchTab({ - url:'/pages/tabbar/station/stationList' + url: '/BagMoney/pages/oilCards/oilCards' }) - return - } - uni.navigateBack({}) + return + } + if (this.isPay == true) { + uni.switchTab({ + url: '/pages/tabbar/station/stationList' + }) + return + } + uni.navigateBack() } - - // uni.navigateBack({ - // delta: 1 - // }); - + + // uni.navigateBack({ + // delta: 1 + // }); + } } } diff --git a/components/transBlock/index.vue b/components/transBlock/index.vue new file mode 100644 index 0000000..a09938c --- /dev/null +++ b/components/transBlock/index.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/pages.json b/pages.json index 60f70d6..95c93ec 100644 --- a/pages.json +++ b/pages.json @@ -322,6 +322,13 @@ "enablePullDownRefresh": false } + }, + { + "path": "pages/oilQRcode/index", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } } ] }, @@ -333,7 +340,6 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - } ] diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 31680bd..b5d4ec0 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -159,10 +159,12 @@ + \ No newline at end of file + diff --git a/static/img/back.png b/static/img/back.png new file mode 100644 index 0000000..f9f7151 Binary files /dev/null and b/static/img/back.png differ diff --git a/static/img/erweima-grey.png b/static/img/erweima-grey.png new file mode 100644 index 0000000..100dd9a Binary files /dev/null and b/static/img/erweima-grey.png differ diff --git a/static/img/erweima-white.png b/static/img/erweima-white.png new file mode 100644 index 0000000..10436e6 Binary files /dev/null and b/static/img/erweima-white.png differ diff --git a/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue b/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue index 9bac644..87e88a3 100644 --- a/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue +++ b/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue @@ -211,7 +211,8 @@ export default {