diff --git a/src/components/BottomPop/BottomPop.vue b/src/components/BottomPop/BottomPop.vue
new file mode 100644
index 0000000..3dee1c8
--- /dev/null
+++ b/src/components/BottomPop/BottomPop.vue
@@ -0,0 +1,80 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+ {
+ onSure()
+ handleClose()
+ }
+ "
+ class="mx-3 my-5"
+ block
+ >
+ 确定
+
+
+
+
+
+
+
diff --git a/src/components/CommonItemItem/CommonItem.vue b/src/components/CommonItemItem/CommonItem.vue
index 4412ef5..40bcf32 100644
--- a/src/components/CommonItemItem/CommonItem.vue
+++ b/src/components/CommonItemItem/CommonItem.vue
@@ -1,7 +1,7 @@
- *
+ *
{{ text }}
@@ -21,30 +21,37 @@
diff --git a/src/pages/attendance/attendance-add-group/attendance-add-group.vue b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
index aa85ee2..af27917 100644
--- a/src/pages/attendance/attendance-add-group/attendance-add-group.vue
+++ b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
@@ -9,6 +9,77 @@
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.desc }}
+ {{ item.desc2 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.desc }}
+
+
+
+
+
+
+
+
+
+
@@ -17,20 +88,37 @@
class="text-right"
v-model="name"
placeholder="必填"
- placeholder-class="input-placeholder"
+ placeholder-class="color-gray"
@input="nameInput()"
:maxlength="15"
/>
-
+ {
+ showType = true
+ }
+ "
+ text="考勤类型"
+ noLine
+ :value="typeList[typeSelectIndex].title"
+ >
-
+ {
+ showWay = true
+ }
+ "
+ text="打卡方式"
+ value="打卡设备"
+ >
@@ -43,12 +131,44 @@