صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
waibao
/
NN2021012701
2
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

wesmiler 更新第5期更新代码合并

wesmiler 4 سال پیش
والد
3a25575700
کامیت
785629acc4
6فایلهای تغییر یافته به همراه109 افزوده شده و 38 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 1 1
      app/weixin/model/AccountLog.php
  2. 1 1
      public/themes/admin_simpleboot3/admin/sales/agency.html
  3. 82 16
      public/themes/admin_simpleboot3/admin/sales/info.html
  4. 1 1
      public/themes/admin_simpleboot3/admin/sales/tips.html
  5. 12 12
      vendor/thinkcmf/cmf-app/src/admin/controller/PoolsController.php
  6. 12 7
      vendor/thinkcmf/cmf-app/src/admin/controller/SalesController.php

+ 1 - 1
app/weixin/model/AccountLog.php
مشاهده فایل 

@@ -89,7 +89,7 @@ class AccountLog extends Model
 
             return true;
 
         }
 
 
-        if($id = AccountLog::where(['user_id'=> $userId,'status'=>2])->whereIn('type',[1,2,4])->value('id')){
 
+        if($id = AccountLog::where(['user_id'=> $userId,'status'=>2,'change_type'=>2])->value('id')){
 
             PRedis::set($cacheKey, $id, rand(10, 30));
 
         }

+ 1 - 1
public/themes/admin_simpleboot3/admin/sales/agency.html
مشاهده فایل 

@@ -135,7 +135,7 @@
 
 <!--                    <td><input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]" value="{$vo.id}" title="ID:{$vo.id}"></td>-->
 
                     <td>{$vo.user_id}</td>
 
                     <td>
 
-                        <img class="avatar" src="{$vo.avatar}"> <if condition="$vo['sex'] eq 1"><img class="sex" src="/static/images/male.png" alt=""><else><img class="sex" src="/static/images/fmale.png" alt=""></if> <span>{$vo['user_nickname']}</span>
 
+                        <a href="{:url('admin/sales/info',['id'=> $vo.user_id])}"><img class="avatar" src="{$vo.avatar}"></a> <if condition="$vo['sex'] eq 1"><img class="sex" src="/static/images/male.png" alt=""><else><img class="sex" src="/static/images/fmale.png" alt=""></if> <span>{$vo['user_nickname']}</span>
 
                     </td>
 
                     <td>
 
                         <p class="profile">{$vo.profile_text}</p>

+ 82 - 16
public/themes/admin_simpleboot3/admin/sales/info.html
مشاهده فایل 

@@ -3,7 +3,8 @@
 
 <body>
 
 <div class="wrap">
 
     <ul class="nav nav-tabs">
 
-        <li><a>用户资料</a></li>
 
+        <li><a href="javascript:history.back(-1);">资源列表</a></li>
 
+        <li class="active"><a href="#">用户资料</a></li>
 
     </ul>
 
     <form method="post" class="form-horizontal js-ajax-form margin-top-20" action="{:url('admin/sales/info')}">
 
         <div class="form-group">
 
@@ -21,9 +22,15 @@
 
             </div>
 
         </div>
 
         <div class="form-group">
 
-            <label for="input-real_name" class="col-sm-2 control-label"><span class="form-required">*</span>{:lang('REALNAME')}</label>
 
+            <label for="input-user_login" class="col-sm-2 control-label"><span class="form-required">*</span>账号</label>
 
             <div class="col-md-6 col-sm-10">
 
-                <input type="text" class="form-control" id="input-real_name" name="real_name" value="{$real_name}">
 
+                <input type="text" class="form-control" id="input-user_login" name="user_login" value="{$user_login}" readonly>
 
+            </div>
 
+        </div>
 
+        <div class="form-group">
 
+            <label for="input-openid" class="col-sm-2 control-label"><span class="form-required">*</span>微信openid</label>
 
+            <div class="col-md-6 col-sm-10">
 
+                <input type="text" class="form-control" id="input-openid" value="{$openid}" readonly>
 
             </div>
 
         </div>
 
         <div class="form-group">
 
@@ -33,6 +40,13 @@
 
             </div>
 
         </div>
 
         <div class="form-group">
 
+            <label for="input-real_name" class="col-sm-2 control-label">真实姓名</label>
 
+            <div class="col-md-6 col-sm-10">
 
+                <input type="text" class="form-control" id="input-real_name" name="real_name" value="{$real_name}">
 
+            </div>
 
+        </div>
 
+
 
+        <div class="form-group">
 
             <label for="input-real_name" class="col-sm-2 control-label">性别</label>
 
             <div class="col-md-6 col-sm-10">
 
                 <input type="text" class="form-control" id="input-sex" name="sex" value="<switch name="sex">
 
