Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
a7c8a904f2
|
|
@ -228,7 +228,7 @@ class MembercardOrderCreate extends OrderCreate
|
|||
}
|
||||
}
|
||||
//生成整体支付单据
|
||||
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages/order/detail?order_id=' . $order_id);
|
||||
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages_rush/order/detail?order_id=' . $order_id);
|
||||
$this->addOrderCronClose($order_id, $shop_goods_list[ 'site_id' ]);//增加关闭订单自动事件
|
||||
model('order')->commit();
|
||||
return $this->success($out_trade_no);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ export default [{
|
|||
{
|
||||
title: '订单',
|
||||
icon: 'icondingdan',
|
||||
path: '/pages/order/orderlist',
|
||||
path: '/pages_rush/order/orderlist',
|
||||
name: 'order_list'
|
||||
},
|
||||
{
|
||||
|
|
@ -101,13 +101,13 @@ export default [{
|
|||
{
|
||||
title: '订单管理',
|
||||
icon: 'icondingdan',
|
||||
path: '/pages/order/orderlist',
|
||||
path: '/pages_rush/order/orderlist',
|
||||
name: 'order_list'
|
||||
},
|
||||
{
|
||||
title: '退款维权',
|
||||
icon: 'iconjishi',
|
||||
path: '/pages/order/orderrefund',
|
||||
path: '/pages_rush/order/orderrefund',
|
||||
name: 'order_refund_list'
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1352,7 +1352,7 @@ return [
|
|||
"link" => [
|
||||
"name" => "ALL_ORDER",
|
||||
"title" => "全部订单",
|
||||
"wap_url" => "/pages/order/list",
|
||||
"wap_url" => "/pages_rush/order/list",
|
||||
"parent" => "MALL_LINK"
|
||||
],
|
||||
"isShow" => true,
|
||||
|
|
|
|||
|
|
@ -1269,7 +1269,7 @@ class UseTemplate
|
|||
"link" => [
|
||||
"name" => "ALL_ORDER",
|
||||
"title" => "全部订单",
|
||||
"wap_url" => "/pages/order/list",
|
||||
"wap_url" => "/pages_rush/order/list",
|
||||
"parent" => "MALL_LINK"
|
||||
],
|
||||
"isShow" => true,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
{block name="resources"}
|
||||
<style>
|
||||
.form-row{margin-top: 0;}
|
||||
.hide{
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
{/block}
|
||||
{block name="main"}
|
||||
|
|
@ -31,7 +34,7 @@
|
|||
</div>
|
||||
<div class="word-aux ">下单赠送积分，得消费额百分比</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">下单赠送贡献值：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -50,8 +53,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">下单赠送购房券，得消费额百分比</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">下单A位置得积分：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -60,8 +63,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">下单分享A位置得积分，得消费额百分比</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">下单A位置得贡献值：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -70,8 +73,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">下单分享A位置得贡献值，得消费额百分比</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">下单D位置得积分：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -80,8 +83,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">下单分享D位置得积分，得消费额百分比</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">下单D位置得贡献值：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -90,7 +93,7 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">下单分享D位置得贡献值，得消费额百分比</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">分销商升级申请协议：</label>
|
||||
<div class="layui-input-block">
|
||||
|
|
@ -102,12 +105,12 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- 每日转换设置 -->
|
||||
<div class="layui-card card-common card-brief">
|
||||
<div class="layui-card card-common card-brief hide">
|
||||
<div class="layui-card-header">
|
||||
<span class="card-title">每日转换设置</span>
|
||||
</div>
|
||||
<div class="layui-card-body">
|
||||
<div class="layui-form-item">
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">无贡献值，积分每天定额返：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -116,8 +119,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">无贡献值，积分每天定额返</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">有贡献值，积分每天定额返：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -126,8 +129,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">有贡献值，积分每天定额返</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">定额返余额占比：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -136,8 +139,8 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">定额返余额占比</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
</div>-->
|
||||
<!--<div class="layui-form-item">
|
||||
<label class="layui-form-label">定额返积分占比：</label>
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-input-inline">
|
||||
|
|
@ -146,7 +149,7 @@
|
|||
<div class="layui-form-mid">%</div>
|
||||
</div>
|
||||
<div class="word-aux ">定额返积分占比</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="layui-form-item" style="display:none">
|
||||
<label class="layui-form-label">是否开启分销：</label>
|
||||
<div class="layui-input-block">
|
||||
|
|
|
|||
|
|
@ -94,10 +94,10 @@
|
|||
<!-- 余额弹框html -->
|
||||
<script type="text/html" id="balance">
|
||||
<div class="layui-form">
|
||||
<div class="layui-form-item">
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label">当前购房券：</label>
|
||||
<div class="layui-input-block account-value">{{ d.house_purchase }}</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">核销数额：</label>
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
<script type="text/html" id="operation">
|
||||
<div class="table-btn">
|
||||
<a class="layui-btn" lay-event="detail">查看</a>
|
||||
<a class="layui-btn" lay-event="adjust_house_purchase">核销购房券</a>
|
||||
|
||||
{{# if(d.status == 1){ }}
|
||||
<a class="layui-btn" lay-event="frozen">冻结</a>
|
||||
<!-- <a class="layui-btn" lay-event="change">上级分销商变更</a> -->
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ class FuturesOrderCreate extends OrderCreate
|
|||
}
|
||||
}
|
||||
//生成整体支付单据
|
||||
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages_promotion/futures/order?status=stock');//'/pages/order/detail?order_id=' . $order_id
|
||||
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages_promotion/futures/order?status=stock');//'/pages_rush/order/detail?order_id=' . $order_id
|
||||
$this->addOrderCronClose($order_id, $shop_goods_list[ 'site_id' ]);//增加关闭订单自动事件
|
||||
model('order')->commit();
|
||||
return $this->success($out_trade_no);
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ class GiftcardOrderCreate extends OrderCreate
|
|||
}
|
||||
}
|
||||
//生成整体支付单据
|
||||
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages/order/detail?order_id=' . $order_id);
|
||||
$pay->addPay($shop_goods_list[ 'site_id' ], $out_trade_no, $this->pay_type, $this->order_name, $this->order_name, $this->pay_money, '', 'OrderPayNotify', '/pages_rush/order/detail?order_id=' . $order_id);
|
||||
$this->addOrderCronClose($order_id, $shop_goods_list[ 'site_id' ]);//增加关闭订单自动事件
|
||||
model('order')->commit();
|
||||
return $this->success($out_trade_no);
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ class GoodsCircle extends BaseModel
|
|||
'payment_method' => $order_item['pay_type'] == 'wechatpay' ? 1 : 2,
|
||||
'user_open_id' => $order_item['weapp_openid'],
|
||||
'order_detail_page' => [
|
||||
'path' => '/pages/order/detail?order_id=' . $order_item['order_id']
|
||||
'path' => '/pages_rush/order/detail?order_id=' . $order_item['order_id']
|
||||
],
|
||||
'total_fee' => $order_item['goods_money']
|
||||
]
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -20,7 +20,7 @@ export default {
|
|||
*/
|
||||
redirectTo(to, param, mode) {
|
||||
let url = to;
|
||||
let tabbarList = ['/pages/index/index', '/pages/goods/list', '/pages/order/list', '/pages/my/index',
|
||||
let tabbarList = ['/pages/index/index', '/pages/goods/list', '/pages_rush/order/list', '/pages/my/index',
|
||||
'/pages/member/list'
|
||||
]
|
||||
for (let i = 0; i < tabbarList.length; i++) {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ export default {
|
|||
jumpFlag: true,
|
||||
list: [
|
||||
{
|
||||
link: '/pages/order/list',
|
||||
link: '/pages_rush/order/list',
|
||||
selectedIconPath: '/static/images/tabbar/order_selected.png',
|
||||
iconPath: '/static/images/tabbar/order.png',
|
||||
text: '订单'
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
</view>
|
||||
</uni-grid-item>
|
||||
<uni-grid-item>
|
||||
<view @click="$util.redirectTo('/pages/order/list')" class="grid_item">
|
||||
<view @click="$util.redirectTo('/pages_rush/order/list')" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/manage_order.png')" mode="aspectFit" />
|
||||
<view class="text">订单管理</view>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -84,21 +84,21 @@
|
|||
<view class="grid margin-top order">
|
||||
<uni-grid :column="5" :showBorder="!1">
|
||||
<uni-grid-item>
|
||||
<view @click="pendingLink('/pages/order/list', 'order_id', 0)" class="grid_item">
|
||||
<view @click="pendingLink('/pages_rush/order/list', 'order_id', 0)" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/wating_pay.png')" mode="aspectFit" />
|
||||
<text class="num" v-if="data.num_data.waitpay > 0">{{ data.num_data.waitpay }}</text>
|
||||
<view class="text">待支付</view>
|
||||
</view>
|
||||
</uni-grid-item>
|
||||
<uni-grid-item>
|
||||
<view @click="pendingLink('/pages/order/list', 'order_id', 1)" class="grid_item">
|
||||
<view @click="pendingLink('/pages_rush/order/list', 'order_id', 1)" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/wating_send.png')" mode="aspectFit" />
|
||||
<text class="num" v-if="data.num_data.waitsend > 0">{{ data.num_data.waitsend }}</text>
|
||||
<view class="text">待发货</view>
|
||||
</view>
|
||||
</uni-grid-item>
|
||||
<uni-grid-item>
|
||||
<view @click="pendingLink('/pages/order/list', 'order_id', 'refunding')" class="grid_item">
|
||||
<view @click="pendingLink('/pages_rush/order/list', 'order_id', 'refunding')" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/return_money.png')" mode="aspectFit" />
|
||||
<text class="num" v-if="data.num_data.refund > 0">{{ data.num_data.refund }}</text>
|
||||
<view class="text">退款中</view>
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
</view>
|
||||
</uni-grid-item>
|
||||
<uni-grid-item>
|
||||
<view @click="$util.redirectTo('/pages/order/list')" class="grid_item">
|
||||
<view @click="$util.redirectTo('/pages_rush/order/list')" class="grid_item">
|
||||
<image class="image50" :src="$util.img('upload/uniapp/shop_uniapp/index/manage_order.png')" mode="aspectFit" />
|
||||
<view class="text">订单查询</view>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ export default {
|
|||
// #ifdef H5
|
||||
var urlencode = this.order;
|
||||
uni.setStorageSync('addressInfo', JSON.stringify(urlencode));
|
||||
let backurl = Config.h5Domain + '/pages/order/address_update?order_id=' + this.order.order_id;
|
||||
let backurl = Config.h5Domain + '/pages_rush/order/address_update?order_id=' + this.order.order_id;
|
||||
window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
|
||||
// #endif
|
||||
},
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ export default {
|
|||
this.$forceUpdate();
|
||||
},
|
||||
goRefund(order_goods_id) {
|
||||
this.$util.redirectTo('/pages/order/refund/detail', {
|
||||
this.$util.redirectTo('/pages_rush/order/refund/detail', {
|
||||
order_goods_id
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ export default {
|
|||
title: res.message
|
||||
});
|
||||
setTimeout(() => {
|
||||
this.$util.redirectTo('/pages/order/list', {}, 'redirectTo');
|
||||
this.$util.redirectTo('/pages_rush/order/list', {}, 'redirectTo');
|
||||
}, 1000);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -126,36 +126,36 @@ export default {
|
|||
},
|
||||
// 发货
|
||||
orderDelivery(order_id) {
|
||||
this.$util.redirectTo("/pages/order/delivery", {
|
||||
this.$util.redirectTo("/pages_rush/order/delivery", {
|
||||
order_id
|
||||
});
|
||||
},
|
||||
// 外卖发货
|
||||
orderLocalDelivery(order_id) {
|
||||
this.$util.redirectTo("/pages/order/local_delivery", {
|
||||
this.$util.redirectTo("/pages_rush/order/local_delivery", {
|
||||
order_id
|
||||
});
|
||||
},
|
||||
goRefund(order_goods_id) {
|
||||
this.$util.redirectTo('/pages/order/refund/detail', {
|
||||
this.$util.redirectTo('/pages_rush/order/refund/detail', {
|
||||
order_goods_id
|
||||
});
|
||||
},
|
||||
// 调整价格
|
||||
orderAdjustMoney(order_id) {
|
||||
this.$util.redirectTo("/pages/order/adjust_price", {
|
||||
this.$util.redirectTo("/pages_rush/order/adjust_price", {
|
||||
order_id
|
||||
});
|
||||
},
|
||||
// 修改地址
|
||||
orderAddressUpdate(order_id) {
|
||||
this.$util.redirectTo("/pages/order/address_update", {
|
||||
this.$util.redirectTo("/pages_rush/order/address_update", {
|
||||
order_id
|
||||
});
|
||||
},
|
||||
// 查看订单日志
|
||||
goLog(order_id) {
|
||||
this.$util.redirectTo("/pages/order/log", {
|
||||
this.$util.redirectTo("/pages_rush/order/log", {
|
||||
order_id
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export default {
|
|||
this.template = option.template || 'basis';
|
||||
},
|
||||
onShow() {
|
||||
var url = '/pages/order/detail/' + this.template + '?order_id=' + this.orderId + '&template=' + this.template;
|
||||
var url = '/pages_rush/order/detail/' + this.template + '?order_id=' + this.orderId + '&template=' + this.template;
|
||||
if (!this.$util.checkToken(url)) return;
|
||||
|
||||
this.getOrderDetail();
|
||||
|
|
@ -54,7 +54,7 @@ export default {
|
|||
title: res.message
|
||||
});
|
||||
setTimeout(() => {
|
||||
this.$util.redirectTo('/pages/order/list', {}, 'redirectTo');
|
||||
this.$util.redirectTo('/pages_rush/order/list', {}, 'redirectTo');
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
|
|
@ -92,7 +92,7 @@ export default {
|
|||
}
|
||||
},
|
||||
goLogistics() {
|
||||
this.$util.redirectTo('/pages/order/logistics', {
|
||||
this.$util.redirectTo('/pages_rush/order/logistics', {
|
||||
order_id: this.orderId
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ export default {
|
|||
this.orderConditionCurr.order_status_list = this.findCurr(orderStatus);
|
||||
uni.removeStorageSync("order_id");
|
||||
}
|
||||
if (!this.$util.checkToken('/pages/order/list')) return;
|
||||
if (!this.$util.checkToken('/pages_rush/order/list')) return;
|
||||
this.$store.dispatch('getShopInfo');
|
||||
|
||||
if (this.mescroll) this.mescroll.resetUpScroll();
|
||||
|
|
@ -312,13 +312,13 @@ export default {
|
|||
} else if (order.order_type == 4) {
|
||||
template = 'virtual';
|
||||
}
|
||||
this.$util.redirectTo("/pages/order/detail/" + template, {
|
||||
this.$util.redirectTo("/pages_rush/order/detail/" + template, {
|
||||
order_id: order.order_id,
|
||||
template: template
|
||||
});
|
||||
},
|
||||
goRefundOrderList() {
|
||||
this.$util.redirectTo('/pages/order/refund/list');
|
||||
this.$util.redirectTo('/pages_rush/order/refund/list');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,25 +60,25 @@ export default {
|
|||
},
|
||||
// 拒绝
|
||||
orderRefundRefuse(order_goods_id) {
|
||||
this.$util.redirectTo("/pages/order/refund/refuse", {
|
||||
this.$util.redirectTo("/pages_rush/order/refund/refuse", {
|
||||
order_goods_id
|
||||
});
|
||||
},
|
||||
// 同意
|
||||
orderRefundAgree(order_goods_id) {
|
||||
this.$util.redirectTo("/pages/order/refund/agree", {
|
||||
this.$util.redirectTo("/pages_rush/order/refund/agree", {
|
||||
order_goods_id
|
||||
});
|
||||
},
|
||||
// 收货
|
||||
orderRefundTakeDelivery(order_goods_id) {
|
||||
this.$util.redirectTo("/pages/order/refund/take_delivery", {
|
||||
this.$util.redirectTo("/pages_rush/order/refund/take_delivery", {
|
||||
order_goods_id
|
||||
});
|
||||
},
|
||||
// 转账
|
||||
orderRefundTransfer(order_goods_id) {
|
||||
this.$util.redirectTo("/pages/order/refund/transfer", {
|
||||
this.$util.redirectTo("/pages_rush/order/refund/transfer", {
|
||||
order_goods_id
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ export default {
|
|||
this.getCondition();
|
||||
},
|
||||
onShow() {
|
||||
if (!this.$util.checkToken('/pages/order/refund/list')) return;
|
||||
if (!this.$util.checkToken('/pages_rush/order/refund/list')) return;
|
||||
|
||||
if (this.mescroll) this.mescroll.resetUpScroll();
|
||||
},
|
||||
|
|
@ -190,12 +190,12 @@ export default {
|
|||
this.$forceUpdate();
|
||||
},
|
||||
toDetail(order) {
|
||||
this.$util.redirectTo("/pages/order/refund/detail", {
|
||||
this.$util.redirectTo("/pages_rush/order/refund/detail", {
|
||||
order_goods_id: order.order_goods_id
|
||||
});
|
||||
},
|
||||
goOrderList() {
|
||||
this.$util.redirectTo('/pages/order/list', {}, 'redirectTo');
|
||||
this.$util.redirectTo('/pages_rush/order/list', {}, 'redirectTo');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ export default {
|
|||
},
|
||||
onShow() {
|
||||
// 判断登录
|
||||
if (!this.$util.checkToken('/pages/order/logistics?order_id=' + this.orderId)) return;
|
||||
if (!this.$util.checkToken('/pages_rush/order/logistics?order_id=' + this.orderId)) return;
|
||||
this.getPackageInfo();
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -126,7 +126,7 @@ export default {
|
|||
},
|
||||
editLogistics(item) {
|
||||
uni.setStorageSync('editLogistics', JSON.stringify(item));
|
||||
this.$util.redirectTo('/pages/order/edit_logistics');
|
||||
this.$util.redirectTo('/pages_rush/order/edit_logistics');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@
|
|||
}
|
||||
},
|
||||
redirectTo: function(e, t, n) {
|
||||
for (var o = e, i = ["/pages/index/index", "/pages/goods/list", "/pages/order/list",
|
||||
for (var o = e, i = ["/pages/index/index", "/pages/goods/list", "/pages_rush/order/list",
|
||||
"/pages/my/index", "/pages/member/list"
|
||||
], a = 0; a < i.length; a++)
|
||||
if (-1 != e.indexOf(i[a])) return void uni.switchTab({
|
||||
|
|
@ -4146,7 +4146,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/list",
|
||||
path: "/pages_rush/order/list",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4175,7 +4175,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/adjust_price",
|
||||
path: "/pages_rush/order/adjust_price",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4196,7 +4196,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/address_update",
|
||||
path: "/pages_rush/order/address_update",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4217,7 +4217,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/delivery",
|
||||
path: "/pages_rush/order/delivery",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4238,7 +4238,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/local_delivery",
|
||||
path: "/pages_rush/order/local_delivery",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4259,7 +4259,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/basis",
|
||||
path: "/pages_rush/order/detail/basis",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4280,7 +4280,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/store",
|
||||
path: "/pages_rush/order/detail/store",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4301,7 +4301,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/local",
|
||||
path: "/pages_rush/order/detail/local",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4322,7 +4322,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/virtual",
|
||||
path: "/pages_rush/order/detail/virtual",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4343,7 +4343,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/logistics",
|
||||
path: "/pages_rush/order/logistics",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4364,7 +4364,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/edit_logistics",
|
||||
path: "/pages_rush/order/edit_logistics",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4385,7 +4385,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/list",
|
||||
path: "/pages_rush/order/refund/list",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4406,7 +4406,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/detail",
|
||||
path: "/pages_rush/order/refund/detail",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4427,7 +4427,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/refuse",
|
||||
path: "/pages_rush/order/refund/refuse",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4448,7 +4448,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/agree",
|
||||
path: "/pages_rush/order/refund/agree",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4469,7 +4469,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/take_delivery",
|
||||
path: "/pages_rush/order/refund/take_delivery",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4490,7 +4490,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/transfer",
|
||||
path: "/pages_rush/order/refund/transfer",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -464,7 +464,7 @@
|
|||
}
|
||||
},
|
||||
redirectTo: function(e, t, n) {
|
||||
for (var o = e, i = ["/pages/index/index", "/pages/goods/list", "/pages/order/list",
|
||||
for (var o = e, i = ["/pages/index/index", "/pages/goods/list", "/pages_rush/order/list",
|
||||
"/pages/my/index", "/pages/member/list"
|
||||
], a = 0; a < i.length; a++)
|
||||
if (-1 != e.indexOf(i[a])) return void uni.switchTab({
|
||||
|
|
@ -4146,7 +4146,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/list",
|
||||
path: "/pages_rush/order/list",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4175,7 +4175,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/adjust_price",
|
||||
path: "/pages_rush/order/adjust_price",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4196,7 +4196,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/address_update",
|
||||
path: "/pages_rush/order/address_update",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4217,7 +4217,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/delivery",
|
||||
path: "/pages_rush/order/delivery",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4238,7 +4238,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/local_delivery",
|
||||
path: "/pages_rush/order/local_delivery",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4259,7 +4259,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/basis",
|
||||
path: "/pages_rush/order/detail/basis",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4280,7 +4280,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/store",
|
||||
path: "/pages_rush/order/detail/store",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4301,7 +4301,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/local",
|
||||
path: "/pages_rush/order/detail/local",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4322,7 +4322,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/detail/virtual",
|
||||
path: "/pages_rush/order/detail/virtual",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4343,7 +4343,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/logistics",
|
||||
path: "/pages_rush/order/logistics",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4364,7 +4364,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/edit_logistics",
|
||||
path: "/pages_rush/order/edit_logistics",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4385,7 +4385,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/list",
|
||||
path: "/pages_rush/order/refund/list",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4406,7 +4406,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/detail",
|
||||
path: "/pages_rush/order/refund/detail",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4427,7 +4427,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/refuse",
|
||||
path: "/pages_rush/order/refund/refuse",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4448,7 +4448,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/agree",
|
||||
path: "/pages_rush/order/refund/agree",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4469,7 +4469,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/take_delivery",
|
||||
path: "/pages_rush/order/refund/take_delivery",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
@ -4490,7 +4490,7 @@
|
|||
windowTop: 0
|
||||
}
|
||||
}, {
|
||||
path: "/pages/order/refund/transfer",
|
||||
path: "/pages_rush/order/refund/transfer",
|
||||
component: {
|
||||
render: function(e) {
|
||||
return e("Page", {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -20,7 +20,7 @@ export default {
|
|||
*/
|
||||
redirectTo(to, param, mode) {
|
||||
let url = to;
|
||||
let tabbarList = ['/pages/index/index', '/pages/goods/list', '/pages/order/list', '/pages/my/index',
|
||||
let tabbarList = ['/pages/index/index', '/pages/goods/list', '/pages_rush/order/list', '/pages/my/index',
|
||||
'/pages/member/list'
|
||||
]
|
||||
for (let i = 0; i < tabbarList.length; i++) {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ export default {
|
|||
jumpFlag: true,
|
||||
list: [
|
||||
{
|
||||
link: '/pages/order/list',
|
||||
link: '/pages_rush/order/list',
|
||||
selectedIconPath: '/static/images/tabbar/order_selected.png',
|
||||
iconPath: '/static/images/tabbar/order.png',
|
||||
text: '订单'
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
title: '商品管理'
|
||||
},
|
||||
{
|
||||
page: '/pages/order/list',
|
||||
page: '/pages_rush/order/list',
|
||||
img: 'upload/uniapp/shop_uniapp/index/manage_order.png',
|
||||
name: 'ORDER_MANAGE',
|
||||
title: '订单管理'
|
||||
|
|
|
|||
|
|
@ -62,21 +62,21 @@
|
|||
<view class="grid margin-top order">
|
||||
<uni-grid :column="5" :showBorder="!1">
|
||||
<uni-grid-item>
|
||||
<view @click="pendingLink('/pages/order/list', 'order_id', 0)" class="grid_item">
|
||||
<view @click="pendingLink('/pages_rush/order/list', 'order_id', 0)" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/wating_pay.png')" mode="aspectFit" />
|
||||
<text class="num" v-if="data.num_data.waitpay > 0">{{ data.num_data.waitpay }}</text>
|
||||
<view class="text">待支付</view>
|
||||
</view>
|
||||
</uni-grid-item>
|
||||
<uni-grid-item>
|
||||
<view @click="pendingLink('/pages/order/list', 'order_id', 1)" class="grid_item">
|
||||
<view @click="pendingLink('/pages_rush/order/list', 'order_id', 1)" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/wating_send.png')" mode="aspectFit" />
|
||||
<text class="num" v-if="data.num_data.waitsend > 0">{{ data.num_data.waitsend }}</text>
|
||||
<view class="text">待发货</view>
|
||||
</view>
|
||||
</uni-grid-item>
|
||||
<uni-grid-item>
|
||||
<view @click="pendingLink('/pages/order/list', 'order_id', 'refunding')" class="grid_item">
|
||||
<view @click="pendingLink('/pages_rush/order/list', 'order_id', 'refunding')" class="grid_item">
|
||||
<image class="image" :src="$util.img('upload/uniapp/shop_uniapp/index/return_money.png')" mode="aspectFit" />
|
||||
<text class="num" v-if="data.num_data.refund > 0">{{ data.num_data.refund }}</text>
|
||||
<view class="text">退款中</view>
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ export default {
|
|||
title: '商品管理'
|
||||
},
|
||||
{
|
||||
page: '/pages/order/list',
|
||||
page: '/pages_rush/order/list',
|
||||
img: 'upload/uniapp/shop_uniapp/index/manage_order.png',
|
||||
name: 'ORDER_MANAGE',
|
||||
title: '订单管理'
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
this.$refs.mescroll.refresh();
|
||||
},
|
||||
onDetail(e){
|
||||
this.$util.redirectTo('/pages/order/detail/basis', {order_id: e})
|
||||
this.$util.redirectTo('/pages_rush/order/detail/basis', {order_id: e})
|
||||
},
|
||||
onEdit(e){
|
||||
this.$util.redirectTo('/pages/invoices/edit/edit', {order_id: e})
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue