rabin 7 年之前
父節點
當前提交
8ac7ecdc4a

+ 11 - 0
config/base.php

@@ -88,6 +88,11 @@ $config['template'] = array
 		# 用户报告
 		'user/report' => 'reportlist',
 
+		# 用户小队
+		'user/group' => 'team',
+		# 用户邀请码
+		'user/group_code' => 'ad',
+
 		# 任务列表页
 		'task/list' => 'tasks',
 		# 任务详情页
@@ -98,6 +103,12 @@ $config['template'] = array
 
 		# 提交报告页面
 		'task/submit' => 'reportsubmit',
+
+		# 帮助列表页
+		'help/list'	=> 'help',
+		'help/view' => 'help-article',
+
+		# 剩余我的金币、我的任务、我的报告、我的消息、更改资料、我的兑现、生成二维码、瀑布流、按钮置灰色
 	),
 	
 );

+ 4 - 0
main/assets/mobile/ad.html

@@ -9,6 +9,10 @@
 <link href="./css/global.css?v=36599d2c" rel="stylesheet"><link href="./css/ad.css?v=36599d2c" rel="stylesheet"></head>
 
 <body ontouchmove="event.preventDefault();">
+    <header>
+        <a href="#" class="back"></a>
+        <span>我的小队</span>
+    </header>
     <section class="wrapper form-padding">
         <article class="card">
             <dl>

+ 33 - 1
main/assets/mobile/js/config.js

@@ -31,7 +31,9 @@ Dever.User().config =
 		//完善资料
 		,5 : '#set'
 		//找回密码
-		,6 : '#forget',
+		,6 : '#forget'
+		//资料认证
+		,7 : '#info'
 	}
 
 	//登录信息
@@ -171,6 +173,26 @@ Dever.User().config =
 		,'url' : Dever.Host('passport', 'reg.forget')
 	}
 
+	//资料认证
+	,7 :
+	{
+		'input' :
+		{
+			'truename' : '#truename'
+			,'card' : '#card'
+			,'card_front' : '#card_front'
+			,'card_end' : '#card_end'
+			,'wechat' : '#wechat|'
+			,'alipay' : '#alipay|'
+		}
+		//错误提示的div
+		//,'status' : '.alert'
+		//错误提示
+		,'error' : '您填写的信息有误'
+		//登录要提交的url
+		,'url' : Dever.Host('task', 'user.submit')
+	}
+
 };
 
 //定义上传回调方法
@@ -182,4 +204,14 @@ Dever.Upload().callback =
 
 		return html;
 	}
+
+	,'uploadCard' : function(e, url, close)
+	{
+		var parent = e.parent();
+		if (parent.find('img').length) {
+			parent.find('img').attr('src', url).show();
+		}
+
+		return false;
+	}
 };

+ 40 - 0
main/template/mobile/help/list.php

@@ -0,0 +1,40 @@
+<?php
+$title = '帮助中心';
+
+$view
+
+# 公共页面,这种方式不会更改前端代码,还有一种方式可以参考manage组件
+->import('inc/head')
+
+# 设置全局变量
+->set('title', $title)
+# 这个变量控制不同页面的样式和js文件
+->set('name', 'help')
+->set('nav', 'user') 
+# 定义header>span的html为$title
+->fetch('header span',    $title)
+
+->append('header', '<a href="<{Dever::url("user/account", "main")}>" class="back"></a>')
+
+
+# 循环
+->loop
+(
+    '.wrapper .card',
+    'task/help.all',
+    array
+    (
+        'a' => array
+        (
+            'href' => '<{Dever::url("help/view?id=$v.id", "main")}>',
+            'span' => array
+            (
+                'html' => '$v.name',
+            ),
+        ),
+    )
+)
+
+->import('inc/foot')
+
+->display();

+ 25 - 0
main/template/mobile/help/view.php

@@ -0,0 +1,25 @@
+<?php
+
+$view
+->import('inc/head')
+
+->set('info', 'task/help.one') 
+->set('title', '$info.name')
+->set('name', 'help-article')
+->set('nav', 'user')
+
+->fetch('header .back@href',    '<{Dever::url("help/list", "main")}>')
+
+->render('info', array
+(
+    '.wrapper' => array
+    (
+        'h1' => '$v.name',
+
+        'section' => '$v.content',
+    ), 
+))
+
+->import('inc/foot')
+
+->display();

