From d9ed67e0bac77dd7703601f90e88a59632f182fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Sat, 14 Sep 2024 11:30:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   2 +-
 pages.json                                    |  12 -
 pages/safeQuestion/safeQuestion.vue           | 139 ---------
 .../updateSafeQuestion/updateSafeQuestion.vue | 278 ------------------
 pages/userInfo/userInfo.vue                   |  19 --
 stores/basic.js                               |  10 -
 6 files changed, 1 insertion(+), 459 deletions(-)
 delete mode 100644 pages/safeQuestion/safeQuestion.vue
 delete mode 100644 pages/updateSafeQuestion/updateSafeQuestion.vue

diff --git a/manifest.json b/manifest.json
index 6396c8d..bc7d848 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__933D519",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : "14",
+    "versionCode" : "15",
     "transformPx" : false,
     /* 小程序特有相关 */
     "mp-weixin" : {
diff --git a/pages.json b/pages.json
index c6faf86..66fb723 100644
--- a/pages.json
+++ b/pages.json
@@ -51,18 +51,6 @@
 				"navigationBarTitleText": "验证邮箱"
 			}
 		},
-		{
-			"path": "pages/safeQuestion/safeQuestion",
-			"style": {
-				"navigationBarTitleText": "安全问题"
-			}
-		},
-		{
-			"path": "pages/updateSafeQuestion/updateSafeQuestion",
-			"style": {
-				"navigationBarTitleText": "安全问题"
-			}
-		},
 		{
 			"path": "pages/webview/webview",
 			"style": {
diff --git a/pages/safeQuestion/safeQuestion.vue b/pages/safeQuestion/safeQuestion.vue
deleted file mode 100644
index ef5b978..0000000
--- a/pages/safeQuestion/safeQuestion.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <view>
-    <view class="text">如果手机丢了，可以通过回答设置的安全问题来登录新设备</view>
-    <view class="safe-question" v-for="item in questionAnswer" :key="item.questionId">
-      <view class="question">
-        <view>{{item.question}}</view>
-        <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
-      </view>
-      <view class="line"></view>
-      <view class="input">{{item.answer}}</view>
-    </view>
-    <view class="button" @click="updateAnswer">修改</view>
-  </view>
-</template>
-
-<script>
-import { getQuestionAnswerRequest, getQuestionListRequest, updateQuestionAnswerRequest } from '@/api/safeAnswer'
-import { mapActions } from 'pinia'
-import { useBasicStore } from '@/stores/basic'
-
-export default {
-  data() {
-    return {
-      questionAnswer: [],
-    }
-  },
-  onLoad() {
-    this.getQuestionAnswer()
-  },
-  methods: {
-    ...mapActions(useBasicStore, ['routeJump', 'getNetworkType']),
-    async getQuestionAnswer() {
-      const netWork = await this.getNetworkType()
-      if(!netWork) {
-        return
-      }
-      const { code, data, message } = await getQuestionAnswerRequest()
-      if(code === 0) {
-        this.questionAnswer = data
-      } else {
-        uni.showToast({
-          title: message,
-          icon: 'none'
-        })
-      }
-    },
-    async updateAnswer() {
-      const netWork = await this.getNetworkType()
-      if(!netWork) {
-        return
-      }
-      this.routeJump({
-        name: 'updateSafeQuestion',
-        params: {
-          questionAnswer: JSON.stringify(this.questionAnswer)
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-page {
-  background-color: $uni-bg-color-grey;
-}
-</style>
-
-<style lang="scss" scoped>
-.text {
-  padding-top: 20rpx;
-  margin-left: 20rpx;
-  font-size: 24rpx;
-  font-weight: bold;
-}
-
-.safe-question {
-  width: 710rpx;
-  margin-left: 20rpx;
-  margin-top: 20rpx;
-}
-
-.question {
-  border-radius: 32rpx 32rpx 0 0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx 32rpx;
-  background-color: #fff;
-}
-
-.icon-arrow {
-  width: 40rpx;
-  height: 40rpx;
-}
-
-.input {
-  border-radius: 0 0 32rpx 32rpx;
-  line-height: 40rpx;
-  background: #FFFFFF;
-  padding: 20rpx 32rpx;
-  word-break: break-all;
-}
-
-.line {
-  width: 100%;
-  height: 2rpx;
-  background: #EBEBEB;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  height: 100rpx;
-  text-align: center;
-  line-height: 100rpx;
-  font-weight: bold;
-}
-
-.popup-content {
-  font-size: 32rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  text-align: center;
-  font-weight: bold;
-}
-
-.button {
-  margin-top: 32rpx;
-  margin-left: 35rpx;
-  width: 680rpx;
-  height: 96rpx;
-  background: #63b8af;
-  border-radius: 16rpx;
-  line-height: 96rpx;
-  text-align: center;
-  font-size: 32rpx;
-  color: #FFFFFF;
-}
-</style>
diff --git a/pages/updateSafeQuestion/updateSafeQuestion.vue b/pages/updateSafeQuestion/updateSafeQuestion.vue
deleted file mode 100644
index c6d1d50..0000000
--- a/pages/updateSafeQuestion/updateSafeQuestion.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-  <view>
-    <view class="text">如果手机丢了，可以通过回答设置的安全问题来登录新设备</view>
-    <view class="safe-question">
-      <view class="question" @click="popup('firstList')">
-        <view>{{answer[0].question}}</view>
-        <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
-      </view>
-      <view class="line"></view>
-      <input class="input" :value="answer[0].answer" maxlength="50" placeholder="请输入答案"
-             placeholder-class="input-placeholder" @input="changeFirstAnswer"></input>
-    </view>
-    <view class="safe-question">
-      <view class="question" @click="popup('secondList')">
-        <view>{{answer[1].question}}</view>
-        <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
-      </view>
-      <view class="line"></view>
-      <input class="input" :value="answer[1].answer" maxlength="50" placeholder="请输入答案"
-             placeholder-class="input-placeholder" @input="changeSecondAnswer"></input>
-    </view>
-    <view class="safe-question">
-      <view class="question" @click="popup('thirdList')">
-        <view>{{answer[2].question}}</view>
-        <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
-      </view>
-      <view class="line"></view>
-      <input class="input" :value="answer[2].answer" maxlength="50" placeholder="请输入答案"
-             placeholder-class="input-placeholder" @input="changeThirdAnswer"></input>
-    </view>
-    <view class="button" @click="updateAnswer">保存</view>
-  </view>
-  <up-popup :show="show" mode="bottom" round="16rpx" @close="close">
-    <view class="popup-title">选择问题</view>
-    <view class="line" style="height: 10rpx"></view>
-    <view v-for="item in currentQuestionList" :key="item.questionId" @click="selectQuestion(item)">
-      <view class="popup-content">{{item.question}}</view>
-      <view class="line"></view>
-    </view>
-    <view class="line" style="height: 10rpx"></view>
-    <view class="popup-title" @click="close">取消</view>
-  </up-popup>
-</template>
-
-<script>
-import { getQuestionAnswerRequest, getQuestionListRequest, updateQuestionAnswerRequest } from '@/api/safeAnswer'
-import { mapActions, mapState } from 'pinia'
-import { useUserStore } from '@/stores/user'
-import { useBasicStore } from '@/stores/basic'
-
-export default {
-  data() {
-    return {
-      questionList: {},
-      currentQuestionList: [],
-      currentIndex: 0,
-      answer:[{
-        question: '问题一',
-        answer: ''
-      }, {
-        question: '问题二',
-        answer: ''
-      }, {
-        question: '问题三',
-        answer: ''
-      }],
-      show: false,
-      pending: false,
-      questionAnswer: null
-    }
-  },
-  computed: {
-    ...mapState(useUserStore, ['userInfo'])
-  },
-  async onLoad (data) {
-    this.getQuestionList()
-    const questionAnswer = JSON.parse(data.questionAnswer)
-    if (questionAnswer) {
-      uni.setNavigationBarTitle({
-        title: '安全问题设置'
-      })
-      this.questionAnswer = questionAnswer
-      this.answer = questionAnswer.map(item => {
-        return {
-          question: item.question,
-          answer: item.answer,
-          questionId: item.questionId
-        }
-      })
-    }
-  },
-  methods: {
-    ...mapActions(useUserStore, ['updateUserInfo']),
-    ...mapActions(useBasicStore, ['backAndToast', 'getNetworkType']),
-    async updateAnswer() {
-      console.log('答案', this.answer)
-      for(let i = 0; i < this.answer.length; i++) {
-        if(!this.answer[i].questionId) {
-          uni.showToast({
-            title: '问题不能为空',
-            icon: 'none'
-          })
-          return
-        }
-      }
-      for(let i = 0; i < this.answer.length; i++) {
-        if(this.answer[i].answer === '') {
-          uni.showToast({
-            title: '答案不能为空',
-            icon: 'none'
-          })
-          return
-        }
-      }
-      const netWork = await this.getNetworkType()
-      if(!netWork) {
-        return
-      }
-      if(this.pending) {
-        return
-      }
-      this.pending = true
-      const { code, message } = await updateQuestionAnswerRequest({
-        questionAndAnswerList: this.answer
-      })
-      if(code === 0) {
-        this.updateUserInfo({
-          ...this.userInfo,
-          haveSafeAnswer: 1
-        })
-        this.backAndToast('设置成功', 2)
-      } else {
-        uni.showToast({
-          title: message,
-          icon: 'none'
-        })
-      }
-      this.pending = false
-    },
-    changeFirstAnswer(data) {
-      this.answer[0].answer = data.detail.value
-    },
-    changeSecondAnswer(data) {
-      this.answer[1].answer = data.detail.value
-    },
-    changeThirdAnswer(data) {
-      this.answer[2].answer = data.detail.value
-    },
-    close() {
-      this.show = false
-    },
-    selectQuestion(item) {
-      this.answer[this.currentIndex].question = item.question
-      this.answer[this.currentIndex].questionId = item.questionId
-      this.show = false
-    },
-    popup(type) {
-      if(type === 'secondList') {
-        this.currentIndex = 1
-      } else if(type === 'thirdList') {
-        this.currentIndex = 2
-      } else {
-        this.currentIndex = 0
-      }
-      this.currentQuestionList = this.questionList[type]
-      this.show = true
-    },
-    async getQuestionList() {
-      const netWork = await this.getNetworkType()
-      if(!netWork) {
-        uni.showModal({
-          title: '提示',
-          content: '未获取到问题列表，请退出重试',
-          showCancel: false,
-          success: () => {
-            uni.navigateBack()
-          }
-        })
-        return
-      }
-      const { code, data, message } = await getQuestionListRequest()
-      if(code === 0) {
-        this.questionList = data
-      } else {
-        uni.showToast({
-          title: message,
-          icon: 'none'
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-page {
-  background-color: $uni-bg-color-grey;
-}
-</style>
-
-<style lang="scss" scoped>
-.text {
-  padding-top: 20rpx;
-  margin-left: 20rpx;
-  font-size: 24rpx;
-  font-weight: bold;
-}
-
-.safe-question {
-  width: 710rpx;
-  margin-left: 20rpx;
-  margin-top: 20rpx;
-}
-
-.question {
-  border-radius: 32rpx 32rpx 0 0;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 20rpx 32rpx;
-  background-color: #fff;
-}
-
-.icon-arrow {
-  width: 40rpx;
-  height: 40rpx;
-}
-
-.input {
-  border-radius: 0 0 32rpx 32rpx;
-  height: 100rpx;
-  line-height: 100rpx;
-  background: #FFFFFF;
-  padding: 0 32rpx;
-}
-
-.input-placeholder {
-  height: 100rpx;
-  font-size: 36rpx;
-  font-weight: bold;
-  line-height: 100rpx;
-}
-
-.line {
-  width: 100%;
-  height: 2rpx;
-  background: #EBEBEB;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  height: 100rpx;
-  text-align: center;
-  line-height: 100rpx;
-  font-weight: bold;
-}
-
-.popup-content {
-  font-size: 32rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  text-align: center;
-  font-weight: bold;
-}
-
-.button {
-  margin-top: 32rpx;
-  margin-left: 35rpx;
-  width: 680rpx;
-  height: 96rpx;
-  background: #63b8af;
-  border-radius: 16rpx;
-  line-height: 96rpx;
-  text-align: center;
-  font-size: 32rpx;
-  color: #FFFFFF;
-}
-</style>
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index cdd7952..5b3a714 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -44,14 +44,6 @@
         <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
       </view>
       <view class="view-line"></view>
-      <view class="view-button" @click="toSafeQuestion">
-        <view>安全问题</view>
-        <view class="view-button" style="padding: 0">
-          <view v-if="!userInfo.haveSafeAnswer" class="red-dot"></view>
-          <image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
-        </view>
-      </view>
-      <view class="view-line"></view>
       <view class="view-button">
         <view>国家/地区</view>
         <view class="view-button" style="padding: 0">
@@ -211,17 +203,6 @@ export default {
       this.routeJump({
         name: 'updatePassword'
       })
-    },
-    toSafeQuestion() {
-      if(this.userInfo.haveSafeAnswer) {
-        this.routeJump({
-          name: 'safeQuestion'
-        })
-      } else {
-        this.routeJump({
-          name: 'updateSafeQuestion'
-        })
-      }
     }
   }
 }
diff --git a/stores/basic.js b/stores/basic.js
index cfb8de8..b5ae7c6 100644
--- a/stores/basic.js
+++ b/stores/basic.js
@@ -37,16 +37,6 @@ const pages = [
     path: '/pages/verifyEmail/verifyEmail',
     tabBar: false
   },
-  {
-    name: 'safeQuestion',
-    path: '/pages/safeQuestion/safeQuestion',
-    tabBar: false
-  },
-  {
-    name: 'updateSafeQuestion',
-    path: '/pages/updateSafeQuestion/updateSafeQuestion',
-    tabBar: false
-  },
   {
     name: 'webview',
     path: '/pages/webview/webview',

From 4b829e56decd7af4d2a402dab32098fb9d4881e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Wed, 18 Sep 2024 15:49:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=89=88=E9=BB=98=E8=AE=A4=E7=8E=AF=E5=A2=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue       | 8 ++++----
 manifest.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/App.vue b/App.vue
index cf7897b..e31de50 100644
--- a/App.vue
+++ b/App.vue
@@ -17,12 +17,12 @@
       envVersion: '',
       // 获取环境配置
       getEnvConfig() {
-        const envVserionStorage = uni.getStorageSync('envVersion')
-        if(envVserionStorage) {
-          return envVserionStorage
+        const envVersionStorage = uni.getStorageSync('envVersion')
+        if(envVersionStorage) {
+          return envVersionStorage
         } else {
           if(this.envVersion === 'develop') {
-            return 'DEV'
+            return 'XHJ'
           } else if(this.envVersion === 'trial') {
             return 'PRE'
           } else {
diff --git a/manifest.json b/manifest.json
index bc7d848..10a1f70 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__933D519",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : "15",
+    "versionCode" : "16",
     "transformPx" : false,
     /* 小程序特有相关 */
     "mp-weixin" : {