jf 5 лет назад
Родитель
Сommit
b2f54689b0
100 измененных файлов с 805 добавлено и 523 удалено
  1. 0 0
      ghs/dist/shop/css/chunk-1ad5cb3a.74bdee96.css
  2. 0 0
      ghs/dist/shop/css/chunk-207c6046.4ba2e692.css
  3. 0 0
      ghs/dist/shop/css/chunk-6c2b731e.6afcd037.css
  4. 0 0
      ghs/dist/shop/css/chunk-afc06cd4.0ba142a8.css
  5. BIN
      ghs/dist/shop/img/login-bg1.8919581a.png
  6. 5 1
      ghs/dist/shop/index.html
  7. 0 0
      ghs/dist/shop/js/app.ce19475b.js
  8. 0 0
      ghs/dist/shop/js/chunk-1ad5cb3a.bdb12190.js
  9. 0 0
      ghs/dist/shop/js/chunk-207c6046.8cdc4b3a.js
  10. 1 0
      ghs/dist/shop/js/chunk-2d0ab66c.8b7dcab9.js
  11. 0 0
      ghs/dist/shop/js/chunk-6c2b731e.d95a71f3.js
  12. 0 0
      ghs/dist/shop/js/chunk-afc06cd4.a5acb854.js
  13. BIN
      ghs/src/assets/images/login-bg1.png
  14. 99 253
      ghs/src/pages/login/index.vue
  15. 292 0
      ghs/src/pages/login/index1.vue
  16. 2 2
      ghsApp/src/admin/home/me.vue
  17. 2 2
      ghsApp/src/admin/staff/list.vue
  18. 2 2
      ghsApp/src/pagesArrears/list.vue
  19. 0 0
      hd/dist/shop/css/chunk-090ebb38.2bee2186.css
  20. 0 0
      hd/dist/shop/css/chunk-207c6046.4ba2e692.css
  21. 0 0
      hd/dist/shop/css/chunk-29e9dc5e.8892b558.css
  22. 0 0
      hd/dist/shop/css/chunk-6c2b731e.6afcd037.css
  23. 0 0
      hd/dist/shop/css/chunk-87f81c90.ee8e4761.css
  24. 0 0
      hd/dist/shop/css/chunk-f3fed1e4.464f1920.css
  25. BIN
      hd/dist/shop/img/login-bg1.8919581a.png
  26. 1 1
      hd/dist/shop/index.html
  27. 0 0
      hd/dist/shop/js/app.c06e62e6.js
  28. 0 0
      hd/dist/shop/js/app.f62946e5.js
  29. 0 0
      hd/dist/shop/js/chunk-090ebb38.06962948.js
  30. 0 0
      hd/dist/shop/js/chunk-0c399f14.ec1c1be7.js
  31. 0 0
      hd/dist/shop/js/chunk-207c6046.091589a1.js
  32. 0 0
      hd/dist/shop/js/chunk-29e9dc5e.79baa67d.js
  33. 1 0
      hd/dist/shop/js/chunk-2d0ab66c.8b7dcab9.js
  34. 0 0
      hd/dist/shop/js/chunk-35950b34.d5fc79e5.js
  35. 0 0
      hd/dist/shop/js/chunk-6c2b731e.44f138d5.js
  36. 0 0
      hd/dist/shop/js/chunk-6f99cf1a.6e94a198.js
  37. 0 0
      hd/dist/shop/js/chunk-87f81c90.90d369cf.js
  38. 0 0
      hd/dist/shop/js/chunk-f3fed1e4.e20dd337.js
  39. BIN
      hd/src/assets/images/login-bg1.png
  40. 1 1
      hd/src/pages/layout/topbar/index.vue
  41. 99 253
      hd/src/pages/login/index.vue
  42. 292 0
      hd/src/pages/login/index1.vue
  43. 2 2
      hdApp/src/admin/home/me.vue
  44. 2 2
      hdApp/src/admin/staff/list.vue
  45. 0 0
      pt/dist/web/css/chunk-04e2da8e.64e7fe0e.css
  46. 0 0
      pt/dist/web/css/chunk-133a8271.64c422ab.css
  47. 0 0
      pt/dist/web/css/chunk-207c6046.4ba2e692.css
  48. 0 0
      pt/dist/web/css/chunk-3b433378.8c08fa62.css
  49. 0 0
      pt/dist/web/css/chunk-47564ca8.9a0f1510.css
  50. 0 0
      pt/dist/web/css/chunk-4927dd0a.f1035bc4.css
  51. 0 0
      pt/dist/web/css/chunk-6c2b731e.6afcd037.css
  52. 0 0
      pt/dist/web/css/chunk-7302a479.8f2c478f.css
  53. 0 0
      pt/dist/web/css/chunk-77156228.d76958d7.css
  54. 0 0
      pt/dist/web/css/chunk-7c199f12.ce53fab1.css
  55. 0 0
      pt/dist/web/css/chunk-a8f6a870.283b831d.css
  56. 0 0
      pt/dist/web/css/chunk-c1071978.db770408.css
  57. 0 0
      pt/dist/web/css/chunk-cb6d7e60.bb378a0f.css
  58. 0 0
      pt/dist/web/css/chunk-ce878c72.45afedf7.css
  59. 0 0
      pt/dist/web/css/chunk-d5e303e8.d4d594a8.css
  60. 0 0
      pt/dist/web/css/chunk-f0a1214e.78f07b4a.css
  61. BIN
      pt/dist/web/img/login-bg1.8919581a.png
  62. 1 1
      pt/dist/web/index.html
  63. 0 0
      pt/dist/web/js/app.9bc7bd1a.js
  64. 0 0
      pt/dist/web/js/app.b6fecc90.js
  65. 0 0
      pt/dist/web/js/chunk-0044508d.42a9bb7c.js
  66. 0 0
      pt/dist/web/js/chunk-02addfa6.788e7ec7.js
  67. 0 0
      pt/dist/web/js/chunk-04e2da8e.9d511230.js
  68. 0 0
      pt/dist/web/js/chunk-05393050.ccaf3c51.js
  69. 0 0
      pt/dist/web/js/chunk-079b3ce4.ced3a376.js
  70. 0 0
      pt/dist/web/js/chunk-08ad3592.aba2813f.js
  71. 1 0
      pt/dist/web/js/chunk-0ccb396c.1a61a28a.js
  72. 0 1
      pt/dist/web/js/chunk-0ccb396c.c4a8eb79.js
  73. 0 0
      pt/dist/web/js/chunk-0ddc6658.25cc4f7c.js
  74. 0 0
      pt/dist/web/js/chunk-0e636808.eb5dc0b3.js
  75. 0 0
      pt/dist/web/js/chunk-121bbdda.7cf3e5e8.js
  76. 0 0
      pt/dist/web/js/chunk-133a8271.f15fcf9d.js
  77. 0 1
      pt/dist/web/js/chunk-150f32d6.6949d3f8.js
  78. 0 0
      pt/dist/web/js/chunk-15f90847.1bd2e841.js
  79. 0 0
      pt/dist/web/js/chunk-179dd69d.7b336013.js
  80. 0 0
      pt/dist/web/js/chunk-17ad7868.e031ac47.js
  81. 0 0
      pt/dist/web/js/chunk-1ea202b7.aa890bf9.js
  82. 0 0
      pt/dist/web/js/chunk-1f8a1561.843ba1a8.js
  83. 0 0
      pt/dist/web/js/chunk-207c6046.37af907a.js
  84. 0 0
      pt/dist/web/js/chunk-22924849.d81f7720.js
  85. 0 0
      pt/dist/web/js/chunk-22bc7a56.3431c8e8.js
  86. 0 0
      pt/dist/web/js/chunk-22bc7a56.cb4a17c8.js
  87. 0 0
      pt/dist/web/js/chunk-2631ef66.af890ee6.js
  88. 0 0
      pt/dist/web/js/chunk-264d02a9.0261cbb9.js
  89. 0 0
      pt/dist/web/js/chunk-2b7f22ea.c2908499.js
  90. 1 0
      pt/dist/web/js/chunk-2d0ab66c.8b7dcab9.js
  91. 0 0
      pt/dist/web/js/chunk-2d0af06a.3764f3d9.js
  92. 0 0
      pt/dist/web/js/chunk-2d0b168d.ac871928.js
  93. 0 0
      pt/dist/web/js/chunk-2d0c06f2.33a1a412.js
  94. 0 0
      pt/dist/web/js/chunk-2d0c0acc.d4a1a0a3.js
  95. 1 1
      pt/dist/web/js/chunk-2d0c8bc6.6a1acedd.js
  96. 0 0
      pt/dist/web/js/chunk-2d0cbb24.377bd332.js
  97. 0 0
      pt/dist/web/js/chunk-2d0d5c2a.97c9d848.js
  98. 0 0
      pt/dist/web/js/chunk-2d0d5c2a.a64647ba.js
  99. 0 0
      pt/dist/web/js/chunk-2d0d622c.f8b79576.js
  100. 0 0
      pt/dist/web/js/chunk-2d0db0d2.e9cc95ee.js

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-1ad5cb3a.74bdee96.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-207c6046.4ba2e692.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-6c2b731e.6afcd037.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-afc06cd4.0ba142a8.css


