邮件修改

admin-index.html

@@ -73,7 +73,7 @@
         </li>
         <li>
           <div class="total-content">
-            <h2 class="total-title">用户已验证</h2>
+            <h2 class="total-title">用户已激活</h2>
             <div class="total-column fL">
               <dl>
                 <dt>今日累计</dt>
@@ -88,7 +88,7 @@
             </div>
           </div>
         </li>
-        <li>
+        <!-- <li>
           <div class="total-content" style="border:none;">
             <h2 class="total-title">用户注册</h2>
             <div class="total-column fL">
@@ -104,7 +104,7 @@
               </dl>
             </div>
           </div>
-        </li>
+        </li> -->
       </ul>
     </div>
     <div class="userRegister" id="userRegister" style="width:100%;height:450px;padding-bottom:20px;"></div>
@@ -127,7 +127,7 @@
             </div>
           </div>
         </li>
-        <li>
+        <!-- <li>
           <div class="total-content">
             <h2 class="total-title">网银在线</h2>
             <div class="total-column fL">
@@ -143,7 +143,7 @@
               </dl>
             </div>
           </div>
-        </li>
+        </li> -->
         <li>
           <div class="total-content">
             <h2 class="total-title">银行转账</h2>
@@ -335,12 +335,12 @@
         trigger: 'axis',
     },
     legend: {
-        data:['仅注册','已验证','合计人数']
+        data:['已激活用户']
     },
     grid: {
         left: '3%',
         right: '4%',
-        bottom: '3%',
+        bottom: '12%',
         containLabel: true
     },
     dataZoom: 
