chenrui 4 éve
szülő
commit
b7bc83bf77

+ 2 - 2
App.vue

@@ -46,7 +46,7 @@
 	}
 	/* 登录页是否记住密码多选框样式 */
 	uni-checkbox.login-form-checkbox .uni-checkbox-input{
-		width: 24upx !important;
-		height: 24upx !important;
+		width: 24rpx !important;
+		height: 24rpx !important;
 	}
 </style>

+ 11 - 11
components/uni-popup/image-txt-popup.vue

@@ -89,29 +89,29 @@
 		line-height: 1.8;
 		.tip-txt{
 			display: block;
-			font-size: 24upx;
+			font-size: 24rpx;
 			color: #999;
-			margin-bottom: 40upx;
+			margin-bottom: 40rpx;
 			text-align: center;
 		}
 		.item-inp{
 			background-color: #fff;
-			border: 2upx solid #dcdee2;
-			border-radius: 8upx;
+			border: 2rpx solid #dcdee2;
+			border-radius: 8rpx;
 			color: #666;
 			display: inline-block;
-			font-size: 24upx;
-			height: 64upx;
+			font-size: 24rpx;
+			height: 64rpx;
 			line-height: 1.5;
-			padding: 8upx 14upx;
+			padding: 8rpx 14rpx;
 			width: 100%;
 			box-sizing: border-box;
 		}
 		.image{
 			max-width: 100%;
-			width: 400upx;
-			height: 160upx;
-			margin: 30upx auto 20upx;
+			width: 400rpx;
+			height: 160rpx;
+			margin: 30rpx auto 20rpx;
 			display: block;
 			img{
 				max-width: 100%;
@@ -119,7 +119,7 @@
 		}
 		.popup-button-yz{
 			display: block;
-			margin: 40upx auto 50upx;
+			margin: 40rpx auto 50rpx;
 			width: 30%;
 			line-height: 2.8;
 		}

+ 9 - 9
components/uni-popup/popup-con.vue

@@ -57,33 +57,33 @@
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
-		box-shadow: 0 8upx 24upx rgba(0,0,0,.15);
+		box-shadow: 0 8rpx 24rpx rgba(0,0,0,.15);
 		display: flex;
 		flex-direction: column;
-		padding: 30upx;
-		width: 600upx;
+		padding: 30rpx;
+		width: 600rpx;
 		background-color: #fff;
-		border-radius: 20upx;
+		border-radius: 20rpx;
 		.popup-header{
-			margin-bottom: 20upx;
+			margin-bottom: 20rpx;
 			text-align: center;
 			font-weight: 700;
-			font-size: 32upx;
+			font-size: 32rpx;
 			color: #333;
 			line-height: 1.8;
 		}
 		.popup-content{
-			font-size: 28upx;
+			font-size: 28rpx;
 			color: #666;
 		}
 		.popup-footer{
 			display: flex;
 			flex-direction: row;
-			margin-top: 40upx;
+			margin-top: 40rpx;
 			.popup-button{
 				flex: 1;
 				text-align: center;
-				font-size: 28upx;
+				font-size: 28rpx;
 				color: #3b4144;
 				line-height: 1.8;
 			}

+ 4 - 4
components/w-picker/w-picker.css

@@ -6,7 +6,7 @@
 }
 .w-picker-view {
 	width: 100%;
-	height: 476upx;
+	height: 476rpx;
 	overflow: hidden;
 	background-color: rgba(255, 255, 255, 1);
 	z-index: 666;
@@ -18,9 +18,9 @@
 .w-picker-item {
   text-align: center;
   width: 100%;
-  height: 88upx;
-  line-height: 88upx;
+  height: 88rpx;
+  line-height: 88rpx;
   text-overflow: ellipsis;
   white-space: nowrap;
-  font-size: 30upx;
+  font-size: 30rpx;
 }

+ 8 - 8
components/w-picker/w-picker.vue

@@ -224,7 +224,7 @@
 		},
 		data() {
 			return {
-				itemHeight:`height: ${uni.upx2px(88)}px;`,
+				itemHeight:`height: ${uni.rpx2px(88)}px;`,
 				result:{},
 				confirmFlag:true
 			};
@@ -271,11 +271,11 @@
 	.w-picker-item {
 	  text-align: center;
 	  width: 100%;
-	  height: 88upx;
-	  line-height: 88upx;
+	  height: 88rpx;
+	  line-height: 88rpx;
 	  text-overflow: ellipsis;
 	  white-space: nowrap;
-	  font-size: 30upx;
+	  font-size: 30rpx;
 	}
 	.w-picker{
 		z-index: 888;
@@ -312,16 +312,16 @@
 		.w-picker-header{
 		  display: flex;
 		  align-items: center;
-		  padding: 0 30upx;
-		  height: 88upx;
+		  padding: 0 30rpx;
+		  height: 88rpx;
 		  background-color: #fff;
 		  position: relative;
 		  text-align: center;
-		  font-size: 32upx;
+		  font-size: 32rpx;
 		  justify-content: space-between;
 		  border-bottom: solid 1px #eee;
 		  .w-picker-btn{
-		  	font-size: 30upx;
+		  	font-size: 30rpx;
 		  }
 		}
 		

+ 2 - 2
pages.json

@@ -45,7 +45,7 @@
 			"path": "pages/userCenter/index",
 			"style": {
 				"navigationBarTitleText": "个人中心",
-				"navigationBarBackgroundColor": "#ff4546",
+				"navigationBarBackgroundColor": "#e84131",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -81,7 +81,7 @@
 	},
 	"tabBar": {
 		"color": "#7A7E83",
-		"selectedColor": "#ff4546",
+		"selectedColor": "#e84131",
 		"backgroundColor": "#ffffff",
 		"fontSize": "14px",
 		"list": [

+ 12 - 12
pages/index/searchModal.vue

@@ -63,8 +63,8 @@ export default {
 	data() {
 		return {
 			customBtnStyle: {  //  自定义按钮样式
-				borderColor: '#ff4546',
-				backgroundColor: '#ff4546',
+				borderColor: '#e84131',
+				backgroundColor: '#e84131',
 				color: '#fff'
 			},
 			isShow: this.visible, // 显示隐藏
@@ -141,23 +141,23 @@ export default {
 .search-popup {
 	.search-title {
 		text-align: center;
-		padding: 18upx 22upx;
+		padding: 18rpx 22rpx;
 		color: #333;
 		border-bottom: 1px solid #eee;
 	}
 	.form-content {
 		display: block;
-		padding: 0 20upx;
+		padding: 0 20rpx;
 		box-sizing: content-box;
 		.status-item {
 			width: 30%;
 			text-align: center;
-			line-height: 60upx;
+			line-height: 60rpx;
 			background-color: #F8F8F8;
 			color: #333;
-			border-radius: 6upx;
-			font-size: 24upx;
-			margin: 0 10upx;
+			border-radius: 6rpx;
+			font-size: 24rpx;
+			margin: 0 10rpx;
 		}
 		.active {
 			background-color: #ffaa00;
@@ -170,7 +170,7 @@ export default {
 		}
 	}
 	.uni-list {
-		margin: 20upx;
+		margin: 20rpx;
 		.uni-list-cell {
 			display: flex;
 			align-items: center;
@@ -186,11 +186,11 @@ export default {
 	}
 	.uni-list-btns {
 		display: flex;
-		padding: 20upx;
+		padding: 20rpx;
 		margin-top: 200rpx;
 		.handle-btn {
-			font-size: 28upx;
-			margin: 0 30upx;
+			font-size: 28rpx;
+			margin: 0 30rpx;
 			width: 100%;
 			flex: 1;
 		}

+ 1 - 1
pages/login/forget-pass.vue

@@ -219,7 +219,7 @@
 <style scoped lang="scss">
 	@import './login.scss';
 	.forget-wrap .login-form{
-		padding-top: 300upx;
+		padding-top: 300rpx;
 	}
 	.getcode-btn {
 		background-color: #298bf2 !important;

+ 20 - 20
pages/login/login.scss

@@ -5,56 +5,56 @@
 	box-sizing: border-box;
 	.logo{
 		display: block;
-		width: 148rpx;
-		height: 133rpx;
-		padding-top: 120upx;
+		width: 200rpx;
+		height: 200rpx;
+		padding-top: 120rpx;
 		margin: 0 auto;
 	}
 	.login-form{
 		display: block;
 		width: 80%;
 		margin: 0 auto;
-		padding-top: 110upx;
+		padding-top: 110rpx;
 		.form-item{
-			margin-bottom: 20upx;
+			margin-bottom: 20rpx;
 			position: relative;
 			display: flex;
 			align-items: center;
-			border-bottom: 1upx solid #dcdee2;
+			border-bottom: 1rpx solid #dcdee2;
 			.require-tip{
 				position: absolute;
 				left: 0;
-				top: 26upx;
+				top: 26rpx;
 				color: red;
 			}
 			.item-inp{
 				flex-grow: 1;
 			}
 			.item-inp, .item-picker{
-				font-size: 30upx;
-				padding: 20upx 20upx;
+				font-size: 30rpx;
+				padding: 20rpx 20rpx;
 			}
 			.getcode-btn{
 				position: absolute;
-				right: 20upx;
+				right: 20rpx;
 				top: 0;
-				font-size: 24upx;
-				margin-top: 14upx;
+				font-size: 24rpx;
+				margin-top: 14rpx;
 			}
 		}
 		.flex-box{
 			display: flex;
 			justify-content: space-between;
-			font-size: 26upx;
+			font-size: 26rpx;
 		}
 		.form-btn-con{
-			margin-top: 100upx;
+			margin-top: 100rpx;
 			.form-btn{
-				font-size: 32upx;
+				font-size: 32rpx;
 				display: block;
-				line-height: 84upx;
+				line-height: 84rpx;
 				margin: 0 auto;
-				background-color: #ff4546;
+				background-color: #e84131;
 				// background-color: #298bf2;
 				color: #fff;
 			}
@@ -64,7 +64,7 @@
 			.apply-btn{
 				display: block;
 				text-align: center;
-				margin-top: 50upx;
+				margin-top: 50rpx;
 			}
 		}
 	}
@@ -74,9 +74,9 @@
 		position: absolute;
 		bottom: 5%;
 		width: 100%;
-		font-size: 24upx;
+		font-size: 24rpx;
 		text{
-			color: #ff4546;
+			color: #e84131;
 		}
 	}
 }

+ 4 - 4
pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login-wrap">
 		<!-- <view v-if="!buildType" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view> -->
-		<image src="../../static/logo.png" class="logo"></image>
+		<image src="../../static/logos.png" class="logo"></image>
 		<form class="login-form" @submit="formSubmit">
 			<view class="form-item">
 				<u-icon size="34" color="#999" name="account"></u-icon>
@@ -11,9 +11,9 @@
 				<u-icon size="34" color="#999" name="lock"></u-icon>
 				<input v-model="form.password" class="item-inp" name="password" password type="text" maxlength="12" placeholder="请输入密码" />
 			</view>
-			<view class="flex-box" style="margin-top: 60upx;">
+			<view class="flex-box" style="margin-top: 60rpx;">
 				<view class="remember-pass">
-					<u-checkbox v-model="isRemember" value="true" :size="30" :label-size="26" active-color="#ff4546" class="login-form-checkbox" @change="rememberChange">记住密码</u-checkbox>
+					<u-checkbox v-model="isRemember" value="true" :size="30" :label-size="26" active-color="#e84131" class="login-form-checkbox" @change="rememberChange">记住密码</u-checkbox>
 				</view>
 			</view>
 			<view class="form-btn-con">
@@ -21,7 +21,7 @@
 			</view>
 		</form>
 		<view class="authUserYs">
-			<u-checkbox v-model="isAuthuserYs" value="true" :size="30" :label-size="26" active-color="#ff4546" class="login-form-checkbox" @change="authuserChange">登录代表同意</u-checkbox>
+			<u-checkbox v-model="isAuthuserYs" value="true" :size="30" :label-size="26" active-color="#e84131" class="login-form-checkbox" @change="authuserChange">登录代表同意</u-checkbox>
 			<text @click="toYsPage()" style="vertical-align: text-top;font-size: 26rpx;text-decoration: underline;">章鱼合作商端用户协议及隐私保护政策</text>
 		</view>
 	</view>

+ 4 - 4
pages/login/userAuthYs.vue

@@ -51,12 +51,12 @@
 
 <style lang="scss">
 	.article{
-		 padding: 35upx 40upx;
-		 line-height: 46upx;
+		 padding: 35rpx 40rpx;
+		 line-height: 46rpx;
 		 >view{
-			 margin: 30upx 0;
+			 margin: 30rpx 0;
 			 p{
-				 margin: 20upx 0;
+				 margin: 20rpx 0;
 				 &:first-child{
 					 font-weight: bold;
 				 }

+ 7 - 7
pages/userCenter/aboutUs.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="logoContent">
 			<view class="logoBorder">
-				<image class="logoImg" src="/static/logo.png"></image>
+				<image class="logoImg" src="/static/logos.png"></image>
 			</view>
 		</view>
 		<view class="textContent">
@@ -25,16 +25,16 @@
 		color:#666;
 		.logoContent{
 			.logoBorder{
-				width:178rpx;
-				height:170rpx;
+				width:240rpx;
+				height:240rpx;
 				border:2px solid #eee;
 				border-radius: 20rpx;
 				margin:70rpx 0 25rpx 0;
 				display: inline-block;
 				position: relative;
 				.logoImg{
-					width:138rpx;
-					height:123rpx;
+					width:200rpx;
+					height:200rpx;
 					position: absolute;
 					top:0;
 					left:0;
@@ -53,8 +53,8 @@
 				font-size: 32rpx;
 			}
 			> view{
-				padding: 16upx 0;
-				line-height: 50upx;
+				padding: 16rpx 0;
+				line-height: 50rpx;
 				text-indent: 60rpx;
 			}
 		}

+ 5 - 5
pages/userCenter/changePwd.vue

@@ -42,8 +42,8 @@
 				},
 				loading: false,
 				customBtnStyle: {  //  自定义按钮样式
-					borderColor: '#ff4546',
-					backgroundColor: '#ff4546',
+					borderColor: '#e84131',
+					backgroundColor: '#e84131',
 					color: '#fff'
 				},
 			}
@@ -177,14 +177,14 @@
 			bottom: 10rpx;
 		}
 		.form-footer-btn{
-			margin: 140upx 50upx 0;
+			margin: 140rpx 50rpx 0;
 			display: flex;
 			justify-content: space-between;
 		}
 		.form-footer-btn uni-button{
 			width: 50%;
-			margin: 0 50upx;
-			font-size: 30upx;
+			margin: 0 50rpx;
+			font-size: 30rpx;
 		}
 	}
 </style>

+ 5 - 5
pages/userCenter/index.vue

@@ -34,7 +34,7 @@
 				quitButton: {
 					borderRadius:'100rpx',
 					fontSize:'30rpx',
-					background: '#ff4546'
+					background: '#e84131'
 				},
 				userInfoData: null,  //  用户信息
 				userAvatarUrl: ''  //  用户头像
@@ -104,7 +104,7 @@
 	.user-content{
 		width: 100%;
 		.user-head{
-			background: #ff4546;
+			background: #e84131;
 			display: flex;
 			align-items: center;
 			padding: 55rpx 55rpx;
@@ -132,10 +132,10 @@
 			}
 		}
 		.user-list{
-			border-radius: 15upx;
-			margin: 20upx;
+			border-radius: 15rpx;
+			margin: 20rpx;
 			overflow: hidden;
-			box-shadow: 0upx 3upx 6upx #eee;
+			box-shadow: 0rpx 3rpx 6rpx #eee;
 		}
 		.user-btn{
 			padding: 85rpx 200rpx;

+ 8 - 3
pages/workOrder/bundle_detail.vue

@@ -6,12 +6,17 @@
 			</view>
 			<!-- 套餐包含服务项 -->
 			<view v-show="serverList.length" class="bundle-list flex flex_column" v-for="item in serverList" :key="item.id">
-				<view class="line-height font32">
-					{{item.itemName}}-{{item.itemClsName}}
+				<view class="flex align_end justify_between">
+					<view class="line-height">
+						<text class="line-height">{{item.itemName}}</text>
+					</view>
+					<view class="line-height">
+						{{item.itemClsName}}
+					</view>
 				</view>
 				<view class="flex align_end justify_between">
 					<view class="uni-col-6 flex flex_column">
-						<text class="line-height">单次工时:¥{{item.itemPrice||0}}</text>
+						<text class="line-height">服务价格:¥{{item.itemPrice||0}}</text>
 					</view>
 					<view class="line-height">
 						次数:<text style="padding: 0 2px;font-weight: bold;">{{ item.times || 0 }}</text>次

+ 2 - 2
pages/workOrder/sellOrder/buyBundle.vue

@@ -39,8 +39,8 @@ export default {
 		};
 		return {
 			customBtnStyle: {  //  自定义按钮样式
-				borderColor: '#ff4546',
-				backgroundColor: '#ff4546',
+				borderColor: '#e84131',
+				backgroundColor: '#e84131',
 				color: '#fff'
 			},
 			form: {

+ 40 - 25
pages/workOrder/sellOrder/chooseBundle.vue

@@ -4,7 +4,7 @@
 		<view class="page-header" id="bundle-item-header">
 			<u-row gutter="16" justify="space-between">
 				<u-col :span="isGobleSearch ? 9 : 12">
-					<u-search placeholder="请输入关键字" v-model="queryWord" @focus="isGobleSearch=true" @custom="searchData" @search="searchData" :action-style="{'color': '#fff', 'font-size': '24rpx', 'background-color': '#ff4546', 'border-radius': '6rpx', 'padding': '6rpx 15rpx'}"></u-search>
+					<u-search placeholder="请输入关键字" v-model="queryWord" @focus="isGobleSearch=true" @custom="searchData" @search="searchData" :action-style="{'color': '#fff', 'font-size': '24rpx', 'background-color': '#e84131', 'border-radius': '6rpx', 'padding': '6rpx 15rpx'}"></u-search>
 				</u-col>
 				<u-col span="3" v-show="isGobleSearch">
 					<view class="close-con">
@@ -25,8 +25,12 @@
 				   <view class="item-f-con">
 				   	  <text style="color: red;">¥{{item.price}}</text>
 					  <view class="handle-btns">
-						<u-button class="item-btn" shape="circle" size="mini" hover-class="none" @click="intoDetail(item.id)">查详情</u-button>
-					  	<u-button class="item-btn buy-btn" type="primary" shape="circle" size="mini" hover-class="none" :custom-style="customBtnStyle" @click="buyBundle(item)">下 单</u-button>
+							<view class="btn-box">
+								<u-button class="item-btn" shape="circle" size="mini" hover-class="none" :custom-style="customBtnStylePlain" @click="intoDetail(item.id)">查详情</u-button>
+							</view>
+							<view class="btn-box">
+								<u-button class="item-btn buy-btn" type="primary" shape="circle" size="mini" hover-class="none" :custom-style="customBtnStyle" @click="buyBundle(item)">下 单</u-button>
+							</view>
 					  </view>
 				   </view>
 				</view>
@@ -53,9 +57,13 @@
 				isGobleSearch: false, // 是否全局搜索
 				clsId: '',
 				customBtnStyle: {  //  自定义按钮样式
-					borderColor: '#ff4546',
-					backgroundColor: '#ff4546',
-					color: '#fff'
+					borderColor: '#e84131',
+					backgroundColor: '#e84131',
+					color: '#fff',
+					width: '100%'
+				},
+				customBtnStylePlain: {  //  自定义按钮样式
+					width: '100%'
 				},
 			}
 		},
@@ -175,18 +183,18 @@
 		width: 100%;
 		height: 100vh;
 		.page-header{
-			padding: 20upx 30upx;
-			border-bottom: 1upx solid #f2f2f2;
+			padding: 20rpx 30rpx;
+			border-bottom: 1rpx solid #f2f2f2;
 			background: #FFFFFF;
 			.close-con{
 				text-align: right;
 				.close-search{
 					display: inline-block;
 					color: #515a6e;
-					border: 2upx dashed #dcdee2;
-					border-radius: 6upx;
-					padding: 12upx 15upx;
-					font-size: 24upx;
+					border: 2rpx dashed #dcdee2;
+					border-radius: 6rpx;
+					padding: 12rpx 15rpx;
+					font-size: 24rpx;
 				}
 			}
 		}
@@ -197,12 +205,12 @@
 			.nav-left{
 				width: 30%;
 				height: 100vh;
-				border-right: 1upx solid #f2f2f2;
+				border-right: 1rpx solid #f2f2f2;
 				background-color: #fff;
 				.nav-left-item{
 					color: #303133;
-					border-right: 2upx solid #fff;
-					padding: 24upx 20upx;
+					border-right: 2rpx solid #fff;
+					padding: 24rpx 20rpx;
 					background-color: #fff;
 					position: relative;
 				}
@@ -223,11 +231,11 @@
 			}
 			.nav-right{
 				height: 100vh;
-				padding: 20upx;
+				padding: 20rpx;
 				box-sizing: border-box;
 				.nav-right-item{
-					padding: 20upx 30upx;
-					border: 1upx solid #f2f2f2;
+					padding: 40rpx 30rpx;
+					border: 1rpx solid #f2f2f2;
 					background: #FFFFFF;
 					margin: 6px 0;
 					border-radius: 10px;
@@ -235,19 +243,26 @@
 					flex-direction: column;
 					justify-content: space-between;
 					.item-name{
-						font-size: 28upx;
-						margin-bottom: 20upx;
+						font-size: 28rpx;
+						margin-bottom: 20rpx;
 					}
 					.item-f-con{
 						display: flex;
 						align-items: center;
 						justify-content: space-between;
+						.handle-btns{
+							.btn-box{
+								display: inline-block;
+								width: 120rpx;
+								margin-left: 20rpx;
+							}
+							.item-btn{
+								display: inline-block;
+								width: 100%;
+							}
+						}
 					}
-					.item-btn{
-						display: inline-block;
-						margin-left: 20upx;
-						width: 112upx;
-					}
+					
 				}
 			}
 		}

+ 16 - 16
pages/workOrder/sellOrder/customBundleDetail.vue

@@ -194,15 +194,15 @@ export default {
 			}
 			.check-order-list{
 				background: #ffffff;
-				padding: 10upx 20upx;
-				margin: 15upx 25upx;
-				border-radius: 6upx;
+				padding: 10rpx 20rpx;
+				margin: 15rpx 25rpx;
+				border-radius: 6rpx;
 				box-shadow: 1px 1px 3px #EEEEEE;
 				.check-row{
 					display: flex;
 					align-items: center;
-					padding: 15upx 10upx;
-					font-size: 30upx;
+					padding: 15rpx 10rpx;
+					font-size: 30rpx;
 					word-break: break-all;
 					&:first-child{
 						color: #666;
@@ -239,21 +239,21 @@ export default {
 						align-items: center;
 						justify-content: flex-end;
 						> view{
-							margin-left: 35upx;
-							font-size: 28upx;
+							margin-left: 35rpx;
+							font-size: 28rpx;
 						}
 					}
 					.u-tag{
 						border-radius: 0;
 					}
 					.uni-icons{
-						margin: 0 5upx;
+						margin: 0 5rpx;
 					}
 				}
 			}
 		}
 		.footer{
-			padding: 20upx;
+			padding: 20rpx;
 		}
 		.noDate {
 			font-size: 32rpx;
@@ -264,25 +264,25 @@ export default {
 		.header {
 			position: relative;
 			background: #FFFFFF;
-			padding: 10upx 20upx;
-			font-size: 30upx;
+			padding: 10rpx 20rpx;
+			font-size: 30rpx;
 		}
 		.header-row{
 			display: flex;
 			align-items: center;
-			padding: 10upx 0;
+			padding: 10rpx 0;
 			color: #666666;
 			.couponText{
 				font-size: 28rpx;
 				color: #666;
 			}
 			&:first-child{
-				font-size: 32upx;
+				font-size: 32rpx;
 				color: #333333;
 			}
 			> view{
 				&:first-child{
-					margin-left: 20upx;
+					margin-left: 20rpx;
 				}
 				text{
 					color: #333333;
@@ -588,8 +588,8 @@ export default {
 		}
 		
 		.active {
-			border-bottom: 6rpx solid #ff4546;
-			color: #ff4546;
+			border-bottom: 6rpx solid #e84131;
+			color: #e84131;
 		}
 		.uni-badge {
 			margin: 8rpx 16rpx 0 16rpx;

BIN
static/logos.png