Kaynağa Gözat

样式调整

dev01 1 yıl önce
ebeveyn
işleme
86ec7b8195

+ 0 - 1
src/pages/detail/index.jsx

@@ -16,7 +16,6 @@ import HistoricalClock from '../../components/historicalClock';
 import { resourceAddress } from "../../utils/config";
 import Un from "../../image/un.png";
 import Ok from "../../image/ok.png";
-import "../mybusiness/index";
 import './index.less'
 
 class Detail extends Component {

+ 150 - 2
src/pages/detail/index.less

@@ -1,3 +1,143 @@
+.indexPage {
+  position: relative;
+  z-index: 1;
+  background: #F5F5F5;
+  min-height: calc(100vh - 52px);
+
+  .list {
+    padding: 20px 23px 52px 23px;
+
+    .item {
+      border-radius: 6px;
+      padding: 31px;
+      background: #FFFFFF;
+      display: flex;
+      flex-flow: row nowrap;
+      margin-bottom: 17px;
+      position: relative;
+      overflow: hidden;
+
+      .revoke {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, .7);
+        z-index: 999;
+        display: flex;
+        flex-flow: row nowrap;
+        align-items: center;
+        justify-content: center;
+
+        .revokeImg {
+          width: 250px;
+          height: 250px;
+        }
+      }
+
+      .infor {
+        width: 100%;
+        position: relative;
+
+        .title {
+          display: flex;
+          flex-flow: row nowrap;
+          justify-content: space-between;
+          align-items: center;
+          padding-bottom: 20px;
+
+          .aname {
+            flex: 1;
+            padding-right: 20px;
+            font-weight: bolder;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .aIcon {
+              background: #1E90FF;
+              color: white;
+              padding: 5px 8px;
+              border-radius: 4px;
+              margin-left: 10px;
+              font-size: 25px;
+            }
+          }
+
+          .createTimes {
+            font-size: 20px;
+            color: #999999;
+            white-space: nowrap;
+          }
+        }
+
+        .userName {
+          font-size: 25px;
+          // color: #999999;
+          padding-bottom: 15px;
+        }
+
+        .releaseStarts {
+          font-size: 25px;
+          color: #999999;
+          padding-bottom: 15px;
+          display: flex;
+          flex-flow: row nowrap;
+          align-items: center;
+          justify-content: space-between;
+          position: relative;
+
+          .punchClock {
+            position: absolute;
+            border-bottom-left-radius: 100px;
+            border-top-left-radius: 100px;
+            padding: 20px 20px;
+            background: #f1662f;
+            color: white;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            right: -31px;
+          }
+        }
+
+        .releaseEnds {
+          font-size: 25px;
+          color: #999999;
+          display: flex;
+          flex-flow: row nowrap;
+          align-items: center;
+          justify-content: space-between;
+          padding-bottom: 25px;
+        }
+
+        .coOder {
+          font-size: 25px;
+          color: #6eb173;
+          padding-bottom: 25px;
+        }
+
+        .bottomContent {
+          display: flex;
+          flex-flow: row nowrap;
+          justify-content: space-between;
+          align-items: center;
+
+          .status {
+            font-size: 28px;
+          }
+
+          .clockIn {
+            font-size: 28px;
+          }
+        }
+      }
+    }
+  }
+
+}
+
 .at-image-picker__remove-btn {
   display: none;
 }
@@ -21,9 +161,17 @@
   height: 197px;
 }
 
+.operation{
+  display: flex;
+  flex-flow: row nowrap;
+  margin: 30px 0;
+
+}
+
 textarea {
   width: 94%;
-  background: #D7D7D7;
+  // background: #D7D7D7;
+  background-color: #F5F5F5;
   padding: 20px;
   border-radius: 20px;
-}
+}

+ 4 - 4
src/pages/mybusiness/myList.jsx

