Merge branch 'master' of http://git.dongerkj.com:9095/waibao/NN2021012701

app/api/controller/MarketController.php

@@ -10,6 +10,7 @@ use app\weixin\model\AccountLog;
 use app\weixin\model\UserBalanceLog;
 use app\weixin\model\Member;
 use app\weixin\model\Storage;
+use app\weixin\model\UserContactLog;
 use app\weixin\model\UserLog;
 use app\weixin\model\UserProfile;
 use app\weixin\model\Wechat;
@@ -106,6 +107,61 @@ class MarketController extends MarketBaseController
     }
 
     /**
+     * 获取主页信息
+     */
+    public function getHomeInfo()
+    {
+        $id = input('id', 0);
+        $cid = input('cid', 0);
+        $type = input('type', 1);
+        // 基础信息
+        $userId = $id ? $id : $this->userId;
+        $myInfo = Member::getHomeInfo($userId, '', $type);
+        if($myInfo){
+            $myInfo['wechat_code'] = isset($myInfo['wechat_account'])? $myInfo['wechat_account'] : '';
+        }
+
+        $cUserInfo = [];
+        $cInfo = [];
+        if ($cid <= 0 && $id) {
+            $cid = UserContactLog::where(['user_id' => $this->userId, 'contact_uid' => $id])
+                ->where('status', 'in', [1, 2, 3])
+                ->value('id');
+            if ($cid <= 0) {
+                $cid = UserContactLog::where(['contact_uid' => $this->userId, 'user_id' => $id])
+                    ->where('status', 'in', [1, 2, 3])
+                    ->value('id');
+            }
+        }
+        if ($cid > 0) {
+            // 认识记录
+            $cInfo = UserContactLog::where(['id' => $cid])->where('status', 'in', [1, 2, 3])->field('id,user_id,contact_uid,is_read,status')->find();
+            $cUid = isset($cInfo['contact_uid']) ? intval($cInfo['contact_uid']) : 0;
+            $status = isset($cInfo['status']) ? intval($cInfo['status']) : 0;
+            if ($cUid) {
+
+                // 被申请方查看，更新申请微信阅读状态
+                if($cUid == $this->userId){
+                    UserContactLog::where(['id' => $cid])->update(['is_read'=> 1]);
+                }
+
+                // 想认识的人的信息
+                $field = 'm.id,m.user_nickname,m.avatar,m.real_name,up.wechat_code,up.qq';
+                $cUserInfo = Member::getHomeInfo($cUid, $field, 2);
+
+                // 未确认认识的不展示联系方式
+                if ($status != 2 && $cUserInfo) {
+                    $cUserInfo['wechat_code'] = '';
+                    $cUserInfo['qq'] = '';
+                }
+            }
+        }
+        PRedis::set('test:' . $userId, ['homeInfo' => $myInfo, 'cUserInfo' => $cUserInfo, 'cInfo' => $cInfo], 600);
+        showJson(1005, 1008, ['homeInfo' => $myInfo, 'cUserInfo' => $cUserInfo, 'cInfo' => $cInfo]);
+
+    }
+
+    /**
      * 注册
      */
     public function register(){
@@ -178,6 +234,7 @@ class MarketController extends MarketBaseController
                 'user_pass' => $userPass,
                 'pay_password' => $userPass,
                 'last_login_ip' => get_client_ip(),
+                'wechat_account' => isset($params['wechat_code']) ? trim($params['wechat_code']) : '',
                 'is_follow' => isset($wxInfo['subscribe']) ? intval($wxInfo['subscribe']) : 0,
                 'sex' => isset($wxInfo['sex']) ? intval($wxInfo['sex']) : 0,
                 'last_login_time' => time(),
@@ -194,6 +251,7 @@ class MarketController extends MarketBaseController
             if (!$agentId) {
                 $res = $agentId = Member::insertGetId($memberData);
             } else {
+                $where['id'] = $agentId;
                 $res = Member::where($where)->update($memberData);
             }
 
@@ -209,7 +267,6 @@ class MarketController extends MarketBaseController
                 'province' => isset($nowAddress[0]) ? $nowAddress[0] : '',
                 'city' => isset($nowAddress[1]) ? $nowAddress[1] : '',
                 'district' => isset($nowAddress[2]) ? $nowAddress[2] : '',
-                'wechat_code' => isset($params['wechat_code']) ? trim($params['wechat_code']) : '',
             ];
 
             if (UserProfile::checkProfile($agentId)) {
@@ -234,7 +291,7 @@ class MarketController extends MarketBaseController
             session('userInfo', null);
 
             showJson(1005, 2043);
-       } catch (\Exception $exception) {
+        } catch (\Exception $exception) {
             PRedis::set('members:marketReg:error:' . $agentId, $exception->getMessage(), 6 * 3600);
             showJson(1004, 2136);
         }
