anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 c196b9a78eeab696ca0ab39f422cbf9c7690d1c6 2 个父辈 13390325 8a64c392

Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy into wangxiaogang

内嵌 并排对比
正在显示 3 个修改的文件 包含 164 行增加 和 10 行删除
@@ -14,7 +14,9 @@ @@ -14,7 +14,9 @@
14 <div class="myorder_box"> 14 <div class="myorder_box">
15 <!-- 顶部 --> 15 <!-- 顶部 -->
16 <div class="order_top"> 16 <div class="order_top">
17 - <img src="__TMPL__/public/assets/images/left.png" alt=""/> 17 + <a href="javascript:history.back(-1)">
  18 + <img src="__TMPL__/public/assets/images/left.png" alt=""/>
  19 + </a>
18 <p>我的订单</p> 20 <p>我的订单</p>
19 </div> 21 </div>
20 <!-- 头部 --> 22 <!-- 头部 -->
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
  6 + <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
  7 + <meta http-equiv="X-UA-Compatible" content="ie=edge" />
  8 + <title>学考无忧-我的钱包</title>
  9 + <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css" />
  10 + <link rel="stylesheet" href="__TMPL__/public/assets/css/log.css" />
  11 +</head>
  12 +
  13 +<body>
  14 +<!-- 弹窗 -->
  15 +<div class="tx_mask">
  16 + <div class="tx_maskCon">
  17 + <div class="tx_maskConImg">
  18 + <img src="__TMPL__/public/assets/images/70.png" alt="" />
  19 + </div>
  20 + <div class="tx_maskCon2">
  21 + <!-- 输入金额 -->
  22 + <input class="tx_maskInput" type="text" placeholder="输入提现金额" />
  23 + <!-- 确定 -->
  24 + <div class="tx_maskOk">确定</div>
  25 + <!-- 提现说明 -->
  26 + <div class="tx_maskTxt">
  27 + <div class="tx_maskTxt1">
  28 + <div class="tx_maskConImg2">
  29 + <img src="__TMPL__/public/assets/images/69.png" alt="" />
  30 + </div>
  31 + <span>提现说明</span>
  32 + </div>
  33 + <p class="tx_maskTxt2">满1元可提现，提现将扣取0.06%的手续费</p>
  34 + </div>
  35 + </div>
  36 + </div>
  37 +</div>
  38 +<div class="log_nine_top">
  39 + <div class="log_top_co">
  40 + <!-- 顶部 -->
  41 + <div class=" order_top log_nine_top">
  42 + <a href="">
  43 + <img src="__TMPL__/public/assets/images/left2.png" alt="" />
  44 + </a>
  45 + <p style="color:white">我的钱包</p>
  46 + </div>
  47 + </div>
  48 + <!-- 账户余额 -->
  49 + <div class="log_nine_money">
  50 + <div class="nine_money_one">账户余额(元）</div>
  51 + <div class="nine_money_two">2758.21</div>
  52 + </div>
  53 + <div class="nine_money_explain">
  54 + <div class="nine_money_explain_one">
  55 + <div class="nine_money_explain_one_img">
  56 + <img src="__TMPL__/public/assets/images/61.png" alt="" />
  57 + </div>
  58 + <div class="nine_money_explain_title">
  59 + 累计收益：7258.28
  60 + </div>
  61 + </div>
  62 + <div class="nine_money_explain_one">
  63 + <div class="nine_money_explain_two_img">
  64 + <img src="__TMPL__/public/assets/images/62.png" alt="" />
  65 + </div>
  66 + <div class="nine_money_explain_title">
  67 + 正在提现额度：2174.21
  68 + </div>
  69 + </div>
  70 + </div>
  71 +</div>
  72 +<!-- 其他信息 -->
  73 +<div class="log_nine_center">
  74 + 其他信息
  75 +</div>
  76 +<!-- 列表 -->
  77 +<div class="log_nine_list">
  78 + <a href="log_twelve.html">
  79 + <div class="log_nine_list_one">
  80 + <div class="log_nine_list_one_left">
  81 + <div class="log_nine_list_one_left_img">
  82 + <img src="__TMPL__/public/assets/images/63.png" alt="" />
  83 + </div>
  84 + <div class="log_nine_list_one_left_title">
  85 + 邀请名单
  86 + </div>
  87 + </div>
  88 + <div class="log_nine_list_one_right">
  89 + <img src="__TMPL__/public/assets/images/29.png" alt="" />
  90 + </div>
  91 + </div>
  92 + </a>
  93 + <a href="w_mention.html">
  94 + <div class="log_nine_list_one">
  95 + <div class="log_nine_list_one_left">
  96 + <div class="log_nine_list_one_left_img">
  97 + <img src="__TMPL__/public/assets/images/65.png" alt="" />
  98 + </div>
  99 + <div class="log_nine_list_one_left_title">
  100 + 提现明细
  101 + </div>
  102 + </div>
  103 + <div class="log_nine_list_one_right">
  104 + <img src="__TMPL__/public/assets/images/29.png" alt="" />
  105 + </div>
  106 + </div>
  107 + </a>
  108 + <a href="log_ten.html">
  109 + <div class="log_nine_list_one">
  110 + <div class="log_nine_list_one_left">
  111 + <div class="log_nine_list_one_left_img">
  112 + <img src="__TMPL__/public/assets/images/72.png" alt="" />
  113 + </div>
  114 + <div class="log_nine_list_one_left_title">
  115 + 商场盈利
  116 + </div>
  117 + <div class="log_nine_list_one_left_title_add">
  118 + （服务费扣点10%）
  119 + </div>
  120 + </div>
  121 + <div class="log_nine_list_one_right">
  122 + <img src="__TMPL__/public/assets/images/29.png" alt="" />
  123 + </div>
  124 + </div>
  125 + </a>
  126 +</div>
  127 +<!-- 按钮 -->
  128 +<div class="log_seven_btn">
  129 + <div class="log_seven_btn_contant">
  130 + 提现
  131 + </div>
  132 +</div>
  133 +
  134 +<script src="__TMPL__/public/assets/js/jquery.js"></script>
  135 +<script src="__TMPL__/public/assets/js/base.js"></script>
  136 +<script>
  137 + $(".log_seven_btn_contant").click(function() {
  138 + $(".tx_mask").css({
  139 + display: "block"
  140 + });
  141 + });
  142 + $(".tx_maskOk").click(function() {
  143 + $(".tx_mask").css({
  144 + display: "none"
  145 + });
  146 + });
  147 +</script>
  148 +</body>
  149 +
  150 +</html>
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 <div class="w_myStarst_left"> 103 <div class="w_myStarst_left">
104 <ul> 104 <ul>
105 <li> 105 <li>
106 - <a href="w_Dpayment.html"> 106 + <a href="{:url('Order/get_all',array('state'=>4))}">
107 <div class="w_my_leftImg"> 107 <div class="w_my_leftImg">
108 <img src="__TMPL__/public/assets/images/42.png" alt="" /> 108 <img src="__TMPL__/public/assets/images/42.png" alt="" />
109 </div> 109 </div>
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </a> 111 </a>
112 </li> 112 </li>
113 <li> 113 <li>
114 - <a href="w_Ypayment.html"> 114 + <a href="{:url('Order/get_all',array('state'=>2))}">
115 <div class="w_my_leftImg"> 115 <div class="w_my_leftImg">
116 <img src="__TMPL__/public/assets/images/43.png" alt="" /> 116 <img src="__TMPL__/public/assets/images/43.png" alt="" />
117 </div> 117 </div>
@@ -119,24 +119,26 @@ @@ -119,24 +119,26 @@
119 </a> 119 </a>
120 </li> 120 </li>
121 <li> 121 <li>
122 - <a href="w_Ypayment.html"> 122 + <a href="{:url('Order/get_all',array('state'=>3))}">
123 <div class="w_my_leftImg"> 123 <div class="w_my_leftImg">
124 <img src="__TMPL__/public/assets/images/44.png" alt="" /> 124 <img src="__TMPL__/public/assets/images/44.png" alt="" />
125 </div> 125 </div>
126 - <p class="w_my_leftTxt">待收货</p> 126 + <p class="w_my_leftTxt">已完成</p>
127 </a> 127 </a>
128 </li> 128 </li>
129 <li> 129 <li>
130 - <div class="w_my_leftImg">  
131 - <img src="__TMPL__/public/assets/images/45.png" alt="" />  
132 - </div>  
133 - <p class="w_my_leftTxt">退换货</p> 130 + <a href="{:url('Order/get_all',array('state'=>5))}">
  131 + <div class="w_my_leftImg">
  132 + <img src="__TMPL__/public/assets/images/45.png" alt="" />
  133 + </div>
  134 + <p class="w_my_leftTxt">已发货</p>
  135 + </a>
134 </li> 136 </li>
135 </ul> 137 </ul>
136 </div> 138 </div>
137 <div class="w_myStarst_right"> 139 <div class="w_myStarst_right">
138 <div> 140 <div>
139 - <a href="w_my_order.html"> 141 + <a href="{:url('Order/get_all')}">
140 <div class="w_my_leftImg"> 142 <div class="w_my_leftImg">
141 <img src="__TMPL__/public/assets/images/46.png" alt="" /> 143 <img src="__TMPL__/public/assets/images/46.png" alt="" />
142 </div> 144 </div>