dever 7 anni fa
parent
commit
0946a48785

+ 1 - 1
main/assets/mobile/css/ad.css

@@ -1,2 +1,2 @@
-body{background:url(../images/f692f110.adv-header.png) no-repeat top #fe6522;background-size:100% auto}.card{margin-top:4.66667rem;background-color:#fff;padding:.53333rem}.card dl{position:relative;margin-left:.93333rem}.card dl:before{content:"";position:absolute;background:url(../images/f97f2067.ico-li.png) no-repeat;background-size:.69333rem .44rem;width:.69333rem;height:.44rem;left:-1rem;top:.1rem}.card dl dt{font-size:.4rem;margin-bottom:.36rem}.card dl dd{margin-bottom:.36rem;line-height:.50667rem}.card dl dd.qrcode img{width:5.06667rem;display:block}.card dl dd.code p{display:inline-block;padding:0 .93333rem;line-height:1.86667rem;background:#fff7e7;color:#f70;font-size:.8rem;text-align:center;border:1px solid #ff731d;border-radius:.13333rem}
+body{background:url(../images/f692f110.adv-header.png) no-repeat center 0.5rem #fe6522;background-size:100% auto}.card{margin-top:4.66667rem;background-color:#fff;padding:.53333rem}.card dl{position:relative;margin-left:.93333rem}.card dl:before{content:"";position:absolute;background:url(../images/f97f2067.ico-li.png) no-repeat;background-size:.69333rem .44rem;width:.69333rem;height:.44rem;left:-1rem;top:.1rem}.card dl dt{font-size:.4rem;margin-bottom:.36rem}.card dl dd{margin-bottom:.36rem;line-height:.50667rem}.card dl dd.qrcode img{width:5.06667rem;display:block}.card dl dd.code p{display:inline-block;padding:0 .93333rem;line-height:1.86667rem;background:#fff7e7;color:#f70;font-size:.8rem;text-align:center;border:1px solid #ff731d;border-radius:.13333rem}
 /*# sourceMappingURL=ad.css.map?v=95681a6c*/

+ 1 - 1
main/assets/mobile/css/certify.css

@@ -1,2 +1,2 @@
-body{background-color:#ff754c}.wrapper{padding-top:.4rem}.wrapper .formset{background-color:#fff;padding:.266667rem;border-radius:.133333rem}.wrapper .formset .file-upload{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrapper .formset .file-upload .uploader{position:relative;width:4.26667rem;height:2.8rem}.wrapper .formset .file-upload .uploader img,.wrapper .formset .file-upload .uploader input[type=file]{width:100%;height:100%;border-radius:.13333rem;border:1px solid #f96b03;border-radius:.133333rem;position:absolute;top:0;left:0;z-index:1}.wrapper .formset .file-upload .uploader input[type=file]{opacity:0}.wrapper .formset .file-upload .uploader:after{position:absolute;width:100%;height:100%;content:"\6B63\9762";background:url(../images/e4cbaad6.ico-add.png) no-repeat center .90667rem;background-size:.53333rem .53333rem;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);text-align:center;line-height:3.5rem;pointer-events:none}.wrapper .formset .file-upload .uploader:last-child:after{content:"\53CD\9762"}
+body{background-color:#ff754c}.wrapper{padding-top:.4rem}.wrapper .formset{background-color:#fff;padding:.266667rem;border-radius:.133333rem}.wrapper .formset .file-upload{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrapper .formset .file-upload .uploader{position:relative;width:4.26667rem;height:2.8rem;border-radius: .133333rem;}.wrapper .formset .file-upload .uploader img,.wrapper .formset .file-upload .uploader input[type=file]{width:100%;height:100%;border-radius:.13333rem;border-radius:.133333rem;position:absolute;top:0;left:0;z-index:1}.wrapper .formset .file-upload .uploader input[type=file]{opacity:0}.wrapper .formset .file-upload .uploader:after{position:absolute;width:100%;height:100%;content:"\6B63\9762";background:url(../images/e4cbaad6.ico-add.png) no-repeat center .90667rem;background-size:.53333rem .53333rem;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);text-align:center;line-height:3.5rem;pointer-events:none}.wrapper .formset .file-upload .uploader:last-child:after{content:"\53CD\9762"}
 /*# sourceMappingURL=certify.css.map?v=95681a6c*/

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


+ 1 - 1
main/assets/mobile/css/help-article.css

@@ -1,2 +1,2 @@
-body{background-color:#ff754c}.wrapper article{padding:.26667rem;background:#fff}.wrapper article h1{font-size:.4rem;padding:.13333rem 0 .46667rem;margin-bottom:.46667rem;border-bottom:1px solid #e5e5e5}.wrapper article section img{width:100%;display:block}.wrapper article section p{line-height:.58667rem}
+body{background-color:#ff754c}.wrapper article{padding:.26667rem;background:#fff}.wrapper article h1{font-weight:bolder;font-size:.4rem;padding:.13333rem 0 .46667rem;margin-bottom:.46667rem;border-bottom:1px solid #e5e5e5}.wrapper article section img{width:100%;height:auto;display:block}.wrapper article section p{line-height:.58667rem}
 /*# sourceMappingURL=help-article.css.map?v=95681a6c*/

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


+ 1 - 1
main/assets/mobile/css/reportsubmit.css

@@ -1,2 +1,2 @@
-.wrapper{padding-top:.4rem}.wrapper .formset{background-color:#fff;padding:.266667rem;border-radius:.133333rem}.wrapper .formset h2{padding:.266667rem 0;color:#333;font-size:.4rem}.wrapper .formset .img-cont ul{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.wrapper .formset .img-cont ul li{position:relative;width:2rem;height:2rem;margin:.3rem .3rem 0 0}.wrapper .formset .img-cont ul li img,.wrapper .formset .img-cont ul li input[type=file]{width:2rem;height:2rem;display:block;border-radius:.133333rem}.wrapper .formset .img-cont ul li img:nth-child(4n),.wrapper .formset .img-cont ul li input[type=file]:nth-child(4n){margin-right:0!important}.wrapper .formset .img-cont ul li .ico-img-del{position:absolute;right:0;top:0}.wrapper .formset .img-cont ul li .ico-img-del:before{margin-right:0}.wrapper .formset .img-cont ul li.img-add{background:url(../images/ceb52ffc.ico-img-add.png) no-repeat 50%;background-size:.533333rem .533333rem;border:1px solid #ff7e53;border-radius:.133333rem}.wrapper .formset .img-cont ul li.img-add input{opacity:0}body{background-color:#ff754c}
+.wrapper{padding-top:.4rem}.wrapper .formset{background-color:#fff;padding:.266667rem;border-radius:.133333rem}.wrapper .formset h2{padding:.266667rem 0;color:#333;font-size:.4rem}.wrapper .formset .img-cont ul{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.wrapper .formset .img-cont ul li{position:relative;width:2rem;height:2rem;margin:.3rem .3rem 0 0}.wrapper .formset .img-cont ul li img,.wrapper .formset .img-cont ul li input[type=file]{width:2rem;height:2rem !important;display:block;border-radius:.133333rem}.wrapper .formset .img-cont ul li img:nth-child(4n),.wrapper .formset .img-cont ul li input[type=file]:nth-child(4n){margin-right:0!important}.wrapper .formset .img-cont ul li .ico-img-del{position:absolute;right:0;top:0}.wrapper .formset .img-cont ul li .ico-img-del:before{margin-right:0}.wrapper .formset .img-cont ul li.img-add{background:url(../images/ceb52ffc.ico-img-add.png) no-repeat 50%;background-size:.533333rem .533333rem;border:1px solid #ff7e53;border-radius:.133333rem}.wrapper .formset .img-cont ul li.img-add input{opacity:0}body{background-color:#ff754c}
 /*# sourceMappingURL=reportsubmit.css.map?v=95681a6c*/

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


+ 1 - 1
main/assets/mobile/css/team.css

@@ -1,2 +1,2 @@
-.team-members{padding:.46667rem}.team-members h3{font-size:.44rem;padding:0 0 .7rem}.team-members h3,.team-members li{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.team-members li{min-height:1.30667rem;border-bottom:1px solid #e5e5e5}.team-members li,.team-members li p{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.team-members li p{display:-webkit-box;display:-ms-flexbox;display:flex}.team-members li img{width:.8rem;height:.8rem;border:1px solid #ff855c;border-radius:50%;display:block;margin-right:.26667rem}.team-members .loadding{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.5rem 0}.team-members .loadding:before{content:"";width:.36rem;height:.36rem;background:url(../images/414d2c80.loading.png) no-repeat;background-size:.36rem}
+.team-members{padding:.46667rem}.team-members h3{font-size:.44rem;padding:0 0 .7rem;font-weight: bolder;color: #333;}.team-members h3,.team-members li{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.team-members li{min-height:1.30667rem;border-bottom:1px solid #e5e5e5}.team-members li,.team-members li p{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.team-members li p{display:-webkit-box;display:-ms-flexbox;display:flex}.team-members li img{width:.8rem;height:.8rem;border:1px solid #ff855c;border-radius:50%;display:block;margin-right:.26667rem}.team-members .loadding{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.5rem 0}.team-members .loadding:before{content:"";width:.36rem;height:.36rem;background:url(../images/414d2c80.loading.png) no-repeat;background-size:.36rem}.no-result{background: #ff754c;}
 /*# sourceMappingURL=team.css.map?v=95681a6c*/

BIN
main/assets/mobile/images/873bc522.ico-account.png


BIN
main/assets/mobile/images/cd5e1bde.ico-account-cur.png


+ 7 - 18
main/assets/mobile/js/config.js

@@ -23,23 +23,11 @@ function updateUser(url)
 }
 
 $(function(){
-	if ($("#username").length) {
-		$("#username").keydown(function(event){
-			if(event.which == 13) {
-				updateUser();
-			}
-		});
-	}
-	
-	if ($("#quit").length) {
-		$("#quit").click(function()
-		{
-			if (confirm('确定退出吗?')) {
-				var href = $(this).attr('url');
-				location.href = href;
-			}
-		});
-	}
+	$("#username").keydown(function(event){
+		if(event.which == 13) {
+			updateUser();
+		}
+	});
 })
 
 
@@ -208,7 +196,8 @@ Dever.User().config =
 		,'callback' : function(e, msg)
 		{
 			Dever.Out(msg);
-			location.href = $("#location").val();
+			//location.href = $("#location").val();
+			history.go(-1);
 		}
 	}
 	

+ 1 - 1
main/assets/mobile/myaccount.html

@@ -39,7 +39,7 @@
     <footer>
         <a href="#" class="ico-gettask">领任务</a>
         <a href="#" class="ico-task">我的任务</a>
-        <a href="#" class="ico-account cur">我的账户</a>
+        <a href="#" class="ico-account cur ico-msg">我的账户</a>
     </footer>
 <script type="text/javascript" src="./js/global.js?v=95681a6c"></script><script type="text/javascript" src="./js/myaccount.js?v=95681a6c"></script></body>
 

+ 16 - 5
main/assets/mobile/mytask.html

@@ -6,9 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta name="sudameta" content="allCIDs:34766,34979,7198,12665,257,258">
     <title></title>
-<link href="./css/global.css?v=95681a6c" rel="stylesheet"><link href="./css/mytask.css?v=95681a6c" rel="stylesheet"></head>
+    <link href="./css/global.css?v=95681a6c" rel="stylesheet">
+    <link href="./css/mytask.css?v=95681a6c" rel="stylesheet">
+</head>
 
-<body>
+<body style="background-color: #f7f5f3;">
     <header>
         <span>我的任务</span>
     </header>
@@ -18,7 +20,7 @@
             <a href="#" class="cur">进行中</a>
             <a href="#">已结束</a>
         </section>
-        <section class="tasklist">
+         <section class="tasklist">
             <dl class="task">
                 <dt>任务标题任务标题任务标题任务</dt>
                 <dd class="tk-column">
@@ -81,11 +83,20 @@
             </dl>
         </section>
     </section>
+    <section class="no-result no-task">
+        <section class="no-notice-wrapper">
+            <img src="images/5dcefa7b.no-records.png" alt="">
+            <p>暂无记录</p>
+            <a href="" class="button">领取任务</a>
+        </section>
+    </section>
     <footer>
         <a href="#" class="ico-gettask">领任务</a>
         <a href="#" class="ico-task cur">我的任务</a>
-        <a href="#" class="ico-account">我的账户</a>
+        <a href="#" class="ico-account ico-msg">我的账户</a>
     </footer>
-<script type="text/javascript" src="./js/global.js?v=95681a6c"></script><script type="text/javascript" src="./js/mytask.js?v=95681a6c"></script></body>
+    <script type="text/javascript" src="./js/global.js?v=95681a6c"></script>
+    <script type="text/javascript" src="./js/mytask.js?v=95681a6c"></script>
+</body>
 
 </html>

+ 1 - 1
main/assets/mobile/tasks.html

@@ -8,7 +8,7 @@
     <title></title>
 <link href="./css/global.css?v=95681a6c" rel="stylesheet"><link href="./css/tasks.css?v=95681a6c" rel="stylesheet"></head>
 
-<body>
+<body style="background-color:#fff;">
     <header>
         <span>领任务</span>
     </header>

+ 3 - 2
main/assets/mobile/team.html

@@ -14,13 +14,14 @@
         <span>我的小队</span>
     </header>
     <!-- 无人员 -->
-    <!-- <section class="no-result">
+    <!--<section class="no-result form-padding">
         <section class="no-notice-wrapper">
             <img src="images/0e138ae3.no-team.png" alt="">
             <p>暂无队员</p>
             <a href="#" class="button">邀请好友入队</a>
         </section>
-    </section> -->
+    </section>
+    -->
     <section class="wrapper form-padding">
         <section class="card team-members">
             <h3>

+ 2 - 2
main/template/mobile/forget.php

@@ -28,13 +28,13 @@ $view
 ->fetch(array('input@dever-error', 2), '密码长度为6~18位')
 
 ->fetch('.nol@id', 'mcode_button')
-->fetch('.nol@dever-send', '<{Dever::load("passport/reg.getUrl", "passport/reg.getMCodeLogin", array("sid" => Dever::id()))}>')
+->fetch('.nol@dever-send', '<{Dever::load("passport/reg.getUrl", "passport/reg.getMCodeLogin", array("skin" => "forget", "sid" => Dever::id()))}>')
 
 ->fetch('.button@class', 'button')
 ->fetch('.button@type', 'button')
 ->fetch('.button@id', 'forget')
 
-->append('header', '<input type="hidden" name="refer" id="refer" value="<{Dever::input("refer")}>">')
+->append('header', '<input type="hidden" name="refer" id="refer" value="<{Dever::input("refer", Dever::encode(Dever::url("user/account", "main")))}>">')
 
 ->import('inc/foot')
 

+ 7 - 1
main/template/mobile/help/list.php

@@ -35,7 +35,13 @@ $view
     )
 )
 
-->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div>')
+# 暂无记录
+->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div><{Dever::load("task/help.all") ? "" : \'<section class="no-result">
+        <section class="no-notice-wrapper">
+            <img src="'.Dever::assets("5dcefa7b.no-records.png", "images").' alt="">
+            <p>暂无记录</p>
+        </section>
+    </section>\'}>')
 
 ->import('inc/foot')
 

+ 1 - 1
main/template/mobile/inc/menu.php

@@ -5,7 +5,7 @@ $view
 ->loop
 ( 
     'footer a',
-    'main/menu-state',
+    'task/user.menu',
     array  
     (
         'self' => array

+ 5 - 2
main/template/mobile/reg.php

@@ -13,7 +13,10 @@ $view
 
 ->fetch('.txtc a',    '《<{Dever::load("main/config-one#title")}>用户服务协议》')
 
-->fetch('.txtc a@href',    '<{Dever::url("service", "main")}>')
+//->fetch('.txtc a@href',    '<{Dever::url("service", "main")}>')
+->fetch('.txtc a@href',    '#')
+
+->fetch('form@autocomplete', 'off')
 
 ->fetch(array('input@id', 0), 'mobile')
 ->fetch(array('input@name', 0), 'mobile')
@@ -29,7 +32,7 @@ $view
 ->fetch(array('input@dever-error', 2), '密码长度为6~18位')
 
 ->fetch('.nol@id', 'mcode_button')
-->fetch('.nol@dever-send', '<{Dever::load("passport/reg.getUrl", "passport/reg.getMcode", array("sid" => Dever::id()))}>') 
+->fetch('.nol@dever-send', '<{Dever::load("passport/reg.getUrl", "passport/reg.getMcode", array("skin" => "reg", "sid" => Dever::id()))}>') 
 
 ->fetch('.button@class', 'button')
 ->fetch('.button@type', 'button')

+ 7 - 1
main/template/mobile/task/list.php

@@ -50,7 +50,13 @@ $view
     )
 )
 
-->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div>')
+# 暂无记录
+->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div><{Dever::load("task/info.all") ? "" : \'<section class="no-result">
+        <section class="no-notice-wrapper">
+            <img src="'.Dever::assets("5dcefa7b.no-records.png", "images").' alt="">
+            <p>暂无记录</p>
+        </section>
+    </section>\'}>')
 
 ->import('inc/foot')
 

+ 1 - 1
main/template/mobile/task/view.php

@@ -7,7 +7,7 @@ $view
 ->set('title', '$info.name')
 ->set('name', 'task')
 
-->fetch('header .back@href',    '<{Dever::url("task/list", "main")}>')
+->fetch('header .back@href',    'javascript:history.go(-1)')
 
 ->render('info', array
 (

+ 2 - 2
main/template/mobile/user/group.php

@@ -37,10 +37,10 @@ $view
 
 ->fetch('.loadding@style', 'display:none;')
 
-->fetch('.wrapper .card@style', '<{Dever::load("task/group.user") ? "" : "display:none;"}>')
+->fetch('.wrapper@style', '<{Dever::load("task/group.user") ? "" : "display:none;"}>')
 
 # 暂无记录
-->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div><{Dever::load("task/group.user") ? "" : \'<section class="no-result"><section class="no-notice-wrapper"><img src="'.Dever::assets("0e138ae3.no-team.png", "images").'" alt=""><p>暂无队员</p><a href="'.Dever::url("user/group_code", "main").'" class="button">邀请好友入队</a></section></section>\'}>')
+->append('body', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div><{Dever::load("task/group.user") ? "" : \'<section class="no-result"><section class="no-notice-wrapper"><img src="'.Dever::assets("0e138ae3.no-team.png", "images").'" alt=""><p>暂无队员</p><a href="'.Dever::url("user/group_code", "main").'" class="button">邀请好友入队</a></section></section>\'}>')
 
 ->import('inc/foot')
 

+ 3 - 1
main/template/mobile/user/msg.php

@@ -34,8 +34,10 @@ $view
     )
 )
 
+->fetch('.wrapper@style','<{Dever::load("task/user.msg") ? "" : "display:none;"}>')
+
 # 暂无记录
-->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div><{Dever::load("task/user.msg") ? "" : \'<section class="no-result">
+->append('body', '<{Dever::load("task/user.msg") ? \'<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div>\' : \'<section class="no-result">
         <section class="no-notice-wrapper">
             <img src="'.Dever::assets("5dcefa7b.no-records.png", "images").' alt="">
             <p>暂无记录</p>

+ 5 - 1
main/template/mobile/user/task.php

@@ -72,8 +72,12 @@ $view
     )
 )
 
+->fetch('.no-result .button@href', '<{Dever::url("task/list", "main")}>')
+
+->fetch('.no-result@style', '<{Dever::load("task/info.user") ? "display:none;" : ""}>')
+
 # 暂无记录
-->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div><{Dever::load("task/info.user") ? "" : \'<section class="no-result" style="margin-top:15px;"><section class="no-notice-wrapper"><img src="'.Dever::assets("5dcefa7b.no-records.png", "images").'" alt=""><p>暂无记录</p><a href="'.Dever::url("task/list", "main").'" class="button">领取任务</a></section></section>\'}>')
+->append('.wrapper', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".wrapper"></div>')
 
 ->import('inc/foot')
 

+ 2 - 2
task/database/user_cash.php

@@ -68,8 +68,8 @@ return array
 			'desc' 		=> '兑现积分',
 			'match' 	=> 'is_numeric',
 			'update'	=> 'text',
-			'list'		=> 'table',
-			'modal'		=> '查看详情',
+			'list_name'	=> '兑现信息',
+			'list'		=> 'Dever::load("task/lib/manage.cash", {id})',
 		),
 
 		'cash'		=> array

+ 3 - 3
task/database/user_group.php

@@ -82,8 +82,8 @@ return array
 			'update'	=> 'select',
 			'option'	=> $status,
 			'search'	=> 'select',
-			'list'		=> true,
-			'edit'		=> true,
+			//'list'		=> true,
+			//'edit'		=> true,
 		),
 
 		'state'		=> array
@@ -98,7 +98,7 @@ return array
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '录入时间',
+			'name' 		=> '注册时间',
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效

+ 2 - 3
task/database/user_info.php

@@ -87,9 +87,8 @@ return array
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
-			'list_name'		=> '详细信息',
-			'list'		=> 'table',
-			'modal'		=> '查看详情',
+			'list_name'		=> '照片信息',
+			'list'		=> 'Dever::load("task/lib/manage.info", {id})',
 		),
 
 		'card_end'		=> array

+ 13 - 0
task/lib/Cron.php

@@ -95,6 +95,8 @@ class Cron
     			$this->updateScoreLog($v['uid'], $v['score'], 2, 1, -1, -1, $v['type'], $v['cash'], $v['cdate']);
 
                 $this->updateMsg($v['uid'], $v['score'], 2, false, false, $v['type'], $v['cash'], $v['cdate']);
+
+                $this->sendSms($v['uid'], $v['cash']);
     		}
     	}
 
@@ -121,6 +123,17 @@ class Cron
     	return 'yes';
     }
 
+    # 发短信
+    private function sendSms($uid, $cash)
+    {
+        $user = Dever::db('passport/user')->one($uid);
+        if ($user && isset($user['mobile']) && $user['mobile']) {
+            $url = Dever::load("passport/reg.getUrl", "passport/reg.getMCodeLogin", array("skin" => "cash", "sid" => Dever::id()));
+            $url .= '&mobile=' . $user['mobile'] . '&type=msg&content=' . $cash;
+            return Dever::daemon($url);
+        }
+    }
+
     /**
      * 寻找这个用户的上线 给上线带来收益
      *

+ 46 - 0
task/lib/Manage.php

@@ -68,6 +68,52 @@ class Manage
 		return $data;
 	}
 
+	/**
+	 * 获取兑现信息:表格模式
+	 *
+	 * @return mixed
+	 */
+	public function cash($id)
+	{
+		$config = Dever::db('main/config')->one();
+		$info = Dever::db('task/user_cash')->one($id);
+		$user = Dever::db('task/user_info')->one(array('uid' => $info['uid']));
+		if ($info['type'] == 1) {
+			$type = '微信';
+			$account = $user['wechat'];
+		} else {
+			$type = '支付宝';
+			$account = $user['alipay'];
+		}
+		$data['真实姓名'] = $user['truename'];
+		$data['身份证号'] = $user['card'];
+		$data['兑现积分'] = $info['score'] . $config['score_name'];
+		$data['兑换金额'] = $info['cash'] . '元';
+		$data['兑现类型'] = $type;
+		$data['兑现账号'] = $account;
+
+		$html = Dever::table($data);
+
+		return $html;
+	}
+
+	/**
+	 * 获取认证信息:表格模式
+	 *
+	 * @return mixed
+	 */
+	public function info($id)
+	{
+		$info = Dever::db('task/user_info')->one($id);
+		
+		$data['身份证正面'] = '<img layer-src="'.$info['card_front'].'" src="'.$info['card_front'].'" width="150px" />';
+		$data['身份证反面'] = '<img layer-src="'.$info['card_end'].'" src="'.$info['card_end'].'" width="150px" />';
+
+		$html = Dever::table($data);
+
+		return $html;
+	}
+
 	/**
 	 * 报告审核
 	 *

+ 1 - 1
task/src/Score.php

@@ -91,7 +91,7 @@ class Score extends Base
 
 		$insert['type'] = 1;
 		$insert['status'] = 1;
-		$insert['cash'] = $type;
+		$insert['cash_type'] = $type;
 		Dever::db('task/user_score_log')->insert($insert);
 
 		# 剩余数量

+ 18 - 0
task/src/User.php

@@ -13,6 +13,24 @@ class User extends Base
         $this->checkLogin();
     }
 
+    public function menu()
+    {
+        $menu = Dever::db('main/menu')->state();
+
+        # 获取消息
+        $msg = Dever::load('message/lib/data.num', $this->data['uid']);
+
+        foreach ($menu as $k => $v) {
+            $menu[$k]['icon'] = $v['icon'];
+
+            if ($v['icon'] == 'ico-account' && $msg) {
+                $menu[$k]['icon'] .= ' ico-msg';
+            }
+        }
+
+        return $menu;
+    }
+
     public function config()
     {
         # 资料认证

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