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

pages/activity-entry/activity-entry.wxml

@@ -59,7 +59,7 @@
             <view class="input-label row align-c">
                 <text space="ensp">报名时间</text>
             </view>
-            <view class="input-wrap row con-b align-c">
+            <view class="input-wrap row con-b align-c" style="padding: 0 0 0 24rpx">
                 <!-- <picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate">
                     <view class="picker">{{formInto.date}}</view>
                 </picker> -->
@@ -94,7 +94,7 @@
             <view class="input-label row align-c">
                 <text space="ensp">报名人数</text>
             </view>
-            <view class="input-wrap row con-b align-c">
+            <view class="input-wrap row con-b align-c" style="padding: 0">
                 <l-button special="{{true}}" bind:lintap="onQuantityCut">
                     <image class="input-icon" src="../../image/cut.png"></image>
                 </l-button>

pages/activity-entry/activity-entry.wxss

@@ -126,8 +126,9 @@
 }
 
 .input-icon {
-    width: 32rpx;
-    height: 32rpx;
+    width: 80rpx;
+    height: 80rpx;
+    padding: 22rpx;
 }
 
 .input-picker {

pages/activity/activity.js

@@ -107,10 +107,11 @@ Page({
                     tmpArr.push(tmpItem)
                 })
 
-                // 活动开始时间倒序排序
-                tmpArr.sort(function(a,b) {
-                    return  new Date(b.beginDate.replace(/月/g,"\/").replace(/日/g,"\/")) - new Date(a.beginDate.replace(/月/g,"\/").replace(/日/g,"\/"))
-                })
+                // var year = new Date().getFullYear()
+                // // 活动开始时间倒序排序
+                // tmpArr.sort(function(a,b) {
+                //     return  new Date(year + "/" + b.beginDate.replace(/月/g,"\/").replace(/日/g,"\/")) - new Date(year + "/" + a.beginDate.replace(/月/g,"\/").replace(/日/g,"\/"))
+                // })
 
                 if (type == 1) {
                     that.setData({

pages/appointment/appointment.wxml

@@ -65,7 +65,7 @@
                 </l-button>
                 <text class="text" style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text>
                 <l-button special="{{true}}" bind:lintap="onQuantityAdd">
-                    <image class="input-icon" src="{{errorQuantity ? '../../image/add-g.png' : '../../image/add.png'}}"></image>
+                    <image class="input-icon" src='../../image/add.png'></image>
                 </l-button>
             </view>
         </view>

pages/play/play.js

@@ -252,9 +252,9 @@ Page({
                 })
 
                 // 活动开始时间倒序排序
-                tmpArr.sort(function(a,b) {
-                    return  new Date(b.beginDate.replace(/月/g,"\/").replace(/日/g,"\/")) - new Date(a.beginDate.replace(/月/g,"\/").replace(/日/g,"\/"))
-                })
+                // tmpArr.sort(function(a,b) {
+                //     return  new Date(b.beginDate.replace(/月/g,"\/").replace(/日/g,"\/")) - new Date(a.beginDate.replace(/月/g,"\/").replace(/日/g,"\/"))
+                // })
 
                 if (type == 1) {
                     that.setData({