@@ -46,7 +46,7 @@ class MyList extends Component {
                 </View>
                 <View className="userName">
                   <View className="uNtext">
-                    研发人员:{v.name}
+                    打卡人员:{v.name}
                   </View>
                 </View>
                 <View className="userName">
@@ -58,7 +58,7 @@ class MyList extends Component {
                   v.processStatus == 1 &&
                   (
                     type == 0 ?
-                      <View style={{ textAlign: "right", color: "blue" }}>已打卡,待审核</View> :
+                      <View style={{ textAlign: "right", color: "blue", fontSize: 12 }}>已打卡,待审核</View> :
                       <View className="releaseStarts">
                         <View className="punchClock">
                           去审核
@@ -66,8 +66,8 @@ class MyList extends Component {
                       </View>
                   )
                 }
-                {v.processStatus == 2 && <View style={{ textAlign: "right", color: "green" }}>{type == 0 ? "已打卡,已审核" : "已审核"}</View>}
-                {v.processStatus == 3 && <View style={{ textAlign: "right", color: "red" }}>{type == 0 ? "已打卡,已驳回" : "已驳回"}</View>}
+                {v.processStatus == 2 && <View style={{ textAlign: "right", color: "green", fontSize: 12 }}>{type == 0 ? "已打卡,已审核" : "已审核"}</View>}
+                {v.processStatus == 3 && <View style={{ textAlign: "right", color: "red", fontSize: 12 }}>{type == 0 ? "已打卡,已驳回" : "已驳回"}</View>}
               </View>
             </View>
           ))}

+ 69 - 1
src/pages/projectDetail/index.less

@@ -1,3 +1,70 @@
+.indexPage {
+  position: relative;
+  z-index: 1;
+  background: #F5F5F5;
+  min-height: calc(100vh - 52px);
+
+  .list {
+    padding: 20px 23px 52px 23px;
+
+    .item {
+      border-radius: 6px;
+      padding: 31px;
+      background: #FFFFFF;
+      display: flex;
+      flex-flow: row nowrap;
+      margin-bottom: 17px;
+      position: relative;
+      overflow: hidden;
+
+      .infor {
+        width: 100%;
+        position: relative;
+
+        .title {
+          display: flex;
+          flex-flow: row nowrap;
+          justify-content: space-between;
+          align-items: center;
+          padding-bottom: 20px;
+
+          .aname {
+            flex: 1;
+            padding-right: 20px;
+            font-weight: bolder;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .aIcon {
+              background: #1E90FF;
+              color: white;
+              padding: 5px 8px;
+              border-radius: 4px;
+              margin-left: 10px;
+              font-size: 25px;
+            }
+          }
+
+          .createTimes {
+            font-size: 20px;
+            color: #999999;
+            white-space: nowrap;
+          }
+        }
+
+        .userName {
+          font-size: 25px;
+          // color: #999999;
+          padding-bottom: 15px;
+        }
+        
+      }
+    }
+  }
+
+}
+
 .at-image-picker__remove-btn {
   display: none;
 }
@@ -22,7 +89,8 @@
 }
 
 textarea {
-  background: #D7D7D7;
+  // background: #D7D7D7;
+  background-color: #F5F5F5;
   padding: 20px;
   border-radius: 20px;
 }

+ 9 - 1
src/pages/punchClock/index.less

@@ -414,7 +414,7 @@
 .picker {
   padding: 10px 20px;
   border-radius: 100px;
-  background: #D7D7D7;
+  background: #F5F5F5;
 
 }
 
@@ -440,4 +440,12 @@
     font-size: 24px;
   }
 
+}
+
+textarea {
+  width: 430px;
+  // background: #D7D7D7;
+  background-color: #F5F5F5;
+  padding: 20px;
+  border-radius: 20px;
 }

