合并冲突

tjty-app/.gitignore

@@ -3,4 +3,4 @@
 /unpackage/dist
 /manifest.json
 /.idea
-/utils
+/utils/request.js

tjty-app/manifest.json

-{
-    "name" : "tjty-app",
-    "appid" : "__UNI__D609992",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "appid" : "wx4bcb80db7383fdcb",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "测试小程序-gerry"
-            }
-        }
-    },
-    "vueVersion" : "2"
-}

tjty-app/pages_activity/activity/activity.vue

@@ -18,11 +18,11 @@
 					</view>
 					<view style="margin-top: -70rpx;">
 						<view class="activity_font"> <text
-								style="padding-top: -50rpx;">报名截止:&nbsp;&nbsp;{{!item.signupTime ? '—' : item.signupTime}}</text>
+								style="padding-top: -1rpx;">报名截止:&nbsp;&nbsp;{{!item.signupTime ? '—' : item.signupTime}}</text>
 						</view>
 						<view class="activity_font">
 							<text>组织机构:&nbsp;&nbsp;{{item.mechanismName |ellipsisInstitutions}}</text></view>
-						<view class="activity_font" style="margin-bottom:10rpx;"> <text>已报名:&nbsp;&nbsp;<text
+						<view class="activity_font" style="padding-bottom:10rpx;"> <text>已报名:&nbsp;&nbsp;<text
 									style="color: #FCA624; margin-left: 12rpx;">
 									<text v-if="item.type ==='1'">{{item.signupNum}}</text>
 									<text v-if="item.type ==='2'">{{item.signupExamNum}}</text>
@@ -229,7 +229,7 @@
 				.image-status {
 					// justify-content: end;
 					position: absolute;
-					padding-left: 86%;
+					padding-left: 86.1%;
           // right: 0.01rpx;
 					top: 0rpx;
 					width: 98rpx;
@@ -247,7 +247,7 @@
           font-size: 25rpx;
 					padding-left: 3%;
 					text-align: left;
-					line-height: 60rpx;
+					line-height: 40rpx;
 					font-family: Source Han Sans CN, Source Han Sans CN-Regular;
 				}
 
@@ -259,7 +259,7 @@
 					height: 77rpx;
 					opacity: 0.6;
 					background: #000000;
-					top: -80rpx;
+					top: -77rpx;
 					z-index: 9;
 					font-size: 18px;
 					font-weight: 500;

tjty-app/pages_activity/activity_detail/activity_detail.vue

@@ -313,19 +313,20 @@
 
         .image {
           position: absolute;
-          border-top-left-radius: 15rpx;
-          border-top-right-radius: 15rpx;
+          border-top-left-radius: 30rpx;
+          border-top-right-radius: 30rpx;
           height: 380rpx;
           width: 100%;
         }
 
         .image-status {
-          position: absolute;
-					padding-left: 87%;
-					top: -5rpx;
-					width: 105rpx;
-					height: 105rpx;
-					z-index: 99;
+      position: absolute;
+      padding-left: 86.5%;
+      // right: 0.01rpx;
+      top: 0rpx;
+      width: 98rpx;
+      height: 98rpx;
+      z-index: 99;
         }
       }
 
@@ -341,7 +342,7 @@
           height: 77rpx;
           opacity: 0.6;
           background: #000000;
-          top: -82rpx;
+          top: -87rpx;
           z-index: 9;
           font-size: 18px;
           font-weight: 500;