From 19a9bcf03833678f564e480f6fc438aba066591c Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 24 Oct 2018 00:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9C=89=E5=AE=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AlipayLifeMessageController.class.php     | 17 +++---
 .../Admin/Lang/zh-cn/alipaylife.php           |  2 +
 .../Admin/Lang/zh-cn/alipaylifemessage.php    |  4 +-
 .../Admin/View/Default/AlipayLife/Index.html  |  4 ++
 .../Default/AlipayLifeMessage/SendInfo.html   | 52 +++++++++++--------
 service/Public/Common/Css/Common.css          |  2 +
 6 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/service/Application/Admin/Controller/AlipayLifeMessageController.class.php b/service/Application/Admin/Controller/AlipayLifeMessageController.class.php
index e3d185848..b98100fdd 100644
--- a/service/Application/Admin/Controller/AlipayLifeMessageController.class.php
+++ b/service/Application/Admin/Controller/AlipayLifeMessageController.class.php
@@ -175,18 +175,23 @@ class AlipayLifeMessageController extends CommonController
         $this->assign('alipay_life_message_type_list', L('alipay_life_message_type_list'));
 
         // 单用户发消息用户信息
-        $user = empty($_GET['user_id']) ? '' : M('User')->find(intval(I('user_id')));
-        $this->assign('user', $user);
+        $alipay_openid = empty($_GET['user_id']) ? '' : M('User')->where(['id'=>intval(I('user_id'))])->getField('alipay_openid');
+        $this->assign('alipay_openid', $alipay_openid);
 
         // 消息发送类型
         $this->assign('alipay_life_message_send_type_list', L('alipay_life_message_send_type_list'));
-        $this->assign('send_type', empty($user) ? 1 : 0);
+        $this->assign('send_type', empty($alipay_openid) ? 1 : 0);
 
-        // 生活号消息分类
-        $alipay_life_list = M('AlipayLife')->field('id,name')->select();
+        // 生活号
+        $where = [];
+        if(!empty($_GET['alipay_life_id']))
+        {
+            $where['id'] = intval(I('alipay_life_id'));
+        }
+        $alipay_life_list = M('AlipayLife')->field('id,name')->where($where)->select();
         $this->assign('alipay_life_list', $alipay_life_list);
 
-        // 生活号消息分类
+        // 生活号分类
         $alipay_life_category = M('AlipayLifeCategory')->where(['is_enable'=>1])->field('id,name')->select();
         $this->assign('alipay_life_category', $alipay_life_category);
 
diff --git a/service/Application/Admin/Lang/zh-cn/alipaylife.php b/service/Application/Admin/Lang/zh-cn/alipaylife.php
index 83f7752f9..59a802ce6 100755
--- a/service/Application/Admin/Lang/zh-cn/alipaylife.php
+++ b/service/Application/Admin/Lang/zh-cn/alipaylife.php
@@ -35,5 +35,7 @@ return array(
 
     'alipay_life_is_shelves_text'         => '上下架',
     'alipay_life_save_category_error'     => '分类添加失败',
+
+    'alipay_life_user_send_text'          =>  '发消息',
 );
 ?>
\ No newline at end of file
diff --git a/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php b/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php
index 2697a9e60..680368c6f 100755
--- a/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php
+++ b/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php
@@ -9,7 +9,7 @@
  */
 return array(
 	// 添加/编辑
-	'alipay_life_message_add_name'          => '生活号消息添加',
+	'alipay_life_message_add_name'          => '生活号消息创建',
 
     'alipay_life_message_life_text'         => '生活号',
     'alipay_life_message_life_format'       => '请选择生活号',
@@ -46,5 +46,7 @@ return array(
             0 => array('value' => 0, 'name' => '单条'),
             1 => array('value' => 1, 'name' => '批量'),
         ),
+
+    'alipay_life_message_user_text'         => '给用户发送消息',
 );
 ?>
\ No newline at end of file
diff --git a/service/Application/Admin/View/Default/AlipayLife/Index.html b/service/Application/Admin/View/Default/AlipayLife/Index.html
index c30cdfa58..d695d82a3 100755
--- a/service/Application/Admin/View/Default/AlipayLife/Index.html
+++ b/service/Application/Admin/View/Default/AlipayLife/Index.html
@@ -82,6 +82,10 @@
                                 </a>
                                 <if condition="$v['is_shelves'] eq 0">
                                     <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AlipayLife/Delete')}}" data-id="{{$v.id}}"> {{:L('common_operation_delete')}}</button>
