Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

* 'master' of http://120.77.182.185/yanl/mini-shimao:
  2020-08-24

pages/activity-detail/activity-detail.wxml

@@ -27,13 +27,13 @@
                 <text>活动时间</text>
                 <text>活动时间</text>
                 <text>{{info.date}}</text>
                 <text>{{info.date}}</text>
             </view>
             </view>
-            <view class="row align-c">
+            <view style="height:auto;" class="row">
                 <text>活动地址</text>
                 <text>活动地址</text>
-                <text>{{info.address}}</text>
+                <text style="height:auto;">{{info.address}}</text>
             </view>
             </view>
             <view class="row align-c">
             <view class="row align-c">
                 <text>报名名额</text>
                 <text>报名名额</text>
-                <text>{{info.quota}}</text>
+                <text>{{info.quota}}人</text>
             </view>
             </view>
         </view>
         </view>
         <view class="detail-describe">
         <view class="detail-describe">

pages/home/home.wxss

@@ -253,13 +253,15 @@
 }
 }
 
 
 .strategy-content .operation {
 .strategy-content .operation {
-    height: 320rpx;
+    /* height: 320rpx; */
     margin: 0 40rpx;
     margin: 0 40rpx;
-    padding-top: 230rpx;
+    /* padding-top: 230rpx; */
+    position: absolute;
+    bottom: 10rpx;
 }
 }
 
 
 .strategy-content .operation text {
 .strategy-content .operation text {
-    height: 40rpx;
+    /* height: 40rpx; */
     font-size: 38rpx;
     font-size: 38rpx;
     font-weight: 800;
     font-weight: 800;
     color: #ffffff;
     color: #ffffff;

pages/mine/mine.js

@@ -199,9 +199,9 @@ Page({
                 let state = res.data.state*1 // 0 待审核 1 审核通过 2 不通过
                 let state = res.data.state*1 // 0 待审核 1 审核通过 2 不通过
                 let stateTest = '去认证'
                 let stateTest = '去认证'
                 switch (state) {
                 switch (state) {
-                    case 0: stateTest = '待审核'; break;
+                    case 0: stateTest = '审核中'; break;
                     case 1: stateTest = '审核通过 '; break;
                     case 1: stateTest = '审核通过 '; break;
-                    case 2: stateTest = '不通过'; break;
+                    case 2: stateTest = '审核失败'; break;
                   }
                   }
                 that.setData({
                 that.setData({
                     type: state == 1 ? 1 : 0,
                     type: state == 1 ? 1 : 0,

pages/mine/mine.wxml

@@ -48,6 +48,8 @@
             <text>享受业主尊贵特权，预定消费专属优惠</text>
             <text>享受业主尊贵特权，预定消费专属优惠</text>
         </view>
         </view>
         <view class="status-operation row con-c align-c" bindtap="goApprove">
         <view class="status-operation row con-c align-c" bindtap="goApprove">
+            <image wx:if="{{stateTest == '审核失败'}}" src="/image/fail-icon.png"></image>
+            <image wx:if="{{stateTest == '审核中'}}" src="/image/sh-icon.png"></image>
             <text>{{stateTest}}</text>
             <text>{{stateTest}}</text>
         </view>
         </view>
     </view>
     </view>

pages/mine/mine.wxss

@@ -33,27 +33,31 @@
     width: 654rpx;
     width: 654rpx;
     height: 130rpx;
     height: 130rpx;
     padding: 24rpx 32rpx 24rpx 40rpx;
     padding: 24rpx 32rpx 24rpx 40rpx;
-    border-radius: 2px;
-    background: linear-gradient(#FBE9D0, #EBD3B2); 
+    border-radius: 4px;
+    background: linear-gradient(180deg,rgba(63,67,87,1) 0%,rgba(37,37,50,1) 100%); 
 }
 }
 
 
 .status-symbol text:nth-child(1) {
 .status-symbol text:nth-child(1) {
     font-size: 30rpx;
     font-size: 30rpx;
     font-weight: bolder;
     font-weight: bolder;
-    color: #342512;
+    color:rgba(255,227,195,1);
 }
 }
 
 
 .status-symbol text:nth-child(2) {
 .status-symbol text:nth-child(2) {
     margin-top: 10rpx;
     margin-top: 10rpx;
     font-size: 22rpx;
     font-size: 22rpx;
-    color: #483522;
+    font-weight:300;
+    color: #F1DBBD;
 }
 }
 
 
 .status-operation {
 .status-operation {
-    width: 110rpx;
+    width: 176rpx;
     height: 52rpx;
     height: 52rpx;
-    border-radius: 2rpx;
-    border: 1px solid rgba(72, 53, 34, 1) !important;
+    border-radius: 4px;
+    /* border: 1px solid rgba(72, 53, 34, 1) !important; */
+    background:linear-gradient(180deg,rgba(255,243,227,1) 0%,rgba(255,227,195,1) 100%);
+    color: #282836;
+    font-size: 26rpx;
 }
 }
 
 
 .status-operation text {
 .status-operation text {
@@ -61,7 +65,11 @@
     font-weight: bolder;
     font-weight: bolder;
     color: #483522;
     color: #483522;
 }
 }
-
+.status-operation image{
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 8rpx;
+}
 .menu {
 .menu {
     width: 750rpx;
     width: 750rpx;
     margin-top: 38rpx;
     margin-top: 38rpx;