From bf35fec7db1ab7a2e544e7a87a1644ee24751af0 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 1 Apr 2022 18:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=B5=8Bpsd11-21=E9=99=A4=E4=BA=8617?=
 =?UTF-8?q?=E3=80=8118?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/base.css                              | 14 +++++
 pages/appreciationServe/appreciationServe.vue | 13 +++--
 pages/dataQuery/client.vue                    |  4 +-
 pages/dataQuery/dataQuery.vue                 | 10 ++--
 pages/dataQuery/details.vue                   | 12 ++---
 pages/dataQuery/projectQuery.vue              | 14 ++---
 pages/mountingsList/mountingsList.vue         | 52 ++++++++-----------
 pages/workOrder/payReturnVisit.vue            | 14 ++---
 8 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/commons/base.css b/commons/base.css
index 008afcc..424f536 100644
--- a/commons/base.css
+++ b/commons/base.css
@@ -290,6 +290,13 @@ button:after{content: none!important;}
 .mar-z36{margin-left: 36rpx;}
 .mar-z40{margin-left: 40rpx;}
 .mar-z50{margin-left: 50rpx;}
+.mar-z60{margin-left: 60rpx;}
+.mar-z70{margin-left: 70rpx;}
+.mar-z80{margin-left: 80rpx;}
+.mar-z90{margin-left: 90rpx;}
+.mar-z100{margin-left: 100rpx;}
+.mar-z110{margin-left: 110rpx;}
+.mar-z120{margin-left: 120rpx;}
 /* 右---外边距 */
 .mar-y10{margin-right: 10rpx;}
 .mar-y20{margin-right: 20rpx;}
@@ -299,6 +306,13 @@ button:after{content: none!important;}
 .mar-y36{margin-right: 36rpx;}
 .mar-y40{margin-right: 40rpx;}
 .mar-y50{margin-right: 50rpx;}
+.mar-y60{margin-right: 60rpx;}
+.mar-y70{margin-right: 70rpx;}
+.mar-y80{margin-right: 80rpx;}
+.mar-y90{margin-right: 90rpx;}
+.mar-y100{margin-right: 100rpx;}
+.mar-y110{margin-right: 110rpx;}
+.mar-y120{margin-right: 120rpx;}
 
 /* 上下左右---内边距 */
 .pad10{padding: 10rpx;}
diff --git a/pages/appreciationServe/appreciationServe.vue b/pages/appreciationServe/appreciationServe.vue
index 0fe1fa9..ef1af78 100644
--- a/pages/appreciationServe/appreciationServe.vue
+++ b/pages/appreciationServe/appreciationServe.vue
@@ -2,7 +2,7 @@
     <view class="content">
         <statusNav returnColor="#c2c2c2" navBarTitle="增值服务"></statusNav>
         <container-subgroup-two>
-            <view slot="content" style="margin: 0 -30rpx;">
+            <view slot="content" style="margin: -20rpx -30rpx 0;">
                 <view class="select-type">
                     <view class="text">选择类型</view>
                     <view class="type">
@@ -58,9 +58,6 @@
                         </view>
                         <input type="text" class="input" value="2022-02-16" />
                     </view>
-
-
-
                     <view class="li-textarea">
                         <view class="title">*详细地址</view>
                         <textarea class="textarea" value="湖南省株洲市荷塘区红旗中路456号五矿二十三冶综合楼" placeholder="" />