@@ -42,6 +56,31 @@
 
             </div>
 
         </div>
 
         <div class="form-group">
 
+            <label for="input-score" class="col-sm-2 control-label"><span class="form-required"></span>生日</label>
 
+            <div class="col-md-6 col-sm-10">
 
+                <input type="text" class="form-control js-bootstrap-datetime" id="birthday" name="birthday" value="{:date('Y-m-d H:i:s',$birthday)}">
 
+            </div>
 
+        </div>
 
+
 
+        <div class="form-group">
 
+            <label class="col-sm-2 control-label">是否置顶</label>
 
+            <div class="col-md-6 col-sm-10">
 
+                <label class="radio-inline">
 
+                    <input type="radio" name="is_top" <if condition="$is_top eq 1">checked</if> value="1">是
 
+                </label>
 
+                <label class="radio-inline">
 
+                    <input type="radio" name="is_top" <if condition="$is_top neq 1">checked</if> value="0"> 否
 
+                </label>
 
+            </div>
 
+        </div>
 
+        <div class="form-group">
 
+            <label for="input-top_expire" class="col-sm-2 control-label"><span class="form-required"></span>置顶时长</label>
 
+            <div class="col-md-6 col-sm-10">
 
+                <input type="text" class="form-control js-bootstrap-datetime" id="top_expire" name="top_expire" value="{$top_expire}">
 
+            </div>
 
+        </div>
 
+
 
+        <div class="form-group">
 
             <label for="input-user_login" class="col-sm-2 control-label">身高</label>
 
             <div class="col-md-6 col-sm-10" style="height: 30px;">
 
                 <input type="text" class="form-control" style="width: 95%;float:left;" id="height" name="height" value="{$height}" ><span style="float:left;height: 34px; line-height: 34px;"> &nbsp;cm</span>
 
@@ -53,6 +92,24 @@
 
                 <input type="text" class="form-control" style="width: 95%;float:left;" id="weight" name="weight" value="{$weight}" ><span style="float:left;height: 34px; line-height: 34px;"> &nbsp;kg</span>
 
             </div>
 
         </div>
 
+        <div class="form-group">
 
+            <php>$salaryarray=array(1=>'5-10w',2=>'10-20w',3=>'20-35w',4=>'35-55w',5=>'100w以上');</php>
 
+            <label for="input-user_login" class="col-sm-2 control-label">收入</label>
 
+            <div class="col-md-6 col-sm-10">
 
+                <select class="form-control" name="salary" id="salary" style="width: 92%;float:left;">
 
+                    <option value="none">--请选择--</option>>
 
+                    <volist name="$salaryarray" id="vo">
 
+                        <if condition="$salary eq $key">
 
+                            <option value="{$key}" selected="">{$vo}</option>
 
+                            <else/>
 
+                            <option value="{$key}">{$vo}</option>
 
+                        </if>
 
+                    </volist>
 
+                </select>
 
+                <span style="float:left;height: 34px; line-height: 34px;"> &nbsp;年薪</span>
 
+            </div>
 
+        </div>
 
+
 
         <php>$educationarray=array(1=>'大专',2=>'本科',3=>'硕士',4=>'博士');</php>
 
         <div class="form-group">
 
             <label for="input-user_login" class="col-sm-2 control-label">学历</label>
 
@@ -77,10 +134,10 @@
 
 
                     <option value="none">--请选择职位--</option>
 
 
-
 
                 </select>
 
             </div>
 
         </div>
 
+
 
         <div class="form-group">
 
             <label for="input-user_login" class="col-sm-2 control-label">现居</label>
 
             <div class="col-md-6 col-sm-10">
 
@@ -103,20 +160,29 @@
 
                 </div>
 
             </div>
 
         </div>
 
-        <php>$marriedarray=array(1=>'未婚',2=>'离异',3=>'离异有孩子');</php>
 
+
 
         <div class="form-group">
 
-            <label for="input-user_login" class="col-sm-2 control-label">婚姻状况</label>
 
+            <label for="input-user_login" class="col-sm-2 control-label">家乡</label>
 
             <div class="col-md-6 col-sm-10">
 
-                <select class="form-control" name="married" id="married">
 
-                    <option value="none">--请选择--</option>
 
-                    <volist name="$marriedarray" id="vo">
 
-                        <if condition="$married eq $key">
 
-                            <option value="{$key}" selected="">{$vo}</option>
 
-                            <else/>
 
-                            <option value="{$key}">{$vo}</option>
 
-                        </if>
 
-                    </volist>
 
-                </select>
 
+                <div class="layui-main">
 
+                    <div class="layui-form" >
 
+                        <div class="layui-form-item" style="margin-bottom:0px;">
 
