syyang 2 年之前
父節點
當前提交
7802c060f8
共有 6 個文件被更改,包括 66 次插入46 次删除
  1. 11 3
      iconfont.wxss
  2. 5 1
      pages/qianming/qianming.json
  3. 7 6
      pages/qianming/qianming.wxml
  4. 29 31
      pages/qianming/qianming.wxss
  5. 4 4
      pages/xqzggzs2/xqzggzs2.wxml
  6. 10 1
      pages/xqzggzs2/xqzggzs2.wxss

+ 11 - 3
iconfont.wxss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3264694 */
-  src: url('//at.alicdn.com/t/c/font_3264694_pam8ysf0ae.woff2?t=1669362403098') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3264694_pam8ysf0ae.woff?t=1669362403098') format('woff'),
-       url('//at.alicdn.com/t/c/font_3264694_pam8ysf0ae.ttf?t=1669362403098') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3264694_vvd9ofl6l5.woff2?t=1669682527309') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3264694_vvd9ofl6l5.woff?t=1669682527309') format('woff'),
+       url('//at.alicdn.com/t/c/font_3264694_vvd9ofl6l5.ttf?t=1669682527309') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wodetijiao:before {
+  content: "\e6d3";
+}
+
+.icon-qingkongbeifen:before {
+  content: "\e6dc";
+}
+
 .icon-31shanchu:before {
   content: "\e604";
 }

+ 5 - 1
pages/qianming/qianming.json

@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "签名",
+  "pageOrientation": "auto" 
 }

+ 7 - 6
pages/qianming/qianming.wxml

@@ -1,18 +1,19 @@
 <!-- 手写界面 -->
 <view class='hand_writing_container'>
   <view class="tips_title">请在区域内进行签名</view>
-  <view id="canvas" class="canvas">
-    <canvas class='firstCanvas' canvas-id="firstCanvas" bindtouchmove='move' bindtouchstart='start' bindtouchend='end' disable-scroll='true'>
-    </canvas>
-  </view>
   <view class="btn_container">
     <view class="btn clean" bindtap="clearClick">
-      <image src="/image/clear.png"></image>
+      <i class="iconfont icon-qingkongbeifen"></i>
       <text>内容清除</text>
     </view>
     <view class="btn submit" bindtap="saveClick">
-      <image src="/image/submit.png"></image>
+      <i class="iconfont icon-wodetijiao"></i>
       <text>确认提交</text>
     </view>
   </view>
+  <view id="canvas" class="canvas">
+    <canvas class='firstCanvas' canvas-id="firstCanvas" bindtouchmove='move' bindtouchstart='start' bindtouchend='end' disable-scroll='true'>
+    </canvas>
+  </view>
+
 </view>

+ 29 - 31
pages/qianming/qianming.wxss

