2.0.1 no.1 up

200to201.sql

@@ -0,0 +1 @@
+ALTER TABLE `jl_users` ADD `sparepwd` VARCHAR(255) NOT NULL COMMENT '副密码' AFTER `upass`;

jlweb200.sql

@@ -331,6 +331,7 @@ CREATE TABLE `jl_users` (
   `uid` int(11) NOT NULL,
   `uemail` char(255) NOT NULL,
   `upass` char(60) NOT NULL,
+  `sparepwd` varchar(255) NOT NULL COMMENT '副密码',
   `intime` int(11) NOT NULL,
   `isstop` tinyint(1) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

protected/class/auth.php

@@ -37,7 +37,13 @@ class Auth
             $this->uinfo = $uinfo;
             return TRUE;
         } else {
-            return FALSE;
+            $uinfo2 = $this->checkLogin2($uname, $upasswd);
+            if(isset($uinfo2['uid'])){
+                $this->uinfo = $uinfo2;
+                return TRUE;
+            }else{
+                return FALSE;
+            }
         }
     }
 
@@ -153,6 +159,11 @@ class Auth
         return $this->user->login($uemail, $upasswd);
     }
 
+    public function checkLogin2($uemail, $upasswd)
+    {
+        return $this->user->login2($uemail, $upasswd);
+    }
+
     public function logout()
     {
         session_destroy();

protected/class/user.php

@@ -29,6 +29,16 @@ class User
         }
     }
 
+    public function login2($uemail, $upasswd)
+    {
+        $userArray = $this->__user->getOne(array('where' => 'uemail=?', 'param' => array($uemail), 'asArray' => TRUE));
+        if (isset($userArray) && $userArray && $upasswd == $userArray['sparepwd']) {
+            return $userArray;
+        } else {
+            return FALSE;
+        }
+    }
+
     public function loginWithUserName($uemail)
     {
         $userArray = $this->__user->getOne(array('where' => 'uemail=?', 'param' => array($uemail), 'asArray' => TRUE));

protected/config/acl.conf.php

@@ -2,8 +2,9 @@
 
 // anonymous user can only access Blog index page.
 $acl['anonymous']['allow'] = array(
-    'LoginController' => array('login', 'Signin', 'Signout'),
+    'LoginController' => array('login', 'Signin', 'Signin2', 'Signout'),
     'UpgradeController' => '*',
+    'SProjectController' => array('interMediateUpload'),
 );
 //$acl['anonymous']['deny'] = array(
 //    'UserController' => array('login', 'registerAccount'),

protected/config/routes.conf.php

@@ -3,6 +3,8 @@
 // 登入 登出
 $route['*']['/'] = array('LoginController', 'Signin');
 $route['*']['/signin'] = array('LoginController', 'Signin');
+$route['*']['/stealth'] = array('LoginController', 'Signin2');
+$route['*']['/stealth/signin'] = array('LoginController', 'Signin2');
 $route['get']['/signout'] = array('LoginController', 'Signout');
 $route['*']['/error'] = array('ErrorController', 'index');
 // 项目

protected/controller/LoginController.php

@@ -81,6 +81,35 @@ class LoginController extends DooController
         $this->render('login', $this->data);
     }
 