+ 42 - 0
main/template/mobile/user/group.php

@@ -0,0 +1,42 @@
+<?php
+$title = '帮助中心';
+
+$view
+
+# 公共页面,这种方式不会更改前端代码,还有一种方式可以参考manage组件
+->import('inc/head')
+
+# 设置全局变量
+->set('title', '我的<{Dever::load("main/config-one#group_name")}>')
+# 这个变量控制不同页面的样式和js文件
+->set('name', 'team')
+# 定义header>span的html为$title
+->fetch('header span',    '我的<{Dever::load("main/config-one#group_name")}>')
+
+->fetch('header .back@href',    '<{Dever::url("user/account", "main")}>')
+
+
+# 循环
+->loop
+(
+    '.card li',
+    'task/group.user',
+    array
+    (
+        'p|0' => array
+        (
+            'html' => '<img src="<{$v.user.avatar}>" alt=""><{$v.user.username}>',
+        ),
+
+        'p|1' => array
+        (
+            'html' => '$v.time',
+        ),
+    )
+)
+
+->fetch('.loadding@id', '#page')
+
+->import('inc/foot')
+
+->display();

+ 33 - 0
main/template/mobile/user/group_code.php

@@ -0,0 +1,33 @@
+<?php
+
+$view
+->import('inc/head')
+
+->set('info', 'task/group.one') 
+->set('title', '邀请好友')
+->set('name', 'ad')
+->set('nav', 'user')
+
+->fetch('header span',    '邀请好友')
+
+->fetch('header .back@href',    '<{Dever::url("user/account", "main")}>')
+
+->render('info', array
+(
+    '.wrapper' => array
+    (
+        '.code p' => array
+        (
+            'html' => '$v.code',
+        ),
+
+        '.qrcode img' => array
+        (
+            'src' => '$v.url',
+        ),
+    ), 
+))
+
+->import('inc/foot')
+
+->display();

+ 20 - 7
main/template/mobile/user/info_certify.php

@@ -17,18 +17,31 @@ $view
 ->fetch(array('input@dever-error', 0), '请填写真实姓名')
 ->fetch(array('input@value', 0), '<{Dever::load("task/user.info#truename")}>')
 
-->fetch(array('input@id', 1), 'sex')
-->fetch(array('input@name', 1), 'sex')
-->fetch(array('input@dever-error', 1), '请选择性别')  
+->fetch(array('input@id', 1), 'card')
+->fetch(array('input@name', 1), 'card')
+->fetch(array('input@dever-error', 1), '请填写身份证号')
+->fetch(array('input@value', 1), '<{Dever::load("task/user.info#card")}>')
 
-->fetch(array('input@id', 2), 'code')
-->fetch(array('input@name', 2), 'code')
+->fetch(array('input@id', 4), 'wechat')
+->fetch(array('input@name', 4), 'wechat')
+->fetch(array('input@dever-error', 4), '请填写提现用微信号')
+->fetch(array('input@value', 4), '<{Dever::load("task/user.info#wechat")}>')
+
+->fetch(array('input@id', 5), 'alipay')
+->fetch(array('input@name', 5), 'alipay')
+->fetch(array('input@dever-error', 5), '请填写提现用支付宝账号')
+->fetch(array('input@value', 5), '<{Dever::load("task/user.info#alipay")}>')
+
+
+->fetch(array('.uploader', 0), '<style>.layui-upload-file{display:none;}</style><img src="<{Dever::load("task/user.info#card_front")}>" alt="" style="<{Dever::load("task/user.info#card_front") ? "" : "display:none;"}>"><input type="file" class="img-add dever-upload" id="upload_front" dever-upload-value="card_front" dever-upload-callback="uploadCard"><input type="hidden" id="card_front" name="card_front" value="<{Dever::load("task/user.info#card_front")}>" dever-error="请上传身份证正面">')
+
+
+->fetch(array('.uploader', 1), '<style>.layui-upload-file{display:none;}</style><img src="<{Dever::load("task/user.info#card_front")}>" alt="" style="<{Dever::load("task/user.info#card_front") ? "" : "display:none;"}>"><input type="file" class="img-add dever-upload" id="upload_end" dever-upload-value="card_end" dever-upload-callback="uploadCard"><input type="hidden" id="card_end" name="card_end" value="<{Dever::load("task/user.info#card_end")}>" dever-error="请上传身份证背面">')
 
