Merge branch 'dev' into payment

no_ymq_dev
laurieryayoi 8 years ago
commit 447272a566

@ -68,8 +68,6 @@ Wiki已经启用,欢迎为此面板维护wiki
[**CGDF**](https://github.com/CGDF-GitHub)
- 一键国旗
- 财务报表
- xcat一键update
- 适配SSD
- 用户列表分页加载

@ -46,9 +46,12 @@ class Job
if(!Tools::is_ip($node->server)){
if($node->changeNodeIp($node->server)){
$node->save();
if ($node->sort == 0 || $node->sort == 10) {
Tools::updateRelayRuleIp($node);
}
}
}
}
}
}
}
}

@ -148,16 +148,20 @@ class NodeController extends AdminController
$success=$node->changeNodeIp($node->server);
}else{
$success=$node->changeNodeIp($req_node_ip);
}
}
} else {
$node->node_ip="";
}
}
if (!$success) {
$rs['ret'] = 0;
$rs['msg'] = "更新节点IP失败,请检查您输入的节点地址是否正确!";
return $response->getBody()->write(json_encode($rs));
}
}
if ($node->sort == 0 || $node->sort == 10) {
Tools::updateRelayRuleIp($node);
}
if ($node->sort==1) {
$SS_Node=Node::where('sort', '=', 0)->where('server', '=', $request->getParam('server'))->first();

@ -363,12 +363,8 @@ class UserController extends AdminController
$tempdata['ref_by_user_name'] = $ref_user->user_name;
}
}
$codes=Code::where('userid',$user->id)->get();
$tempdata['top_up']=0;
foreach($codes as $code){
$tempdata['top_up']+=$code->number;
}
$tempdata['top_up']=round($tempdata['top_up'],2);
$tempdata['top_up']=$user->get_top_up();
array_push($data,$tempdata);
}

@ -156,12 +156,6 @@ class Node extends Model
return false;
}
$relay_rules = Relay::where('dist_node_id', $node_id)->get();
foreach ($relay_rules as $relay_rule) {
$relay_rule->dist_ip = $ip;
$relay_rule->save();
}
$this->attributes['node_ip'] = $ip;
return true;
}

@ -341,8 +341,19 @@ class User extends Model
$ref_user_id, $ref_user_name);
return $return_array;
}
public function get_user_attributes($key)
{
return $this->attributes[$key];
}
public function get_top_up()
{
$codes=Code::where('userid',$this->attributes['id'])->get();
$top_up=0;
foreach($codes as $code){
$top_up+=$code->number;
}
return round($top_up,2);
}
}

