shish 7 ヶ月 前
コミット
ff207af829

+ 3 - 3
ghsApp/src/components/module/app-search.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-	<div class="app-search-module" :style="{ height: height + 'rpx' }">
+	<div class="app-search-module" :style="{ height: height + 'upx' }">
 		<div class="map-search" :style="{ backgroundColor: backColor }" style="height:90upx">
 		<div class="map-search" :style="{ backgroundColor: backColor }" style="height:90upx">
 			<div class="icon-wrap" v-if="isIcon">
 			<div class="icon-wrap" v-if="isIcon">
 				<i class="iconfont" :class="[icon]"></i>
 				<i class="iconfont" :class="[icon]"></i>
@@ -12,7 +12,7 @@
 					:focus="focus"
 					:focus="focus"
 					@input="inputFn"
 					@input="inputFn"
 					@focus="inputEmptyFn"
 					@focus="inputEmptyFn"
-					:style="{ fontSize: fontSize + 'rpx' }"
+					:style="{ fontSize: fontSize + 'upx' }"
 					:placeholder="placeholder"
 					:placeholder="placeholder"
 					placeholder-class="placeholder"
 					placeholder-class="placeholder"
 					@confirm="searchFn"
 					@confirm="searchFn"
@@ -21,7 +21,7 @@
 			</div>
 			</div>
 		</div>
 		</div>
 		<block v-if="isBtn">
 		<block v-if="isBtn">
-			<button v-if="isTextBtn" class="search-btn" :style="{ fontSize: fontSize + 'rpx' }" @click="searchFn" > {{ btnText }} </button>
+			<button v-if="isTextBtn" class="search-btn" :style="{ fontSize: fontSize + 'upx' }" @click="searchFn" > {{ btnText }} </button>
 			<button v-else class="search-btn admin-button-com middle blue" :style="{ fontSize: fontSize + 'upx' }" @click="searchFn" > {{ btnText }} </button>
 			<button v-else class="search-btn admin-button-com middle blue" :style="{ fontSize: fontSize + 'upx' }" @click="searchFn" > {{ btnText }} </button>
 		</block>
 		</block>
 	</div>
 	</div>

+ 4 - 4
hdApp/src/components/module/app-search.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-	<div class="app-search-module" :style="{ height: height + 'rpx' }">
+	<div class="app-search-module" :style="{ height: height + 'upx' }">
 		<div class="map-search" :style="{ backgroundColor: backColor }" style="height:90upx">
 		<div class="map-search" :style="{ backgroundColor: backColor }" style="height:90upx">
 			<div class="icon-wrap" v-if="isIcon">
 			<div class="icon-wrap" v-if="isIcon">
 				<i class="iconfont" :class="[icon]"></i>
 				<i class="iconfont" :class="[icon]"></i>
@@ -12,7 +12,7 @@
 				v-model="search"
 				v-model="search"
 				:focus="focus"
 				:focus="focus"
 				@input="inputFn" @focus="inputEmptyFn"
 				@input="inputFn" @focus="inputEmptyFn"
-				:style="{ fontSize: fontSize + 'rpx' }"
+				:style="{ fontSize: fontSize + 'upx' }"
 				:placeholder="placeholder"
 				:placeholder="placeholder"
 				placeholder-class="placeholder"
 				placeholder-class="placeholder"
 				@confirm="searchFn"
 				@confirm="searchFn"
@@ -24,7 +24,7 @@
 			<button
 			<button
 				v-if="isTextBtn"
 				v-if="isTextBtn"
 				class="search-btn"
 				class="search-btn"
-				:style="{ fontSize: fontSize + 'rpx' }"
+				:style="{ fontSize: fontSize + 'upx' }"
 				@click="searchFn"
 				@click="searchFn"
 			>
 			>
 				{{ btnText }}
 				{{ btnText }}
@@ -32,7 +32,7 @@
 			<button
 			<button
 				v-else
 				v-else
 				class="search-btn admin-button-com middle blue"
 				class="search-btn admin-button-com middle blue"
-				:style="{ fontSize: fontSize + 'rpx' }"
+				:style="{ fontSize: fontSize + 'upx' }"
 				@click="searchFn"
 				@click="searchFn"
 			>
 			>
 				{{ btnText }}
 				{{ btnText }}

+ 4 - 4
mallApp/src/components/module/app-search.vue

@@ -1,16 +1,16 @@
 <template>
 <template>
-	<div class="app-search-module" :style="{height: height + 'rpx'}">
+	<div class="app-search-module" :style="{height: height + 'upx'}">
 		<div class="map-search" :style="{backgroundColor: backColor}">
 		<div class="map-search" :style="{backgroundColor: backColor}">
 			<div class="icon-wrap" v-if="isIcon">
 			<div class="icon-wrap" v-if="isIcon">
 				<i class="iconfont" :class="[icon]" style="font-size:38upx;"></i>
 				<i class="iconfont" :class="[icon]" style="font-size:38upx;"></i>
 			</div>
 			</div>
 			<div class="input-wrap">
 			<div class="input-wrap">
-				<input type="text" ref="searchInput" v-model="search" :focus="focus" @input="inputFn" :style="{fontSize: fontSize + 'rpx'}" :placeholder="placeholder" placeholder-class="placeholder" />
+				<input type="text" ref="searchInput" v-model="search" :focus="focus" @input="inputFn" :style="{fontSize: fontSize + 'upx'}" :placeholder="placeholder" placeholder-class="placeholder" />
 			</div>
 			</div>
 		</div>
 		</div>
 		<block v-if="isBtn">
 		<block v-if="isBtn">
-			<button v-if="isTextBtn" class="search-btn" :style="{fontSize: fontSize + 'rpx'}" @click="searchFn">{{ btnText }}</button>
-			<button v-else class="search-btn admin-button-com middle blue" :style="{fontSize: fontSize + 'rpx'}" @click="searchFn">{{ btnText }}</button>
+			<button v-if="isTextBtn" class="search-btn" :style="{fontSize: fontSize + 'upx'}" @click="searchFn">{{ btnText }}</button>
+			<button v-else class="search-btn admin-button-com middle blue" :style="{fontSize: fontSize + 'upx'}" @click="searchFn">{{ btnText }}</button>
 		</block>
 		</block>
 	</div>
 	</div>
 </template>
 </template>