@@ -352,7 +352,11 @@
     xAxis : [
         {
             type : 'category',
-            data : ['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31']
+            splitLine: {
+            show: true,
+            interval: 'auto'
+        },
+            data : ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']
         }
     ],
     yAxis : [
@@ -366,28 +370,31 @@
     ],
     calculable:false,
     series : [
+        // {
+        //     name:'仅注册',
+        //     type:'bar',
+        //     stack: '人数',
+        //     data:[50,110,120,10,70,32,50,110,120,10,70,32,50,110,120,10,70,32,50,110,120,10,70,32,50,110,120,10,70,32,50],
+        //     itemStyle:{
+        //           normal:{color:'#e9af68'}
+        //       }
+        // },
+        // {
+        //     name:'已验证',
+        //     type:'bar',
+        //     stack: '人数',
+        //     data:[30,0,20,50,0,100,30,0,20,50,0,100,30,0,20,50,0,100,30,0,20,50,0,100,30,0,20,50,0,100,30],
+        //     itemStyle:{
+        //           normal:{color:'#009f86'}
+        //       }
+        // },
         {
-            name:'仅注册',
-            type:'bar',
-            stack: '人数',
-            data:[50,110,120,10,70,32,50,110,120,10,70,32,50,110,120,10,70,32,50,110,120,10,70,32,50,110,120,10,70,32,50],
-            itemStyle:{
-                  normal:{color:'#e9af68'}
-              }
-        },
-        {
-            name:'已验证',
-            type:'bar',
-            stack: '人数',
-            data:[30,0,20,50,0,100,30,0,20,50,0,100,30,0,20,50,0,100,30,0,20,50,0,100,30,0,20,50,0,100,30],
-            itemStyle:{
-                  normal:{color:'#009f86'}
-              }
-        },
-        {
-            name:'合计人数',
+            name:'已激活用户',
             type:'line',
-            data:[80,110,140,60,70,132,80,110,140,60,70,132,80,110,140,60,70,132,80,110,140,60,70,132,80,110,140,60,70,132,80,110,140,60,70,132,80],
+            data:[80,110,140,60,70,132,80,110,140,60,70,132],
+
+            // 80,110,140,60,70,132,80,110,140,60,70,132,80,110,140,60,70,132,80,110,140,60,70,132,80
+
             itemStyle:{
                   normal:{color:'#E4575A'}
               }
@@ -411,7 +418,7 @@
     grid: {
         left: '3%',
         right: '4%',
-        bottom: '3%',
+        bottom: '12%',
         containLabel: true
     },
     dataZoom: 
@@ -423,6 +430,10 @@
     xAxis : [
         {
             type : 'category',
+            splitLine: {
+            show: true,
+            interval: 'auto'
+        },
             data : ['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31']
         }
     ],

admin-maillist.html

@@ -86,7 +86,7 @@
                 </tr>
               </thead>
               <tr>
-                <td><a href="#">想成为路面专家，看这几本书！</a></td>
+                <td><a href="admin-maillist-next.html">想成为路面专家，看这几本书！</a></td>
                 <td>通行证</td>
                 <td>2016-02-25</td>
                 <td>
@@ -95,7 +95,7 @@
                 </td>
               </tr>
               <tr>
-                <td><a href="#">想成为路面专家，看这几本书！</a></td>
+                <td><a href="admin-maillist-next.html">想成为路面专家，看这几本书！</a></td>
                 <td>通行证</td>
                 <td>2016-02-25</td>
                 <td>
@@ -104,7 +104,7 @@
                 </td>
               </tr>
               <tr>
-                <td><a href="#">【纵横知道】祝您新春快乐!</a></td>
+                <td><a href="admin-maillist-next.html">【纵横知道】祝您新春快乐!</a></td>
                 <td>通行证</td>
                 <td>2016-02-25</td>
                 <td>
@@ -113,7 +113,7 @@
                 </td>
               </tr>
               <tr>
-                <td><a href="#">【纵横知道】祝您新春快乐!</a></td>
+                <td><a href="admin-maillist-next.html">【纵横知道】祝您新春快乐!</a></td>
                 <td>通行证</td>
                 <td>2016-02-25</td>
                 <td>
@@ -122,7 +122,7 @@
                 </td>
               </tr>
               <tr>
-                <td><a href="#">【纵横知道】祝您新春快乐！公司内部发送</a></td>
+                <td><a href="admin-maillist-next.html">【纵横知道】祝您新春快乐！公司内部发送</a></td>
                 <td>通行证</td>
                 <td>2016-02-25</td>
                 <td>
@@ -131,7 +131,7 @@
                 </td>
               </tr>
               <tr>
-                <td><a href="#">【纵横干货】简单学编办，深入做造价；10、11月价格信息更新。</a></td>
+                <td><a href="admin-maillist-next.html">【纵横干货】简单学编办，深入做造价；10、11月价格信息更新。</a></td>
                 <td>通行证</td>
                 <td>2016-02-25</td>
                 <td>

admin-orderlist.html

@@ -93,7 +93,7 @@
             <th width="100">存入金额</th>
             <th colspan="3" class="text-center bg-success">充值账号(手机/邮箱/称呼)</th>
             <th width="90">支付状态</th>
-            <th width="150">操作</th>
+            <th width="180">操作</th>
           </tr>
         </thead>
         <tr>
@@ -180,6 +180,21 @@
             <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalEdit">手动确认</a>
           </td>
         </tr>
+        <tr>
+          <td>2016031015111432470</td>
+          <td>2016-03-10 15:11:14</td>
+          <td>网银在线</td>
+          <td>100</td>
+          <td></td>
+          <td>注册邮箱 <i class="text-success glyphicon glyphicon-ok-circle"></i></td>
+          <td>称呼</td>
+          <td>交易未支付</td>
+          <td>
+            <a href="#" class="btn btn-info btn-xs" data-toggle="modal" data-target="#myModalGj">改价</a>
+            <a href="#" class="btn btn-danger btn-xs" data-toggle="modal" data-target="#myModal">关闭</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalEdit">手动确认</a>
+          </td>
+        </tr>
       </table>
     </div>
     <nav>
@@ -205,6 +220,39 @@
   <!-- mainWrapper end -->
 </div>
 
+
+<!-- 改价 -->
+<div class="modal fade" id="myModalGj" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="myModalLabel">订单改价</h4>
+      </div>
+      <div class="modal-body">
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label for="adminName" class="col-sm-3 control-label">订单号</label>
+            <div class="col-sm-7">
+              <input type="adminName" class="form-control" id="adminName" value="2017011011063959084">
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="adminPassword" class="col-sm-3 control-label">栏目名称</label>
+            <div class="col-sm-7">
+              <input type="adminPassword" class="form-control" id="adminPassword" placeholder="2">
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- 添加 -->
 <div class="modal fade" id="myModalAdd" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
@@ -243,18 +291,15 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">管理员编辑</h4>
+        <h4 class="modal-title" id="myModalLabel">确认订单</h4>
       </div>
       <div class="modal-body">
         <form class="form-horizontal">
           <div class="form-group">
-            <label for="adminName" class="col-sm-3 control-label">用户名称</label>
-            <div class="col-sm-7">
-              <input type="adminName" class="form-control" id="adminName" value="zlf162543">
-            </div>
+            <label for="adminPassword" class="col-sm-6 control-label"> 确认后,为该用户加入金额：<b>10</b> &nbsp;元</label>
           </div>
           <div class="form-group">
-            <label for="adminPassword" class="col-sm-3 control-label">密码</label>
+            <label for="adminPassword" class="col-sm-3 control-label">操作人</label>
             <div class="col-sm-7">
               <input type="adminPassword" class="form-control" id="adminPassword" value="">
             </div>
@@ -275,10 +320,10 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">确认删除</h4>
+        <h4 class="modal-title" id="myModalLabel">确认关闭</h4>
       </div>
       <div class="modal-body">
-        <p>确定要删除该用户吗？</p>
+        <p>确定要关闭该订单吗？</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default">确认</button>

admin-salelist.html

@@ -94,7 +94,7 @@
           <td>0</td>
           <td>0</td>
           <td>
-            <a href="#" class="btn btn-primary btn-xs">确认提取</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalLq">确认提取</a>
           </td>
         </tr>
         <tr>
@@ -103,7 +103,7 @@
           <td>0</td>
           <td>0</td>
           <td>
-            <a href="#" class="btn btn-primary btn-xs">确认提取</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalLq">确认提取</a>
           </td>
         </tr>
         <tr>
@@ -112,7 +112,7 @@
           <td>0</td>
           <td>0</td>
           <td>
-            <a href="#" class="btn btn-primary btn-xs">确认提取</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalLq">确认提取</a>
           </td>
         </tr>
         <tr>
@@ -121,7 +121,7 @@
           <td>0</td>
           <td>40</td>
           <td>
-            <a href="#" class="btn btn-primary btn-xs">确认提取</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalLq">确认提取</a>
           </td>
         </tr>
         <tr>
@@ -130,7 +130,7 @@
           <td>0</td>
           <td>80</td>
           <td>
-            <a href="#" class="btn btn-primary btn-xs">确认提取</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalLq">确认提取</a>
           </td>
         </tr>
         <tr>
@@ -139,7 +139,7 @@
           <td>0</td>
           <td>140</td>
           <td>
-            <a href="#" class="btn btn-primary btn-xs">确认提取</a>
+            <a href="#" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModalLq">确认提取</a>
           </td>
         </tr>
       </table>
@@ -199,6 +199,38 @@
   </div>
 </div>
 
+<!-- 领取 -->
+<div class="modal fade" id="myModalLq" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title" id="myModalLabel">确认领取金额</h4>
+      </div>
+      <div class="modal-body">
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label for="adminName" class="col-sm-3 control-label">提取金额</label>
+            <div class="col-sm-7">
+              <input type="adminName" class="form-control" id="adminName" placeholder="">
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="" class="col-sm-3 control-label">确认人</label>
+            <div class="col-sm-7">
+              <input type="" class="form-control" id="" placeholder="">
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+        <button type="button" class="btn btn-primary">确认</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 
 </body>
 </html>

css/style.css

@@ -308,12 +308,15 @@ table {
 .total-main ul li{
   float:left;
   margin-right: 15px;
+  border-right: 1px solid #ddd;
+}
+.total-main ul li:last-child{
+  border:none;
 }
 .total-content{
   min-width:225px;
   height:113px;
-  text-align: center;
-  border-right: 1px solid #ddd;
+  text-align: center; 
 }
 .total-content-balanc{
   width:360px;