@ -269,13 +269,23 @@
</div>
{else}
<p class="card-heading" align="center"><b>
<i class="icon icon-lg">visibility_off</i>等级至少为{$display_ios_class}可见,如需升级请<a href="/user/shop">点击这里</a>升级套餐。
<i class="icon icon-lg">visibility_off</i>等级至少为{$display_ios_class}可见,如需升级请<a href="/user/shop">点击这里</a>升级套餐
</b></p>
{/if}
{/if}
<p><span class="icon icon-lg text-white">filter_1</span> 在 Safari 中<a class="btn-dl" href="itms-services://?action=download-manifest&url=https://raw.githubusercontent.com/xcxnig/ssr-download/master/potatso-lite.plist"><i class="material-icons">save_alt</i> 点击安装 Potatso Lite</a> 或在非国区AppStore中搜索<code>Shadowrocket</code>下载安装 </p>
<p><span class="icon icon-lg text-white">filter_2</span> 打开 Potatso Lite,点击添加代理,点击右上角的 + 号,选择“订阅”,名字任意填写,开启自动更新,URL填写以下地址并保存即可</p>
<p>如果使用shadowrocket,打开 Shadowrocket,点击右上角的 + 号,类型选择“Subscribe”,URL填写以下地址并点击右上角完成即可。或使用<a href="javascript:void(0);" class="btn-dl" style="margin-left: 5px;" data-onekeyfor="sub0"><i class="material-icons icon-sm">how_to_vote</i>小火箭一键{if $mergeSub!='true'}普通{/if}端口订阅</a> {if $mergeSub!='true'}<a href="javascript:void(0);" class="btn-dl" style="margin-left: 5px;" data-onekeyfor="sub1"><i class="material-icons icon-sm">how_to_vote</i>小火箭一键单端口订阅</a>{/if}</p>
<p><span class="icon icon-lg text-white">build</span> 工具一:Shadowrocket</p>
<p><span class="icon icon-lg text-white">filter_1</span> 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载<code>Shadowrocket</code>,期间可能会弹出付款,照做即可,不会产生真实扣费
<p><span class="icon icon-lg text-white">filter_2</span> 打开Shadowrocket,点击右上角的 + 号,“类型”选择“Subscribe”,点击复制本网页下方的“订阅地址”,粘贴到“URL”中,点击右上角的“完成”</p>
<p>或在 Safari 中点击<a href="javascript:void(0);" class="btn-dl" style="margin-left: 5px;" data-onekeyfor="sub0"><i class="material-icons icon-sm">how_to_vote</i>小火箭一键{if $mergeSub!='true'}普通端口{/if}订阅</a> {if $mergeSub!='true'}<a href="javascript:void(0);" class="btn-dl" style="margin-left: 5px;" data-onekeyfor="sub1"><i class="material-icons icon-sm">how_to_vote</i>小火箭一键单端口订阅</a>{/if}</p>
<p><span class="icon icon-lg text-white">filter_3</span> 选择一个节点,打开上方的连接开关即可</p>
<p><span class="icon icon-lg text-white">build</span> 工具二:Quantumult</p>
<p><span class="icon icon-lg text-white">filter_1</span> 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载<code>Quantumult</code>,期间可能会弹出付款,照做即可,不会产生真实扣费
<p><span class="icon icon-lg text-white">filter_2</span> 点击下方的“设置”,点击“订阅”,点击右上角的 + 号,选择“服务器”,“名称”任意填写,点击复制本网页下方的“订阅地址”,粘贴到“链接”中,点击右上角的“保存”</p>
<p><span class="icon icon-lg text-white">filter_3</span> 点击 Quantumult 底部菜单栏中间的图标,选择一个节点,再点击“主页”,打开右上角的开关即可</p>
<p><span class="icon icon-lg text-white">build</span> 工具三:Potatso Lite</p>
<p><span class="icon icon-lg text-white">filter_1</span> 在 Safari 中<a class="btn-dl" href="itms-services://?action=download-manifest&url=https://raw.githubusercontent.com/xcxnig/ssr-download/master/potatso-lite.plist"><i class="material-icons">save_alt</i> 点击安装 Potatso Lite</a>,安装时如果弹出登录框则使用上方的账户</p>
<p><span class="icon icon-lg text-white">filter_2</span> 打开 Potatso Lite,点击添加代理,选择“订阅”,名字任意填写,点击复制本网页下方的“订阅地址”,粘贴到URL中,点击右上角的 √</p>
<p><span class="icon icon-lg text-white">filter_3</span> 选择一个代理节点,点击下方的“开始”即可</p>
<div><span class="icon icon-lg text-white">flash_auto</span> {if $mergeSub!='true'}普通节点{/if}订阅地址:</div>
<div class="float-clear"><input type="text" class="input form-control form-control-monospace cust-link col-xx-12 col-sm-8 col-lg-7" name="input1" id="sub0" readonly value="{$subUrl}{$ssr_sub_token}{if $mergeSub!='true'}?mu=0{/if}" readonly="true"><button class="copy-text btn btn-subscription col-xx-12 col-sm-3 col-lg-2" type="button" data-clipboard-text="{$subUrl}{$ssr_sub_token}{if $mergeSub!='true'}?mu=0{/if}">点击复制</button><br></div>
{if $mergeSub!='true'}
@ -446,8 +456,18 @@
</b></p>
{/if}
{/if}
<p><span class="icon icon-lg text-white">filter_1</span> 在 Safari 中点击<a href="itms-services://?action=download-manifest&url=https://raw.githubusercontent.com/xcxnig/ssr-download/master/potatso-lite.plist">这里</a>安装 Potatso Lite</p>
<p><span class="icon icon-lg text-white">filter_2</span> 打开<a href="/user/node">节点列表</a>,点开自己需要的节点详情,自行导入节点</p>
<p><span class="icon icon-lg text-white">build</span> 工具一:Shadowrocket</p>
<p><span class="icon icon-lg text-white">filter_1</span> 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载<code>Shadowrocket</code>,期间可能会弹出付款,照做即可,不会产生真实扣费
<p><span class="icon icon-lg text-white">filter_2</span> 打开<a href="/user/node">节点列表</a>,点开自己需要的节点详情,点击配置链接导入节点</p>
<p><span class="icon icon-lg text-white">filter_3</span> 选择一个节点,打开上方的连接开关即可</p>
<p><span class="icon icon-lg text-white">build</span> 工具二:Quantumult</p>
<p><span class="icon icon-lg text-white">filter_1</span> 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载<code>Quantumult</code>,期间可能会弹出付款,照做即可,不会产生真实扣费
<p><span class="icon icon-lg text-white">filter_2</span> 打开<a href="/user/node">节点列表</a>,点开自己需要的节点详情,点击配置链接导入节点</p>
<p><span class="icon icon-lg text-white">filter_3</span> 点击 Quantumult 底部菜单栏中间的图标,选择一个节点,再点击“主页”,打开右上角的开关即可</p>
<p><span class="icon icon-lg text-white">build</span> 工具三:Potatso Lite</p>
<p><span class="icon icon-lg text-white">filter_1</span> 在 Safari 中<a class="btn-dl" href="itms-services://?action=download-manifest&url=https://raw.githubusercontent.com/xcxnig/ssr-download/master/potatso-lite.plist"><i class="material-icons">save_alt</i> 点击安装 Potatso Lite</a>,安装时如果弹出登录框则使用上方的账户</p>
<p><span class="icon icon-lg text-white">filter_2</span> 打开<a href="/user/node">节点列表</a>,点开自己需要的节点详情,点击配置链接导入节点</p>
<p><span class="icon icon-lg text-white">filter_3</span> 选择一个代理节点,点击下方的“开始”即可</p>
</div>
<div class="tab-pane fade" id="all_ss_android">
<p><span class="icon icon-lg text-white">filter_1</span><a href="/ssr-download/ssd-android.apk" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载 SSD</a>,<a href="/ssr-download/ss-android-obfs.apk" class="btn-dl"><i class="material-icons">save_alt</i> 点击下载 SS 混淆插件</a></p>
@ -786,6 +806,7 @@ $(".copy-text").click(function () {
$("#result").modal();
$("#msg").html("已拷贝订阅链接,请您继续接下来的操作。");
});
$(function(){
new Clipboard('.reset-link');
});

