Home Explore Help
Sign In
project
/
cms
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of ssh://git.dever.cc:10022/project/cms

dever 4 years ago
parent
d73d1d75ae 2fe6b5351d
commit
a89c4b02ce
36 changed files with 33 additions and 33 deletions
Split View Show Diff Stats
  1. 2 2
      main/assets/xuniren/activity.html
  2. 2 2
      main/assets/xuniren/article.html
  3. 2 2
      main/assets/xuniren/contact.html
  4. 0 0
      main/assets/xuniren/css/activity.css
  5. 1 1
      main/assets/xuniren/css/activity.css.map
  6. 0 0
      main/assets/xuniren/css/article.css
  7. 1 1
      main/assets/xuniren/css/article.css.map
  8. 0 0
      main/assets/xuniren/css/contact.css
  9. 1 1
      main/assets/xuniren/css/contact.css.map
  10. 0 0
      main/assets/xuniren/css/feature.css
  11. 1 1
      main/assets/xuniren/css/feature.css.map
  12. 0 0
      main/assets/xuniren/css/global.css
  13. 1 1
      main/assets/xuniren/css/global.css.map
  14. 0 0
      main/assets/xuniren/css/index.css
  15. 1 1
      main/assets/xuniren/css/index.css.map
  16. 0 0
      main/assets/xuniren/css/news.css
  17. 1 1
      main/assets/xuniren/css/news.css.map
  18. 0 0
      main/assets/xuniren/css/search.css
  19. 1 1
      main/assets/xuniren/css/search.css.map
  20. 0 0
      main/assets/xuniren/css/video.css
  21. 1 1
      main/assets/xuniren/css/video.css.map
  22. 0 0
      main/assets/xuniren/css/xnr-detail.css
  23. 1 1
      main/assets/xuniren/css/xnr-detail.css.map
  24. 0 0
      main/assets/xuniren/css/xnr.css
  25. 1 1
      main/assets/xuniren/css/xnr.css.map
  26. 0 0
      main/assets/xuniren/css/zwz-detail.css
  27. 1 1
      main/assets/xuniren/css/zwz-detail.css.map
  28. 2 2
      main/assets/xuniren/feature.html
  29. 1 1
      main/assets/xuniren/index.html
  30. 0 0
      main/assets/xuniren/js/global.js.map
  31. 2 2
      main/assets/xuniren/news.html
  32. 2 2
      main/assets/xuniren/search.html
  33. 2 2
      main/assets/xuniren/video.html
  34. 2 2
      main/assets/xuniren/xnr-detail.html
  35. 2 2
      main/assets/xuniren/xnr.html
  36. 2 2
      main/assets/xuniren/zwz-detail.html

+ 2 - 2
main/assets/xuniren/activity.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/activity.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/activity.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 <!-- <body class="night-skin"> -->
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.60790470118723740.741510329833041xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.407900918379639150.47631090389473707xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/article.html
View File 

@@ -14,13 +14,13 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/article.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/article.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.113600080689159280.7643740697274304xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.81113024565490010.6482704840551836xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/contact.html
View File 

@@ -13,13 +13,13 @@
 
 	<meta name="Keywords" content="" />
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/contact.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/contact.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.130804902703149930.27674888777333617xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.5341315330754690.1935741132306441xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/activity.css


+ 1 - 1
main/assets/xuniren/css/activity.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/activity.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/activity.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/article.css


+ 1 - 1
main/assets/xuniren/css/article.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/article.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/article.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/contact.css


+ 1 - 1
main/assets/xuniren/css/contact.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/contact.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/contact.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/feature.css


+ 1 - 1
main/assets/xuniren/css/feature.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/feature.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/feature.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/global.css


+ 1 - 1
main/assets/xuniren/css/global.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=b95bd1d5","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=b7601e09","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/index.css


+ 1 - 1
main/assets/xuniren/css/index.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/news.css


+ 1 - 1
main/assets/xuniren/css/news.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/news.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/news.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/search.css


+ 1 - 1
main/assets/xuniren/css/search.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/search.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/search.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/video.css


+ 1 - 1
main/assets/xuniren/css/video.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/video.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/video.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/xnr-detail.css


+ 1 - 1
main/assets/xuniren/css/xnr-detail.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/xnr-detail.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/xnr-detail.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/xnr.css


