From 4074f0a21b433d45c01d7da5c5574c44b5fdd7e2 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 28 Dec 2021 18:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=B3=A8=E5=86=8C=E7=9A=84=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.js         | 3 +++
 pages/login/login.wxml       | 2 +-
 pages/register/register.js   | 2 ++
 pages/register/register.wxml | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/login/login.js b/pages/login/login.js
index fa86ca7..78c2840 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -2,6 +2,7 @@
 import UserApi from '../../assets/js/http/userApi'
 import { encrypt } from '../../assets/js/jsencrypt/rsa'
 import { wxBind } from '../../assets/js/common'
+import {appletName} from "../../assets/js/project.config"
 var countdown = 60; // 倒计时秒数
 Page({
   data: {
@@ -11,6 +12,7 @@ Page({
     openId: '',
     count: 60,
     userInfoTemp: '',
+    appletName:appletName,
     rsaPublicKey: '',
     showGetCaptcha: true,
     authorize: false // 默认没有微信授权
@@ -176,6 +178,7 @@ Page({
                   openId: encrypt(that.data.rsaPublicKey,res.result.openid),
                   rsaPublicKey: that.data.rsaPublicKey
                 }
+                console.log(params.openId,'params.openiD');
                 UserApi.wxLogin(params).then(res=>{
                   if(res.success) {// 已经用手机号登录过，此时用微信快捷登录时，把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
                     wx.setStorageSync('userInfo', res.result.userInfo)
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 422f68c..150a9c9 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -10,7 +10,7 @@
     <image class="bg-image" mode="scaleToFill" src="../../assets/images/login-bg.png"></image>
     <view class="bg-text">
       <text>您好，欢迎使用</text>
-      <text>标准所协同工作平台</text>
+      <text>{{appletName}}</text>
     </view>
   </view>
   <form bindsubmit="formSubmit" class="form-box">
diff --git a/pages/register/register.js b/pages/register/register.js
index 6b379c0..326c07f 100644
--- a/pages/register/register.js
+++ b/pages/register/register.js
@@ -1,5 +1,6 @@
 // pages/register/register.js
 import UserApi from '../../assets/js/http/userApi'
+import {appletName} from "../../assets/js/project.config"
 
 import {
   phoneReg,
@@ -22,6 +23,7 @@ Page({
     statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
     showGetCaptcha: true, // 默认显示 获取验证阿门
     phone: '',
+    appletName:appletName,
     password: '',
     confirmPassword: '',
     captcha: '',
diff --git a/pages/register/register.wxml b/pages/register/register.wxml
index 3ca9161..3c68c10 100644
--- a/pages/register/register.wxml
+++ b/pages/register/register.wxml
@@ -12,7 +12,7 @@
     <image class="bg-image" mode="scaleToFill" src="../../assets/images/login-bg.png"></image>
     <view class="bg-text">
       <text>您好，欢迎注册</text>
-      <text>标准所协同工作平台</text>
+      <text>{{appletName}}</text>
     </view>
   </view>
   <form bindsubmit="formSubmit" class="form-box">