合并分支 'xv' 到 'master'

关于我们背景图添加



查看合并请求 !334

@@ -23,6 +23,9 @@ class ZjSystemController extends AdminBaseController
     public function edit(){
         if ($this->request->param()){
             $arr=input('param.');
+            if (empty($arr['about_img'])){
+                $this->error('关于我们页背景图不可为空');
+            }
             $arr['about']=htmlspecialchars(cmf_replace_content_file_url(htmlspecialchars_decode($arr['about'])));
             $up=Db::name('zj_system')->update($arr);
             if (empty($up)){

@@ -64,7 +64,7 @@ class AdminIndexController extends AdminBaseController
         $keywordComplex = [];
         if (!empty($param['keyword'])) {
             $keyword = $param['keyword'];
-            $keywordComplex['mobile|id']    = ['like', "%$keyword%"];
+            $keywordComplex['mobile|id'] = $keyword;
         }
         if (!empty($param['start_time'])){
         $where['create_time']=['egt',strtotime($param['start_time'])];

@@ -18,7 +18,26 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label><span class="form-required">*</span>关于我们</label>
+                            <label><span class="form-required">*</span>关于我们-背景图</label>
+                            <div style="text-align: center;">
+                                <input type="hidden" name="about_img" id="thumbnai2"
+                                       value="{$one.about_img|default=''}">
+                                <a href="javascript:uploadOneImage('图片上传','#thumbnai2');">
+                                    <if condition="empty($one.about_img)">
+                                        <img src="__TMPL__/public/assets/images/default-thumbnail.png"
+                                             id="thumbnai2-preview"
+                                             width="135" style="cursor: pointer"/>
+                                        <else/>
+                                        <img src="{:cmf_get_image_preview_url($one.about_img)}"
+                                             id="thumbnai2-preview"
+                                             width="135" style="cursor: pointer"/>
+                                    </if>
+                                </a>
+                                <input type="button" class="btn btn-sm btn-cancel-thumbnai2" value="取消图片">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label><span class="form-required">*</span>关于我们-公司简介</label>
                             <div>
                                 <script type="text/plain" id="content" name="about">{:cmf_replace_content_file_url(htmlspecialchars_decode($one.about))}</script>
                             </div>
@@ -66,6 +85,12 @@
 <script type="text/javascript" src="__STATIC__/js/admin.js"></script>
 <script type="text/javascript" src="__STATIC__/js/city-picker.js"></script>
 <script>
+
+    $('.btn-cancel-thumbnai2').click(function () {
+        $('#thumbnai2-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
+        $('#thumbnai2').val('');
+    });
+
     var pla=$.rawCitiesData
     var ci=document.getElementById('city')
     var co=document.getElementById('county')

@@ -12,7 +12,7 @@
                 <th>类型</th>
                 <th>变更时间</th>
                 <th>变更额度</th>
-                <th>变更后余额</th>
+                <!--<th>变更后余额</th>-->
             </tr>
             </thead>
             <tbody>
@@ -32,7 +32,7 @@
                         </if>
                     </td>
                     <td>{:date('Y-m-d H:i',$vo.create_time)}</td>
-                    <td>{$vo.change}</td>
+
                     <td>{$vo['balance']}</td>
                 </tr>
             </foreach>