diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index fe2721e..c601843 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/Contents.json new file mode 100644 index 0000000..37a0d03 --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 1.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 1.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 1.png new file mode 100644 index 0000000..1b54894 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 1.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 2.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 2.png new file mode 100644 index 0000000..1b54894 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg 2.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg.png new file mode 100644 index 0000000..1b54894 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_default.imageset/img_v3_029s_310c0e5f-3baa-463d-9065-59daf68a2dcg.png differ diff --git a/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift b/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift index ea177df..c5110ca 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift @@ -259,8 +259,18 @@ class MenuVC: BaseController,UITableViewDelegate,UITableViewDataSource { case 1://第二组 switch indexPath.row { case 0://Privacy Policy,执行隐私政策 + let vc:CCWebController = CCWebController() + vc.titleValue = NSLocalizedString("隐私政策", comment: "") + let sizeUrl = NSLocalizedString("siteUrl", comment: "隐私政策url") + vc.urlString = sizeUrl + self.navigationController?.pushViewController(vc, animated: true) break - default://Terms of Service, 执行服务条例 + default://Terms of Service, 用户协议 + let vc:CCWebController = CCWebController() + vc.titleValue = NSLocalizedString("用户协议", comment: "") + let sizeUrl = NSLocalizedString("userSiteUrl", comment: "用户协议url") + vc.urlString = sizeUrl + self.navigationController?.pushViewController(vc, animated: true) break } default://跳转组 diff --git a/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVCCell.swift b/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVCCell.swift index f261fba..7c3b941 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVCCell.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVCCell.swift @@ -58,7 +58,7 @@ class MenuVCCell: UITableViewCell { }else { //是url let url = data["image"] as! URL - iconImageView.kf.setImage(with: url, placeholder: UIImage(named: "menuvc_terms")) + iconImageView.kf.setImage(with: url, placeholder: UIImage(named: "menuvc_default")) } // //获取图片 // iconImageView.image = data["image"] as? UIImage