BIN
ghs/dist/shop/img/login-bg1.8919581a.png


+ 5 - 1
ghs/dist/shop/index.html

@@ -43,4 +43,8 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.9413475f.css" rel="preload" as="style"><link href="/css/chunk-libs.edfd0370.css" rel="preload" as="style"><link href="/js/app.903990d9.js" rel="preload" as="script"><link href="/js/chunk-libs.128ff89b.js" rel="preload" as="script"><link href="/css/chunk-libs.edfd0370.css" rel="stylesheet"><link href="/css/app.9413475f.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.128ff89b.js"></script><script src="/js/app.903990d9.js"></script></body></html>
+<<<<<<< HEAD
+			}</style><link href="/css/app.9413475f.css" rel="preload" as="style"><link href="/css/chunk-libs.edfd0370.css" rel="preload" as="style"><link href="/js/app.903990d9.js" rel="preload" as="script"><link href="/js/chunk-libs.128ff89b.js" rel="preload" as="script"><link href="/css/chunk-libs.edfd0370.css" rel="stylesheet"><link href="/css/app.9413475f.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.128ff89b.js"></script><script src="/js/app.903990d9.js"></script></body></html>
+=======
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.ce19475b.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.ce19475b.js"></script></body></html>
+>>>>>>> 61e8b589e8ae1e9a1aaf11decde7ac9d83854d46

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.ce19475b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-1ad5cb3a.bdb12190.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-207c6046.8cdc4b3a.js


+ 1 - 0
ghs/dist/shop/js/chunk-2d0ab66c.8b7dcab9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab66c"],{"14b5":function(n,p,o){n.exports=o.p+"img/login-bg1.8919581a.png"}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-6c2b731e.d95a71f3.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-afc06cd4.a5acb854.js


BIN
ghs/src/assets/images/login-bg1.png


+ 99 - 253
ghs/src/pages/login/index.vue

@@ -1,25 +1,10 @@
 <template>
-	<div class="scope">
-		<ul class="bg-bubbles">
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-		</ul>
-
-		<div class="tmp2">
-			<div class="title" style="color: #25aff3">
-				<!-- <icon-svg name="logo-t-lr"></icon-svg> -->
-				花卉宝
-			</div>
-
-			<el-form ref="form" class="form" size="medium" :disabled="saving">
+  <div class="loginPage">
+    <div class="login_main">
+      <div class="login_left"></div>
+      <div class="login_right">
+        <p>欢迎登录</p>
+        <el-form ref="form" class="form" size="medium" :disabled="saving">
 				<el-form-item label="用户名">
 					<el-input
 						placeholder="请输入用户名"
@@ -40,253 +25,114 @@
 						@keyup.enter.native="next"
 					></el-input>
 				</el-form-item>
-
-				<!-- <el-form-item label="验证码" class="captcha">
-					<el-input
-						placeholder="请输入图片验证码"
-						maxlength="4"
-						v-model="form.verifyCode"
-						auto-complete="off"
-						@keyup.enter.native="next"
-					></el-input>
-
-					<captcha
-						ref="captcha"
-						class="value"
-						v-model="form.captchaId"
-						@change="captchaChange"
-					></captcha>
-				</el-form-item> -->
-
 				<el-button class="submit-btn" @click="next" :saving="saving">登录</el-button>
 			</el-form>
-		</div>
-	</div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-// import { isPc } from '@/cool/utils/index';
 import index from './index';
-
 export default {
 	mixins: [index],
 
 	created() {
-		// if (!isPc()) {
-		// 	this.$router.push('/login-h5');
-		// }
 	}
 };
 </script>
 
 <style lang="stylus" scoped>
