panhui 4 anni fa
parent
commit
49e90a160b

BIN
src/main/pc-space/src/assets/alipay.png


BIN
src/main/pc-space/src/assets/dcep.png


BIN
src/main/pc-space/src/assets/weixin.png


+ 6 - 1
src/main/pc-space/src/components/PageHeader.vue

@@ -1,7 +1,10 @@
 <template>
     <div class="container">
         <div class="header">
-            <img class="logo" src="../assets/img/nav_logo@3x.png" alt="" />
+            <router-link class="logo-link" :to="{ path: '/' }">
+                <img class="logo" src="../assets/img/nav_logo@3x.png" alt=""
+            /></router-link>
+
             <div class="content">
                 <div class="tabs">
                     <div
@@ -119,6 +122,8 @@ export default {
         .logo {
             width: 170px;
             height: 60px;
+        }
+        .logo-link {
             padding: 15px 0px 15px 30px;
         }
         .content {

+ 7 - 1
src/main/pc-space/src/views/CollectionDetail.vue

@@ -17,7 +17,7 @@
                             v-else
                             :src="getImg(item.url, '', 800)"
                             :preview-src-list="bannerList"
-                            style="width: 460px; height: 520px"
+                            style="width: 460px; height: 460px"
                             fit="scale-down"
                         />
                     </swiper-slide>
@@ -602,6 +602,12 @@ export default {
     width: 462px;
     display: inline-block;
     .line();
+    /deep/.el-image {
+        display: block;
+        img {
+            display: block;
+        }
+    }
 }
 .buy {
     width: 100%;

+ 144 - 7
src/main/pc-space/src/views/Submit.vue

@@ -3,15 +3,29 @@
         <div class="page">
             <div class="info">
                 <div class="price">
-                    <span>应付金额</span>
+                    <span class="text1">应付金额</span>
                     <img src="../assets/icon_jiage.png" alt="" />
-                    <span>105.00</span>
+                    <span class="text2">105.00</span>
                 </div>
+                <div class="flex1"></div>
                 <div class="order">
-                    <span>订单编号</span>
+                    <span class="text1">订单编号</span>
                     <span class="text2">2019052035464</span>
-                    <!-- <el-button type="info" size="default" @click=""></el-button> -->
-                    
+                    <el-button type="info" size="mini" plain>复制</el-button>
+                </div>
+            </div>
+
+            <div class="payMethods">
+                <div class="title">选择支付方式</div>
+                <div class="pay-list">
+                    <div class="pay-info">
+                        <el-radio-group v-model="payMethods">
+                            <el-radio v-for="item in payList" border :label="item.type" :key="item.type">
+                                <img :src="item.icon" alt="" />
+                                <span> {{ item.name }}</span>
+                            </el-radio>
+                        </el-radio-group>
+                    </div>
                 </div>
             </div>
         </div>
@@ -22,7 +36,20 @@
 export default {
     data() {
         return {
-            show: true
+            show: false,
+            payMethods: 'ALIPAY',
+            payList: [
+                {
+                    icon: require('../assets/alipay.png'),
+                    name: '支付宝',
+                    type: 'ALIPAY'
+                },
+                {
+                    icon: require('../assets/weixin.png'),
+                    name: '微信',
+                    type: 'WEIXIN'
+                }
+            ]
         };
     },
     methods: {
@@ -32,6 +59,116 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.page {
+.info {
+    .flex();
+    height: 94px;
+    .price {
+        .flex();
+        align-items: flex-end;
+        .text1 {
+            font-size: 16px;
+            color: #000000;
+            line-height: 24px;
+        }
+        img {
+            width: 10px;
+            display: block;
+            margin: 0 0 4px 10px;
+        }
+        .text2 {
+            font-size: 40px;
+            font-family: OSP;
+            font-weight: normal;
+            color: #ff4f50;
+            line-height: 36px;
+        }
+    }
+
+    .order {
+        .text1 {
+            font-size: 13px;
+            color: #939599;
+            line-height: 24px;
+        }
+
+        .text2 {
+            font-size: 13px;
+            color: #0e0e0e;
+            line-height: 22px;
+            padding: 0 6px 0 30px;
+        }
+        .el-button {
+            height: 20px;
+            line-height: 20px;
+            padding: 0 10px;
+        }
+    }
+}
+
+/deep/.el-radio {
+    .flex();
+    display: inline-flex;
+    flex-direction: row-reverse;
+    justify-content: space-between;
+    min-width: 192px;
+    height: 42px;
+    color: #939599;
+    padding: 0;
+    .el-radio__label {
+        .flex();
+        img {
+            width: 24px;
+            height: 24px;
+        }
+        span {
+            font-size: 16px;
+            font-weight: bold;
+            padding: 0 10px;
+        }
+        margin-left: 24px;
+    }
+    .el-radio__input {
+        margin-right: 24px;
+        width: 20px;
+        flex-shrink: 0;
+
+        .el-radio__inner {
+            width: 20px;
+            height: 20px;
+            &::after {
+                content: '\e6da';
+                font-family: 'element-icons';
+                width: 14px;
+                height: 14px;
+                font-size: 14px;
+                color: #fff;
+                font-weight: bold;
+                background-color: transparent;
+            }
+        }
+
+        &.is-checked {
+            .el-radio__inner {
+                background-image: linear-gradient(135deg, @prim 20%, @warn 100%);
+                border-width: 0;
+            }
+        }
+    }
+    &.is-checked {
+        .line(@bg:#E0FFF8,@radius:4px);
+        border-width: 0;
+        .el-radio__label {
+            color: #000;
+        }
+    }
+}
+.payMethods {
+    padding-top: 30px;
+    .title {
+        font-size: 16px;
+        color: #000000;
+        line-height: 24px;
+        padding-bottom: 20px;
+    }
 }
 </style>