1
xuxueyang
2024-07-12 74ff2cd15d65511c26b6a1a2e58e6153deb1e938
1
已修改6个文件
32 ■■■■ 文件已修改
App.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
environments/index.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/supplier-home.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/protocol.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/supplier/supplier-reg/supplier-reg.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
App.vue
@@ -41,13 +41,14 @@
            if (true && storage.getItem('token')) {
                setTimeout(async () => {
                    const res = await this.$store.dispatch('getCurrentInfo');
                    // console.log('init info',res,this.currentInfo)
                    if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
                        uni.reLaunch({
                            url: '/pages/home/supplier-home'
                        })
                    }
                    // console.log('init info',res,this.currentInfo)
                    // #ifdef PUB_CUSTOMER
                    if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
                        uni.reLaunch({
                            url: '/pages/home/supplier-home'
                        })
                    }
                    // #endif
                }, 200);
            } else {
environments/index.js
@@ -1,7 +1,7 @@
export default {
    
    httpBaseUri: 'https://www.hmyxianhua.com/flower',
    // httpBaseUri: 'https://47.99.58.211/flower',
    // httpBaseUri: 'https://www.hmyxianhua.com/flower',
    httpBaseUri: 'http://47.99.58.211/flower',
    clientId: '',
    secret: '',
@@ -9,4 +9,5 @@
    appDownloadUri: 'http://xxx/app/',
    websocketUrl: '',
    type: 'dev'
}
}
pages.json
@@ -125,7 +125,7 @@
            {
                "path": "supplier-reg/supplier-reg",
                "style": {
                    "navigationBarTitleText": "申请入住",
                    "navigationBarTitleText": "申请入驻",
                    "navigationStyle": "custom"
                }
            },
@@ -193,7 +193,7 @@
    }],
    "globalStyle": {
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "uni-app",
        "navigationBarTitleText": "花满芫",
        "navigationBarBackgroundColor": "#F8F8F8",
        "backgroundColor": "#F8F8F8",
        "app-plus": {
pages/home/supplier-home.vue
@@ -253,7 +253,7 @@
                
                if (!this.currentInfo.supplierDTO) {
                    await this.$message.confirm('尚未入住店铺信息,是否前往入住?')
                    await this.$message.confirm('尚未入驻店铺信息,是否前往入驻?')
                    this.goto('/sub_pages/supplier/supplier-info/supplier-info', true)
                    return
                }
sub_pages/supplier/protocol.vue
@@ -1,6 +1,6 @@
<template>
    <view>
        入住协议todo
        入驻协议todo
    </view>
</template>
sub_pages/supplier/supplier-reg/supplier-reg.vue
@@ -11,7 +11,7 @@
                <form class="cl">
                    <view class="t-a titles-top">
                        <view class="title-1">HELLO</view>
                        <view class="title-2">欢迎入住<span class="title-3">花满芜</span></view>
                        <view class="title-2">欢迎入驻<span class="title-3">花满芜</span></view>
                    </view>