@@ -194,7 +191,7 @@
     }
 
     .select-type .type .on {
-        background-color: #0051ff;
+        background-color: #0081ff;
         border: none;
         color: #FFFFFF;
         box-shadow: 2rpx 2px 10rpx rgba(0, 81, 255, 0.5);
@@ -209,11 +206,13 @@
     .appreciationServe-from .li {
         display: flex;
         height: 80rpx;
-
+		border-bottom: 1rpx solid #f5f5f7;
         align-items: center;
 
     }
-
+	.appreciationServe-from .li:last-child {
+		border-bottom: none;
+	}
     .appreciationServe-from .li .title {
         font-size: 26rpx;
         color: #333333;
diff --git a/pages/dataQuery/client.vue b/pages/dataQuery/client.vue
index 2fdd1f7..a1bcd2d 100644
--- a/pages/dataQuery/client.vue
+++ b/pages/dataQuery/client.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<statusNav returnColor="#c2c2c2" navBarTitle="客户(查询结果列表)"></statusNav>
 		<container-subgroup-two>
-			<view class="client-content" slot="content" style="margin: 0 -30rpx;">
+			<view class="client-content" slot="content" style="margin: -20rpx -30rpx 0;">
 				<view @tap="goDetail(index)" class="li" v-for="(item,index) in dataList" :key="index">
 					<view class="li-content">
 						<view class="">
@@ -121,7 +121,7 @@
 	}
 
 	.client-content .li .label-content .label {
-		padding: 10rpx 21rpx;
+		padding: 10rpx 30rpx;
 		background-color: #EDEDED;
 		margin-right: 12rpx;
 		color: #999999;
diff --git a/pages/dataQuery/dataQuery.vue b/pages/dataQuery/dataQuery.vue
index 0b98ac4..e65e2ca 100644
--- a/pages/dataQuery/dataQuery.vue
+++ b/pages/dataQuery/dataQuery.vue
@@ -5,18 +5,18 @@
         <container-subgroup-two >
         <view class="dataQuery-content"  slot="content" style="margin: 0 -30rpx;">
             <view class="li">
-                <view class="title">
-                    项目名称：湖南工业大学生化学院三楼会议室
+                <view class="title mar-y120 clips1">
+                    项目名称：湖南工业大学生化学院三楼会议室湖南工业大学生化学院三楼会议室
                 </view>
                 <view class="text-content">
                     <view class="left">
-                        <view class="text">
+                        <view class="text clips1">
                             核心品牌：海康威视
                         </view>
-                        <view class="text">
+                        <view class="text clips1">
                             规格型号：DS-CK18FI-H
                         </view>
-                        <view class="text">
+                        <view class="text clips1">
                             批 次 号：2210122
                         </view>
                     </view>
diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue
index d6d6e38..2c2283f 100644
--- a/pages/dataQuery/details.vue
+++ b/pages/dataQuery/details.vue
@@ -25,7 +25,7 @@
                 </view>
             
                 <view class="text-content">
-                    <view class="li">
+                    <view class="li clips1">
                         客户名称：<text class="cor">长沙警校</text>
                     </view>
                     <view class="li">
@@ -44,7 +44,7 @@
                         入库时间：<text class="cor">2022.3.1</text>
                     </view>
                     <view class="li">
-                        项目数量：<text class="cor1">50</text>
+                        项目数量：<text class="cor1 bold">50</text>
                     </view>
                     <view class="li">
                         所属区域：<text class="cor">长沙</text>
@@ -94,12 +94,12 @@
                 <view class="title-content">
                     <view class="title">
                         <image class="icon" src="../../static/iocn/xmlb.png" mode=""></image>
-                        <view class="text">
+                        <view class="text" style="font-size: 28rpx;">
                             项目列表
                         </view>
                     </view>
                     <picker mode="date" :value="time" @change="bindTimeChange">
-                        <view class="date">
+                        <view class="date scal09">
                             选择年份 <image class="icon" src="../../static/iocn/sjx.png" mode=""></image>
                         </view>
                     </picker>
@@ -302,8 +302,8 @@
     }
 
     .project-list .title-content .date {
-        width: 120rpx;
         height: 40rpx;
+		padding: 2rpx 10rpx;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -316,7 +316,7 @@
 
     .project-list .title-content .date .icon {
         width: 12rpx;
-        height: 18rpx;
+        height: 12rpx;
         margin-left: 5rpx;
     }
 
diff --git a/pages/dataQuery/projectQuery.vue b/pages/dataQuery/projectQuery.vue
index e9dd29d..20a4cce 100644
--- a/pages/dataQuery/projectQuery.vue
+++ b/pages/dataQuery/projectQuery.vue
@@ -5,7 +5,7 @@
           <view slot="content" style="margin: 0 -30rpx;">
         <view class="project-list">
             <view class="li" @click="projectDetailsFun()" v-for="(item,index) in projectQuery">
-                <view class="message">
+                <view class="message pad-s10">
                     <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
                     <view class="text">
                         <view class="title">{{item.name}}</view>
@@ -224,14 +224,14 @@
     }
 
     .project-list .li {
-        width: 710rpx;
+        width: 100%;
         box-sizing: border-box;
         background-color: #FFFFFF;
         position: relative;
 
         margin: auto;
         margin-bottom: 20rpx;
-        padding: 33rpx 23rpx;
+        padding: 40rpx;
     }
 
     .project-list .li .icon {
@@ -244,7 +244,7 @@
         line-height: 40rpx;
         text-align: center;
         background-size: 100% 100%;
-        top: -10rpx;
+        top: 0rpx;
 
 
     }
@@ -261,13 +261,13 @@
     }
     .project-list .li .message {
         display: flex;
-
+		
     }
 
     .project-list .li .message .img {
         width: 230rpx;
-        margin-right: 11rpx;
-        height: 180rpx;
+        margin-right: 16rpx;
+        height: 190rpx;
 
     }
 
