Merge branch 'spsearch' of 121.43.114.153:/home/git/repositories/shopnc into spsearch

admin/control/mb_special.php

@@ -839,4 +839,13 @@ class mb_specialControl extends SystemControl
         }
         showMessage(L('nc_common_save_succ'), urlAdmin('mb_special', 'ugc_list'));
     }
+
+    public function discoveryOp(){
+        echo 'discovery';
+    }
+
+    public function search_keywordOp(){
+        $keyword = trim($_POST['keyword']);
+        echo json_encode('200');
+    }
 }

admin/control/member.php

@@ -327,4 +327,11 @@ class memberControl extends SystemControl{
 			Tpl::showpage('member.attr');
 		}
 	}
+
+	public function member_callOp(){
+		$bonus_rate = trim($_POST['bonus_rate']);
+		$bonus_num = trim($_POST['bonus_num']);
+		$member_id = trim($_POST['member_id']);
+		echo json_encode(array('jsonObj'=>'200'));
+	}
 }

admin/include/menu.php

@@ -216,6 +216,7 @@ if(C('mobile_isuse')){
 				'text' => $lang['nc_mobile'],
 				'list' => array(
 					array('args'=>'index_edit,mb_special,mobile',				'text'=>'首页编辑'),
+					array('args'=>'discovery,mb_special,mobile',				'text'=>'发现'),
 					array('args'=>'special_list,mb_special,mobile',				'text'=>'专题设置'),
 					array('args'=>'ugc_list,mb_special,mobile',					'text'=>$lang['nc_special_review']),
 					array('args'=>'mb_category_list,mb_category,mobile',		'text'=>$lang['nc_mobile_catepic']),

admin/language/zh_cn/member.php

@@ -16,11 +16,13 @@ $lang['member_index_if_admin']		= '是否是管理员';
 $lang['member_index_set_admin']		= '设为管理员';
 $lang['member_index_store']			= '店铺';
 $lang['member_index_to_store']		= '访问店铺';
-$lang['member_index_edit_store']		= '编辑店铺';
+$lang['member_index_edit_store']    = '编辑店铺';
 $lang['member_index_to_message']	= '通知';
 $lang['member_index_points']		= '积分';
 $lang['member_index_inform']		= '举报商品';
 $lang['member_index_prestore']		= '预存款';
+$lang['member_index_bonuss']        = '拥有红包数';
+$lang['member_index_call']          = '唤醒';
 $lang['member_index_available']	    = '可用';
 $lang['member_index_frozen']		= '冻结';
 $lang['member_index_help1']			= '通过会员管理，你可以进行查看、编辑会员资料等操作';

admin/templates/default/mb_special.list.php

@@ -70,9 +70,9 @@ input {
           <th colspan="15" class="nobg"><?php echo $lang['nc_list'];?></th>
         </tr>
         <tr class="thead">
-          <th class="w12">&nbsp;</th>
-          <th>专题编号</th>
-          <th>专题描述</th>
+          <th class="center w96">专题编号</th>
+          <th class="center w144">专题描述</th>
+          <th class="center w400">专题搜索关键字</th>
           <th class="w200 align-center"><span><?php echo $lang['nc_handle'];?></span></th>
         </tr>
       </thead>
@@ -80,9 +80,9 @@ input {
         <?php if(!empty($output['list']) && is_array($output['list'])){ ?>
         <?php foreach($output['list'] as $key => $value){ ?>
         <tr class="hover">
-          <td>&nbsp;</td>
-          <td><?php echo $value['special_id'];?></td>
-          <td><span nc_type="edit_special_desc" column_id="<?php echo $value['special_id'];?>" title="<?php echo $lang['nc_editable'];?>" class="editable tooltip w270"><?php echo $value['special_desc'];?></span></td>
+          <td class="center"><?php echo $value['special_id'];?></td>
+          <td class="center"><span nc_type="edit_special_desc" column_id="<?php echo $value['special_id'];?>" title="<?php echo $lang['nc_editable'];?>" class="alignleft editable tooltip w270"><?php echo $value['special_desc'];?></span></td>
+          <td class="center"><input type="text" name="search_keyword" placeholder="添加该专题的搜索关键字" value=""><a class="btn search_keyword"><span>添加</span></a></td>
           <td class="nowrap align-center"><a href="<?php echo urlAdmin('mb_special', 'special_edit', array('special_id' => $value['special_id']));?>">编辑</a>&nbsp;|&nbsp; <a href="javascript:;" nctype="btn_del" data-special-id="<?php echo $value['special_id'];?>">删除</a></td>
         </tr>
         <?php } ?>
@@ -171,5 +171,20 @@ input {
 
         //编辑专题描述
         $('span[nc_type="edit_special_desc"]').inline_edit({act: 'mb_special',op: 'update_special_desc'});
+
+        //添加搜索关键字
+
+        $('.search_keyword').on('click',function(){
+            var keyword = $(this).siblings('input[name="search_keyword"]').val();
+            if(!keyword){
+                alert('请输入关键字');
+                return;
+            }
+            if(confirm('确定提交?')) {
+                $.post('index.php?act=mb_special&op=search_keyword',{keyword:keyword},function(res){
+                    console.log(res);
+                });
+            }
+        });
     });
 </script> 

admin/templates/default/member.index.php

@@ -78,13 +78,15 @@
           <th>&nbsp;</th>
           <th colspan="2"><?php echo $lang['member_index_name']?></th>
           <th class="align-center"><span fieldname="logins" nc_type="order_by"><?php echo $lang['member_index_login_time']?></span></th>
+          <th class="align-center"><?php echo $lang['member_index_reg_time'];?></th>
           <th class="align-center"><span fieldname="last_login" nc_type="order_by"><?php echo $lang['member_index_last_login']?></span></th>
           <th class="align-center"><?php echo $lang['member_index_points']; ?></th>
-          <th class="align-center"><?php echo $lang['member_index_prestore'];?></th>
+          <th class="align-center"><?php echo $lang['member_index_bonuss']?></th>
           <th class="align-center">经验值</th>
           <th class="align-center">级别</th>
           <th class="align-center"><?php echo $lang['member_index_login']; ?></th>
           <th class="align-center"><?php echo $lang['nc_handle']; ?></th>
+          <th class="align-center"><?php echo $lang['member_index_call'];?></th>
         </tr>
       <tbody>
         <?php if(!empty($output['member_list']) && is_array($output['member_list'])){ ?>
@@ -92,9 +94,9 @@
         <tr class="hover member">
           <td class="w24"><input type="checkbox" name='del_id[]' value="<?php echo $v['member_id']; ?>" class="checkitem"></td>
           <td class="w48 picture"><div class="size-44x44"><span class="thumb size-44x44"><i></i><img src="<?php if ($v['member_avatar'] != ''){ echo $v['member_avatar'];}else { echo UPLOAD_SITE_URL.'/'.ATTACH_COMMON.DS.C('default_user_portrait');}?>?<?php echo microtime();?>"  onload="javascript:DrawImage(this,44,44);"/></span></div></td>
-          <td><p class="name"><strong><?php echo $v['member_name']; ?></strong>(<?php echo $lang['member_index_true_name']?>: <?php echo $v['member_nickname']; ?>)</p>
-            <p class="smallfont"><?php echo $lang['member_index_reg_time']?>:&nbsp;<?php echo $v['member_time']; ?></p>
-            
+          <td class="w150">
+            <p class="name"><strong><?php echo $v['member_name']; ?></strong></p>
+            <p class="name"><?php echo $lang['member_index_true_name']?>: <?php echo $v['member_nickname']; ?></p>
               <div class="im"><span class="email" >
                 <?php if($v['member_email'] != ''){ ?>
                 <a href="mailto:<?php echo $v['member_email']; ?>" class=" yes" title="<?php echo $lang['member_index_email']?>:<?php echo $v['member_email']; ?>"><?php echo $v['member_email']; ?></a><?php echo $v['member_email']; ?></span>
@@ -113,6 +115,7 @@
                <?php } ?>
               </div></td>
           <td class="align-center"><?php echo $v['member_login_num']; ?></td>
+          <td class="align-center"><?php echo $v['member_time']; ?></td>
           <td class="w150 align-center"><p><?php echo $v['member_login_time']; ?></p>
             <p><?php echo $v['member_login_ip']; ?></p></td>
           <td class="align-center"><?php echo $v['member_points']; ?></td>
@@ -123,6 +126,12 @@
           <td class="align-center"><?php echo $v['member_grade'];?></td>
           <td class="align-center"><?php echo $v['member_state'] == 1?$lang['member_edit_allow']:$lang['member_edit_deny']; ?></td>
           <td class="align-center"><a href="index.php?act=member&op=member_edit&member_id=<?php echo $v['member_id']; ?>"><?php echo $lang['nc_edit']?></a> | <a href="index.php?act=notice&op=notice&member_name=<?php echo ltrim(base64_encode($v['member_name']),'='); ?>"><?php echo $lang['member_index_to_message'];?></a></td>
+          <td class="align-center">
+            <input type="hidden" value="10" name="bonus_rate">
+            <input type="hidden" value="10" name="bonus_num">
+            <input type="hidden" value="<?php echo $v['member_id'] ?>" name="member_id">
+            <input type="button" class="member_call_submit" value="唤醒">
+          </td>
         </tr>
         <?php } ?>
         <?php }else { ?>
@@ -149,6 +158,22 @@
 $(function(){
     $('#ncsubmit').click(function(){
     	$('input[name="op"]').val('member');$('#formSearch').submit();
-    });	
+    });
+
+    $('.member_call_submit').click(function(){
+      if(confirm('确认发送?')) {
+        var bonus_rate = $(this).siblings("input[name='bonus_rate']").val();
+        var bonus_num = $(this).siblings("input[name='bonus_num']").val();
+        var member_id = $(this).siblings("input[name='member_id']").val();
+        $.post('index.php?act=member&op=member_call',{bonus_rate:bonus_rate,bonus_num:bonus_num,member_id:member_id},function(res){
+            if(res.code == 200) {
+              alert('发送成功!');
+            }
+            else {
+              alert(res.message);
+            }
+        });
+      }
+    });
 });
 </script>

admin/templates/default/oper_send.awaken.php

@@ -12,6 +12,25 @@
         </div>
     </div>
     <div class="fixed-empty"></div>
+    <div>
+        <table class="tb-type1 noborder search">
+            <tbody>
+            <tr style="background: rgb(255, 255, 255);">
+                <td>
+                    <label>全局过滤条件:
+                        <select name="golbal_last_login" class="golbal_last_login">
+                            <option value="all">全部</option>
+                            <option value="10">未登录10天</option>
+                            <option value="20">未登录20天</option>
+                            <option value="30">未登录30天</option>
+                            <option value="40">未登录40天</option>
+                        </select>
+                    </label>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
     <table class="table tb-type2" id="prompt">
         <tbody>
         <tr class="space odd">
@@ -40,15 +59,20 @@
                         <td class="w400 align-left"><label>paysn：<input class="w300" type="text" name="paysn" placeholder="请输入paysn"></label></td>
                         <td class="w200 align-left"><label>金额：<input type="text" name="amount" placeholder="单个用户红包金额"></label></td>
                         <td class="w250 align-left"><label>最近多少天注册用户：<input type="text" name="days" placeholder="请输入天数"></label></td>
+                        <input type="hidden" class="golbal_last_login" name="global_condition" value="all">
                         <td class="w200 align-left"><a href="JavaScript:void(0);" class="submit_btn btn" id="submit_form"><span><?php echo $lang['nc_submit']; ?></span></a></td>
                     </tr>
             </tbody>
         </table>
     </form>
-    <table class="table tb-type2 nobdb">
+    <table class="table tb-type2" id="prompt">
         <tbody>
         <tr>
-            <td class="w400 align-left"><label>短信内容，【熊猫美妆】周末福利大放送，{50}元红包已到账！{雪花秀、兰芝补货，SNP、婵真}上新，传送门：{http://t.cn/RY9Iiba}，退订回复N:</label></td>
+            <td>
+                <ul>
+                    <li>短信内容，【熊猫美妆】周末福利大放送，{50}元红包已到账！{雪花秀、兰芝补货，SNP、婵真}上新，传送门：{http://t.cn/RY9Iiba}，退订回复N:</li>
+                </ul>
+            </td>
         </tr>
         </tbody>
     </table>
@@ -63,6 +87,7 @@
                 <td class="w200 align-left"><label>网页地址：<input type="text" name="openurl" placeholder="请输入可打开地址"></label></td>
                 <td class="w250 align-left"><label>最近多少天注册用户：<input type="text" name="days" placeholder="请输入天数"></label></td>
                 <td class="w250 align-left"><label>红包少于多少元用户：<input type="text" name="et_amount" placeholder="请输入金额"></label></td>
+                <input type="hidden" class="golbal_last_login" name="global_condition" value="all">
                 <td class="w200 align-left"><a href="JavaScript:void(0);" class="submit_btn btn" id="submit_form"><span><?php echo $lang['nc_submit']; ?></span></a></td>
             </tr>
             </tbody>
@@ -70,6 +95,12 @@
     </form>
 </div>
 <script type="text/javascript">
+
+    $('.golbal_last_login').on('change',function(){
+        var last_login = $(this).val();
+        $('.golbal_last_login').val(last_login);
+    });
+
     $('.submit_btn').on('click', function () {
         var confirm = window.confirm('确认提交？');
         if (confirm) {

helper/user_session/fcode.php

@@ -67,9 +67,9 @@ class fcode
         }
 
         $mod_fcode = Model('goods_fcode');
-        $codes = $mod_fcode->getFcodeList(array('mobile' => session_helper::cur_mobile()));
+        $fcodes = $mod_fcode->getFcodeList(['mobile' => session_helper::cur_mobile()]);
 
-        foreach ($codes as $item)
+        foreach ($fcodes as $item)
         {
             $fcoder = new mfcode($item);
             if($fcoder->un_used()) {
@@ -99,7 +99,6 @@ class fcode
         if(array_key_exists($common_id,$this->mCodes))
         {
             $total = 0;
-
             $fcodes = $this->mCodes[$common_id];
             foreach ($fcodes as $item)
             {