From 11102f5178c7675001e337676ed6bb1041655cfb Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 14 Dec 2020 17:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9B=E5=88=97=E8=A1=A8=E5=AD=97=E5=8F=B7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detailContent/detailContent.wxss          |  2 +-
 subpages/heart/pages/clockIn/clockIn.wxml     |  6 ++++-
 subpages/heart/pages/clockIn/clockIn.wxss     | 22 +++++++++++++++++++
 utils/config.js                               |  4 ++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
index a5d89fd..867176a 100644
--- a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
+++ b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss
@@ -75,7 +75,7 @@
 
 .detail-content .issue-content {
   color: #333;
-  font-size: 38rpx;
+  font-size: 34rpx;
   line-height: 50rpx;
   margin: 25rpx 0 30rpx;
 }
diff --git a/subpages/heart/pages/clockIn/clockIn.wxml b/subpages/heart/pages/clockIn/clockIn.wxml
index 19a89e0..989f8a9 100644
--- a/subpages/heart/pages/clockIn/clockIn.wxml
+++ b/subpages/heart/pages/clockIn/clockIn.wxml
@@ -41,5 +41,9 @@
     <view class="clear"></view>
   </view>
 
-  <view class="button" bindtap="submission" style="{{submissionDisabled?'background:grey;':''}}" disabled="{{submissionDisabled}}">提交打卡</view>
+  <!-- <view class="button" bindtap="submission" style="{{submissionDisabled?'background:grey;':''}}" disabled="{{submissionDisabled}}">提交打卡</view> -->
+  <view class="submit" bindtap="submission">
+      <image class="submit-bk" src="../../images/submit-bk.png" />
+      <view class="submit-text">提交打卡</view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/subpages/heart/pages/clockIn/clockIn.wxss b/subpages/heart/pages/clockIn/clockIn.wxss
index 54708e3..79c1379 100644
--- a/subpages/heart/pages/clockIn/clockIn.wxss
+++ b/subpages/heart/pages/clockIn/clockIn.wxss
@@ -167,3 +167,25 @@ button::after{
   border: none !important;
 }
 
+.submit {
+  width: 592rpx;
+  height: 116rpx;
+  position: relative;    
+  margin: 78rpx auto;
+}
+.submit .submit-bk {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: -1;
+}
+.submit .submit-text {
+  font-size: 34rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+}
+
diff --git a/utils/config.js b/utils/config.js
index 7f4183f..2a84d51 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,8 +6,8 @@ module.exports = {
 };
 
 function BASEURL() {
-  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
-  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
   // return 'http://10.211.55.2:9094/epdc-api/api/'
 }