切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
1b0022fde8a73f6e9f2b2fa22ea3883d084ba62d
1 个父辈
e98d9c2f
1 个管道 的构建
通过
耗费 1 秒
修改商城订单详情问题
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
89 行增加
和
91 行删除
.idea/workspace.xml
api/index/controller/UserController.php
.idea/workspace.xml
查看文件 @
1b0022f
...
...
@@ -2,7 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"0011664b-87e9-41bd-9f37-18792fb15777"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -28,8 +27,8 @@
<file
leaf-file-name=
"UserController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"281"
>
<caret
line=
"1007"
column=
"7"
lean-forward=
"true"
selection-start-line=
"1007"
selection-start-column=
"7"
selection-end-line=
"1007"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"133"
>
<caret
line=
"674"
column=
"7"
lean-forward=
"true"
selection-start-line=
"674"
selection-start-column=
"7"
selection-end-line=
"674"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -59,44 +58,44 @@
<element
signature=
"e#15025#15481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#17554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17577#17932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17938#18651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18656#20113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20119#20580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20585#23712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23718#24327#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24332#25617#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25623#25980#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25985#26968#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26974#27326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27331#28440#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28446#28801#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28806#30233#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30239#30663#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30668#31279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31285#31781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31786#35497#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32588#33715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35503#35787#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35792#36428#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36449#36768#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36774#37182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37188#37947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37966#38830#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38856#39256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39279#39852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39875#40685#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40691#41290#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41295#42259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42265#42932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42937#43978#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43984#44647#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44652#45679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45686#46117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46122#46700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46706#47135#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47140#47742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47748#48175#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48180#48746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17938#18653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18658#20055#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20061#20522#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20527#23654#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23660#24269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24274#25559#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25565#25922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25927#26910#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26916#27268#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27273#28382#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28388#28743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28748#30175#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30181#30605#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30610#31221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31227#31723#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31728#35439#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32530#33657#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35445#35729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35734#36370#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36391#36710#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36716#37124#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37130#37889#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37908#38772#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38798#39198#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39221#39794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39817#40627#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40633#41232#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41237#42201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42207#42874#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42879#43920#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43926#44589#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44594#45621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45628#46059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46064#46642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46648#47077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47082#47684#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47690#48117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48122#48688#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -190,11 +189,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"231"
/>
<option
name=
"y"
value=
"49"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"302"
/>
<option
name=
"y"
value=
"134"
/>
<option
name=
"width"
value=
"1618"
/>
<option
name=
"height"
value=
"109
8
"
/>
<option
name=
"height"
value=
"109
6
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -356,15 +355,15 @@
<workItem
from=
"1576110549014"
duration=
"12973000"
/>
<workItem
from=
"1576213939457"
duration=
"999000"
/>
<workItem
from=
"1576215244804"
duration=
"6841000"
/>
<workItem
from=
"1576298110450"
duration=
"7
028
000"
/>
<workItem
from=
"1576298110450"
duration=
"7
985
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"57
1116
000"
/>
<option
name=
"totallyTimeSpent"
value=
"57
2073
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
231"
y=
"49"
width=
"1618"
height=
"1098"
extended-state=
"1
"
/>
<frame
x=
"
302"
y=
"134"
width=
"1618"
height=
"1096"
extended-state=
"0
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.18870346"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -783,8 +782,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"281"
>
<caret
line=
"1007"
column=
"7"
lean-forward=
"true"
selection-start-line=
"1007"
selection-start-column=
"7"
selection-end-line=
"1007"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"133"
>
<caret
line=
"674"
column=
"7"
lean-forward=
"true"
selection-start-line=
"674"
selection-start-column=
"7"
selection-end-line=
"674"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -814,44 +813,44 @@
<element
signature=
"e#15025#15481#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#17554#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17577#17932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17938#18651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18656#20113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20119#20580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20585#23712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23718#24327#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24332#25617#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25623#25980#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25985#26968#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26974#27326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27331#28440#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28446#28801#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28806#30233#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30239#30663#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30668#31279#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31285#31781#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31786#35497#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32588#33715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35503#35787#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35792#36428#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36449#36768#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36774#37182#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37188#37947#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37966#38830#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38856#39256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39279#39852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39875#40685#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40691#41290#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41295#42259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42265#42932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42937#43978#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43984#44647#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44652#45679#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45686#46117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46122#46700#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46706#47135#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47140#47742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47748#48175#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48180#48746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17938#18653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18658#20055#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20061#20522#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20527#23654#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23660#24269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24274#25559#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25565#25922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25927#26910#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26916#27268#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27273#28382#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28388#28743#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28748#30175#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30181#30605#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30610#31221#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31227#31723#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31728#35439#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32530#33657#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35445#35729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35734#36370#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36391#36710#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36716#37124#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37130#37889#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37908#38772#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38798#39198#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39221#39794#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39817#40627#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40633#41232#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41237#42201#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42207#42874#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42879#43920#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43926#44589#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44594#45621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45628#46059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46064#46642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46648#47077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47082#47684#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47690#48117#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#48122#48688#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/UserController.php
查看文件 @
1b0022f
...
...
@@ -616,7 +616,7 @@ class UserController extends RestBaseController
* @return goods_name:商品名称
* @return content:留言备注
* @return freight:运费
* @return
total:
价格
* @return
price:商品
价格
* @return num:购买数量
* @return total_sum:总计
* @return shopgoods_id:商品信息
...
...
@@ -646,9 +646,8 @@ class UserController extends RestBaseController
$data
[
'goods_id'
]
=
$res
[
'shopgoods_id'
];
$data
[
'freight'
]
=
$shopgoods_id
[
'freight'
];
$data
[
'price'
]
=
$shopgoods_id
[
'price'
];
$data
[
'total'
]
=
$res
[
'total'
];
$data
[
'total
_sum
'
]
=
$res
[
'total'
];
$data
[
'num'
]
=
$res
[
'num'
];
$data
[
'total_sum'
]
=
$data
[
'total'
]
+
$data
[
'freight'
];
$data
[
'thumbnail'
]
=
cmf_get_image_preview_url
(
$shopgoods_id
[
'thumbnail'
]);
$data
[
'goods_name'
]
=
$shopgoods_id
[
'goods_name'
];
$data
[
'content'
]
=
cmf_replace_content_file_url
(
htmlspecialchars_decode
(
$res
[
'content'
]));
...
...
请
注册
或
登录
后发表评论