From d4895a606830027467073f71b713c478112d7dbf Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 18 Apr 2019 11:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/petscms/Pets.php          |  8 ++++--
 .../plugins/view/petscms/pets/saveinfo.html   | 26 ++++++++++---------
 .../view/petscms/petsadmin/saveinfo.html      | 20 +++++++-------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/application/plugins/petscms/Pets.php b/application/plugins/petscms/Pets.php
index f320555d6..b569f251c 100644
--- a/application/plugins/petscms/Pets.php
+++ b/application/plugins/petscms/Pets.php
@@ -118,8 +118,12 @@ class Pets extends Controller
             }
             unset($params['id']);
         }
-        $this->assign('data', $data);
+
+        // 是否绑定
+        $this->assign('pest_no', empty($params['pest_no']) ? '' : $params['pest_no']);
+        unset($params['pest_no']);
         $this->assign('params', $params);
+        $this->assign('data', $data);
         $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list);
         $this->assign('pets_attribute_is_text_list', Service::$pets_attribute_is_text_list);
         $this->assign('pets_attribute_gender_list', Service::$pets_attribute_gender_list);
@@ -174,7 +178,7 @@ class Pets extends Controller
 
         // 用户
         $params['user_id'] = $this->user['id'];
-        return Service::PestSave($params);
+        return Service::PetsSave($params);
     }
 
     /**
diff --git a/application/plugins/view/petscms/pets/saveinfo.html b/application/plugins/view/petscms/pets/saveinfo.html
index bf44ad91e..618de13ee 100644
--- a/application/plugins/view/petscms/pets/saveinfo.html
+++ b/application/plugins/view/petscms/pets/saveinfo.html
@@ -30,10 +30,10 @@
 
                 <!-- 基础 -->
                 <div class="base-view">
-                    {{if empty($data['id']) and !empty($params['pest_no'])}}
+                    {{if empty($data['id']) and !empty($pest_no)}}
                         <div class="am-form-group">
                             <label>编号<span class="am-form-group-label-tips">宠物绑定</span></label>
-                            <input type="text" name="pest_no" placeholder="编号" maxlength="60" data-validation-message="编号格式 1~60 个字符之间" class="am-radius" value="{{$params.pest_no}}" readonly="true" />
+                            <input type="text" name="pest_no" placeholder="编号" maxlength="60" data-validation-message="编号格式 1~60 个字符之间" class="am-radius" value="{{$pest_no}}" readonly="true" />
                         </div>
                     {{/if}}
 
@@ -114,6 +114,18 @@
                         <div class="plug-file-upload-submit" data-view-tag="ul.goods-photo-view">+上传相册</div>
                     </div>
 
+                    {{if empty($pest_no)}}
+                        <div class="am-form-group">
+                            <label>状态<span class="am-form-group-label-tips-must">必选</span></label>
+                            <select name="status" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择状态" required>
+                                <option value="">可选择...</option>
+                                {{foreach $pets_attribute_status_list as $v}}
+                                    <option value="{{$v.value}}" {{if isset($data['status']) and $data['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                                {{/foreach}}
+                            </select>
+                        </div>
+                    {{/if}}
+
                     <!-- 宠物简介 -->
                     <div class="am-form-group">
                         <label>宠物简介<span class="am-form-group-label-tips">选填</span></label>
@@ -181,16 +193,6 @@
                     </div>
                 </div>
 
-                <div class="am-form-group">
-                    <label>状态<span class="am-form-group-label-tips-must">必选</span></label>
-                    <select name="status" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择状态" required>
-                        <option value="">可选择...</option>
-                        {{foreach $pets_attribute_status_list as $v}}
-                            <option value="{{$v.value}}" {{if isset($data['status']) and $data['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                </div>
-
                 <div class="am-form-group am-form-group-refreshing">
                     <input type="hidden" name="id" value="{{if !empty($data['id'])}}{{$data.id}}{{/if}}" />
                     <button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">提交</button>
diff --git a/application/plugins/view/petscms/petsadmin/saveinfo.html b/application/plugins/view/petscms/petsadmin/saveinfo.html
index c49d7e8a9..a422076ed 100644
--- a/application/plugins/view/petscms/petsadmin/saveinfo.html
+++ b/application/plugins/view/petscms/petsadmin/saveinfo.html
@@ -88,6 +88,16 @@
                         <div class="plug-file-upload-submit" data-view-tag="ul.goods-photo-view">+上传相册</div>
                     </div>
 
+                    <div class="am-form-group">
+                        <label>状态</label>
+                        <select name="status" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择状态">
+                            <option value="">可选择...</option>
+                            {{foreach $pets_attribute_status_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['status']) and $data['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+
                     <!-- 宠物简介 -->
                     <div class="am-form-group">
                         <label>宠物简介</label>
@@ -155,16 +165,6 @@
                     </div>
                 </div>
 
-                <div class="am-form-group">
-                    <label>状态</label>
-                    <select name="status" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择状态">
-                        <option value="">可选择...</option>
-                        {{foreach $pets_attribute_status_list as $v}}
-                            <option value="{{$v.value}}" {{if isset($data['status']) and $data['status'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                        {{/foreach}}
-                    </select>
-                </div>
-
                 <div class="am-form-group am-form-group-refreshing">
                     <input type="hidden" name="id" value="{{if !empty($data['id'])}}{{$data.id}}{{/if}}" />
                     <input type="hidden" name="user_id" value="{{if !empty($data['user_id'])}}{{$data.user_id}}{{/if}}" />
-- 
GitLab