Skip to content

S
saasio
Commit efae58de by yangfangfang
Options

存储数据修改

parent a49d3c49
Showing with 699 additions and 115 deletions
src/main/websrc/data/channel.json 0 → 100644
{
"companys": [
"果合",
"安沃",
"adsage",
"万普",
"畅思",
"mex",
"点入",
"土壳移动",
"mobvista",
"glispa",
"磨盘时代",
"趣米",
"力美积分墙",
"拓畅",
"筷子",
"优友",
"新游互联",
"豆盟",
"力美dsp",
"指盟",
"点乐",
"avazu",
"mdsp",
"搞趣",
"追书神器",
"adview",
"限时免费大全",
"宜搜",
"百思不得姐",
"笑得合不拢嘴",
"久邦数码",
"试客",
"yeahmobi",
"非凡dsp",
"钱咖",
"大树dsp",
"易连飞宇",
"优数",
"fyber",
"兔玩网",
"仁盈软件",
"oneway",
"18183",
"掌通",
"睿晟",
"applovin",
"新数dsp",
"盆友",
"mobcastle",
"指尖互动",
"蜂巢",
"玩吧",
"图友dsp",
"钱鹿",
"tad",
"掌阅",
"西洋镜",
"biddingx",
"7日坐标",
"x-mob",
"软猎",
"掌上互动",
"灵境",
"巨掌",
"仙果dsp",
"tapjoy",
"everyads",
"果合视频",
"syhs",
"mobupps",
"聚鹏",
"adoceans",
"掌游宝",
"astra",
"时趣互动",
"vidoads",
"海数互联",
"多点广告",
"adcolony",
"inmobi",
"麦萌漫画",
"亿玛",
"aduu",
"dmmobi",
"玩转互联",
"众橙",
"银橙",
"spotad",
"掌握",
"adpotato",
"mobcastlead",
"麒点",
"易动手盟",
"adtopping",
"rocket10",
"1图1",
"unity",
"云聚",
"ipromo",
"idvert",
"慧推",
"麦田",
"hina",
"纷熙移动",
"thinklean",
"易杨dsp",
"上榜科技",
"极光",
"快手",
"echovalue",
"taptica",
"mobhuge",
"applift",
"灼见",
"巨鲨wap",
"dotinapp",
"氪金",
"比邻弘科",
"adwan",
"miercn",
"surikate",
"gamebeats",
"云数",
"wead",
"乐樽",
"pocketmedia",
"17ads",
"appnext",
"hotmobi",
"quadas",
"一木",
"shuqi",
"vidoplus",
"象威hypers",
"joyplus",
"adpotato-af",
"聚点",
"曼拓dsp",
"点锐",
"ktplay",
"soloads",
"xbaos",
"superads",
"涌玉",
"道有道",
"mobwalker",
"boommob",
"cliiky",
"etoron",
"xy助手",
"aso100",
"倍业dsp",
"快友",
"ironsource",
"汇聚畅想",
"龙珠直播",
"游戏多",
"cauly",
"芝麻互娱",
"clicktech",
"greenkoo",
"锐艺",
"快看",
"adlight",
"pptv",
"kukukk",
"爱思助手",
"咪兔广告",
"vision",
"moboway",
"玉米dsp",
"兔兔助手",
"parbattech",
"efreemob",
"mobgi",
"mobisummer",
"gdmedia",
"龙涵",
"vlion",
"zxrtb",
"惠员助手",
"youappi",
"华院分析",
"1plusads",
"zoncheer",
"leadbolt",
"今日赚",
"adsgard1",
"mobilda",
"爱秀",
"墨迹天气",
"九苑",
"汽车之家",
"infimob",
"今日头条",
"zplayads",
"智投广告",
"madhouse",
"promoadx",
"veda",
"知乎",
"trafficred",
"adcost",
"话语科技",
"chartboost",
"广州娱玩",
"upltv",
"一点资讯",
"taptap",
"15mob",
"zhimob",
"闯奇",
"果盟",
"多盟",
"有米",
"appcoachs",
"vungle",
"璧合",
"helium",
"matomy",
"mediamob",
"centrixlink",
"斗鱼",
"creativeclicks",
"coinads",
"懂球帝",
"智龙",
"novad",
"adrich",
"拓美dsp",
"高能平台",
"新效",
"imoney",
"蝉大师",
"htad",
"奥菲传媒",
"gotzha",
"cloudmobi",
"骏伯网络",
"聚告",
"玖玖网络",
"新澜",
"核桃林",
"摩邑诚",
"信淼",
"云锐",
"厦门微众",
"轩辕",
"乐思",
"舜飞",
"齐欣互动",
"点锐",
"掌优",
"点摩",
"智云众",
"侠客行",
"厚拓",
"德绚",
"派瑞",
"猎鹰",
"微思敦",
"天擎",
"九点",
"共和盛世",
"千手网络",
"行云",
"新启成",
"旺翔",
"点摩",
"爱德康赛",
"火速",
"酷亿",
"东方现代",
"龙数",
"灵云",
"华晋",
"微传播",
"狗仔",
"游思",
"畅效",
"欢趣",
"勤诚",
"心景",
"龙域",
"真龙",
"移瑞"
],
"emails": [
"guohead",
"adwo",
"adsage",
"wapx",
"chukong",
"mobiexchanger",
"dianru",
"tukmob",
"mobvista",
"glispa",
"imopan",
"qumi",
"limei",
"chance-ad",
"kuaizi",
"youyou",
"xinyou",
"doumeng",
"limeidsp",
"zhimeng",
"dianle",
"avazu",
"gao7",
"zhuishu",
"adview",
"xianmian",
"easou",
"budejie",
"xdhblz",
"jiubang",
"shike",
"yeahmobi",
"feifan",
"qianka",
"dashu",
"yilianfy",
"youshu",
"fyber",
"tuwan",
"renying",
"oneway",
"18183",
"zhangtong",
"listen-ad",
"applovin",
"wisemedia",
"penyou",
"mobcastle",
"fingermob",
"fengchao",
"wanba",
"adtuyou",
"qianlu",
"tad",
"zhangyue",
"xiyangjing",
"biddingx",
"7ri",
"xmob",
"ruanlie",
"adzshd",
"lingjing",
"adjuz",
"3gu",
"tapjoy",
"everyads",
"guohevideo",
"syhs",
"mobupps",
"jupeng",
"adoceans",
"zhangyoubao",
"fuseclick",
"shiquhudong",
"vidoads",
"haishu",
"duodianad",
"adcolony",
"inmobi",
"maimengmanhua",
"yima",
"aduu",
"dmmobi",
"wanzhuan",
"zhongcheng",
"ycmedia",
"spotad",
"zhangwo",
"adpotato",
"mobcastlead",
"keydot",
"yidong",
"topdang",
"rocket10",
"1tu1",
"unity",
"yunju",
"ipromo",
"idvert",
"htmob",
"maitian",
"hina",
"fenxiyidong",
"thinklean",
"eyangmedia",
"shangbangkeji",
"jiguang",
"kuaishou",
"echovalue",
"taptica",
"mobhuge",
"applift",
"zhuojian",
"jusha",
"dotinapp",
"codrim",
"lbadvisor",
"adwan",
"miercn",
"surikate",
"gamebeats",
"yunshu",
"wead",
"lezun",
"pocketmedia",
"costations",
"appnext",
"hotmobi",
"quadas",
"yimu",
"shuqi",
"vidoplus",
"hypers",
"joyplus",
"adpotatoaf",
"jd61",
"mantoinfo",
"dianrui",
"ktplay",
"solo-ads",
"xbaos",
"superads",
"adyoyu",
"daoyoudao",
"mobwalker",
"boommob",
"cliiky",
"etoron",
"xyzs",
"aso100",
"bayescom",
"kuaiyou",
"ironsrc",
"hjcx",
"longzhu",
"youxiduo",
"fsn",
"zhimahuyu",
"clicktech",
"greenkoo",
"rui-yi",
"kuaikan",
"adlight",
"pptv",
"kukukk",
"i4",
"mitu",
"vision",
"moboway",
"yumidsp",
"tutuzhushou",
"parbattech",
"efreemob",
"kyle",
"mobisummer",
"gdmedia",
"longhan",
"vlion",
"zxrtb",
"huiyuanzhushou",
"youappi",
"huayuanfenxi",
"1plusads",
"zongchi",
"leadbolt",
"jinrizhuan",
"adsgard1",
"mobilda",
"aixiu",
"moji",
"jiuyuan",
"qichezhijia",
"infimob",
"toutiao",
"zplayads",
"zhitou",
"madhouse",
"promoadx",
"veda",
"zhihu",
"traffic",
"adcost",
"huayukeji",
"chartboost",
"yuwan",
"upltv",
"yidianzixun",
"taptap",
"15mob",
"zhimob",
"chuangqi",
"guomob",
"domob",
"youmi",
"appcoachs",
"vungle",
"behe",
"helium",
"matomy",
"mediamob",
"centrixlink",
"douyu",
"creativeclicks",
"coinads",
"dongqiudi",
"zhilong",
"novad",
"adrich",
"toomeead",
"gaoneng",
"xinxiao",
"imoney",
"chandashi",
"htad",
"aofeichuanmei",
"gotzha",
"cloudmobi",
"junbowangluo",
"adinall",
"jiujiuwangluo",
"xinlanad",
"hetaolinmedia",
"mobiexchanger",
"shxinmiao",
"bjyunrui",
"xm-ls",
"hsuanyuen",
"lscx",
"usingde",
"sunteng",
"qxhd",
"zhangyoukeji",
"imygbs",
"optaim",
"bccv",
"szhometop",
"deshell",
"aspiration-cn",
"lieying",
"wesdom",
"skytech",
"9ads",
"ghssad",
"5iqianshou",
"wifiwalker",
"xinqicheng",
"adunite",
"imygbs",
"adks",
"hotsales",
"coolyi",
"adseast",
"loosho",
"yunmedia",
"huajinmedia",
"weichuanbo",
"sogou-inc",
"yousiad",
"ad-cx",
"hzhuanqu",
"ihmedia",
"wish-media",
"starmobs",
"zhenlong",
"infimob",
"eduancm"
]
}
src/main/websrc/demo.html
......@@ -19,16 +19,13 @@
$.get("/api/demo",function(data) {
data = JSON.parse(data);
var account = data.content.account,token = data.content.token;
var isSuper = account.isSuperUser == true && account.isChannelPerson!=true;
$.cookie("ryioUid",account.id);
$.cookie("ryioUname",account.email);
// $.cookie("ryioUauth",account.authStr);
window.localStorage.setItem("ryioUauth",account.authStr);
$.cookie("ryioToken",token);
$.cookie("ryioPastDate",account.pastDate);
window.localStorage.setItem("io_ryioUauth",account.authStr);
window.localStorage.setItem("io_ry_user",JSON.stringify(account));
$.cookie("io_ryioToken",token);
var isSuper = account.isSuperUser == true && account.isChannelPerson!=true;
$.cookie("ryioIsSuper",isSuper);
$.cookie("io_ryioIsSuper",isSuper);
window.location.href="index.html";
});
</script>
......
src/main/websrc/js/active/product.js
......@@ -3,11 +3,13 @@
.controller("productCtrl",["$scope","HttpService","ToolService","UtilService","$state","$rootScope","$interval",productCtrl])
function productCtrl($scope,HttpService,ToolService,UtilService,$state,$rootScope,$interval){
$scope.Prostatus = UtilService.getCookie("ryioStatus");
$scope.UserId = UtilService.getCookie("ryioUid");
var UUser = ToolService.getUser();
$scope.Prostatus = UUser.status;
$scope.UserId = UUser.id;
//判断状态
$scope.UserEmail= $.cookie("ryioUname");
$scope.UserEmail= UUser.email;
$scope.findStatus = function(){
var statusPM = HttpService.getInfo("reged/findbyemail?email="+$scope.UserEmail);
ToolService.showLoading();
......@@ -24,30 +26,24 @@
}
},1000);
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
$scope.initpage();
// if(data.isSuperUser == true){
// window.location.href = "index.html#/manage/app";
// }else{
window.location.href = "index.html";
// }
window.location.href = "index.html#/manage/app";
}
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
}
});
}
$scope.findStatus();
/*if($scope.Prostatus == 1){
$scope.initpage();
if($rootScope.isSuper){
$scope.goPage("collect.app");
}
}*/
$scope.postApply = function(){
var savePM = HttpService.getInfo("reged/verify/"+$scope.UserId);
ToolService.showLoading();
......@@ -55,7 +51,8 @@
ToolService.hideLoading();
if(data.status == -1){
$scope.Prostatus = -1;
UtilService.setCookie("ryioStatus",data.status,7);
UUser.status = data.status;
ToolService.setUser(UUser);
}
});
}
......
src/main/websrc/js/app/HttpService.js
......@@ -11,16 +11,15 @@
};
service.noLogin = function(url){
if(angular.isUndefined(url) || url.indexOf('login')==-1){
var loginuserId = UtilService.getCookie("ryioUid");
var loginuserId = UtilService.getUser().id;
if(UtilService.isNullStr(loginuserId)){
service.logOutCookie();
}
}
};
service.logOutCookie = function(){
UtilService.setCookie("ryioUid","");
// UtilService.setCookie("ryioUname",'');
window.localStorage.setItem("ryioUauth","");
UtilService.setUser({});
window.localStorage.setItem("ryioUauth","");
UtilService.setCookie("ryioToken","");
UtilService.setCookie("ryioIsSuper","");
window.location.href="/login.html";
......
src/main/websrc/js/app/ToolService.js
......@@ -17,7 +17,7 @@
return that.name;
}
service.isDemoUser = function(){
return (UtilService.getCookie("ryioUname") == 'demo@reyun.com');
return (UtilService.getUser().email == 'demo@reyun.com');
}
service.getChannelCampaignList = function(){
var list = [
......@@ -387,8 +387,11 @@
return "子应用管理员";
}
}
service.setUser = function(user){
window.localStorage.setItem("io_ry_user",JSON.stringify(user));
}
service.getUser = function(){
var u = localStorage.getItem("ry_user");
var u = localStorage.getItem("io_ry_user");
if(UtilService.isNullStr(u)){
return {};
......@@ -416,9 +419,11 @@
appname = $rootScope.appInstance.name;
}
if(!submenu || submenu==''){submenu = menu[$rootScope.pagePath];}
var Uuser = UtilService.getUser();
var params = {
appid: UtilService.getTKAppkey(),
who:UtilService.getCookie("ryioUname"),
who:Uuser.email,
what:"pageview",
context:{
rootmenu:rootmenu[$rootScope.mainMenu], //菜单分类
......@@ -436,7 +441,7 @@
"_campaignid":cmids.campaignid,
"_apptype":"wap",
email:UtilService.getCookie("ryioUname"),
email:Uuser.email,
_deviceid:UtilService.randDeviceId(), //设备ID
operatesystem: UtilService.operatorSystem(),//操作系统 _ryos
browser: UtilService.getBrowser() //浏览器类型
......@@ -459,15 +464,16 @@
company = "";
}
var Uuser = UtilService.getUser();
var params = {
appid:UtilService.getTKAppkey(),
who:UtilService.getCookie("ryioUname"),
who:Uuser.email,
what:"operation",
context:{
menu:menu[$rootScope.pagePath], //菜单分类
opername:opername, //操作名字
email:UtilService.getCookie("ryioUname"),
email:Uuser.email,
user_appkey:appkey, //所选APP的id,
appcategory:appcategory,//应用类型 中文名
appname:appname, //应用名称
......@@ -485,7 +491,7 @@
};
$.post(UtilService.getLogRoot()+"/receive/tkio/event",JSON.stringify(params));
}
//自定义报送
service.sendWhatEvtData = function(what,jsonparams){
var appkey = "",appcategory = "",appname = "";
......@@ -501,12 +507,13 @@
company = "";
}
var Uuser = UtilService.getUser();
var params = {
appid:UtilService.getTKAppkey(),
who:UtilService.getCookie("ryioUname"),
who:Uuser.email,
what:what,
context:{
email:UtilService.getCookie("ryioUname"),
email:Uuser.email,
user_appkey:appkey, //所选APP的id,
appcategory:appcategory,//应用类型 中文名
appname:appname, //应用名称
......
src/main/websrc/js/app/UtilService.js
......@@ -221,10 +221,10 @@
}
service.setCookie = function(n,_value,d){
$.cookie(n,_value,{expires:d,path:'/',secure:false,raw:false});
$.cookie("io_"+n,_value,{expires:d,path:'/',secure:false,raw:false});
}
service.getCookie = function(n){
return $.cookie(n);
return $.cookie("io_"+n);
}
service.setItem = function(n,_value){
......@@ -266,6 +266,19 @@
return randNumber;
}
}
service.setUser = function(user){
window.localStorage.setItem("io_ry_user",JSON.stringify(user));
}
service.getUser = function(){
var u = localStorage.getItem("io_ry_user");
if(service.isNullStr(u)){
return {};
}
else{
return JSON.parse(u);
}
}
service.getTKAppkey = function(){
return "f0f251af10e66a0c94d2e923d8863105";
}
......
src/main/websrc/js/app/app.js
......@@ -133,15 +133,16 @@
}
});
$scope.loginuserName = UtilService.getCookie("ryioUname");
$scope.currentAccountId = UtilService.getCookie("ryioUid");
$scope.userPastDate = UtilService.getCookie("ryioPastDate");
var uuser = ToolService.getUser();
$scope.loginuserName = uuser.email;
$scope.currentAccountId = uuser.id;
$scope.userPastDate = uuser.pastDate;
$scope.errorBack = function(msg){
ToolService.showTips(msg);
};
var rmdId = UtilService.randRangeId(),auid = UtilService.getCookie("ryioUid");
var rmdId = UtilService.randRangeId(),auid = ToolService.getUser().id;
$scope.goPage = function(ui){
$rootScope.channeluniqueName = 'normal';
......@@ -164,7 +165,7 @@
}
}
$rootScope.noLeftMenus = ["userinfo","nopower","auth","app"];
$rootScope.noLeftMenus = ["userinfo","nopower","auth","app","product"];
$scope.resizeStyle = function(){
var mleft = '0px';
if($rootScope.noLeftMenus.indexOf($rootScope.pagePath) == -1){
......
src/main/websrc/js/app/config.js
......@@ -8,20 +8,22 @@
$rootScope.$stateParams = $stateParams;
$rootScope.isSuper = UtilService.getCookie("ryioIsSuper")=='true' || UtilService.getCookie("ryioIsSuper")==true;
var ryioRole = UtilService.getCookie("ryioRole");
if(ryioRole && ryioRole == '1'){ //管理员
var UUUser = ToolService.getUser();
var userID = UUUser.id,ryioRole = UUUser.roleCategory;
if(ryioRole && ryioRole == 1){ //管理员
$rootScope.isManage = true;
}
else if(ryioRole && ryioRole == '2'){//子应用管理员
else if(ryioRole && ryioRole == 2){//子应用管理员
$rootScope.isAppManage = true;
}
$rootScope.isall = $rootScope.isSuper || $rootScope.isManage || $rootScope.isAppManage;
$rootScope.firstMeau = '/collect/custommenu';
var userID = UtilService.getCookie("ryioUid");
var flowPM = HttpService.getInfo("mng/accountRestrict/find/"+userID);
var queryFlow = function(){
flowPM.then(function(data){
if(!data){return false;}
$rootScope.flowName = data.packageName; //套餐名称
$rootScope.flowLevel = data.priceLevel; //套餐级别
if(data.flowRestrict == true){ //是否是受限用户 true是
......@@ -183,7 +185,7 @@
.factory('httpInterceptor', [function() {
var timestampMarker = {
request: function(config) {
var token = $.cookie("ryioToken");
var token = $.cookie("io_ryioToken");
config.headers.Authorization = token;
config.requestTimestamp = new Date().getTime();
config.timeout = 3000 * 10;
......
src/main/websrc/js/app/directive.js
......@@ -2047,11 +2047,11 @@
var noticePM = HttpService.getInfo("notice/findDeploy", {});
noticePM.then(function(data){
$scope.list = data;
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead != true;
})
if(data){
$scope.noreadList = $scope.list.filter(function(item){
return item.isRead != true;
})
}
});
$timeout($scope.queryNotice,1000*60*3);
}
......
src/main/websrc/js/collect/report.js
......@@ -3,7 +3,7 @@
.controller("reportCtrl",["$rootScope","$scope","HttpService","ToolService","UtilService",exportCtrl]);
function exportCtrl($rootScope,$scope,HttpService,ToolService,UtilService){
$scope.UserId = $.cookie("ryioUid");
$scope.UserId = ToolService.getUser().id;
$scope.query = function(){
ToolService.showLoading()
......
src/main/websrc/js/home/home.js
......@@ -11,11 +11,12 @@
document.getElementById("sysLoad").style.display = "none";
}
$scope.Homename = UtilService.getCookie("ryioUname");
var Uuser = UtilService.getUser();
$scope.Homename = Uuser.email;
if($scope.Homename == undefined || $scope.Homename == null){
$scope.Homename = "";
}
$scope.HomeId = UtilService.getCookie("ryioUid");
$scope.HomeId = UtilService.getUser().id;
if($scope.HomeId == undefined || $scope.HomeId == null){
$scope.HomeId = "";
}
......@@ -39,8 +40,8 @@
}
$scope.isSuper = UtilService.getCookie("ryioIsSuper")=='true' || UtilService.getCookie("ryioIsSuper")==true;
var ryioRole = UtilService.getCookie("ryioRole");
if(ryioRole && ryioRole == '1'){ //管理员
var ryioRole = Uuser.roleCategory;
if(ryioRole && ryioRole == 1){ //管理员
$scope.isManage = true;
}
......@@ -48,9 +49,9 @@
$scope.companyMore = function(){
$scope.companyMoreType = false;
}
$scope.UserEmail= $.cookie("ryioUname");
$scope.UserEmail= Uuser.email;
$scope.userNow = function(){
var status = UtilService.getCookie("ryioStatus");
var status = Uuser.status;
var statusPM = HttpService.getInfo("reged/findbyemail?email="+$scope.UserEmail);
ToolService.showLoading();
statusPM.then(function(data){
......@@ -66,17 +67,15 @@
}
},1000);
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
if(data.isSuperUser == true){
window.location.href = "index.html#/manage/app";
}else{
window.location.href = "index.html";
}
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
window.location.href = "index.html#/manage/app";
}
}else{
UtilService.setCookie("ryioStatus",data.status,7);
UtilService.setCookie("ryioPastDate",data.pastDate,7);
UUser.status = data.status;
UUser.pastDate = data.pastDate;
ToolService.setUser(UUser);
window.location.href = "index.html#/active/product";
}
});
......
src/main/websrc/js/login/acvitation.js
......@@ -11,11 +11,13 @@
$scope.hideLoading = function(){
document.getElementById("sysLoad").style.display = "none";
}
$scope.registerId = $.cookie("regId");
$scope.registerEmail= $.cookie("regEmail");
$scope.flag = $.cookie("regFlag");
$scope.activeStatus = $.cookie("ryioActiveStatus");
$scope.acvitation = $.cookie("ryioAcvitation"); //0 success 1 failure
$scope.registerId = UtilService.getCookie("regId");
$scope.registerEmail= UtilService.getCookie("regEmail");
$scope.flag = UtilService.getCookie("regFlag");
var Uuser = UtilService.getUser();
$scope.activeStatus = Uuser.activeStatus;
$scope.acvitation = UtilService.getCookie("ryioAcvitation"); //0 success 1 failure
//判断状态
$scope.findStatus = function(){
......@@ -23,7 +25,10 @@
$http.get("/api/reged/findbyemail?email="+$scope.registerEmail).success(function(data){
$scope.hideLoading();
$scope.activeStatus = data.content.activeStatus;
UtilService.setCookie("ryioActiveStatus",data.content.activeStatus,7);
Uuser.activeStatus = $scope.activeStatus;
UtilService.setUser(Uuser);
if(data.content.status > -3 && $scope.flag != 1){
window.location.href = "success.html";
}
......@@ -60,9 +65,9 @@
}else{
$scope.acvitation = 1;
}
});
});
}
$scope.changeEmail = function(){
$scope.winFlag = 1;
$scope.oldemail = $scope.registerEmail;
......@@ -118,7 +123,7 @@
txt:"请输入正确的邮箱格式"
}
}
if ($scope.tip.succ != true) {
if ($scope.tip.succ != true) {
return false;
}
$scope.errorMessage = "";
......@@ -159,4 +164,4 @@
}
}
}
})();
\ No newline at end of file
})();
src/main/websrc/js/login/login.js
......@@ -9,17 +9,11 @@
$scope.reportDate = DateService.getYesDay().startDate;
$scope.isrember = false;
$scope.isonline = true;
/*var chartInstance = echarts.init(document.getElementById('mapInfo'));
var options = OptionService.getLoginMapOption({name:[],val:[],key:[]},"map",{});
chartInstance.setOption(options);*/
var uname = UtilService.getCookie("ryioUname"),upass = UtilService.getCookie("ryioUpass");
var uname = UtilService.getCookie("ryioUname");
if(!UtilService.isNullStr(uname)){
$scope.name = uname;
}
if(!UtilService.isNullStr(upass)){
$scope.password = upass;
}
var code = "";
$scope.getImgInfo = function(){
......@@ -85,19 +79,13 @@
else{
TrackingIO.loggedin(account.email);
UtilService.setCookie("ryioUid",account.id,7);
UtilService.setCookie("ryioUname",account.email,7);
window.localStorage.setItem("ry_user",JSON.stringify(account));
UtilService.setCookie("ryioToken",token,7);
UtilService.setCookie("ryioPastDate",account.pastDate,7);
UtilService.setCookie("ryioStatus",account.status,7);
UtilService.setCookie("ryioActiveStatus",account.activeStatus,7);
UtilService.setCookie("ryioIcon",0,7);
window.localStorage.setItem("io_ry_user",JSON.stringify(account));
UtilService.setCookie("ryioUname",account.email);
UtilService.setCookie("ryioToken",token,7);////
var isSuper = account.isSuperUser == true && account.isChannelPerson!=true;
UtilService.setCookie("ryioIsSuper",isSuper,7);
UtilService.setCookie("ryioRole",account.roleCategory,7);
UtilService.setCookie("ryioIsSuper",isSuper,7);///////
if( data.account.activeStatus != true && data.account.status == 1 && isSuper==true){
UtilService.setCookie("regId",account.id,7);
UtilService.setCookie("regEmail",$scope.name,7);
......
src/main/websrc/js/login/olduser.js
......@@ -12,9 +12,9 @@
}
//$scope.registerId = $location.search().id;
//$scope.registerEmail= $location.search().email;
$scope.registerId = $.cookie("regId");
$scope.registerEmail= $.cookie("regEmail");
$scope.flag = $.cookie("regFlag");
$scope.registerId = UtilService.getCookie("regId");
$scope.registerEmail= UtilService.getCookie("regEmail");
$scope.flag = UtilService.getCookie("regFlag");
$scope.hasReged = true;
$scope.oldEmail = function(){
......@@ -28,7 +28,7 @@
}
window.location.href = "activation.html";
});
}
}
})();
\ No newline at end of file
})();
src/main/websrc/js/manage/app.js
......@@ -315,7 +315,7 @@
return false;
}
var appTagList = [], isnull = false, tag = "00";
console.log($scope.tagType,$scope.typeIds,$scope.themeIds,$scope.styleIds)
if($scope.tagType == 'game'){
$scope.typenull = !$scope.typeIds;
$scope.themenull = !$scope.themeIds;
......
src/main/websrc/js/manage/auth.js
......@@ -5,7 +5,7 @@
function authCtrl($rootScope,$scope,HttpService,ToolService,UtilService,$state){
$scope.demoUSuper = UtilService.getCookie("ryioUname") == 'demoadmin@reyun.com';
$scope.demoUSuper = UtilService.getUser().email == 'demoadmin@reyun.com';
$scope.deviceList = [
{id:1,name:"已启用"},
{id:2,name:"已停用"}
......
src/main/websrc/olduser.html
......@@ -35,7 +35,7 @@
<div class="registerActivation">注册激活</div>
<div class="activationText oldUser">我们当前正在为开发者做更多的权限和安全设计，为了您的账户安全，请激活您的邮箱。</div>
<div class="activationButton" ng-click="oldEmail()">发送激活邮件</div>
<div class="activationText"><a href="index.html">跳过，下次再显示</a></div>
<div class="activationText"><a href="index.html#/manage/app">跳过，下次再显示</a></div>
</div>
</div>
<div class="copyright regt" ng-class="{'static':!hasReged}">
......
src/main/websrc/styles/style.scss
......@@ -4199,7 +4199,7 @@ pre{
height:30px;
line-height: 30px;
font-size:12px;
background-color:$activebgcolor;
background-color:$logobg;
color:#fff;
display:inline-block;
border-radius:$comradius;
......@@ -4237,7 +4237,7 @@ pre{
vertical-align:middle;
}
.btnMoreGroup .primaryBtn{
background-color:$activebgcolor;
background-color:$logobg;
color:#fff;
border-top-left-radius:$comradius;
border-bottom-left-radius:$comradius;
......@@ -4257,7 +4257,7 @@ pre{
}
.btnMoreGroup .primarySelBtn.dis{border-left:none;}
.btnMoreGroup .primarySelBtn{
background-color:$activebgcolor;
background-color:$logobg;
border-top-right-radius:$comradius;
border-bottom-right-radius:$comradius;
float:left;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment