rabin 2 years ago
parent
commit
553cfcd7b2

+ 1 - 1
service/option/assets/pc/css/custom-bars.css

@@ -19,7 +19,7 @@
 }
 /* line 40, ../scss/custom-bars.scss */
 .flexy-grid:nth-of-type(odd) {
-  background-color: #D8DBE4;
+  /*background-color: #D8DBE4;*/
 }
 /* line 43, ../scss/custom-bars.scss */
 .flexy-grid input[type='checkbox'] {

+ 17 - 10
service/option/assets/pc/html/set.html

@@ -24,29 +24,33 @@
 <body>
 	<div class="container">
 		<header class="codrops-header">
-			<h1>期权管理系统</h1>
+			<h1 style="font-size:30px">期权管理系统</h1>
 		</header>
 		
-		<section class="content">
+		<section class="content" style="margin:0 auto;width:800px;">
 			
 			<article class="flexy-grid">
-				<h3>点击开始进行期权交付</h3>
+				<h3 style="font-size: 50px;">点击开始进行期权导入</h3>
 				
-				<div class="site-main-button" style="margin-top: 20px; margin-bottom: 0;">
-				  <button class="layui-btn layui-btn-danger site-main-active" data-type="set">设置</button>
-				  <button class="layui-btn layui-btn-danger site-main-active" data-type="loading">开始</button>
-				</div>
 			</article>
 			<div class="layui-progress layui-progress-big" lay-showPercent="true" lay-filter="main">
 			  <div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
 			</div>
+
 		</section>
 		<!-- Related demos -->
+
+		<div style="margin:0 auto;width: 100px;">
+			<div class="site-main-button" style="margin-top: 20px; margin-bottom: 0;">
+			  <button class="layui-btn layui-btn-danger site-main-active" data-type="set" style="display:none;">设置</button>
+			  <button class="layui-btn layui-btn-danger site-main-active" data-type="loading">开始</button>
+			</div>
+		</div>
 		
 	</div>
 	<script>
-	var data;
-	var total = 0;
+	var data = <{$list}>;
+	var total = '<{$total}>';
 	var n = 0;
 	var j;
 	var DISABLED = 'layui-btn-disabled';
@@ -69,6 +73,10 @@
 				element.progress('main', n+'%');
 				
 				setTimeout(function(){loop(i,othis)}, 1000);
+			} else {
+				$('h3').html('完成');
+				othis.removeClass(DISABLED);
+				element.progress('main', '100%');
 			}
 		}
 
@@ -138,7 +146,6 @@
 	      var start = value[0];
 	      var end = value[1];
 	      $.getJSON(url, {start:start,end:end}, function(t) {
-	   			state = 1;
 	   			total = t.data.total;
 	   			data = t.data.list;
 	   			layer.closeAll();

+ 4 - 3
service/option/src/Import.php

@@ -8,15 +8,16 @@ class Import
 {
     public function set()
     {
-    	$data = array();
+    	$data = $this->get();
+        $data['list'] = Dever::json_encode($data['list']);
         $data['url'] = Dever::url('import.get?json=1', 'option');
         return Dever::render('set', $data);
     }
 
     public function get()
     {
-    	$where['start'] = Dever::input('start');
-    	$where['end'] = Dever::input('end');
+    	$where['start'] = Dever::input('start', 1);
+    	$where['end'] = Dever::input('end', 10);
 
     	# 获取索引数值内的账户列表
         $data['list'] = Dever::db('option/member')->getDataByKeys($where);