diff --git a/Podfile.lock b/Podfile.lock
index d6dcb018866622fb2b25c690007365f232fff6c4..1c69739d26c27e2dd09b83ea295a889d21088e0a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -33,11 +33,11 @@ PODS:
     - FMDB/common
   - IQKeyboardManager (3.2.4)
   - MBProgressHUD (0.9.1)
-  - MJRefresh (2.2.0)
+  - MJRefresh (2.2.1)
   - Reveal-iOS-SDK (1.5.1)
-  - SDWebImage (3.7.2):
-    - SDWebImage/Core (= 3.7.2)
-  - SDWebImage/Core (3.7.2)
+  - SDWebImage (3.7.3):
+    - SDWebImage/Core (= 3.7.3)
+  - SDWebImage/Core (3.7.3)
   - SSKeychain (1.2.3)
 
 DEPENDENCIES:
@@ -59,9 +59,9 @@ SPEC CHECKSUMS:
   FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
   IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
   MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
-  MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
+  MJRefresh: c3fa0387e8e97a11a9666639d2f815607edd1c2f
   Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9
-  SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
+  SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0
diff --git a/XFFruit.xcodeproj/project.pbxproj b/XFFruit.xcodeproj/project.pbxproj
index cabf1ba114933111cbcd34a4404f3b5f71a81146..1e7990091a801b16d5984377c70e2c114d353b96 100644
--- a/XFFruit.xcodeproj/project.pbxproj
+++ b/XFFruit.xcodeproj/project.pbxproj
@@ -146,7 +146,7 @@
 		72873CEB1BA27BA6007B3387 /* GXFPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CEA1BA27BA6007B3387 /* GXFPopView.m */; };
 		72873CEE1BA280DD007B3387 /* GXFPopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72873CED1BA280DD007B3387 /* GXFPopCell.m */; };
 		72882D8B1BA9121E00935BA6 /* ChooseProductUnitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72882D8A1BA9121E00935BA6 /* ChooseProductUnitViewController.m */; };
-		729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; settings = {ASSET_TAGS = (); }; };
+		729A2E931BE60C0200493603 /* GeometryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 729A2E921BE60C0200493603 /* GeometryView.m */; };
 		72A8132D1BCA8BBA003631F3 /* ChooseTransportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A8132C1BCA8BBA003631F3 /* ChooseTransportViewController.m */; };
 		72A813FA1BCD3205003631F3 /* ReceiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813F71BCD3205003631F3 /* ReceiveViewController.m */; };
 		72A813FD1BCD33BE003631F3 /* ReceiveBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A813FC1BCD33BE003631F3 /* ReceiveBoltView.m */; };
@@ -2563,6 +2563,7 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
+				DD0C5CA575D0001C5572EB89 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2702,6 +2703,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		DD0C5CA575D0001C5572EB89 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -3258,8 +3274,8 @@
 			baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3271,7 +3287,7 @@
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3281,8 +3297,8 @@
 			baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Fanfan Cui (7S27LB84E2)";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
@@ -3294,7 +3310,7 @@
 					"$(PROJECT_DIR)/XFFruit/Vendors/JiGuang/lib",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;
diff --git a/XFFruit/zh-Hans.lproj/Localizable.strings b/XFFruit/zh-Hans.lproj/Localizable.strings
index d7c5487d9670370d6e6e1120de440fe8501fc23c..648b953f321f2080df3e7f70228e3dee4a6c18a6 100644
--- a/XFFruit/zh-Hans.lproj/Localizable.strings
+++ b/XFFruit/zh-Hans.lproj/Localizable.strings
@@ -36,12 +36,25 @@
 "PatrolPlan"                            = "巡店计划";
 "MyStore"                               = "我的店铺";
 
-
 //Business
 "Business"                              = "业务";
+"Announcement"                          = "公告";
+"AddSurvey"                              = "新建行情调研";
+"Survey"                                 = "查看行情调研";
+"Survey1"                                 = "填写行情反馈";
+"Survey2"                                 = "新建采购通知";
+"Survey3"                                 = "查看采购通知单";
+"Survey4"                                 = "新建采购单";
+"Survey5"                                 = "查看采购单";
+"Survey6"                                 = "审核采购单";
+"Survey7"                                 = "新建发运单";
+"Survey8"                                 = "查看发运单";
+"Survey9"                                 = "新建加工单";
+"EditorShopDetail"                        ="编辑商品明细";
+"AddShopDetail"                           ="添加商品明细";
 
-// Store
-"Store"                                 = "门店";
+// Report
+"Report"                                 = "报表";
 "Navigate"                              = "导航";
 "SignUp"                                = "进店签到";
 "LeaveStore"                            = "离店登记";
@@ -50,17 +63,17 @@
 "Choose a Store"                        = "选择门店";
 "Store Detail"                          = "门店详情";
 
-// Sync
-"Sync"                                  = "同步";
+// Message
+"Message"                                  = "企信";
 "Task Progressing"                      = "任务处理";
 "Patrol Result"                         = "巡店结果";
-"SignIn Record"                         = "任务处理";
+"SignIn Record"                         = "签到记录";
 "Count:"                                = "数量:";
 "numbers"                               = "条";
 "To Upload Data"                        = "待上传数据";
 
-// System
-"System"                                = "系统";
+// Me
+"Me"                                = "我的";
 "Company"                               = "公司";
 "User"                                  = "用户";
 "Code"                                  = "代码";
@@ -86,6 +99,7 @@
 "Post by Me"                            = "我发起";
 "Task Code"                             = "任务编号";
 "Task Type"                             = "类型";
+"Task Charger"                          = "处理人";
 "Task Content"                          = "内容";
 "Task Title"                            = "任务标题";
 "Task Deadline"                         = "要求完成时间";
@@ -177,11 +191,10 @@
 "Announcement Detail"                    = "公告详情";
 
 //行情调研
-"Survey"                                 = "行情调研";
+
 "AddSurvey"                              = "新建行情调研";
 "AddPurchase"                            = "新建采购单";
 "Purchase"                               = "采购单";
-
 //Business
 "Business"                              = "业务";
 "Announcement"                          = "公告";
@@ -199,16 +212,5 @@
 "EditorShopDetail"                        ="编辑商品明细";
 "AddShopDetail"                           ="添加商品明细";
 
-
-
-
-
-
-
-//Avatar
-//选择界面 的title
-"ProductTitle"                                 = "商品选择";
-"VendorTitle"                              = "供应商";
-"WarehouseTitle"                            = "加工工厂";
 "ProductUnitTitle"                            = "商品单位";
-
+"ProductUnitTitle"                            = "商品单位";
\ No newline at end of file