This commit is contained in:
zmj 2024-04-30 09:33:57 +08:00
parent 448733a1c8
commit 9c08d45e09
4 changed files with 54 additions and 16 deletions

View File

@ -19,7 +19,13 @@ export function errorReport(data) {
return request.post(`api/err/report`, data); return request.post(`api/err/report`, data);
} }
/**
* 新商户
*/
export function isNewMer(uid, mer_id, data) {
return request.post(`auth/guide/${uid}/${mer_id}`, data);
}
/**
/** /**
* 提现----查询单条信息 * 提现----查询单条信息
*/ */

View File

@ -425,8 +425,10 @@
merstreet, merstreet,
getUserInfo, getUserInfo,
getAdminApplyAPI, getAdminApplyAPI,
progressBankList progressBankList,
isNewMer
} from '@/api/user.js'; } from '@/api/user.js';
import { import {
business, business,
intention, intention,
@ -873,24 +875,45 @@
} }
}, },
onReady() { onReady() {
let that = this if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
const query = uni.createSelectorQuery().in(this); isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
query return
.select(".tools-two-img") if (res.data == 'true') {
.boundingClientRect((data) => { let that = this
let info = JSON.stringify(data) const query = uni.createSelectorQuery().in(this);
that.elInfo = data query
// #ifdef APP-PLUS .select(".tools-two-img")
// if(that.userInfoData.is_newUser){ .boundingClientRect((data) => {
if (true) { let info = JSON.stringify(data)
that.openDiver() that.elInfo = data
// #ifdef APP-PLUS
that.openDiver()
// #endif
})
.exec();
} }
// #endif
}) })
.exec(); }
}, },
onShow() { 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) { if (this.loadEndFlag) {
this.getUserInfo(); this.getUserInfo();
this.codelist(); this.codelist();

View File

@ -226,7 +226,8 @@
import Loading from '@/components/Loading/index.vue'; import Loading from '@/components/Loading/index.vue';
import { import {
merstreet, merstreet,
getUserInfo getUserInfo,
isNewMer
} from '@/api/user.js'; } from '@/api/user.js';
import { import {
navigateTo, navigateTo,

View File

@ -25,6 +25,9 @@
</template> </template>
<script> <script>
import {
isNewMer
} from '@/api/user.js';
export default { export default {
data() { data() {
return { return {
@ -46,6 +49,11 @@
}, },
next() { next() {
this.subNVue.hide('zoom-in', 300, ) this.subNVue.hide('zoom-in', 300, )
isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, {
done: true
}).then(res => {
console.log('res', res)
})
} }
}, },
onLoad() { onLoad() {