Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/assets/pc/html/setGoods.html

@@ -24,7 +24,7 @@
                 <div class="top">
                     <i class="layui-icon layui-icon-app"></i>商品列表
 
-                    <a class="mini-button" onclick="location.href='<{$link}>'">返回上一页</a>
+                    <!-- <a class="mini-button" onclick="location.href='<{$link}>'">返回上一页</a> -->
                 </div>
                 <div class="left_main">
                     <input id="key" class="mini-textbox" placeholder="请输入商品名称" onenter="onKeyEnter"/>

service/agent/assets/pc/html/setMemberGoods.html

@@ -24,7 +24,7 @@
                 <div class="top">
                     <i class="layui-icon layui-icon-app"></i>商品列表
 
-                    <a class="mini-button" onclick="location.href='<{$link}>'">返回上一页</a>
+                    <!-- <a class="mini-button" onclick="location.href='<{$link}>'">返回上一页</a> -->
                 </div>
                 <div class="left_main">
                     <input id="key" class="mini-textbox" placeholder="请输入商品名称" onenter="onKeyEnter"/>

service/agent/assets/pc/html/setOrderGoods.html

@@ -26,7 +26,7 @@
                 <div class="top">
                     <i class="layui-icon layui-icon-app"></i>商品列表
                     
-                    <a class="mini-button" onclick="location.href='<{$link}>'">返回上一页</a>
+                    <!-- <a class="mini-button" onclick="location.href='<{$link}>'">返回上一页</a> -->
                 </div>
                 <div class="left_main">
                     <input id="key" class="mini-textbox" placeholder="请输入商品名称" onenter="onKeyEnter"/>

service/agent/database/member.php

@@ -570,7 +570,7 @@ return array
             (
                 'idcard' => 'yes',
                 'id' => array('yes', '!='),
-                'status' => 2,
+                'status' => array('yes', 'in'),
                 'state' => 1,
             ),
             'order' => array('id' => 'desc'),

service/agent/lib/User.php

@@ -44,6 +44,7 @@ class User
         if ($member) {
         	$where['id'] = $member['id'];
         	$where['idcard'] = $member['idcard'];
+            $where['status'] = '1,2';
         	$other = Dever::db('agent/member')->getData($where);
         	$idcard_pic = '<a href="'.$member['idcard_front'].'" target="_blank"><img src="'.$member['idcard_front'].'" width="150" /></a>';
 	        if ($member['idcard_back']) {

service/agent/src/My.php

@@ -103,6 +103,7 @@ class My extends Core
             return $this->data;
         }
         $where['idcard'] = $this->user['idcard'];
+        $where['status'] = '1,2';
         $this->data['user'] = Dever::db('agent/member')->getData($where);
 
         if ($this->data['user']) {

service/option/database/account.php

@@ -70,9 +70,9 @@ if ($search_auth == 1) {
     (
         '创建账户' => array('fast', '', 'member'),
     );
-    $list_button['list1'] = array('账户列表', '"member&search_option_aid={id}&oper_table=account&search_option_dever_auth='.$search_auth.'"');
+    $list_button['list1'] = array('账户列表', '"member&search_option_aid={id}&search_option_dever_auth='.$search_auth.'"');
 } elseif ($search_auth == 3) {
-    $list_button['list1'] = array('账户列表', '"member&search_option_aid={id}&oper_table=account&search_option_dever_auth='.$search_auth.'"');
+    $list_button['list1'] = array('账户列表', '"member&search_option_aid={id}&search_option_dever_auth='.$search_auth.'"');
 }
 
 return array

service/option/database/agreement.php

@@ -33,7 +33,7 @@ if ($aid) {
     }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
+        // '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 return array

service/option/database/bill_duifu.php

@@ -32,7 +32,7 @@ if (!$oper_table && $aid) {
     }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
+        // '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 

service/option/database/bill_fafang.php

@@ -32,7 +32,7 @@ if (!$oper_table && $aid) {
     }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
+        // '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 

service/option/database/bill_jiaofu.php

@@ -34,7 +34,7 @@ if (!$oper_table && $aid) {
     }
     $button = array
     (
-        '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
+        // '返回上一页' => array('location', 'l=project/database/list&project=option&table=cash&page_type=1&aid=' . $option_aid),
     );
 }
 

service/option/database/member.php

@@ -28,9 +28,9 @@ if ($search_auth <= 2) {
         //'list' => array('查看详情', '"cash&mid={id}&page_type=1&search_audit=-1"'),
         'fast_add' => array('期权价值交付', 'push_cash&search_option_aid={aid}&search_option_mid={id}&type=1'),
         'fast_add1' => array('期权价值发放', 'push_cash&search_option_aid={aid}&search_option_mid={id}type=2'),
-        'list1' => array('交付记录', '"bill_jiaofu&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&oper_table=member&top_table=account"'),
-        'list2' => array('发放记录', '"bill_fafang&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&oper_table=member&top_table=account"'),
-        'list3' => array('兑付记录', '"bill_duifu&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&oper_table=member&top_table=account"'),
+        'list1' => array('交付记录', '"bill_jiaofu&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&top_table=account"'),
+        'list2' => array('发放记录', '"bill_fafang&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&top_table=account"'),
+        'list3' => array('兑付记录', '"bill_duifu&search_option_main=2&search_option_aid={aid}&search_option_mid={id}&top_table=account"'),
     );
 }
 

service/option/lib/Account.php

@@ -211,7 +211,7 @@ class Account
 
             if ($cash) {
                 $table = array();
-                $table['head'] = array('账户类型', '待交付', '已交付总额', '已发放剩余', '未发放', '已兑付');
+                $table['head'] = array('账户类型', '待交付', '已交付总额', '已发放', '未发放', '已兑付');
                 $table['body'] = array();
 
                 foreach ($cash as $k => $v) {
@@ -331,16 +331,16 @@ class Account
             }
         }
         
-        $head_btn[] = array
-        (
-            'type' => 'link',
-            'link' => $url,
-            'name' => '返回上一页',
-        );
+        // $head_btn[] = array
+        // (
+        //     'type' => 'link',
+        //     'link' => $url,
+        //     'name' => '返回上一页',
+        // );
         $head = array
         (
             'name' => '基本信息',
-            'btn' => $head_btn,
+            'btn' => array(),
         );
         $foot = $button;
         $html = Dever::show($head, $result, $foot);