tanxue преди 1 месец
родител
ревизия
71639e0131

+ 1 - 70
common/styles/global/components.scss

@@ -99,28 +99,6 @@ view{box-sizing: border-box;}
 .phone-green-btn[type='default']:hover{background-color: #34c595;color: #fff;}
 
 /***** 标题栏  *****/
-// 三个元素
-.phone-navBar-box{
-	display: flex;align-items: center;justify-content: space-between;background-color: #fff;
-	padding: calc(20rpx + var(--status-bar-height)) 20rpx 20rpx;box-sizing: border-box;position: relative;
-	.nav-bar-icon{
-		width: 24rpx;height: 38rpx;
-		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
-	}
-	.nav-bar-title{font-size: 36rpx;color: #333;}
-	// 考试数字
-	.nav-bar-other{
-		font-size: 30rpx;color: #fff;margin-right: 2%;
-		.key-note{color: #ffff01;}
-	}
-	// 文字按钮
-	.text-btn{font-size: 26rpx;color: #666;padding-top: 4rpx;box-sizing: border-box;}
-	// 图标
-	.nav-bar-icon-box{
-		.nav-bar-right-icon{font-size: 42rpx;color: #666;}
-		.nav-bar-right-icon + .nav-bar-right-icon{margin-left: 24rpx;}
-	}
-}
 // 两个元素 
 .icon-title-navBar-box{
 	background-color: #fff;box-sizing: border-box;
@@ -128,19 +106,12 @@ view{box-sizing: border-box;}
 	.nav-bar-title{font-size: 32rpx;height: 64rpx;line-height: 64rpx;color: #333;max-width: 70%;}
 	.nav-bar-box{width: 64rpx;height: 64rpx;line-height: 64rpx;position: absolute;left: 10rpx;top: 10rpx;
 	display: flex;align-items: center;justify-content: center;}
-	.nav-bar-icon{
-		width: 24rpx;height: 38rpx;
-		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
-	}
+	.nav-bar-icon{width: 24rpx;height: 38rpx;@include ezy-no-repeat-cover();}
 	.bar-ml10{margin-left: 10rpx;}
 	.nav-bar-btn{font-size: 24rpx;position: absolute;right: 20rpx;
 			line-height: 50rpx;border-radius: 8rpx;padding: 0 10rpx;}
 }
 
-// 仅一个返回按钮
-.phone-nav-bar-icon{width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: var(--status-bar-height);
-		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
-	}
 
 /***** tab *****/	
 // client
@@ -376,46 +347,6 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		text-align: center;margin:10rpx 2%;border:1rpx solid #6bccb0;color:#6bccb0;
 		box-sizing: border-box;padding: 0 6rpx;font-size: 26rpx;background-color:#e5f8f4;
 	}
-	.radio-btn-box{
-		width: 100%;display:block;text-align: center;
-		.radio-btn{color:#6bccb0;display:inline-block;margin: 16rpx 0;}
-		.radio-btn::after{
-			content: '';width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/common/nav-bar-jt-bottom-green.svg");
-			display: inline-block;vertical-align: middle;margin-left: 10rpx;font-size: 30rpx;
-		}
-		.collapsed-btn::after{transform: rotate(180deg);}
-	}
-	.label-radio-btn-box{margin-right: 180rpx;}
-}
-
-// label-select
-.form-label-select{
-	width: 100%;display: flex;justify-content: space-between;
-	background-color: #fff;font-size: 30rpx;color: #333;
-	padding: 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
-	.select-picker-box{width: 100%;display: flex;align-items: center;justify-content: flex-end;}
-	.select-picker-box[disabled="true"]{color: #999;}
-	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
-	.phone-form-label{min-width: 180rpx;line-height:60rpx;flex-shrink: 0;}
-	.form-radio-picker{width:auto!important;flex: unset!important;display: flex;align-items: center;}
-	.form-radio-select,.form-radio-disabled{
-		display: flex;align-items: center;
-		>view{flex: 1;}
-		icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
-			transform: rotate(270deg);margin-left: 4rpx;}
-	}
-	.form-radio-disabled{
-		color: #999;
-		icon{background-image: url("@/static/images/common/nav-bar-jt-bottom-disabled.svg");}
-	}
-	
-	// 日期
-	.uni-date{
-		display: flex;align-items: center;
-		.uni-date-editor{flex: 1;display: flex;justify-content: flex-end;}
-	}
 }
 
 // label-switch

+ 0 - 41
common/styles/global/pages.scss

@@ -453,7 +453,6 @@
 		}
 		.user-title{font-size: 30rpx;color: #333;margin-left: 20rpx;}
 		.user-jt-icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
 			transform: rotate(270deg);margin-left: 4rpx;}
 	}
 	.info-btn{width: 360rpx;margin: 100rpx auto 24rpx;font-size: 30rpx;}
@@ -511,28 +510,6 @@
 	}
 }
 
-/*** 消息列表 ***/
-.phone-tongzhi-list{
-	.uni-list-item__container{padding: 0!important;}
-	.xiaoxi-list-card-box{
-		width: 100%;
-	}
-	.card-head-row{
-		width: 100%;display: flex;align-items: center;border-bottom: 1rpx solid #f4f6fa;
-		padding: 10rpx 20rpx;box-sizing: border-box;justify-content: space-between;
-		.head-name{font-size: 32rpx;color:#49be89;@include single-line-ellipsis();}
-		.head-createTime{font-size: 28rpx;color:#969495;margin-left: auto;flex-shrink: 0;}
-		icon{width: 24rpx;height: 24rpx;@include ezy-no-repeat-cover;flex-shrink: 0;
-			background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
-			transform: rotate(270deg);margin-left:4rpx;}
-	}
-	.card-content{
-		width: 100%;height: 84rpx;padding:0 20rpx;box-sizing: border-box;@include multi-line-ellipsis(2);
-		@include ezy-rich-text();font-size: 28rpx;color:#666;margin: 16rpx 0;line-height: 1.5;
-	}
-}
-
-
 /*** 筛选 ***/
 .phone-filter-page{
 	width: 100%;height: 100vh;background-color: #f8f9fd;
@@ -551,24 +528,6 @@
 }
 
 
-/*** 地图浮层 ***/
-.map-popup-box{
-	width: 100%;height: 100vh;display: flex;flex-direction: column;
-	.map-card-list{width: 100%;padding: 24rpx;box-sizing: border-box;flex: 1;overflow: auto;}
-	.map-card-box{border-bottom: 1rpx solid #ccc;padding-bottom: 20rpx;margin-bottom: 20rpx;display: flex;align-items: center;}
-	.map-card-box:last-child{border-bottom: 0;}
-	.dqwz-text{color:#3fd2a1;border: 1rpx solid #3fd2a1;padding: 1rpx 10rpx 3rpx;
-	box-sizing: border-box;border-radius: 4rpx;line-height: 1;font-size: 24rpx;margin-right: 10rpx;}
-	.map-card-title{font-size: 30rpx;color: #000;margin-bottom: 12rpx;}
-	.map-card-address{font-size: 24rpx;color: #666;}
-	.map-active-icon{
-		width: 40rpx;height: 40rpx;@include ezy-no-repeat-cover();margin-left: auto;
-		background-image: url("@/static/images/common/markIcon.png");
-	}
-	
-	.white-popup{background-color: #fff;}
-}
-
 /*** 已售课程***/
 .phone-yishou-page{
 	.ys-kc-saixuan-view{height: calc(100vh - 320rpx - var(--status-bar-height));}

+ 9 - 3
components/custom-navbar/custom-navbar.vue

@@ -4,7 +4,7 @@
 	  <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
 	  <view class="icon-title-box">
 		  <view class="nav-bar-box" v-if="showBackBtn" @click="handleBack">
-			  <view class="nav-bar-icon"></view>
+			  <view class="nav-bar-icon"  :style="{ backgroundImage: 'url(' + imgsArr.navBarJtIcon + ')' }"></view>
 		  </view>
 		  <!-- 标题区域 -->
 		  <view class="nav-bar-title" :style="{fontSize: titleSize + 'rpx', color: titleColor}">
@@ -15,6 +15,7 @@
 </template>
 
 <script>
+import cacheManager from '@/utils/cacheManager.js';
 export default {
   props: {
     title: String,
@@ -24,7 +25,9 @@ export default {
   },
   data() {
     return {
-      statusBarHeight: 0
+      statusBarHeight: 0,
+	   // 初始化 imgsArr,设置默认空对象
+	  imgsArr: { navBarJtIcon: '' }
     };
   },
   methods: {
@@ -39,7 +42,10 @@ export default {
         this.statusBarHeight = res.statusBarHeight;
       }
     });
-  }
+  },
+  created() {
+  	this.imgsArr.navBarJtIcon = cacheManager.get('projectImg').nav_bar_jt;
+  },
 };
 </script>
 

+ 0 - 146
components/selectZyLevel/index.vue

@@ -1,146 +0,0 @@
-<template>
-	<contentDialogVue ref="commonPopup" title="选择职业">
-		<view class="phone-zydj-popup">
-			<view class="icon-title-navBar-box">
-				<view class="nav-bar-icon" @click="handleClose"></view>
-				<text class="nav-bar-title">职业等级</text>
-			</view>
-			<!-- 技能块展示 -->
-			<view class="phone-select-group">
-				<view v-for="item in data.list" :key="item.id" class="phone-select-item"
-					:class="{ selectActive: item.active }" @click="toggleSelect(item)">
-					{{ item.name }}
-				</view>
-			</view>
-			<view class="zydj-popup-btn-box">
-				<button type="default" class="phone-green-btn" @click="confirmBtn">保存</button>
-			</view>
-		</view>
-	</contentDialogVue>
-
-</template>
-
-<script setup>
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	import {
-		getJiazhengZhiye,
-	} from "@/api/jiazheng.js"
-	import contentDialogVue from '@/components/dialog/contentDialog.vue';
-
-
-	const props = defineProps({
-		title: {
-			type: String,
-			default: ''
-		},
-		content: {
-			type: String,
-			require: true,
-			default: ''
-		},
-		dialogContentClass: {
-			type: String,
-			require: true,
-			default: 'content-center-class'
-		},
-		notBtn: {
-			type: String,
-			require: true,
-			default: '取消'
-		},
-		okBtn: {
-			type: String,
-			require: true,
-			default: '确认'
-		},
-		id: {
-			type: Number,
-		},
-		mode: {
-			type: String,
-			default: 'duoxuan' // danxuan / duoxuan
-		}
-	});
-
-	const commonPopup = ref(null);
-	const $emit = defineEmits(['confirm-btn'])
-
-	const data = reactive({
-		list: [],
-		// item: {
-		// 	zyId: null,
-		// 	zyName: null,
-		//  active: true
-		// }
-	})
-
-
-
-	// 打开弹窗
-	function handleShow(mdata) {
-		getZyList(mdata)
-
-	}
-	// 取消
-	function handleClose() {
-		commonPopup.value.handleClose();
-	}
-	// 确认
-	function confirmBtn() {
-		$emit('confirm-btn', data.list.filter(item => item.active).map(item => {
-      return {
-        name: item.name,
-        id: item.id,
-      }
-    }));
-		handleClose();
-	}
-
-	function getZyList(alreadySelect) {
-		getJiazhengZhiye({
-			id: props.id
-		}).then(res => {
-			data.list = res.data.map(item => {
-				if (alreadySelect) {
-					const da1 = alreadySelect.find(ite => ite.zyId == item.id);
-					if (da1) {
-						return {
-							id: item.id,
-							name: item.name,
-							active: true
-						}
-					}
-				}
-				return {
-					id: item.id,
-					name: item.name,
-					active: false
-				}
-			})
-			commonPopup.value.handleShow();
-		})
-	}
-
-	function toggleSelect(item) {
-		item.active = !item.active;
-		if (props.mode == 'danxuan') {
-      data.list.map(cite => {
-				if (cite.id != item.id) {
-					cite.active = false;
-				}
-			})
-		}
-	}
-
-	defineExpose({
-		handleShow,
-		handleClose
-	})
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 13
pages.json

@@ -10,19 +10,6 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "pages/demo/demo1",
-			"style": {
-				"navigationBarTitleText": "demo1",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/demo/demo2",
-			"style": {
-				"navigationStyle": "custom"
-			}
 		}
 	],
 	"subPackages": [{

+ 5 - 10
pages/client/jiazheng/shareImage.vue

@@ -1,8 +1,6 @@
 <template>
 	<view class="phone-jianli-page">
-		<view class="icon-title-navBar-box">
-			<text class="nav-bar-title">家政人员信息</text>
-		</view>
+		<customNavbarVue title="家政人员信息"></customNavbarVue>
 		<view class="jianli-wrap-box">
 			<view class="jianli-head-box">
 				<view class="head-img-box">
@@ -74,12 +72,9 @@
 	</view>
 </template>
 <script>
-	import {
-		ref
-	} from "vue";
-	import {
-		commonShare
-	} from "@/api/jiazheng.js";
+	import {ref} from "vue";
+	import {commonShare} from "@/api/jiazheng.js";
+	import customNavbarVue from "@/components/custom-navbar/custom-navbar.vue";
 	export default {
 		data() {
 			return {
@@ -88,7 +83,7 @@
 			}
 		},
 		components: {
-
+			customNavbarVue
 		},
 		onLoad(options) {
 			this.pageInfo.uuid = options.uuid;

+ 1 - 1
pages/client/my/myInfo.vue

@@ -8,7 +8,7 @@
 			<uni-file-picker return-type="object" v-model="data.images" :del-icon="false" mode="grid" disable-preview :auto-upload="false"
 				@select="handleSelect" file-mediatype="image" class="phone-file-picker user-file-picker">
 			</uni-file-picker>
-			<icon class="user-jt-icon"></icon>
+			<icon class="user-jt-icon" :style="{ backgroundImage: 'url(' + data.jtIcon + ')' }"></icon>
 		</view>
 		<!-- 姓名 -->
 		<view class="form-label-input">

+ 0 - 47
pages/demo/demo1.vue

@@ -1,47 +0,0 @@
-<template>
-	<view class="demo1">
-		<!---------- 标题文字 ------------>
-		<!-- 箭头+标题文字 -->
-		<view class="icon-title-navBar-box">
-			<view @click="goUpPage" class="nav-bar-icon"></view>
-			<text class="nav-bar-title">箭头+标题文字</text>
-		</view>
-		
-		<!-- 箭头+标题文字 + 文字按钮-->
-		<view class="ezy-navBar-box">
-			<view class="nav-bar-icon"></view>
-			<text class="nav-bar-title">订单支付</text>
-			<view class="text-btn">取消订单</view>
-		</view>
-		<!--  仅一个箭头 -->
-		<!-- <view @click="goUpPage" class="ezy-nav-bar-icon"></view> -->
-		<view class="icon-title-navBar-box">
-			<text class="nav-bar-title">标题文字</text>
-		</view>
-		<!-- switch -->
-		<view>
-			<view class="uni-list-cell-db">照片</view>
-			<switch checked @change="switch1Change" />
-		</view>
-		<!---------- 搜索框 ------------>
-		<!-- 查询职业 -->
-		<view class="phone-search-box">
-			<input class="search-input" placeholder="请输入职业名称" v-model="data.zyName" />
-			<view class="search-icon" @click="handleSearch">
-				<uni-icons type="search" size="24" color="#fff"></uni-icons>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {ref,reactive} from "vue";
-	const data = reactive({
-		zyName: '', // 职业名称
-	})
-	function goUpPage(){}
-	function handleSearch(){}
-</script>
-
-<style>
-</style>

+ 0 - 21
pages/demo/demo2.vue

@@ -1,21 +0,0 @@
-<template>
-	<button @click="handleClis">激活</button>
-	<selectZyLevel ref="selectRef" @confirm-btn="onConfirm" :id="13"></selectZyLevel>
-</template>
-
-<script setup>
-import selectZyLevel from "@/components/selectZyLevel/index.vue"
-import {ref} from "vue"
-
-const selectRef = ref(null)
-function handleClis() {
-	selectRef.value.handleShow()
-}
-function onConfirm(list) {
-	console.log('list', list)
-}
-</script>
-
-<style>
-
-</style>

+ 0 - 1
static/images/common/nav-bar-jt-bottom-disabled.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740467226332" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2034" width="60" height="60" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 704c8.288 0 15.776-3.232 21.456-8.4l0.064 0.08 352-320-0.08-0.08c6.448-5.856 10.56-14.208 10.56-23.6a32 32 0 0 0-32-32c-8.288 0-15.76 3.232-21.456 8.4l-0.08-0.08L512 628.752 181.536 328.32l-0.08 0.08A31.776 31.776 0 0 0 160 320a32 32 0 0 0-32 32c0 9.376 4.112 17.744 10.544 23.6l-0.08 0.08 352 320 0.08-0.08c5.68 5.168 13.168 8.4 21.456 8.4z" p-id="2035" data-spm-anchor-id="a313x.search_index.0.i1.23233a81kOTPLw" fill="#999" class="selected"></path></svg>

+ 0 - 1
static/images/common/nav-bar-jt-bottom-green.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740467226332" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2034" width="60" height="60" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 704c8.288 0 15.776-3.232 21.456-8.4l0.064 0.08 352-320-0.08-0.08c6.448-5.856 10.56-14.208 10.56-23.6a32 32 0 0 0-32-32c-8.288 0-15.76 3.232-21.456 8.4l-0.08-0.08L512 628.752 181.536 328.32l-0.08 0.08A31.776 31.776 0 0 0 160 320a32 32 0 0 0-32 32c0 9.376 4.112 17.744 10.544 23.6l-0.08 0.08 352 320 0.08-0.08c5.68 5.168 13.168 8.4 21.456 8.4z" p-id="2035" data-spm-anchor-id="a313x.search_index.0.i1.23233a81kOTPLw" fill="#3fd2a1" class="selected"></path></svg>

+ 0 - 1
static/images/common/nav-bar-jt-bottom.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740467226332" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2034" width="60" height="60" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 704c8.288 0 15.776-3.232 21.456-8.4l0.064 0.08 352-320-0.08-0.08c6.448-5.856 10.56-14.208 10.56-23.6a32 32 0 0 0-32-32c-8.288 0-15.76 3.232-21.456 8.4l-0.08-0.08L512 628.752 181.536 328.32l-0.08 0.08A31.776 31.776 0 0 0 160 320a32 32 0 0 0-32 32c0 9.376 4.112 17.744 10.544 23.6l-0.08 0.08 352 320 0.08-0.08c5.68 5.168 13.168 8.4 21.456 8.4z" p-id="2035" data-spm-anchor-id="a313x.search_index.0.i1.23233a81kOTPLw" fill="#676767" class="selected"></path></svg>

+ 0 - 1
static/images/common/nav-bar-jt.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1739178328843" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5033" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M375.467 512l370.915-329.955c18.205-15.93 20.48-45.512 4.551-63.716-15.928-18.204-45.511-20.48-63.715-4.55l-409.6 364.088c-11.378 9.102-15.93 20.48-15.93 34.133s4.552 25.031 15.93 34.133l409.6 364.089c9.102 6.827 20.48 11.378 29.582 11.378 13.653 0 25.031-4.551 34.133-15.929 15.929-18.204 15.929-47.786-4.551-63.716L375.467 512z" p-id="5034" fill="#333333"></path></svg>