-.scope {
-	height: 100vh;
+.loginPage{
+  height: 100vh;
 	width: 100vw;
 	position: relative;
-
-	.tmp2 {
-		height: 383px;
-		width: 767px;
-		border-radius: 10px;
-		overflow: hidden;
-		position: absolute;
-		left: calc(50% - 384px);
-		top: calc(50% - 192px);
-		box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
-
-		&:before {
-			content: '';
-			background-image: url('../../assets/images/login-bg.png');
-			background-size: 100% 100%;
-			position: absolute;
-			left: 0px;
-			right: 0;
-			height: 383px;
-			width: 767px;
-			z-index: 1;
-		}
-
-		&:after {
-			content: '';
-			background: linear-gradient(to right, $color, $color2);
-			position: absolute;
-			left: 0px;
-			right: 0;
-			height: 383px;
-			width: 767px;
-			z-index: 0;
-		}
-
-		.title {
-			position: absolute;
-			left: 25px;
-			top: 10px;
-			z-index: 1;
-			font-size: 20px;
-			letter-spacing: 1px;
-			text-shadow: 1px 2px 10px rgba(0, 0, 0, 0.4);
-
-			.icon-svg {
-				height: 40px;
-				width: 180px;
-			}
-		}
-
-		.el-form {
-			height: 280px;
-			width: 280px;
-			border-radius: 3px;
-			position: absolute;
-			right: 42px;
-			top: 45px;
-			z-index: 1;
-
-			.el-form-item {
-				margin-bottom: 5px;
-			}
-
-			>>>.el-input {
-				.el-input__inner {
-					border: 0;
-					box-shadow: 0 0 0px 1000px #fefcfe inset;
-					border-radius: 0;
-					padding: 0 5px;
-				}
-			}
-
-			.captcha {
-				position: relative;
-
-				.value {
-					position: absolute;
-					bottom: 0;
-					right: 0;
-				}
-			}
-
-			.submit-btn {
-				width: 100%;
-				background: linear-gradient(to top left, $color, $color2);
-				color: #fff;
-				font-size: 15px;
-				letter-spacing: 2px;
-				cursor: pointer;
-				margin-top: 20px;
-			}
-		}
-	}
-
-	.bg-bubbles {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		background: linear-gradient(to bottom right, $color, $color2);
-	}
-
-	.bg-bubbles li {
-		position: absolute;
-		bottom: -160px;
-		width: 40px;
-		height: 40px;
-		background-color: rgba(255, 255, 255, 0.15);
-		list-style: none;
-		animation: square 15s infinite;
-		transition-timing-function: linear;
-		border-radius: 50%;
-	}
-
-	.bg-bubbles li:nth-child(1) {
-		left: 10%;
-	}
-
-	.bg-bubbles li:nth-child(2) {
-		left: 20%;
-		width: 90px;
-		height: 90px;
-		animation-delay: 2s;
-		animation-duration: 7s;
-	}
-
-	.bg-bubbles li:nth-child(3) {
-		left: 25%;
-		animation-delay: 4s;
-	}
-
-	.bg-bubbles li:nth-child(4) {
-		left: 40%;
-		width: 60px;
-		height: 60px;
-		animation-duration: 8s;
-		background-color: rgba(255, 255, 255, 0.3);
-	}
-
-	.bg-bubbles li:nth-child(5) {
-		left: 70%;
-	}
-
-	.bg-bubbles li:nth-child(6) {
-		left: 80%;
-		width: 120px;
-		height: 120px;
-		animation-delay: 3s;
-		background-color: rgba(255, 255, 255, 0.2);
-	}
-
-	.bg-bubbles li:nth-child(7) {
-		left: 32%;
-		width: 160px;
-		height: 160px;
-		animation-delay: 2s;
-	}
-
-	.bg-bubbles li:nth-child(8) {
-		left: 55%;
-		width: 20px;
-		height: 20px;
-		animation-delay: 4s;
-		animation-duration: 15s;
-	}
-
-	.bg-bubbles li:nth-child(9) {
-		left: 25%;
-		width: 10px;
-		height: 10px;
-		animation-delay: 2s;
-		animation-duration: 12s;
-		background-color: rgba(255, 255, 255, 0.3);
-	}
-
-	.bg-bubbles li:nth-child(10) {
-		left: 85%;
-		width: 160px;
-		height: 160px;
-		animation-delay: 5s;
-	}
-
-	@keyframes square {
-		0% {
-			opacity: 0.5;
-			transform: translateY(0px) rotate(45deg);
-		}
-
-		25% {
-			opacity: 0.75;
-			transform: translateY(-400px) rotate(90deg);
-		}
-
-		50% {
-			opacity: 1;
-			transform: translateY(-600px) rotate(135deg);
-		}
-
-		100% {
-			opacity: 0;
-			transform: translateY(-1000px) rotate(180deg);
-		}
-	}
+  background: #3385FF;
+  &>.login_main{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 1017px;
+    height: 572px;
+    background: #fff;
+    &>div{
+      width: 50%;
+      height: 100%;
+      display: inline-block;
+    }
+    &>.login_left{
+      vertical-align: top;
+      background: url('../../assets/images/login-bg1.png') no-repeat center;
+      background-size: cover;
+    }
+    &>.login_right{
+      border-left: 1px dashed #333;
+      vertical-align: top;
+      padding-left: 67px;
+      box-sizing: border-box;
+      &>p{
+        margin-top: 64px;
+        margin-bottom: 43px;
+        font-size: 32px;
+        font-weight: 500;
+        color: #3385FF;
+      }
+      .el-form {
+        // height:30vh;
+        width: 83%;
+        border-radius: 3px;
+        // position: absolute;
+        // right: 42px;
+        // top: 45px;
+        z-index: 1;
+
+        .el-form-item {
+          margin-bottom: 5px;
+        }
+        >>>.el-form-item__label{
+          color: #9289A6;
+          font-size: 16px;
+          line-height 33px;
+        }
+        >>>.el-input {
+          height: 48px;
+          border-radius: 8px;
+          .el-input__inner {
+            // border: 0;
+            // box-shadow: 0 0 0px 1000px #fefcfe inset;
+            // border-radius: 0;
+            // padding: 0 5px;
+            height: 100%;
+            border: 1px solid #B1B3CC;
+            font-size: 16px;
+          }
+        }
+
+        .captcha {
+          position: relative;
+
+          .value {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+          }
+        }
+
+        .submit-btn {
+          width: 100%;
+          height: 45px;
+          margin-top: 50px;
+          background: #3385FF;
+          border-radius: 40px;
+          font-size: 18px;
+          font-weight: 400;
+          letter-spacing: 10px;
+          color: #FFFFFF;
+        }
+      }
+    }
+  }
 }
-</style>
+
+</style>

+ 292 - 0
ghs/src/pages/login/index1.vue

@@ -0,0 +1,292 @@
+<template>
+	<div class="scope">
+		<ul class="bg-bubbles">
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+		</ul>
+
+		<div class="tmp2">
+			<div class="title" style="color: #25aff3">
+				<!-- <icon-svg name="logo-t-lr"></icon-svg> -->
+				花卉宝
+			</div>
+
+			<el-form ref="form" class="form" size="medium" :disabled="saving">
+				<el-form-item label="用户名">
+					<el-input
+						placeholder="请输入用户名"
+						v-model="form.mobile"
+						maxlength="20"
+						@keyup.enter.native="next"
+						auto-complete="off"
+					></el-input>
+				</el-form-item>
+
+				<el-form-item label="密码">
+					<el-input
+						type="password"
+						placeholder="请输入密码"
+						v-model="form.password"
+						maxlength="20"
+						auto-complete="off"
+						@keyup.enter.native="next"
+					></el-input>
+				</el-form-item>
+
+				<!-- <el-form-item label="验证码" class="captcha">
+					<el-input
+						placeholder="请输入图片验证码"
+						maxlength="4"
+						v-model="form.verifyCode"
+						auto-complete="off"
+						@keyup.enter.native="next"
+					></el-input>
+
+					<captcha
+						ref="captcha"
+						class="value"
+						v-model="form.captchaId"
+						@change="captchaChange"
+					></captcha>
+				</el-form-item> -->
+
+				<el-button class="submit-btn" @click="next" :saving="saving">登录</el-button>
+			</el-form>
+		</div>
+	</div>
+</template>
+
+<script>
+// import { isPc } from '@/cool/utils/index';
+import index from './index';
+
+export default {
+	mixins: [index],
+
+	created() {
+		// if (!isPc()) {
+		// 	this.$router.push('/login-h5');
+		// }
+	}
+};
+</script>
+
+<style lang="stylus" scoped>
+.scope {
+	height: 100vh;
+	width: 100vw;
+	position: relative;
+
+	.tmp2 {
+		height: 383px;
+		width: 767px;
+		border-radius: 10px;
+		overflow: hidden;
+		position: absolute;
+		left: calc(50% - 384px);
+		top: calc(50% - 192px);
+		box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+
+		&:before {
+			content: '';
+			background-image: url('../../assets/images/login-bg.png');
+			background-size: 100% 100%;
+			position: absolute;
+			left: 0px;
+			right: 0;
+			height: 383px;
+			width: 767px;
+			z-index: 1;
+		}
+
+		&:after {
+			content: '';
+			background: linear-gradient(to right, $color, $color2);
+			position: absolute;
+			left: 0px;
+			right: 0;
+			height: 383px;
+			width: 767px;
+			z-index: 0;
+		}
+
+		.title {
+			position: absolute;
+			left: 25px;
+			top: 10px;
+			z-index: 1;
+			font-size: 20px;
+			letter-spacing: 1px;
+			text-shadow: 1px 2px 10px rgba(0, 0, 0, 0.4);
+
+			.icon-svg {
+				height: 40px;
+				width: 180px;
+			}
+		}
+
+		.el-form {
+			height: 280px;
+			width: 280px;
+			border-radius: 3px;
+			position: absolute;
+			right: 42px;
+			top: 45px;
+			z-index: 1;
+
+			.el-form-item {
+				margin-bottom: 5px;
+			}
+
+			>>>.el-input {
+				.el-input__inner {
+					border: 0;
+					box-shadow: 0 0 0px 1000px #fefcfe inset;
+					border-radius: 0;
+					padding: 0 5px;
+				}
+			}
+
+			.captcha {
+				position: relative;
+
+				.value {
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
+			}
+
+			.submit-btn {
+				width: 100%;
+				background: linear-gradient(to top left, $color, $color2);
+				color: #fff;
+				font-size: 15px;
+				letter-spacing: 2px;
+				cursor: pointer;
+				margin-top: 20px;
+			}
+		}
+	}
+
+	.bg-bubbles {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: linear-gradient(to bottom right, $color, $color2);
+	}
+
+	.bg-bubbles li {
+		position: absolute;
+		bottom: -160px;
+		width: 40px;
+		height: 40px;
+		background-color: rgba(255, 255, 255, 0.15);
+		list-style: none;
+		animation: square 15s infinite;
+		transition-timing-function: linear;
+		border-radius: 50%;
+	}
+
+	.bg-bubbles li:nth-child(1) {
+		left: 10%;
+	}
+
+	.bg-bubbles li:nth-child(2) {
+		left: 20%;
+		width: 90px;
+		height: 90px;
+		animation-delay: 2s;
+		animation-duration: 7s;
+	}
+
+	.bg-bubbles li:nth-child(3) {
+		left: 25%;
+		animation-delay: 4s;
+	}
+
+	.bg-bubbles li:nth-child(4) {
+		left: 40%;
+		width: 60px;
+		height: 60px;
+		animation-duration: 8s;
+		background-color: rgba(255, 255, 255, 0.3);
+	}
+
+	.bg-bubbles li:nth-child(5) {
+		left: 70%;
+	}
+
+	.bg-bubbles li:nth-child(6) {
+		left: 80%;
+		width: 120px;
+		height: 120px;
+		animation-delay: 3s;
+		background-color: rgba(255, 255, 255, 0.2);
+	}
+
+	.bg-bubbles li:nth-child(7) {
+		left: 32%;
+		width: 160px;
+		height: 160px;
+		animation-delay: 2s;
+	}
+
+	.bg-bubbles li:nth-child(8) {
+		left: 55%;
+		width: 20px;
+		height: 20px;
+		animation-delay: 4s;
+		animation-duration: 15s;
+	}
+
+	.bg-bubbles li:nth-child(9) {
+		left: 25%;
+		width: 10px;
+		height: 10px;
+		animation-delay: 2s;
+		animation-duration: 12s;
+		background-color: rgba(255, 255, 255, 0.3);
+	}
+
+	.bg-bubbles li:nth-child(10) {
+		left: 85%;
+		width: 160px;
+		height: 160px;
+		animation-delay: 5s;
+	}
+
+	@keyframes square {
+		0% {
+			opacity: 0.5;
+			transform: translateY(0px) rotate(45deg);
+		}
+
+		25% {
+			opacity: 0.75;
+			transform: translateY(-400px) rotate(90deg);
+		}
+
+		50% {
+			opacity: 1;
+			transform: translateY(-600px) rotate(135deg);
+		}
+
+		100% {
+			opacity: 0;
+			transform: translateY(-1000px) rotate(180deg);
+		}
+	}
+}
+</style>

+ 2 - 2
ghsApp/src/admin/home/me.vue

@@ -28,10 +28,10 @@
               />
               <view class="top-info_box">
                 <view>
-                  {{ infoData.sjName }}
+                  {{ infoData.shopName }}
                 </view>
                 <view>
-                  <text>{{ infoData.shopName }} {{infoData.sjId}} {{infoData.shopId}}</text>
+                  <text>{{ infoData.sjName }} {{infoData.sjId}} {{infoData.shopId}}</text>
                 </view>
               </view>
             </view>

+ 2 - 2
ghsApp/src/admin/staff/list.vue

@@ -38,7 +38,7 @@
 									<i class="iconfont iconshanchu1"></i>
 								</div>
 								<!-- 修改 -->
-								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
+								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}, type: 2})">
 								<i class="iconfont iconbianji"></i>
 								</div>
 							</div>
