rabin 2 anni fa
parent
commit
851d227da4
2 ha cambiato i file con 9 aggiunte e 2 eliminazioni
  1. 1 1
      app/mshop/lib/Buy.php
  2. 8 1
      service/agent/lib/Import.php

+ 1 - 1
app/mshop/lib/Buy.php

@@ -919,7 +919,7 @@ class Buy
                     'name' => '配送发货',
                 );
 
-                if ($parent_order && $parent_order['uid']) {
+                if ($parent_order && ((isset($parent_order['uid']) && $parent_order['uid']) || (isset($parent_order['mid']) && $parent_order['mid']))) {
                 } else {
                     $button[] = array
                     (

+ 8 - 1
service/agent/lib/Import.php

@@ -108,7 +108,14 @@ class Import
                     $data['name'] = 'boss';
                 }
                 $data['password'] = $v['pwd'];
-                $data['avatar'] = $v['avatar'] ? $host . $v['avatar'] : '';
+                if ($v['avatar'] && strstr($v['avatar'], 'http')) {
+                    $data['avatar'] = $v['avatar'];
+                } elseif ($v['avatar']) {
+                    $data['avatar'] = $host . $v['avatar'];
+                } else {
+                    $data['avatar'] = '';
+                }
+                
                 $data['username'] = $v['nickname'];
                 $data['mid'] = $v['id'];
                 $data['parent_mid'] = $v['agentid'];