diff --git a/main.js b/main.js index 50d3d94..0858c0e 100644 --- a/main.js +++ b/main.js @@ -34,7 +34,7 @@ export function createApp () { app.config.productionTip = false; app.component('g-empty', gEmpty); - app.component('g-tabbar', gTabbar); + app.component('g-tabbar', gTabbar); app.component('g-loading', gLoading); app.component('g-button', gButton); app.component('g-list-job', gListJob); @@ -99,7 +99,7 @@ export function createApp () { uni.setStorageSync("apply-agencyId", res.user.agencyId); // 单独存储 -- 代理id,方便获取 uni.setStorageSync("apply-supplierAccount", res.supplierAccount); // 单独存储 -- 是否是发单号,方便获取 0.不是发单号 1.是发单号 if (res.agencyId) { - // if (res.agencyStatus == 1) { + // if (res.agencyStatus == 1) { G.Get(apiInfo.login_agencyInfo, {}, (aRes) => { uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员 uni.setStorageSync("IS_CREATOR", aRes.agency.userId == res.user.id || res.admin == true ? 1 : 2); // 1是创建者 2是普通成员 @@ -167,7 +167,19 @@ export function createApp () { }); }, $sourceType); }, - + /** + * 上传到oss + */ + uploadImgToOss (callback = () => { }, type = 'default', $num = 1, $sourceType = ['album', 'camera']) { + G.uploadImage($num, (imgRes) => { + uni.showLoading({ + title: '上传中...', + }) + G.Get(apiInfo.getOssInfo, {}, (res) => { + console.log('uploadImgToOssresresresres', res); + }) + }) + }, /* 上传图片 */ uploadImgByCamera (callback = () => { }, type = 'default', $num = 1, $sourceType = ['camera']) { diff --git a/pages/message/index.vue b/pages/message/index.vue index cc64966..6fb394b 100644 --- a/pages/message/index.vue +++ b/pages/message/index.vue @@ -1,10 +1,12 @@