@@ -275,7 +332,6 @@ class MarketController extends MarketBaseController
             'province' => isset($nowAddress[0]) ? $nowAddress[0] : '',
             'city' => isset($nowAddress[1]) ? $nowAddress[1] : '',
             'district' => isset($nowAddress[2]) ? $nowAddress[2] : '',
-            'wechat_code' => isset($params['wechat_code']) ? trim($params['wechat_code']) : '',
             'qq' => isset($params['qq']) ? trim($params['qq']) : '',
         ];
         Db::startTrans();
@@ -295,6 +351,7 @@ class MarketController extends MarketBaseController
         $memberData = [
             'user_nickname' => isset($params['nickname']) ? trim($params['nickname']) : '',
             'birthday' => $birthday,
+            'wechat_account' => isset($params['wechat_code']) ? trim($params['wechat_code']) : '',
             'sex' => isset($params['sex']) ? intval($params['sex']) : 0,
         ];
         if ($newMobile && $mobile != $newMobile) {

app/api/controller/SmsController.php

@@ -42,7 +42,7 @@ class SmsController extends HomeBaseController
                 }
                 break;
             case 'marketReg':  // 分销账号注册
-                $id = Member::where(['user_login' => $mobile,'agent_type'=> 1])->where('agent_status','>=',0)->value('id');
+                $id = Member::where(['user_login' => $mobile,'agent_type'=> 1])->where('agent_status','>=',1)->value('id');
                 if ($id && $id != $userId) {
                     showJson(1004, 2001);
                 }

app/weixin/model/Wechat.php

@@ -949,7 +949,6 @@ class Wechat
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
         $data = curl_exec($ch);
-        var_dump($data);
         curl_close($ch);
         return $data;
     }

app/weixin/service/Award.php

@@ -126,6 +126,8 @@ class Award
         $level1Award = isset($marketConfig['level_1']) ? floatval($marketConfig['level_1']) : 0;
         $awardMoney = $marketType==1? moneyFormat($level1Award) : moneyFormat($money * ($level1Award / 100),3);
         $logData['levelAward'] = $level1Award;
