fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 1861cfce4f186d4faea4db9bc9d4d87f72b39a4f 2 parents 7db78f33 c1df3529

Merge branch 'gray'

Inline Side-by-side
Showing 14 changed files with 13 additions and 16 deletions
... ... @@ -417,15 +417,12 @@ class WebAction extends Controller_Abstract
$cookieList[1] = intval(Encryption::decrypt($cookieList[1]));
if (isset($cookieList[1]) && $cookieList[1]) {
if ($useSession) {
$token = $this->getSession('_TOKEN');
if (empty($token)) {
$token = $this->getCookie('_TOKEN');
}
if ($token === Helpers::makeToken($cookieList[1])) {
$token = $this->getCookie('_TOKEN');
$salt = substr($token, -8);
if ($cookieList[3] === Helpers::makeToken($cookieList[1] . $salt)) {
$this->_uid = $cookieList[1];
}
}
else {
} else {
$this->_uid = $cookieList[1];
}
$this->_uname = $cookieList[0];
... ...
... ... @@ -177,7 +177,7 @@
<div class="express-list express-tips">注：配送会由于天气，交通等不可抗拒的客观因素造成您收货时间延迟，请您知悉。
</div>
<div class="express-list hide is-sup"><span class="sf">您所选择的区域暂不在顺丰派送范围内,</span><a style="text-decoration: none;" target="_blank" href="{{sfUrl}}">点击查看详情</a></div>
<div class="express-list sf hide">如您购买的商品为航空禁运品顺丰会用陆运的方式给你派送，预计3-5天送达，请您见谅</div>
<div class="express-list sf hide">如您购买的商品为航空禁运品顺丰会用陆运的方式给您派送，预计3-5天送达，请您见谅</div>
</div>
</div>
</div>
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{
"name": "web-yohobuy",
"version": "5.2.0",
"version": "5.2.2",
"description": "web yohobuy static",
"keywords": [],
"homepage": "",
... ...
... ... @@ -301,7 +301,7 @@ class PaymentModel
* @param string $orderCode 订单号
* @return array
*/
public static function weixinQrcode($orderCode)
public static function weixinQrcode($uid, $orderCode)
{
do {
... ... @@ -309,7 +309,6 @@ class PaymentModel
self::$code['message'] = '订单号不能为空';
break;
}
$uid = self::getUid($orderCode);
/* 判断订单信息是否存在 */
$orderDetail = OrderData::getOrderDetail($uid, $orderCode);
... ...
... ... @@ -16,7 +16,8 @@ class WechatqrcodeController extends WebAction
$this->autoLogin();
$orderCode = $this->get('order_code', $this->get('ordercode'));
$data = PaymentModel::weixinQrcode($orderCode);
$uid = $this->getUid();
$data = PaymentModel::weixinQrcode($uid, $orderCode);
if (empty($data['code']) || $data['code'] !== 200) {
$this->helpJsRedirect($data['message']);
}
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.0"
application.version = "5.2.2"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.0"
application.version = "5.2.2"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.0"
application.version = "5.2.2"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.0"
application.version = "5.2.2"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...