From 3fb606b010042fa95cd1ad75c05b387a35519318 Mon Sep 17 00:00:00 2001 From: tianya Date: Thu, 22 Oct 2020 13:57:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E6=A8=A1=E5=9D=97=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B4=AD=E7=89=A9=E8=BD=A6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/templets/index_body.htm | 2 +- src/dede/templets/vote_add.htm | 9 +- src/dede/templets/vote_edit.htm | 9 +- src/dede/templets/vote_getcode.htm | 119 ++++--- src/dede/templets/vote_main.htm | 3 +- src/dede/vote_add.php | 1 + src/dede/vote_edit.php | 1 + src/include/dedevote.class.php | 16 +- src/include/payment/bank.php | 2 +- src/include/payment/cod.php | 2 +- src/install/sql-dfdata.txt | 10 +- src/member/templets/footer.htm | 2 +- src/plus/vote.php | 7 +- src/templets/default/footer.htm | 2 +- src/templets/default/index.htm | 116 +++--- src/templets/default/widget_vote.htm | 12 + src/templets/plus/car.htm | 282 +++++++-------- src/templets/plus/carbuyaction.htm | 354 +++++++++---------- src/templets/plus/download_links_templet.htm | 6 +- src/templets/plus/flink-add.htm | 6 +- src/templets/plus/flink-list.htm | 6 +- src/templets/plus/heightsearch.htm | 6 +- src/templets/plus/plus_foot.htm | 14 - src/templets/plus/plus_footer.htm | 19 + src/templets/plus/plus_header.htm | 23 ++ src/templets/plus/recommend.htm | 6 +- src/templets/plus/rssmap.htm | 6 +- src/templets/plus/shops_action_payment.htm | 45 +-- src/templets/plus/sitemap.htm | 6 +- src/templets/plus/view_msg.htm | 6 +- src/templets/plus/view_msg_catalog.htm | 6 +- src/templets/plus/vote.htm | 73 ++-- 32 files changed, 591 insertions(+), 586 deletions(-) create mode 100644 src/templets/default/widget_vote.htm delete mode 100755 src/templets/plus/plus_foot.htm create mode 100644 src/templets/plus/plus_footer.htm create mode 100644 src/templets/plus/plus_header.htm diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm index 29405129..04d60e91 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -232,7 +232,7 @@ 主程序研发： 织梦团队 + target="_blank" style="color:blue">Dede商业 鸣谢： diff --git a/src/dede/templets/vote_add.htm b/src/dede/templets/vote_add.htm index 18ba9b4d..51b03162 100755 --- a/src/dede/templets/vote_add.htm +++ b/src/dede/templets/vote_add.htm @@ -76,8 +76,7 @@ - + @@ -154,7 +154,10 @@ - + diff --git a/src/dede/templets/vote_edit.htm b/src/dede/templets/vote_edit.htm index c7dc7c42..4272380d 100755 --- a/src/dede/templets/vote_edit.htm +++ b/src/dede/templets/vote_edit.htm @@ -51,14 +51,14 @@
投票管理>>增加投票  管理以往投票内容记录投票管理>>增加投票  
@@ -85,6 +84,7 @@
+
投票名称：
  + + +
- + + +
投票管理>>增加投票  管理以往投票内容记录投票管理>>增加投票  
+ @@ -127,7 +127,10 @@ - + diff --git a/src/dede/templets/vote_getcode.htm b/src/dede/templets/vote_getcode.htm index c26db3f1..fbf9abd5 100755 --- a/src/dede/templets/vote_getcode.htm +++ b/src/dede/templets/vote_getcode.htm @@ -1,67 +1,78 @@ - + + - -获取代码 - + + 获取代码 + + + + -
投票名称：
  + + +
 
- - - - - - -
投票管理>>获取代码
- - - - - - - - - - - - - - - - - + + + + + + - -
在封面或主页模板中使用的标记：
- - - - - - - - - - - -
- - - -
- -
-
在封面或主页模板中使用的JS：
- -
默认生成的表单HTML：
- +
默认生成的表单HTML：
+ -
+
+ + + + \ No newline at end of file diff --git a/src/dede/templets/vote_main.htm b/src/dede/templets/vote_main.htm index cb0767a0..84ee2c35 100755 --- a/src/dede/templets/vote_main.htm +++ b/src/dede/templets/vote_main.htm @@ -43,9 +43,8 @@ 未启用";}else{echo "启用";} ?> - 获取代码 + 代码 更改 -   删除 diff --git a/src/dede/vote_add.php b/src/dede/vote_add.php index 71ecbf31..868a764f 100755 --- a/src/dede/vote_add.php +++ b/src/dede/vote_add.php @@ -16,6 +16,7 @@ if(empty($dopost)) $dopost = ""; if(empty($isarc)) $isarc = 0; if($dopost=="save" && $isarc == 0) { + CheckCSRF(); $starttime = GetMkTime($starttime); $endtime = GetMkTime($endtime); $voteitems = ""; diff --git a/src/dede/vote_edit.php b/src/dede/vote_edit.php index dbda6e11..834dd453 100755 --- a/src/dede/vote_edit.php +++ b/src/dede/vote_edit.php @@ -34,6 +34,7 @@ if($dopost=="delete") } else if($dopost=="saveedit") { + CheckCSRF(); $starttime = GetMkTime($starttime); $endtime = GetMkTime($endtime); $query = "UPDATE `#@__vote` SET votename='$votename', diff --git a/src/include/dedevote.class.php b/src/include/dedevote.class.php index a43be833..1abc4cfe 100755 --- a/src/include/dedevote.class.php +++ b/src/include/dedevote.class.php @@ -133,7 +133,7 @@ class DedeVote { $itembgcolor="#FFFFFF"; } - $items = "\r\n"; + $items = "
\r\n"; $items .= "\r\n"; $items .= "\r\n"; $items .= "\r\n"; @@ -146,16 +146,16 @@ class DedeVote { if($this->VoteInfos['ismore']==0) { - $items.="\r\n"; + $items.="\r\n"; } else { - $items.="\r\n"; + $items.="\r\n"; } } $items .= "\r\n"; } $items.="\r\n
".$arr['name']."
".$arr['name']."
\r\n"; - $items .= "\r\n"; - $items .= "VoteID."'); />
\r\n"; @@ -285,16 +285,14 @@ class DedeVote { $totalcount=1; } - $res = "\r\n"; + $res = "
\r\n"; $res .= "\r\n"; $i=1; foreach($this->VoteNotes as $k=>$arr) { $res .= ""; $c = $arr['count']; - $res .= "\r\n"; + $res .= "\r\n"; $i++; } $res .= "\r\n"; diff --git a/src/include/payment/bank.php b/src/include/payment/bank.php index acba5413..abd6d0ce 100755 --- a/src/include/payment/bank.php +++ b/src/include/payment/bank.php @@ -47,7 +47,7 @@ class bank $cart->clearItem(); $cart->MakeOrders(); if($payment=="member") $button="您可以 返回首页 或去 会员中心"; - else $button="您可以 返回首页 或去 查看订单"; + else $button="您可以 返回首页 或去 查看订单"; return $button; } diff --git a/src/include/payment/cod.php b/src/include/payment/cod.php index ffe9cb8c..54233f9d 100755 --- a/src/include/payment/cod.php +++ b/src/include/payment/cod.php @@ -44,7 +44,7 @@ class Cod $cart = new MemberShops(); $cart->clearItem(); $cart->MakeOrders(); - $button="您可以 返回首页 或去 查看订单"; + $button="您可以 返回首页 或去 查看订单"; return $button; } diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 24eddb94..1ecf6833 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -4106,12 +4106,12 @@ INSERT INTO `#@__sys_module` VALUES (1, '0cce60bc0238aa03804682c801584991', '百 INSERT INTO `#@__sys_module` (`hashcode`, `modname`, `indexname`, `indexurl`, `ismember`, `menustring`) VALUES ('533c5b843ded8752b9857cc7c8e5b455', '得德广告模块', '', '', 0, '\r\n\r\n\r\n\r\n\r\n\r\n'); -INSERT INTO `#@__plus` VALUES (27, '友情链接模块', '', '', '织梦团队', 1, ''), -(24, '文件管理器', '', '', '织梦团队', 1, ''), -(23, '百度新闻', '', '', '织梦团队', 1, 'baidunews.php'), -(28, '投票模块', '', '', '织梦团队', 1, ''), +INSERT INTO `#@__plus` VALUES (27, '友情链接模块', '', '', 'Dede商业', 1, ''), +(24, '文件管理器', '', '', 'Dede商业', 1, ''), +(23, '百度新闻', '', '', 'Dede商业', 1, 'baidunews.php'), +(28, '投票模块', '', '', 'Dede商业', 1, ''), (25, '广告管理', '', '', '织梦官方', 1, ''), -(10, '挑错管理', '', '', '织梦团队', 1, ''); +(10, '挑错管理', '', '', 'Dede商业', 1, ''); INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ('cfg_disable_funs', '模板引擎禁用PHP函数', 7, 'bstring', 'phpinfo,eval,exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,parse_ini_file,show_source,file_put_contents'); INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ('cfg_disable_tags', '模板引擎禁用标签', 7, 'bstring', 'php'); diff --git a/src/member/templets/footer.htm b/src/member/templets/footer.htm index 97e4cdee..ae1eeecd 100644 --- a/src/member/templets/footer.htm +++ b/src/member/templets/footer.htm @@ -1,7 +1,7 @@

- Powered by DedeCMS © 2020 DedeBIZ技术支持
+ Powered by DedeCMS © 2020 DedeBIZ技术支持
  

diff --git a/src/plus/vote.php b/src/plus/vote.php index 6c8c6d35..6232fb53 100755 --- a/src/plus/vote.php +++ b/src/plus/vote.php @@ -37,9 +37,9 @@ $vo = new DedeVote($aid); $rsmsg = ''; -$row = $dsql->GetOne("SELECT * FROM #@__vote WHERE aid='$aid'"); +$row = $dsql->GetOne("SELECT * FROM `#@__vote` WHERE aid='$aid'"); //判断是否允许游客进行投票 -if($row['range'] == 1) +if($row['isallow'] == 1) { if(!$member->IsLogin()) { @@ -74,9 +74,6 @@ $endtime = GetDateMk($vo->VoteInfos['endtime']); $votelist = $vo->GetVoteResult("98%",30,"30%"); - - - //判断是否允许被查看 $admin = new userLogin; if($dopost == 'view') diff --git a/src/templets/default/footer.htm b/src/templets/default/footer.htm index d47694c8..125d46a4 100755 --- a/src/templets/default/footer.htm +++ b/src/templets/default/footer.htm @@ -1,7 +1,7 @@

- Powered by DedeCMS{dede:global.cfg_version/} © 2020 DedeBIZ技术支持
+ Powered by DedeCMS{dede:global.cfg_version/} © 2020 DedeBIZ技术支持
{dede:global.cfg_powerby/}  {dede:global.cfg_beian/}

diff --git a/src/templets/default/index.htm b/src/templets/default/index.htm index b02fc6ba..04f26d68 100755 --- a/src/templets/default/index.htm +++ b/src/templets/default/index.htm @@ -17,7 +17,7 @@ {dede:include filename="top.htm"/} - + {dede:include filename="header.htm"/} {dede:include filename="navbar.htm"/} @@ -30,7 +30,7 @@
-
推荐头条
+
推荐头条
    @@ -48,23 +48,24 @@
