From 666b32b5ac04f9594763f4b6b34747dc10b66a3f Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Fri, 10 Feb 2023 10:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/config/router.config.js               |  4 +
 ant-design-vue-jeecg/src/permission.js        |  2 +-
 .../shopping/components/Order/placeOrder.vue  | 94 +++++++++++++++++++
 .../views/shopping/pages/gerenzhongxin.vue    | 10 +-
 .../src/views/shopping/pages/pay.vue          | 38 ++++++++
 5 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/shopping/pages/pay.vue

diff --git a/ant-design-vue-jeecg/src/config/router.config.js b/ant-design-vue-jeecg/src/config/router.config.js
index 6f23714e..315632f9 100644
--- a/ant-design-vue-jeecg/src/config/router.config.js
+++ b/ant-design-vue-jeecg/src/config/router.config.js
@@ -660,4 +660,8 @@ export const constantRouterMap = [
     path: '/shopping/news',//这里是你需要设置新窗口打开的页面的路径s
     component: () => import('@/views/shopping/pages/news'),
   },
+  {
+    path: '/shopping/pay',//这里是你需要设置新窗口打开的页面的路径s
+    component: () => import('@/views/shopping/pages/pay'),
+  },
 ]
diff --git a/ant-design-vue-jeecg/src/permission.js b/ant-design-vue-jeecg/src/permission.js
index 84cfc773..94ad8060 100644
--- a/ant-design-vue-jeecg/src/permission.js
+++ b/ant-design-vue-jeecg/src/permission.js
@@ -19,7 +19,7 @@ const whiteList = ['/user/login','/userequip/loginequip','/user/sgin',
   '/sckz/sckzzxt','/sbjm/sbjmsjkzxt','/jxgl/jxglsjkzxt','/szls/szlssjkzxt','/jxdsj/jxdsjzszxt',
   '/ybgl/ybglsjkzxt','/mflgl/mflglsjkzxt','/ddcl/ddclzxt','/ddgl/ddglzxt','/dyhsc/dyhsczxt','/znyy/znyysczhgkzzrj',
   '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt','/shopping/shopHome','/shopping/clothType','/shopping/sirendingzhi',
-  '/shopping/ClothDetail','/shopping/person','/shopping/person','/shopping/order','/shopping/chengyi','/shopping/news'] // no redirect whitelist
+  '/shopping/ClothDetail','/shopping/person','/shopping/person','/shopping/order','/shopping/chengyi','/shopping/news','/shopping/pay'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
index 8558d2a6..6fcf475f 100644
--- a/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
@@ -7,12 +7,76 @@
           <p class="f_14">我们将通过以下手机号码向您发送订单相关信息</p>
           <p class="f_14 phone">17719145652</p>
         </div>
+        <div class="addr">
+          <div class="title">
+            <span class="icon">1</span>
+            <span class="text f_18">配送地址</span></div>
+          <div class="form">
+            <a-form layout="vertical">
+              <a-form-item label="请选择您的配送方式">
+                <a-radio-group>
+                  <a-radio value="a">
+                    送货上门
+                  </a-radio>
+                  <a-radio value="b">
+                    门店自提
+                  </a-radio>
+                </a-radio-group>
+              </a-form-item>
+              <a-form-item
+                label="Field A"
+              >
+                <a-input placeholder="input placeholder" />
+              </a-form-item>
+              <a-form-item
+                label="Field B"
+              >
+                <a-input placeholder="input placeholder" />
+              </a-form-item>
+            </a-form>
+          </div>
+        </div>
+        <div class="addr"></div>
+        <div class="addr"></div>
       </div>
       <div class="rightDiv">1</div>
     </div>
 
   </div>
 </template>
+<script>
+  export default {
+    data() {
+      return {
+        formLayout: 'horizontal',
+      };
+    },
+    computed: {
+      formItemLayout() {
+        const { formLayout } = this;
+        return formLayout === 'horizontal'
+          ? {
+            labelCol: { span: 4 },
+            wrapperCol: { span: 14 },
+          }
+          : {};
+      },
+      buttonItemLayout() {
+        const { formLayout } = this;
+        return formLayout === 'horizontal'
+          ? {
+            wrapperCol: { span: 14, offset: 4 },
+          }
+          : {};
+      },
+    },
+    methods: {
+      handleFormLayoutChange(e) {
+        this.formLayout = e.target.value;
+      },
+    },
+  };
+</script>
 <style lang="less" scoped>
   .placeOrder{
     padding-top: 54px;
@@ -33,6 +97,36 @@
             color: #999;
           }
         }
+        .title{
+          padding-top: 30px;
+          padding-bottom: 20px;
+          border-bottom: 1px solid #EAEAEA;
+          .icon{
+            box-sizing: border-box;
+            display: inline-block;
+            width: 30px;
+            height: 30px;
+            line-height: 30px;
+            text-align: center;
+            border: 2px solid #313131;
+            border-radius: 50%;
+            margin-right: 15px;
+            font-weight: 600;
+            color: #313131;
+          }
+          .text{
+            font-weight: 600;
+            color: #313131;
+          }
+        }
+        .addr{
+          background-color: #fff;
+          padding:0 30px 30px 30px;
+        }
+        .form{
+          background-color: #fff;
+          padding-top: 30px;
+        }
        }
       .rightDiv{
         width: 410px;
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
index 78cc87a6..c08f07d2 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
@@ -73,7 +73,7 @@
               <p class="heji d-flex">
                 <span class="f_20 c_1B">总计：¥ {{item.total}}</span>
                 <span class="f_16 c_333 ">
-                  <a class="btn ljzf" v-if="!item.pay">立即支付</a>
+                  <a class="btn ljzf" v-if="!item.pay" @click="ljzf(item)">立即支付</a>
                   <a class="btn ljzf" v-if="!item.receipt && item.pay">确认收货</a>
                   <a  class="btn ckxq" @click="openDetail(item)">查看详情</a>
                 </span>
@@ -173,6 +173,14 @@
             },
         });
       },
+      ljzf(item){
+        this.$router.push({
+          path: "/shopping/pay",
+          query: {
+            id: item.id,
+          },
+        });
+      },
       menuChange(key){
         this.current.shift()
         this.current.push(key.key)
diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue b/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue
new file mode 100644
index 00000000..f93a147e
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/pay.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="pay">
+    <Header fontColor="#000"></Header>
+    <div class="bg">
+
+    </div>
+    <Footer></Footer>
+  </div>
+</template>
+<script>
+  import Header from "../components/Header/HeaderView";
+  import Footer from "../components/Footer/FooterView"
+  export default {
+    name: "pay",
+    components: { Header,Footer },
+    data() {
+      return {
+      };
+    },
+    methods: {
+
+    },
+  };
+</script>
+<!--<style>-->
+<!--  .news .top .middle .router-link-exact-active.router-link-active {-->
+<!--    border-bottom: 2px solid #000;-->
+<!--  }-->
+<!--</style>-->
+<style lang="less" scoped>
+  @import '../assets/common.css';
+.pay{
+  .bg{
+    background-image: url("../assets/bg06.png");
+  }
+}
+</style>
+