wangxy 1 month ago
parent
commit
993d099155

+ 4 - 14
components/dialog/contentDialog.vue

@@ -1,22 +1,17 @@
 <template>
-	<uni-popup ref="commonPopup" :animation="false" :is-mask-click="false" mask-background-color="rgba(0, 0, 0, 0.4)">
-		<view class="phone-common-dialog">
+	<uni-popup ref="commonPopup" :type="type" :animation="false" :is-mask-click="false" mask-background-color="rgba(0, 0, 0, 0.4)" background-color="#fff">
+		<view class="phone-common-dialog1">
 			<view class="common-body-box">
 				<view class="common-title">{{title}}</view>
 				<view class="common-content" :class="dialogContentClass">
 					<slot></slot>
 				</view>
 				<view class="common-btn-box" v-if="showBtn">
-					<view class="not-confirm-btn" @click="handleClose">{{notBtn}}</view>
-					<view class="confirm-btn" @click="confirmBtn">{{okBtn}}</view>
+					<view @click="confirmBtn">{{okBtn}}</view>
 				</view>
 			</view>
 		</view>
-	<!-- 	<view class="popup-content" :class="{ 'popup-height': type='bottom' }">
-			<slot></slot>
-		</view> -->
 	</uni-popup>
-
 </template>
 
 <script setup>
@@ -48,15 +43,10 @@
 			require: true,
 			default: 'content-center-class'
 		},
-		notBtn: {
-			type: String,
-			require: true,
-			default: '取消'
-		},
 		okBtn: {
 			type: String,
 			require: true,
-			default: '确认'
+			default: '保存'
 		},
 		showBtn: {
 			type: Boolean,

+ 8 - 6
components/selectZyLevel/index.vue

@@ -1,14 +1,16 @@
 <template>
 	<contentDialogVue ref="commonPopup" @confirm-btn="confirmBtn" title="选择职业">
-		<!-- 技能块展示 -->
-		<view v-for="item in data.list" :key="item.id" class="phone-radio-item"
-			:class="{ radioActive: !!item.zyLevelName }" @click="toggleSelect(item)">
-			{{ item.name }}
-			<view class="radio-item-tag" v-if="!!item.zyLevelName">{{item.zyLevelName[0]}}</view>
+		<view   style="height: 100vh">
+			<!-- 技能块展示 -->
+			<view v-for="item in data.list" :key="item.id" class="phone-radio-item"
+				:class="{ radioActive: !!item.zyLevelName }" @click="toggleSelect(item)">
+				{{ item.name }}
+				<view class="radio-item-tag" v-if="!!item.zyLevelName">{{item.zyLevelName[0]}}</view>
+			</view>
 		</view>
 	</contentDialogVue>
 	<!-- 弹窗 -->
-	<contentDialogVue ref="commonPopup2" :showBtn="false" title="请选择职业等级">
+	<contentDialogVue ref="commonPopup2" type="center" :showBtn="false" title="请选择职业等级">
 		<!-- 等级选择 -->
 		<view v-for="item in data.zyLevelList" :key="item.id" @click="handleSelectLevelId(item)">
 			{{item.name}}

+ 2 - 2
pages/admin/ShouYe/shouye.vue

@@ -47,10 +47,10 @@
 		 	<icon class="index-icon zjz-icon"></icon>
 		 	<text>子家政公司</text>
 		 </view>
-<!--		 <view @click="goToPage('demo')" class="card-item-box" v-if="auth.type == 2">
+		 <view @click="goToPage('demo')" class="card-item-box" v-if="auth.type == 2">
 		 	<icon class="index-icon zjz-icon"></icon>
 		 	<text>demo</text>
-		 </view>-->
+		 </view>
 	  </view>
 	  <view class="card-list-box">  
 		<view class="card-list-title">管理考证人员</view>