".$i."、".$arr['name']." -
".$arr['count']."
-
- - - - - - - - - - - - - - - - {dede:array.Items} - - - - - - - - - {/dede:array} - - - - - - - -
商品列表
选择编号名称数量单价(元)操作
{dede:value.id/}{dede:value.title/} - - {dede:value.units/}{dede:value.price/}删除
-
- 共 {dede:var.carts.cart_count/} 件商品,合计: {dede:var.carts.price_count/}元
-
- - - - - - -
-
- - - - - - - -{dede:include filename="../default/footer.htm"/} - + + +
+
+

购物车

+
+
+
+
+

我的购物车 - 订单号:{dede:var.carts.orders_id/}

+
+ + + + + + + + + + + + + + + + + + + {dede:array.Items} + + + + + + + + + {/dede:array} + + + + + + + +
商品列表
选择编号名称数量单价(元)操作
{dede:value.id/}{dede:value.title/} + + {dede:value.units/}{dede:value.price/}删除
+
+ 共 {dede:var.carts.cart_count/} 件商品,合计: + {dede:var.carts.price_count/}元
+
+ + + + + + +
+
+ +
+
+
+ + + + + + \ No newline at end of file diff --git a/src/templets/plus/carbuyaction.htm b/src/templets/plus/carbuyaction.htm index 91531f0e..d2074fce 100755 --- a/src/templets/plus/carbuyaction.htm +++ b/src/templets/plus/carbuyaction.htm @@ -1,191 +1,187 @@ - + + -购物车 - 下单购买{dede:var.carts.orders_id/} - - - - - + 购物车 - 下单购买{dede:var.carts.orders_id/} + + + + + + + + -
-
-
-

{dede:global.cfg_webname/}

+ +
+
+

商品购买

