Wesmiler 2021-0115第4期分销功能新增

app/api/controller/MarketController.php

@@ -102,7 +102,8 @@ class MarketController extends MarketBaseController
     public function register(){
         try {
             $params = input();
-            $inviteId = input('id', 0);
+            $inviteId = input('sid', 0);
+            $inviteId = $inviteId? $inviteId : session('invite_id');
             $validate = new MemberValidate();
             if (!$validate->scene('marketReg')->check($params)) {
                 showJson(1004, $validate->getError());
@@ -128,16 +129,16 @@ class MarketController extends MarketBaseController
 
             // 验证信息
             $where = ['openid' => $openid, 'user_type'=> 2];
-            $info = Member::where($where)->field('id,agent_status')->find();
+            $info = Member::where($where)->field('id,agent_type,agent_status')->find();
             $agentId = isset($info['id'])? $info['id'] : 0;
             $agentType = isset($info['agent_type'])? $info['agent_type'] : 0;
             $agentStatus = isset($info['agent_status'])? $info['agent_status'] : 0;
             if($info && $agentType==1){
                 // 已审核
                 if($agentStatus == 1){
-                    showJson(1007,2040,['url'=> Wechat::makeRedirectUrl(url('/weixin/market/index','','',true))]);
+                    showJson(1006,2040,['url'=> Wechat::makeRedirectUrl(url('/weixin/market/index','','',true))]);
                 } else {
-                    showJson(1007,2041,['url'=> Wechat::makeRedirectUrl(url('/weixin/page/custom','','',true))]);
+                    showJson(1006,2041,['url'=> Wechat::makeRedirectUrl(url('/weixin/page/custom','','',true))]);
                 }
             }
 

app/weixin/controller/MarketController.php

@@ -25,6 +25,7 @@ class MarketController extends MarketBaseController
      */
     public function entry(){
         if($this->agentStatus == 1){
+            session('invite_id', isset($_GET['sid'])? intval($_GET['sid']) : 0);
             //Wechat::redirectUrl(url('/weixin/market/index','','',true));
         }
         return $this->fetch();

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

@@ -12,6 +12,7 @@
     </div>
     <div class="gerxix_box">
         <ul>
+            <li v-if="inviteInfo.id"><h1>邀请人</h1><img class="minzu" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><input id="inviteName" class="tianx" type="text" :placeholder="inviteInfo.user_nickname?inviteInfo.user_nickname : inviteInfo.mobile" readonly></li>
             <li><h1>昵称</h1><img class="minzu" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><input id="nickname" class="tianx" type="text" placeholder="请填写" v-model="params.nickname"></li>
             <li><h1>姓名</h1><img class="minzu" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><input id="realname" class="tianx" type="text" placeholder="请填写" v-model="params.realname"></li>
             <li><h1>微信号</h1><img class="minzu" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><input id="wechat_code" class="tianx" type="text" placeholder="请填写" v-model="params.wechat_code"></li>

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

@@ -3,6 +3,8 @@ var app = new Vue({
     'data': {
         // 当前导航
         curNav: 'member',
+        inviteId: 0,
+        inviteInfo: {},
         // 用户信息
         wxInfo: {},
         // 信息
@@ -36,6 +38,13 @@ var app = new Vue({
         timeId: null,
     },
     created: function(){
+        var inviteId = getParam('sid');
+        inviteId = typeof (inviteId) != 'undefined'? inviteId : 0;
+        if(inviteId){
+            this.inviteId = inviteId;
+            this.getInviteInfo(inviteId)
+        }
+
         this.getInfo();
         var rebackurl = getParam('rebackurl');
         if(typeof (rebackurl) != 'undefined' && rebackurl != null){
@@ -88,6 +97,19 @@ var app = new Vue({
                 }
             }, "json");
         },
+        // 获取邀请用户信息
+        getInviteInfo: function (sid) {
+            var _this = this;
+            $.post('/api/market/getInfo', {type: 2, id: sid}, function (res) {
+                if (res.code == 'success') {
+                    if(res.data.id<=0 || typeof(res.data.id) == 'undefined'){
+                        return false;
+                    }
+
+                    _this.inviteInfo = res.data
+                }
+            }, "json");
+        },
         // 发送验证码
         sendCode: function(){
             var _this = this;
@@ -557,14 +579,14 @@ var app = new Vue({
                         $.showLoading(res.message);
                         setTimeout(function(){
                            location.href = '/weixin/market/index';
-                        }, 500)
-                    }else if (res.code == 'login'){
+                        }, 800)
+                    }else if (res.code == 'exception'){
                         var url = res.data.url;
                         $.showLoading(res.message);
                         if(url){
                             setTimeout(function(){
                                 location.href = url;
-                            }, 500)
+                            }, 2000)
                         }
                     }else{
                         res.message = typeof(res.message) != 'undefined' && res.message? res.message : '提交失败，请刷新重试';

vendor/thinkcmf/cmf/src/lang/zh-cn.php

@@ -124,8 +124,8 @@ return [
     '2037'=> '您隐身了，不能认识哦',
     '2038'=> '您隐身了，不能申请哦',
     '2039'=> '微信授权信息获取失败请刷新后重试',
-    '2040'=> '您的账号已完成注册',
-    '2041'=> '账号已存在且被冻结请联系客服处理',
+    '2040'=> '您的微信已绑定注册过账号，稍后将自动登录',
+    '2041'=> '您的微信已绑定注册，但账号被冻结中请联系客服处理',
     '2042'=> '账号未注册，请先去注册',
     '2043'=> '账号注册成功，请耐心等候客服审核',
     '2044'=> '账号正在审核中，请耐心等候处理',