@@ -51,7 +51,7 @@
 			</div>
 			<!-- 按钮 -->
 			<div class="app-footer">
-				<div class="admin-button-com middle blue" @click="pageTo('/admin/staff/add')">添加员工</div>
+				<div class="admin-button-com middle blue" @click="pageTo({url: '/admin/staff/add', type: 2})">添加员工</div>
 			</div>
 		</block>
 		<!-- 角色管理 -->

+ 2 - 2
ghsApp/src/pagesArrears/list.vue

@@ -15,8 +15,8 @@
 						/>
 						<text class="name">{{ item.name }} </text>
 					</view>
-					<view class="item-main">
-						<view class="phone" @click="callUp(item.mobile)" ><i class="iconfont icondianhua1"></i> {{ item.mobile }}</view>
+					<view class="item-main" @click="gotoDetailsEvent(item)">
+						<view class="phone" @click.stop="callUp(item.mobile)" ><i class="iconfont icondianhua1"></i> {{ item.mobile }}</view>
 						<view class="price" @click="gotoDetailsEvent(item)">-{{ item.debtAmount }} <text class="iconfont iconxiangyou"></text>
 						</view>
 					</view>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-090ebb38.2bee2186.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-207c6046.4ba2e692.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-29e9dc5e.8892b558.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-6c2b731e.6afcd037.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-87f81c90.ee8e4761.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/css/chunk-f3fed1e4.464f1920.css


BIN
hd/dist/shop/img/login-bg1.8919581a.png


+ 1 - 1
hd/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.c06e62e6.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.c06e62e6.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.f62946e5.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.f62946e5.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/app.c06e62e6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/app.f62946e5.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-090ebb38.06962948.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-0c399f14.ec1c1be7.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-207c6046.091589a1.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-29e9dc5e.79baa67d.js


