Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

common/components/stringUtil.php

@@ -161,8 +161,8 @@ class stringUtil
 	{
 		$fchar = ord($s0{0});
 		if ($fchar >= ord("A") and $fchar <= ord("z")) return strtoupper($s0{0});
-		$s1 = iconv("UTF-8", "gb2312", $s0);
-		$s2 = iconv("gb2312", "UTF-8", $s1);
+        $s1 = mb_convert_encoding($s0,'gbk','utf-8');
+        $s2 = mb_convert_encoding($s1,'utf-8','gbk');
 		if ($s2 == $s0) {
 			$s = $s1;
 		} else {

sql.sql

@@ -2103,7 +2103,7 @@ ADD COLUMN `totalView`  int(11) NOT NULL DEFAULT 0 COMMENT '累计访问次数'
 ADD COLUMN `totalUser`  int(11) NOT NULL DEFAULT 0 COMMENT '总用户；总客户数' AFTER `totalView`,
 ADD COLUMN `totalPurchaseOrder`  int(11) NOT NULL DEFAULT 0 COMMENT '总采购订单' AFTER `totalUser`;
 
-=======linqh 2021.4.15
+=======linqh 2021-4-15
 ===
 ALTER TABLE `xhStatIncome`
 ADD COLUMN `totalAmount`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '总收入金额' AFTER `amount`;
@@ -2121,3 +2121,6 @@ ADD COLUMN `shopId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '门店ID' AFTE
 ADD INDEX `idx_shopId` (`shopId`) ;
 
 
+======shish 2021-4-17
+ALTER TABLE xhStatIncomeMonth DROP INDEX `income`;
+ALTER TABLE xhStatIncome DROP INDEX `income`;