diff --git a/api/user.js b/api/user.js index febb0fe..a9dbc8b 100644 --- a/api/user.js +++ b/api/user.js @@ -19,7 +19,13 @@ export function errorReport(data) { return request.post(`api/err/report`, data); } - +/** + * 新商户 + */ +export function isNewMer(uid, mer_id, data) { + return request.post(`auth/guide/${uid}/${mer_id}`, data); +} +/** /** * 提现----查询单条信息 */ diff --git a/pages/index/index.vue b/pages/index/index.vue index ee68487..f472dd1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -425,8 +425,10 @@ merstreet, getUserInfo, getAdminApplyAPI, - progressBankList + progressBankList, + isNewMer } from '@/api/user.js'; + import { business, intention, @@ -873,24 +875,45 @@ } }, onReady() { - let that = this - const query = uni.createSelectorQuery().in(this); - query - .select(".tools-two-img") - .boundingClientRect((data) => { - let info = JSON.stringify(data) - that.elInfo = data - // #ifdef APP-PLUS - // if(that.userInfoData.is_newUser){ - if (true) { - that.openDiver() + if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) { + isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => { + return + if (res.data == 'true') { + let that = this + const query = uni.createSelectorQuery().in(this); + query + .select(".tools-two-img") + .boundingClientRect((data) => { + let info = JSON.stringify(data) + that.elInfo = data + // #ifdef APP-PLUS + that.openDiver() + // #endif + }) + .exec(); } - // #endif }) - .exec(); + } + + }, onShow() { + + if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) { + isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then( + res => { + return + if (res.data == 'true' && this.elInfo) { + console.log('resdaa', res.data) + this.openDiver() + } + }) + } + + + + if (this.loadEndFlag) { this.getUserInfo(); this.codelist(); diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 600d2d2..d5f4621 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -226,7 +226,8 @@ import Loading from '@/components/Loading/index.vue'; import { merstreet, - getUserInfo + getUserInfo, + isNewMer } from '@/api/user.js'; import { navigateTo, diff --git a/pages/product/list/subnvue/concat.nvue b/pages/product/list/subnvue/concat.nvue index d0bb56b..95591c2 100644 --- a/pages/product/list/subnvue/concat.nvue +++ b/pages/product/list/subnvue/concat.nvue @@ -25,6 +25,9 @@