Your Name 3 years ago
parent
commit
c48097e3b2
2 changed files with 10 additions and 2 deletions
  1. 1 1
      data/payback/active.html
  2. 9 1
      learn/active/src/Home.php

+ 1 - 1
data/payback/active.html

@@ -77,7 +77,7 @@ src="https://wx.gtimg.com/pay_h5/goldplan/js/jgoldplan-1.0.0.js"></script>
   if (url.indexOf('uat.') != -1) {
       //var jump = 'http://learn.uat.churenyiliao.com/active/#/pages/activities/order/order?id=' + order_id;
       var jump = 'http://learn.uat.churenyiliao.com/active/';
-      var back = 'http://guanli.uat.churenyiliao.com/learn/active/?l=api.getDesc';
+      var back = 'http://guanli.uat.churenyiliao.com/learn/active/?l=user.getDesc';
   } else {
       //var jump = 'https://learn.churenyiliao.com/active/#/pages/activities/order/order?id=' + order_id;
       var jump = 'https://learn.churenyiliao.com/active/';

+ 9 - 1
learn/active/src/Home.php

@@ -126,8 +126,16 @@ Class Home extends Core
 		}
 		if ($uid) {
 			$user = Dever::db('active/user')->find($uid);
+			$member = Dever::load('active/lib/user')->agent($user);
 			$where['where_id'] = $uid;
-			$where['name'] = $data['name'];
+			if ($member) {
+				if ($data['name'] != $member['name']) {
+					$where['name'] = $member['name'];
+				}
+			} else {
+				$where['name'] = $data['name'];
+			}
+			
 			if (!$user['idcard'] && $data['idcard']) {
 				$where['idcard'] = $data['idcard'];
 			}