+ 1 - 0
hd/dist/shop/js/chunk-2d0ab66c.8b7dcab9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab66c"],{"14b5":function(n,p,o){n.exports=o.p+"img/login-bg1.8919581a.png"}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-35950b34.d5fc79e5.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-6c2b731e.44f138d5.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-6f99cf1a.6e94a198.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-87f81c90.90d369cf.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hd/dist/shop/js/chunk-f3fed1e4.e20dd337.js


BIN
hd/src/assets/images/login-bg1.png


+ 1 - 1
hd/src/pages/layout/topbar/index.vue

@@ -27,7 +27,7 @@
 		<div class="user" v-if="userInfo">
 			<el-dropdown trigger="click" :hide-on-click="false" @command="onCommand">
 				<span class="el-dropdown-link">
-					<span class="name">{{ userInfo.nickName | default_name }}</span>
+					<span class="name">{{ userInfo.name | default_name }}</span>
 					<img class="avatar" :src="userInfo.avatarUrl | default_avatar" alt="头像" />
 					<i class="el-icon-caret-bottom"></i>
 				</span>

+ 99 - 253
hd/src/pages/login/index.vue

@@ -1,25 +1,10 @@
 <template>
-	<div class="scope">
-		<ul class="bg-bubbles">
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-			<li></li>
-		</ul>
-
-		<div class="tmp2">
-			<div class="title" style="color: #25aff3">
-				<!-- <icon-svg name="logo-t-lr"></icon-svg> -->
-				花卉宝
-			</div>
-
-			<el-form ref="form" class="form" size="medium" :disabled="saving">
+  <div class="loginPage">
+    <div class="login_main">
+      <div class="login_left"></div>
+      <div class="login_right">
+        <p>欢迎登录</p>
+        <el-form ref="form" class="form" size="medium" :disabled="saving">
 				<el-form-item label="用户名">
 					<el-input
 						placeholder="请输入用户名"
@@ -40,253 +25,114 @@
 						@keyup.enter.native="next"
 					></el-input>
 				</el-form-item>
-
-				<!-- <el-form-item label="验证码" class="captcha">
-					<el-input
-						placeholder="请输入图片验证码"
-						maxlength="4"
-						v-model="form.verifyCode"
-						auto-complete="off"
-						@keyup.enter.native="next"
-					></el-input>
-
-					<captcha
-						ref="captcha"
-						class="value"
-						v-model="form.captchaId"
-						@change="captchaChange"
-					></captcha>
-				</el-form-item> -->
-
 				<el-button class="submit-btn" @click="next" :saving="saving">登录</el-button>
 			</el-form>
-		</div>
-	</div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-// import { isPc } from '@/cool/utils/index';
 import index from './index';
-
 export default {
 	mixins: [index],
 
 	created() {
-		// if (!isPc()) {
-		// 	this.$router.push('/login-h5');
-		// }
 	}
 };
 </script>
 
 <style lang="stylus" scoped>
