合并分支 'wxg' 到 'master'

/



查看合并请求 !86

@@ -53,8 +53,8 @@ class Shop extends Frontend
         $data['is_collect'] = $is_collect;
         //当前用户若不是会员加密部分信息
         if($encrypt == '2'){
-            $data['store_phone'] = "***********";
-            $data['store_address'] = "***********";
+            $data['phone'] = "***********";
+            $data['address'] = "***********";
         }
         $this->assign('data',$data);
         dump(collection($data)->toArray());