feat: 完善地区选择组件

sadais-org · Oct 14, 2020 · 111995f · 111995f
1 parent c05a41c
commit 111995f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/components/pi-button/index.vue b/components/pi-button/index.vue
@@ -314,6 +314,7 @@ export default {
   position: relative;
   display: inline-block;
   padding: $pi-button-default-padding;
+  margin: initial;
   border: none;
   border-radius: $pi-button-default-radius;
   &::after {

diff --git a/components/pi-date-picker/index.vue b/components/pi-date-picker/index.vue
@@ -26,6 +26,7 @@
       <!-- 标题栏 -->
       <view
         v-if="showTitle"
+        style="z-index: 1;"
         class="pi-justify-center pi-fz-32 pi-fw-500"
         :style="[{ padding: getTitlePadding }]"
       >

diff --git a/components/pi-regions-select/index.vue b/components/pi-regions-select/index.vue
@@ -40,7 +40,15 @@
         <slot v-if="$slots.toolbar" name="toolbar" />
         <template v-else>
           <view class="item-btn" @tap="handlePopupClose">取消</view>
-          <view class="item-btn pi-primary" @tap="handleConfirm">确定</view>
+          <pi-button
+            type="secondary"
+            size="small"
+            :disabled="!isCompleted"
+            :custom-style="{ padding: 0, backgroundColor: 'transparent' }"
+            @tap="handleConfirm"
+          >
+            确定
+          </pi-button>
         </template>
       </view>
       <pi-tabs v-model="tabCurrentItem" :items="getTabItems" />
@@ -73,7 +81,7 @@
       <!-- 顶部操作条 -->
       <pi-bottom-bar v-if="toolbarPosition === 'bottom'">
         <slot v-if="$slots.toolbar" name="toolbar" />
-        <pi-button v-else width="100%" type="primary" @tap="handleConfirm">
+        <pi-button v-else :disabled="!isCompleted" width="100%" type="primary" @tap="handleConfirm">
           确定
         </pi-button>
       </pi-bottom-bar>
@@ -321,6 +329,9 @@ export default {
         tabs.push({ id: 'county', text: county.name || PLEASE_SELECT_TIP })
       }
       return tabs
+    },
+    isCompleted() {
+      return this.getTabItems.findIndex(t => t.text === PLEASE_SELECT_TIP) === -1
     }
   },
   watch: {