Merge branch 'master' of http://gitlab.pubdata.cn/hlm/hlm_pl_mall

app/admin/view/dashboard/h5_activity.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="activity_list"}
         {foreach name="activity_list" item="v"}
-        <div class="data-item" onclick="setLink('/home/article_detail?activity_id={$v.activity_id}')">{$v.activity_title}</div>
+        <div class="data-item" onclick="setLink('/pages/home/activity/Activitydetail?activity_id={$v.activity_id}')">{$v.activity_title}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_article.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="article_list"}
         {foreach name="article_list" item="v"}
-        <div class="data-item" onclick="setLink('/home/article_detail?article_id={$v.article_id}')">{$v.article_title}</div>
+        <div class="data-item" onclick="setLink('/pages/home/article/Articledetail?article_id={$v.article_id}')">{$v.article_title}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_article_class.html

@@ -20,7 +20,7 @@
                     html+='<div data-parent_id="'+res.result[i].ac_id+'">'
                     html+='<div class="data-class-item">'
                     html+='<span class="iconfont"></span>'
-                    html+='<span onclick="setLink(\'/home/article_list?ac_id='+res.result[i].ac_id+'\')">'+res.result[i].ac_name+'</span>'
+                    html+='<span onclick="setLink(\'/pages/home/article/Articlelist?ac_id='+res.result[i].ac_id+'\')">'+res.result[i].ac_name+'</span>'
                     html+='</div>'
                     html+='</div>'
                 }

app/admin/view/dashboard/h5_bonus.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="bonus_list"}
         {foreach name="bonus_list" item="v"}
-        <div class="data-item" onclick="setLink('/home/bonus_detail?bonus_id={$v.bonus_id}')">{$v.bonus_name}</div>
+        <div class="data-item" onclick="setLink('/pages/home/bonus/Detail?bonus_id={$v.bonus_id}')">{$v.bonus_name}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_document.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="document_list"}
         {foreach name="document_list" item="v"}
-        <div class="data-item" onclick="setLink('/home/document?type={$v.document_code}')">{$v.document_title}</div>
+        <div class="data-item" onclick="setLink('/pages/home/article/Document?type={$v.document_code}')">{$v.document_title}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_goods_class.html

@@ -20,7 +20,7 @@
                     html+='<div data-parent_id="'+res.result[i].gc_id+'">'
                     html+='<div class="data-class-item">'
                     html+='<span class="iconfont"></span>'
-                    html+='<span onclick="setLink(\'/home/goodslist?cate_id='+res.result[i].gc_id+'\')">'+res.result[i].gc_name+'</span>'
+                    html+='<span onclick="setLink(\'/pages/home/goodslist/Goodslist?cate_id='+res.result[i].gc_id+'\')">'+res.result[i].gc_name+'</span>'
                     html+='</div>'
                     html+='</div>'
                 }

app/admin/view/dashboard/h5_link.html

@@ -14,31 +14,31 @@
         <div class="link-path" style="display:none"></div>
         <!-- 商城页面 -->
         <div class="link-list" data-id="1">
-            <div class="link-item" onclick="setLink('/home/index')">首页</div>
-            <div class="link-item" onclick="setLink('/home/map')">定位</div>
-            <div class="link-item" onclick="setLink('/home/brand')">品牌</div>
-            <div class="link-item" onclick="setLink('/home/search')">搜索</div>
-            <div class="link-item" onclick="setLink('/home/cart')">购物车</div>
-            <div class="link-item" onclick="setLink('/home/chain_list')">门店列表</div>
-            <div class="link-item" onclick="setLink('/home/chain_nearby')">附近门店</div>
-            <div class="link-item" onclick="setLink('/home/memberregister')">用户注册</div>
-            <div class="link-item" onclick="setLink('/home/memberlogin')">用户登录</div>
-            <div class="link-item" onclick="setLink('/home/memberforget')">忘记密码</div>
-            <div class="link-item" onclick="setLink('/home/sellerlogin')">卖家登录</div>
-            <div class="link-item" onclick="setLink('/chain/login')">门店登录</div>
+            <div class="link-item" onclick="setLink('/pages/home/index/Index')">首页</div>
+            <div class="link-item" onclick="setLink('/pages/home/map/Map')">定位</div>
+            <div class="link-item" onclick="setLink('/pages/home/brand/Brand')">品牌</div>
+            <div class="link-item" onclick="setLink('/pages/home/search/Search')">搜索</div>
+            <div class="link-item" onclick="setLink('/pages/member/cart/Cart')">购物车</div>
+            <div class="link-item" onclick="setLink('/pages/home/goodsdetail/ChainList')">门店列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/chain/ChainNearby')">附近门店</div>
+            <div class="link-item" onclick="setLink('/pages/home/memberregister/Register')">用户注册</div>
+            <div class="link-item" onclick="setLink('/pages/home/memberlogin/Login')">用户登录</div>
+            <div class="link-item" onclick="setLink('/pages/home/memberforget/Forget')">忘记密码</div>
+            <div class="link-item" onclick="setLink('/pages/home/sellerlogin/Login')">卖家登录</div>
+            <div class="link-item" onclick="setLink('/pages/chain/login/Login')">门店登录</div>
         </div>
         <!-- 营销页面 -->
         <div class="link-list" data-id="2" style="display:none">
