mirror of
https://gitee.com/zongzhige/shopxo.git
synced 2026-07-07 06:15:29 +08:00
小程序模式
This commit is contained in:
@ -174,6 +174,9 @@ class Common extends Controller
|
||||
|
||||
// 开发模式
|
||||
$this->assign('shopxo_is_develop', config('shopxo.is_develop'));
|
||||
|
||||
// 默认不加载百度地图api
|
||||
$this->assign('is_load_baidu_map_api', 0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -94,6 +94,9 @@ class Site extends Common
|
||||
$this->assign('sitetype_address_list', $address['data']);
|
||||
}
|
||||
|
||||
// 加载百度地图api
|
||||
$this->assign('is_load_baidu_map_api', 1);
|
||||
|
||||
// 编辑器文件存放地址
|
||||
$this->assign('editor_path_type', 'common');
|
||||
|
||||
|
||||
@ -169,12 +169,12 @@
|
||||
</td>
|
||||
<td class="am-hide-sm-only">
|
||||
{{if in_array($v['order_model'], [0,2])}}
|
||||
{{$v.receive_name}}<br />
|
||||
{{$v.receive_tel}}<br />
|
||||
{{$v.receive_province_name}}<br />
|
||||
{{$v.receive_city_name}}<br />
|
||||
{{$v.receive_county_name}}<br />
|
||||
{{$v.receive_address}}
|
||||
{{$v.address_data.name}}<br />
|
||||
{{$v.address_data.tel}}<br />
|
||||
{{$v.address_data.province_name}}<br />
|
||||
{{$v.address_data.city_name}}<br />
|
||||
{{$v.address_data.county_name}}<br />
|
||||
{{$v.address_data.address}}
|
||||
{{else /}}
|
||||
<span class="cr-ddd">无信息</span>
|
||||
{{/if}}
|
||||
@ -305,19 +305,66 @@
|
||||
{{/if}}
|
||||
</dd>
|
||||
|
||||
<dt>地址信息</dt>
|
||||
<dd>
|
||||
{{if in_array($v['order_model'], [0,2])}}
|
||||
{{$v.receive_name}}<br />
|
||||
{{$v.receive_tel}}<br />
|
||||
{{$v.receive_province_name}}
|
||||
{{$v.receive_city_name}}
|
||||
{{$v.receive_county_name}}
|
||||
{{$v.receive_address}}
|
||||
{{else /}}
|
||||
<span class="cr-ddd">无信息</span>
|
||||
{{/if}}
|
||||
</dd>
|
||||
{{if in_array($v['order_model'], [0,2])}}
|
||||
<dt>地址信息</dt>
|
||||
<dd>
|
||||
{{if !empty($v['address_data'])}}
|
||||
{{$v.address_data.name}}<br />
|
||||
{{$v.address_data.tel}}<br />
|
||||
{{$v.address_data.province_name}}
|
||||
{{$v.address_data.city_name}}
|
||||
{{$v.address_data.county_name}}
|
||||
{{$v.address_data.address}}
|
||||
{{else /}}
|
||||
<span class="cr-ddd">无信息</span>
|
||||
{{/if}}
|
||||
</dd>
|
||||
{{/if}}
|
||||
|
||||
{{if $v['order_model'] eq 2}}
|
||||
<dt>取货信息</dt>
|
||||
<dd>
|
||||
{{if !empty($v['extraction_data'])}}
|
||||
<p>
|
||||
<span>取货码:</span>
|
||||
{{if empty($v['extraction_data']['code'])}}
|
||||
<span class="am-text-danger">取货码不存在、请联系管理员</span>
|
||||
{{else /}}
|
||||
<span class="am-badge am-badge-success am-radius">{{$v.extraction_data.code}}</span>
|
||||
{{/if}}
|
||||
</p>
|
||||
{{if !empty($v['extraction_data']['images'])}}
|
||||
<p class="am-margin-top-xs">
|
||||
<img class="am-img-thumbnail" src="{{$v.extraction_data.images}}" alt="取货码" />
|
||||
</p>
|
||||
{{/if}}
|
||||
{{else /}}
|
||||
<span class="cr-ddd">无信息</span>
|
||||
{{/if}}
|
||||
</dd>
|
||||
{{/if}}
|
||||
|
||||
{{if $v['order_model'] eq 3}}
|
||||
<dt>密钥信息</dt>
|
||||
<dd>
|
||||
<ul class="am-list am-margin-bottom-0 fictitious-container">
|
||||
{{foreach $v.items as $goods}}
|
||||
<li class="am-g am-list-item-desced am-list-item-thumbed am-list-item-thumb-left">
|
||||
<div class="am-u-sm-2 am-list-thumb">
|
||||
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
|
||||
</div>
|
||||
<div class="am-u-sm-10 am-list-item-text">
|
||||
{{if empty($goods['fictitious_goods_value'])}}
|
||||
<span>未配置数据</span>
|
||||
{{else /}}
|
||||
{{$goods.fictitious_goods_value|raw}}
|
||||
{{/if}}
|
||||
</div>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</dd>
|
||||
{{/if}}
|
||||
|
||||
<dt>快递信息</dt>
|
||||
<dd>{{if empty($v['express_name'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.express_name}}<br />{{$v.express_number}}{{/if}}</dd>
|
||||
|
||||
@ -47,6 +47,11 @@
|
||||
<!-- 元素拖动 -->
|
||||
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/tdrag/tdrag.min.js"></script>
|
||||
|
||||
<!-- baidu map -->
|
||||
{{if isset($is_load_baidu_map_api) and $is_load_baidu_map_api eq 1}}
|
||||
<script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
|
||||
{{/if}}
|
||||
|
||||
<!-- 隐藏编辑器初始化 -->
|
||||
<script type="text/javascript">
|
||||
var upload_editor = UE.getEditor("upload-editor-view", {
|
||||
|
||||
@ -171,9 +171,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- map -->
|
||||
<script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
|
||||
|
||||
<!-- footer start -->
|
||||
{{include file="public/footer" /}}
|
||||
<!-- footer end -->
|
||||
|
||||
@ -99,6 +99,9 @@ class Buy extends Common
|
||||
$this->assign('extension_data', $ret['data']['extension_data']);
|
||||
$this->assign('params', $params);
|
||||
|
||||
// 加载百度地图api
|
||||
$this->assign('is_load_baidu_map_api', 1);
|
||||
|
||||
// 钩子
|
||||
$this->PluginsHook($ret['data'], $params);
|
||||
|
||||
|
||||
@ -311,6 +311,9 @@ class Common extends Controller
|
||||
$this->assign('home_site_icp', MyC('home_site_icp'));
|
||||
$this->assign('home_site_security_record_name', MyC('home_site_security_record_name'));
|
||||
$this->assign('home_site_security_record_url', MyC('home_site_security_record_url'));
|
||||
|
||||
// 默认不加载百度地图api
|
||||
$this->assign('is_load_baidu_map_api', 0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -138,6 +138,9 @@ class Order extends Common
|
||||
|
||||
$this->assign('data', $data['data'][0]);
|
||||
|
||||
// 加载百度地图api
|
||||
$this->assign('is_load_baidu_map_api', 1);
|
||||
|
||||
// 参数
|
||||
$this->assign('params', $params);
|
||||
return $this->fetch();
|
||||
|
||||
@ -485,9 +485,6 @@
|
||||
{{/foreach}}
|
||||
{{/if}}
|
||||
|
||||
<!-- map -->
|
||||
<script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
|
||||
|
||||
<!-- footer start -->
|
||||
{{include file="public/footer" /}}
|
||||
<!-- footer end -->
|
||||
|
||||
@ -264,15 +264,15 @@
|
||||
<div class="extraction-take-container">
|
||||
<p>
|
||||
<span>取货码:</span>
|
||||
{{if empty($data['extraction_code'])}}
|
||||
{{if empty($data['extraction_data']['code'])}}
|
||||
<span class="am-text-danger">取货码不存在、请联系管理员</span>
|
||||
{{else /}}
|
||||
<span class="am-badge am-badge-success am-radius">{{$data.extraction_code}}</span>
|
||||
<span class="am-badge am-badge-success am-radius">{{$data.extraction_data.code}}</span>
|
||||
{{/if}}
|
||||
</p>
|
||||
{{if !empty($data['extraction_code_images'])}}
|
||||
{{if !empty($data['extraction_data']['images'])}}
|
||||
<p class="am-margin-top-xs">
|
||||
<img class="qrcode-images am-img-thumbnail" src="{{$data.extraction_code_images}}" />
|
||||
<img class="qrcode-images am-img-thumbnail" src="{{$data.extraction_data.images}}" alt="取货码" />
|
||||
</p>
|
||||
{{/if}}
|
||||
</div>
|
||||
@ -285,9 +285,9 @@
|
||||
<div class="am-panel am-panel-default business-panel">
|
||||
<div class="am-panel-hd">{{if $data.order_model eq 2}}取货地址{{else /}}收货地址{{/if}}</div>
|
||||
<div class="am-panel-bd">
|
||||
<span>{{$data.receive_name}}, {{$data.receive_tel}}, {{$data.receive_province_name}} {{$data.receive_city_name}} {{$data.receive_county_name}} {{$data.receive_address}}</span>
|
||||
{{if $data.order_model eq 2 and $data.receive_lng gt 0 and $data.receive_lat gt 0}}
|
||||
<button type="button" class="am-btn am-btn-success am-radius am-icon-map-marker extraction-receive-map-submit" data-lng="{{$data.receive_lng}}" data-lat="{{$data.receive_lat}}"> 查看位置</button>
|
||||
<span>{{$data.address_data.name}}, {{$data.address_data.tel}}, {{$data.address_data.province_name}} {{$data.address_data.city_name}} {{$data.address_data.county_name}} {{$data.address_data.address}}</span>
|
||||
{{if $data.order_model eq 2 and $data.address_data.lng gt 0 and $data.address_data.lat gt 0}}
|
||||
<button type="button" class="am-btn am-btn-success am-radius am-icon-map-marker extraction-receive-map-submit" data-lng="{{$data.address_data.lng}}" data-lat="{{$data.address_data.lat}}"> 查看位置</button>
|
||||
<div class="am-popup" id="popup-extraction-receive-map">
|
||||
<div class="am-popup-inner">
|
||||
<div class="am-popup-hd">
|
||||
@ -507,9 +507,6 @@
|
||||
<!-- content end -->
|
||||
</div>
|
||||
|
||||
<!-- map -->
|
||||
<script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
|
||||
|
||||
<!-- footer start -->
|
||||
{{include file="public/footer" /}}
|
||||
<!-- footer end -->
|
||||
@ -57,6 +57,11 @@
|
||||
<!-- 日期组件 -->
|
||||
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/My97DatePicker/WdatePicker.js"></script>
|
||||
|
||||
<!-- baidu map -->
|
||||
{{if isset($is_load_baidu_map_api) and $is_load_baidu_map_api eq 1}}
|
||||
<script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
|
||||
{{/if}}
|
||||
|
||||
<!-- 隐藏编辑器初始化 -->
|
||||
<script type="text/javascript">
|
||||
var upload_editor = UE.getEditor("upload-editor-view", {
|
||||
|
||||
@ -46,9 +46,6 @@
|
||||
</div>
|
||||
<!-- conntent end -->
|
||||
|
||||
<!-- map -->
|
||||
<!-- <script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script> -->
|
||||
|
||||
<!-- footer start -->
|
||||
{{include file="public/footer" /}}
|
||||
<!-- footer end -->
|
||||
|
||||
@ -953,7 +953,7 @@ class BuyService
|
||||
// 添加订单(收货|取货)地址
|
||||
if(!empty($address))
|
||||
{
|
||||
$ret = self::OrderReceiveAddressInsert($order_id, $params['user']['id'], $address);
|
||||
$ret = self::OrderAddressInsert($order_id, $params['user']['id'], $address);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
Db::rollback();
|
||||
@ -1189,24 +1189,25 @@ class BuyService
|
||||
* @param [int] $user_id [用户id]
|
||||
* @param [array] $address [地址]
|
||||
*/
|
||||
private static function OrderReceiveAddressInsert($order_id, $user_id, $address)
|
||||
private static function OrderAddressInsert($order_id, $user_id, $address)
|
||||
{
|
||||
// 订单收货地址
|
||||
$data = [
|
||||
'order_id' => $order_id,
|
||||
'user_id' => $user_id,
|
||||
'receive_address_id' => isset($address['id']) ? intval($address['id']) : 0,
|
||||
'receive_name' => isset($address['name']) ? $address['name'] : '',
|
||||
'receive_tel' => isset($address['tel']) ? $address['tel'] : '',
|
||||
'receive_province' => isset($address['province']) ? intval($address['province']) : 0,
|
||||
'receive_city' => isset($address['city']) ? intval($address['city']) : 0,
|
||||
'receive_county' => isset($address['county']) ? intval($address['county']) : 0,
|
||||
'receive_address' => isset($address['address']) ? $address['address'] : '',
|
||||
'receive_province_name' => isset($address['province_name']) ? $address['province_name'] : '',
|
||||
'receive_city_name' => isset($address['city_name']) ? $address['city_name'] : '',
|
||||
'receive_county_name' => isset($address['county_name']) ? $address['county_name'] : '',
|
||||
'receive_lng' => isset($address['lng']) ? (float) $address['lng'] : '0.0000000000',
|
||||
'receive_lat' => isset($address['lat']) ? (float) $address['lat'] : '0.0000000000',
|
||||
'address_id' => isset($address['id']) ? intval($address['id']) : 0,
|
||||
'name' => isset($address['name']) ? $address['name'] : '',
|
||||
'tel' => isset($address['tel']) ? $address['tel'] : '',
|
||||
'province' => isset($address['province']) ? intval($address['province']) : 0,
|
||||
'city' => isset($address['city']) ? intval($address['city']) : 0,
|
||||
'county' => isset($address['county']) ? intval($address['county']) : 0,
|
||||
'address' => isset($address['address']) ? $address['address'] : '',
|
||||
'province_name' => isset($address['province_name']) ? $address['province_name'] : '',
|
||||
'city_name' => isset($address['city_name']) ? $address['city_name'] : '',
|
||||
'county_name' => isset($address['county_name']) ? $address['county_name'] : '',
|
||||
'lng' => isset($address['lng']) ? (float) $address['lng'] : '0.0000000000',
|
||||
'lat' => isset($address['lat']) ? (float) $address['lat'] : '0.0000000000',
|
||||
'add_time' => time(),
|
||||
];
|
||||
|
||||
// 订单地址添加前钩子
|
||||
@ -1224,11 +1225,11 @@ class BuyService
|
||||
}
|
||||
|
||||
// 添加订单地址
|
||||
if(Db::name('OrderReceiveAddress')->insertGetId($data) > 0)
|
||||
if(Db::name('OrderAddress')->insertGetId($data) > 0)
|
||||
{
|
||||
return DataReturn('添加成功', 0);
|
||||
}
|
||||
return DataReturn('订单收货地址添加失败', -1);
|
||||
return DataReturn('订单地址添加失败', -1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -679,25 +679,12 @@ class OrderService
|
||||
if(in_array($v['order_model'], [0,2]))
|
||||
{
|
||||
// 销售模式+自提模式 地址信息
|
||||
$receive_address = Db::name('OrderReceiveAddress')->where(['order_id'=>$v['id']])->find();
|
||||
if(!empty($receive_address) && is_array($receive_address))
|
||||
{
|
||||
unset($receive_address['add_time'], $receive_address['upd_time'], $receive_address['id']);
|
||||
$v = array_merge($v, $receive_address);
|
||||
}
|
||||
$v['address_data'] = self::OrderAddressData($v['id']);
|
||||
|
||||
// 自提模式 添加订单取货码
|
||||
if($v['order_model'] == 2)
|
||||
{
|
||||
$extraction_code = Db::name('OrderExtractionCode')->where(['order_id'=>$v['id']])->value('code');
|
||||
if(empty($extraction_code))
|
||||
{
|
||||
$v['extraction_code'] = null;
|
||||
$v['extraction_code_images'] = null;
|
||||
} else {
|
||||
$v['extraction_code'] = $extraction_code;
|
||||
$v['extraction_code_images'] = MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode($extraction_code))]);
|
||||
}
|
||||
$v['extraction_data'] = self::OrdersExtractionData($v['id']);
|
||||
}
|
||||
}
|
||||
|
||||
@ -860,6 +847,59 @@ class OrderService
|
||||
return DataReturn('处理成功', 0, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单自提信息
|
||||
* @author Devil
|
||||
* @blog http://gong.gg/
|
||||
* @version 1.0.0
|
||||
* @date 2019-11-26
|
||||
* @desc description
|
||||
* @param [int] $order_id [订单id]
|
||||
*/
|
||||
private static function OrdersExtractionData($order_id)
|
||||
{
|
||||
$result = [
|
||||
'code' => null,
|
||||
'images' => null,
|
||||
];
|
||||
$code = Db::name('OrderExtractionCode')->where(['order_id'=>$order_id])->value('code');
|
||||
if(!empty($code))
|
||||
{
|
||||
$result['code'] = $code;
|
||||
$result['images'] = MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode($code))]);
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单地址
|
||||
* @author Devil
|
||||
* @blog http://gong.gg/
|
||||
* @version 1.0.0
|
||||
* @date 2019-11-26
|
||||
* @desc description
|
||||
* @param [int] $order_id [订单id]
|
||||
*/
|
||||
private static function OrderAddressData($order_id)
|
||||
{
|
||||
// 销售模式+自提模式 地址信息
|
||||
$data = Db::name('OrderAddress')->where(['order_id'=>$order_id])->find();
|
||||
if(!empty($data) && is_array($data))
|
||||
{
|
||||
// 坐标转换 百度转火星(高德,谷歌,腾讯坐标)
|
||||
if(isset($data['lng']) && isset($data['lat']) && $data['lng'] > 0 && $data['lat'] > 0)
|
||||
{
|
||||
$map = \base\GeoTransUtil::BdToGcj($data['lng'], $data['lat']);
|
||||
if(isset($map['lng']) && isset($map['lat']))
|
||||
{
|
||||
$data['lng_gcj'] = $map['lng'];
|
||||
$data['lat_gcj'] = $map['lat'];
|
||||
}
|
||||
}
|
||||
}
|
||||
return empty($data) ? [] : $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单售后操作名称
|
||||
* @author Devil
|
||||
|
||||
@ -68,7 +68,7 @@ App({
|
||||
// 请求地址
|
||||
request_url: "{{request_url}}",
|
||||
request_url: 'http://tp5-dev.com/',
|
||||
// request_url: 'https://test.shopxo.net/',
|
||||
request_url: 'https://dev.shopxo.net/',
|
||||
|
||||
// 基础信息
|
||||
application_title: "{{application_title}}",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"pages": ["pages/user-order-detail/user-order-detail",
|
||||
"pages": [
|
||||
"pages/index/index",
|
||||
"pages/goods-category/goods-category",
|
||||
"pages/cart/cart",
|
||||
@ -15,7 +15,7 @@
|
||||
"pages/user-address/user-address",
|
||||
"pages/user-address-save/user-address-save",
|
||||
"pages/user-order/user-order",
|
||||
|
||||
"pages/user-order-detail/user-order-detail",
|
||||
"pages/user-order-comments/user-order-comments",
|
||||
"pages/user-faovr/user-faovr",
|
||||
"pages/user-answer-list/user-answer-list",
|
||||
|
||||
@ -13,7 +13,7 @@ Page({
|
||||
},
|
||||
|
||||
onLoad(params) {
|
||||
params['id'] = 3;
|
||||
//params['id'] = 5;
|
||||
this.setData({params: params});
|
||||
this.init();
|
||||
},
|
||||
@ -94,6 +94,31 @@ Page({
|
||||
});
|
||||
},
|
||||
|
||||
// 地图查看
|
||||
address_map_event(e) {
|
||||
if ((this.data.detail.address_data || null) == null)
|
||||
{
|
||||
app.showToast("地址有误");
|
||||
return false;
|
||||
}
|
||||
|
||||
var ads = this.data.detail.address_data;
|
||||
var lng = parseFloat(ads.lng_gcj || 0);
|
||||
var lat = parseFloat(ads.lat_gcj || 0);
|
||||
if (lng <= 0 || lat <= 0) {
|
||||
app.showToast("坐标有误");
|
||||
return false;
|
||||
}
|
||||
|
||||
wx.openLocation({
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
scale: 18,
|
||||
name: ads.alias || '',
|
||||
address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
|
||||
});
|
||||
},
|
||||
|
||||
// 下拉刷新
|
||||
onPullDownRefresh() {
|
||||
this.init();
|
||||
|
||||
@ -1,15 +1,20 @@
|
||||
<view wx:if="{{detail != null}}">
|
||||
<!-- 地址 -->
|
||||
<view wx:if="{{detail.order_model == 0 || detail.order_model == 2}}" class="address bg-white spacing-mb">
|
||||
<view class="address-base oh">
|
||||
<text>{{detail.receive_name}}</text>
|
||||
<text class="fr">{{detail.receive_tel}}</text>
|
||||
<text>{{detail.address_data.name}}</text>
|
||||
<text class="fr">{{detail.address_data.tel}}</text>
|
||||
</view>
|
||||
<view class="address-detail oh">
|
||||
<image class="icon fl" src="/images/user-address.png" mode="widthFix" />
|
||||
<view class="text fr">{{detail.receive_province_name}}{{detail.receive_city_name}}{{detail.receive_county_name}}{{detail.receive_address}}</view>
|
||||
<view class="text fr">
|
||||
{{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}
|
||||
<text wx:if="{{detail.order_model == 2 && (detail.status == 2 || detail.status == 3) && (detail.address_data.lng_gcj || 0) > 0 && (detail.address_data.lat_gcj || 0) > 0}}" class="cr-666 br address-map-submit" bindtap="address_map_event">查看位置</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 商品列表 -->
|
||||
<view class="goods bg-white spacing-mb">
|
||||
<view wx:for="{{detail.items}}" wx:key="item" class="goods-item oh">
|
||||
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
|
||||
@ -29,17 +34,7 @@
|
||||
</view>
|
||||
</navigator>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 订单基础数据 -->
|
||||
<view wx:if="{{detail_list.length > 0}}" class="panel-item spacing-mt">
|
||||
<view class="panel-title">基础数据</view>
|
||||
<view class="panel-content bg-white">
|
||||
<view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
|
||||
<view class="title fl">{{item.name}}</view>
|
||||
<view class="content cr-888 fl br-l">{{item.value}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="order-describe">{{detail.describe}}</view>
|
||||
</view>
|
||||
|
||||
<!-- 虚拟销售数据 -->
|
||||
@ -59,6 +54,29 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 自提信息 -->
|
||||
<view wx:if="{{detail.order_model == 2 && (detail.status == 2 || detail.status == 3) && (detail.extraction_data || null) != null}}" class="panel-item spacing-mt site-extraction">
|
||||
<view class="panel-title">取货信息</view>
|
||||
<view class="panel-content bg-white oh">
|
||||
<view>
|
||||
<text>取货码:</text>
|
||||
<text class="code">{{detail.extraction_data.code || '取货码不存在、请联系管理员'}}</text>
|
||||
</view>
|
||||
<image wx:if="{{(detail.extraction_data.images || null) != null}}" class="br qrcode" src="{{detail.extraction_data.images}}" mode="aspectFill" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 订单基础数据 -->
|
||||
<view wx:if="{{detail_list.length > 0}}" class="panel-item spacing-mt">
|
||||
<view class="panel-title">基础数据</view>
|
||||
<view class="panel-content bg-white">
|
||||
<view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
|
||||
<view class="title fl">{{item.name}}</view>
|
||||
<view class="content cr-888 fl br-l">{{item.value}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 扩展数据 -->
|
||||
<view wx:if="{{extension_data.length > 0}}" class="panel-item spacing-mt extension-list">
|
||||
<view class="panel-title">扩展数据</view>
|
||||
|
||||
@ -50,6 +50,9 @@
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
}
|
||||
.order-describe {
|
||||
padding: 20rpx 10rpx;
|
||||
}
|
||||
|
||||
/*
|
||||
* 面板信息
|
||||
@ -112,4 +115,29 @@
|
||||
}
|
||||
.site-fictitious .panel-content .right-value {
|
||||
width: calc(100% - 100rpx);
|
||||
}
|
||||
|
||||
/*
|
||||
* 自提信息
|
||||
*/
|
||||
.site-extraction .panel-content {
|
||||
padding: 20rpx;
|
||||
}
|
||||
.site-extraction .panel-content .code {
|
||||
background: #5eb95e;
|
||||
color: #fff;
|
||||
}
|
||||
.site-extraction .panel-content .code,
|
||||
.address-map-submit {
|
||||
padding: 1rpx 16rpx;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
.site-extraction .panel-content .qrcode {
|
||||
margin-top: 15rpx;
|
||||
width: 300rpx;
|
||||
height: 300rpx;
|
||||
}
|
||||
.address-map-submit {
|
||||
margin-left: 20rpx;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
@ -34,10 +34,10 @@
|
||||
</navigator>
|
||||
</view>
|
||||
<view class="item-describe tr cr-666">{{item.describe}}</view>
|
||||
<view wx:if="{{item.status <= 3 || (item.status == 4 && item.user_is_comments == 0)}}" class="item-operation tr br-t">
|
||||
<view wx:if="{{item.status == 1 || item.status == 3 || (item.status == 4 && item.user_is_comments == 0) || (item.status == 2 && item.order_model != 2)}}" class="item-operation tr br-t">
|
||||
<button wx:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
|
||||
<button wx:if="{{item.status == 1}}" class="submit-pay cr-666 br" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付</button>
|
||||
<button wx:if="{{item.status == 2}}" class="submit-rush cr-666 br" type="default" size="mini" bindtap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催</button>
|
||||
<button wx:if="{{item.status == 2 && item.order_model != 2}}" class="submit-rush cr-666 br" type="default" size="mini" bindtap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催</button>
|
||||
<button wx:if="{{item.status == 3}}" class="submit-success cr-666 br" type="default" size="mini" bindtap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货</button>
|
||||
<button wx:if="{{item.status == 4 && item.user_is_comments == 0}}" class="submit-success cr-666 br" type="default" size="mini" bindtap="comments_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">评论</button>
|
||||
</view>
|
||||
|
||||
@ -51,4 +51,33 @@ form.am-form .am-form-group { padding-right: 5px; }
|
||||
list-style: none;
|
||||
padding: 1px;
|
||||
margin: 10px 0 0 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 虚拟销售-密钥信息
|
||||
*/
|
||||
.fictitious-container {
|
||||
margin-top: 0 !important;
|
||||
}
|
||||
.fictitious-container li .am-u-sm-2 {
|
||||
width: 60px;
|
||||
padding: 0;
|
||||
}
|
||||
.fictitious-container li .am-u-sm-10 {
|
||||
width: calc(100% - 60px);
|
||||
padding: 0;
|
||||
}
|
||||
.fictitious-container li img {
|
||||
max-width: 40px;
|
||||
}
|
||||
.fictitious-container li {
|
||||
border-color: #eee;
|
||||
}
|
||||
.fictitious-container li:first-child {
|
||||
border-top: 0;
|
||||
padding-top: 0;
|
||||
}
|
||||
.fictitious-container li:last-child {
|
||||
border-bottom: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
Reference in New Issue
Block a user