From 56fa6e19b10ed652b958bdb18b0a6bbf6da5a55b Mon Sep 17 00:00:00 2001
From: CccccHhhhh <845024850@qq.com>
Date: Mon, 15 Jul 2019 19:03:39 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'master'=20of=20https://gitee.?=
 =?UTF-8?q?com/AC-0308/Interesting=5FPH3=20into=20=E9=99=88=E6=B5=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	project/public/pages/CH/vip.html
---
 project/public/pages/CH/vip.html    | 29 ++++++++++++++++-----------
 project/views/CH/Notpaying.ejs      | 31 +++++++++++++++++++++++++----
 project/views/CH/Order.ejs          |  8 ++++++--
 project/views/CH/Paymenthasbeen.ejs |  8 ++++++--
 4 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/project/public/pages/CH/vip.html b/project/public/pages/CH/vip.html
index 66d0354..8f961db 100644
--- a/project/public/pages/CH/vip.html
+++ b/project/public/pages/CH/vip.html
@@ -652,22 +652,21 @@
                 <nav>
                     <h4>个人中心</h4>
                     <ul class="navUl" >
-                        <li><a href="vip.html" class="borderBottom">会员中心</a></li>
-                        <li><a href="../FYK/me.html" >我的资料</a></li>
-                        <li><a href="../FYK/editinfo.html" >修改资料</a></li>
-                        <li><a href="../FYK/account.html">账户安全</a></li>
-                        <li><a href="../FYK/address.html">收货地址</a></li>
+                        <li><a href="/pages/CH/vip.html" class="borderBottom">会员中心</a></li>
+                        <li><a href="/me">我的资料</a></li>
+                        <li><a href="/editinfo" >修改资料</a></li>
+                        <li><a href="/account">账户安全</a></li>
+                        <li><a href="/address">收货地址</a></li>
                     </ul>
 
                     <h4 class="navH4">我的订单</h4>
                     <ul class="navUl">
-                        <li><a href="Orders.html">所有订单</a></li>
-                        <li><a href="Not%20paying.html">待付款</a></li>
-                        <li><a href="Payment%20has%20been.html">待收货</a></li>
-                        <li><a href="completed.html">已完成</a></li>
-                        <li><a href="../FYK/messages.html">我的收藏</a></li>
-                        <li><a href="show%20oders.html">我的晒单</a></li>
-
+                        <li><a href="/Order" class="borderBottom">所有订单</a></li>
+                        <li><a href="/Notpaying">待付款</a></li>
+                        <li><a href="/Paymenthasbeen">待收货</a></li>
+                        <li><a href="/completed">已完成</a></li>
+                        <li><a href="/collect">我的收藏</a></li>
+                        <li><a href="/showOders">我的晒单</a></li>
                     </ul>
                 </nav>
 
@@ -816,5 +815,11 @@
 <script src="../../frame/less.min.js"></script>
 <script src="../../frame/jquery-3.4.1.min.js"></script>
 <script src="../../frame/bootstrap-3.3.7-dist/js/bootstrap.js"></script>
+<script>
+    function delShop(obj) {
+        console.log(obj);
+        $(obj).parents('.ordersec2').remove()
+    }
+</script>
 </body>
 </html>
diff --git a/project/views/CH/Notpaying.ejs b/project/views/CH/Notpaying.ejs
index ee974fc..09cb1a8 100644
--- a/project/views/CH/Notpaying.ejs
+++ b/project/views/CH/Notpaying.ejs
@@ -143,6 +143,29 @@
         </div>
     </div>
 </div>
+<div class="modal fade" tabindex="-1" role="dialog" id="mymodal1">
+    <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">取消订单</h4>
+            </div>
+            <div class="modal-body">
+                <p>确认是否取消订单？</p>
+                <!--<div class="form-group">-->
+                <!--<label for="username">用户名</label>-->
+                <!--<input type="text" id="username" class="form-control" autofocus>-->
+                <!--</div>-->
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="delShop()">是</button>
+                <button type="button" class="btn btn-default ">否</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- 取消订单 -->
 <% include ../common/nav.ejs%>
 
 <!--这里编写主内容-->
@@ -188,7 +211,7 @@
                         <div class="btnNot">
                             <span class="iconfont icon-cha font1" onclick="delShop(this)"></span><br>
                             <a href="/go_to_checkout"><button class="btn btn-primary payBtn1">去付款</button></a>
-                            <button class="btn btn-primary payBtn2" onclick="delShop(this)">取消订单</button>
+                            <button class="btn btn-primary payBtn2" data-toggle="modal" data-target="#mymodal1">取消订单</button>
                         </div>
                     </div>
                     <div class="lineDiv1"></div>
@@ -213,9 +236,9 @@
 <!--这里引用自己的js-->
 </body>
 <script>
-    function delShop(obj) {
-        console.log(obj);
-        $(obj).parents('.ordersec2').remove()
+    function delShop() {
+        $('.ordersec2')[0].remove()
+
     }
 </script>
 </html>
diff --git a/project/views/CH/Order.ejs b/project/views/CH/Order.ejs
index d28a29a..1f228df 100644
--- a/project/views/CH/Order.ejs
+++ b/project/views/CH/Order.ejs
@@ -49,7 +49,7 @@
                 <!--</div>-->
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">是</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="delShop()">是</button>
                 <button type="button" class="btn btn-default ">否</button>
             </div>
         </div><!-- /.modal-content -->
@@ -210,7 +210,7 @@
                             <div class="btnNot">
                                 <span class="iconfont icon-cha font1" onclick="delShop(this)"></span><br>
                                 <a href="/go_to_checkout"><button class="btn btn-primary payBtn1">去付款</button></a>
-                                <button class="btn btn-primary payBtn2" onclick="delShop(this)" data-toggle="modal" data-target="#mymodal1">取消订单</button>
+                                <button class="btn btn-primary payBtn2" data-toggle="modal" data-target="#mymodal1">取消订单</button>
                             </div>
                         </div>
                         <div class="lineDiv1"></div>
@@ -241,5 +241,9 @@
     // function getOrder() {
     //
     // }
+    function delShop() {
+        $('.ordersec2')[0].remove()
+
+    }
 </script>
 </html>
diff --git a/project/views/CH/Paymenthasbeen.ejs b/project/views/CH/Paymenthasbeen.ejs
index a1b8ed7..5f34513 100644
--- a/project/views/CH/Paymenthasbeen.ejs
+++ b/project/views/CH/Paymenthasbeen.ejs
@@ -72,7 +72,7 @@
                 <!--</div>-->
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">是</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="delShop()">是</button>
                 <button type="button" class="btn btn-default ">否</button>
             </div>
         </div><!-- /.modal-content -->
@@ -234,7 +234,7 @@
                         <div class="btnNot">
                             <span class="iconfont icon-cha font1" onclick="delShop(this)"></span>
                             <button  class="btn btn-success btn-primary payBtn1" data-toggle="modal" data-target="#mymodal">确认收货</button>
-                            <button class="btn btn-primary payBtn2" onclick="delShop(this)" data-toggle="modal" data-target="#mymodal1">取消订单</button>
+                            <button class="btn btn-primary payBtn2"  data-toggle="modal" data-target="#mymodal1">取消订单</button>
 
                         </div>
                     </div>
@@ -266,5 +266,9 @@
     // function getOrder() {
     //
     // }
+    function delShop() {
+        $('.ordersec2')[0].remove()
+
+    }
 </script>
 </html>
-- 
Gitee