Merge branch 'shipanpan' into 'master'

申请页面

See merge request !30

pages/sign/applyResult/applyResult.js

@@ -4,6 +4,7 @@ Page({
 	 * 页面的初始数据
 	 */
 	data: {
+		success : true,
 		type: '1',
 		curImage: 'https://wdty.xueyoubangedu.com/wandou/pic_02.png'
 	},

pages/sign/applyResult/applyResult.json

 {
   "usingComponents": {},
-  "navigationBarTitleText": "申请成功"
+  "navigationBarTitleText": "豌豆教练"
 }
\ No newline at end of file

pages/sign/applyResult/applyResult.wxml

-<view class="box">
+<!-- <view class="box">
 	<view class="icon">
 		<image src="/images/pic_01.png"></image>
 	</view>
@@ -11,4 +11,17 @@
 		<view class="save" catchtap="prevImage">长按保存相册</view>
 		<view class="wx">微信号: bu15333212792<text class="copy" bindtap="copy">复制</text></view>
 	</view>
+</view> -->
+<view>
+	<view class="one" wx:if="{{ success }}">
+		<image src="/images/loading.png"></image>
+		<view>您的申请正在审核中</view>
+	</view>
+	<view class="two" wx:else>
+		<image src="/images/fail.png"></image>
+		<view class="fail">抱歉，您的申请未通过</view>
+		<view class="button">
+			<view class="apply" bindtap="save">重新申请</view>
+		</view>
+	</view>
 </view>
\ No newline at end of file

pages/sign/applyResult/applyResult.wxss

@@ -56,3 +56,52 @@
   margin-left: 18rpx;
   text-decoration: underline;
 }
+
+.one{
+  width: 300rpx;
+  height: 380rpx;
+  margin: 236rpx auto;
+  text-align: center;
+}
+.one image{
+  width: 300rpx;
+  height: 300rpx;
+}
+.one view{
+  color: #1A1A1A;
+  font-size: 28rpx;
+  text-align: center;
+}
+
+.two{
+  width: 500rpx;
+  height: 500rpx;
+  margin: 263rpx auto;
+  text-align: center;
+}
+.two image{
+  width: 300rpx;
+  height: 300rpx;
+}
+.two .fail{
+  color: #1A1A1A;
+  font-size: 28rpx;
+  text-align: center;
+}
+.two .button{
+  width: 500rpx;
+  height: 80rpx;
+  background: #FFFFFF;
+  margin-top: 89rpx;
+}
+.two .button .apply{
+  width: 500rpx;
+  height: 80rpx;
+  border:none;
+  background: linear-gradient(-70deg, #FFC600 0%, #FFD400 100%);
+  border-radius: 40rpx;
+  color: #000000;
+  font-size: 30rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
\ No newline at end of file

project.config.json

@@ -48,6 +48,14 @@
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},
 	"condition": {
+		"search": {
+			"current": -1,
+			"list": []
+		},
+		"conversation": {
+			"current": -1,
+			"list": []
+		},
 		"plugin": {
 			"list": []
 		},
@@ -158,26 +166,9 @@
 					"scene": null
 				},
 				{
-					"name": "财务",
-					"pathName": "pages/tabbar/financial/financial",
-					"query": "",
-					"scene": null
-				},
-				{
-					"name": "课程管理详情页面",
-					"pathName": "pages/index/classManagement/classManagement",
-					"query": "",
-					"scene": null
-				},
-				{
-					"name": "申请成为教练",
-					"pathName": "pages/sign/apply/apply",
-					"query": "",
-					"scene": null
-				},
-				{
-					"name": "课程瞬间上传",
-					"pathName": "pages/index/courseInstant/courseInstant",
+					"id": -1,
+					"name": "pages/sign/applyResult/applyResult",
+					"pathName": "pages/sign/applyResult/applyResult",
 					"scene": null
 				}
 			]