Explorar el Código

1.完成app样式调整

steelwei hace 1 mes
padre
commit
1c1bf05137
Se han modificado 3 ficheros con 28 adiciones y 13 borrados
  1. 20 4
      .idea/workspace.xml
  2. 7 8
      pages/mine/settings/auth/edit.vue
  3. 1 1
      utils/config.js

+ 20 - 4
.idea/workspace.xml

@@ -4,10 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e5f5f697-2bd4-4205-922a-fb106cdbbdf5" name="Changes" comment="1.完成app样式调整" />
-    <list id="6ae23f6a-53fe-4817-a1d7-106bcf184c18" name="New changelist" comment="不想提交的文件">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    <list default="true" id="e5f5f697-2bd4-4205-922a-fb106cdbbdf5" name="Changes" comment="1.完成app样式调整">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/mine/settings/auth/edit.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/mine/settings/auth/edit.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utils/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/utils/config.js" afterDir="false" />
     </list>
+    <list id="6ae23f6a-53fe-4817-a1d7-106bcf184c18" name="New changelist" comment="不想提交的文件" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -43,6 +45,7 @@
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;D:/windsurfProject/petSystem/pet-system-fulfiller-app&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
@@ -51,6 +54,7 @@
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
     &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;D:\\Idea\\IntelliJ IDEA 2024.3.5\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
@@ -74,6 +78,9 @@
       <workItem from="1772441478263" duration="4739000" />
       <workItem from="1773048292053" duration="1121000" />
       <workItem from="1773058426552" duration="87000" />
+      <workItem from="1773058524158" duration="373000" />
+      <workItem from="1773140880066" duration="1007000" />
+      <workItem from="1773142765254" duration="647000" />
     </task>
     <task id="LOCAL-00001" summary="1.完成app端履约者入驻相关功能开发&#10;2.完成app端履约者登录功能开发&#10;3.完成履约者个人中心功能开发">
       <option name="closed" value="true" />
@@ -107,7 +114,15 @@
       <option name="project" value="LOCAL" />
       <updated>1773058319475</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="1.完成app样式调整">
+      <option name="closed" value="true" />
+      <created>1773058548412</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1773058548412</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -118,6 +133,7 @@
     <MESSAGE value="完成修改认证页面" />
     <MESSAGE value="1.完成app登录调整" />
     <MESSAGE value="1" />
+    <MESSAGE value="不想提交的文件" />
     <MESSAGE value="1.完成app样式调整" />
     <option name="LAST_COMMIT_MESSAGE" value="1.完成app样式调整" />
   </component>

+ 7 - 8
pages/mine/settings/auth/edit.vue

@@ -57,8 +57,8 @@
           @click="toggleService(service)"
         >
           <text class="service-name">{{ service.name }}</text>
-          <view class="check-icon" :class="{ active: selectedServices.includes(service.id) }">
-            <text v-if="selectedServices.includes(service.id)">✓</text>
+          <view class="check-icon" :class="{ active: selectedServices.map(String).includes(String(service.id)) }">
+            <text v-if="selectedServices.map(String).includes(String(service.id))">✓</text>
           </view>
         </view>
       </view>
@@ -127,7 +127,7 @@ export default {
       try {
         const res = await getServiceTypes()
         this.serviceOptions = (res.data || []).map(item => ({
-          id: Number(item.id),
+          id: String(item.id),
           name: item.name
         }))
       } catch (e) {
@@ -147,10 +147,9 @@ export default {
           let serviceIds = []
           if (res.data.serviceTypes) {
             serviceIds = [...new Set(
-              res.data.serviceTypes.replace(/[\[\]"]/g, '').split(',')
-                .map(s => s.trim()).filter(s => s)
-                .map(Number)
-                .filter(id => !isNaN(id) && id > 0)
+              String(res.data.serviceTypes).replace(/[\[\]"']/g, '').split(',')
+                .map(s => s.trim())
+                .filter(id => id && id !== '0' && id !== 'null' && id !== 'undefined')
             )]
           }
           this.selectedServices = serviceIds
@@ -222,7 +221,7 @@ export default {
       }
     },
     getServiceName(serviceId) {
-      const found = this.serviceOptions.find(s => s.id === serviceId)
+      const found = this.serviceOptions.find(s => String(s.id) === String(serviceId))
       return found ? found.name : ''
     },
     toggleService(service) {

+ 1 - 1
utils/config.js

@@ -4,7 +4,7 @@
  */
 
 // API 基础地址(开发环境)
-export const BASE_URL = 'http://192.168.0.102:8080'
+export const BASE_URL = 'http://127.0.0.1:8080'
 
 // 履约者App客户端ID(需要在 sys_client 表中配置)
 export const CLIENT_ID = '3'