+        $typeNames = [4=>'完善资料',5=>'完成身份认证',6=>'完成学历认证',7=>'完成工作认证',9=>'报名参加活动'];
+        $typeName = isset($typeNames[$type])? $typeNames[$type] : ($money? "支付{$money}元，": '消费');
         if ($level1Award > 0 && $level1Award <= 100 && $awardMoney > 0) {
             // 账户变动
             Db::startTrans();
@@ -133,7 +135,7 @@ class Award
                 // 写入奖励日志
                 $levelName = "您邀请的[{$sourceNickname}]用户";
                 $marketName = isset($marketConfig['name']) ? $marketConfig['name'] : '分销收益';
-                $logTitle = "{$levelName}支付{$money}元,获得{$marketName}{$awardMoney}元";
+                $logTitle = "{$levelName}{$typeName},获得{$marketName}{$awardMoney}元";
                 $log = [
                     'change' => $awardMoney,
                     'type' => $type,
@@ -168,7 +170,7 @@ class Award
                             $checkTime = date('Y.m.d H:i');
                             $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看收益明细";
                             $msgParams = [
-                                'title' => "您邀请的用户[$sourceNickname]消费所得的收益已到账！\n\n类型：\t{$marketName}",
+                                'title' => "您邀请的用户[$sourceNickname]{$typeName}所得的收益已到账！\n\n结算类型：\t{$marketName}",
                                 'remark' => $remark,
                                 'type' => 'income',
                                 'keywords' => [
@@ -233,7 +235,7 @@ class Award
                 // 写入奖励日志
                 $levelName = "您的下级[{$nickname}]邀请的[{$sourceNickname}]用户";
                 $marketName = isset($marketConfig['name']) ? $marketConfig['name'] : '分销收益';
-                $logTitle = "{$levelName}消费{$money}元,获得{$marketName}{$awardMoneyTwo}元";
+                $logTitle = "{$levelName}{$typeName},获得{$marketName}{$awardMoneyTwo}元";
                 $log = [
                     'change' => $awardMoneyTwo,
                     'type' => $type,
@@ -268,7 +270,7 @@ class Award
                             $checkTime = date('Y.m.d H:i');
                             $remark = "感谢您对拾光的信任，我们一起解救单身青年！点击查看收益明细";
                             $msgParams = [
-                                'title' => "您的下级[$nickname]邀请的用户[{$sourceNickname}]消费所得的收益已到账！\n\n类型：\t{$marketName}",
+                                'title' => "您的下级[$nickname]邀请的用户[{$sourceNickname}]{$typeName}所得的收益已到账！\n\n结算类型：\t{$marketName}",
                                 'remark' => $remark,
                                 'type' => 'income',
                                 'keywords' => [

data/config/weixin.php

@@ -47,6 +47,7 @@ return [
         'privacy' => 9, // 隐私保护政策
         'marketAgree' => 10, // 隐私保护政策
     ],
+    // 收益类型
     'incomeTypes'=> [
         2=> '会员开通VIP奖励',
         3=> '人工牵线付费奖励',

public/themes/default/weixin/market/index.html

@@ -78,6 +78,10 @@
                     <li><img src="__TMPL__/weixin/public/assets/img/custom.png">
                         <p>我的客服</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
+                <a href="/weixin/page/marketAgree">
+                    <li><img src="__TMPL__/weixin/public/assets/img/new-rule.png">
+                        <p>奖励规则</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                </a>
                 <a href="/weixin/page/about">
                     <li class="bangd_s"><img src="__TMPL__/weixin/public/assets/img/about.png">
                         <p>关于拾光</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>

public/themes/default/weixin/member/index.html

@@ -49,7 +49,7 @@
         <div class="liebr_box">
             <ul>
                 <a href="/weixin/auth/vip">
-                    <li><img src="__TMPL__/weixin/public/assets/img/new-vip.png" style="width: 24px; margin-left: 14px;">
+                    <li><img src="__TMPL__/weixin/public/assets/img/new-vip.png">
                         <p>会员中心</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h2 class="expire" v-if="memberInfo.vip_expire_near">即将到期请及时续费</h2></li>
                 </a>
                 <a href="/weixin/auth/index">
@@ -70,7 +70,7 @@
                         <p>充值记录</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3 v-text="memberInfo.rechargeCount" v-if="memberInfo.rechargeCount">0</h3></li>
                 </a>-->
                 <a href="/weixin/auth/hand">
-                    <li><img src="__TMPL__/weixin/public/assets/img/new-hand.png" style="width: 22px; margin-left: 15px;">
+                    <li><img src="__TMPL__/weixin/public/assets/img/new-hand.png" >
                         <p>人工牵线</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/custom">
@@ -78,11 +78,11 @@
                         <p>我的客服</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/member/privacy" >
-                    <li><img src="__TMPL__/weixin/public/assets/img/new-privacy.png" style="width: 24px; margin-left: 14px;">
+                    <li><img src="__TMPL__/weixin/public/assets/img/new-privacy.png">
                         <p>隐私设置</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/rule">
-                    <li><img class="rule" src="__TMPL__/weixin/public/assets/img/new-rule.png">
+                    <li><img  src="__TMPL__/weixin/public/assets/img/new-rule.png">
                         <p>违规处罚</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/about">

public/themes/default/weixin/public/assets/css/about.css

@@ -13,11 +13,12 @@ body {
     background: #fff;
     padding: 0px 15px;
     padding-top: .5rem;
+    min-height: 420px;
 }
 .huodxq_nr img{margin: 0 auto; max-width: 100%;}
 
 .footer {
-    position: absolute;
+    /*position: absolute;*/
     bottom: 15px;
     text-align: center;
     width: 100%;

public/themes/default/weixin/public/assets/js/market-entry.js

@@ -534,7 +534,7 @@ var app = new Vue({
                 $.modal({
                     id: "privacy",
                     title: "温馨提示",
-                    text: '<div class="tips"><p>非常感谢您对拾光婚恋平台的信任和支持，为了保证平台用户能够在安全的环境中使用该平台，共同营造出真诚靠谱的交友环境，请您仔细阅读并同意相关条款。</p><br><p><a href="/weixin/page/marketAgree">《分销用户服务协议》</a></p><p><a href="/weixin/page/privacy">《隐私保护政策》</a></div>',
+                    text: '<div class="tips"><p>非常感谢您对拾光婚恋平台的信任和支持，为了保证平台用户能够在安全的环境中使用该平台，共同营造出真诚靠谱的交友环境，请您仔细阅读并同意相关条款。</p><br><p><a href="/weixin/page/marketAgree">《红娘推广奖励规则》</a></p><p><a href="/weixin/page/privacy">《隐私保护政策》</a></div>',
                     buttons: [
                         {
                             text: "不同意", className: "default", onClick: function () {
@@ -561,6 +561,11 @@ var app = new Vue({
                 formData.append('image', _this.file);
             }
 
+            var sid = getParam('sid')
+            if(typeof (sid) != 'undefined' && sid >0){
+                formData.append('sid', sid);
+            }
+
             _this.agree = false;
             _this.submitting.submit = true;
             $.showLoading('数据保存中...');

public/themes/default/weixin/public/assets/js/market-profile.js

@@ -59,7 +59,7 @@ var app = new Vue({
         getInfo: function () {
             var _this = this;
             $.showLoading("数据加载中...");
-            $.post('/api/member/getHomeInfo', {type: 2}, function (res) {
+            $.post('/api/market/getHomeInfo', {type: 2}, function (res) {
                 $.hideLoading();
                 if (res.code == 'success') {
                     _this.memberInfo = res.data

public/themes/default/weixin/public/assets/js/withdraw.js

@@ -39,7 +39,7 @@ var app = new Vue({
         },
         // 计算金额
         countMoney: function(){
-            var pattNum = /^[1-9][0-9]{0,7}(.[0-9]{1,2})?$/;
+            var pattNum = /^([1-9][0-9]{0,7}|0)(.[0-9]{1,2})?$/;
             if(!pattNum.test(this.params.money)){
                 this.params.money = 0;
                 return false;

vendor/thinkcmf/cmf/src/controller/HomeBaseController.php

@@ -30,7 +30,7 @@ class HomeBaseController extends BaseController
         $accessIp = $accessIp? explode(',', $accessIp) : [];
         $closeMsg = isset($closeConfig['msg'])? $closeConfig['msg'] : '<div style="width: 100%; margin-top: 20%;line-height: 100px; font-size: 24px; text-align: center;"><h2>网站正在升级维护中</h2></div>';
         $controllerName =  strtolower(request()->controller());
-        if($controllerName != 'notify' && $isClose==1 && (empty($accessIp) || $accessIp && !in_array(get_client_ip(),$accessIp))){
+        if(!in_array($controllerName, ['notify','weixin']) && $isClose==1 && (empty($accessIp) || $accessIp && !in_array(get_client_ip(),$accessIp))){
             echo '<meta name="viewport" content="width=device-width, initial-scale=1.0,minimum-scale=1.0,user-scalable=0"><title>站点维护提示</title><div id="close_msg">'.$closeMsg.'</div>'; die();
         }