Inicio Explorar Ayuda
Registro Iniciar sesión
moonsflyer
/
likeshop.project
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

1

moonsflyer hace 7 meses
padre
a5a8a4d3b5
commit
81221c3365
Se han modificado 3 ficheros con 12 adiciones y 3 borrados
Dividir vista Mostrar estadísticas de diff
  1. 2 0
      app/common/logic/PaymentLogic.php
  2. 8 1
      app/count/controller/IndexController.php
  3. 2 2
      app/count/view/count/index.html

+ 2 - 0
app/common/logic/PaymentLogic.php
Ver fichero 

@@ -86,9 +86,11 @@ class PaymentLogic extends BaseLogic
 
                 }
 
                 break;
 
             case PayEnum::WECHAT_PAY:
 
+
 
                 $payService = (new WeChatPayService($terminal, $order['user_id'] ?? null));
 
                 $result = $payService->pay($from, $order);
 
                 break;
 
+
 
             case PayEnum::ALI_PAY:
 
                 $payService = (new AliPayService($terminal));
 
                 $result = $payService->pay($from, $order);

+ 8 - 1
app/count/controller/IndexController.php
Ver fichero 

@@ -398,15 +398,22 @@ class IndexController extends BaseAdminController
 
         $service_data['SupplyDemandInfo'] =  json_encode($service_info['data']['SupplyDemandInfo']);
 
         $service_data['supply_cate_name'] =  json_encode($service_info['data']['supply_cate_name']);
 
         $service_data['supply_cate_value'] =  json_encode($service_info['data']['supply_cate_value']);
 
-
 
+        $supply_first_cate_list = $service_info['data']['supply_first_cate_name'];
 
         $list = $service_info['data']['SupplyDemandInfo'];
 
         $con = ['co01','co03','co02','co05','co04'];
 
         foreach($list as &$lv){
 
             $randomKey  = array_rand($con);
 
             $lv['co'] = $con[$randomKey];
 
         }
 
+
 
         $service_data['SupplyDemandList'] = $list ;
 
 
+        $cons = ['co01','co03','co02','co05','co04'];
 
+        foreach($supply_first_cate_list as &$sfcl){
 
+            $randomKeys  = array_rand($cons);
 
+            $sfcl['co'] = $cons[$randomKeys];
 
+        }
 
+        $service_data['supply_first_cate_list'] = $supply_first_cate_list ;
 
         $data['service_info'] = $service_data;
 
         /* 社会化服务 end*/

+ 2 - 2
app/count/view/count/index.html
Ver fichero 

@@ -1,4 +1,4 @@
 
-<!doctype html>
 
+<!doctype html>
 
 <html>
 
 
 <head>
 
@@ -199,7 +199,7 @@
 
 							<div class="text-b tit02" style="text-align: center;">分类</div>
 
 							<div class="tagcloud">
 
 								<!-- bo大小 co颜色 -->
 
-								{foreach $service_info.SupplyDemandList as $k => $item}
 
+								{foreach $service_info.supply_first_cate_list as $k => $item}
 
 								<a class="b01 {$item.co}" href="#">{$item.name}</a>
 
 								{/foreach}
 
 <!--								<a class="b02 co02" href="#">化肥</a>-->