-.scope {
-	height: 100vh;
+.loginPage{
+  height: 100vh;
 	width: 100vw;
 	position: relative;
-
-	.tmp2 {
-		height: 383px;
-		width: 767px;
-		border-radius: 10px;
-		overflow: hidden;
-		position: absolute;
-		left: calc(50% - 384px);
-		top: calc(50% - 192px);
-		box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
-
-		&:before {
-			content: '';
-			background-image: url('../../assets/images/login-bg.png');
-			background-size: 100% 100%;
-			position: absolute;
-			left: 0px;
-			right: 0;
-			height: 383px;
-			width: 767px;
-			z-index: 1;
-		}
-
-		&:after {
-			content: '';
-			background: linear-gradient(to right, $color, $color2);
-			position: absolute;
-			left: 0px;
-			right: 0;
-			height: 383px;
-			width: 767px;
-			z-index: 0;
-		}
-
-		.title {
-			position: absolute;
-			left: 25px;
-			top: 10px;
-			z-index: 1;
-			font-size: 20px;
-			letter-spacing: 1px;
-			text-shadow: 1px 2px 10px rgba(0, 0, 0, 0.4);
-
-			.icon-svg {
-				height: 40px;
-				width: 180px;
-			}
-		}
-
-		.el-form {
-			height: 280px;
-			width: 280px;
-			border-radius: 3px;
-			position: absolute;
-			right: 42px;
-			top: 45px;
-			z-index: 1;
-
-			.el-form-item {
-				margin-bottom: 5px;
-			}
-
-			>>>.el-input {
-				.el-input__inner {
-					border: 0;
-					box-shadow: 0 0 0px 1000px #fefcfe inset;
-					border-radius: 0;
-					padding: 0 5px;
-				}
-			}
-
-			.captcha {
-				position: relative;
-
-				.value {
-					position: absolute;
-					bottom: 0;
-					right: 0;
-				}
-			}
-
-			.submit-btn {
-				width: 100%;
-				background: linear-gradient(to top left, $color, $color2);
-				color: #fff;
-				font-size: 15px;
-				letter-spacing: 2px;
-				cursor: pointer;
-				margin-top: 20px;
-			}
-		}
-	}
-
-	.bg-bubbles {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		background: linear-gradient(to bottom right, $color, $color2);
-	}
-
-	.bg-bubbles li {
-		position: absolute;
-		bottom: -160px;
-		width: 40px;
-		height: 40px;
-		background-color: rgba(255, 255, 255, 0.15);
-		list-style: none;
-		animation: square 15s infinite;
-		transition-timing-function: linear;
-		border-radius: 50%;
-	}
-
-	.bg-bubbles li:nth-child(1) {
-		left: 10%;
-	}
-
-	.bg-bubbles li:nth-child(2) {
-		left: 20%;
-		width: 90px;
-		height: 90px;
-		animation-delay: 2s;
-		animation-duration: 7s;
-	}
-
-	.bg-bubbles li:nth-child(3) {
-		left: 25%;
-		animation-delay: 4s;
-	}
-
-	.bg-bubbles li:nth-child(4) {
-		left: 40%;
-		width: 60px;
-		height: 60px;
-		animation-duration: 8s;
-		background-color: rgba(255, 255, 255, 0.3);
-	}
-
-	.bg-bubbles li:nth-child(5) {
-		left: 70%;
-	}
-
-	.bg-bubbles li:nth-child(6) {
-		left: 80%;
-		width: 120px;
-		height: 120px;
-		animation-delay: 3s;
-		background-color: rgba(255, 255, 255, 0.2);
-	}
-
-	.bg-bubbles li:nth-child(7) {
-		left: 32%;
-		width: 160px;
-		height: 160px;
-		animation-delay: 2s;
-	}
-
-	.bg-bubbles li:nth-child(8) {
-		left: 55%;
-		width: 20px;
-		height: 20px;
-		animation-delay: 4s;
-		animation-duration: 15s;
-	}
-
-	.bg-bubbles li:nth-child(9) {
-		left: 25%;
-		width: 10px;
-		height: 10px;
-		animation-delay: 2s;
-		animation-duration: 12s;
-		background-color: rgba(255, 255, 255, 0.3);
-	}
-
-	.bg-bubbles li:nth-child(10) {
-		left: 85%;
-		width: 160px;
-		height: 160px;
-		animation-delay: 5s;
-	}
-
-	@keyframes square {
-		0% {
-			opacity: 0.5;
-			transform: translateY(0px) rotate(45deg);
-		}
-
-		25% {
-			opacity: 0.75;
-			transform: translateY(-400px) rotate(90deg);
-		}
-
-		50% {
-			opacity: 1;
-			transform: translateY(-600px) rotate(135deg);
-		}
-
-		100% {
-			opacity: 0;
-			transform: translateY(-1000px) rotate(180deg);
-		}
-	}
+  background: #3385FF;
+  &>.login_main{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 1017px;
+    height: 572px;
+    background: #fff;
+    &>div{
+      width: 50%;
+      height: 100%;
+      display: inline-block;
+    }
+    &>.login_left{
+      vertical-align: top;
+      background: url('../../assets/images/login-bg1.png') no-repeat center;
+      background-size: cover;
+    }
+    &>.login_right{
+      border-left: 1px dashed #333;
+      vertical-align: top;
+      padding-left: 67px;
+      box-sizing: border-box;
+      &>p{
+        margin-top: 64px;
+        margin-bottom: 43px;
+        font-size: 32px;
+        font-weight: 500;
+        color: #3385FF;
+      }
+      .el-form {
+        // height:30vh;
+        width: 83%;
+        border-radius: 3px;
+        // position: absolute;
+        // right: 42px;
+        // top: 45px;
+        z-index: 1;
+
+        .el-form-item {
+          margin-bottom: 5px;
+        }
+        >>>.el-form-item__label{
+          color: #9289A6;
+          font-size: 16px;
+          line-height 33px;
+        }
+        >>>.el-input {
+          height: 48px;
+          border-radius: 8px;
+          .el-input__inner {
+            // border: 0;
+            // box-shadow: 0 0 0px 1000px #fefcfe inset;
+            // border-radius: 0;
+            // padding: 0 5px;
+            height: 100%;
+            border: 1px solid #B1B3CC;
+            font-size: 16px;
+          }
+        }
+
+        .captcha {
+          position: relative;
+
+          .value {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+          }
+        }
+
+        .submit-btn {
+          width: 100%;
+          height: 45px;
+          margin-top: 50px;
+          background: #3385FF;
+          border-radius: 40px;
+          font-size: 18px;
+          font-weight: 400;
+          letter-spacing: 10px;
+          color: #FFFFFF;
+        }
+      }
+    }
+  }
 }
-</style>
+
+</style>

+ 292 - 0
hd/src/pages/login/index1.vue

@@ -0,0 +1,292 @@
+<template>
+	<div class="scope">
+		<ul class="bg-bubbles">
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+			<li></li>
+		</ul>
+
+		<div class="tmp2">
+			<div class="title" style="color: #25aff3">
+				<!-- <icon-svg name="logo-t-lr"></icon-svg> -->
+				花卉宝
+			</div>
+
+			<el-form ref="form" class="form" size="medium" :disabled="saving">
+				<el-form-item label="用户名">
+					<el-input
+						placeholder="请输入用户名"
+						v-model="form.mobile"
+						maxlength="20"
+						@keyup.enter.native="next"
+						auto-complete="off"
+					></el-input>
+				</el-form-item>
+
+				<el-form-item label="密码">
+					<el-input
+						type="password"
+						placeholder="请输入密码"
+						v-model="form.password"
+						maxlength="20"
+						auto-complete="off"
+						@keyup.enter.native="next"
+					></el-input>
+				</el-form-item>
+
+				<!-- <el-form-item label="验证码" class="captcha">
+					<el-input
+						placeholder="请输入图片验证码"
+						maxlength="4"
+						v-model="form.verifyCode"
+						auto-complete="off"
+						@keyup.enter.native="next"
+					></el-input>
+
+					<captcha
+						ref="captcha"
+						class="value"
+						v-model="form.captchaId"
+						@change="captchaChange"
+					></captcha>
+				</el-form-item> -->
+
+				<el-button class="submit-btn" @click="next" :saving="saving">登录</el-button>
+			</el-form>
+		</div>
+	</div>
+</template>
+
+<script>
+// import { isPc } from '@/cool/utils/index';
+import index from './index';
+
+export default {
+	mixins: [index],
+
+	created() {
+		// if (!isPc()) {
+		// 	this.$router.push('/login-h5');
+		// }
+	}
+};
+</script>
+
+<style lang="stylus" scoped>
+.scope {
+	height: 100vh;
+	width: 100vw;
+	position: relative;
+
+	.tmp2 {
+		height: 383px;
+		width: 767px;
+		border-radius: 10px;
+		overflow: hidden;
+		position: absolute;
+		left: calc(50% - 384px);
+		top: calc(50% - 192px);
+		box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
+
+		&:before {
+			content: '';
+			background-image: url('../../assets/images/login-bg.png');
+			background-size: 100% 100%;
+			position: absolute;
+			left: 0px;
+			right: 0;
+			height: 383px;
+			width: 767px;
+			z-index: 1;
+		}
+
+		&:after {
+			content: '';
+			background: linear-gradient(to right, $color, $color2);
+			position: absolute;
+			left: 0px;
+			right: 0;
+			height: 383px;
+			width: 767px;
+			z-index: 0;
+		}
+
+		.title {
+			position: absolute;
+			left: 25px;
+			top: 10px;
+			z-index: 1;
+			font-size: 20px;
+			letter-spacing: 1px;
+			text-shadow: 1px 2px 10px rgba(0, 0, 0, 0.4);
+
+			.icon-svg {
+				height: 40px;
+				width: 180px;
+			}
+		}
+
+		.el-form {
+			height: 280px;
+			width: 280px;
+			border-radius: 3px;
+			position: absolute;
+			right: 42px;
+			top: 45px;
+			z-index: 1;
+
+			.el-form-item {
+				margin-bottom: 5px;
+			}
+
+			>>>.el-input {
+				.el-input__inner {
+					border: 0;
+					box-shadow: 0 0 0px 1000px #fefcfe inset;
+					border-radius: 0;
+					padding: 0 5px;
+				}
+			}
+
+			.captcha {
+				position: relative;
+
+				.value {
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
+			}
+
+			.submit-btn {
+				width: 100%;
+				background: linear-gradient(to top left, $color, $color2);
+				color: #fff;
+				font-size: 15px;
+				letter-spacing: 2px;
+				cursor: pointer;
+				margin-top: 20px;
+			}
+		}
+	}
+
+	.bg-bubbles {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: linear-gradient(to bottom right, $color, $color2);
+	}
+
+	.bg-bubbles li {
+		position: absolute;
+		bottom: -160px;
+		width: 40px;
+		height: 40px;
+		background-color: rgba(255, 255, 255, 0.15);
+		list-style: none;
+		animation: square 15s infinite;
+		transition-timing-function: linear;
+		border-radius: 50%;
+	}
+
+	.bg-bubbles li:nth-child(1) {
+		left: 10%;
+	}
+
+	.bg-bubbles li:nth-child(2) {
+		left: 20%;
+		width: 90px;
+		height: 90px;
+		animation-delay: 2s;
+		animation-duration: 7s;
+	}
+
+	.bg-bubbles li:nth-child(3) {
+		left: 25%;
+		animation-delay: 4s;
+	}
+
+	.bg-bubbles li:nth-child(4) {
+		left: 40%;
+		width: 60px;
+		height: 60px;
+		animation-duration: 8s;
+		background-color: rgba(255, 255, 255, 0.3);
+	}
+
+	.bg-bubbles li:nth-child(5) {
+		left: 70%;
+	}
+
+	.bg-bubbles li:nth-child(6) {
+		left: 80%;
+		width: 120px;
+		height: 120px;
+		animation-delay: 3s;
+		background-color: rgba(255, 255, 255, 0.2);
+	}
+
+	.bg-bubbles li:nth-child(7) {
+		left: 32%;
+		width: 160px;
+		height: 160px;
+		animation-delay: 2s;
+	}
+
+	.bg-bubbles li:nth-child(8) {
+		left: 55%;
+		width: 20px;
+		height: 20px;
+		animation-delay: 4s;
+		animation-duration: 15s;
+	}
+
+	.bg-bubbles li:nth-child(9) {
+		left: 25%;
+		width: 10px;
+		height: 10px;
+		animation-delay: 2s;
+		animation-duration: 12s;
+		background-color: rgba(255, 255, 255, 0.3);
+	}
+
+	.bg-bubbles li:nth-child(10) {
+		left: 85%;
+		width: 160px;
+		height: 160px;
+		animation-delay: 5s;
+	}
+
+	@keyframes square {
+		0% {
+			opacity: 0.5;
+			transform: translateY(0px) rotate(45deg);
+		}
+
+		25% {
+			opacity: 0.75;
+			transform: translateY(-400px) rotate(90deg);
+		}
+
+		50% {
+			opacity: 1;
+			transform: translateY(-600px) rotate(135deg);
+		}
+
+		100% {
+			opacity: 0;
+			transform: translateY(-1000px) rotate(180deg);
+		}
+	}
+}
+</style>

+ 2 - 2
hdApp/src/admin/home/me.vue

@@ -28,10 +28,10 @@
               />
               <view class="top-info_box">
                 <view>
-                  {{ infoData.sjName }}
+                  {{ infoData.shopName }}
                 </view>
                 <view>
-                  <text>{{ infoData.shopName }} {{infoData.sjId}} {{infoData.shopId}}</text>
+                  <text>{{ infoData.sjName }} {{infoData.sjId}} {{infoData.shopId}}</text>
                 </view>
               </view>
             </view>

+ 2 - 2
hdApp/src/admin/staff/list.vue

@@ -33,7 +33,7 @@
 								</div>
 							</div>
 							<div class="list-det-right">
-								<div  @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
+								<div  @click="pageTo({url: '/admin/staff/add',query: {id: item.id}, type: 2})">
 									<i class="iconfont iconbianji"></i>
 								</div>
 								<div v-if="item.super == 0 && item.id != loginInfo.shopAdminId" @click="delModalFn(item)">
@@ -49,7 +49,7 @@
 			</div>
 			<!-- 按钮 -->
 			<div class="app-footer">
-				<div class="admin-button-com middle blue" @click="pageTo('/admin/staff/add')">添加员工</div>
+				<div class="admin-button-com middle blue" @click="pageTo({url:'/admin/staff/add', type: 2})">添加员工</div>
 			</div>
 		</block>
 		<!-- 角色管理 -->

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-04e2da8e.64e7fe0e.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-133a8271.64c422ab.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-207c6046.4ba2e692.css


+ 0 - 0
pt/dist/web/css/chunk-05393050.8c08fa62.css → pt/dist/web/css/chunk-3b433378.8c08fa62.css


+ 0 - 0
pt/dist/web/css/chunk-7eee58d0.9a0f1510.css → pt/dist/web/css/chunk-47564ca8.9a0f1510.css


+ 0 - 0
pt/dist/web/css/chunk-af22d442.f1035bc4.css → pt/dist/web/css/chunk-4927dd0a.f1035bc4.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-6c2b731e.6afcd037.css


+ 0 - 0
pt/dist/web/css/chunk-264d02a9.8f2c478f.css → pt/dist/web/css/chunk-7302a479.8f2c478f.css


+ 0 - 0
pt/dist/web/css/chunk-e3296878.d76958d7.css → pt/dist/web/css/chunk-77156228.d76958d7.css


+ 0 - 0
pt/dist/web/css/chunk-e82da562.ce53fab1.css → pt/dist/web/css/chunk-7c199f12.ce53fab1.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-a8f6a870.283b831d.css


+ 0 - 0
pt/dist/web/css/chunk-150f32d6.db770408.css → pt/dist/web/css/chunk-c1071978.db770408.css


+ 0 - 0
pt/dist/web/css/chunk-5ee51234.bb378a0f.css → pt/dist/web/css/chunk-cb6d7e60.bb378a0f.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-ce878c72.45afedf7.css


+ 0 - 0
pt/dist/web/css/chunk-3accf308.d4d594a8.css → pt/dist/web/css/chunk-d5e303e8.d4d594a8.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-f0a1214e.78f07b4a.css


BIN
pt/dist/web/img/login-bg1.8919581a.png


+ 1 - 1
pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.9bc7bd1a.js" rel="preload" as="script"><link href="/js/chunk-libs.45fbbdb7.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.45fbbdb7.js"></script><script src="/js/app.9bc7bd1a.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.b6fecc90.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.b6fecc90.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/app.9bc7bd1a.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/app.b6fecc90.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-0044508d.42a9bb7c.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-02addfa6.788e7ec7.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-04e2da8e.9d511230.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-05393050.ccaf3c51.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-079b3ce4.ced3a376.js


+ 0 - 0
pt/dist/web/js/chunk-08ad3592.6e7199c0.js → pt/dist/web/js/chunk-08ad3592.aba2813f.js


+ 1 - 0
pt/dist/web/js/chunk-0ccb396c.1a61a28a.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0ccb396c"],{"0dda":function(a,t,s){},b630:function(a,t,s){"use strict";s.r(t);var e=function(){var a=this,t=a.$createElement,s=a._self._c||t;return s("div",{staticClass:"common-captcha",on:{click:a.refresh}},[a.svg?s("div",{staticClass:"svg",domProps:{innerHTML:a._s(a.svg)}}):s("img",{staticClass:"base64",attrs:{src:a.base64,alt:""}})])},c=[],n=(s("b3b0"),s("a5f8"),{data:function(){return{svg:"",base64:""}},mounted:function(){this.refresh()},methods:{refresh:function(){var a=this;this.$service.common.captcha({height:36,width:110}).then((function(t){var s=t.captchaId,e=t.data;e.includes("data:image/png;base64,")?a.base64=e:a.svg=e,a.$emit("input",s),a.$emit("change",{base64:a.base64,svg:a.svg,captchaId:s})})).catch((function(t){a.$message.error(t)}))}}}),i=n,r=(s("b88a"),s("5d22")),o=Object(r["a"])(i,e,c,!1,null,"01a8a8e2",null);t["default"]=o.exports},b88a:function(a,t,s){"use strict";s("0dda")}}]);

+ 0 - 1
pt/dist/web/js/chunk-0ccb396c.c4a8eb79.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0ccb396c"],{"0dda":function(t,a,s){},b630:function(t,a,s){"use strict";s.r(a);var e=function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("div",{staticClass:"common-captcha",on:{click:t.refresh}},[t.svg?s("div",{staticClass:"svg",domProps:{innerHTML:t._s(t.svg)}}):s("img",{staticClass:"base64",attrs:{src:t.base64,alt:""}})])},c=[],n=(s("e395"),s("9e4b"),{data:function(){return{svg:"",base64:""}},mounted:function(){this.refresh()},methods:{refresh:function(){var t=this;this.$service.common.captcha({height:36,width:110}).then((function(a){var s=a.captchaId,e=a.data;e.includes("data:image/png;base64,")?t.base64=e:t.svg=e,t.$emit("input",s),t.$emit("change",{base64:t.base64,svg:t.svg,captchaId:s})})).catch((function(a){t.$message.error(a)}))}}}),i=n,r=(s("b88a"),s("5d22")),o=Object(r["a"])(i,e,c,!1,null,"01a8a8e2",null);a["default"]=o.exports},b88a:function(t,a,s){"use strict";s("0dda")}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-0ddc6658.25cc4f7c.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-0e636808.eb5dc0b3.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-121bbdda.7cf3e5e8.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-133a8271.f15fcf9d.js


+ 0 - 1
pt/dist/web/js/chunk-150f32d6.6949d3f8.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-150f32d6"],{"051b":function(t,o,e){},1818:function(t,o,e){"use strict";var r=e("c52d"),n=e("ea4b"),i=e("9018");t.exports=function(t){var o=r(this),e=i(o.length),l=arguments.length,a=n(l>1?arguments[1]:void 0,e),s=l>2?arguments[2]:void 0,c=void 0===s?e:n(s,e);while(c>a)o[a++]=t;return o}},"1b29":function(t,o,e){"use strict";e.r(o);var r=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("e-charts",{attrs:{options:t.options}})},n=[],i=(e("8e49"),e("b4b0"),e("6678")),l=e.n(i),a=(e("679c"),{name:"echart1",components:{ECharts:l.a},data:function(){return{options:{tooltip:{trigger:"axis"},xAxis:[{type:"category",data:["2019-01","2019-02","2019-03","2019-04","2019-05","2019-06"],axisLine:{lineStyle:{color:"#999"}}}],yAxis:[{type:"value",splitNumber:4,splitLine:{lineStyle:{type:"dashed",color:"#DDD"}},axisLine:{show:!1,lineStyle:{color:"#333"}},nameTextStyle:{color:"#999"},splitArea:{show:!1}}],series:[{name:"课时",type:"line",data:new Array(6).fill(1).map((function(){return parseInt(1e4*Math.random())})),lineStyle:{normal:{width:8,color:{type:"linear",colorStops:[{offset:0,color:"#A9F387"},{offset:1,color:"#48D8BF"}],globalCoord:!1},shadowColor:"rgba(72,216,191, 0.3)",shadowBlur:10,shadowOffsetY:20}},itemStyle:{normal:{color:"#fff",borderWidth:10,borderColor:"#A9F387"}},smooth:!0}]}}}}),s=a,c=(e("ff76"),e("5d22")),f=Object(c["a"])(s,r,n,!1,null,"28c126ad",null);o["default"]=f.exports},b4b0:function(t,o,e){var r=e("3478"),n=e("1818"),i=e("d3b1");r({target:"Array",proto:!0},{fill:n}),i("fill")},ff76:function(t,o,e){"use strict";e("051b")}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-15f90847.1bd2e841.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-179dd69d.7b336013.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-17ad7868.e031ac47.js


+ 0 - 0
pt/dist/web/js/chunk-1ea202b7.c223ed2d.js → pt/dist/web/js/chunk-1ea202b7.aa890bf9.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-1f8a1561.843ba1a8.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-207c6046.37af907a.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-22924849.d81f7720.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.3431c8e8.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.cb4a17c8.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-2631ef66.af890ee6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-264d02a9.0261cbb9.js


+ 0 - 0
pt/dist/web/js/chunk-2b7f22ea.b1436a09.js → pt/dist/web/js/chunk-2b7f22ea.c2908499.js


+ 1 - 0
pt/dist/web/js/chunk-2d0ab66c.8b7dcab9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab66c"],{"14b5":function(n,p,o){n.exports=o.p+"img/login-bg1.8919581a.png"}}]);

+ 0 - 0
pt/dist/web/js/chunk-2d0af06a.c25b84a6.js → pt/dist/web/js/chunk-2d0af06a.3764f3d9.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-2d0b168d.ac871928.js


+ 0 - 0
pt/dist/web/js/chunk-2d0c06f2.0960d0d4.js → pt/dist/web/js/chunk-2d0c06f2.33a1a412.js


+ 0 - 0
pt/dist/web/js/chunk-2d0c0acc.1d7d3165.js → pt/dist/web/js/chunk-2d0c0acc.d4a1a0a3.js


+ 1 - 1
pt/dist/web/js/chunk-2d0c8bc6.e8bd905a.js → pt/dist/web/js/chunk-2d0c8bc6.6a1acedd.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c8bc6"],{"55c3":function(t,i,s){"use strict";s.r(i);s("42be");i["default"]={watch:{"list.loading":function(t){}},computed:{totalPages:function(){return this.$util.isEmpty(this.list.total)?0:Math.ceil(this.list.total/this.list.limit)}},data:function(){return{list:{data:[],page:1,pageSize:10,loading:!0,finished:!1,total:0}}},methods:{resetList:function(){this.list={data:[],page:1,pageSize:10,loading:!0,finished:!1,total:null}},completes:function(t,i){this.list.loading=!1,this.list.data=1===this.list.page?t.list||t.data||t[i]:this.list.data.concat(t.list||t.data||t[i]),this.list.total=t.totalPage*this.list.pageSize,0==t.moreData?this.list.finished=!0:++this.list.page}}}}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c8bc6"],{"55c3":function(t,i,a){"use strict";a.r(i);a("16ca");i["default"]={watch:{"list.loading":function(t){}},computed:{totalPages:function(){return this.$util.isEmpty(this.list.total)?0:Math.ceil(this.list.total/this.list.limit)}},data:function(){return{list:{data:[],page:1,pageSize:10,loading:!0,finished:!1,total:0}}},methods:{resetList:function(){this.list={data:[],page:1,pageSize:10,loading:!0,finished:!1,total:null}},completes:function(t,i){this.list.loading=!1,this.list.data=1===this.list.page?t.list||t.data||t[i]:this.list.data.concat(t.list||t.data||t[i]),this.list.total=t.totalPage*this.list.pageSize,0==t.moreData?this.list.finished=!0:++this.list.page}}}}}]);

+ 0 - 0
pt/dist/web/js/chunk-2d0cbb24.b5239974.js → pt/dist/web/js/chunk-2d0cbb24.377bd332.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-2d0d5c2a.97c9d848.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-2d0d5c2a.a64647ba.js


+ 0 - 0
pt/dist/web/js/chunk-2d0d622c.a1333305.js → pt/dist/web/js/chunk-2d0d622c.f8b79576.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-2d0db0d2.e9cc95ee.js


Некоторые файлы не были показаны из-за большого количества измененных файлов