diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue index 35ba97f7f..8cc9e30f7 100644 --- a/yudao-ui-app/App.vue +++ b/yudao-ui-app/App.vue @@ -1,22 +1,31 @@ diff --git a/yudao-ui-app/common/api.js b/yudao-ui-app/common/api.js index d090e2bb5..34b56b727 100644 --- a/yudao-ui-app/common/api.js +++ b/yudao-ui-app/common/api.js @@ -2,12 +2,15 @@ const { http } = uni.$u /* login */ //使用手机 + 密码登录 -export const passwordLogin = params => http.post('/app-api/member/user/login', params) +export const passwordLogin = params => http.post('/app-api/member/login', params) //发送手机验证码 export const sendSmsCode = params => http.post('/app-api/member/send-sms-code', params) //使用手机 + 验证码登录 export const smsLogin = params => http.post('/app-api/member/sms-login', params) +//获取用户信息 +export const getUserInfo = params => http.get('/app-api/member/user/get', params) + /* index */ // 获取滚动图数据 export const getBannerData = params => http.get('/app-api/index', params) diff --git a/yudao-ui-app/common/config.js b/yudao-ui-app/common/config.js index ec3682f18..14c80225e 100644 --- a/yudao-ui-app/common/config.js +++ b/yudao-ui-app/common/config.js @@ -1,3 +1,8 @@ module.exports = { - baseUrl: 'http://192.168.3.199:8086' + //后端接口地址 + baseUrl: 'http://127.0.0.1:48080', + header: { + //租户ID + 'tenant-id': 1 + } } diff --git a/yudao-ui-app/common/mixin.js b/yudao-ui-app/common/mixin.js index b6a4eeee3..f124374df 100644 --- a/yudao-ui-app/common/mixin.js +++ b/yudao-ui-app/common/mixin.js @@ -1,7 +1,5 @@ export default { - data() { - return { - - } - } + data() { + return {} + } } diff --git a/yudao-ui-app/main.js b/yudao-ui-app/main.js index 7f51faee1..d662ffd07 100644 --- a/yudao-ui-app/main.js +++ b/yudao-ui-app/main.js @@ -1,14 +1,16 @@ import Vue from 'vue' import App from './App' +// 引入全局uView +import uView from '@/uni_modules/uview-ui' + // vuex import store from './store' Vue.config.productionTip = false Vue.prototype.$store = store -// 引入全局uView -import uView from '@/uni_modules/uview-ui' + App.mpType = 'app' Vue.use(uView) diff --git a/yudao-ui-app/pages/cart/cart.vue b/yudao-ui-app/pages/cart/cart.vue index fc20e149d..9b8b42b38 100644 --- a/yudao-ui-app/pages/cart/cart.vue +++ b/yudao-ui-app/pages/cart/cart.vue @@ -4,7 +4,7 @@ - +