重置密码修改

application/admin/view/cms/page/add.html

@@ -85,24 +85,24 @@
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Iscomment')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-iscomment" name="row[iscomment]" type="hidden" value="10">
-            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-iscomment" data-yes="1" data-no="0">
-                <i class="fa fa-toggle-on text-success fa-2x"></i>
-            </a>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Parsetpl')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input  id="c-parsetpl" name="row[parsetpl]" type="hidden" value="0">
-            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-parsetpl" data-yes="1" data-no="0" >
-                <i class="fa fa-toggle-on text-success fa-flip-horizontal text-gray fa-2x"></i>
-            </a>
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Iscomment')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-iscomment" name="row[iscomment]" type="hidden" value="10">-->
+<!--            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-iscomment" data-yes="1" data-no="0">-->
+<!--                <i class="fa fa-toggle-on text-success fa-2x"></i>-->
+<!--            </a>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Parsetpl')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input  id="c-parsetpl" name="row[parsetpl]" type="hidden" value="0">-->
+<!--            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-parsetpl" data-yes="1" data-no="0" >-->
+<!--                <i class="fa fa-toggle-on text-success fa-flip-horizontal text-gray fa-2x"></i>-->
+<!--            </a>-->
+<!--        </div>-->
+<!--    </div>-->
     <div id="extend">{include file="cms/common/fields"}</div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>

application/admin/view/cms/page/edit.html

@@ -97,24 +97,24 @@
             <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Iscomment')}:</label>
-        <div class="col-xs-12 col-sm-4">
-            <input  id="c-iscomment" name="row[iscomment]" type="hidden" value="{$row.iscomment}">
-            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-iscomment" data-yes="1" data-no="0" >
-                <i class="fa fa-toggle-on text-success {eq name="$row.iscomment" value="0"}fa-flip-horizontal text-gray{/eq} fa-2x"></i>
-            </a>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Parsetpl')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input  id="c-parsetpl" name="row[parsetpl]" type="hidden" value="{$row.parsetpl}">
-            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-parsetpl" data-yes="1" data-no="0" >
-                <i class="fa fa-toggle-on text-success {eq name="$row.parsetpl" value="0"}fa-flip-horizontal text-gray{/eq} fa-2x"></i>
-            </a>
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Iscomment')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-4">-->
+<!--            <input  id="c-iscomment" name="row[iscomment]" type="hidden" value="{$row.iscomment}">-->
+<!--            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-iscomment" data-yes="1" data-no="0" >-->
+<!--                <i class="fa fa-toggle-on text-success {eq name="$row.iscomment" value="0"}fa-flip-horizontal text-gray{/eq} fa-2x"></i>-->
+<!--            </a>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Parsetpl')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input  id="c-parsetpl" name="row[parsetpl]" type="hidden" value="{$row.parsetpl}">-->
+<!--            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-parsetpl" data-yes="1" data-no="0" >-->
+<!--                <i class="fa fa-toggle-on text-success {eq name="$row.parsetpl" value="0"}fa-flip-horizontal text-gray{/eq} fa-2x"></i>-->
+<!--            </a>-->
+<!--        </div>-->
+<!--    </div>-->
     <div id="extend">{include file="cms/common/fields"}</div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>

application/api/controller/Cms.php

@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\admin\model\cms\Archives;
 use app\admin\model\cms\AuthorManuscript;
 use app\admin\model\cms\Channel;
 use app\admin\model\cms\Conference;
@@ -88,4 +89,16 @@ class Cms extends Api
         $conferences = Conference::whereTime('createtime', 'between', [$start_time, $end_time])->select();
         $this->success('', $conferences);
     }
+
+    /**
+     * 获取对应期刊文章信息
+     *
+     * @return void
+     */
+    public function getArticle()
+    {
+        $channel_id = $this->request->get('channel_id');
+        $archives = Archives::where(['p_channel_id' => $channel_id, 'channel_id' => 34])->order('weigh', 'DESC')->limit(4)->select();
+        $this->success('', $archives);
+    }
 }

application/api/controller/User.php

@@ -357,8 +357,8 @@ class User extends Api
      */
     public function resetpwd()
     {
-        $type = $this->request->post("type");
-        $mobile = $this->request->post("mobile");
+//        $type = $this->request->post("type");
+//        $mobile = $this->request->post("mobile");
         $email = $this->request->post("email");
         $newpassword = $this->request->post("newpassword");
         $captcha = $this->request->post("captcha");
@@ -369,20 +369,20 @@ class User extends Api
         if (!Validate::make()->check(['newpassword' => $newpassword], ['newpassword' => 'require|regex:\S{6,30}'])) {
             $this->error(__('Password must be 6 to 30 characters'));
         }
-        if ($type == 'mobile') {
-            if (!Validate::regex($mobile, "^1\d{10}$")) {
-                $this->error(__('Mobile is incorrect'));
-            }
-            $user = \app\common\model\User::getByMobile($mobile);
-            if (!$user) {
-                $this->error(__('User not found'));
-            }
-            $ret = Sms::check($mobile, $captcha, 'resetpwd');
-            if (!$ret) {
-                $this->error(__('Captcha is incorrect'));
-            }
-            Sms::flush($mobile, 'resetpwd');
-        } else {
+//        if ($type == 'mobile') {
+//            if (!Validate::regex($mobile, "^1\d{10}$")) {
+//                $this->error(__('Mobile is incorrect'));
+//            }
+//            $user = \app\common\model\User::getByMobile($mobile);
+//            if (!$user) {
+//                $this->error(__('User not found'));
+//            }
+//            $ret = Sms::check($mobile, $captcha, 'resetpwd');
+//            if (!$ret) {
+//                $this->error(__('Captcha is incorrect'));
+//            }
+//            Sms::flush($mobile, 'resetpwd');
+//        } else {
             if (!Validate::is($email, "email")) {
                 $this->error(__('Email is incorrect'));
             }
@@ -395,7 +395,7 @@ class User extends Api
                 $this->error(__('Captcha is incorrect'));
             }
             Ems::flush($email, 'resetpwd');
-        }
+//        }
         //模拟一次登录
         $this->auth->direct($user->id);
         $ret = $this->auth->changepwd($newpassword, '', true);