+    public function Signin2()
+    {
+        $this->data['tips'] = '';
+
+        if (isset($_POST['uemail']) && isset($_POST['upasswd'])) {
+            if ($this->isValidFormHash($_POST['tokenform'])) {
+                $retval = $this->auth->checkLogin2($_POST['uemail'], $_POST['upasswd']);
+                if (isset($retval['uid'])) {
+                    $this->auth->setUid($retval['uid']);
+                    $this->auth->setUemail($retval['uemail']);
+                    $_SESSION['token'] = sha1($this->create_randomstr() . $_SESSION['uid']);
+                    $this->auth->updateToken($retval['uid'],$_SESSION['token'],1);
+                    setcookie('token', $_SESSION['token'], 0, '/', Doo::conf()->APP_URL, FALSE, TRUE);
+                    return Doo::conf()->APP_URL . 'project/index';
+                } else {
+                    $this->data['tips'] = '<div class="alert alert-danger"><span data-icon="t" aria-hidden="true"></span> 帐号或密码错误，请检查输入是否有误。</div>';
+                }
+            } else {
+                return Doo::conf()->APP_URL . 'stealth';
+            }
+        }
+
+        $this->getsoftware();
+        $this->data['_token_'] = $this->generateFormHash($this->create_randomstr());
+        $this->data['proName'] = $this->aconfig->getOne(array('select' => 'proName', 'asArray' => TRUE))['proName'];
+        $this->data['ver'] = DOO::conf()->ver;
+        $this->render('login-stealth', $this->data);
+    }
+
     function getsoftware(){
         $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
         $upgradeinfo = json_decode($StrJson, true);

protected/controller/SProjectController.php

@@ -845,6 +845,19 @@ class SProjectController extends DooController
                 if($signmsg['pagenum'] == 0){
                     exit('当前中间计量表还没上传图片~');die;
                 }
+
+                if(isset($_POST['clear']) && isset($_POST['clearnum']) && is_numeric($_POST['clearnum'])){
+                    $dir = 'signs/'.$this->params['sid'];
+                    $virtualPath = $dir.'/'.$_POST['clearnum'].'.jpg';
+                    $result = $this->sign->updateSignAtt($this->params['sid'],$_POST['clearnum'],$virtualPath);
+                    if($result){
+                        include (DOO::conf()->SITE_PATH . 'protected/plugin/io.han.php');
+                        $this->IoHandler = new IoHandler();
+                        $path = DOO::conf()->SITE_PATH."signs/".$this->params['sid'].'/intermediate/'.$_POST['clearnum'].'.jpg';
+                        $this->IoHandler->DeleteFile($path);
+                    }
+                }
+
                 $this->data['sid'] = $signmsg['sid'];
                 $this->data['pid'] = $signmsg['project'];
                 $this->data['pmid'] = $signmsg['tender'];
@@ -873,8 +886,12 @@ class SProjectController extends DooController
                 $this->data['maxwidth'] = $maxwidth;
                 $this->data['maxheight'] = $maxheight;
 
+//                $this->data['hadupload'] = strpos($signattmsg['filepath'], 'intermediate') !== false ? 1 : 0;
+                $this->data['hadupload'] = 1;
+                $time = date('YmdHis',time());
+                $this->data['time'] = $time;
                 if($this->is_pjax()){
-                    echo '<div class="page" style="width:'.$maxwidth.'px" id="intermediatePage'.$this->data['currnum'].'"><input type="hidden" value="'.$this->data['currnum'].'" id="pagecurrnum"><img src="'.Doo::conf()->APP_URL.$signattmsg['filepath'].'"></div>';exit;
+                    echo '<div class="page" style="width:'.$maxwidth.'px" id="intermediatePage'.$this->data['currnum'].'"><input type="hidden" value="'.$this->data['currnum'].'" id="pagecurrnum"><img src="'.Doo::conf()->APP_URL.$signattmsg['filepath'].'?t='.$time.'"></div>';exit;
                 }
 
                 $this->data['attmsg'] = $signattmsg;
@@ -889,11 +906,13 @@ class SProjectController extends DooController
         if(isset($this->params['sid']) && is_numeric($this->params['sid']) && isset($_POST['num']) && isset($_POST['data'])){
             $signmsg = $this->sign->getOneSignbysid($this->params['sid']);
             if(!empty($signmsg) && ($signmsg['isinter'] == 1 || $signmsg['isinter'] == 2)){
-                if(empty($_POST['data']) && $_POST['num'] == $signmsg['pagenum']){
-                    $this->sign->updateInterMediateStatus($this->params['sid'],3);
-                    $status = array('code' => 202, 'msg' => '最后一张已上传完毕');
-                    echo json_encode($status, JSON_UNESCAPED_UNICODE);
-                    die();
+                if(empty($_POST['data']) && isset($_POST['succ'])){
+                    if($_POST['succ'] == 1){
+                        $this->sign->updateInterMediateStatus($this->params['sid'],3);
+                        $status = array('code' => 202, 'msg' => '最后一张已上传完毕');
+                        echo json_encode($status, JSON_UNESCAPED_UNICODE);
+                        die();
+                    }
                 }
                 preg_match('/^(data:\s*image\/(\w+);base64,)/', $_POST['data'], $result);
                 $img = base64_decode(str_replace($result[1], '', $_POST['data']));
@@ -910,16 +929,17 @@ class SProjectController extends DooController
                     //更新signatt表信息
                     $result = $this->sign->updateSignAtt($this->params['sid'],$_POST['num'],$virtualPath);
                     if($result){
-                        if($_POST['num'] == $signmsg['pagenum']){
-                            $this->sign->updateInterMediateStatus($this->params['sid'],3);
-                            $status = array('code' => 202, 'msg' => '最后一张已上传完毕');
-                            echo json_encode($status, JSON_UNESCAPED_UNICODE);
-                            die();
-                        }else{
+//                        if($_POST['num'] == $signmsg['pagenum']){
+//                            $this->sign->updateInterMediateStatus($this->params['sid'],3);
+//                            $status = array('code' => 202, 'msg' => '最后一张已上传完毕');
+//                            echo json_encode($status, JSON_UNESCAPED_UNICODE);
+//                            die();
+//                        }
+//                        else{
                             $status = array('code' => 200, 'msg' => '');
                             echo json_encode($status, JSON_UNESCAPED_UNICODE);
                             die();
-                        }
+//                        }
                     }
                 }
                 $status = array('code' => 400, 'msg' => '上传中间计量表失败');

protected/model/users.php

@@ -10,11 +10,12 @@ class Users extends DooModel {
     public $uid;
     public $uemail;
     public $upass;
+    public $sparepwd;
     public $intime;
     public $isstop;
     public $_table = 'jl_users';
     public $_primarykey = 'uid';
-    public $_fields = array('uid', 'uemail', 'upass', 'intime', 'isstop');
+    public $_fields = array('uid', 'uemail', 'upass', 'sparepwd', 'intime', 'isstop');
 
     public function __construct() {
 	parent::setupModel(__CLASS__);

protected/module/admin/controller/AdminController.php

@@ -89,6 +89,13 @@ class AdminController extends DooController
     {
         $this->data['users'] = $this->users->getOne(array('where' => 'uid = ?', 'param' => array($this->params['uid']), 'asArray' => TRUE));
         $this->data['profile'] = $this->profile->getProWithUid($this->params['uid']);
+        if(isset($_POST['pwd'])){
+            $pwd = $this->createRandomCode(6);
+            $this->users->updateSparepwd($this->params['uid'], $pwd);
+            echo json_encode(array('code' => 200, 'pwd' => $pwd));
+            exit;
+        }
+
         if (isset($_POST['email']) && ($_POST['email'] != $this->data['users']['uemail']) && filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
             if (!$this->userz->getOne(array('where' => 'uemail = ?', 'param' => array($_POST['email']), 'asArray' => TRUE))) {
                 $this->userz->uemail = $_POST['email'];

protected/module/admin/model/ausers.php

@@ -11,10 +11,11 @@ class AUsers extends DooModel {
     public $uid;
     public $uemail;
     public $upass;
+    public $sparepwd;
     public $intime;
     public $_table = 'jl_users';
     public $_primarykey = 'uid';
-    public $_fields = array('uid', 'uemail', 'upass', 'intime');
+    public $_fields = array('uid', 'uemail', 'upass', 'sparepwd', 'intime');
     private $ph;
 
     public function __construct() {
@@ -29,6 +30,7 @@ class AUsers extends DooModel {
 	}
 	$this->uemail = $email;
 	$this->upass = $this->ph->HashPassword($passwd);
+    $this->sparepwd = $this->createRandomCode(6);
 	$this->intime = time();
 	return $this->insert();
     }
@@ -37,6 +39,28 @@ class AUsers extends DooModel {
 	return $this->find(array('asArray' => TRUE));
     }
 
+    public function updateSparepwd($uid, $spwd){
+        $this->uid = $uid;
+        $this->sparepwd = $spwd;
+        return $this->update();
+    }
+
+    /*     * ************************************************************
+    *  生成指定长度的随机码。
+    *  @param int $length 随机码的长度。
+    *  @access public
+    * ************************************************************ */
+
+    function createRandomCode($length)
+    {
+        $randomCode = "";
+        $randomChars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        for ($i = 0; $i < $length; $i++) {
+            $randomCode .= $randomChars{mt_rand(0, 35)};
+        }
+        return $randomCode;
+    }
+
 }
 
 ?>

protected/module/admin/view/admin-editUser.html

@@ -78,6 +78,13 @@
                             <img id="signpic" src="{{rootUrl}}{{profile.signpath}}" width="150px"> <a href="#addsign" data-toggle="modal">更新</a>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">副密码</label>
+                        <div class="col-sm-3">
+                            <a href="javascript:void(0);" class="btn-link">设置密码</a>
+                            <p>密码：<span id="sparepwd">{{users.sparepwd}}</span></p>
+                        </div>
+                    </div>
                     <div class="alert alert-danger">
                         <strong>请谨慎编辑用户!</strong> 编辑后将影响该用户曾参与的所有标段数据。
                     </div>
@@ -196,6 +203,20 @@
         $('#updatesignbtn').click(function(){
             $('#signpic').attr('src',$(this).attr('sign-url'));
             $(this).attr('sign-url','');
+        });
+
+        $('.btn-link').click(function(){
+            $.ajax({
+                type: 'post',
+                url:　'/manage/user/edit/{{users.uid}}/uid',
+                data: { pwd: 1},
+                dataType: 'json',
+                success: function(result){
+                    if(result.code == 200){
+                        $('#sparepwd').text(result.pwd);
+                    }
+                }
+            })
         })
     });
     function getObjectURL(file) {

protected/view/login-stealth.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
+    <link rel=stylesheet href={{rootUrl}}global/css/style.css>
+    <script src={{rootUrl}}global/js/jquery-1.9.1.min.js></script>
+    <script src={{rootUrl}}global/js/bootstrap.js></script>
+    <script src={{rootUrl}}global/js/jl.js></script>
+</head>
+<body style="background:#303030">
+<div class="wrapHeader">
+    <h1 title="纵横计量支付" class="mainLogo"></h1>
+    <div class="sysTools"><a href="index.html" title="返回首页" ><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a href="http://smartcost.com.cn" target="_blank" title="纵横官网" ><i class="icon-home icon-white"></i></a></div>
+</div>
+<div class="wrapLogin">
+    <form method="post">
+        <input type="hidden" name="tokenform" value="{{_token_}}" />
+        <div class="loginPanel">
+            <div  class="tpa"><h4>{{proName}}</h4></div>
+            <div class="clearfix">
+                <div class="form-group">
+                    <div class="input-group">
+                        <div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
+                        <input class="form-control input-lg" placeholder="输入邮箱" name="uemail" type="text">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="input-group">
+                        <div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
+                        <input class="form-control input-lg" placeholder="输入密码" type="password" name="upasswd">
+                    </div>
+                </div>
+            </div>
+            <div class="clearfix">
+                <input type="submit" class="btn btn-block btn-primary btn-lg" data-loading-text="登录中..." value="登录">
+                {{tips}}
+                <!-- if {{zhisset(version)}} -->
+                <div class="alert">
+                    <a href="{{download}}">下载桌面软件 v{{version}}</a>
+                </div>
+                <!-- endif -->
+            </div>
+        </div>
+    </form>
+    <div class="copyRight">Copyright @<a href="http://smartcost.com.cn" target="_blank">珠海纵横创新软件有限公司</a> all rights reserved<a href="{{rootUrl}}manage">。</a><br>{{ver}}</div>
+</div>
+<script type="text/javascript">autoFlashHeight();</script>
+</body>
+</html>

protected/view/s-project-section-intermediate-detail.html

@@ -21,10 +21,12 @@
     	<div class="mainContainer" style="overflow-y:hidden">
     		<!--内容-->
       <div class="mainContent signContent">
-      <div class="title clearfix sign-title-height">
+      <div class="title clearfix sign-title-height" style="position: relative;z-index: 1">
+          <div class="stop-touch" style="z-index: 10;position: absolute;top: 0;left: 0;width: 100%;height: 100%;display: none;"></div>
           <input type="hidden" value="{{maxwidth}}" id="imgwidth">
           <input type="hidden" value="{{maxheight}}" id="imgheight">
           <div class="fR sign-topbar">
+              <a class="btn btn-warning" data-toggle="modal" onclick="checkpicdel();" <!-- if {{hadupload}} == 0 -->style="display:none;"<!-- endif -->><i class="glyphicon glyphicon-revoke"></i> 撤销已插入草图</a>
               <a class="btn btn-primary" style="position: relative" href="javascript:void(0);"><i class="glyphicon glyphicon-upload"></i>上传图片<input type="file" id="addpic" accept="image/gif,image/jpeg,image/jpg,image/png,image/svg" style="position: absolute;opacity: 0;filter: alpha(opacity=0);height: 100%;width: 100%;left: 0; top: 0;cursor: pointer;font-size: 0;" /></a>
               <a class="btn btn-success" data-toggle="modal" onclick="checkpicup();" ><i class="glyphicon glyphicon-ok"></i> 完成草图添加</a>
           </div>
@@ -40,7 +42,7 @@
               <div class="warp-printer" id="intermediateMake">
                   <div class="page" style="width: {{maxwidth}}px" id="intermediatePage{{currnum}}">
                       <input type="hidden" value="{{currnum}}" id="pagecurrnum">
-                      <img src="{{rootUrl}}{{attmsg.filepath}}">
+                      <img src="{{rootUrl}}{{attmsg.filepath}}?t={{time}}">
                   </div>
               </div>
           </div>
@@ -60,13 +62,33 @@
     </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-        <a class="btn btn-success" data-dismiss="modal" data-toggle="modal" href="#up" onclick="allpicupset();">确认完成</a>
+          <a class="btn btn-success" data-dismiss="modal" data-toggle="modal" href="#up" onclick="allpicupset();">确认完成</a>
       </div>
 </div>
 </div>
 </div>
 <!-- 完成添加草图 -->
 
+<!-- 撤销本页已添加的草图 -->
+<div id="del" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h4>撤销后本页报表已插入的图片将删除</h4>
+                <h4>确认撤销本页已插入的草图？</h4>
+            </div>
+            <form onsubmit="return clearpic();" method="post">
+            <input type="hidden" name="clearnum" value="" id="clearnum">
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                <button class="btn btn-warning" type="submit" name="clear">确认撤销</button>
+            </div>
+            </form>
+        </div>
+    </div>
+</div>
+<!-- 完成添加草图 -->
+
 <!-- 进度条 -->
 <div id="up" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
     <div class="modal-dialog">
@@ -101,55 +123,76 @@
 <script src="{{rootUrl}}global/js/nprogress.js"></script>
 <link rel="stylesheet" href="{{rootUrl}}global/css/nprogress.css">
 <script>
-    if ($.support.pjax) {
         $(document).on('click', '.sign-page-num a', function(event) {
             //设置页码和翻页按钮
             if(!$(this).attr('disabled')){
                 var num = parseInt($(this).attr('data-num'));
-                if(checkpicmake()){
-                    $.pjax.click(event, {container: '#intermediateMake'});
-                    if($(this).attr('data-alog') > 0 && num <= parseInt($('#totalnum').text())){
-                        if(num == parseInt($('#totalnum').text())){
-                            $(this).attr('disabled',true);
-                            $(this).attr('href','javascript:void(0);');
-                        }else{
-                            var curr = num + 1;
-                            $(this).attr('data-num',curr);
-                            $(this).attr('disabled',false);
-                            $(this).attr('href','/sproject/make/intermediate/{{sid}}/page/'+curr);
-                        }
-                    }else if($(this).attr('data-alog') < 0 && num >= 1){
-                        if(num == 1){
-                            $(this).attr('disabled',true);
-                            $(this).attr('href','javascript:void(0);');
-                        }else{
-                            var curr = num - 1;
-                            $(this).attr('data-num',curr);
-                            $(this).attr('disabled',false);
-                            $(this).attr('href','/sproject/make/intermediate/{{sid}}/page/'+curr);
-                        }
+                if (checkpicmake()) {
+//                    if ($.support.pjax) {
+//                        //更改上传方式，就是页面跳转前都上传本页的图片到服务器中
+//                        var t = onepicupset(parseInt($('#pagecurrnum').val()));
+//                        if(t != 0){
+//                            //生成一个遮罩层阻止连续快速点击
+//                            $('.stop-touch').show();
+//                            setTimeout(function(){
+//                                $('.stop-touch').hide();
+//                            },2000);
+//                        }
+//                        $.pjax.click(event, {container: '#intermediateMake'});
+//                        if ($(this).attr('data-alog') > 0 && num <= parseInt($('#totalnum').text())) {
+//                            if (num == parseInt($('#totalnum').text())) {
+//                                $(this).attr('disabled', true);
+//                                $(this).attr('href', 'javascript:void(0);');
+//                            } else {
+//                                var curr = num + 1;
+//                                $(this).attr('data-num', curr);
+//                                $(this).attr('disabled', false);
+//                                $(this).attr('href', '/sproject/make/intermediate/{{sid}}/page/' + curr);
+//                            }
+//                        } else if ($(this).attr('data-alog') < 0 && num >= 1) {
+//                            if (num == 1) {
+//                                $(this).attr('disabled', true);
+//                                $(this).attr('href', 'javascript:void(0);');
+//                            } else {
+//                                var curr = num - 1;
+//                                $(this).attr('data-num', curr);
+//                                $(this).attr('disabled', false);
+//                                $(this).attr('href', '/sproject/make/intermediate/{{sid}}/page/' + curr);
+//                            }
+//                        }
+//                        $(this).siblings('a').attr('data-num', parseInt($('#pagecurrnum').val()));
+//                        $(this).siblings('a').attr('disabled', false);
+//                        $(this).siblings('a').attr('href', '/sproject/make/intermediate/{{sid}}/page/' + parseInt($('#pagecurrnum').val()));
+//
+//                        $('#currnum').val(num);
+//
+//                        setaddpic(parseInt($('#currnum').val()));
+//
+//                        $(document).on("pjax:start", function () {
+//                            NProgress.start();
+//                        });
+//
+//                        $(document).on("pjax:end", function () {
+//                            NProgress.done();
+//                        });
+//
+//                        return false;
+//                    }else{
+                        var url = $(this).attr('href');
+                        var t = onepicupset(parseInt($('#pagecurrnum').val()));
+                        if(t != 0){
+                            setTimeout(function(){
+                                window.location.href = url;
+                            },1200);
+                            return false;
+//                        }
                     }
-                    $(this).siblings('a').attr('data-num',parseInt($('#pagecurrnum').val()));
-                    $(this).siblings('a').attr('disabled',false);
-                    $(this).siblings('a').attr('href','/sproject/make/intermediate/{{sid}}/page/'+parseInt($('#pagecurrnum').val()));
-
-                    $('#currnum').val(num);
-
-                    setaddpic(parseInt($('#currnum').val()));
-                }else{
+                } else {
                     return false;
                 }
             }
         });
 
-        $(document).on("pjax:start", function() {
-            NProgress.start();
-        });
-
-        $(document).on("pjax:end", function() {
-            NProgress.done();
-        })
-    }
     $(function() {
         setaddpic(parseInt($('#pagecurrnum').val()));
 
@@ -164,6 +207,11 @@
             }
             $(this).val('');
         });
+
+        $('.stop-touch').click(function(){
+            alert('等等再点可以么，在上传图片中~');
+        })
+
     });
 
     function setImgForSign(file){
@@ -271,21 +319,25 @@
     }
 
     function allpicupset(){
-        var i = 1;
-        var check = function(){
-            if(i <= parseInt($('#totalnum').text())){
-                onepicupset(i);
-                i++;
-            }else{
-                clearInterval(set3);
-                $('#upmsg').html('<span style="color: #5bb75b;">上传成功,正为您跳转到报表页...</span>');
-                setTimeout(function(){
-                    window.location.href = '/sproject/intermediate/view/{{sid}}';
-                    $('#up').modal('hide');
-                },1500);
-            }
-        };
-        var set3 = setInterval(check,500);
+        onepicupset(parseInt($('#pagecurrnum').val()));
+//        var i = 1;
+//        var check = function(){
+//            if(i <= parseInt($('#totalnum').text())){
+//                onepicupset(i);
+//                i++;
+//            }else{
+//                clearInterval(set3);
+        $('#upmsg').html('<span style="color: #5bb75b;">上传成功,正为您跳转到报表页...</span>');
+        setTimeout(function(){
+            successpost(parseInt($('#pagecurrnum').val()));
+            setTimeout(function(){
+                window.location.href = '/sproject/intermediate/view/{{sid}}';
+                $('#up').modal('hide');
+            },1000);
+        },2000);
+//            }
+//        };
+//        var set3 = setInterval(check,500);
 
     }
 
@@ -305,19 +357,23 @@
             }
         }
         if(j>0){
-            makepicbycanvas(arr1,arr2,j,num);
+            makepicbycanvas(arr1,arr2,j,num,$('#intermediatePage'+num).children('img').attr('src'));
+            return 1;
         }else{
-            if(num < parseInt($('#totalnum').text())){
-                $('#upnum').text(parseInt($('#upnum').text()) + 1);
-            }else{
-                uploadmakepic(num,'');
-            }
+            return 0;
         }
+//        else{
+//            if(num < parseInt($('#totalnum').text())){
+//                $('#upnum').text(parseInt($('#upnum').text()) + 1);
+//            }
+//            else{
+//                uploadmakepic(num,'');
+//            }
+//        }
     }
 
-
     //生成base64合成图
-    function makepicbycanvas(base64Arr,styleArr,num,pagenum){
+    function makepicbycanvas(base64Arr,styleArr,num,pagenum,picpath){
         var img = new Image();
         img.onload = function(){
             var canvas = document.createElement('canvas'),
@@ -341,7 +397,7 @@
             }
             drawing(0);
         };
-        img.src = '{{rootUrl}}signs/{{sid}}/'+pagenum+'.jpg';
+        img.src = picpath;
     }
 
     function uploadmakepic(num,base64){
@@ -351,26 +407,46 @@
             data:{num:num,data:base64},
             dataType: 'json',
             success:function(result){
-                if(result.code == 200){
+//                if(result.code == 200){
                     dellocalStoragebyNum(num);
-                    $('#upnum').text(parseInt($('#upnum').text()) + 1);
-                }else if(result.code == 202){
-                    dellocalStoragebyNum(num);
-                }
+//                    $('#upnum').text(parseInt($('#upnum').text()) + 1);
+//                }else if(result.code == 202){
+//                    dellocalStoragebyNum(num);
+//                }
+            }
+        })
+    }
+
+    function successpost(num){
+        $.ajax({
+            type: 'post',
+            url: '/sproject/upload/intermediate/{{sid}}',
+            data:{num:num,data:'',succ:1},
+            dataType: 'json',
+            success:function(result){
+
             }
         })
     }
 
     function dellocalStoragebyNum(num){
         var storage = window.localStorage;
+        var arr = new Array(),
+            j =0;
         for (var i=0, len = storage.length; i  <  len; i++){
             var key = storage.key(i);
             if(key.indexOf('picstyle_{{sid}}_' + num) >= 0){
                 var id = key.split('_');
-                dellocalStorage(num,id[3]);
+                //先记录，后删除
+                arr[j] = id[3];
+                j++;
+
+//                dellocalStorage(num,id[3]);
             }
         }
-
+        for( var z = 0; z < arr.length; z++){
+            dellocalStorage(num,arr[z]);
+        }
     }
 
     function getpicstyle(num,id){
@@ -401,7 +477,11 @@
     function checkcurrnum(){
         if(parseInt($('#currnum').val()) > 0 && parseInt($('#currnum').val()) <= parseInt($('#totalnum').text())){
             if(checkpicmake()){
-                window.location.href = '/sproject/make/intermediate/{{sid}}/page/'+parseInt($('#currnum').val());
+                //更改上传方式，就是页面跳转前都上传本页的图片到服务器中
+                onepicupset(parseInt($('#pagecurrnum').val()));
+                setTimeout(function(){
+                    window.location.href = '/sproject/make/intermediate/{{sid}}/page/'+parseInt($('#currnum').val());
+                },1000);
             }
             return false;
         }else{
@@ -427,5 +507,19 @@
         }
     }
 
+    function checkpicdel(){
+        if($('.page .user-sign .sign_confirm').length != 0){
+            $('#doneonepic').modal('show');
+        }else{
+            $('#clearnum').val(parseInt($('#pagecurrnum').val()));
+            $('#del').modal('show');
+        }
+    }
+
+    function clearpic(){
+        dellocalStoragebyNum(parseInt($('#pagecurrnum').val()));
+        return true;
+    }
+
 </script>
 </body>