+ 1 - 1
main/assets/xuniren/css/xnr.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/xnr.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/xnr.css?v=c1121968","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/css/zwz-detail.css


+ 1 - 1
main/assets/xuniren/css/zwz-detail.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/zwz-detail.css?v=dfc72524","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/zwz-detail.css?v=c1121968","sourceRoot":""}

+ 2 - 2
main/assets/xuniren/feature.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />

 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">

 	<link rel="stylesheet" href="./static/swiper.min.css" />

-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/feature.css?v=dfc72524" rel="stylesheet"></head>

+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/feature.css?v=c1121968" rel="stylesheet"></head>

 

 <body>

 <!-- <body class="night-skin"> -->

 	<header>

 		<div class="wrapper">

 			<div class="logo-area clearfix">

-				<a class="logo"><img src="xxxHTMLLINKxxx0.45738290106356170.6627189795697341xxx" alt="logo"></a>

+				<a class="logo"><img src="xxxHTMLLINKxxx0.4231528194366030.7395077676077908xxx" alt="logo"></a>

 				<ul class="menu">

 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>

 					<li class="pc-menu">

+ 1 - 1
main/assets/xuniren/index.html
View File 

@@ -14,7 +14,7 @@
 
 	<meta name="Description" content="" />

 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">

 	<link rel="stylesheet" href="./static/swiper.min.css" />

-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/index.css?v=dfc72524" rel="stylesheet"></head>

+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/index.css?v=c1121968" rel="stylesheet"></head>

 

 <body>

 <!-- <body class="night-skin"> -->

File diff suppressed because it is too large
+ 0 - 0
main/assets/xuniren/js/global.js.map


+ 2 - 2
main/assets/xuniren/news.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />

 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">

 	<link rel="stylesheet" href="./static/swiper.min.css" />

-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/news.css?v=dfc72524" rel="stylesheet"></head>

+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/news.css?v=c1121968" rel="stylesheet"></head>

 

 <body>

 <!-- <body class="night-skin"> -->

 	<header>

 		<div class="wrapper">

 			<div class="logo-area clearfix">

-				<a class="logo"><img src="xxxHTMLLINKxxx0.87676212285327540.735307135676946xxx" alt="logo"></a>

+				<a class="logo"><img src="xxxHTMLLINKxxx0.061547708408088430.4605764706965443xxx" alt="logo"></a>

 				<ul class="menu">

 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>

 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/search.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/search.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/search.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 <!-- <body class="night-skin"> -->
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.88094504570093560.20233698494446495xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.055980207080631670.8037310432991573xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/video.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/video.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/video.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 <!-- <body class="night-skin"> -->
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.2882517269462670.39297090248541267xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.71540338671414380.8491553089264228xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/xnr-detail.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/xnr-detail.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/xnr-detail.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 <!-- <body class="night-skin"> -->
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.47074329028238360.3385672506685924xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.85063518928656050.788516169491422xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/xnr.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/xnr.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/xnr.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 <!-- <body class="night-skin"> -->
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.390145461912074330.5843825361051231xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.59864330080314220.7560933484336909xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

+ 2 - 2
main/assets/xuniren/zwz-detail.html
View File 

@@ -14,14 +14,14 @@
 
 	<meta name="Description" content="" />
 
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 
-<link href="css/global.css?v=b95bd1d5" rel="stylesheet"><link href="css/zwz-detail.css?v=dfc72524" rel="stylesheet"></head>
 
+<link href="css/global.css?v=b7601e09" rel="stylesheet"><link href="css/zwz-detail.css?v=c1121968" rel="stylesheet"></head>
 
 
 <body>
 
 <!-- <body class="night-skin"> -->
 
 	<header>
 
 		<div class="wrapper">
 
 			<div class="logo-area clearfix">
 
-				<a class="logo"><img src="xxxHTMLLINKxxx0.30333606415599570.39315135699908077xxx" alt="logo"></a>
 
+				<a class="logo"><img src="xxxHTMLLINKxxx0.86850524840287210.32947461315606974xxx" alt="logo"></a>
 
 				<ul class="menu">
 
 					<li class="pc-menu"><a href="javascript:;" id="tonight" class="iconfont icon-yueliang"></a></li>
 
 					<li class="pc-menu">

Some files were not shown because too many files changed in this diff