From 70a477a56ffbfa72ae01ff6d2064a31a2969d969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 10:45:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dwebview=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug=202.=20=E4=BF=AE=E6=94=B9=E6=98=B5=E7=A7=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6=E4=B8=BA50=E5=B9=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=98=BE=E7=A4=BA=203.=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=A0=E9=99=A4=E9=94=81=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/env.js                   |  2 +-
 pages/setting/setting.vue       |  2 +-
 pages/updateName/updateName.vue |  2 +-
 pages/userInfo/userInfo.vue     | 14 ++++++++++++--
 pages/webview/webview.vue       |  9 +++++----
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/config/env.js b/config/env.js
index 6bfcb16..5492c2f 100644
--- a/config/env.js
+++ b/config/env.js
@@ -13,7 +13,7 @@ const DEV = {
 const PRE = {
   name: '预发',
   baseUrl: 'https://pre.lock.star-lock.cn/api',
-  webviewBaseUrl: 'https://pre.lock.star-lock.cn',
+  webviewBaseUrl: 'https://lock.xhjcn.ltd',
   version,
   buildNumber
 }
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 550fc5f..9c87fad 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -136,7 +136,7 @@ export default {
               } else {
                 uni.hideLoading()
                 uni.showToast({
-                  title: '删除失败',
+                  title: '删除失败，请保持在锁附近',
                   icon: 'none'
                 })
               }
diff --git a/pages/updateName/updateName.vue b/pages/updateName/updateName.vue
index 572c12b..23f0ffd 100644
--- a/pages/updateName/updateName.vue
+++ b/pages/updateName/updateName.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <input class="input" :value="nickname" maxlength="20" placeholder="请输入昵称"
+    <input class="input" :value="nickname" maxlength="50" placeholder="请输入昵称"
            placeholder-class="input-placeholder" :focus="true" @input="updateInput"></input>
     <view class="button" @click="updateName">保存</view>
   </view>
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index 2d9e32b..5eaa6a5 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -13,8 +13,8 @@
       <view class="view-line"></view>
       <view class="view-button" @click="toUpdateName">
         <view>昵称</view>
-        <view class="view-button" style="padding: 0">
-          <view class="info">{{userInfo.nickname}}</view>
+        <view class="view-button" style="padding: 20rpx 0">
+          <view class="name-info">{{userInfo.nickname}}</view>
           <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
         </view>
       </view>
@@ -257,6 +257,16 @@ page {
   margin-right: 20rpx;
 }
 
+.name-info {
+  line-height: 40rpx;
+  font-size: 30rpx;
+  text-align: right;
+  width: 500rpx;
+  overflow: hidden;
+  word-break: break-all;
+  margin-right: 20rpx;
+}
+
 .red-dot {
   margin-right: 20rpx;
   background: #ec433c;
diff --git a/pages/webview/webview.vue b/pages/webview/webview.vue
index 29ca69c..264e9e3 100644
--- a/pages/webview/webview.vue
+++ b/pages/webview/webview.vue
@@ -5,16 +5,17 @@
 </template>
 
 <script>
-import baseConfig from '@/config/env'
+import env from '@/config/env'
 
 export default {
   data() {
     return {
-      url: ''
+      url: '',
+      env: null
     }
   },
   onLoad: function (options) {
-    console.log(baseConfig.webviewBaseUrl)
+    this.env = env[getApp().globalData.getEnvConfig()]
     const officialAccounts = {
       default: {
         url: '/app/introduce',
@@ -30,7 +31,7 @@ export default {
       }
     }
     const item = officialAccounts[options?.type] || officialAccounts['default']
-    this.url = baseConfig.webviewBaseUrl + item['url']
+    this.url = this.env.webviewBaseUrl + item['url']
     console.log(this.url)
     uni.setNavigationBarTitle({
       title: item['name']