+
 
+                            <div class="layui-inline" style="margin-bottom:0px;width: 170px;">
 
+                                <input type="text" class="form-control" id="home_province" name="home_province" value="{$home_province}">
 
+                            </div>
 
+                            <div class="layui-inline" style="margin-bottom:0px;width: 170px;">
 
+                                <input type="text" class="form-control" id="home_city" name="home_city" value="{$home_city}">
 
+                            </div>
 
+                            <div class="layui-inline" style="margin-bottom:0px;width: 170px;">
 
+                                <input type="text" class="form-control" id="home_district" name="home_district" value="{$home_district}">
 
+                            </div>
 
+                        </div>
 
+
 
+                    </div>
 
+                </div>
 
+
 
+
 
 
             </div>
 
         </div>

+ 1 - 1
public/themes/admin_simpleboot3/admin/sales/tips.html
مشاهده فایل 

@@ -135,7 +135,7 @@
 
 <!--                    <td><input type="checkbox" class="js-check" data-yid="js-check-y" data-xid="js-check-x" name="ids[]" value="{$vo.id}" title="ID:{$vo.id}"></td>-->
 
                     <td>{$vo.user_id}</td>
 
                     <td>
 
-                        <img class="avatar" src="{$vo.avatar}"> <if condition="$vo['sex'] eq 1"><img class="sex" src="/static/images/male.png" alt=""><else><img class="sex" src="/static/images/fmale.png" alt=""></if> <span>{$vo['user_nickname']}</span>
 
+                        <a href="{:url('admin/sales/info',['id'=> $vo.user_id])}"><img class="avatar" src="{$vo.avatar}"></a> <if condition="$vo['sex'] eq 1"><img class="sex" src="/static/images/male.png" alt=""><else><img class="sex" src="/static/images/fmale.png" alt=""></if> <span>{$vo['user_nickname']}</span>
 
                     </td>
 
                     <td>
 
                         <p class="profile">{$vo.profile_text}</p>

+ 12 - 12
vendor/thinkcmf/cmf-app/src/admin/controller/PoolsController.php
مشاهده فایل 

@@ -84,8 +84,8 @@ class PoolsController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
                 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -201,8 +201,8 @@ class PoolsController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -318,8 +318,8 @@ class PoolsController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -435,8 +435,8 @@ class PoolsController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -556,8 +556,8 @@ class PoolsController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -675,8 +675,8 @@ class PoolsController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;

+ 12 - 7
vendor/thinkcmf/cmf-app/src/admin/controller/SalesController.php
مشاهده فایل 

@@ -85,8 +85,8 @@ class SalesController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -228,8 +228,8 @@ class SalesController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -390,8 +390,8 @@ class SalesController extends AdminBaseController
 
                 $item['is_vip'] = $isVip && time() < $vipExpire? 1 : 0;
 
 
                 // 是否充值和消费过
 
-                $item['is_recharge'] = UserRechargeLog::check($item['id'], 2);
 
-                $item['is_cost'] = AccountLog::check($item['id']);
 
+                $item['is_recharge'] = UserRechargeLog::check($item['user_id'], 2);
 
+                $item['is_cost'] = AccountLog::check($item['user_id']);
 
 
                 $profile = [];
 
                 $birthday = isset($item['birthday'])? $item['birthday'] : 0;
 
@@ -494,9 +494,14 @@ class SalesController extends AdminBaseController
 
         $info = Db::name('user')->alias('u')
 
             ->leftJoin('user_profile up', 'u.id=up.userid')
 
             ->leftJoin('pools p', 'p.user_id=u.id')
 
-            ->field('u.id,u.openid,u.avatar,u.sex,u.birthday,u.user_nickname,u.real_name,u.create_time,u.user_status,u.mobile,up.idcard_check,up.position_check,up.height,up.weight,up.education_check,up.education,up.occupation,up.married,up.city')
 
+            ->field('p.expire_at,u.id,u.openid,u.user_login,u.is_top,u.vip_auth,u.top_expire,u.avatar,u.sex,u.birthday,u.user_nickname,u.real_name,u.create_time,u.user_status,u.mobile,up.salary,up.idcard_check,up.position_check,up.height,up.weight,up.education_check,up.education,up.occupation,up.married,up.province,up.district,up.city,up.home_province,up.home_district,up.home_city')
 
             ->where(['u.id'=> $id, 'u.user_type'=> 2])
 
             ->find();
 
+        if($info){
 
+            if($info['expire_at'] && $info['expire_at'] <= date('Y-m-d H:i:s')){
 
+                $info['mobile'] = formatStr($info['mobile']);
 
+            }
 
+        }
 
         $this->assign($info);
 
         return $this->fetch();
 
     }