Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jcy2004x
ShopXO
提交
3b26ca74
ShopXO
项目概览
jcy2004x
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3b26ca74
编写于
2月 01, 2020
作者:
D
devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序开发
上级
632b237c
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
45 addition
and
140 deletion
+45
-140
application/admin/lang/zh-cn.php
application/admin/lang/zh-cn.php
+0
-135
application/service/BuyService.php
application/service/BuyService.php
+1
-1
public/appmini/old/weixin/pages/buy/buy.js
public/appmini/old/weixin/pages/buy/buy.js
+24
-2
public/appmini/old/weixin/pages/buy/buy.wxml
public/appmini/old/weixin/pages/buy/buy.wxml
+9
-2
public/appmini/old/weixin/pages/buy/buy.wxss
public/appmini/old/weixin/pages/buy/buy.wxss
+11
-0
未找到文件。
application/admin/lang/zh-cn.php
浏览文件 @
3b26ca74
...
...
@@ -126,140 +126,5 @@ return array(
'type'
=>
'string'
,
],
],
// 订单excel导出
'excel_order_title_list'
=>
[
'order_no'
=>
[
'name'
=>
'订单编号'
,
'type'
=>
'string'
,
],
// 收件人信息
'receive_name'
=>
[
'name'
=>
'收件人姓名'
,
'type'
=>
'string'
,
],
'receive_tel'
=>
[
'name'
=>
'收件人电话'
,
'type'
=>
'string'
,
],
'receive_province_name'
=>
[
'name'
=>
'收件人所在省'
,
'type'
=>
'string'
,
],
'receive_city_name'
=>
[
'name'
=>
'收件人所在市'
,
'type'
=>
'string'
,
],
'receive_county_name'
=>
[
'name'
=>
'收件人所在区县'
,
'type'
=>
'string'
,
],
'receive_address'
=>
[
'name'
=>
'收件人详细地址'
,
'type'
=>
'string'
,
],
// 用户留言
'user_note'
=>
[
'name'
=>
'用户留言'
,
'type'
=>
'string'
,
],
// 快递信息
'express_name'
=>
[
'name'
=>
'快递公司'
,
'type'
=>
'string'
,
],
'express_number'
=>
[
'name'
=>
'快递单号'
,
'type'
=>
'string'
,
],
// 支付信息
'payment_name'
=>
[
'name'
=>
'支付方式'
,
'type'
=>
'string'
,
],
'pay_status_name'
=>
[
'name'
=>
'支付状态'
,
'type'
=>
'string'
,
],
// 基础信息
'status_name'
=>
[
'name'
=>
'订单状态'
,
'type'
=>
'string'
,
],
'preferential_price'
=>
[
'name'
=>
'优惠金额'
,
'type'
=>
'string'
,
],
'price'
=>
[
'name'
=>
'订单单价'
,
'type'
=>
'string'
,
],
'total_price'
=>
[
'name'
=>
'订单总价(订单最终价格)'
,
'type'
=>
'string'
,
],
'pay_price'
=>
[
'name'
=>
'已支付金额'
,
'type'
=>
'string'
,
],
'excel_export_items'
=>
[
'name'
=>
'商品信息'
,
'type'
=>
'string'
,
],
'items_count'
=>
[
'name'
=>
'购买总数'
,
'type'
=>
'int'
,
],
'describe'
=>
[
'name'
=>
'描述'
,
'type'
=>
'string'
,
],
// 时间
'confirm_time'
=>
[
'name'
=>
'确认时间'
,
'type'
=>
'string'
,
],
'pay_time'
=>
[
'name'
=>
'支付时间'
,
'type'
=>
'string'
,
],
'delivery_time'
=>
[
'name'
=>
'发货时间'
,
'type'
=>
'string'
,
],
'collect_time'
=>
[
'name'
=>
'完成时间'
,
'type'
=>
'string'
,
],
'cancel_time'
=>
[
'name'
=>
'取消时间'
,
'type'
=>
'string'
,
],
'close_time'
=>
[
'name'
=>
'关闭时间'
,
'type'
=>
'string'
,
],
'add_time'
=>
[
'name'
=>
'创建时间'
,
'type'
=>
'string'
,
],
'upd_time'
=>
[
'name'
=>
'更新时间'
,
'type'
=>
'string'
,
],
// 评论
'user_is_comments_time'
=>
[
'name'
=>
'评论时间'
,
'type'
=>
'string'
,
],
],
);
?>
\ No newline at end of file
application/service/BuyService.php
浏览文件 @
3b26ca74
...
...
@@ -614,7 +614,7 @@ class BuyService
// 站点模式 0销售, 2自提, 4销售+自提, 则其它正常模式
$common_site_type
=
MyC
(
'common_site_type'
,
0
,
true
);
$site_model
=
isset
(
$params
[
'site_model'
])
?
intval
(
$params
[
'site_model'
])
:
-
1
;
$site_model
=
isset
(
$params
[
'site_model'
])
?
intval
(
$params
[
'site_model'
])
:
0
;
// 数据处理
$address
=
null
;
...
...
public/appmini/old/weixin/pages/buy/buy.js
浏览文件 @
3b26ca74
...
...
@@ -17,6 +17,11 @@ Page({
common_order_is_booking
:
0
,
common_site_type
:
0
,
extraction_address
:
[],
site_model
:
0
,
buy_header_nav
:
[
{
name
:
"
快递邮寄
"
,
value
:
0
},
{
name
:
"
自提点取货
"
,
value
:
2
}
],
// 优惠劵
plugins_coupon_data
:
null
,
...
...
@@ -75,6 +80,7 @@ Page({
data
[
'
address_id
'
]
=
this
.
data
.
address_id
;
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
wx
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
...
...
@@ -166,6 +172,7 @@ Page({
data
[
'
payment_id
'
]
=
this
.
data
.
payment_id
;
data
[
'
user_note
'
]
=
this
.
data
.
user_note_value
;
data
[
'
coupon_id
'
]
=
this
.
data
.
plugins_use_coupon_id
;
data
[
'
site_model
'
]
=
this
.
data
.
site_model
;
// 数据验证
var
validation
=
[];
...
...
@@ -264,12 +271,12 @@ Page({
// 地址选择事件
address_event
(
e
)
{
if
(
this
.
data
.
common_site_type
==
0
)
if
(
this
.
data
.
common_site_type
==
0
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
0
)
)
{
wx
.
navigateTo
({
url
:
'
/pages/user-address/user-address?is_back=1
'
});
}
else
if
(
this
.
data
.
common_site_type
==
2
)
}
else
if
(
this
.
data
.
common_site_type
==
2
||
(
this
.
data
.
common_site_type
==
4
&&
this
.
data
.
site_model
==
2
)
)
{
wx
.
navigateTo
({
url
:
'
/pages/extraction-address/extraction-address?is_back=1
'
...
...
@@ -279,4 +286,19 @@ Page({
}
},
// 销售+自提 模式选择事件
buy_header_nav_event
(
e
)
{
// 数据设置
this
.
setData
({
address
:
null
,
address_id
:
null
,
site_model
:
e
.
currentTarget
.
dataset
.
value
||
0
,
});
// 删除地址缓存
wx
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
// 数据初始化
this
.
init
();
},
});
public/appmini/old/weixin/pages/buy/buy.wxml
浏览文件 @
3b26ca74
...
...
@@ -4,8 +4,15 @@
</block>
<block wx:else>
<view wx:if="{{goods_list.length > 0}}" class="page">
<!-- 销售+自提 模式选择 -->
<view wx:if="{{common_site_type == 4}}" class="buy-header-nav oh tc">
<block wx:for="{{buy_header_nav}}" wx:key="key">
<view class="item fl {{site_model == item.value ? 'cr-main' : 'cr-666'}}" data-value="{{item.value}}" bindtap="buy_header_nav_event">{{item.name}}</view>
</block>
</view>
<!-- 地址 -->
<block wx:if="{{common_site_type == 0 || common_site_type == 2}}">
<block wx:if="{{common_site_type == 0 || common_site_type == 2
|| common_site_type == 4
}}">
<view class="address bg-white arrow-right" bindtap="address_event">
<view wx:if="{{address != null}}">
<view class="address-base oh">
...
...
@@ -19,7 +26,7 @@
</view>
</view>
<view wx:if="{{address == null}}" class="no-address cr-888">
请选择地址
{{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}}
</view>
</view>
<view class="address-divider spacing-mb"></view>
...
...
public/appmini/old/weixin/pages/buy/buy.wxss
浏览文件 @
3b26ca74
...
...
@@ -141,6 +141,17 @@
padding: 12rpx;
}
/**
* 销售+自提 模式选择
*/
.buy-header-nav {
background: #e9e9e9;
}
.buy-header-nav .item {
padding: 25rpx 0;
width: 50%;
}
/**
* 插件样式区域
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录