-            <div class="link-item" onclick="setLink('/home/activity_list')">活动列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/activity/Activitylist')">活动列表</div>
             <div class="link-item" onclick="loadActivity()">活动详情</div>
-            <div class="link-item" onclick="setLink('/home/pintuan_list')">拼团列表</div>
-            <div class="link-item" onclick="setLink('/home/bargain_list')">砍价列表</div>
-            <div class="link-item" onclick="setLink('/home/groupbuy_list')">抢购列表</div>
-            <div class="link-item" onclick="setLink('/home/vr_groupbuy_list')">虚拟抢购列表</div>
-            <div class="link-item" onclick="setLink('/home/presell_list')">预售列表</div>
-            <div class="link-item" onclick="setLink('/member/live_list')">直播列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/pintuan/PintuanList')">拼团列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/bargain/Bargainlist')">砍价列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/groupbuy/GroupBuyList')">抢购列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/vrgroupbuy/GroupBuyList')">虚拟抢购列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/presell/PresellList')">预售列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/live/LiveList')">直播列表</div>
             <div class="link-item" onclick="loadLive()">直播详情</div>
-            <div class="link-item" onclick="setLink('/home/marketmanagelist')">抽奖列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/marketmanage/Marketmanagelist')">抽奖列表</div>
             <div class="link-item" onclick="loadMarket(1)">刮刮卡</div>
             <div class="link-item" onclick="loadMarket(4)">生肖翻翻看</div>
             <div class="link-item" onclick="loadMarket(2)">大转盘</div>
@@ -48,23 +48,23 @@
         </div>
         <!-- 积分页面 -->
         <div class="link-list" data-id="3" style="display:none">
-            <div class="link-item" onclick="setLink('/home/pointsgoods')">积分首页</div>
-            <div class="link-item" onclick="setLink('/home/point_prod')">积分商品</div>
+            <div class="link-item" onclick="setLink('/pages/home/pointsgoods/Index')">积分首页</div>
+            <div class="link-item" onclick="setLink('/pages/home/pointsgoods/PointProd')">积分商品</div>
             <div class="link-item" onclick="loadPointProd()">积分商品详情</div>
-            <div class="link-item" onclick="setLink('/home/point_voucher')">积分代金券</div>
-            <div class="link-item" onclick="setLink('/member/pointscart')">积分购物车</div>
-            <div class="link-item" onclick="setLink('/member/point_signin')">签到送积分</div>
+            <div class="link-item" onclick="setLink('/pages/home/pointsgoods/PointVoucher')">积分代金券</div>
+            <div class="link-item" onclick="setLink('/pages/member/pointscart/Cart')">积分购物车</div>
+            <div class="link-item" onclick="setLink('/pages/member/point/PointSignin')">签到送积分</div>
         </div>
         <!-- 文章页面 -->
         <div class="link-list" data-id="4" style="display:none">
-            <div class="link-item" onclick="setLink('/home/article_list')">文章列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/article_list')">文章列表</div>
             <div class="link-item" onclick="loadArticleClass()">文章分类</div>
             <div class="link-item" onclick="loadArticle">文章详情</div>
             <div class="link-item" onclick="loadDocument()">协议</div>
         </div>
         <!-- 店铺页面 -->
         <div class="link-list" data-id="5" style="display:none">
-            <div class="link-item" onclick="setLink('/home/storelist')">店铺列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/storelist')">店铺列表</div>
             <div class="link-item" onclick="loadStoreClass()">店铺分类</div>
             <div class="link-item" onclick="loadStore(1)">店铺详情</div>
             <div class="link-item" onclick="loadStore(2)">店铺装修</div>
