Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages.json

config.js

@@ -6,7 +6,8 @@ if(process.env.NODE_ENV === 'development'){
 }else{
     // 生产环境
     //APP_SERVER_URL = 'http://cloud.jeeplus.org/api'
-    APP_SERVER_URL = 'http://192.168.2.131/api'
+    //APP_SERVER_URL = 'http://192.168.2.131/api'
+    APP_SERVER_URL = 'http://cpaoa.xgccpm.com/api'
 }
 
 APP_SERVER_URL = APP_SERVER_URL

pages.json

@@ -233,7 +233,9 @@
 		},
 		{
 			"path" : "pages/test/luckyDraw/LuckyDrawMemberList",
-			"style" : {}
+			"style" : {
+				"navigationBarTitleText": "IT兴趣小组招募成员"
+				}
 		},
 		{
 			"path" : "pages/generateForm/GenerateForm",

pages/materialManagement/collect/CollectForm.vue

@@ -80,7 +80,7 @@
                     <u-form-item label="文件上传">
                         <el-upload
                                 class="upload-demo"
-                                :action="`http://we4k7g.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                                :action="`http://localhost:2800/api/public-modules-server/oss/file/webUpload/upload`"
                                 :on-remove="(file, fileList) => handleRemove(file, fileList, index_experience,'detail')"
                                 :file-list="inputForm.detailInfos[index_experience].fileInfoLost"
                                 :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,index_experience,'detail')"
@@ -108,7 +108,7 @@
             <u-form-item label="附件">
                 <el-upload
                         class="upload-demo"
-                        :action="`http://5hrd5v.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://localhost:2800/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList, '','')"
                         :file-list="inputForm.files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'','')"
@@ -200,7 +200,7 @@
                     <u-form-item label="文件上传">
                         <el-upload
                                 class="upload-demo"
-                                :action="`http://we4k7g.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                                :action="`http://localhost:2800/api/public-modules-server/oss/file/webUpload/upload`"
                                 :on-remove="(file, fileList) => handleRemove(file, fileList, index_experience,'detail')"
                                 :file-list="inputForm.detailInfos[index_experience].fileInfoLost"
                                 :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,index_experience,'detail')"
@@ -229,7 +229,7 @@
                 <el-upload
                         style="width: 20%;"
                         class="upload-demo"
-                        :action="`http://we4k7g.natappfree.cc/api/public-modules-server/oss/file/webUpload/upload`"
+                        :action="`http://localhost:2800/api/public-modules-server/oss/file/webUpload/upload`"
                         :on-remove="(file, fileList) => handleRemove(file, fileList, '','')"
                         :file-list="inputForm.files"
                         :on-success="(response, file, fileList) => handleUploadSuccess(response, file, fileList,'','')"

pages/test/luckyDraw/LuckyDrawEvents.vue

@@ -16,7 +16,7 @@
 					<view class="text-cut"> {{item.name}} </view>
 				</view>
 				<view class="content">
-					<image src="/static/lucky_draw_events.jpg"
+					<image src="/static/first.jpg"
 					 mode="aspectFill"></image>
 					<view class="desc">
 						<view class="text-content"> {{item.detail}} </view>

pages/test/luckyDraw/LuckyDrawEventsDetail.vue

@@ -1,28 +1,32 @@
 <template>
 	<view>
-		<view class="">
+		<view style="height: 5px;">
 			<cu-custom :isBack="false" :backUrl="'/pages/test/luckyDraw/LuckyDrawEvents'" bgColor="bg-gradual-blue">
 <!--				<block slot="backText">返回</block>-->
 				<block slot="content">活动详情</block>
 			</cu-custom>
 		</view>
-		<view class="cu-card article">
+		<view class="cu-card article" >
 			<view class="cu-item shadow">
 				<!-- 活动名称 -->
 				<view class="title">
 					<view class="text-center"> {{dataDetail.name}} </view>
 				</view>
 				<!-- 活动详情 -->
-				<view class="content">
+				<!-- <view class="content">
 					<view class="desc">
 						<view class="text-content-luckyDraw"> {{dataDetail.detail}} </view>
 					</view>
-				</view>
+				</view> -->
 				<!-- 图片 -->
 				<view class="content" style="margin-top: 15px;">
-					<image style="width: 100%;" src="/static/lucky_draw_events.jpg" mode="widthFix"></image>
+					<image style="width: 100%;" src="/static/first.png" mode="widthFix"></image>
 				</view>
 				
+				<!-- <view class="content" style="margin-top: 15px;">
+					<image style="width: 100%;" src="/static/second.jpg" mode="widthFix"></image>
+				</view> -->
+				
 				<view class=" padding-lr" :key="'00'" :id="'00'">
 					<view class="cu-bar solid-bottom bg-white">
 						<view class="action">

pages/test/luckyDraw/LuckyDrawEvents_pc.vue

@@ -2,7 +2,7 @@
 	<view>
 		<cu-custom :backUrl="'/pages/apps/apps'" :isBack="true" bgColor="bg-gradual-blue" >
 			<block slot="backText">返回</block>
-			<block slot="content">活动抽奖</block>
+			<block slot="content">IT小组招募</block>
 			<block slot="right" >
 				<view  @click="back()">
 					刷新
@@ -16,7 +16,7 @@
 					<view class="text-cut"> {{item.name}} </view>
 				</view>
 				<view class="content">
-					<image src="/static/lucky_draw_events.jpg"
+					<image src="/static/first.jpg"
 					 mode="aspectFill"></image>
 					<view class="desc">
 						<view class="text-content"> {{item.detail}} </view>