order
devil_gong
parent
2cf2683ed2
commit
4dda32bf11
|
|
@ -11,12 +11,16 @@
|
|||
</view>
|
||||
|
||||
<view class="goods bg-white spacing-mb">
|
||||
<view a:for="{{detail.goods}}" class="goods-item oh">
|
||||
<view a:for="{{detail.items}}" class="goods-item oh">
|
||||
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}">
|
||||
<image class="goods-image fl" src="{{item.images}}" mode="aspectFill" />
|
||||
<view class="goods-base">
|
||||
<view class="goods-title multi-text">{{item.title}}</view>
|
||||
<view class="goods-attribute cr-888">{{item.attribute}}</view>
|
||||
<block a:if="{{item.attribute != null}}">
|
||||
<view class="goods-attribute cr-888" a:for="{{item.attribute}}" a:for-item="attr">
|
||||
{{attr.attr_type_name}}:{{attr.attr_name}}
|
||||
</view>
|
||||
</block>
|
||||
<view class="oh goods-price">
|
||||
<text class="sales-price">￥{{item.price}}</text>
|
||||
<text a:if="{{item.original_price > 0}}" class="original-price">￥{{item.original_price}}</text>
|
||||
|
|
|
|||
|
|
@ -40,8 +40,9 @@ Page({
|
|||
self.setData({
|
||||
detail: data,
|
||||
detail_list:[
|
||||
{name: "状态", value: data.status_text},
|
||||
{name: "支付状态", value: data.pay_status_text},
|
||||
{name: "订单单 号", value: data.order_no},
|
||||
{name: "状态", value: data.status_name},
|
||||
{name: "支付状态", value: data.pay_status_name},
|
||||
{name: "单价", value: data.price},
|
||||
{name: "总价", value: data.total_price},
|
||||
{name: "优惠", value: data.preferential_price},
|
||||
|
|
|
|||
|
|
@ -1,45 +1,55 @@
|
|||
<view class="search-content bg-white">
|
||||
<view class="search-box oh">
|
||||
<input class="search" type="text" onInput="input_event" placeholder="收件人/电话/单号" />
|
||||
<view class="search-btn tc fr" onTap="search_event">
|
||||
<icon class="search-icon" type="search" size="16" />
|
||||
</view>
|
||||
<view class="search-box oh">
|
||||
<input class="search" type="text" onInput="input_event" placeholder="收件人/电话/单号" />
|
||||
<view class="search-btn tc fr" onTap="search_event">
|
||||
<icon class="search-icon" type="search" size="16" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<scroll-view scroll-y="{{true}}" class="scroll-box" onScrollToLower="scroll_lower" lower-threshold="30">
|
||||
<view class="list-content spacing">
|
||||
<view class="list-item bg-white spacing-mb" a:if="{{data_list.length > 0}}" a:for="{{data_list}}">
|
||||
<view class="item-base oh br-b">
|
||||
<text class="cr-666">{{item.add_time}}</text>
|
||||
<text class="fr cr-main">{{item.status_name}}</text>
|
||||
</view>
|
||||
<navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}">
|
||||
<view a:for="{{item.items}}" a:for-item="items" class="goods-item oh">
|
||||
<image class="goods-image fl" src="{{items.images}}" mode="aspectFill" />
|
||||
<view class="goods-base">
|
||||
<view class="goods-title multi-text">{{items.title}}</view>
|
||||
<view class="goods-attribute cr-888">{{items.attribute}}</view>
|
||||
<view class="oh goods-price">
|
||||
<text class="sales-price">￥{{items.price}}</text>
|
||||
<text a:if="{{items.original_price > 0}}" class="original-price">￥{{items.original_price}}</text>
|
||||
<text class="buy-number">x{{items.buy_number}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</navigator>
|
||||
<view class="item-describe tr cr-666">{{item.describe}}</view>
|
||||
<view a:if="{{item.status <= 3}}" class="item-operation tr br-t">
|
||||
<button a:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" onTap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
|
||||
<button a:if="{{item.status == 1}}" class="submit-pay cr-666" type="default" size="mini" onTap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付</button>
|
||||
<button a:if="{{item.status == 2}}" class="submit-rush cr-666" type="default" size="mini" onTap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催</button>
|
||||
<button a:if="{{item.status == 3}}" class="submit-success cr-666" type="default" size="mini" onTap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货</button>
|
||||
<view class="list-content spacing">
|
||||
<view class="list-item bg-white spacing-mb" a:if="{{data_list.length > 0}}" a:for="{{data_list}}">
|
||||
<view class="item-base oh br-b">
|
||||
<text class="cr-666">{{item.add_time}}</text>
|
||||
<text class="fr cr-main">{{item.status_name}}</text>
|
||||
</view>
|
||||
<navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}">
|
||||
<view a:for="{{item.items}}" a:for-item="detail" class="goods-item oh">
|
||||
<image class="goods-image fl" src="{{detail.images}}" mode="aspectFill" />
|
||||
<view class="goods-base">
|
||||
<view class="goods-title multi-text" >{{detail.title}}</view>
|
||||
<block a:if="{{detail.attribute != null}}">
|
||||
<view class="goods-attribute cr-888" a:for="{{detail.attribute}}" a:for-item="attr">
|
||||
{{attr.attr_type_name}}:{{attr.attr_name}}
|
||||
</view>
|
||||
</block>
|
||||
<view class="oh goods-price">
|
||||
<text class="sales-price">￥{{detail.price}}</text>
|
||||
<text a:if="{{detail.original_price > 0}}" class="original-price">￥{{detail.original_price}}</text>
|
||||
<text class="buy-number">x{{detail.buy_number}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</navigator>
|
||||
<view class="item-describe tr cr-666">{{item.describe}}
|
||||
</view>
|
||||
<view a:if="{{item.status <= 3}}" class="item-operation tr br-t">
|
||||
<button a:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" onTap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消
|
||||
</button>
|
||||
<button a:if="{{item.status == 1}}" class="submit-pay cr-666" type="default" size="mini" onTap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付
|
||||
</button>
|
||||
<button a:if="{{item.status == 2}}" class="submit-rush cr-666" type="default" size="mini" onTap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催
|
||||
</button>
|
||||
<button a:if="{{item.status == 3}}" class="submit-success cr-666" type="default" size="mini" onTap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
<view a:if="{{data_list.length == 0}}">
|
||||
<import src="/pages/common/nodata.axml" />
|
||||
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
|
||||
<import src="/pages/common/nodata.axml" />
|
||||
<template is="nodata" data="{{status: data_list_loding_status}}">
|
||||
</template>
|
||||
</view>
|
||||
</view>
|
||||
<import src="/pages/common/bottom_line.axml" />
|
||||
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
|
||||
</scroll-view>
|
||||
</view>
|
||||
<import src="/pages/common/bottom_line.axml" />
|
||||
<template is="bottom_line" data="{{status: data_bottom_line_status}}">
|
||||
</template>
|
||||
</scroll-view>
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
const app = getApp();
|
||||
|
||||
Page({
|
||||
data: {
|
||||
data_list: [],
|
||||
|
|
|
|||
|
|
@ -83,27 +83,21 @@ class OrderController extends CommonController
|
|||
*/
|
||||
public function Detail()
|
||||
{
|
||||
if(empty($this->data_post['id']))
|
||||
{
|
||||
$this->ajaxReturn('详情id不能为空');
|
||||
}
|
||||
|
||||
// 条件
|
||||
$where = [
|
||||
'id' => intval($this->data_post['id']),
|
||||
'is_delete_time' => 0,
|
||||
'user_id' => $this->user['id'],
|
||||
];
|
||||
$where = OrderService::UserOrderListWhere($this->data_post);
|
||||
|
||||
// 获取数据
|
||||
$data = M('Order')->where($where)->find();
|
||||
if(empty($data))
|
||||
// 获取列表
|
||||
$data_params = array(
|
||||
'limit_start' => 0,
|
||||
'limit_number' => 1,
|
||||
'where' => $where,
|
||||
);
|
||||
$data = OrderService::OrderList($data_params);
|
||||
if(!empty($data['data'][0]))
|
||||
{
|
||||
$this->ajaxReturn(L('common_data_no_exist_error'));
|
||||
$this->ajaxReturn(L('common_operation_success'), 0, $data['data'][0]);
|
||||
}
|
||||
|
||||
$result = $this->SetDataList([$data]);
|
||||
$this->ajaxReturn(L('common_operation_success'), 0, $result[0]);
|
||||
$this->ajaxReturn(L('common_not_data_tips'), -100);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue