diff --git a/client_mp/App.vue b/client_mp/App.vue index ac8bcb0..45c99f9 100644 --- a/client_mp/App.vue +++ b/client_mp/App.vue @@ -13,13 +13,25 @@ /** * h5,app-plus(nvue下也为app-plus),mp-weixin,mp-alipay...... */ - this.$u.api.getUserInfo().then(res=>{ - this.$u.vuex('vuex_user', res.data) - }).catch(e=>{ - uni.reLaunch({ + var that=this + // 小程序自动登录 + uni.login({ + provider: 'weixin', + success: function (loginRes) { + that.$u.api.wxmplogin({code:loginRes.code}).then(res=>{ + that.$u.vuex('vuex_token', res.data.access) + }).catch(e=>{uni.reLaunch({ url:'/pages/login/login' - }) - }) + })}) + } + }); + // this.$u.api.getUserInfo().then(res=>{ + // this.$u.vuex('vuex_user', res.data) + // }).catch(e=>{ + // uni.reLaunch({ + // url:'/pages/login/login' + // }) + // }) }, } diff --git a/client_mp/common/http.api.js b/client_mp/common/http.api.js index 437c7b9..2c5f7dd 100644 --- a/client_mp/common/http.api.js +++ b/client_mp/common/http.api.js @@ -19,6 +19,10 @@ const install = (Vue, vm) => { let login = (params = {}) => vm.$u.post('/token/', params); //账户密码登录 // 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下 + let wxmplogin = (params = {}) => vm.$u.post('/wxmplogin/', params); //微信登录 + + let bindmp = (params = {}) => vm.$u.post('/system/user/bindwxmp/', params); //微信绑定 + let getMyInspectTaskList = (params = {}) => vm.$u.get('/quality/subinspecttask/self/', params); let getSubinspectTask = (id, params)=> vm.$u.get(`/quality/subinspecttask/${id}/`, params); @@ -43,6 +47,8 @@ const install = (Vue, vm) => { getCode, codeLogin, login, + wxmplogin, + bindmp, getMyInspectTaskList, getSubinspectTask, getSubtaskDepts, diff --git a/client_mp/pages/home/home.vue b/client_mp/pages/home/home.vue index 2988d8d..9d69798 100644 --- a/client_mp/pages/home/home.vue +++ b/client_mp/pages/home/home.vue @@ -13,7 +13,7 @@ - + {{item.name}} @@ -116,9 +116,9 @@ }).then(res => { this.myinspecttaskList = res.data }).catch(e => { - uni.reLaunch({ - url:'/pages/login/login' - }) + // uni.reLaunch({ + // url:'/pages/login/login' + // }) }) }, openPage(path) { diff --git a/client_mp/pages/inspectrecord/index.vue b/client_mp/pages/inspectrecord/index.vue index d86559e..835f1b8 100644 --- a/client_mp/pages/inspectrecord/index.vue +++ b/client_mp/pages/inspectrecord/index.vue @@ -48,7 +48,7 @@ --> - 多选 + 多选 指派给 diff --git a/client_mp/pages/inspectrecord/recorddo.vue b/client_mp/pages/inspectrecord/recorddo.vue index c6720d8..b2f938d 100644 --- a/client_mp/pages/inspectrecord/recorddo.vue +++ b/client_mp/pages/inspectrecord/recorddo.vue @@ -111,7 +111,7 @@ // console.log(sData.imgs) this.$u.api.checkInspectRecord(sData.id, sData).then(res => { - + this.$u.toast('提交成功'); uni.navigateBack({ }) diff --git a/client_mp/pages/login/login.vue b/client_mp/pages/login/login.vue index 63792c9..e2c8740 100644 --- a/client_mp/pages/login/login.vue +++ b/client_mp/pages/login/login.vue @@ -1,9 +1,8 @@