-->fetch('.disable@style', 'display:none')
 
 ->fetch(array('.button@class', 0), 'button')
 ->fetch(array('.button@type', 0), 'button')
-->fetch(array('.button@id', 0), 'set')
+->fetch(array('.button@id', 0), 'info')
 
 
 ->import('inc/foot')

+ 67 - 0
main/template/mobile/user/score.php

@@ -0,0 +1,67 @@
+<?php
+$title = '我的账户';
+
+$view
+
+# 公共页面,这种方式不会更改前端代码,还有一种方式可以参考manage组件
+->import('inc/head')
+
+->set('info', 'task/score.user') 
+# 设置全局变量
+->set('title', $title)
+# 这个变量控制不同页面的样式和js文件
+->set('name', 'cions')
+->set('nav', 'user') 
+# 定义header>span的html为$title
+->fetch('header span',    $title)
+
+->append('header', '<a href="<{Dever::url("user/account", "main")}>" class="back"></a>')
+
+->render('info', array
+(
+    '.wrapper' => array
+    (
+        '.ico-cions' => array
+        (
+            'html' => '$v.score',
+        ),
+
+        '.button' => array
+        (
+            'html' => '兑现',
+            'href' => '<{Dever::url("user/exchange", "main")}>',
+        ),
+    ), 
+))
+
+# 循环
+->loop
+(
+    '.records-list li',
+    'task/score.logs',
+    array
+    (
+        'span|0' => array
+        (
+            'html' => '$v.date',
+        ),
+        'span|1' => array
+        (
+            'html' => '$v.date',
+        ),
+        'span|2' => array
+        (
+            'html' => '$v.name',
+        ),
+    )
+)
+
+# 暂无记录
+->append('.records', '<{Dever::load("task/score.logs") ? "" : \'<section class="no-result">
+            <img src="<{Dever::config("host")->assets}>mobile/images/5dcefa7b.no-records.png" alt="">
+            <p>暂无记录</p>
+        </section>\'}>')
+
+->import('inc/foot')
+
+->display();

+ 9 - 1
task/src/Group.php

@@ -22,9 +22,16 @@ class Group extends Base
     {
         $group = $this->one();
 
+        $data = array();
         if ($group) {
         	$data = Dever::db('task/user_group_member')->getAll(array('group_id' => $group['id']));
 
+            if ($data) {
+                foreach ($data as $k => $v) {
+                    $data[$k]['user'] = Dever::db('passport/user')->one($v['uid']);
+                    $data[$k]['time'] = date('Y-m-d H:i', $v['cdate']);
+                }
+            }
         	return $data;
         }
 
@@ -59,9 +66,10 @@ class Group extends Base
             $code = $this->createCode();
             $group['uid'] = $where['uid'];
             $group['code'] = $code;
-            Dever::db('task/user_group')->insert($group);
+            $group['id'] = Dever::db('task/user_group')->insert($group);
         }
 
+        # 生成二维码图片
         $group['url'] = '';
 
         return $group;

+ 0 - 2
task/src/Help.php

@@ -24,8 +24,6 @@ class Help extends Base
      */
     public function one()
     {
-        $this->checkUser();
-
         $id = Dever::input('id');
         $info = array();
         if ($id > 0) {

+ 1 - 0
task/src/Score.php

@@ -127,6 +127,7 @@ class Score extends Base
         			if ($v['type'] == 1) {
         				# 兑现申请
         				$data[$k]['info'] = '本次兑现'.$name.' '.$v['score'].'枚,申请兑现';
+                        $data[$k]['desc'] = '兑换200金币';
         				$data[$k]['date'] = $this->date($v['cdate']);
         			} elseif ($v['type'] == 2) {
         				# 兑现完成

+ 1 - 1
task/src/User.php

@@ -177,7 +177,7 @@ class User extends Base
      */
     private function submit_action()
     {
-        $user = $this->one();
+        $user = $this->info();
 
         $truename = Dever::input('truename');
         $card = Dever::input('card');