+ 16 - 4
src/pages/punchClock/punchClocks.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import { Input, Textarea, View, Text, Picker, Button, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro';
 import {
-  AtButton, AtModal, AtModalContent, AtModalAction
+  AtButton, AtModal, AtModalContent, AtModalAction, AtTextarea
 } from "taro-ui";
 import dayjs from 'dayjs';
 import Skeleton from 'taro-skeleton'
@@ -235,7 +235,7 @@ class PunchClocks extends Component {
                   <View className='items'>
                     <View className='ititle'><Text style={{ color: "red", width: "7px" }}>*</Text>研发工时:
                       <Input value={this.state.duration} type='digit' className='input' placeholder='请输入'
-                        style={{ textAlign: "center", background: "#D7D7D7", borderRadius: "15px", padding: "3px 5px" }}
+                        style={{ textAlign: "center", background: "#F5F5F5", borderRadius: "15px", padding: "3px 5px" }}
                         // border: "1px solid #d6e4ef",
                         onInput={e => {
                           this.setState({
@@ -264,17 +264,29 @@ class PunchClocks extends Component {
 
                   <View className='items'>
                     <View className='ititles'><Text style={{ width: "7px" }}></Text>研发记录:
-                      <Textarea
+                      <AtTextarea
                         value={this.state.remark}
+                        onChange={value => {
+                          this.setState({
+                            remark: value,
+                          });
+                        }}
+                        maxLength={500}
                         placeholder="请填写研发过程记录"
+                      />
+                      {/* 
+                      <Textarea
+                        value={this.state.remark}
+                        placeholder="请填写研发过程记录不能超过500字"
                         style='background:#D7D7D7;width:66%;min-height:70px;padding:10px;border-radius: 10px'
                         autoHeight
+                        maxlength={500}
                         onInput={e => {
                           this.setState({
                             remark: e.detail.value
                           })
                         }}
-                      />
+                      /> */}
                     </View>
                   </View>
                   <View className='items'>

+ 14 - 3
src/pages/reclockin/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { Input, Textarea, View, Text, Picker, Button } from '@tarojs/components'
+import { AtTextarea } from "taro-ui";
 import Taro, { getCurrentInstance } from '@tarojs/taro';
 import dayjs from 'dayjs';
 import Skeleton from 'taro-skeleton'
@@ -189,7 +190,7 @@ class ReClockin extends Component {
               <View className='items'>
                 <View className='ititle'><Text style={{ color: "red", width: "7px" }}>*</Text>研发工时:
                   <Input value={this.state.duration} type='digit' className='input' placeholder='请输入'
-                    style={{ textAlign: "center", background: "#D7D7D7", borderRadius: "15px", padding: "3px 5px" }}
+                    style={{ textAlign: "center", background: "#F5F5F5", borderRadius: "15px", padding: "3px 5px" }}
                     onInput={e => {
                       this.setState({
                         duration: e.detail.value
@@ -217,7 +218,17 @@ class ReClockin extends Component {
 
               <View className='items'>
                 <View className='ititles'><Text style={{ width: "7px" }}></Text>研发记录:
-                  <Textarea
+                  <AtTextarea
+                    value={this.state.content}
+                    onChange={value => {
+                      this.setState({
+                        content: value,
+                      });
+                    }}
+                    maxLength={500}
+                    placeholder="请填写研发过程记录"
+                  />
+                  {/* <Textarea
                     value={this.state.content}
                     style='background:#D7D7D7;width:66%;min-height:70px;border:1px solid #d6e4ef;padding:10px;border-radius: 10px' autoHeight
                     onInput={e => {
@@ -225,7 +236,7 @@ class ReClockin extends Component {
                         content: e.detail.value
                       })
                     }}
-                  />
+                  /> */}
                 </View>
               </View>
               <View className='items'>

+ 10 - 1
src/pages/reclockin/index.less

@@ -410,6 +410,15 @@
 .picker {
   padding: 10px 20px;
   border-radius: 100px;
-  background: #D7D7D7;
+  // background: #D7D7D7;
+  background-color: #F5F5F5;
 
 }
+
+textarea {
+  width: 430px;
+  // background: #D7D7D7;
+  background-color: #F5F5F5;
+  padding: 20px;
+  border-radius: 20px;
+}

+ 1 - 2
src/utils/config.js

@@ -2,6 +2,5 @@
 // export const resourceAddress = '172.16.1.187/dev-api'
 // 生产
 export const resourceAddress = 'https://yanfa.jishutao.com/prod-api';
-// 测试
-// export const resourceAddress = 'https://static.jishutao.com/upload';
+