+                                <else />
+                                    <a href="{{:U('Admin/AlipayLifeMessage/SendInfo', ['alipay_life_id'=>$v['id']])}}">
+                                        <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-send-o"> {{:L('alipay_life_user_send_text')}}</button>
+                                    </a>
                                 </if>
                             </td>
                         </tr>
diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/SendInfo.html b/service/Application/Admin/View/Default/AlipayLifeMessage/SendInfo.html
index 0974c36c6..3d78bc72a 100755
--- a/service/Application/Admin/View/Default/AlipayLifeMessage/SendInfo.html
+++ b/service/Application/Admin/View/Default/AlipayLifeMessage/SendInfo.html
@@ -25,35 +25,45 @@
 				</select>
 			</div>
 			<if condition="$send_type eq 1">
-				<div class="am-form-group">
-					<label>{{:L('alipay_life_message_category_text')}}</label>
-				    <select name="alipay_life_id" class="am-radius c-p chosen-select" multiple="multiple" data-placeholder="{{:L('common_select_can_choose')}}" data-validation-message="{{:L('alipay_life_message_category_format')}}" required>
-						<foreach name="alipay_life_category" item="v">
-							<option value="{{$v.id}}" <if condition="!empty($data['alipay_life_id']) and in_array($v['id'], $data['alipay_life_id'])">selected</if>>{{$v.name}}</option>
-						</foreach>
-					</select>
-				</div>
+				<empty name="params.alipay_life_id">
+					<div class="am-form-group">
+						<label>{{:L('alipay_life_message_category_text')}}</label>
+					    <select name="alipay_life_category_id" class="am-radius c-p chosen-select" multiple="multiple" data-placeholder="{{:L('common_select_can_choose')}}" data-validation-message="{{:L('alipay_life_message_category_format')}}" required>
+							<foreach name="alipay_life_category" item="v">
+								<option value="{{$v.id}}">{{$v.name}}</option>
+							</foreach>
+						</select>
+					</div>
+				</empty>
 
+				<notempty name="params.alipay_life_id">
+					<div class="am-form-group">
+						<label>{{:L('alipay_life_message_life_text')}}</label>
+					    <select name="alipay_life_id" class="am-radius c-p chosen-select" multiple="multiple" data-placeholder="{{:L('common_select_can_choose')}}" data-validation-message="{{:L('alipay_life_message_life_format')}}" <notempty name="params.alipay_life_id">disabled</notempty> required>
+							<foreach name="alipay_life_list" item="v">
+								<option value="{{$v.id}}" <if condition="$params['alipay_life_id'] eq $v['id']">selected</if>>{{$v.name}}</option>
+							</foreach>
+						</select>
+					</div>
+				</notempty>
+			<else />
 				<div class="am-form-group">
-					<label>{{:L('alipay_life_message_life_text')}}</label>
-				    <select name="alipay_life_category_id" class="am-radius c-p chosen-select" multiple="multiple" data-placeholder="{{:L('common_select_can_choose')}}" data-validation-message="{{:L('alipay_life_message_life_format')}}" required>
-						<foreach name="alipay_life_list" item="v">
-							<option value="{{$v.id}}" <if condition="!empty($data['alipay_life_category_id']) and in_array($v['id'], $data['alipay_life_category_id'])">selected</if>>{{$v.name}}</option>
-						</foreach>
-					</select>
+					<label>{{:L('alipay_life_message_user_text')}}</label>
+					<input type="hidden" name="alipay_life_user_id" value="{{$params.alipay_life_user_id}}" />
+					<input type="text" class="am-radius" value="{{$alipay_openid}}" disabled />
 				</div>
 			</if>
 
 			<if condition="$nav_type eq 1">
 				<div class="am-form-group">
 					<label>{{:L('alipay_life_message_title_text')}}</label>
-					<input type="text" name="title" placeholder="{{:L('alipay_life_message_title_text')}}" maxlength="80" data-validation-message="{{:L('alipay_life_message_title_format')}}" class="am-radius" <notempty name="data"> value="{{$data.title}}"</notempty> />
+					<input type="text" name="title" placeholder="{{:L('alipay_life_message_title_text')}}" maxlength="80" data-validation-message="{{:L('alipay_life_message_title_format')}}" class="am-radius" />
 				</div>
 			</if>
 
 			<div class="am-form-group">
 				<label>{{:L('alipay_life_message_content_text')}}</label>
-				<textarea rows="5" name="content" class="am-radius" placeholder="{{:L('alipay_life_message_content_text')}}" data-validation-message="{{:L('alipay_life_message_content_format')}}" maxlength="250" required><present name="data">{{$data.content}}</present></textarea>
+				<textarea rows="5" name="content" class="am-radius" placeholder="{{:L('alipay_life_message_content_text')}}" data-validation-message="{{:L('alipay_life_message_content_format')}}" maxlength="250" required></textarea>
 			</div>
 
 			<if condition="$nav_type eq 1">
