xjc 4 年之前
父節點
當前提交
ea1a829038
共有 3 個文件被更改,包括 8 次插入7 次删除
  1. 3 2
      pages/eventDetail/eventDetail.wxml
  2. 1 1
      pages/learning/learning.js
  3. 4 4
      project.config.json

+ 3 - 2
pages/eventDetail/eventDetail.wxml

@@ -52,8 +52,9 @@
     </view>
 </view>
                               
-<button  wx:if='{{info.is_signup && !info.is_user_signuped}}' bindtap="open" class="post">我要报名</button>
-<button  wx:if='{{info.is_signup && info.is_user_signuped}}' disabled="true" class="post">已报名</button>
+<button  wx:if='{{info.is_signup && !info.is_user_signuped && !info.is_over}}' bindtap="open" class="post">我要报名</button>
+<button  wx:if='{{info.is_signup && info.is_user_signuped && !info.is_over}}' disabled="true" class="post">已报名</button>
+<button  wx:if='{{info.is_over}}' disabled="true" class="post">已结束</button>
 
 
 <view class="bg" wx:if='{{show}}'>

+ 1 - 1
pages/learning/learning.js

@@ -16,7 +16,7 @@ Page({
     pre:[],
     keyword:'',
     array: ['时间正序', '时间倒序'],
-    val: ['ctime', '-ctime'],
+    val: ['-ctime', 'ctime'],
     index: 0,
     show_tj:0,
     page_0:1,

+ 4 - 4
project.config.json

@@ -6,14 +6,17 @@
 	"setting": {
 		"urlCheck": true,
 		"es6": true,
+		"enhance": false,
 		"postcss": true,
 		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
+		"nodeModules": false,
 		"autoAudits": false,
 		"showShadowRootInWxmlPanel": true,
 		"scopeDataCheck": false,
+		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
@@ -22,17 +25,14 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
+		"bundle": false,
 		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false,
-		"enhance": false,
-		"nodeModules": false,
-		"uglifyFileName": false,
 		"compileHotReLoad": false,
 		"useMultiFrameRuntime": true,
 		"useApiHook": true,
 		"useApiHostProcess": true,
 		"enableEngineNative": false,
-		"bundle": false,
 		"useIsolateContext": true,
 		"userConfirmedBundleSwitch": false,
 		"packNpmManually": false,