edit

app/user/database/info.php

@@ -121,19 +121,6 @@ return array
 			'list'		=> true,
 		),
 
-		'area_id'		=> array
-		(
-			'type' 		=> 'varchar-500',
-			'name' 		=> '所在地区',
-			'default' 	=> '',
-			'desc' 		=> '所在地区',
-			'match' 	=> 'is_string',
-			'search'	=> 'linkage',
-			'update'	=> 'linkage',
-			'option'	=> Dever::url('api.get', 'area'),
-			'list'		=> 'Dever::load("area/api.string", "{area_id}")',
-		),
-
         'state'     => array
         (
             'type'      => 'tinyint-1',

app/user/lib/Info.php

@@ -73,19 +73,23 @@ class Info
 		            $result['info'] = $user['info'];
 		            $result['sex'] = $user['sex'];
 		            $result['title'] = '';
-		            $result['area_id'] = $user['area_id'];
 		        } else {
 		        	!$result['username'] && $result['username'] = $user['username'];
 		        	!$result['avatar'] && $result['avatar'] = $user['avatar'];
 		        	!$result['info'] && $result['info'] = $user['info'];
 		        	!$result['sex'] && $result['sex'] = $user['sex'];
-		        	!$result['area_id'] && $result['area_id'] = $user['area_id'];
 		        }
 			} else {
 				$result = $user;
 			}
 		}
 
+		$result['mobile'] = $user['mobile'];
+		$result['area_id'] = $user['area_id'];
+		$result['address'] = $user['address'];
+        $result['address_contact'] = $user['address_contact'] ? $user['address_contact'] : $user['username'];
+        $result['address_mobile'] = $user['address_mobile'] ? $user['address_mobile'] : $user['mobile'];
+
 		$this->user[$user['id']] = $result;
 		
 		return $result;

app/user/src/Api.php

@@ -151,4 +151,44 @@ class Api extends Core
 
         return 'ok';
     }
+
+    # 获取商品的一些其他信息：自提点、自己的收货地址
+    public function goods()
+    {
+        $goods_id = Dever::input('goods_id');
+
+        # 获取自提点
+        $data['store'] = Dever::load('goods/lib/info')->storeInfo($goods_id, $this->user['area_id']);
+
+
+        # 获取收货地址
+        $this->user['area_name'] = '';
+        if ($this->user['area_id']) {
+            $this->user['area_name'] = Dever::load('area/api')->string($this->user['area_id'], '');
+        }
+        $data['area_id'] = $this->user['area_id'];
+        $data['area_name'] = $this->user['area_name'];
+        $data['address'] = $this->user['address'];
+        $data['address_contact'] = $this->user['address_contact'];
+        $data['address_mobile'] = $this->user['address_mobile'];
+
+        return $data;
+    }
+
+    # 保存收货地址
+    public function saveAddress()
+    {
+        $address_contact = Dever::input('address_contact');
+        $address_mobile = Dever::input('address_mobile');
+        $area_id = Dever::input('area_id');
+        $address = Dever::input('address');
+
+        if ($address_contact && $address_mobile && $area_id && $address) {
+            Dever::load('passport/api')->upAddress($this->uid, $address_contact, $address_mobile, $area_id, $address);
+        } else {
+            Dever::alert('联系信息不能为空');
+        }
+
+        return 'ok';
+    }
 }

app/user/src/Pay.php

@@ -18,7 +18,8 @@ class Pay extends Core
 
         $content_id = Dever::input('content_id');
         $goods_id = Dever::input('goods_id');
-        $address_id = Dever::input('address_id');
+        $mode = Dever::input('mode');
+        $store_id = Dever::input('store_id');
         $num = Dever::input('num');
         $sku = Dever::input('sku');
 
@@ -26,7 +27,7 @@ class Pay extends Core
             Dever::alert('请传入正确的产品ID');
         }
 
-        $pay = Dever::load('goods/lib/pay')->action($this->share_uid, $this->user, $goods_id, $sku, $num, $address_id, $this->system_source, 'collection/info', $this->id);
+        $pay = Dever::load('goods/lib/pay')->action($this->share_uid, $this->user, $goods_id, $sku, $num, $mode, $store_id, $this->system_source, 'collection/info', $this->id);
 
         return $pay;
     }