From 74ff2cd15d65511c26b6a1a2e58e6153deb1e938 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 12 七月 2024 14:40:17 +0800
Subject: [PATCH] 1
---
sub_pages/supplier/protocol.vue | 2 +-
environments/index.js | 7 ++++---
sub_pages/supplier/supplier-reg/supplier-reg.vue | 2 +-
pages/home/supplier-home.vue | 2 +-
pages.json | 4 ++--
App.vue | 15 ++++++++-------
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/App.vue b/App.vue
index ac7a622..6bdaa3c 100644
--- a/App.vue
+++ b/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 {
diff --git a/environments/index.js b/environments/index.js
index 30e3981..4d26ee2 100644
--- a/environments/index.js
+++ b/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'
-}
\ No newline at end of file
+}
+
diff --git a/pages.json b/pages.json
index da87714..ef06e85 100644
--- a/pages.json
+++ b/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": {
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index bcc74e0..c3ce2fa 100644
--- a/pages/home/supplier-home.vue
+++ b/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
}
diff --git a/sub_pages/supplier/protocol.vue b/sub_pages/supplier/protocol.vue
index fcc96ac..f422552 100644
--- a/sub_pages/supplier/protocol.vue
+++ b/sub_pages/supplier/protocol.vue
@@ -1,6 +1,6 @@
<template>
<view>
- 入住协议todo
+ 入驻协议todo
</view>
</template>
diff --git a/sub_pages/supplier/supplier-reg/supplier-reg.vue b/sub_pages/supplier/supplier-reg/supplier-reg.vue
index 44790f8..7bdfc5f 100644
--- a/sub_pages/supplier/supplier-reg/supplier-reg.vue
+++ b/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>
--
Gitblit v1.9.3