diff --git a/BagMoney/components/oil-card/oil-card.vue b/BagMoney/components/oil-card/oil-card.vue
index be63dda..6227c7a 100644
--- a/BagMoney/components/oil-card/oil-card.vue
+++ b/BagMoney/components/oil-card/oil-card.vue
@@ -43,7 +43,7 @@
- 扫码
+ 扫一扫
手机号码
@@ -57,6 +57,7 @@
-
diff --git a/BagStation/pages/oilQRcode/index.vue b/BagStation/pages/oilQRcode/index.vue
index 54f2905..8e73dc5 100644
--- a/BagStation/pages/oilQRcode/index.vue
+++ b/BagStation/pages/oilQRcode/index.vue
@@ -4,17 +4,24 @@
返回
-
- 肖师傅
- 13216655221
-
+
+
+
+ {{user.name || ''}}
+ {{user.userPhone || ''}}
+
+
+ 扫一扫上面的二维码图案,给我赠油,可截图保存。
+
-
+ 注: 重新生成收油码后, 以前截图保存的收油码将作废!
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
- })
+ return request({
+ url: `/${service_name}/${group_name}/getOilCardRecordByPage`,
+ method: 'post',
+ data: data
+ })
},
- switchAccountInfo(role){
+ switchAccountInfo(role) {
return request({
- url: `/${service_name}/${group_name}/switchAccountInfo/${role}`,
- method: 'get'
+ 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'
- })
- },
- 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
- })
- },
+ 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'
+ })
+ },
}
diff --git a/components/transBlock/index.vue b/components/transBlock/index.vue
new file mode 100644
index 0000000..ca3e937
--- /dev/null
+++ b/components/transBlock/index.vue
@@ -0,0 +1,240 @@
+
+
+
+
+ 请输入赠卡金额
+ ¥
+
+
+
+
+
+
+
+ 转出验证:本次转出需要短信确认,验证码 已发送至您的手机
+ {{phoneHandle(this.user.userPhone)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 转出成功!
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 31680bd..b6d7f8d 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -159,10 +159,12 @@
+