Merge branch 'liuxiangxin' into jun

app/Http/Controllers/Admin/Orders.php

@@ -136,7 +136,7 @@ class Orders extends Auth{
 		// 恭喜
 		$shopName				= $orderAddr['contact_shop'] ? $orderAddr['contact_shop'] : $order['custom_name'];
 		// 结果
-		$shareImage				= $this->getShareImage($shopName,$order['custom_uid'],$order['id'],$score);
+		$shareImage				= $this->getShareImage($shopName,$score);
 		// 分配数据
 		$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
 		$this->assign('order', $order);
@@ -539,7 +539,7 @@ class Orders extends Auth{
 	 * 分享图片
 	 * 
 	 */
-	private function getShareImage($shopName,$uid,$orderId,$score=0){
+	private function getShareImage($shopName,$score=0){
 		// 尝试执行
 		try {
 			// 加载图片
@@ -592,7 +592,6 @@ class Orders extends Auth{
 
 			return		$base64;
 		} catch (\Throwable $th) {
-			dd($th);
 			// 返回路径
 			return 			'';
 		}

app/Models/FilesManager.php

@@ -193,6 +193,7 @@ class FilesManager extends Model
             // 产品名称每行必填
             if( !$order['product_name'] )       return ['error' => ($row + 1).' 行未识别到商品名称'];
             if( !$order['buy_num'] )            return ['error' => ($row + 1).' 行未识别到商品数量'];
+            if( !$order['pay_total'] )            return ['error' => ($row + 1).' 行未识别到商品金额'];
             // 替换一下产品名称中的数据，避免数据超长
             $order['product_name']              = str_ireplace(['（）','()','（','('],'',str_ireplace($order['sku_attr_names'],'',$order['product_name']));
             $order['insert_time']               = $order['insert_time'] ? intval(strtotime($order['insert_time'])) : '';
@@ -201,7 +202,7 @@ class FilesManager extends Model
                 // 如果没有订单ID 使用上一条的信息(兼容合并单元格)
                 if( !$order['weizan_orderid'] )     $order['weizan_orderid']    = $sheetList[$row-1]['weizan_orderid'];
                 if( !$order['insert_time'] )        $order['insert_time']       = $sheetList[$row-1]['insert_time'];
-                if( !$order['buyer_nick'] )         $order['buyer_nick']       = $sheetList[$row-1]['buyer_nick'];
+                if( !$order['buyer_nick'] )         $order['buyer_nick']        = $sheetList[$row-1]['buyer_nick'];
                 if( !$order['status'] )             $order['status']            = $sheetList[$row-1]['status'];
                 if( !$order['contact_phone'] )      $order['contact_phone']     = $sheetList[$row-1]['contact_phone'];
                 if( !$order['contact_name'] )       $order['contact_name']      = $sheetList[$row-1]['contact_name'];

resources/views/admin/score_clockin/index.blade.php

@@ -18,7 +18,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>ID</th>
 						<th>打卡天数</th>
 						<th>奖励积分</th>
-						<th>奖励卷</th>
+						<th>奖励券</th>
 						<th>修改时间</th>
 						<th>操作</th>
 					</tr>