fix: bug修复

This commit is contained in:
2024-10-29 17:38:47 +08:00
parent 48bf3e6f33
commit cadb9dbcc4
31 changed files with 1032 additions and 662 deletions

View File

@@ -36,18 +36,16 @@ class Group extends BaseController
{
return $this->view->fetch();
}
public function backup_treasure()
{
return $this->view->fetch();
}
public function backup_treasure()
{
return $this->view->fetch();
}
public function pssd()
{
return $this->view->fetch();
}
public function question()
{
$data = $this->request->param();
@@ -57,33 +55,32 @@ class Group extends BaseController
'a.country_code' => $this->country_code,
];
$cid = isset($data['cid']) ? $data['cid'] : 0;
if ($cid)
if ($cid) {
$where['a.cid'] = $cid;
}
$search['keyword'] = '';
if (isset($data['keyword']) && $data['keyword'] != '')
{
$where['a.title'] = ['like', '%' . $data['keyword'] . '%'];
if (isset($data['keyword']) && $data['keyword'] != '') {
$where['a.title'] = ['like', '%' . $data['keyword'] . '%'];
$search['keyword'] = $data['keyword'];
}
$order = [
'a.sort' => 'asc',
'a.id' => 'desc'
'a.sort' => 'asc',
'a.id' => 'desc',
];
$field = ['a.*', 'b.name' => 'cate_name'];
$question_list = model('question')->alias('a')->join('question_category b', 'a.cid = b.id', 'LEFT')->where($where)->order($order)->field($field)->paginate(4);
// echo model('question')->getLastSql();die;
// tiaoshi($question_list->items());die;
$question_catelist = model('question_category')->where(['stat' => 0])->select();
$value = [
'question_list' => $question_list->isEmpty() ? null : $question_list->items(),
'page' => $question_list->render(),
'cid' => $cid,
'search' => $search,
'question_catelist' => $question_catelist
$value = [
'question_list' => $question_list->isEmpty() ? null : $question_list->items(),
'page' => $question_list->render(),
'cid' => $cid,
'search' => $search,
'question_catelist' => $question_catelist,
];
$this->assign($value);
@@ -104,7 +101,7 @@ class Group extends BaseController
{
return $this->view->fetch();
}
public function responsibility()
public function responsibility()
{
return $this->view->fetch();
}
@@ -128,7 +125,6 @@ class Group extends BaseController
return $this->view->fetch();
}
public function search()
{
return $this->view->fetch();
@@ -139,7 +135,6 @@ class Group extends BaseController
return $this->view->fetch();
}
public function headset()
{
return $this->view->fetch();
@@ -195,113 +190,127 @@ class Group extends BaseController
{
return $this->view->fetch();
}
public function thunderbolt_3 ()
public function thunderbolt_3()
{
return $this->view->fetch();
}
public function customized ()
public function customized()
{
return $this->view->fetch();
}
/********20230720 顶部导航栏目************/
public function blog2023(){
return $this->view->fetch();
}
public function brand2023(){
return $this->view->fetch();
}
public function brand(){
return $this->view->fetch();
}
public function Contact2023(){
return $this->view->fetch();
}
public function product2023(){
return $this->view->fetch();
}
public function catelists2023(){
return $this->view->fetch();
}
public function download(){
return $this->view->fetch();
}
public function achievement(){
return $this->view->fetch();
}
public function business2023(){
return $this->view->fetch();
}
public function distributor2023(){
return $this->view->fetch();
}
public function introduction2023(){
return $this->view->fetch();
}
public function faq(){
public function blog2023()
{
$where = ['stat' => 0];
$order = [
'sort' => 'asc',
'id' => 'desc'
];
$fq_list = model('fq')->where($where)->order($order)->paginate(6);
// echo model('question')->getLastSql();die;
// tiaoshi($question_list->items());die;
$value = [
'fq_list' => $fq_list->isEmpty() ? null : $fq_list->items(),
'page' => $fq_list->render(),
];
$this->assign($value);
return $this->view->fetch();
return $this->view->fetch();
}
public function brand2023()
{
return $this->view->fetch();
}
public function brand()
{
return $this->view->fetch();
}
public function Contact2023()
{
return $this->view->fetch();
}
public function product2023()
{
return $this->view->fetch();
}
public function catelists2023()
{
return $this->view->fetch();
}
public function download()
{
return $this->view->fetch();
}
public function mileage(){
$arg_where = ['a.siteid' => $this->siteid, 'a.country_code' => $this->country_code];
$arg_order = ['a.id' => 'desc'];
$arg_field = ['a.id', 'a.cid', 'a.name', 'a.sort', 'a.headline', 'a.ishot', 'a.recommend', 'a.writer', 'a.source', 'a.viewcount', 'a.zancount', 'a.commentcount', 'a.description', 'a.picture', 'a.tags', 'a.createtime', 'c.id' => 'categoryid', 'c.name' => 'categoryname'];
$dataObject = model('Article')->getCateArticleLists($arg_where, $arg_order, $arg_field, 12);
$category = model('ArticleCategory')->getRow(1);
$value = [
'list' => $dataObject->isEmpty() ? null : $dataObject->items(), //$dataObject->getCollection()->toArray()
'page' => $dataObject->render(),
'category' => $category,
];
//echo "<pre>=="; print_r($category);
$this->assign($value);
return $this->view->fetch();
}
public function guide(){
return $this->view->fetch();
}
public function achievement()
{
public function query(){
return $this->view->fetch();
return $this->view->fetch();
}
public function contact(){
public function business2023()
{
return $this->view->fetch();
}
public function distributor2023()
{
return $this->view->fetch();
}
public function introduction2023()
{
return $this->view->fetch();
}
public function faq()
{
$where = ['stat' => 0];
$order = [
'sort' => 'asc',
'id' => 'desc',
];
$fq_list = model('fq')->where($where)->order($order)->paginate(6);
// echo model('question')->getLastSql();die;
// tiaoshi($question_list->items());die;
$value = [
'fq_list' => $fq_list->isEmpty() ? null : $fq_list->items(),
'page' => $fq_list->render(),
];
$this->assign($value);
return $this->view->fetch();
}
public function mileage()
{
$arg_where = ['a.siteid' => $this->siteid, 'a.country_code' => $this->country_code];
$arg_order = ['a.id' => 'desc'];
$arg_field = ['a.id', 'a.cid', 'a.name', 'a.sort', 'a.headline', 'a.ishot', 'a.recommend', 'a.writer', 'a.source', 'a.viewcount', 'a.zancount', 'a.commentcount', 'a.description', 'a.picture', 'a.tags', 'a.createtime', 'c.id' => 'categoryid', 'c.name' => 'categoryname'];
$dataObject = model('Article')->getCateArticleLists($arg_where, $arg_order, $arg_field, 12);
$category = model('ArticleCategory')->getRow(1);
$value = [
'list' => $dataObject->isEmpty() ? null : $dataObject->items(), //$dataObject->getCollection()->toArray()
'page' => $dataObject->render(),
'category' => $category,
];
//echo "<pre>=="; print_r($category);
$this->assign($value);
return $this->view->fetch();
}
public function guide()
{
return $this->view->fetch();
}
public function query()
{
return $this->view->fetch();
}
public function contact()
{
$banners = Loader::model("Banner")->alias('b')->field([
'b.id',
'b.typeid',
@@ -344,43 +353,47 @@ class Group extends BaseController
];
}
$this->assign('data', $data);
return $this->view->fetch();
}
public function tutorial(){
return $this->view->fetch();
}
public function distributor(){
return $this->view->fetch();
}
public function business(){
return $this->view->fetch();
}
public function introduction(){
return $this->view->fetch();
}
public function test ()
public function tutorial()
{
$field = ['a.*', 'b.name', 'b.shortname', 'b.brand_id', 'b.url_tm', 'b.url_jd'];
return $this->view->fetch();
}
public function distributor()
{
return $this->view->fetch();
}
public function business()
{
return $this->view->fetch();
}
public function introduction()
{
return $this->view->fetch();
}
public function test()
{
$field = ['a.*', 'b.name', 'b.shortname', 'b.brand_id', 'b.url_tm', 'b.url_jd'];
$special_product_list = db('special_product_relation')->alias('a')->join('product b', 'a.product_id=b.id', 'LEFT')->where(['a.special_id' => 3, 'a.stat' => 0, 'b.stat' => 0])->field($field)->limit(8)->select();
$normal_product = [];
$normal_product = [];
$special_product = [];
foreach ($special_product_list as $key => $value) {
$product_two_img = model('product_two_img')->where(['stat' => 0, 'product_id' => $value['product_id']])->find();
$value['img'] = $product_two_img['image_url'];
if ($value['type'] == 0)
$value['img'] = $product_two_img['image_url'];
if ($value['type'] == 0) {
array_push($normal_product, $value);
else if ($value['type'] == 1)
} else if ($value['type'] == 1) {
array_push($special_product, $value);
}
}
// tiaoshi($normal_product);
// tiaoshi($special_product);die;
@@ -388,61 +401,75 @@ class Group extends BaseController
$this->assign('normal_product', $normal_product);
$this->assign('special_product', $special_product);
return $this->view->fetch();
}
public function report()
}
public function report()
{
if ($this->customer_id <= 0)
if ($this->customer_id <= 0) {
$this->redirect('/login.html');
}
return $this->view->fetch();
}
public function create_report()
{
if ($this->customer_id <= 0)
if ($this->customer_id <= 0) {
return $this->json(-100, '请先登录');
}
$data = $this->request->post();
if (empty($data) || !is_array($data))
if (empty($data) || !is_array($data)) {
return $this->json(-1, '数据错误');
}
if ($data['product_name'] == '')
if ($data['product_name'] == '') {
return $this->json(-2, '产品名称不能为空');
if ($data['product_model'] == '')
}
if ($data['product_model'] == '') {
return $this->json(-3, '产品型号不能为空');
if ($data['product_manufacturer'] == '')
}
if ($data['product_manufacturer'] == '') {
return $this->json(-4, '厂商不能为空');
}
// if ($data['buy_source'] == '')
// return $this->json(-5, '购买渠道不能为空');
if ($data['customer_telephone'] != '' && !preg_match("/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/", $data['customer_telephone']))
if ($data['customer_telephone'] != '' && !preg_match("/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/", $data['customer_telephone'])) {
return $this->json(-6, '手机格式错误');
if ($data['customer_email'] != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,})$/", $data['customer_email']))
}
if ($data['customer_email'] != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,})$/", $data['customer_email'])) {
return $this->json(-7, '邮箱格式错误');
}
$insert_data = [
'customer_id' => $this->customer_id,
'product_name' => $data['product_name'],
'product_model' => $data['product_model'],
'product_manufacturer' => $data['product_manufacturer'],
'buy_source' => $data['buy_source'],
'product_price' => floatval($data['product_price']),
'customer_name' => $data['customer_name'],
'customer_email' => $data['customer_email'],
'customer_telephone' => $data['customer_telephone'],
'description' => $data['description'],
'create_time' => time(),
'customer_id' => $this->customer_id,
'product_name' => $data['product_name'],
'product_model' => $data['product_model'],
'product_manufacturer' => $data['product_manufacturer'],
'buy_source' => $data['buy_source'],
'product_price' => floatval($data['product_price']),
'customer_name' => $data['customer_name'],
'customer_email' => $data['customer_email'],
'customer_telephone' => $data['customer_telephone'],
'description' => $data['description'],
'create_time' => time(),
];
$result = model('report')->insert($insert_data);
if (!$result)
if (!$result) {
return $this->json(-8, '提交失败');
}
return $this->json(200, 'ok');
}
public function job()
{
$sql = "SELECT * FROM cod_job
$sql = "SELECT * FROM cod_job
WHERE stat=0
AND NOW() >= publish_time
AND NOW() <= end_time
@@ -457,16 +484,18 @@ class Group extends BaseController
{
$data = $this->request->post();
//$this->verify_check($data['captcha'], 'authcode') || $this->error('验证码有误', url('group/test'));
$sn = $data['sn'];//dump($sn);die;
$sn = $this->https_request('http://mes.orico.com.cn:8084/api/values/',$sn);dump($sn);die;
$sn = $data['sn']; //dump($sn);die;
$sn = $this->https_request('http://mes.orico.com.cn:8084/api/values/', $sn);
dump($sn);die;
}
//CURL POST请求
function https_request($url, $data = null) {
$apiUrl = "$url$data";//print_r($apiUrl);die;
$oCurl = curl_init();
if(stripos($apiUrl,"https://")!==FALSE){
curl_setopt($oCurl, CURLOPT_SSL_VERIFYPEER, FALSE);
public function https_request($url, $data = null)
{
$apiUrl = "$url$data"; //print_r($apiUrl);die;
$oCurl = curl_init();
if (stripos($apiUrl, "https://") !== false) {
curl_setopt($oCurl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($oCurl, CURLOPT_SSL_VERIFYHOST, false);
}
curl_setopt($oCurl,CURLOPT_TIMEOUT,5);
@@ -485,7 +514,8 @@ class Group extends BaseController
}
}
//可以发送get和post的请求方式
function curl_request($url,$method='get',$data=null,$https=true){
public function curl_request($url, $method = 'get', $data = null, $https = true)
{
//1.初识化curl
$ch = curl_init($url);
//2.根据实际请求需求进行参数封装
@@ -504,7 +534,8 @@ class Group extends BaseController
curl_setopt($ch,CURLOPT_POSTFIELDS,$data);
}
//3.发送请求
$result = curl_exec($ch);dump($result);die;
$result = curl_exec($ch);
dump($result);die;
//4.返回返回值,关闭连接
curl_close($ch);
return $result;
@@ -519,12 +550,16 @@ class Group extends BaseController
* @param int $flag 标志位
* @return string 返回的资源内容
*/
public function post($url, $keysArr, $flag = 0){
public function post($url, $keysArr, $flag = 0)
{
$ch = curl_init();
if(! $flag) curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($ch, CURLOPT_POST, TRUE);
if (!$flag) {
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
}
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $keysArr);
curl_setopt($ch, CURLOPT_URL, $url);
$ret = curl_exec($ch);