diff --git a/apis/index.js b/apis/index.js index a091090..aaa096b 100644 --- a/apis/index.js +++ b/apis/index.js @@ -6,6 +6,7 @@ */ import store from '@/store' +import router from '../router' // 基础配置 const config = { @@ -145,9 +146,11 @@ const loginHint = () => { showCancel:false, success: res=> { loginHintState = false - if (res.confirm) uni.switchTab({ - url:'/pages/index/index' - }) + if (res.confirm) { + uni.reLaunch({ + url:'/pages/index/index' + }) + } } }) } diff --git a/apis/interfaces/scan.js b/apis/interfaces/scan.js index 82c5faf..63a17a8 100644 --- a/apis/interfaces/scan.js +++ b/apis/interfaces/scan.js @@ -3,31 +3,29 @@ * moduleName:核销相关操作 */ -import { - request -} from '../index' +import { request } from '../index' // 扫码前置条件 get 核销前置 post 表示核销 -const scanInfo = (apiUrl, data, method) => { - return request({ - url: apiUrl, - method: method, - data: data - }) +const scanInfo = (apiUrl,data,method) => { + return request({ + url: apiUrl, + method:method, + data:data + }) } // 核销记录 -const scanList = (apiUrl, data) => { - return request({ - url: apiUrl, - method: 'GET', - data: data - }) +const scanList = (apiUrl,data) => { + return request({ + url: apiUrl, + method:'GET', + data:data + }) } export { - scanInfo, - scanList + scanInfo, + scanList } diff --git a/pages.json b/pages.json index 976c57d..7622737 100644 --- a/pages.json +++ b/pages.json @@ -281,14 +281,18 @@ "name": "verificationIndex", "auth": true, "style": { - "navigationBarTitleText": "扫码核销" + "navigationBarTitleText": "扫码核销", + "navigationBarBackgroundColor":"#076cff", + "navigationBarTextStyle":"white" } }, { "path": "pages/verification/history", "name": "verificationHistory", "auth": true, "style": { - "navigationBarTitleText": "核销记录" + "navigationBarTitleText": "核销记录", + "navigationBarBackgroundColor":"#076cff", + "navigationBarTextStyle":"white" } }, { "path": "pages/shop/lists", diff --git a/pages/found/index.vue b/pages/found/index.vue index 21709ea..9e7315b 100644 --- a/pages/found/index.vue +++ b/pages/found/index.vue @@ -99,7 +99,7 @@ tipsContent: '', // 弹出的动态内容 tipsState: false // 弹出的动态状态 }, - energyShard: '' // 碎片说明 + energyShard: '' // 积分说明 } }, onShow() { diff --git a/pages/verification/history.vue b/pages/verification/history.vue index 55f1c32..fcada04 100644 --- a/pages/verification/history.vue +++ b/pages/verification/history.vue @@ -1,7 +1,7 @@