Merge remote-tracking branch 'origin/modular' into modular

src/views/base/address/components/New_EditAddress.vue

@@ -48,7 +48,6 @@ import BasicSelect from '@/components/BasicPacks/BasicSelect.vue'
 import BasicButton from '@/components/BasicPacks/BasicButton.vue'
 import BasicInput from '@/components/BasicPacks/BasicInput.vue'
 import BasicTextArea from '@/components/BasicPacks/BasicTextArea.vue'
-import { loading } from '@/utils'
 import { createAddress, getCity, updateAddress } from '@/api/address'
 import { FormInstance, message } from 'ant-design-vue'
 import { Address } from '@/models/address'
@@ -130,14 +129,11 @@ const changeProvince = async (obj: any) => {
     return
   }
   try {
-    loading.value = true
     cityList.value = undefined
     address.value.city = undefined
     cityList.value = await getCity(obj.id)
   } catch (e) {
     message.error('خطا در دریافت شهرها')
-  } finally {
-    loading.value = false
   }
 }
 

src/views/base/address/composables/useAddressPage.ts

@@ -98,14 +98,11 @@ export function useAddressPage() {
 
   const changeProvince = async (obj: { id: number }) => {
     try {
-      loading.value = true
       cityList.value = undefined
       address.value.city = undefined
       cityList.value = await getCity(obj.id)
     } catch (e) {
       message.error('خطا در دریافت شهرها')
-    } finally {
-      loading.value = false
     }
   }
 

src/views/base/rules/components/RulesContentPanel.vue

@@ -4,7 +4,7 @@
       ? 'drules-content'
       : 'rules-panel border-solid border-2 border-primary text-primary rounded-[12px] p-4 mobile-content-box'"
   >
-    <div :class="variant !== 'desktop' ? 'mobile-content-box__scroll' : undefined">
+    <div :class="variant === 'desktop' ? 'drules-content__scroll' : 'mobile-content-box__scroll'">
       <div :class="variant === 'desktop' ? 'drules-content__title' : 'font-bold text-sm text-primary'">
         {{ rulesTitle }}
       </div>

src/views/base/rules/desktop/styles/desktop-rules.less

@@ -77,6 +77,10 @@
 
 .drules-main {
   padding: 28px;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  max-height: calc(100vh - 180px);
 
   &__intro {
     display: flex;
@@ -85,6 +89,7 @@
     margin-bottom: 24px;
     padding-bottom: 20px;
     border-bottom: 1px solid #eef0f3;
+    flex-shrink: 0;
   }
 
   &__logo {
@@ -114,12 +119,27 @@
 }
 
 .drules-content {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
   padding: 20px;
   border: 1px solid rgba(9, 61, 81, 0.12);
   border-radius: 12px;
   background: rgba(9, 61, 81, 0.02);
   color: @App-primary-color;
 
+  &__scroll {
+    flex: 1;
+    min-height: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
+    overscroll-behavior-y: contain;
+    padding-left: 4px;
+    margin-left: -4px;
+  }
+
   &__title {
     font-size: 16px;
     font-weight: 700;
@@ -206,6 +226,10 @@
     grid-template-columns: 1fr;
   }
 
+  .drules-main {
+    max-height: none;
+  }
+
   .drules-side {
     position: static;
   }