From fd51b49c7139b48d06c62a2e1bdd8906f215e776 Mon Sep 17 00:00:00 2001
From: qdintc <qdintc@126.com>
Date: Sun, 17 Aug 2025 22:13:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.js                                         |  8 ++++----
 src/pages/login.vue                                   |  9 ---------
 src/pages/work/accounts/accountDealRecord/addEdit.vue | 10 ++++++++--
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/config.js b/src/config.js
index 8325230..9260eda 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,6 +1,6 @@
 // 应用全局配置
 const config = {
-  baseUrl: 'http://152.136.151.187:82/prod-api',
+  baseUrl: 'https://qdintc.com//prod-api',
   // baseUrl: 'http://localhost:8080',
    //cloud后台网关地址
   //  baseUrl: 'http://192.168.10.3:8080',
@@ -13,15 +13,15 @@ const config = {
      // 应用logo
      logo: "/static/logo.jpg",
      // 官方网站
-     site_url: "http://www.qdintc.com",
+     site_url: "https://www.qdintc.com",
      // 政策协议
      agreements: [{
          title: "隐私政策",
-        url: "http://qdintc.com/static/protocol.html"
+        url: "https://qdintc.com/static/protocol.html"
        },
        {
          title: "用户服务协议",
-         url: "http://qdintc.com/static/protocol.html"
+         url: "https://qdintc.com/static/protocol.html"
        }
      ]
    }
diff --git a/src/pages/login.vue b/src/pages/login.vue
index ddbb26b..ff96e0b 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -14,13 +14,6 @@
         <view class="iconfont icon-password icon"></view>
         <input v-model="loginForm.password" type="password" class="input"  placeholder="请输入密码" maxlength="20" />
       </view>
-      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-        <view class="iconfont icon-code icon"></view>
-        <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-        <view class="login-code">
-          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
-        </view>
-      </view>
       <view class="flex align-center" style="margin-left: 5px;">
         <up-checkbox
         :customStyle="{marginBottom: '8px'}"
@@ -114,8 +107,6 @@ async function handleLogin() {
     modal.msgError("请输入您的账号")
   } else if (loginForm.value.password === "") {
     modal.msgError("请输入您的密码")
-  } else if (loginForm.value.code === "" && captchaEnabled.value) {
-    modal.msgError("请输入验证码")
   } else {
     modal.loading("登录中，请等待...")
     pwdLogin()
diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue
index f72ec81..c7dd2bf 100644
--- a/src/pages/work/accounts/accountDealRecord/addEdit.vue
+++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue
@@ -131,7 +131,7 @@ const data = reactive({
     amount: [{type: 'number', required: true, message: '交易金额不能为空', trigger: ['change', 'blur'] }],
     dealTypeName: [{ required: true, message: '交易类型不能为空', trigger:['change', 'blur'] }],
     dealCategoryName: [{ required: true, message: '交易类别不能为空', trigger: ['change', 'blur'] }],
-    childCategoryName: [{ required: true, message: '交易子类别不能为空', trigger: ['change', 'blur'] }],
+    childCategoryName: [{ required: false, message: '交易子类别不能为空', trigger: ['change', 'blur'] }],
     createTime: [{ required: true, message: '交易时间不能为空', trigger: ['change', 'blur'] }]
   }
 })
@@ -205,7 +205,8 @@ getDicts('daily_expenses').then(result => {
           form.value.childCategoryName=dictStr(form.value.childCategory, result.data)
          })
   } else {
-    form.value.childCategoryName = form.value.childCategory
+    form.value.childCategoryName = form.value.dealCategory
+    form.value.childCategory = form.value.dealCategory
     childCategoryShow.value = false
   }
 // 交易类别
@@ -236,6 +237,7 @@ getDicts('deal_category').then(result => {
          })    
         })
       }
+      console.log(form.value)
   }
   function dictStr(val, arr) {
       let str = ''
@@ -359,6 +361,10 @@ getDicts('deal_category').then(result => {
 				datePickShow.value = false
 		}
   function submit() {
+     if (!form.value.dealCategory === '1') {
+          form.value.childCategory = form.value.dealCategory
+          form.value.childCategoryName = form.value.dealCategory
+        }
         proxy.$refs['uForm'].validate().then(() => {
           if (form.value.id != null) {
             if(flag.value==null){