diff --git a/App.vue b/App.vue index 9f884c5..0143076 100644 --- a/App.vue +++ b/App.vue @@ -64,6 +64,7 @@ ...uni.getStorageSync('GLOBAL_DATA') || {} }, onLaunch: function(option) { + this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.uid = this.$store.state.app.uid let that = this; @@ -97,6 +98,10 @@ break; } } + if(option.query.hasOwnProperty('spread')){ + that.globalData.spid = option.query.spread + } + console.log(that.globalData.spid,"分享者的uid") // #endif // 获取导航高度; uni.getSystemInfo({ diff --git a/api/user.js b/api/user.js index 66d4ff6..c6780ca 100644 --- a/api/user.js +++ b/api/user.js @@ -711,4 +711,8 @@ export function jifenToShare(data) { // export function getUserGroup(data) { return request.get(`user/group`,data) +} +// 获取列表 +export function getNoticeList() { + return request.get(`notice/list`) } \ No newline at end of file diff --git a/components/Authorize.vue b/components/Authorize.vue index c8557eb..b2285fd 100644 --- a/components/Authorize.vue +++ b/components/Authorize.vue @@ -191,6 +191,12 @@ userInfo.code = this.code; userInfo.spread = app.globalData.spid; //获取推广人ID userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID + console.log({ + auth: { + type:'routine', + auth: userInfo + } + },"参数") commonAuth({ auth: { type:'routine', diff --git a/pages.json b/pages.json index 6c1a155..8a4ae0e 100644 --- a/pages.json +++ b/pages.json @@ -104,6 +104,18 @@ "navigationBarBackgroundColor": "#F2F2F2" // #endif } + }, + { + "path": "notice", + "style": { + "navigationBarTitleText": "公告列表" + } + }, + { + "path": "noticeItem", + "style": { + "navigationBarTitleText": "公告详情" + } } ] }, diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index e160806..8dc7888 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -341,10 +341,10 @@ 生成海报 -