diff --git a/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj b/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj
index 538b5c1..40e9b73 100644
--- a/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj
+++ b/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj
@@ -2358,9 +2358,9 @@
 		044896132DBC8492006C7493 /* view */ = {
 			isa = PBXGroup;
 			children = (
+				044896162DBC8492006C7493 /* LoginPhoneYiJianView.h */,
 				044896142DBC8492006C7493 /* LoginPhoneYiJianView.m */,
 				044896152DBC8492006C7493 /* LoginView.h */,
-				044896162DBC8492006C7493 /* LoginPhoneYiJianView.h */,
 				044896172DBC8492006C7493 /* LoginView.m */,
 			);
 			path = view;
@@ -2477,28 +2477,28 @@
 		044896FD2DBC8499006C7493 /* Category */ = {
 			isa = PBXGroup;
 			children = (
-				044896FE2DBC8499006C7493 /* UILable */,
-				044897042DBC8499006C7493 /* UIImage+Bytes.m */,
-				044897052DBC8499006C7493 /* UIApplication+Visible.h */,
-				044897062DBC8499006C7493 /* RadianView */,
-				044897092DBC8499006C7493 /* UIView+Additions.m */,
-				0448970A2DBC8499006C7493 /* UIButtonTouchArea */,
-				0448970D2DBC8499006C7493 /* NSString+extend.h */,
 				044897112DBC8499006C7493 /* 颜色转化 */,
+				0448979A2DBC849A006C7493 /* AES */,
 				044897142DBC8499006C7493 /* CamaImageTools */,
-				044897172DBC8499006C7493 /* Languages */,
-				0448971A2DBC8499006C7493 /* UIApplication+Visible.m */,
 				0448971B2DBC8499006C7493 /* FSTextView */,
-				0448971E2DBC8499006C7493 /* VideoUrlImageView */,
-				044897232DBC8499006C7493 /* UIImage+Bytes.h */,
+				044897172DBC8499006C7493 /* Languages */,
+				044897912DBC849A006C7493 /* NavGationView */,
+				0448970D2DBC8499006C7493 /* NSString+extend.h */,
+				0448978F2DBC849A006C7493 /* NSString+extend.m */,
+				044897062DBC8499006C7493 /* RadianView */,
 				044897242DBC8499006C7493 /* RSAEncrypt */,
 				044897872DBC849A006C7493 /* TagView */,
+				044897052DBC8499006C7493 /* UIApplication+Visible.h */,
+				0448971A2DBC8499006C7493 /* UIApplication+Visible.m */,
 				0448978C2DBC849A006C7493 /* UIButtonImage */,
-				0448978F2DBC849A006C7493 /* NSString+extend.m */,
-				044897902DBC849A006C7493 /* UIView+Additions.h */,
-				044897912DBC849A006C7493 /* NavGationView */,
+				0448970A2DBC8499006C7493 /* UIButtonTouchArea */,
+				044897232DBC8499006C7493 /* UIImage+Bytes.h */,
+				044897042DBC8499006C7493 /* UIImage+Bytes.m */,
+				044896FE2DBC8499006C7493 /* UILable */,
 				044897952DBC849A006C7493 /* UITextField */,
-				0448979A2DBC849A006C7493 /* AES */,
+				044897902DBC849A006C7493 /* UIView+Additions.h */,
+				044897092DBC8499006C7493 /* UIView+Additions.m */,
+				0448971E2DBC8499006C7493 /* VideoUrlImageView */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -2743,10 +2743,10 @@
 		044897952DBC849A006C7493 /* UITextField */ = {
 			isa = PBXGroup;
 			children = (
-				044897962DBC849A006C7493 /* UITextFieldYS.h */,
 				044897972DBC849A006C7493 /* UITextField+SY.h */,
-				044897982DBC849A006C7493 /* UITextFieldYS.m */,
 				044897992DBC849A006C7493 /* UITextField+SY.m */,
+				044897962DBC849A006C7493 /* UITextFieldYS.h */,
+				044897982DBC849A006C7493 /* UITextFieldYS.m */,
 			);
 			path = UITextField;
 			sourceTree = "<group>";
@@ -2754,9 +2754,9 @@
 		0448979A2DBC849A006C7493 /* AES */ = {
 			isa = PBXGroup;
 			children = (
-				0448979B2DBC849A006C7493 /* MIUAES.m */,
 				0448979C2DBC849A006C7493 /* GTM */,
 				044897A02DBC849A006C7493 /* MIUAES.h */,
+				0448979B2DBC849A006C7493 /* MIUAES.m */,
 				044897A12DBC849A006C7493 /* otherAES */,
 			);
 			path = AES;
@@ -2765,9 +2765,9 @@
 		0448979C2DBC849A006C7493 /* GTM */ = {
 			isa = PBXGroup;
 			children = (
+				0448979F2DBC849A006C7493 /* GTMBases64.h */,
 				0448979D2DBC849A006C7493 /* GTMBases64.m */,
 				0448979E2DBC849A006C7493 /* GTMDefines.h */,
-				0448979F2DBC849A006C7493 /* GTMBases64.h */,
 			);
 			path = GTM;
 			sourceTree = "<group>";
@@ -2823,16 +2823,16 @@
 		044897B82DBC849A006C7493 /* baseImageUrl */ = {
 			isa = PBXGroup;
 			children = (
-				044897B92DBC849A006C7493 /* BaseRequestDataController.h */,
-				044897BA2DBC849A006C7493 /* IndexGetNewsModel.m */,
-				044897BB2DBC849A006C7493 /* PutImageModel.m */,
-				044897BC2DBC849A006C7493 /* SmsloginCodeModel.h */,
+				044897C02DBC849A006C7493 /* AreaprovinceListModel.h */,
 				044897BD2DBC849A006C7493 /* AreaprovinceListModel.m */,
+				044897B92DBC849A006C7493 /* BaseRequestDataController.h */,
 				044897BE2DBC849A006C7493 /* BaseRequestDataController.m */,
 				044897BF2DBC849A006C7493 /* IndexGetNewsModel.h */,
-				044897C02DBC849A006C7493 /* AreaprovinceListModel.h */,
-				044897C12DBC849A006C7493 /* SmsloginCodeModel.m */,
+				044897BA2DBC849A006C7493 /* IndexGetNewsModel.m */,
 				044897C22DBC849A006C7493 /* PutImageModel.h */,
+				044897BB2DBC849A006C7493 /* PutImageModel.m */,
+				044897BC2DBC849A006C7493 /* SmsloginCodeModel.h */,
+				044897C12DBC849A006C7493 /* SmsloginCodeModel.m */,
 			);
 			path = baseImageUrl;
 			sourceTree = "<group>";
@@ -2849,12 +2849,12 @@
 		044897C62DBC849A006C7493 /* UserInfo */ = {
 			isa = PBXGroup;
 			children = (
-				044897C72DBC849A006C7493 /* BaseModel.m */,
-				044897C82DBC849A006C7493 /* UserDetailModel.m */,
-				044897C92DBC849A006C7493 /* baseInfoModel.m */,
-				044897CA2DBC849A006C7493 /* UserDetailModel.h */,
-				044897CB2DBC849A006C7493 /* BaseModel.h */,
 				044897CC2DBC849A006C7493 /* baseInfoModel.h */,
+				044897C92DBC849A006C7493 /* baseInfoModel.m */,
+				044897CB2DBC849A006C7493 /* BaseModel.h */,
+				044897C72DBC849A006C7493 /* BaseModel.m */,
+				044897CA2DBC849A006C7493 /* UserDetailModel.h */,
+				044897C82DBC849A006C7493 /* UserDetailModel.m */,
 			);
 			path = UserInfo;
 			sourceTree = "<group>";
@@ -2871,23 +2871,23 @@
 		044897D02DBC849A006C7493 /* ZJScrollPageView */ = {
 			isa = PBXGroup;
 			children = (
-				044897D12DBC849A006C7493 /* ZJContentView.h */,
-				044897D22DBC849A006C7493 /* UIView+ZJFrame.m */,
-				044897D32DBC849A006C7493 /* ZJCollectionView.h */,
-				044897D42DBC849A006C7493 /* ZJScrollSegmentView.h */,
-				044897D52DBC849A006C7493 /* ZJScrollPageViewDelegate.h */,
-				044897D62DBC849A006C7493 /* ZJSegmentStyle.h */,
-				044897D72DBC849A006C7493 /* ZJTitleView.m */,
-				044897D82DBC849A006C7493 /* UIViewController+ZJScrollPageController.m */,
-				044897D92DBC849A006C7493 /* ZJScrollPageView.h */,
 				044897DA2DBC849A006C7493 /* UIView+ZJFrame.h */,
-				044897DB2DBC849A006C7493 /* ZJContentView.m */,
-				044897DC2DBC849A006C7493 /* ZJCollectionView.m */,
-				044897DD2DBC849A006C7493 /* ZJSegmentStyle.m */,
-				044897DE2DBC849A006C7493 /* ZJScrollSegmentView.m */,
-				044897DF2DBC849A006C7493 /* ZJScrollPageView.m */,
+				044897D22DBC849A006C7493 /* UIView+ZJFrame.m */,
 				044897E02DBC849A006C7493 /* UIViewController+ZJScrollPageController.h */,
+				044897D82DBC849A006C7493 /* UIViewController+ZJScrollPageController.m */,
+				044897D32DBC849A006C7493 /* ZJCollectionView.h */,
+				044897DC2DBC849A006C7493 /* ZJCollectionView.m */,
+				044897D12DBC849A006C7493 /* ZJContentView.h */,
+				044897DB2DBC849A006C7493 /* ZJContentView.m */,
+				044897D92DBC849A006C7493 /* ZJScrollPageView.h */,
+				044897DF2DBC849A006C7493 /* ZJScrollPageView.m */,
+				044897D52DBC849A006C7493 /* ZJScrollPageViewDelegate.h */,
+				044897D42DBC849A006C7493 /* ZJScrollSegmentView.h */,
+				044897DE2DBC849A006C7493 /* ZJScrollSegmentView.m */,
+				044897D62DBC849A006C7493 /* ZJSegmentStyle.h */,
+				044897DD2DBC849A006C7493 /* ZJSegmentStyle.m */,
 				044897E12DBC849A006C7493 /* ZJTitleView.h */,
+				044897D72DBC849A006C7493 /* ZJTitleView.m */,
 			);
 			path = ZJScrollPageView;
 			sourceTree = "<group>";
@@ -2966,11 +2966,11 @@
 		0448980C2DBC849B006C7493 /* HUD */ = {
 			isa = PBXGroup;
 			children = (
-				0448980D2DBC849B006C7493 /* HXLoadingHUD.m */,
-				0448980E2DBC849B006C7493 /* images */,
+				044898232DBC849B006C7493 /* HXHud.h */,
 				044898212DBC849B006C7493 /* HXHud.m */,
 				044898222DBC849B006C7493 /* HXLoadingHUD.h */,
-				044898232DBC849B006C7493 /* HXHud.h */,
+				0448980D2DBC849B006C7493 /* HXLoadingHUD.m */,
+				0448980E2DBC849B006C7493 /* images */,
 			);
 			path = HUD;
 			sourceTree = "<group>";
diff --git a/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate
index 5695457..a0570d8 100644
Binary files a/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m
index 4ec8d59..4119513 100644
--- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m
+++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m
@@ -160,6 +160,7 @@
     {
         imagedata = UIImagePNGRepresentation(image);
     }
+    [HXLoadingHUD showWithStatus:@"" maskType:0];
     
     [[KCSPUploadImageManager shareManager] netWorkUrlUserPost:[NSString stringWithFormat:@"%@api/user/upload",BaseFileUrl] UploadImage:imagedata type:0 dicQuery:dicQuery Callback:^(BOOL state, id  _Nullable responseObject, NSString * _Nullable describle) {
         BOOL stateBack = NO;
diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/我的/view/WoDeView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/我的/view/WoDeView.m
index d8420a3..6d2c8f5 100644
--- a/KuaiCunShiPin/KuaiCunShiPin/Main/我的/view/WoDeView.m
+++ b/KuaiCunShiPin/KuaiCunShiPin/Main/我的/view/WoDeView.m
@@ -317,14 +317,14 @@
     [self.arrdata addObject:@"账号绑定"];
     [self.arrdata addObject:@"发布素材"];
     [self.arrdata addObject:@"兑换钻石"];
-//    if(DEBUG)
-//    {
-//        [self.arrdata addObject:@"分享APP"];
-//        if([UserDetailModel zhiFuState])
-//        {
-//            [self.arrdata addObject:@"联系客服"];
-//        }
-//    }
+    if(DEBUG)
+    {
+        [self.arrdata addObject:@"分享APP"];
+        if([UserDetailModel zhiFuState])
+        {
+            [self.arrdata addObject:@"联系客服"];
+        }
+    }
     [self.arrdata addObject:@"系统设置"];
     [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.offset(60*self.arrdata.count);
diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/视频处理/印记/ShiPingEditShuiYinView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/视频处理/印记/ShiPingEditShuiYinView.m
index d662577..9dd13af 100644
--- a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/视频处理/印记/ShiPingEditShuiYinView.m
+++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/视频处理/印记/ShiPingEditShuiYinView.m
@@ -273,6 +273,17 @@
         
         [self kuangBianJie:NO];
         
+        UIView *viewtemp = [pan.view.superview viewWithTag:10];
+        if([viewtemp isKindOfClass:[UITextField class]])
+        {
+            UITextField *fieldtemp = (UITextField *)viewtemp;
+            float ftmep = self.viewboy.height*15/50;
+            if(ftmep<15)ftmep=15;
+            if(ftmep>50)ftmep = 50;
+            fieldtemp.font = [UIFont systemFontOfSize:ftmep];//50
+        }
+        
+        
         [pan setTranslation:CGPointZero inView:self.viewedit];
     }else if(pan.state == UIGestureRecognizerStateEnded){
         self.transLast = self.viewboy.frame.origin;