gjy 3 years ago
parent
commit
5ce5190ecf
4 changed files with 24 additions and 7 deletions
  1. 1 1
      pages/mine/settings/editPassword.vue
  2. 1 1
      pages/order/index.vue
  3. 11 2
      pages/public/login.vue
  4. 11 3
      pages/release/release.vue

+ 1 - 1
pages/mine/settings/editPassword.vue

@@ -14,7 +14,7 @@
 					</u-button>
 				</u-form-item>
 				<u-form-item label="新密码" prop="password" borderBottom>
-					<u--input v-model="registerData.password" border="none" placeholder="请输入密码,6-16位字符"></u--input>
+					<u--input v-model="registerData.password" border="none" placeholder="请输入密码,6-16位字符"></u--input>
 				</u-form-item>
 			
 				<u-code ref="uCode" @change="codeChange" seconds="20" @start="disabled1 = true" @end="disabled1 = false">

+ 1 - 1
pages/order/index.vue

@@ -16,7 +16,7 @@
 			</view> -->
 		<view class="top-content">
 			<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
-				@search="getSearch" :clearabled="true"></u-search>
+				@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
 			<view class="tab-content">
 				<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
 					:inactiveStyle="{color:'white'}" :activeStyle="{

+ 11 - 2
pages/public/login.vue

@@ -20,8 +20,17 @@
 				<!-- <u--input class='password' border="none" v-model='password'
 					placeholder="请输入密码,6-16位字符" :type="type" value="">
 					</u--input> -->
-				<u-input class='password' border="none" v-model='password' placeholder="请输入密码,6-16位字符"
-					:type="isShowPassword" :clearable='true'>
+				<u-input 	v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码,6-16位字符"
+					type="password" :clearable='true'>
+					<template slot="suffix">
+						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
+							v-if="isShowPassword=='password'"></u-icon>
+						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
+						</u-icon>
+					</template>
+				</u-input>
+				<u-input v-else class='password' border="none" v-model='password' placeholder="请输入密码,6-16位字符"
+					type="text" :clearable='true'>
 					<template slot="suffix">
 						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
 							v-if="isShowPassword=='password'"></u-icon>

+ 11 - 3
pages/release/release.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="fixed1"></view>
-		<view class='title flex'>
+		<view class='title top-title flex'>
 			<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
 			<view class="nav-title">发布</view>
 			<view class="search" @click="goToRecord">
@@ -863,7 +863,7 @@
 
 	.content1 {
 		background: white;
-		margin: var(--status-bar-height) 20rpx 0 20rpx;
+		margin: 100rpx 20rpx 0 20rpx;
 		border-radius: 20rpx;
 		padding: 40rpx;
 
@@ -905,7 +905,15 @@
 		display: flex;
 		justify-content: flex-end;
 	}
-
+	.top-title{
+		background:#fff;
+		padding:20rpx;
+		position: fixed;
+		z-index:100;
+		top:0;
+		box-sizing: border-box;
+		width:100%;
+	}
 	.content2 {
 		padding: 40rpx;