This commit is contained in:
devil_gong 2018-11-26 15:29:21 +08:00
parent 79fa83ae8c
commit 13b1dfff52
13 changed files with 16 additions and 11 deletions

View File

@ -50,7 +50,7 @@ App({
// 请求地址
request_url: "https://demo.shopxo.net/",
request_url: 'http://localhost/project/shopxo/service/',
//request_url: 'http://localhost/project/shopxo/service/',
// 基础信息
application_title: "ShopXO电商系统",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
alipay/images/empty.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
alipay/images/error.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -55,7 +55,7 @@
</view>
<!-- 支付方式 -->
<view a:if="{{payment_list.length > 0}}" class="payment-list bg-white oh">
<view a:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
<view class="item tc fl" a:for="{{payment_list}}">
<view class="item-content br {{(item.selected || '')}}" data-value="{{item.id}}" onTap="payment_event">
<image a:if="{{(item.logo || null) != null}}" class="icon" src="{{item.logo}}" mode="widthFix" />

View File

@ -14,6 +14,7 @@ Page({
is_first: 1,
extension_list: [],
payment_id: 0,
common_order_is_booking: 0,
},
onLoad(params) {
if((params.data || null) == null || app.get_length(JSON.parse(params.data)) == 0)
@ -84,6 +85,7 @@ Page({
payment_list: data.payment_list || [],
extension_list: data.extension_list || [],
data_list_loding_status: 3,
common_order_is_booking: data.common_order_is_booking || 0,
});
if (this.data.address == null || this.data.address_id == 0) {
this.setData({
@ -133,9 +135,11 @@ Page({
// 数据验证
var validation = [
{ fields: 'address_id', msg: '请选择地址' },
{ fields: 'payment_id', msg: '请选择支付方式' }
{ fields: 'address_id', msg: '请选择地址' }
];
if (this.data.common_order_is_booking != 1) {
validation.push({ fields: 'payment_id', msg: '请选择支付方式' });
}
if (app.fields_check(data, validation)) {
// 加载loding
my.showLoading({content: '提交中...'});

View File

@ -61,7 +61,7 @@
<view a:if="{{data_list.length == 0 && data_list_loding_status == 0}}" class="no-data-box tc">
<image src="/images/default-cart-empty.png" mode="widthFix" />
<view class="no-data-tips">购物车空空如也</view>
<button type="default" class="my-btn-default">
<button type="default" class="my-btn-default" hover-class="none">
<navigator url="/pages/index/index" open-type="switchTab" hover-class="none">去逛逛</navigator>
</button>
</view>

View File

@ -69,7 +69,7 @@ Page({
});
}
self.setData({
avatar: user.avatar,
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname,
});
self.get_data();
@ -117,7 +117,7 @@ Page({
user_order_status_list: temp_user_order_status_list,
customer_service_tel: data.customer_service_tel || null,
common_user_center_notice: data.common_user_center_notice || null,
avatar: (data.avatar != null) ? data.avatar : this.data.avatar,
avatar: (data.avatar != null) ? data.avatar : app.data.default_user_head_src,
nickname: (data.nickname != null) ? data.nickname : this.data.nickname,
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,

View File

@ -73,10 +73,11 @@ class BuyController extends CommonController
// 数据返回组装
$result = [
'goods_list' => $ret['data'],
'payment_list' => $payment_list,
'base' => $base,
'extension_list' => $extension_list,
'goods_list' => $ret['data'],
'payment_list' => $payment_list,
'base' => $base,
'extension_list' => $extension_list,
'common_order_is_booking' => (int) MyC('common_order_is_booking', 0),
];
$this->ajaxReturn(L('common_operation_success'), 0, $result);
} else {