panhui 4 роки тому
батько
коміт
2e4677612a

+ 8 - 1
src/main/nine-space/src/components/product/productInfo.vue

@@ -15,7 +15,8 @@
             <div class="name van-ellipsis">
                 {{ info.name }}
             </div>
-            <div class="price"><i class="font_family icon-icon_jiage"></i>{{ info.price }}</div>
+            <div class="price" v-if="info.salable"><i class="font_family icon-icon_jiage"></i>{{ info.price }}</div>
+            <div class="status" v-else>仅展示</div>
             <div class="text">
                 <div class="text1" v-if="info.type === 'BLIND_BOX'">
                     <span>{{ info.sale }}/</span>
@@ -110,6 +111,12 @@ export default {
                 font-size: 10px;
             }
         }
+        .status {
+            line-height: 22px;
+            padding: 7px 0;
+            color: #939599;
+            font-size: 16px;
+        }
     }
 
     .text {

+ 3 - 3
src/main/nine-space/src/views/product/Detail.vue

@@ -25,9 +25,9 @@
         </swiper>
 
         <div class="info">
-            <div class="price-line">
-                <div class="price" v-if="info.salable"><i class="font_family icon-icon_jiage"></i>{{ info.price }}</div>
-                <div class="sub" v-if="info.royalties && info.salable">
+            <div class="price-line" v-if="info.salable">
+                <div class="price"><i class="font_family icon-icon_jiage"></i>{{ info.price }}</div>
+                <div class="sub" v-if="info.royalties">
                     含 <span>{{ info.royalties }}%</span> 版税
                 </div>
                 <div class="flex1"></div>

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


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

@@ -154,6 +154,8 @@
             <collection-info v-for="(item, index) in relateds" :key="item.id" :info.sync="relateds[index]">
             </collection-info>
         </div>
+
+        <submit></submit>
     </div>
 </template>
 <script>
@@ -162,8 +164,9 @@ import product from '../mixins/product';
 import 'swiper/css/swiper.css';
 import LikeButton from '../components/LikeButton.vue';
 import CollectionInfo from '../components/CollectionInfo.vue';
+import Submit from './Submit.vue';
 export default {
-    components: { Swiper, SwiperSlide, LikeButton, CollectionInfo },
+    components: { Swiper, SwiperSlide, LikeButton, CollectionInfo, Submit },
     mixins: [product],
     data() {
         return {

+ 37 - 0
src/main/pc-space/src/views/Submit.vue

@@ -0,0 +1,37 @@
+<template>
+    <el-dialog center title="支付订单" :visible.sync="show" width="680px">
+        <div class="page">
+            <div class="info">
+                <div class="price">
+                    <span>应付金额</span>
+                    <img src="../assets/icon_jiage.png" alt="" />
+                    <span>105.00</span>
+                </div>
+                <div class="order">
+                    <span>订单编号</span>
+                    <span class="text2">2019052035464</span>
+                    <!-- <el-button type="info" size="default" @click=""></el-button> -->
+                    
+                </div>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            show: true
+        };
+    },
+    methods: {
+        submit() {}
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.page {
+}
+</style>