From 18bffaf517771a70afa6340caa64b2ca2b9f0a08 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 15:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login.vue                    | 2 +-
 src/saas/AppCountryAlbum/Watermark.vue | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/login.vue b/src/pages/login.vue
index 890873d0..672b4c04 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -51,7 +51,7 @@ export default {
       this.$refs.loginForm.validate(v => {
         if (v) {
           let {name: module} = this.currentApp
-          this.getToken({...this.form, module}).then(() => {
+          this.getToken({...this.form, module, corpId: 'wpytYEDgAAcpXjmlYkYwKO60JDGDWrXg'}).then(() => {
             this.target ? uni.reLaunch({url: this.target}) : uni.navigateBack({})
           }).catch(() => 0)
         }
diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 81d9baa1..eb0e99b3 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -291,16 +291,15 @@
           console.log(res)
           if (res.code === 0) {
             const data = res.data.result.now
-            alert(JSON.stringify(data))
 
             uni.setStorageSync('address', {
               ...uni.getStorageSync('address'),
-              weather: data.text || ''
+              weather: `${data.text} ${data.temp}°` || ''
             })
 
             this.address = {
               ...uni.getStorageSync('address'),
-              weather: data.text || ''
+              weather: `${data.text} ${data.temp}°` || ''
             }
           }
         })