@@ -76,7 +76,7 @@
         </div>
         <!-- 商品页面 -->
         <div class="link-list" data-id="6" style="display:none">
-            <div class="link-item" onclick="setLink('/home/goodslist')">商品列表</div>
+            <div class="link-item" onclick="setLink('/pages/home/goodslist')">商品列表</div>
             <div class="link-item" onclick="loadGoodsClass()">商品分类</div>
             <div class="link-item" onclick="loadGoods(1)">商品详情</div>
             <div class="link-item" onclick="loadGoods(2)">商品视频</div>
@@ -84,45 +84,45 @@
         </div>
         <!-- 会员页面 -->
         <div class="link-list" data-id="7" style="display:none">
-            <div class="link-item" onclick="setLink('/member/index')">用户中心</div>
-            <div class="link-item" onclick="setLink('/member/account')">我的钱包</div>
-            <div class="link-item" onclick="setLink('/member/orderreturn')">退款退货</div>
-            <div class="link-item" onclick="setLink('/member/predeposit_list')">资金明细</div>
-            <div class="link-item" onclick="setLink('/member/recharge_card_list')">充值卡明细</div>
-            <div class="link-item" onclick="setLink('/member/withdraw_list')">提现明细</div>
-            <div class="link-item" onclick="setLink('/member/chat_list')">聊天列表</div>
-            <div class="link-item" onclick="setLink('/member/friend_list')">好友列表</div>
-            <div class="link-item" onclick="setLink('/member/consult_list')">商品咨询列表</div>
-            <div class="link-item" onclick="setLink('/member/recharge_list')">充值明细</div>
-            <div class="link-item" onclick="setLink('/member/voucher_list')">代金券列表</div>
-            <div class="link-item" onclick="setLink('/member/notice_list')">通知列表</div>
-            <div class="link-item" onclick="setLink('/member/setting')">账号设置</div>
-            <div class="link-item" onclick="setLink('/member/profile_set')">个人信息</div>
-            <div class="link-item" onclick="setLink('/member/address_list')">地址列表</div>
-            <div class="link-item" onclick="setLink('/member/bank_list')">提现账户列表</div>
-            <div class="link-item" onclick="setLink('/member/refund_list')">退款列表</div>
-            <div class="link-item" onclick="setLink('/member/vrrefund_list')">虚拟订单退款列表</div>
-            <div class="link-item" onclick="setLink('/member/return_list')">退货列表</div>
-            <div class="link-item" onclick="setLink('/member/invoice_list')">发票列表</div>
-            <div class="link-item" onclick="setLink('/member/inform_list')">举报商家列表</div>
-            <div class="link-item" onclick="setLink('/member/complaint_list')">投诉商家列表</div>
-            <div class="link-item" onclick="setLink('/member/order_list')">我的订单</div>
-            <div class="link-item" onclick="setLink('/member/favorite')">我的收藏</div>
-            <div class="link-item" onclick="setLink('/member/vrorder_list')">我的虚拟订单</div>
-            <div class="link-item" onclick="setLink('/member/evaluate_list')">订单评价列表</div>
-            <div class="link-item" onclick="setLink('/member/inviter_manage')">推广海报</div>
-            <div class="link-item" onclick="setLink('/member/inviter_user')">推广会员</div>
-            <div class="link-item" onclick="setLink('/member/inviter_order')">推广佣金</div>
-            <div class="link-item" onclick="setLink('/member/bargain_list')">用户砍价列表</div>
-            <div class="link-item" onclick="setLink('/member/marketmanagelog')">活动记录</div>
-            <div class="link-item" onclick="setLink('/member/bonusreceive')">红包记录</div>
-            <div class="link-item" onclick="setLink('/member/pointsorder_list')">积分订单列表</div>
-            <div class="link-item" onclick="setLink('/member/point_list')">积分明细</div>
-            <div class="link-item" onclick="setLink('/member/arrivalnotice')">到货通知列表</div>
-            <div class="link-item" onclick="setLink('/member/browse_list')">浏览历史</div>
-            <div class="link-item" onclick="setLink('/member/feedback')">意见反馈</div>
-            <div class="link-item" onclick="setLink('/member/auth')">会员认证</div>
-            <div class="link-item" onclick="setLink('/member/seller_joinin_1')">店铺入驻</div>
+            <div class="link-item" onclick="setLink('/pages/member/index/Index')">用户中心</div>
+            <div class="link-item" onclick="setLink('/pages/member/account/Account')">我的钱包</div>
+            <div class="link-item" onclick="setLink('/pages/member/orderreturn/Orderreturn')">退款退货</div>
+            <div class="link-item" onclick="setLink('/pages/member/predeposit/PredepositList')">资金明细</div>
+            <div class="link-item" onclick="setLink('/pages/member/predeposit/RechargeCardList')">充值卡明细</div>
+            <div class="link-item" onclick="setLink('/pages/member/withdraw/WithdrawList')">提现明细</div>
+            <div class="link-item" onclick="setLink('/pages/member/chat/ChatList')">聊天列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/friend/FriendList')">好友列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/consult/ConsultList')">商品咨询列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/recharge/RechargeList')">充值明细</div>
+            <div class="link-item" onclick="setLink('/pages/member/voucher/VoucherList')">代金券列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/notice/NoticeList')">通知列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/setting/AccountSet')">账号设置</div>
+            <div class="link-item" onclick="setLink('/pages/member/profile/ProfileSet')">个人信息</div>
+            <div class="link-item" onclick="setLink('/pages/member/address/AddressList')">地址列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/bank/BankList')">提现账户列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/refund/RefundList')">退款列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/vrrefund/VrRefundList')">虚拟订单退款列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/return/ReturnList')">退货列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/invoice/InvoiceList')">发票列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/inform/InformList')">举报商家列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/complaint/ComplaintList')">投诉商家列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/order/OrderList')">我的订单</div>
+            <div class="link-item" onclick="setLink('/pages/member/favorite/Favorite')">我的收藏</div>
+            <div class="link-item" onclick="setLink('/pages/member/vrorder/OrderList')">我的虚拟订单</div>
+            <div class="link-item" onclick="setLink('/pages/member/evaluate/EvaluateList')">订单评价列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/inviter/InviterManage')">推广海报</div>
+            <div class="link-item" onclick="setLink('/pages/member/inviter/InviterUser')">推广会员</div>
+            <div class="link-item" onclick="setLink('/pages/member/inviter/InviterOrder')">推广佣金</div>
+            <div class="link-item" onclick="setLink('/pages/member/bargain/Bargainlist')">用户砍价列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/marketmanagelog/Marketmanagelog')">活动记录</div>
+            <div class="link-item" onclick="setLink('/pages/member/bonusreceive/Bonusreceive')">红包记录</div>
+            <div class="link-item" onclick="setLink('/pages/member/pointsorder/OrderList')">积分订单列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/point/PointList')">积分明细</div>
+            <div class="link-item" onclick="setLink('/pages/member/arrivalnotice/Arrivalnotice')">到货通知列表</div>
+            <div class="link-item" onclick="setLink('/pages/member/browse/BrowseList')">浏览历史</div>
+            <div class="link-item" onclick="setLink('/pages/member/feedback/Feedback')">意见反馈</div>
+            <div class="link-item" onclick="setLink('/pages/member/auth/Auth')">会员认证</div>
+            <div class="link-item" onclick="setLink('/pages/member/sellerjoinin/Step1')">店铺入驻</div>
         </div>
 
         <div id="load_html"></div>
