From fbff1e5cefc4efcab71a8c374adf24cd648ff27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 2 Sep 2024 13:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=89=88=E5=92=8C=E4=BD=93=E9=AA=8C=E7=89=88=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=87=E6=8D=A2=E7=8E=AF=E5=A2=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue             | 17 ++++++++++++-
 config/env.js       | 12 ++++++---
 pages/mine/mine.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++-
 utils/request.js    | 13 ++++------
 4 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/App.vue b/App.vue
index 233307e..6d7b2f9 100644
--- a/App.vue
+++ b/App.vue
@@ -14,7 +14,22 @@
       // 账号信息
       appid: '',
       // 小程序版本
-      envVersion: ''
+      envVersion: '',
+      // 获取环境配置
+      getEnvConfig() {
+        const envVserionStorage = uni.getStorageSync('envVersion')
+        if(envVserionStorage) {
+          return envVserionStorage
+        } else {
+          if(this.envVersion === 'develop') {
+            return 'DEV'
+          } else if(this.envVersion === 'trial') {
+            return 'PRE'
+          } else {
+            return 'PROD'
+          }
+        }
+      }
     },
     computed: {
       ...mapState(useBluetoothStore, ['bluetoothStatus']),
diff --git a/config/env.js b/config/env.js
index 5f1fca5..ac08042 100644
--- a/config/env.js
+++ b/config/env.js
@@ -1,26 +1,30 @@
 import request from '@/utils/request'
 
 const version = '1.0.0'
+const buildNumber = 0
 
 const DEV = {
   name: '开发',
   baseUrl: 'https://dev.lock.star-lock.cn/api',
   webviewBaseUrl: 'https://dev.lock.star-lock.cn',
-  version: version
+  version,
+  buildNumber
 }
 const PRE = {
   name: '预发',
   baseUrl: 'https://pre.lock.star-lock.cn/api',
   webviewBaseUrl: 'https://pre.lock.star-lock.cn',
-  version: version
+  version,
+  buildNumber
 }
 
 const PROD = {
   name: '线上',
   baseUrl: 'https://lock.xhjcn.ltd/api',
   webviewBaseUrl: 'https://lock.xhjcn.ltd',
-  version: version
+  version,
+  buildNumber
 }
 
 // 更换环境的时候 切换导出就行
-export default DEV
+export default { DEV, PRE, PROD }
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 2326f04..f848844 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -31,6 +31,10 @@
           <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
         </view>
       </view>
+      <view class="env" v-if="envVersion !== 'release' && env">
+        <view class="env-text">{{env.name}}环境 版本号：{{env.version}}+{{env.buildNumber}}</view>
+        <view class="env-button" @click="show=true">切换环境</view>
+      </view>
       <label for="changePhone">
         <view class="switch-account">切换账号</view>
       </label>
@@ -40,11 +44,17 @@
       <label for="phone">
         <view class="button-login">登录</view>
       </label>
+      <view class="env" v-if="envVersion !== 'release' && env">
+        <view class="env-text">{{env.name}}环境 版本号：{{env.version}}+{{env.buildNumber}}</view>
+        <view class="env-button" @click="show=true">切换环境</view>
+      </view>
     </view>
 	</view>
   <button open-type="contact" style="display:none" id="contact"></button>
   <button open-type="getPhoneNumber" style="display:none" id="phone" @getphonenumber="getphonenumber"></button>
   <button open-type="getPhoneNumber" style="display:none" id="changePhone" @getphonenumber="changePhone"></button>
+  <up-action-sheet :actions="envList" :closeOnClickOverlay="true" title="切换环境" cancelText="取消" :closeOnClickAction="true"
+                   :show="show" :safeAreaInsetBottom="true" @close="show=false" @select="selectEnv"></up-action-sheet>
 </template>
 
 <script>
@@ -53,11 +63,16 @@
   import { useLockStore } from '@/stores/lock'
   import { mapState, mapActions } from 'pinia'
   import { phoneLoginRequest } from '@/api/user'
+  import env from '@/config/env'
 
 	export default {
 		data() {
 			return {
-        buttonInfo: null
+        buttonInfo: null,
+        env: null,
+        envVersion: '',
+        envList: [],
+        show: false
 			}
 		},
     computed: {
@@ -66,12 +81,29 @@
     },
     async onLoad() {
       this.buttonInfo = await this.getButtonInfo()
+      this.env = env[getApp().globalData.getEnvConfig()]
+      this.envVersion = getApp().globalData.envVersion
+      for (let key in env) {
+        this.envList.push({
+          ...env[key],
+          key: key
+        })
+      }
+      console.log(this.envList)
     },
 		methods: {
       ...mapActions(useBasicStore, ['getButtonInfo', 'routeJump']),
       ...mapActions(useLockStore, ['getLockList', 'updateLockSearch']),
       ...mapActions(useUserStore, ['updateLoginStatus', 'phoneLogin', 'updateUserInfo', 'getUserInfo',
         'checkSession']),
+      selectEnv(env) {
+        uni.setStorageSync('envVersion', env.key)
+        uni.removeStorageSync('token')
+        uni.removeStorageSync('openid')
+        uni.reLaunch({
+          url: '/pages/home/home'
+        })
+      },
       async changePhone(res) {
         if(res.detail.errMsg === 'getPhoneNumber:fail user deny') {
           return
@@ -203,6 +235,32 @@ page {
   font-weight: bold;
 }
 
+.env {
+  position: absolute;
+  bottom: 180rpx;
+  width: 600rpx;
+  line-height: 80rpx;
+  text-align: center;
+  margin-left: 75rpx;
+  font-size: 40rpx;
+  font-weight: bold;
+
+  .env-text {
+    color: #999999;
+    font-size: 30rpx;
+  }
+
+  .env-button {
+    border-radius: 46rpx;
+    background: #f0ad4e;
+    color: #ffffff;
+    font-size: 40rpx;
+    font-weight: bold;
+    width: 600rpx;
+    height: 80rpx;
+  }
+}
+
 .button-login {
   border-radius: 46rpx;
   width: 650rpx;
diff --git a/utils/request.js b/utils/request.js
index 9a9b2af..eec9fee 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,4 +1,4 @@
-import baseConfig from '@/config/env'
+import env from '@/config/env'
 
 /*
 * config
@@ -12,10 +12,12 @@ import baseConfig from '@/config/env'
 
 const request = (config) => {
   return new Promise((resolve) => {
+    const baseConfig = env[getApp().globalData.getEnvConfig()]
+
     const token = config?.token ? config.token : uni.getStorageSync('token')
     const headerDefault = {
       appid: getApp().globalData.appid,
-      version: baseConfig.version,
+      version: baseConfig.version + '+' + baseConfig.buildNumber,
       authorization: `Bearer ${token}`
     }
     const URL = config.baseUrl ? config.baseUrl + config.url : baseConfig.baseUrl + config.url
@@ -63,13 +65,8 @@ const request = (config) => {
         resolve({ code: -1, data, message: '网络不太好哦，请稍后再试' })
       },
       async complete(res) {
-        const env =
-          baseConfig.baseUrl.indexOf('test') !== -1
-            ? 'test'
-            : baseConfig.baseUrl.indexOf('pre') !== -1
-              ? 'pre'
-              : 'release'
         console.log(URL.substring(baseConfig.baseUrl.length + 1), {
+          env: getApp().globalData.getEnvConfig(),
           url: URL.substring(baseConfig.baseUrl.length + 1),
           req: config?.data || {},
           code: res?.data?.errorCode,