diff --git a/pages/mountingsList/mountingsList.vue b/pages/mountingsList/mountingsList.vue
index 539972a..6410f8e 100644
--- a/pages/mountingsList/mountingsList.vue
+++ b/pages/mountingsList/mountingsList.vue
@@ -2,30 +2,31 @@
     <view class="content">
         <statusNav returnColor="#c2c2c2" navBarTitle="配件列表"></statusNav>
         <container-subgroup-two>
-          <view slot="content" style="margin:0rpx -25rpx 0rpx" :style="{paddingTop:statusBarHeight-40 + 'px'}">
+          <view slot="content" style="margin: -26rpx -25rpx 0rpx" :style="{paddingTop:statusBarHeight + 'px'}">
 				<view class="mountingsList-input"  :style="{top:statusBarHeight + 'px'}">
-					<input type="text" class="int" value="" placeholder="请输入关键字" />
+					<input type="text" class="int fon24" value="" placeholder="请输入关键字" />
 					<image class="search" src="../../static/iocn/ss.png" mode=""></image>
 					<view class="xian"></view>
 				</view>
 				<view class="mountings-list">
-					<view class="li" v-for="(item,index) in dataList.data">
-						<view class="textCon">
+					<view class="li radius10" v-for="(item,index) in dataList.data" :key="index">
+						<view class="textCon" style="padding: 0rpx 16rpx;">
 							<view class="imgCon">
-								<image :src="item.images" class="img" mode="aspectFill"></image>
+								<image :src="item.images" class="img radius10" mode="aspectFill"></image>
+								<!-- <image src="/static/del/img001.png" class="img radius10" mode="aspectFill"></image> -->
 							</view>
-							<view class="text">
-								<view class="title">
-									<view class="">{{item.name}}</view>
-									<view class="ispitchOn" @click="ispitchOnFun(item)">
+							<view class="text" style="104rpx">
+								<view class="title disjbac posir">
+									<view class="clips1 mar-y40 bold fon24">{{item.name}}</view>
+									<view class="ispitchOn" @click="ispitchOnFun(item)" style="position: absolute;right: 0;">
 										<image v-if="item.isJob" src="../../static/iocn/pxz.png" class="icon1" mode=""></image>
 										<view v-else class="icon"></view>
 									</view>
 								</view>
-								<view class="brand p">配件品牌：{{item.brand}}</view>
-								<view class="model p">规格型号{{item.model}}</view>
+								<view class="brand p scal09" style="margin-left: -20rpx;">配件品牌：{{item.brand}}</view>
+								<view class="model p scal09" style="margin-left: -20rpx;">规格型号：{{item.model}}</view>
 								<view class="num p">
-									<view class="">已用数量：{{item.remark}}张</view>
+									<view class="scal09" style="margin-left: -8rpx;">已用数量：{{item.remark || 0}}张</view>
 									<view class="numBtn">
 										<view class="subtract" @click="addDelEv(item,0)">-</view>
 										<view class="sum">{{item.num}}</view>
@@ -34,11 +35,11 @@
 								</view>
 							</view>
 						</view>
-						<view class="bottom">
-							<view class="p">*请注意规格型号的选择，不同型号不同价格。</view>
-							<view class="sum">费用合计：¥{{item.sum}}</view>
+						<view class="bottom line-h40">
+							<view class="p scal09 width100" style="margin-left: -20rpx;">*请注意规格型号的选择，不同型号不同价格。</view>
+							<view class="sum fon24 bold flexs">费用合计：¥{{item.sum}}</view>
 						</view>
