切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
刘朕
5 years ago
提交
7eb52eef550036c3ddb3a14c05cf5d3cff26b8c9
1 个父辈
f3d743ef
1 个管道 的构建
通过
耗费 50 秒
业务员新增邮费设置
变更
7
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
197 行增加
和
7 行删除
app/portal/controller/OrderpageController.php
app/portal/controller/PersonalcenterController.php
public/themes/simpleboot3/portal/orderpage/order_salesman_kd.html
public/themes/simpleboot3/portal/personalcenter/salesman_center.html
public/themes/simpleboot3/portal/personalcenter/salesman_postage.html
public/themes/simpleboot3/public/assets/images/postage.png
public/themes/simpleboot3/public/assets/js/mui.min.js
app/portal/controller/OrderpageController.php
查看文件 @
7eb52ee
...
...
@@ -70,13 +70,11 @@ class OrderpageController extends WeChatBaseController{
$data
[
$key
][
'price0'
]
=
$pricing
[
0
];
$data
[
$key
][
'price1'
]
=
$pricing
[
1
];
}
// 获取订单金额
$money
=
Db
::
name
(
'indent'
)
->
where
(
'id'
,
$indet_id
[
'indet_id'
])
->
find
();
$money
[
'money'
]
=
explode
(
'.'
,
$money
[
'money'
]);
$this
->
assign
(
'money'
,
$money
[
'money'
]);
$this
->
assign
(
'data'
,
$data
);
$courier
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
find
();
$this
->
assign
(
'courier'
,
$courier
[
'courier'
]);
$this
->
assign
(
'indent_id'
,
$indet_id
[
'indet_id'
]);
//判断这个用户所属哪个业务员
$uid
=
cmf_get_current_user_id
();
$user
=
Db
::
name
(
'my_user'
)
->
where
(
'uid'
,
$uid
)
->
find
();
...
...
@@ -89,6 +87,16 @@ class OrderpageController extends WeChatBaseController{
$teacher
=
Db
::
name
(
'my_user'
)
->
where
(
'id'
,
$user
[
'pid'
])
->
find
();
$salesman
=
Db
::
name
(
'my_user'
)
->
where
(
'id'
,
$teacher
[
'pid'
])
->
find
();
}
// 查询业务员是否设置过邮费
$user_postage
=
Db
::
name
(
'user_postage'
)
->
where
(
'user_id'
,
$salesman
[
'uid'
])
->
find
();
if
(
$user_postage
)
{
$courier
=
$user_postage
[
'money'
];
}
else
{
$courier
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
value
(
'courier'
);
}
$this
->
assign
(
'courier'
,
$courier
);
$this
->
assign
(
'indent_id'
,
$indet_id
[
'indet_id'
]);
//查询这个用户下添加的学校
$school
=
Db
::
name
(
'school'
)
->
where
(
"uid"
,
!
empty
(
$salesman
[
'uid'
])
?
$salesman
[
'uid'
]
:
0
)
->
select
()
->
toArray
();
...
...
@@ -152,9 +160,26 @@ class OrderpageController extends WeChatBaseController{
$money
=
Db
::
name
(
'indent'
)
->
where
(
"id ="
.
$indent_id
[
'indet_id'
])
->
find
();
$indent_goods_data
=
Db
::
name
(
'indent_goods'
)
->
where
(
'indent_id'
,
$indent_id
[
'indet_id'
])
->
select
();
$this
->
assign
(
'data'
,
$indent_goods_data
);
$courier
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
find
();
$this
->
assign
(
'courier'
,
$courier
[
'courier'
]);
$money
[
'money'
]
=
$money
[
'money'
]
+
$courier
[
'courier'
];
//判断这个用户所属哪个业务员
$user
=
Db
::
name
(
'my_user'
)
->
where
(
'uid'
,
$uid
)
->
find
();
//当当前用户为老师时
if
(
$user
[
'status'
]
==
3
){
$salesman
=
Db
::
name
(
'my_user'
)
->
where
(
'id'
,
$user
[
'pid'
])
->
find
();
}
//当前用户为学生时
if
(
$user
[
'status'
]
==
4
){
$teacher
=
Db
::
name
(
'my_user'
)
->
where
(
'id'
,
$user
[
'pid'
])
->
find
();
$salesman
=
Db
::
name
(
'my_user'
)
->
where
(
'id'
,
$teacher
[
'pid'
])
->
find
();
}
// 查询业务员是否设置过邮费
$user_postage
=
Db
::
name
(
'user_postage'
)
->
where
(
'user_id'
,
$salesman
[
'uid'
])
->
find
();
if
(
$user_postage
)
{
$courier
=
$user_postage
[
'money'
];
}
else
{
$courier
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
value
(
'courier'
);
}
$this
->
assign
(
'courier'
,
$courier
);
$money
[
'money'
]
=
$money
[
'money'
]
+
$courier
;
$this
->
assign
(
'money'
,
$money
[
'money'
]);
if
(
empty
(
$indent_id
[
'address_id'
])){
$address
=
Db
::
name
(
'address'
)
->
where
(
"uid="
.
$uid
.
" and default_address=1 and delete_time = 0"
)
->
find
();
...
...
app/portal/controller/PersonalcenterController.php
查看文件 @
7eb52ee
...
...
@@ -872,7 +872,59 @@ class PersonalcenterController extends WeChatBaseController{
}
public
function
salesman_postage
()
{
if
(
$this
->
request
->
isAjax
())
{
$user_id
=
cmf_get_current_user_id
();
$money
=
$this
->
request
->
param
(
'money'
);
$my_user
=
Db
::
name
(
'my_user'
)
->
where
(
'uid'
,
$user_id
)
->
find
();
if
(
$my_user
[
'status'
]
!=
2
)
{
$this
->
error
(
'无法访问该页面'
);
}
if
(
empty
(
$money
))
{
$this
->
error
(
'请设置邮费金额'
);
}
// 获取业务员配置的邮费,如未配置过,则新增一条记录
$user_postage
=
Db
::
name
(
'user_postage'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
if
(
!
$user_postage
)
{
$insert
=
[
'user_id'
=>
$user_id
,
'money'
=>
$money
,
'createtime'
=>
time
(),
'updatetime'
=>
time
()
];
$result
=
Db
::
name
(
'user_postage'
)
->
insertGetId
(
$insert
);
}
else
{
$result
=
true
;
if
(
$money
!=
$user_postage
[
'money'
])
{
$update
=
[
'id'
=>
$user_postage
[
'id'
],
'money'
=>
$money
,
'updatetime'
=>
time
()
];
$result
=
Db
::
name
(
'user_postage'
)
->
update
(
$update
);
}
}
if
(
!
$result
)
{
$this
->
error
(
'邮费设置失败'
);
}
$this
->
success
(
'邮费设置成功'
);
}
else
{
$user_id
=
cmf_get_current_user_id
();
$my_user
=
Db
::
name
(
'my_user'
)
->
where
(
'uid'
,
$user_id
)
->
find
();
if
(
$my_user
[
'status'
]
!=
2
)
{
$this
->
error
(
'无法访问该页面'
);
}
// 获取业务员配置的邮费,如未配置过,则使用平台配置的邮费
$user_postage
=
Db
::
name
(
'user_postage'
)
->
where
(
'user_id'
,
$user_id
)
->
find
();
if
(
!
$user_postage
)
{
$postage_money
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
value
(
'courier'
);
}
else
{
$postage_money
=
$user_postage
[
'money'
];
}
$this
->
assign
(
'money'
,
$postage_money
);
return
$this
->
fetch
();
}
}
...
...
public/themes/simpleboot3/portal/orderpage/order_salesman_kd.html
查看文件 @
7eb52ee
...
...
@@ -23,6 +23,10 @@
background-size
:
100%
100%
;
background-image
:
url('__TMPL__/public/assets/images/71.png')
;
}
.order_addressYes
{
padding-top
:
1.5rem
;
margin-top
:
0
;
}
</style>
</head>
...
...
public/themes/simpleboot3/portal/personalcenter/salesman_center.html
查看文件 @
7eb52ee
...
...
@@ -45,6 +45,21 @@
</div>
</div>
</a>
<a
href=
"{:url('Personalcenter/salesman_postage')}"
>
<div
class=
"log_one_list_one"
>
<div
class=
"log_one_list_left"
>
<div
class=
"log_one_list_img"
>
<img
src=
"__TMPL__/public/assets/images/postage.png"
alt=
""
/>
</div>
<div
class=
"log_one_list_word"
>
邮费设置
</div>
</div>
<div
class=
"log_one_list_right"
>
<img
src=
"__TMPL__/public/assets/images/29.png"
alt=
""
/>
</div>
</div>
</a>
<a
href=
"{:url('OrderSalesman/get_all')}"
>
<div
class=
"log_one_list_one"
>
<div
class=
"log_one_list_left"
>
...
...
public/themes/simpleboot3/portal/personalcenter/salesman_postage.html
0 → 100644
查看文件 @
7eb52ee
<!DOCTYPE html>
<html
lang=
"en"
>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html;charset=UTF-8"
/>
<meta
content=
"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
name=
"viewport"
/>
<meta
http-equiv=
"X-UA-Compatible"
content=
"ie=edge"
/>
<title>
学考无忧-邮费设置
</title>
<link
rel=
"stylesheet"
href=
"__TMPL__/public/assets/css/mui.min.css"
>
<link
rel=
"stylesheet"
href=
"__TMPL__/public/assets/css/mui.picker.min.css"
>
<link
rel=
"stylesheet"
href=
"__TMPL__/public/assets/css/reset.css"
/>
<link
rel=
"stylesheet"
href=
"__TMPL__/public/assets/css/log.css"
/>
<style>
.mui-poppicker-header
,
.mui-picker
{
background-color
:
white
;
}
.mui-btn-blue
,
.mui-btn-primary
,
input
[
type
=
submit
]
{
background-color
:
#FF7700
;
border
:
0
;
}
.mui-pciker-list
li
.highlight
{
color
:
#FF7700
;
}
.mui-toast-container
{
bottom
:
50%
;
}
</style>
</head>
<body>
<div
class=
"log_top_co"
>
<!-- 顶部 -->
<div
class=
" order_top log_top_co"
>
<a
href=
"{:url('personalcenter/personal_center')}"
>
<img
src=
"__TMPL__/public/assets/images/left.png"
alt=
""
/>
</a>
<p>
邮费设置
</p>
</div>
</div>
<div
class=
"school_ooo"
>
<!-- 地址信息 -->
<div
class=
"log_four_input"
>
<div
class=
"log_four_input_one"
>
<div
class=
"log_four_input_one_left"
>
邮费
</div>
<div
class=
"log_four_input_one_center"
>
<input
type=
"number"
placeholder=
"请录入邮费"
id=
"money"
value=
"{$money}"
/>
</div>
<div
class=
"log_four_input_one_right"
>
<img
src=
"__TMPL__/public/assets/images/29.png"
alt=
""
/>
</div>
</div>
</div>
</div>
<!-- 按钮 -->
<div
class=
"log_seven_btn"
>
<div
class=
"log_seven_btn_contant"
onclick=
"my_postage()"
>
确定
</div>
</div>
<script
src=
"__TMPL__/public/assets/js/jquery.js"
></script>
<script
src=
"__TMPL__/public/assets/js/base.js"
></script>
<script
src=
"__TMPL__/public/assets/js/mui.min.js"
></script>
<script
src=
"__TMPL__/public/assets/js/mui.picker.min.js"
></script>
<script>
var
money
;
/**
*点击确定提交
*/
function
my_postage
(){
money
=
$
(
'#money'
).
val
();
if
(
money
==
''
){
alert
(
'请输入邮费'
);
}
else
{
$
.
post
(
"{:url('personalcenter/salesman_postage')}"
,{
money
:
money
},
function
(
data
){
mui
.
toast
(
data
.
msg
);
if
(
data
){
setTimeout
(
function
()
{
window
.
location
.
href
=
"{:url('personalcenter/personal_center')}"
;
},
1000
);
}
});
}
}
</script>
</body>
</html>
\ No newline at end of file
...
...
public/themes/simpleboot3/public/assets/images/postage.png
0 → 100644
查看文件 @
7eb52ee
6.1 KB
public/themes/simpleboot3/public/assets/js/mui.min.js
查看文件 @
7eb52ee
请
注册
或
登录
后发表评论