@@ -1,17 +1,17 @@
 .hand_writing_container {
   width: 100%;
-  padding: 5.503vh 8.1761vh 0;
+  padding: 35rpx 80rpx;
   box-sizing: border-box;
 }
 
 .tips_title {
-  height: 4.72vh;
-  line-height: 4.72vh;
-  margin-bottom: 3.459vh;
-  font-size: 4.71698vh;
-  font-family: Source Han Sans CN;
+  height: 90rpx;
+  line-height: 90rpx;
+  margin-bottom: 20rpx;
+  font-size: 40rpx;
   font-weight: 500;
-  color: rgba(45, 45, 45, 1);
+  color: #181818;
+  text-align: center;
 }
 
 .canvas {
@@ -19,7 +19,7 @@
   height: 66.194968vh;
   margin-bottom: 3.7735849vh;
   box-sizing: border-box;
-  border: 1rpx dashed black;
+  border: 1rpx dashed #555;
 }
 
 .firstCanvas {
@@ -30,39 +30,37 @@
 
 .btn_container {
   display: flex;
+  flex-direction: row;
   align-items: center;
-  padding: 0 45.44vh;
-  box-sizing: border-box;
-  justify-content: space-between;
+  justify-content: space-around;
+  margin-bottom: 50rpx;
 }
 
 .btn {
-  width: 45.597484vh;
-  height: 13.83647798vh;
-  padding: 0 11vh;
+  width: 250rpx;
+  height: 75rpx;
+  padding: 0 20rpx;
   box-sizing: border-box;
-  border-radius: 1.572327vh;
+  border-radius: 50rpx;
+  /* justify-content:space-between; */
   display: flex;
-  justify-content: space-between;
   align-items: center;
-}
-
-.btn image {
-  flex: 0 0 4.71698vh;
-  width: 4.71698vh;
-  height: 4.71698vh;
-  display: block;
-  margin-right: 1.88679vh;
+  justify-content:center;
 }
 
 .btn text {
-  flex: 0 0 auto;
-  height: 4.717vh;
-  line-height: 4.717vh;
-  font-size: 4.71698vh;
-  font-family: Source Han Sans CN;
-  font-weight: 400;
-  color: rgba(255, 255, 255, 1);
+  line-height: 75rpx;
+  font-size: 32rpx;
+  color: #fff;
+  padding-left: 10rpx;
+}
+.btn i {
+  font-size: 40rpx;
+  color: #fff;
+}
+.btn i.icon-wodetijiao {
+  font-size: 50rpx;
+  color: #fff;
 }
 
 .clean {

+ 4 - 4
pages/xqzggzs2/xqzggzs2.wxml

@@ -4,17 +4,17 @@
   <text class="con_tit mar_top">隐患限期整改告知书</text>
   <view class="flex_row text_ind mar_top2">经查,你单位存在下列问题: </view>
  
-<view wx:for="{{pageData.riskInspections}}" wx:key="index">
+<view wx:for="{{pageData.riskInspections}}" wx:key="index" class="jcwt">
 {{index+1}}、{{item.busItemsName}}
 </view>
 
-  <view class="flex_row text_ind">现告知你单位对上述问题于 {{pageData.latTime}},前整改完毕,达到有关法律法规规章和标准规定的要求。由此造成事故的,依法追究有关人员的责任。整改期间,你单位应当采取措施,确保安全生产。</view>
+  <view class="flex_row text_ind">现告知你单位对上述问题于<b> {{pageData.latTime}}</b>,前整改完毕,达到有关法律法规规章和标准规定的要求。由此造成事故的,依法追究有关人员的责任。整改期间,你单位应当采取措施,确保安全生产。</view>
   <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的,我单位将提报相关执法部门进行依法查处。</view>
   <view class="flex_row text_ind">如果对本告知内容有异议,可向<input type="text" style="width: 150rpx;" />咨询或说明情况,也可通过12350安全生产举报电话进行反映。在没有新书面告知前,本告知要求不停止执行,法律另有规定的除外。</view>
 
 
-  <view class="flex_row mar_top">检查人员:{{pageData.nickName}}<text>编号:</text><input type="text" style="width: 190rpx;" /></view>
-  <view class="flex_row mar_top2"><text style="opacity: 0;">检查人员:</text><input type="text" style="width: 190rpx;" />编号:<input type="text" style="width: 190rpx;" /></view>
+  <view class="flex_row mar_top">检查人员:<text style="margin-right: 30rpx;">{{pageData.nickName}}</text><text style="margin-left:30rpx;">编号:</text><input type="text" style="width: 190rpx;" /></view>
+
   <view class="flex_row mar_top2" bindtap="bindQianming">被复查单位负责人(签名):<input type="text" style="width: 220rpx;" /></view>
   <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 370rpx;" />部门:{{pageData.deptName}}(印章)</view>
   <view class="flex_row mar_top2" style="text-align: right;"><input type="number" style="width: 100rpx;" />年<input type="number" style="width: 100rpx;" />月<input type="number" style="width: 100rpx;" />日</view>

+ 10 - 1
pages/xqzggzs2/xqzggzs2.wxss

@@ -23,7 +23,7 @@ input{
   margin-bottom: 20rpx;
   line-height: 70rpx;
   font-size: 34rpx;
-  color: #333;
+  color: #181818;
 }
 .flex_row input{
 display: inline-table;
@@ -49,4 +49,13 @@ textarea{
 button{
   width: 70%!important;
   margin: 50rpx auto;
+}
+.jcwt{
+  font-weight: 500;
+  font-size: 34rpx;
+  color: #181818;
+  margin-bottom: 18rpx;
+}
+.flex_row b{
+  color: #f00;
 }