@ -168,16 +168,16 @@
</nav>
<div class="tab-pane fade {if $ssr_prefer}active in{/if}" id="ssr_url">
{if URL::SSRCanConnect($user, $mu)}
<p><a href="{URL::getItemUrl($ssr_item, 0)}"/>Android 手机上用默认浏览器打开点我就可以直接添加了(给 ShadowsocksR APP)</a></p>
<p><a href="{URL::getItemUrl($ssr_item, 0)}"/>iOS 上用 Safari 打开点我就可以直接添加了(给 Shadowrocket)</a></p>
<p><a class="copy-text" data-clipboard-text="{URL::getItemUrl($ssr_item, 0)}">点我复制配置链接</a></p>
<p><a href="{URL::getItemUrl($ssr_item, 0)}">iOS 上用 Safari 打开点我即可直接添加</a></p>
{else}
<p>您好,您目前的 加密方式,混淆,或者协议设置在 ShadowsocksR 客户端下无法连接。请您选用 Shadowsocks 客户端来连接,或者到 资料编辑 页面修改后再来查看此处。</p>
{/if}
</div>
<div class="tab-pane fade {if !$ssr_prefer}active in{/if}" id="ss_url">
{if URL::SSCanConnect($user, $mu)}
<p><a href="{URL::getItemUrl($ss_item, 1)}"/>Android 手机上用默认浏览器打开点我就可以直接添加了(给 Shadowsocks)</a></p>
<p><a href="{URL::getItemUrl($ss_item, 1)}"/>iOS 上用 Safari 打开点我就可以直接添加了(给 Shadowrocket)</a></p>
<p><a class="copy-text" data-clipboard-text="{URL::getItemUrl($ssr_item, 1)}">点我复制配置链接</a></p>
<p><a href="{URL::getItemUrl($ss_item, 1)}">iOS 上用 Safari 打开点我即可直接添加</a></p>
{else}
<p>您好,您目前的 加密方式,混淆,或者协议设置在 Shadowsocks 客户端下无法连接。请您选用 ShadowsocksR 客户端来连接,或者到 资料编辑 页面修改后再来查看此处。</p>
{/if}
@ -246,7 +246,7 @@
</div>
</div>
{include file='dialog.tpl'}
</div>
</div>
@ -264,7 +264,16 @@
<script src="https://cdn.jsdelivr.net/gh/davidshimjs/qrcodejs@gh-pages/qrcode.min.js"></script>
<script>
$(function(){
new Clipboard('.copy-text');
});
$(".copy-text").click(function () {
$("#result").modal();
$("#msg").html("已拷贝订阅链接,请您继续接下来的操作。");
});
{if URL::SSCanConnect($user, $mu)}
var text_qrcode = '{URL::getItemUrl($ss_item, 1)}',
text_qrcode_win = '{URL::getItemUrl($ss_item, 2)}';