-					</view>
+					</view> 
 				</view>
 				<button class="submit-button" @tap="submitEv" type="default">确认提交</button>
             </view>
@@ -208,7 +209,6 @@
     .mountings-list .li {
         width: 680rpx;
         margin: auto;
-
         margin-top: 20rpx;
         background-color: #FFFFFF;
         padding: 30rpx 20rpx 0rpx;
@@ -221,13 +221,15 @@
 
     .mountings-list .li .imgCon {
         width: 217rpx;
-        height: 137rpx;
+        height: 140rpx;
         background-color: #CCCCCC;
         border-radius: 5rpx;
         display: flex;
         align-items: center;
         justify-content: center;
         margin-right: 18rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
     }
 
     .mountings-list .li .text {
@@ -241,13 +243,6 @@
         z-index: 1;
     }
 
-    .mountings-list .li .title {
-        font-weight: bold;
-        font-size: 24rpx;
-        display: flex;
-        justify-content: space-between;
-    }
-
     .mountings-list .li .title .ispitchOn .icon {
         width: 26rpx;
         height: 26rpx;
@@ -274,7 +269,7 @@
     }
 
     .mountings-list .li .text {
-        padding-bottom: 22rpx;
+        padding-bottom: 20rpx;
     }
 
     .numBtn {
@@ -316,11 +311,6 @@
         justify-content: space-between;
         font-size: 24rpx;
     }
-
-    .mountings-list .li .bottom .p {
-        width: 60%;
-    }
-
     .mountings-list .li .bottom .sum {
         color: #ff0000;
     }
diff --git a/pages/workOrder/payReturnVisit.vue b/pages/workOrder/payReturnVisit.vue
index 932fe06..33b0d8f 100644
--- a/pages/workOrder/payReturnVisit.vue
+++ b/pages/workOrder/payReturnVisit.vue
@@ -13,13 +13,13 @@
                                <text>系</text>
                                <text>人</text>
                            </view>
-                           <input class="input" placeholder="请填写联系人称呼" type="text" value="" />
+                           <input class="input" placeholder="请填写联系人称呼" type="text" placeholder-class="placeClass" />
                        </view>
                        <view class="payReturnVisit-input">
                            <view class="title">
                                联系电话
                            </view>
-                           <input class="input" placeholder="请输入手机号码" type="text" value="" />
+                           <input class="input" placeholder="请输入手机号码" type="text" placeholder-class="placeClass" />
                        </view>
                        <view class="payReturnVisit-input">
                            <view class="title">
@@ -27,26 +27,26 @@
                                <text>信</text>
                                <text>号</text>
                            </view>
-                           <input class="input" placeholder="请输入微信号码" type="text" value="" />
+                           <input class="input" placeholder="请输入微信号码" type="text" placeholder-class="placeClass" />
                        </view>
                    
                        <view class="payReturnVisit-textarea">
                            <view class="title">
                                回访内容
                            </view>
-                           <textarea class="textarea" value="" placeholder="请输入回访内容" />
+                           <textarea class="textarea" placeholder="请输入回访内容" placeholder-class="placeClass" />
                        </view>
                        <view class="payReturnVisit-input">
                            <view class="title">
                                客服电话
                            </view>
-                           <input class="input" placeholder="400-765-9876" type="text" value="" />
+                           <input class="input" placeholder="400-765-9876" type="text" placeholder-class="placeClass" />
                        </view>
                        <view class="payReturnVisit-input">
                            <view class="title">
                                回访时间
                            </view>
-                           <input class="input" placeholder="2022/02/13 14:18:00" type="text" value="" />
+                           <input class="input" placeholder="2022/02/13 14:18:00" type="text" placeholder-class="placeClass" />
                        </view>
                    </view>
                    <button class="submit-button" type="default">确认发送</button>
@@ -78,7 +78,7 @@ containerSubgroupTwo,
 
 <style>
 
-
+	.placeClass{color:#cccccc;}
     .hint {
         color: #358ff0;
         font-size: 24rpx;