@@ -185,19 +185,19 @@
         var path=''
         switch(id){
             case 1:
-                path='%2Fhome%2Fmarketcard'
+                path='%2Fpages%2Fhome%2Fmarketmanage%2FMarketcard'
                 text='刮刮卡'
                 break
             case 2:
-            path='%2Fhome%2Fmarketwheel'
+            path='%2Fpages%2Fhome%2Fmarketmanage%2FMarketwheel'
                 text='大转盘'
                 break
             case 3:
-            path='%2Fhome%2Fmarketegg'
+            path='%2Fpages%2Fhome%2Fmarketmanage%2FMarketegg'
                 text='砸金蛋'
                 break
             case 4:
-            path='%2Fhome%2Fmarketzodiac'
+            path='%2Fpages%2Fhome%2Fmarketmanage%2FMarketzodiac'
                 text='生肖翻翻看'
                 break
         }
@@ -266,7 +266,7 @@
         var callback=''
         switch(id){
             case 1:
-                path='%2Fhome%2Fstoredetail'
+                path='%2Fpages%2Fhome%2Fstoredetail%2FStoredetail'
                 text='店铺详情'
                 break
             case 2:
@@ -274,23 +274,23 @@
                 text='选择店铺'
                 break
             case 3:
-            path='%2Fhome%2Fstoremap'
+            path='%2Fpages%2Fhome%2Fstoredetail%2FStoremap'
                 text='店铺地图'
                 break
             case 4:
-            path='%2Fhome%2Fstoreabout'
+            path='%2Fpages%2Fhome%2Fstoreabout%2FStoreabout'
                 text='店铺介绍'
                 break
             case 5:
-            path='%2Fhome%2Fstorevoucher'
+            path='%2Fpages%2Fhome%2Fstoredetail%2FStoreVoucher'
                 text='店铺代金券'
                 break
             case 6:
-            path='%2Fhome%2Fstore_goodsclass'
+            path='%2Fpages%2Fhome%2Fstoregoodsclass%2FGoodsclass'
                 text='店铺商品分类'
                 break
             case 7:
-            path='%2Fhome%2Fstore_goodslist'
+            path='%2Fpages%2Fhome%2Fstoregoodslist%2FGoodslist'
                 text='店铺商品列表'
                 break
         }
