Главная Обзор Помощь
Регистрация Вход
zhh
/
huahuibao
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge branch 'master' into dev

shish 1 год назад
Родитель
92596d22f7 8e82eedc48
Сommit
cbfc8cc637
3 измененных файлов с 17 добавлено и 16 удалено
Единый вид Показать статистику Diff
  1. 3 10
      app-ghs/controllers/ExpendController.php
  2. 6 6
      app-pt/views/main/app.php
  3. 8 0
      biz-ghs/custom/classes/CustomClass.php

+ 3 - 10
app-ghs/controllers/ExpendController.php
Просмотреть файл 

@@ -365,20 +365,13 @@ class ExpendController extends BaseController
 
     //删除支出
 
     //删除支出
 
     public function actionDelExpend()
 
     public function actionDelExpend()
 
     {
 
     {
 
+        $post = Yii::$app->request->post();
 
+
 
         $staff = $this->shopAdmin;
 
         $staff = $this->shopAdmin;
 
         if ($staff->finance == 0) {
 
         if ($staff->finance == 0) {
 
             util::fail('没有财务权限');
 
             util::fail('没有财务权限');
 
         }
 
         }
 
-
 
-        $post = Yii::$app->request->post();
 
-        $staffId = intVal($post['staffId']);
 
-        $staff = ShopAdminClass::getById($staffId, true);
 
-        if (empty($staff)) {
 
-            util::fail('没有找到员工');
 
-        }
 
-        if ($staff->mainId != $this->mainId) {
 
-            util::fail('员工不存在');
 
-        }
 
+        $staffId = $this->shopAdminId;
 
 
 
         $id = intval($post['id']);
 
         $id = intval($post['id']);
 
         $expend = ExpendClass::getById($id, true);
 
         $expend = ExpendClass::getById($id, true);

+ 6 - 6
app-pt/views/main/app.php
Просмотреть файл 

@@ -21,33 +21,33 @@ if ($xhbApi == 'wixhb.com') {
 
 <body>
 
 <body>
 
 <div style="text-align:center;margin-top:100px;">
 
 <div style="text-align:center;margin-top:100px;">
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
-       href="https://img.<?php echo $xhbApi; ?>/apk/ghs/1230.apk">销花宝APP</a>
 
+       href="https://api.shop.<?php echo $xhbApi; ?>/1235.apk">销花宝APP</a>
 
 </div>
 
 </div>
 
 
 
 <div style="text-align:center;margin-top:30px;">
 
 <div style="text-align:center;margin-top:30px;">
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
-       href="https://img.<?php echo $hhbApi; ?>/apk/hd/192.apk">花掌柜APP</a>
 
+       href="https://api.shop.<?php echo $hhbApi; ?>/192.apk">花掌柜APP</a>
 
 </div>
 
 </div>
 
 <div style="text-align:center;margin-top:30px;">
 
 <div style="text-align:center;margin-top:30px;">
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
 
 
-       href="https://img.wixhb.com/apk/hd/pad180.apk">花掌柜收银</a>
 
+       href="https://api.shop.wixhb.com/pad180.apk">花掌柜收银</a>
 
 </div>
 
 </div>
 
 <div style="text-align:center;margin-top:30px;">
 
 <div style="text-align:center;margin-top:30px;">
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
 
 
-       href="https://img.wixhb.com/apk/ghs/pad141.apk">销花宝收银</a>
 
+       href="https://api.shop.wixhb.com/pad141.apk">销花宝收银</a>
 
 </div>
 
 </div>
 
 <div style="width:100%;text-align:center;margin-top:20px;">-----------------------------------------------------------------</div>
 
 <div style="width:100%;text-align:center;margin-top:20px;">-----------------------------------------------------------------</div>
 
 <div style="text-align:center;margin-top:30px;">
 
 <div style="text-align:center;margin-top:30px;">
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
 
 
-       href="https://img.wixhb.com/apk/hd/pad180.apk">花掌柜收银（最新版）</a>
 
+       href="https://api.shop.wixhb.com/pad180.apk">花掌柜收银（最新版）</a>
 
 </div>
 
 </div>
 
 <div style="text-align:center;margin-top:30px;">
 
 <div style="text-align:center;margin-top:30px;">
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
     <a style="margin:0 auto;display:inline-block;border:none;padding:8px 15px;border-radius:16px;color:white;background-color:#3385FF;text-decoration:none"
 
 
 
-       href="https://img.wixhb.com/apk/ghs/pad144.apk">销花宝收银（最新版）</a>
 
+       href="https://api.shop.wixhb.com/pad144.apk">销花宝收银（最新版）</a>
 
 </div>
 
 </div>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 8 - 0
biz-ghs/custom/classes/CustomClass.php
Просмотреть файл 

@@ -682,6 +682,8 @@ class CustomClass extends BaseClass
 
         $objPHPExcel->getActiveSheet()->setCellValue('E1', '余额');
 
         $objPHPExcel->getActiveSheet()->setCellValue('E1', '余额');
 
         $objPHPExcel->getActiveSheet()->setCellValue('F1', '待结金额');
 
         $objPHPExcel->getActiveSheet()->setCellValue('F1', '待结金额');
 
         $objPHPExcel->getActiveSheet()->setCellValue('G1', '最近下单');
 
         $objPHPExcel->getActiveSheet()->setCellValue('G1', '最近下单');
 
+        $objPHPExcel->getActiveSheet()->setCellValue('H1', '累计消费');
 
+        $objPHPExcel->getActiveSheet()->setCellValue('I1', '累计消费次数');
 
 
 
         //设置宽度
 
         //设置宽度
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('B')->setWidth(25);
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('B')->setWidth(25);
 
@@ -690,6 +692,8 @@ class CustomClass extends BaseClass
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(20);
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(20);
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(15);
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(15);
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(30);
 
         $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(30);
 
+        $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(15);
 
+        $objPHPExcel->getActiveSheet()->getColumnDimension('I')->setWidth(20);
 
         //加粗
 
         //加粗
 
         $objPHPExcel->getActiveSheet()->getStyle('A1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('A1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('B1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('B1')->getFont()->setSize(9)->setBold(true);
 
@@ -698,6 +702,8 @@ class CustomClass extends BaseClass
 
         $objPHPExcel->getActiveSheet()->getStyle('E1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('E1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('F1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('F1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('G1')->getFont()->setSize(9)->setBold(true);
 
         $objPHPExcel->getActiveSheet()->getStyle('G1')->getFont()->setSize(9)->setBold(true);
 
+        $objPHPExcel->getActiveSheet()->getStyle('H1')->getFont()->setSize(9)->setBold(true);
 
+        $objPHPExcel->getActiveSheet()->getStyle('I1')->getFont()->setSize(9)->setBold(true);
 
 
 
         $objPHPExcel->getActiveSheet()->getStyle('A1')->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
         $objPHPExcel->getActiveSheet()->getStyle('A1')->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
         $objPHPExcel->getActiveSheet()->getStyle('B1')->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
         $objPHPExcel->getActiveSheet()->getStyle('B1')->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
@@ -719,6 +725,8 @@ class CustomClass extends BaseClass
 
             } else {
 
             } else {
 
                 $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $custom['recentExpend']);
 
                 $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $custom['recentExpend']);
 
             }
 
             }
 
+            $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $custom['buyAmount']);
 
+            $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $custom['buyNum']);
 
             //居左
 
             //居左
 
             $objPHPExcel->getActiveSheet()->getStyle('A' . $i)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
             $objPHPExcel->getActiveSheet()->getStyle('A' . $i)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
             $objPHPExcel->getActiveSheet()->getStyle('B' . $i)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 
             $objPHPExcel->getActiveSheet()->getStyle('B' . $i)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);