Authored by caoyan

Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6

Showing 26 changed files with 16 additions and 16 deletions
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/coupon.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/coupon.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/coupon.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/coupon.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/price-compare.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/price-compare.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/price-compare.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/price-compare.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/resource-edit-new.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/resource-edit-new.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/resource-edit-new.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/resource-edit-new.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/resource-edit.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/resource-edit.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/resource-edit.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/resource-edit.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/resource-list.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/resource-list.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/resource-list.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/resource-list.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/send-coupon.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/send-coupon.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/send-coupon.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/send-coupon.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/send-record.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/send-record.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/send-record.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/send-record.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <title>ufo后台管理</title> 5 <title>ufo后台管理</title>
6 <meta charset="UTF-8"> 6 <meta charset="UTF-8">
7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"> 7 <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8 -<link href="css/vendors.44ca5b8e86ed5f24a655.css" rel="stylesheet"><link href="css/shop.44ca5b8e86ed5f24a655.css" rel="stylesheet"></head> 8 +<link href="css/vendors.bd7dfde6bf79f441c558.css" rel="stylesheet"><link href="css/shop.bd7dfde6bf79f441c558.css" rel="stylesheet"></head>
9 9
10 <body> 10 <body>
11 <div id="app"></div> 11 <div id="app"></div>
12 -<script type="text/javascript" src="js/vendors.44ca5b8e86ed5f24a655.js"></script><script type="text/javascript" src="js/shop.44ca5b8e86ed5f24a655.js"></script></body> 12 +<script type="text/javascript" src="js/vendors.bd7dfde6bf79f441c558.js"></script><script type="text/javascript" src="js/shop.bd7dfde6bf79f441c558.js"></script></body>
13 13
14 </html> 14 </html>