Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

learn/active/database/info.php

@@ -389,7 +389,7 @@ return array
         'share_name'      => array
         (
             'type'      => 'varchar-300',
-            'name'      => '分享内容',
+            'name'      => '分享内容-{member}代表分享人的名称，{active}代表活动名称，比如：您的好友{member}，分享给你一个核销码，欢迎您参加：{active}活动名称，请点击链接填写资料认领',
             'default'   => '',
             'desc'      => '分享内容',
             'match'     => 'option',
@@ -397,6 +397,19 @@ return array
             'tab'       => 3,
         ),
 
+         'share_pic'       => array
+        (
+            'type'      => 'text-255',
+            'name'      => '分享图片',
+            'default'   => '',
+            'desc'      => '分享图片',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '1',
+            // 'place'     => '759*562',
+            'tab'       => 3,
+        ),
+
         'desc'      => array
         (
             'type'      => 'text-1000',

learn/active/src/Off.php

@@ -46,7 +46,9 @@ Class Off extends Coreoff
 						}
 					}
 				}
-				
+			}
+			if ($data && ($data['active_id'] != $where['active_id'])) {
+					Dever::alert('该核销码不属于此活动');
 			}
 		}
 		$active = Dever::db('active/info')->find($where['active_id']);

learn/active/src/User.php

@@ -178,8 +178,21 @@ Class User extends Core
                 $data['info']['rdate'] = date('Y-m-d H:i',$data['info']['rdate']);
             }
 			$data['info']['share_name'] = '';
+            $u_name = '';
 			if ($active['share_name']) {
-				$data['info']['share_name'] = $active['share_name'];
+                if (strstr($active['share_name'],'{member}')){
+                    $u_name = str_replace('{member}',$user['name'],$active['share_name']);   
+                }
+                if ($u_name && strstr($u_name,'{active}')) {
+                    $u_name = str_replace('{active}',$active['name'],$u_name);
+                }
+                if (!$u_name && strstr($active['share_name'],'{active}')) {
+                    $u_name = str_replace('{active}',$active['name'],$active['share_name']);
+                }
+                if (!$u_name && $active['share_name']) {
+                    $u_name = $active['share_name'];
+                }
+				$data['info']['share_name'] = $u_name;
 			}
            
 			$data['info']['mobile'] = $active['mobile'];