@@ -312,15 +312,15 @@
         var path=''
         switch(id){
             case 1:
-            path='%2Fhome%2Fgoodsdetail'
+            path='%2Fpages%2Fhome%2Fgoodsdetail%2FGoodsdetail'
                 text='商品详情'
                 break
             case 2:
-            path='%2Fhome%2Fgoods_video'
+            path='%2Fpages%2Fhome%2Fgoodsdetail%2FGoodsVideo'
                 text='商品视频'
                 break
             case 3:
-            path='%2Fhome%2Fgoodsconsult'
+            path='%2Fpages%2Fhome%2Fgoodsdetail%2FGoodsConsult'
                 text='商品咨询'
                 break
         }

app/admin/view/dashboard/h5_live.html

@@ -15,7 +15,7 @@
     {else}
     {notempty name="live_apply_list"}
         {foreach name="live_apply_list" item="v"}
-        <div class="data-item" onclick="setLink('/member/live_detail?live_apply_id={$v.live_apply_id}')">{$v.live_apply_name}</div>
+        <div class="data-item" onclick="setLink('/member/live/LiveDetail?live_apply_id={$v.live_apply_id}')">{$v.live_apply_name}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_point_prod.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="prod_list"}
         {foreach name="prod_list" item="v"}
-        <div class="data-item" onclick="setLink('/home/pointsgoods_detail?pgoods_id={$v.pgoods_id}')"><img src="{:pointprod_thumb($v['pgoods_image'])}" />{$v.pgoods_name}</div>
+        <div class="data-item" onclick="setLink('/home/pointsgoods/Detail?pgoods_id={$v.pgoods_id}')"><img src="{:pointprod_thumb($v['pgoods_image'])}" />{$v.pgoods_name}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_special.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="editable_page_list"}
         {foreach name="editable_page_list" item="v"}
-        <div class="data-item" onclick="setLink('{if $Request.param.store_id}/home/store_special?special_id={$v.editable_page_id}&id={$Request.param.store_id}{else}/home/special?special_id={$v.editable_page_id}{/if}')">{$v.editable_page_name}</div>
+        <div class="data-item" onclick="setLink('{if $Request.param.store_id}/home/storespecial/Index?special_id={$v.editable_page_id}&id={$Request.param.store_id}{else}/home/special?special_id={$v.editable_page_id}{/if}')">{$v.editable_page_name}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/admin/view/dashboard/h5_store_class.html

@@ -6,7 +6,7 @@
 <div class="data-list">
     {notempty name="class_list"}
         {foreach name="class_list" item="v"}
-        <div class="data-item" onclick="setLink('/home/storelist?storeclass_id={$v.storeclass_id}')">{$v.storeclass_name}</div>
+        <div class="data-item" onclick="setLink('/home/storelist/Storelist?storeclass_id={$v.storeclass_id}')">{$v.storeclass_name}</div>
         {/foreach}
         {else /}
         <div class="no-data">{$Think.lang.ds_no_record}</div>

app/home/view/default/base/base_joinin.html

@@ -62,6 +62,7 @@
                         <img src="{:ds_get_pic(ATTACH_COMMON,$Think.config.ds_config.site_logowx)}" width="90" height="90" />
                     </div>
                 </li>
+				<!--
                 <li class="app-qrcode">
                     <span class="outline"></span>
                     <span class="blank"></span>
@@ -71,7 +72,7 @@
                         <h3>{$Think.lang.scan_qr_code}</h3>
                         <p>{$Think.lang.download_mobile_client}</p>
                     </div>
-                </li>
+                </li> -->
             </ul>
         </div>
     </div>