1

app/admin/controller/user/User.php

@@ -328,6 +328,7 @@ class User extends AuthController
         $f[] = Form::input('uid', '用户编号', $user->getData('uid'))->disabled(1);
         $f[] = Form::input('real_name', '真实姓名', $user->getData('real_name'));
         $f[] = Form::text('phone', '手机号', $user->getData('phone'));
+        $f[] = Form::input('pwd', '重置密码');
         $f[] = Form::date('birthday', '生日', $user->getData('birthday') ? date('Y-m-d', $user->getData('birthday')) : 0);
         $f[] = Form::input('card_id', '身份证号', $user->getData('card_id'));
         $f[] = Form::textarea('mark', '用户备注', $user->getData('mark'));
@@ -362,6 +363,14 @@ class User extends AuthController
         $res1 = false;
         $res2 = false;
         $edit = array();
+        if(input('pwd','')!='')
+        {
+            if(strlen(input('pwd',''))<6)
+            {
+                return Json::fail('密码不能少于6位!');
+            }
+            $edit['pwd']= md5(input('pwd',''));
+        }
         if ($data['money_status'] && $data['money']) {//余额增加或者减少
             if ($data['money_status'] == 1) {//增加
                 $edit['now_money'] = bcadd($user['now_money'], $data['money'], 2);

app/api/controller/JuniuController.php

@@ -0,0 +1,54 @@
+<?php
+namespace app\api\controller;
+use app\Request;
+use crmeb\services\UtilService;
+
+class JuniuController
+{
+    private static $appid ="jnz_formal_0001";
+    private static $appsecret = "mxtw58mxbexwjk40ghin";
+    private static $url = "https://new.juniuzu.com";
+    /**
+     * 获取商品列表
+     * @param Request $request
+     */
+    public function lst(Request $request)
+    {
+        list($page,$keyword,$sort_field,$sort_way) = UtilService::postMore(
+            [
+                ['page',1],
+                ['keyword',''],
+                ['sort_field','sales_show'],
+                ['sort_way','desc'],
+            ],$request,true
+        );
+        $rs = do_request(self::$url.'/api/goods/getlist?'.http_build_query(compact('page','keyword','sort_field','sort_way')),[],null,false);
+        return app('json')->success('获取成功',json_decode($rs,true));
+    }
+
+    /**
+     * 获取商品详情
+     * @param Request $request
+     */
+    public function info(Request $request)
+    {
+        $id = input('id',0);
+        $rs = do_request(self::$url.'/api/goods/getdetail?'.http_build_query(compact('id')),[],null,false);
+        return app('json')->success('获取成功',json_decode($rs,true));
+    }
+
+    public function getexpress(Request $request)
+    {
+        $sn = input('sn',0);
+        $rs = do_request(self::$url.'/api/goods/getexpress?'.http_build_query(compact('sn')),[],null,false);
+        return app('json')->success('获取成功',json_decode($rs,true));
+    }
+    /**
+     * 创建订单
+     * @param Request $request
+     */
+    public function order_create(Request $request)
+    {
+
+    }
+}

app/common.php

@@ -525,3 +525,33 @@ if (!function_exists('array_unique_fb')) {
         return $out;
     }
 }
+if (!function_exists('do_request')) {
+    function do_request($url, $data, $header = null, $post = true, $json = false, $format = 0, $form = false)
+    {
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, $url);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+        if ($post) {
+            curl_setopt($curl, CURLOPT_POST, 1);
+            if (!$json && !$form) {
+                curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($data));
+            } else if ($json && !$form) {
+                curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data, $format));
+            } else {
+                curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+            }
+        }
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        if ($header) {
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
+            curl_setopt($curl, CURLOPT_HEADER, 0);
+        }
+        $result = curl_exec($curl);
+        if (curl_errno($curl)) {
+            return json_encode(['status' => curl_errno($curl), 'msg' => '请求失败']);
+        }
+        curl_close($curl);
+        return $result;
+    }
+}

route/api/route.php

@@ -233,6 +233,11 @@ Route::group(function () {
     //拼团数据
     Route::get('pink', 'PublicController/pink')->name('pinkData');
 
+    //第三方积分
+    Route::post('juniu/lst', 'JuniuController/lst')->name('juniulst'); //商品列表
+    Route::get('juniu/info', 'JuniuController/info')->name('juniuinfo'); //商品详情
+    Route::get('juniu/express', 'JuniuController/express')->name('juniuexpress'); //物流信息
+
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);