Merge branch 'master' of http://122.114.239.145:7070/r/php/iem_awe

wangtengyu

2018-12-24 7c88e336ac4aa48722976c227f2f4f7017668c6f

Merge branch 'master' of http://122.114.239.145:7070/r/php/iem_awe

 addons/longbing_card/icon-custom.jpg

 addons/longbing_card/icon-custom_old.jpg

 addons/longbing_card/template/goods/editSpe.html

@@ -106,6 +106,13 @@
        title: '请输入选项名',
    }, function(value, index, elem){
        layer.close(index);
        
        <!-- 2018-12-21 不可输入默认选项 chenlei start -->
        if ('默认' == value) {
            layer.msg('不可输入默认!');
            return false;
        }
        <!-- 2018-12-21 不可输入默认选项 chenlei end -->

        for (var i = 0; i < json.length; i++)
        {

 addons/longbing_card/template/manage/speEdit.html

@@ -165,6 +165,13 @@
            title: '请输入选项名',
        }, function(value, index, elem){
            layer.close(index);
            
            <!-- 2018-12-21 不可输入默认选项 chenlei start -->
            if ('默认' == value) {
                layer.msg('不可输入默认!');
                return false;
            }
            <!-- 2018-12-21 不可输入默认选项 chenlei end -->

            for (var i = 0; i < json.length; i++)
            {

 data/tpl/web/default/common/footer-base.tpl.php

@@ -1,6 +1,7 @@
<?php defined('IN_IA') or exit('Access Denied');?></div>
    <div class="container-fluid footer text-center" role="footer">    
        <div class="friend-link">
        <!-- 2018-12-18 删除微擎 chenlei start -->
<!--         <div class="friend-link">
            <?php  if(empty($_W['setting']['copyright']['footerright'])) { ?>
                <a href="http://www.we7.cc">微信开发</a>
                <a href="http://s.we7.cc">微信应用</a>
@@ -9,8 +10,9 @@
            <?php  } else { ?>
                <?php  echo $_W['setting']['copyright']['footerright'];?>
            <?php  } ?>
        </div>
        <div class="copyright"><?php  if(empty($_W['setting']['copyright']['footerleft'])) { ?>Powered by <a href="http://www.we7.cc"><b>微擎</b></a> v<?php echo IMS_VERSION;?> &copy; 2014-2015 <a href="http://www.we7.cc">www.we7.cc</a><?php  } else { ?><?php  echo $_W['setting']['copyright']['footerleft'];?><?php  } ?></div>
        </div> -->
        <div class="copyright"><?php  if(empty($_W['setting']['copyright']['footerleft'])) { ?>Powered by <!-- <a href="http://www.we7.cc"> --><b>九鼎</b></a> v<?php echo IMS_VERSION;?> &copy; 2014-2015<?php  } else { ?><?php  echo $_W['setting']['copyright']['footerleft'];?><?php  } ?></div>
        <!-- 2018-12-18 删除微擎 chenlei end -->
        <?php  if(!empty($_W['setting']['copyright']['icp'])) { ?><div>备案号：<a href="http://www.miitbeian.gov.cn" target="_blank"><?php  echo $_W['setting']['copyright']['icp'];?></a></div><?php  } ?>
    </div>
    <?php  if(!empty($_W['setting']['copyright']['statcode'])) { ?><?php  echo $_W['setting']['copyright']['statcode'];?><?php  } ?>

 data/tpl/web/default/common/header.tpl.php

@@ -4,12 +4,14 @@
<div class="head mixMenu-head">
    <nav class="navbar navbar-default" role="navigation">
        <div class="container <?php  if(!empty($frames['section']['platform_module_menu']['plugin_menu'])) { ?>plugin-head<?php  } ?>">
            <!-- 2018-12-18 删除微擎logo chenlei start -->
            <div class="navbar-header">
                <a class="navbar-brand" href="<?php  echo $_W['siteroot'];?>">
                    <img src="<?php  if(!empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')) { ?><?php  echo to_global_media($_W['setting']['copyright']['blogo'])?><?php  } else { ?>./resource/images/logo/logo.png<?php  } ?>" class="pull-left" width="110px" height="35px">
                    <!-- <img src="<?php  if(!empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')) { ?><?php  echo to_global_media($_W['setting']['copyright']['blogo'])?><?php  } else { ?>./resource/images/logo/logo.png<?php  } ?>" class="pull-left" width="110px" height="35px"> -->
                    <span class="version hidden"><?php echo IMS_VERSION;?></span>
                </a>
            </div>
            <!-- 2018-12-18 删除微擎logo chenlei end -->
            <?php  if(!empty($_W['uid'])) { ?>
            <div class="collapse navbar-collapse">
                <style>

 data/tpl/web/default/user/login.tpl.php

@@ -1,11 +1,13 @@
<?php defined('IN_IA') or exit('Access Denied');?><?php (!empty($this) && $this instanceof WeModuleSite || 0) ? (include $this->template('common/header-base', TEMPLATE_INCLUDEPATH)) : (include template('common/header-base', TEMPLATE_INCLUDEPATH));?>
<div class="system-login" <?php  if(!empty($_W['setting']['copyright']['background_img']) && function_exists('to_global_media')) { ?> style="background-image:url('<?php  echo to_global_media($_W['setting']['copyright']['background_img']);?>')" <?php  } else { ?> style="background-image: url('./resource/images/bg-login.png');" <?php  } ?>>
<div class="system-login" <?php  if(!empty($_W['setting']['copyright']['background_img']) && function_exists('to_global_media')) { ?> style="background-image:url('<?php  echo to_global_media($_W['setting']['copyright']['background_img']);?>')" <?php  } else { ?> style="background-image: url('./resource/images/bg-login5.png');" height="700px" <?php  } ?>>

    <div class="head">
        <!-- 2018-12-18 删除微擎logo chenlei start -->
        <a href="/" class="logo-version">
            <img src="<?php  if(!empty($_W['setting']['copyright']['flogo']) && function_exists('to_global_media')) { ?><?php  echo to_global_media($_W['setting']['copyright']['flogo'])?><?php  } else { ?>./resource/images/logo/logo.png<?php  } ?>" class="logo">
            <!-- <img src="<?php  if(!empty($_W['setting']['copyright']['flogo']) && function_exists('to_global_media')) { ?><?php  echo to_global_media($_W['setting']['copyright']['flogo'])?><?php  } else { ?>./resource/images/logo/logo.png<?php  } ?>" class="logo"> -->
            <span class="version hidden"><?php echo IMS_VERSION;?></span>
        </a>
        <!-- 2018-12-18 删除微擎logo chenlei end -->
        <?php  if(!empty($_W['setting']['copyright']['showhomepage'])) { ?>
        <a href="<?php  echo url('account/welcome')?>" class="pull-right">首页</a>
        <?php  } ?>
@@ -30,7 +32,9 @@

            <div class="form-inline" style="margin-bottom: 15px;">
                <div class="pull-right">
                    <a href="<?php  echo url('user/find-password');?>" target="_blank" class="color-default"></a>
                    <!-- 2018-12-18 添加忘记密码 chenlei start -->
                    <a href="<?php  echo url('user/find-password');?>" target="_blank" class="color-default">忘记密码？</a>
                    <!-- 2018-12-18 添加忘记密码 chenlei end -->
                </div>
                <div class="checkbox">
                    <input type="checkbox" value="true" id="rember" name="rember">
@@ -40,14 +44,16 @@
            <div class="login-submit text-center">
                <input type="submit" id="submit" name="submit" value="登录" class="btn btn-primary btn-block" />
                <div class="text-right">
                    <!-- 2018-12-18 添加手机注册 chenlei start -->
                    <?php  if(!$_W['siteclose'] && $setting['register']['open']) { ?>
                        <?php  if(empty($_GPC['login_type']) || $_GPC['login_type'] == 'system') { ?>
                        <?php  if(empty($_W['setting']['copyright']['mobile_status'])) { ?>
                        <a href="<?php  echo url('user/register');?>" class="color-default">立即注册</a>
                        <?php  } ?>
                        <?php  if($_GPC['login_type'] == 'mobile') { ?>
                        <?php  if(!empty($_W['setting']['copyright']['mobile_status'])) { ?>
                        <a href="<?php  echo url('user/register', array('register_type' => 'mobile'))?>" class="color-default">立即注册</a>
                        <?php  } ?>
                    <?php  } ?>
                    <!-- 2018-12-18 添加手机注册 chenlei end -->
                </div>
                <input name="token" value="<?php  echo $_W['token'];?>" type="hidden" />
            </div>

 data/tpl/web/default/user/register.tpl.php

@@ -1,5 +1,22 @@
<?php defined('IN_IA') or exit('Access Denied');?><?php (!empty($this) && $this instanceof WeModuleSite || 0) ? (include $this->template('common/header-base', TEMPLATE_INCLUDEPATH)) : (include template('common/header-base', TEMPLATE_INCLUDEPATH));?>
<script>
    // 2018-11-28 添加邀请码URL传值设置 chenlei start
    $(function(){
        var invitationCode = getParam("invitation_code");
        if (invitationCode != null && invitationCode != "" && invitationCode != undefined && invitationCode.length == 6) {
            document.getElementById("invitation_code").value = invitationCode;
            document.getElementById("invitation_code").readOnly  = true;
        }
    });
    function getParam(paramName) { 
        paramValue = "", isFound = !1; 
        if (this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) { 
            arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0; 
            while (i < arrSource.length && !isFound) arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++ 
        } 
        return paramValue == "" && (paramValue = null), paramValue 
    }
    // 2018-11-28 添加邀请码URL传值设置 chenlei end
    $('#form1').submit(function(){
        if ($.trim($(':text[name="username"]').val()) == '') {
            util.message('没有输入用户名.', '', 'error');
@@ -37,7 +54,9 @@
        <div class="container">
            <div class="navbar-header">
                <a class="navbar-brand" href="<?php  echo $_W['siteroot'];?>">
                    <img src="<?php  if(!empty($_W['setting']['copyright']['blogo'])) { ?><?php  echo tomedia($_W['setting']['copyright']['blogo'])?><?php  } else { ?>./resource/images/logo/logo.png<?php  } ?>" class="pull-left" width="110px" height="35px">
                    <!-- 2018-12-18 删除微擎logo chenlei start -->
                    <!-- <img src="<?php  if(!empty($_W['setting']['copyright']['blogo'])) { ?><?php  echo tomedia($_W['setting']['copyright']['blogo'])?><?php  } else { ?>./resource/images/logo/logo.png<?php  } ?>" class="pull-left" width="110px" height="35px"> -->
                    <!-- 2018-12-18 删除微擎logo chenlei end -->
                </a>
            </div>
        </div>
@@ -48,12 +67,16 @@
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="title register-nav">
                    <a href="<?php  echo url('user/register', array('register_type' => 'system', 'owner_uid' => $_GPC['owner_uid']))?>" <?php  if($_GPC['register_type'] == 'system' || empty($_GPC['register_type'])) { ?>class="active"<?php  } ?>>用户名密码</a>
                    <!-- 2018-12-18 开启手机注册 chenlei start -->
                    <?php  if(!empty($_W['setting']['copyright']['mobile_status'])) { ?>
                    <a href="<?php  echo url('user/register', array('register_type' => 'mobile', 'owner_uid' => $_GPC['owner_uid']))?>" <?php  if($_GPC['register_type'] == 'mobile') { ?>class="active"<?php  } ?>>手机注册</a>
                    <a href="<?php  echo url('user/register', array('register_type' => 'mobile', 'owner_uid' => $_GPC['owner_uid']))?>" class="active">手机注册</a>
                    <?php  } ?>
                    <?php  if(empty($_W['setting']['copyright']['mobile_status'])) { ?>
                    <a href="<?php  echo url('user/register', array('register_type' => 'system', 'owner_uid' => $_GPC['owner_uid']))?>" class="active">用户名密码</a>
                    <?php  } ?>
                    <!-- 2018-12-18 开启手机注册 chenlei end -->
                </div>
                <?php  if($_GPC['register_type'] == 'system' || empty($_GPC['register_type'])) { ?>
                <?php  if(empty($_W['setting']['copyright']['mobile_status'])) { ?>
                <form action="" class="we7-form register-mobile" method="post" role="form" id="form1" ng-controller="UserRegisterSystem" ng-cloak>
                    <div class="form-group" ng-class="{true:'has-error has-feedback',false:'has-success has-feedback'}[usernameErr]">
                        <label class="control-label col-sm-1">用户名:<span class="color-red">*</span></label>
@@ -121,8 +144,9 @@
                    <label>邀请码:<span style="color:red">*</span></label>
                    <input name="invitation" type="text" class="form-control" placeholder="请输入邀请码">
                </div-->
                <?php  if($_GPC['register_type'] == 'mobile') { ?>
                <?php  if(!empty($_W['setting']['copyright']['mobile_status'])) { ?>
                <form action="javascript:;" class="we7-form">
                    <input name="register_type" value="mobile" type="hidden"/>
                    <div class="register-mobile" ng-controller="UsersRegisterMobile" ng-cloak>
                        <div class="form-group">
                            <label class="control-label col-sm-2">手机号:<span class="color-red">*</span></label>
@@ -138,7 +162,8 @@
                                <span ng-class="{true:'color-red',false:'sr-only'}[mobileErr]" ng-bind="mobileMsg"></span>
                            </div>
                        </div>
                        <div class="form-group">
                        <!-- 2018-11-28 删除输入验证码 chenlei start -->
<!--                        <div class="form-group">
                            <label class="control-label col-sm-2">输入验证码:<span class="color-red">*</span></label>
                            <div class="col-sm-10">
                                <div class="input-group">
@@ -148,8 +173,9 @@
                                <span ng-class="{true:'fa fa-times form-control-feedback color-red reg-mobile-valid',false:'fa fa-check form-control-feedback color-green reg-mobile-valid'}[imagecodeErr]" aria-hidden="true"></span>
                                <span ng-class="{true:'color-red',false:'sr-only'}[imagecodeErr]" ng-bind="imagecodeMsg"></span>
                            </div>
                        </div>
                        <div class="form-group">
                        </div> -->
                        <!-- 2018-11-28 删除输入验证码 chenlei end -->
                         <div class="form-group">
                            <label class="control-label col-sm-2">输入验证码:<span class="color-red">*</span></label>
                            <div class="col-sm-10">
                                <input ng-model='smscode' type="text" class="form-control" placeholder="请输入手机验证码" ng-blur="checkMobileCode()">
@@ -157,6 +183,16 @@
                                <span ng-class="{true:'color-red',false:'sr-only'}[smscodeErr]" ng-bind="smscodeMsg"></span>
                            </div>
                        </div>
                         <!-- 2018-11-28 添加邀请码,手机号码 chenlei start -->
                        <div class="form-group">
                            <label for="" class="control-label col-sm-2">邀请码:</label>
                            <div class="col-sm-10">
                                <input ng-model="invitation_code" type="text" class="form-control" placeholder="请输入6位邀请码" ng-model="invitation_code" ng-blur="" >
                                <span ng-class="{true:'fa fa-times form-control-feedback reg-system-valid',false:'fa fa-check form-control-feedback reg-system-valid'}[invitation_codeErr]" aria-hidden="true"></span>
                                <span ng-class="{true:'color-red',false:'sr-only'}[invitation_codeErr]" ng-bind="invitation_codeMsg"></span>
                            </div>
                        </div>
                        <!-- 2018-11-28 添加邀请码,手机号码 chenlei end -->
                        <div class="form-group">
                            <label class="control-label col-sm-2">密码:<span class="color-red">*</span></label>
                            <div class="col-sm-10">

 framework/builtin/store/site.php

@@ -1014,7 +1014,30 @@
        if ($operate == 'check_pay_result') {
            $orderid = intval($_GPC['orderid']);
            $pay_type = pdo_getcolumn('site_store_order', array('id' => $orderid), 'type');
			
            // 2018-12-19 购买成功后，直接添加到绑定的小程序上 chenlei start
            $module = pdo_fetch("SELECT g.module,g.type,m.version FROM ".tablename('site_store_order').
                " o LEFT JOIN ".tablename('site_store_goods')." g on o.goodsid = g.id LEFT JOIN ".tablename('modules').
                "  m on m.name = g.module WHERE o.id = :id LIMIT 1", array(':id' => $orderid));
            if ($pay_type == STORE_ORDER_FINISH) {
                $module = pdo_fetch("SELECT g.module,g.type,m.version,MAX(v.version),v.id FROM ".tablename('site_store_order').
                    " o LEFT JOIN ".tablename('site_store_goods')." g on o.goodsid = g.id LEFT JOIN ".tablename('modules').
                    "  m on m.name = g.module LEFT JOIN".tablename('wxapp_versions')." v on v.uniacid = o.uniacid WHERE o.id = :id LIMIT 1", array(':id' => $orderid));
			    
                if (!empty($module)) {
                    if ($module[type] == ACCOUNT_TYPE_APP_NORMAL) {
                        $new_module_data = array(
                            $module[module] => array(
                                'name' => $module[module],
                                'version' => $module[version]
                            )
                        );
                        pdo_update('wxapp_versions', array('modules' => iserializer($new_module_data)), array('id' => $module[id]));
                        cache_delete(cache_system_key('miniapp_version', array('version_id' => $module[id])));
                    }
                }
                // 2018-12-19 购买成功后，直接添加到绑定的小程序上 chenlei end
			    
                iajax(1);
            } else {
                iajax(2);

 framework/builtin/store/template/header.html

@@ -8,7 +8,9 @@
            <div class="container ">
                <div class="navbar-header">
                    <a class="navbar-brand" href="{$_W['siteroot']}">
                        <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px">
                        <!-- 2018-12-18 删除微擎logo chenlei start -->
                        <!-- <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px"> -->
                        <!-- 2018-12-18 删除微擎logo chenlei end -->
                    </a>
                </div>
                <div class="collapse navbar-collapse">
@@ -143,7 +145,9 @@
<div class="first-sidebar">
        <div class="{if !empty($frames['section']['platform_module_menu']['plugin_menu'])}plugin-head{/if}">
            <a class="logo-wrap" href="{$_W['siteroot']}">
                <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="logo">
                <!-- 2018-12-18 删除微擎logo chenlei start -->
                <!-- <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="logo"> -->
                <!-- 2018-12-18 删除微擎logo chenlei end -->
            </a>
            {if !empty($_W['uid'])}
            <div class="nav">
@@ -305,7 +309,9 @@
<div class="container ">
    <div class="navbar-header">
        <a class="navbar-brand" href="{$_W['siteroot']}">
            <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px">
            <!-- 2018-12-18 删除微擎logo chenlei start -->
            <!-- <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px"> -->
            <!-- 2018-12-18 删除微擎logo chenlei end -->
        </a>
    </div>
    <div class="collapse navbar-collapse">

 framework/class/oauth2/mobile.class.php

@@ -78,6 +78,7 @@
        $smscode = trim($_GPC['smscode']);
        $mobile = trim($_GPC['mobile']);
        $member['password'] = $_GPC['password'];
        $member['invitation_code'] = $_GPC['invitation_code'];

        if (empty($smscode)) {
            return error(-1, '短信验证码不能为空');

 framework/model/cloud.mod.php

@@ -451,15 +451,18 @@
        if(empty($sign)) {
                $sign = '短信宝';
        }
        // 2018-12-18 短信包更换 chenlei start
        $sign = '九鼎';
        //判断剩余条数
      if($balance<1){
                return error(-1, '短信发送失败, 原因:余额不足');
        } 
//       if($balance<1){
//                 return error(-1, '短信发送失败, 原因:余额不足');
//         } 
        //短信宝账号
       // $smsbao_info=pdo_get('uni_settings' , array('uniacid' => $_W['uniacid']), array('copyright'));
        //$smsbao_info=setting_load($key = 'copyright');
        $sms_param['u']=$_W['setting']['copyright']['sms_name'];
        $sms_param['p']=md5($_W['setting']['copyright']['sms_password']);
        $sms_param['u']= 'jiudingsms';//$_W['setting']['copyright']['sms_name'];
        $sms_param['p']= md5('iemsoft.cn');//md5($_W['setting']['copyright']['sms_password']);
        // 2018-12-18 短信包更换 chenlei end
        $sms_param['m']=$mobile;
        $sms_param['c']='【'.$sign.'】'.$content;
        $statusStr = array(

 web/resource/images/bg-login.png

 web/resource/images/bg-login_old.png

 web/resource/js/app/common.min.js

Diff too large

 web/source/user/registerset.ctrl.php

@@ -8,12 +8,16 @@

$_W['page']['title'] = '用户登录/注册设置 - 注册设置';

$copyright = $_W['setting']['copyright'];
if (checksubmit('submit')) {
    setting_save(array('open' => intval($_GPC['open']), 'verify' => intval($_GPC['verify']), 'code' => intval($_GPC['code']), 'groupid' => intval($_GPC['groupid']), 'safe' => intval($_GPC['safe'])), 'register');
    cache_delete(cache_system_key('defaultgroupid', array('uniacid' => $_W['uniacid'])));
    itoast('更新设置成功！', url('user/registerset'), 'success');
    setting_save(array('open' => intval($_GPC['open']), 'verify' => intval($_GPC['verify']), 'code' => intval($_GPC['code']), 'groupid' => intval($_GPC['groupid']), 'safe' => intval($_GPC['safe'])), 'register');
    cache_delete(cache_system_key('defaultgroupid', array('uniacid' => $_W['uniacid'])));
    $copyright['mobile_status'] = intval($_GPC['mobile_status']);
    setting_save($copyright, 'copyright');
    itoast('更新设置成功！', url('user/registerset'), 'success');
}
$settings = $_W['setting']['register'];
$settings['mobile_status'] = $copyright['mobile_status'];
$groups = user_group();

template('user/registerset');

 web/themes/default/common/footer-base.html

@@ -1,6 +1,7 @@
</div>
    <div class="container-fluid footer text-center" role="footer">    
        <div class="friend-link">
        <!-- 2018-12-18 删除微擎 chenlei start -->
<!--         <div class="friend-link">
            {if empty($_W['setting']['copyright']['footerright'])}
                <a href="http://www.we7.cc">微信开发</a>
                <a href="http://s.we7.cc">微信应用</a>
@@ -9,8 +10,9 @@
            {else}
                {$_W['setting']['copyright']['footerright']}
            {/if}
        </div>
        <div class="copyright">{if empty($_W['setting']['copyright']['footerleft'])}Powered by <a href="http://www.we7.cc"><b>微擎</b></a> v{IMS_VERSION} &copy; 2014-2015 <a href="http://www.we7.cc">www.we7.cc</a>{else}{$_W['setting']['copyright']['footerleft']}{/if}</div>
        </div> -->
        <div class="copyright">{if empty($_W['setting']['copyright']['footerleft'])}Powered by <!-- <a href="http://www.we7.cc"> --><b>九鼎</b></a> v{IMS_VERSION} &copy; 2014-2015{else}{$_W['setting']['copyright']['footerleft']}{/if}</div>
        <!-- 2018-12-18 删除微擎 chenlei end -->
        {if !empty($_W['setting']['copyright']['icp'])}<div>备案号：<a href="http://www.miitbeian.gov.cn" target="_blank">{$_W['setting']['copyright']['icp']}</a></div>{/if}
    </div>
    {if !empty($_W['setting']['copyright']['statcode'])}{$_W['setting']['copyright']['statcode']}{/if}

 web/themes/default/common/header.html

@@ -4,12 +4,14 @@
<div class="head mixMenu-head">
    <nav class="navbar navbar-default" role="navigation">
        <div class="container {if !empty($frames['section']['platform_module_menu']['plugin_menu'])}plugin-head{/if}">
            <!-- 2018-12-18 删除微擎logo chenlei start -->
            <div class="navbar-header">
                <a class="navbar-brand" href="{$_W['siteroot']}">
                    <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px">
                    <!-- <img src="{if !empty($_W['setting']['copyright']['blogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px"> -->
                    <span class="version hidden">{IMS_VERSION}</span>
                </a>
            </div>
            <!-- 2018-12-18 删除微擎logo chenlei end -->
            {if !empty($_W['uid'])}
            <div class="collapse navbar-collapse">
                <style>

 web/themes/default/user/find-password.html

@@ -1,7 +1,9 @@
{template 'common/header-base'}
<div class="system-forget">
    <!--手机验证找回密码-->
    <div class="logo"><img src="{if !empty($_W['setting']['copyright']['blogo'])}{php echo tomedia($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="img-responsive"></div>
    <!-- 2018-12-18 删除微擎logo chenlei start -->
    <div class="logo"><!-- <img src="{if !empty($_W['setting']['copyright']['blogo'])}{php echo tomedia($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="img-responsive"> --></div>
    <!-- 2018-12-18 删除微擎logo chenlei end -->
    <div class="container" id="js-users-find-password" ng-controller="UsersFindMobilePwd" ng-cloak>
        <div class="steps">
            <div class="steps-item steps-status-finish">

 web/themes/default/user/login.html

@@ -1,11 +1,13 @@
{template 'common/header-base'}
<div class="system-login" {if !empty($_W['setting']['copyright']['background_img']) && function_exists('to_global_media')} style="background-image:url('{php echo to_global_media($_W['setting']['copyright']['background_img']);}')" {else} style="background-image: url('./resource/images/bg-login.png');" {/if}>
<div class="system-login" {if !empty($_W['setting']['copyright']['background_img']) && function_exists('to_global_media')} style="background-image:url('{php echo to_global_media($_W['setting']['copyright']['background_img']);}')" {else} style="background-image: url('./resource/images/bg-login.png');" height="700px" {/if}>

    <div class="head">
        <!-- 2018-12-18 删除微擎logo chenlei start -->
        <a href="/" class="logo-version">
            <img src="{if !empty($_W['setting']['copyright']['flogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['flogo'])}{else}./resource/images/logo/logo.png{/if}" class="logo">
            <!-- <img src="{if !empty($_W['setting']['copyright']['flogo']) && function_exists('to_global_media')}{php echo to_global_media($_W['setting']['copyright']['flogo'])}{else}./resource/images/logo/logo.png{/if}" class="logo"> -->
            <span class="version hidden">{IMS_VERSION}</span>
        </a>
        <!-- 2018-12-18 删除微擎logo chenlei end -->
        {if !empty($_W['setting']['copyright']['showhomepage'])}
        <a href="{php echo url('account/welcome')}" class="pull-right">首页</a>
        {/if}
@@ -30,7 +32,9 @@

            <div class="form-inline" style="margin-bottom: 15px;">
                <div class="pull-right">
                    <a href="{url 'user/find-password'}" target="_blank" class="color-default"></a>
                    <!-- 2018-12-18 添加忘记密码 chenlei start -->
                    <a href="{url 'user/find-password'}" target="_blank" class="color-default">忘记密码？</a>
                    <!-- 2018-12-18 添加忘记密码 chenlei end -->
                </div>
                <div class="checkbox">
                    <input type="checkbox" value="true" id="rember" name="rember">
@@ -40,14 +44,16 @@
            <div class="login-submit text-center">
                <input type="submit" id="submit" name="submit" value="登录" class="btn btn-primary btn-block" />
                <div class="text-right">
                    <!-- 2018-12-18 添加手机注册 chenlei start -->
                    {if !$_W['siteclose'] && $setting['register']['open']}
                        {if empty($_GPC['login_type']) || $_GPC['login_type'] == 'system'}
                        {if empty($_W['setting']['copyright']['mobile_status'])}
                        <a href="{url 'user/register'}" class="color-default">立即注册</a>
                        {/if}
                        {if $_GPC['login_type'] == 'mobile'}
                        {if !empty($_W['setting']['copyright']['mobile_status'])}
                        <a href="{php echo url('user/register', array('register_type' => 'mobile'))}" class="color-default">立即注册</a>
                        {/if}
                    {/if}
                    <!-- 2018-12-18 添加手机注册 chenlei end -->
                </div>
                <input name="token" value="{$_W['token']}" type="hidden" />
            </div>

 web/themes/default/user/register.html

@@ -1,5 +1,22 @@
{template 'common/header-base'}
<script>
    // 2018-11-28 添加邀请码URL传值设置 chenlei start
    $(function(){
        var invitationCode = getParam("invitation_code");
        if (invitationCode != null && invitationCode != "" && invitationCode != undefined && invitationCode.length == 6) {
            document.getElementById("invitation_code").value = invitationCode;
            document.getElementById("invitation_code").readOnly  = true;
        }
    });
    function getParam(paramName) { 
        paramValue = "", isFound = !1; 
        if (this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) { 
            arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0; 
            while (i < arrSource.length && !isFound) arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++ 
        } 
        return paramValue == "" && (paramValue = null), paramValue 
    }
    // 2018-11-28 添加邀请码URL传值设置 chenlei end
    $('#form1').submit(function(){
        if ($.trim($(':text[name="username"]').val()) == '') {
            util.message('没有输入用户名.', '', 'error');
@@ -37,7 +54,9 @@
        <div class="container">
            <div class="navbar-header">
                <a class="navbar-brand" href="{$_W['siteroot']}">
                    <img src="{if !empty($_W['setting']['copyright']['blogo'])}{php echo tomedia($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px">
                    <!-- 2018-12-18 删除微擎logo chenlei start -->
                    <!-- <img src="{if !empty($_W['setting']['copyright']['blogo'])}{php echo tomedia($_W['setting']['copyright']['blogo'])}{else}./resource/images/logo/logo.png{/if}" class="pull-left" width="110px" height="35px"> -->
                    <!-- 2018-12-18 删除微擎logo chenlei end -->
                </a>
            </div>
        </div>
@@ -48,12 +67,16 @@
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="title register-nav">
                    <a href="{php echo url('user/register', array('register_type' => 'system', 'owner_uid' => $_GPC['owner_uid']))}" {if $_GPC['register_type'] == 'system' || empty($_GPC['register_type'])}class="active"{/if}>用户名密码</a>
                    <!-- 2018-12-18 开启手机注册 chenlei start -->
                    {if !empty($_W['setting']['copyright']['mobile_status'])}
                    <a href="{php echo url('user/register', array('register_type' => 'mobile', 'owner_uid' => $_GPC['owner_uid']))}" {if $_GPC['register_type'] == 'mobile'}class="active"{/if}>手机注册</a>
                    <a href="{php echo url('user/register', array('register_type' => 'mobile', 'owner_uid' => $_GPC['owner_uid']))}" class="active">手机注册</a>
                    {/if}
                    {if empty($_W['setting']['copyright']['mobile_status'])}
                    <a href="{php echo url('user/register', array('register_type' => 'system', 'owner_uid' => $_GPC['owner_uid']))}" class="active">用户名密码</a>
                    {/if}
                    <!-- 2018-12-18 开启手机注册 chenlei end -->
                </div>
                {if $_GPC['register_type'] == 'system' || empty($_GPC['register_type'])}
                {if empty($_W['setting']['copyright']['mobile_status'])}
                <form action="" class="we7-form register-mobile" method="post" role="form" id="form1" ng-controller="UserRegisterSystem" ng-cloak>
                    <div class="form-group" ng-class="{true:'has-error has-feedback',false:'has-success has-feedback'}[usernameErr]">
                        <label class="control-label col-sm-1">用户名:<span class="color-red">*</span></label>
@@ -121,8 +144,9 @@
                    <label>邀请码:<span style="color:red">*</span></label>
                    <input name="invitation" type="text" class="form-control" placeholder="请输入邀请码">
                </div-->
                {if $_GPC['register_type'] == 'mobile'}
                {if !empty($_W['setting']['copyright']['mobile_status'])}
                <form action="javascript:;" class="we7-form">
                    <input name="register_type" value="mobile" type="hidden"/>
                    <div class="register-mobile" ng-controller="UsersRegisterMobile" ng-cloak>
                        <div class="form-group">
                            <label class="control-label col-sm-2">手机号:<span class="color-red">*</span></label>
@@ -138,7 +162,8 @@
                                <span ng-class="{true:'color-red',false:'sr-only'}[mobileErr]" ng-bind="mobileMsg"></span>
                            </div>
                        </div>
                        <div class="form-group">
                        <!-- 2018-11-28 删除输入验证码 chenlei start -->
<!--                        <div class="form-group">
                            <label class="control-label col-sm-2">输入验证码:<span class="color-red">*</span></label>
                            <div class="col-sm-10">
                                <div class="input-group">
@@ -148,8 +173,9 @@
                                <span ng-class="{true:'fa fa-times form-control-feedback color-red reg-mobile-valid',false:'fa fa-check form-control-feedback color-green reg-mobile-valid'}[imagecodeErr]" aria-hidden="true"></span>
                                <span ng-class="{true:'color-red',false:'sr-only'}[imagecodeErr]" ng-bind="imagecodeMsg"></span>
                            </div>
                        </div>
                        <div class="form-group">
                        </div> -->
                        <!-- 2018-11-28 删除输入验证码 chenlei end -->
                         <div class="form-group">
                            <label class="control-label col-sm-2">输入验证码:<span class="color-red">*</span></label>
                            <div class="col-sm-10">
                                <input ng-model='smscode' type="text" class="form-control" placeholder="请输入手机验证码" ng-blur="checkMobileCode()">
@@ -157,6 +183,16 @@
                                <span ng-class="{true:'color-red',false:'sr-only'}[smscodeErr]" ng-bind="smscodeMsg"></span>
                            </div>
                        </div>
                         <!-- 2018-11-28 添加邀请码,手机号码 chenlei start -->
                        <div class="form-group">
                            <label for="" class="control-label col-sm-2">邀请码:</label>
                            <div class="col-sm-10">
                                <input ng-model="invitation_code" type="text" class="form-control" placeholder="请输入6位邀请码" ng-model="invitation_code" ng-blur="" >
                                <span ng-class="{true:'fa fa-times form-control-feedback reg-system-valid',false:'fa fa-check form-control-feedback reg-system-valid'}[invitation_codeErr]" aria-hidden="true"></span>
                                <span ng-class="{true:'color-red',false:'sr-only'}[invitation_codeErr]" ng-bind="invitation_codeMsg"></span>
                            </div>
                        </div>
                        <!-- 2018-11-28 添加邀请码,手机号码 chenlei end -->
                        <div class="form-group">
                            <label class="control-label col-sm-2">密码:<span class="color-red">*</span></label>
                            <div class="col-sm-10">

 web/themes/default/user/registerset.html

@@ -12,6 +12,22 @@
            <span class="help-block"> 开启后，用户可以在登录页面注册账号。</span>
        </div>
    </div>
    <!-- 2018-12-18 添加手机注册 chenlei start -->
    <div class="form-group">
        <label class="col-sm-2 control-label" style="width: 150px;">手机注册</label>
        <div class="col-sm-8 form-controls">
            <input type="radio" name="mobile_status" id="mobile_status_status-1" {if $settings['mobile_status'] == 1} checked="checked" {/if} value="1" />
            <label class="radio-inline" for="mobile_status_status-1">
                是 
            </label>
            <input type="radio" name="mobile_status" id="mobile_status_status-0" {if $settings['mobile_status'] == 0} checked="checked" {/if} value="0" />
            <label class="radio-inline" for="mobile_status_status-0">
                否
            </label>
            <span class="help-block"> 开启后，用户可以通过手机号注册/登录</span>
        </div>
    </div>
    <!-- 2018-12-18 添加手机注册 chenlei end -->

    <div class="form-group">
        <label for="" class="control-label col-sm-2"  style="width: 150px;">是否审核新用户</label>