application/index/view/user/login.html

@@ -48,31 +48,38 @@
     <form id="resetpwd-form" class="form-horizontal form-layer" method="POST" action="{:url('api/user/resetpwd')}">
         <div class="form-body">
             <input type="hidden" name="action" value="resetpwd"/>
+<!--            <div class="form-group">-->
+<!--                <label class="control-label col-xs-12 col-sm-3">{:__('Type')}:</label>-->
+<!--                <div class="col-xs-12 col-sm-8">-->
+<!--                    <div class="radio">-->
+<!--                        <label for="type-email"><input id="type-email" checked="checked" name="type" data-send-url="{:url('api/ems/send')}" data-check-url="{:url('api/validate/check_ems_correct')}" type="radio" value="email"> {:__('Reset password by email')}</label>-->
+<!--                        <label for="type-mobile"><input id="type-mobile" name="type" type="radio" data-send-url="{:url('api/sms/send')}" data-check-url="{:url('api/validate/check_sms_correct')}" value="mobile"> {:__('Reset password by mobile')}</label>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group" data-type="email">-->
+<!--                <label for="email" class="control-label col-xs-12 col-sm-3">{:__('Email')}:</label>-->
+<!--                <div class="col-xs-12 col-sm-8">-->
+<!--                    <input type="text" class="form-control" id="email" name="email" value="" data-rule="required(#type-email:checked);email;remote({:url('api/validate/check_email_exist')}, event=resetpwd, id=0)" placeholder="">-->
+<!--                    <span class="msg-box"></span>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group hide" data-type="mobile">-->
+<!--                <label for="mobile" class="control-label col-xs-12 col-sm-3">{:__('Mobile')}:</label>-->
+<!--                <div class="col-xs-12 col-sm-8">-->
+<!--                    <input type="text" class="form-control" id="mobile" name="mobile" value="" data-rule="required(#type-mobile:checked);mobile;remote({:url('api/validate/check_mobile_exist')}, event=resetpwd, id=0)" placeholder="">-->
+<!--                    <span class="msg-box"></span>-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="form-group">
-                <label class="control-label col-xs-12 col-sm-3">{:__('Type')}:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <div class="radio">
-                        <label for="type-email"><input id="type-email" checked="checked" name="type" data-send-url="{:url('api/ems/send')}" data-check-url="{:url('api/validate/check_ems_correct')}" type="radio" value="email"> {:__('Reset password by email')}</label>
-                        <label for="type-mobile"><input id="type-mobile" name="type" type="radio" data-send-url="{:url('api/sms/send')}" data-check-url="{:url('api/validate/check_sms_correct')}" value="mobile"> {:__('Reset password by mobile')}</label>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group" data-type="email">
-                <label for="email" class="control-label col-xs-12 col-sm-3">{:__('Email')}:</label>
+                <label for="email" class="control-label col-xs-12 col-sm-3">Email:</label>
                 <div class="col-xs-12 col-sm-8">
                     <input type="text" class="form-control" id="email" name="email" value="" data-rule="required(#type-email:checked);email;remote({:url('api/validate/check_email_exist')}, event=resetpwd, id=0)" placeholder="">
                     <span class="msg-box"></span>
                 </div>
             </div>
-            <div class="form-group hide" data-type="mobile">
-                <label for="mobile" class="control-label col-xs-12 col-sm-3">{:__('Mobile')}:</label>
-                <div class="col-xs-12 col-sm-8">
-                    <input type="text" class="form-control" id="mobile" name="mobile" value="" data-rule="required(#type-mobile:checked);mobile;remote({:url('api/validate/check_mobile_exist')}, event=resetpwd, id=0)" placeholder="">
-                    <span class="msg-box"></span>
-                </div>
-            </div>
             <div class="form-group">
-                <label for="captcha" class="control-label col-xs-12 col-sm-3">{:__('Captcha')}:</label>
+                <label for="captcha" class="control-label col-xs-12 col-sm-3">Captcha:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
                         <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_ems_correct')}, event=resetpwd, email:#email)"/>
@@ -84,7 +91,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label for="newpassword" class="control-label col-xs-12 col-sm-3">{:__('New password')}:</label>
+                <label for="newpassword" class="control-label col-xs-12 col-sm-3">New password:</label>
                 <div class="col-xs-12 col-sm-8">
                     <input type="password" class="form-control" id="newpassword" name="newpassword" value="" data-rule="required;password" placeholder="">
                     <span class="msg-box"></span>
@@ -94,7 +101,7 @@
         <div class="form-group form-footer">
             <label class="control-label col-xs-12 col-sm-3"></label>
             <div class="col-xs-12 col-sm-8">
-                <button type="submit" class="btn btn-md btn-primary">{:__('Ok')}</button>
+                <button type="submit" class="btn btn-md btn-primary">Ok</button>
             </div>
         </div>
     </form>