@@ -61,25 +71,23 @@
 					<label class="block">{{:L('alipay_life_message_image_url_text')}}</label>
 					<button type="button" class="am-btn am-btn-default am-btn-sm am-radius">
 					<i class="am-icon-cloud-upload"></i> {{:L('common_select_images_text')}}</button>
-					<input type="text" name="image_url" class="am-radius js-choice-one original-images-url original-icon-images-url" data-choice-one-to='input[name="file_image_url"]' <notempty name="data"> value="{{$data.image_url}}"</notempty>" data-validation-message="{{:L('alipay_life_message_image_url_format')}}" readonly="readonly" />
-					<i class="am-icon-trash-o am-icon-sm original-images-url-delete" data-input-tag="input.original-icon-images-url" data-image-tag="#form-img-icon" data-tips-tag="#form-icon-tips" data-file-tag="input.file_image_url-tag"></i>
+					<input type="text" name="image_url" class="am-radius js-choice-one original-images-url original-icon-images-url" data-choice-one-to='input[name="file_image_url"]' data-validation-message="{{:L('alipay_life_message_image_url_format')}}" readonly="readonly" />
 					<input type="file" name="file_image_url" multiple data-validation-message="{{:L('alipay_life_message_image_url_format')}}" accept="image/gif,image/jpeg,image/jpg,image/png" class="js-choice-one images-file-event file_image_url-tag" data-choice-one-to=".original-icon-images-url" data-tips-tag="#form-icon-tips" data-image-tag="#form-img-icon" />
 					<div id="form-icon-tips" class="m-t-5"></div>
-					<img src="<if condition="!empty($data['image_url'])">{{$image_host}}{{$data.image_url}}<else />{{$image_host}}/Public/Admin/Default/Images/default-images.png</if>" id="form-img-icon" class="block m-t-5 am-img-thumbnail am-radius" width="100" height="100" data-default="{{$image_host}}/Public/Admin/Default/Images/default-images.png" />
+					<img src="{{$image_host}}/Public/Admin/Default/Images/default-images.png" id="form-img-icon" class="block m-t-5 am-img-thumbnail am-radius" width="100" height="100" data-default="{{$image_host}}/Public/Admin/Default/Images/default-images.png" />
 				</div>
 
 				<div class="am-form-group">
 					<label>{{:L('alipay_life_message_url_text')}}</label>
-					<input type="text" name="url" placeholder="{{:L('alipay_life_message_url_text')}}" data-validation-message="{{:L('alipay_life_message_url_format')}}" class="am-radius" maxlength="255" <notempty name="data"> value="{{$data.url}}"</notempty> required />
+					<input type="text" name="url" placeholder="{{:L('alipay_life_message_url_text')}}" data-validation-message="{{:L('alipay_life_message_url_format')}}" class="am-radius" maxlength="255" required />
 				</div>
 
 				<div class="am-form-group">
 					<label>{{:L('alipay_life_message_action_name_text')}}</label>
-					<input type="text" name="action_name" placeholder="{{:L('alipay_life_message_action_name_text')}}" data-validation-message="{{:L('alipay_life_message_action_name_format')}}" class="am-radius" maxlength="60" <notempty name="data"> value="{{$data.action_name}}"</notempty> />
+					<input type="text" name="action_name" placeholder="{{:L('alipay_life_message_action_name_text')}}" data-validation-message="{{:L('alipay_life_message_action_name_format')}}" class="am-radius" maxlength="60" />
 				</div>
 			</if>
 			<div class="am-form-group">
-				<input type="hidden" name="id" <notempty name="data"> value="{{$data.id}}"</notempty> />
 				<input type="hidden" name="type" value="{{$nav_type}}" />
 				<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm w100" data-am-loading="{loadingText:'{{:L('common_form_loading_tips')}}'}">{{:L('common_operation_save')}}</button>
 			</div>
diff --git a/service/Public/Common/Css/Common.css b/service/Public/Common/Css/Common.css
index 0ef517fba..a550040ef 100755
--- a/service/Public/Common/Css/Common.css
+++ b/service/Public/Common/Css/Common.css
@@ -40,6 +40,8 @@
 .am-tagsinput { display: block; }
 .am-tagsinput { padding: 0 5px 5px 5px; }
 .am-tagsinput .tag { margin-top: 5px; }
+.chosen-disabled .chosen-choices, .chosen-disabled .chosen-single { background-color: #ccc; }
+.chosen-disabled .search-choice { background: #d6d6d6 !important; }
 
 /**
  * 公共提示信息