- -
- IsLogin()){ - ?> - M_UserName; ?>,欢迎您的登录。 会员中心 | 我的资料 | 我的空间 | 退出登录 - -
- -
- -
- -
-
-

商品购买

-
-
- IsLogin()){ ?> - - - - -
您好,欢迎来到本网站, 请 登录 或 注册
- -
- - +
+ IsLogin()){ ?> +
- - - - +
下单购买买家付款确认收货交易结束 您好,欢迎来到本网站, 请 登录 或 注册
- - - - - - - - - - - - - - - - - - - - - - - - -
确认订单信息
订单编号{dede:var.carts.orders_id/}
订单价格{dede:var.carts.price_count/} 元
商品总数{dede:var.carts.cart_count/}件
状态下单
- - - - - - - - - {dede:array.shops_deliveryarr} - - - - - {/dede:array} - - -
配送方式

{dede:value.dname/} 手续费：{dede:value.price/}元 {dede:value.des/}.

- - - - - - - - - - - - - - {dede:array.shops_paymentarr} + + + +
支付方式
 名称描述手续费
+ + + + + + +
下单购买买家付款确认收货交易结束
+ + + + + + + + + + + + + + + + + + + + + + + + +
确认订单信息
订单编号{dede:var.carts.orders_id/}
订单价格{dede:var.carts.price_count/} 元
商品总数{dede:var.carts.cart_count/}件
状态下单
+ + + + + + + - - - - - - - {/dede:array} - - -
配送方式
{dede:value.name/} {dede:value.description/} {dede:value.fee/}元
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
确认订单信息
街道地址 - *请填写街道地址，不能为空!
收货人 - *请填写收货人姓名
E-Mail - 可选，联系您的电子邮箱
手机/电话 - *请填写可以联系到您的电话
邮编 - *请填写格式如：300030
- - - - - - - - - - - - - - - - - - - - - -
确认订单信息
购买留言 -

请在购买留言中填写您对商品的特殊要求，如“我要红色的小码”(100个字以内)

验证码 - - 看不清换一张
-
+ {dede:array.shops_deliveryarr} + + + +

{dede:value.dname/} 手续费：{dede:value.price/}元 + {dede:value.des/}.

+ + + {/dede:array} + + + + + + + + + + + + + + + + + {dede:array.shops_paymentarr} + + + + + + + + {/dede:array} + + +
支付方式
 名称描述手续费
{dede:value.name/} {dede:value.description/} {dede:value.fee/}元
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确认订单信息
街道地址 + *请填写街道地址，不能为空!
收货人 + *请填写收货人姓名
E-Mail + 可选，联系您的电子邮箱
手机/电话 + *请填写可以联系到您的电话
邮编 + *请填写格式如：300030
+ + + + + + + + + + + + + + + + + + + + + +
确认订单信息
购买留言 +

请在购买留言中填写您对商品的特殊要求，如“我要红色的小码”(100个字以内)

+
验证码 + + 看不清换一张 +
+ +
-
- -{dede:include filename="../default/footer.htm"/} + + + \ No newline at end of file diff --git a/src/templets/plus/download_links_templet.htm b/src/templets/plus/download_links_templet.htm index 4de90d3d..e3d2988e 100755 --- a/src/templets/plus/download_links_templet.htm +++ b/src/templets/plus/download_links_templet.htm @@ -41,12 +41,12 @@
-

Powered by DedeCMS © 2004-2020 DesDev Inc.
+

Powered by DedeCMS © 2004-2020 DesDev Inc.

  

diff --git a/src/templets/plus/flink-add.htm b/src/templets/plus/flink-add.htm index c99df743..8db15533 100755 --- a/src/templets/plus/flink-add.htm +++ b/src/templets/plus/flink-add.htm @@ -91,13 +91,13 @@

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

+ Powered by DedeCMS © 2004-2020 DesDev Inc.
  

diff --git a/src/templets/plus/flink-list.htm b/src/templets/plus/flink-list.htm index 74382a5a..aa0ad158 100755 --- a/src/templets/plus/flink-list.htm +++ b/src/templets/plus/flink-list.htm @@ -56,13 +56,13 @@

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

+ Powered by DedeCMS © 2004-2020 DesDev Inc.
  

diff --git a/src/templets/plus/heightsearch.htm b/src/templets/plus/heightsearch.htm index 32687887..65d0ea97 100755 --- a/src/templets/plus/heightsearch.htm +++ b/src/templets/plus/heightsearch.htm @@ -112,14 +112,14 @@
返回顶部

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

+ Powered by DedeCMS © 2004-2020 DesDev Inc.
  

diff --git a/src/templets/plus/plus_foot.htm b/src/templets/plus/plus_foot.htm deleted file mode 100755 index 1222e931..00000000 --- a/src/templets/plus/plus_foot.htm +++ /dev/null @@ -1,14 +0,0 @@ - -
- -
-
-

- Powered by DedeCMS{dede:global.cfg_version/} © 2004-2020 DesDev Inc.

{dede:global.cfg_powerby/}  {dede:global.cfg_beian/}

- -
-
-
\ No newline at end of file diff --git a/src/templets/plus/plus_footer.htm b/src/templets/plus/plus_footer.htm new file mode 100644 index 00000000..3b62ea97 --- /dev/null +++ b/src/templets/plus/plus_footer.htm @@ -0,0 +1,19 @@ + + +
+ +
+ + + + + diff --git a/src/templets/plus/plus_header.htm b/src/templets/plus/plus_header.htm new file mode 100644 index 00000000..ff551b7d --- /dev/null +++ b/src/templets/plus/plus_header.htm @@ -0,0 +1,23 @@ +
+
+
+ +
+
+
+ + +
+ +
+
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/src/templets/plus/recommend.htm b/src/templets/plus/recommend.htm index feff0f88..0e1cc0f7 100755 --- a/src/templets/plus/recommend.htm +++ b/src/templets/plus/recommend.htm @@ -51,14 +51,14 @@
返回顶部

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

+ Powered by DedeCMS © 2004-2020 DesDev Inc.
  

diff --git a/src/templets/plus/rssmap.htm b/src/templets/plus/rssmap.htm index 9b778e1c..fe036d5b 100755 --- a/src/templets/plus/rssmap.htm +++ b/src/templets/plus/rssmap.htm @@ -31,13 +31,13 @@

- Powered by DedeCMS{dede:global name='cfg_version'/} © 2004-2020 DesDev Inc.

{dede:global name='cfg_powerby'/}  {dede:global name='cfg_beian'/}

+ Powered by DedeCMS{dede:global name='cfg_version'/} © 2004-2020 DesDev Inc.
{dede:global name='cfg_powerby'/}  {dede:global name='cfg_beian'/}

diff --git a/src/templets/plus/shops_action_payment.htm b/src/templets/plus/shops_action_payment.htm index 6bb9df17..868f9b5c 100755 --- a/src/templets/plus/shops_action_payment.htm +++ b/src/templets/plus/shops_action_payment.htm @@ -3,40 +3,17 @@ 下单购买 - {dede:var.carts.orders_id/} - - - - + + + + + + - -
-
-
-

{dede:global.cfg_webname/}

-
-
- IsLogin()){ - ?> - 您好,欢迎来到本网站, 请 登录 或 注册 - - M_UserName; ?>,欢迎您的登录。 会员中心 | - 我的资料 | - 我的空间 | - 退出登录 - -
-
-
- - -
-

商品购买

+ +
+

商品购买

@@ -46,7 +23,7 @@
交易结束
- +
@@ -89,6 +66,6 @@ -{dede:include filename="../default/footer.htm"/} + \ No newline at end of file diff --git a/src/templets/plus/sitemap.htm b/src/templets/plus/sitemap.htm index 7d843aab..e2b6ee04 100755 --- a/src/templets/plus/sitemap.htm +++ b/src/templets/plus/sitemap.htm @@ -30,13 +30,13 @@

- Powered by DedeCMS{dede:global name='cfg_version'/} © 2004-2020 DesDev Inc.

{dede:global name='cfg_powerby'/}  {dede:global name='cfg_beian'/}

+ Powered by DedeCMS{dede:global name='cfg_version'/} © 2004-2020 DesDev Inc.
{dede:global name='cfg_powerby'/}  {dede:global name='cfg_beian'/}

diff --git a/src/templets/plus/view_msg.htm b/src/templets/plus/view_msg.htm index 0f4d1d7e..da52b80e 100755 --- a/src/templets/plus/view_msg.htm +++ b/src/templets/plus/view_msg.htm @@ -71,14 +71,14 @@
返回顶部

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

+ Powered by DedeCMS © 2004-2020 DesDev Inc.
  

diff --git a/src/templets/plus/view_msg_catalog.htm b/src/templets/plus/view_msg_catalog.htm index 152f9303..2ddbcf3a 100755 --- a/src/templets/plus/view_msg_catalog.htm +++ b/src/templets/plus/view_msg_catalog.htm @@ -58,14 +58,14 @@
返回顶部

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

+ Powered by DedeCMS © 2004-2020 DesDev Inc.
  

diff --git a/src/templets/plus/vote.htm b/src/templets/plus/vote.htm index 3ba87dda..6281412c 100755 --- a/src/templets/plus/vote.htm +++ b/src/templets/plus/vote.htm @@ -1,51 +1,40 @@ - + + - -<?php echo $cfg_webname?>_投票结果 - - + + <?php echo $cfg_webname?>_投票结果 + + + + + + - -
-
-
-

-
+ + -
-
-
-
-

- - 投票开始时间：　 - 投票结束时间: - 投票人数： -
-
- -
-
- +
+
+

+

+ 投票开始时间：　 + 投票结束时间: + 投票人数： +

+
+
+ +
+
+ +
-
- -
- -
-
-

- Powered by DedeCMS © 2004-2020 DesDev Inc.

  

- -
-
-
+ - + + \ No newline at end of file
确认订单并付款