@ -33,6 +33,18 @@
</noscript>
<div id="app"></div>
<!-- 构建完成的内容会被自动插入 -->
{if $config["sspanelAnalysis"] == 'true'}
<!-- Google Analytics -->
<script>
window.ga=window.ga||function(){ (ga.q=ga.q||[]).push(arguments) };ga.l=+new Date;
ga('create', 'UA-111801619-3', 'auto');
var hostDomain = window.location.host || document.location.host || document.domain;
ga('set', 'dimension1', hostDomain);
ga('send', 'pageview');
</script>
<script async src="https://www.google-analytics.com/analytics.js"></script>
<!-- End Google Analytics -->
{/if}
{if $recaptcha_sitekey != null}
<script src="https://recaptcha.net/recaptcha/api.js?render=explicit" async defer></script>
{/if}

@ -93,7 +93,7 @@ export default {
},
setCurrentPage(num) {
if (num !== "···") {
this.currentPage = num ? num : 1;
this.currentPage = num || 1;
this.getButtonList();
this.$emit("turnPage", this.currentPage);
}

@ -450,7 +450,7 @@ export default {
this.invite_gift = r.inviteInfo.invite_gift;
this.code_payback = r.inviteInfo.code_payback;
this.pagenation = {
lastPage: r.inviteInfo.paybacks.last_page,
lastPage: r.inviteInfo.paybacks.last_page
};
});
},

@ -9,7 +9,7 @@
<script>
import storeMap from "@/mixins/storeMap";
import userMixin from "@/mixins/userMixin";
import { _get, _post } from "../../js/fetch";
import { _post } from "../../js/fetch";
export default {
mixins: [userMixin, storeMap],

@ -29,7 +29,7 @@ import Pagenation from "@/components/pagenation.vue";
import storeMap from "@/mixins/storeMap";
import userMixin from "@/mixins/userMixin";
import { _get, _post } from "../../js/fetch";
import { _post } from "../../js/fetch";
export default {
mixins: [userMixin, storeMap],

@ -344,7 +344,7 @@ export default {
},
{
name: "充值中心",
id: "user-charge",
id: "user-charge"
},
{
name: "套餐购买",

Loading…
Cancel
Save