xuqiang 4 jaren geleden
bovenliggende
commit
04f9c1e0f8

+ 3 - 0
src/main/pc-space/src/components/AssetInfo.vue

@@ -70,6 +70,9 @@ export default {
     width: 276px;
     width: 276px;
     height: 416px;
     height: 416px;
     display: inline-block;
     display: inline-block;
+    &::before {
+        border-radius: 8px;
+    }
     .imgBox {
     .imgBox {
         height: 266px;
         height: 266px;
         width: 100%;
         width: 100%;

+ 5 - 2
src/main/pc-space/src/components/CollectionInfo.vue

@@ -93,10 +93,13 @@ export default {
     width: 276px;
     width: 276px;
     height: 416px;
     height: 416px;
     display: inline-block;
     display: inline-block;
+    &::before {
+        border-radius: 8px !important;
+    }
     .imgBox {
     .imgBox {
         height: 266px;
         height: 266px;
         width: 100%;
         width: 100%;
-        border-radius: 7px 7px 0px 0px;
+        border-radius: 8px 8px 0px 0px;
     }
     }
 
 
     &:hover {
     &:hover {
@@ -130,7 +133,7 @@ export default {
     }
     }
 
 
     .introduce {
     .introduce {
-        padding: 10px 16px 12px;
+        padding: 10px 16px 10px;
         font-size: 14px;
         font-size: 14px;
         font-weight: 400;
         font-weight: 400;
         color: #939599;
         color: #939599;

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

@@ -287,6 +287,7 @@ export default {
         padding: 0 25px;
         padding: 0 25px;
         color: #939599;
         color: #939599;
         font-size: 18px;
         font-size: 18px;
+        font-weight: 400;
         // font-weight: bold;
         // font-weight: bold;
         &.is-active {
         &.is-active {
             color: #fff;
             color: #fff;

+ 10 - 1
src/main/pc-space/src/styles/list.less

@@ -129,7 +129,12 @@
         }
         }
     }
     }
 }
 }
-
+/deep/.el-input__inner {
+    border: 1px solid #898989;
+    background-color: transparent;
+    color: #fff;
+    border-radius: 8px;
+}
 /deep/.menu {
 /deep/.menu {
     .el-radio-button__inner {
     .el-radio-button__inner {
         border-color: #949699;
         border-color: #949699;
@@ -141,7 +146,11 @@
         background: linear-gradient(46deg, @prim 0%, @warn 100%);
         background: linear-gradient(46deg, @prim 0%, @warn 100%);
         color: #fff;
         color: #fff;
         border-color: #fff;
         border-color: #fff;
+        font-weight: bold;
+        // box-shadow: 0 !important;
+        box-shadow: 0 0 0 0 #000000;
     }
     }
+    
     .el-radio-button {
     .el-radio-button {
         &:last-child {
         &:last-child {
             .el-radio-button__inner {
             .el-radio-button__inner {

+ 35 - 2
src/main/pc-space/src/views/CastingDetail.vue

@@ -22,11 +22,20 @@
                         <span>{{ info.followers }}</span>
                         <span>{{ info.followers }}</span>
                     </div>
                     </div>
 
 
-                    <el-button plain round :class="{ prim: !info.follow }" size="mini" @click="like(info)">
+                    <el-button
+                        style="color: #939599"
+                        plain
+                        round
+                        :class="{ prim: !info.follow }"
+                        size="mini"
+                        @click="like(info)"
+                    >
                         {{ info.follow ? '已关注' : '关注' }}
                         {{ info.follow ? '已关注' : '关注' }}
                     </el-button>
                     </el-button>
                     <el-popover placement="bottom" trigger="hover">
                     <el-popover placement="bottom" trigger="hover">
-                        <el-button style="margin-left: 20px" slot="reference" plain round size="mini">分享</el-button>
+                        <el-button style="margin-left: 20px; color: #939599" slot="reference" plain round size="mini"
+                            >分享</el-button
+                        >
                         <share :info="info" pageType="caseDetail"> </share>
                         <share :info="info" pageType="caseDetail"> </share>
                     </el-popover>
                     </el-popover>
                 </div>
                 </div>
@@ -57,6 +66,10 @@
                     @change="onSearch"
                     @change="onSearch"
                 >
                 >
                 </el-input>
                 </el-input>
+                <!-- <el-select class="select" v-model="sortStr" placeholder="请选择">
+                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select> -->
                 <el-select class="select" v-model="sortStr" placeholder="请选择">
                 <el-select class="select" v-model="sortStr" placeholder="请选择">
                     <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value">
                     <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                     </el-option>
@@ -110,6 +123,20 @@ export default {
                     value: false
                     value: false
                 }
                 }
             ],
             ],
+            typeOptions: [
+                {
+                    label: '全部',
+                    type: ''
+                },
+                {
+                    label: '售卖',
+                    type: 'ON_SALE'
+                },
+                {
+                    label: '仅展示',
+                    type: 'NORMAL'
+                }
+            ],
             sortList: [
             sortList: [
                 {
                 {
                     label: '综合排序',
                     label: '综合排序',
@@ -170,6 +197,12 @@ export default {
         color: transparent;
         color: transparent;
     }
     }
 }
 }
+/deep/.el-input__inner {
+    border: 1px solid #898989;
+    background-color: transparent;
+    color: #fff;
+    border-radius: 8px;
+}
 .avatar {
 .avatar {
     position: absolute;
     position: absolute;
     width: 92px;
     width: 92px;

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

@@ -69,6 +69,12 @@
                         首发抢购倒计时<span>{{ startTime }}</span>
                         首发抢购倒计时<span>{{ startTime }}</span>
                     </div>
                     </div>
                 </div>
                 </div>
+                <div style="margin-bottom: 30px" v-if="info.salable == false">
+                    <div class="time">
+                        <div class="time1">卖家特定</div>
+                    </div>
+                    <div class="card init3">仅展示</div>
+                </div>
                 <div style="padding-bottom: 20px" class="price" v-if="info.salable">
                 <div style="padding-bottom: 20px" class="price" v-if="info.salable">
                     <div class="price1">
                     <div class="price1">
                         <div class="price2">价格</div>
                         <div class="price2">价格</div>
@@ -80,8 +86,8 @@
                     </div>
                     </div>
                     <div class="price1 num">
                     <div class="price1 num">
                         <div class="num1">
                         <div class="num1">
-                            <div class="price2 num2">数量</div>
-                            <span class="span">{{ info.total }}</span>
+                            <div class="price2 num2">单词限购 1 件</div>
+                            <!-- <span class="span">{{ info.total }}</span> -->
                         </div>
                         </div>
                         <div class="price2 num2">已售 {{ info.sale }} / 剩余 {{ info.stock }}</div>
                         <div class="price2 num2">已售 {{ info.sale }} / 剩余 {{ info.stock }}</div>
                     </div>
                     </div>
@@ -590,7 +596,6 @@ export default {
             justify-content: space-between;
             justify-content: space-between;
             background: #1c1e26;
             background: #1c1e26;
             border-radius: 8px 8px 0px 0px;
             border-radius: 8px 8px 0px 0px;
-            // width: 678px;
             height: 56px;
             height: 56px;
             padding: 0 16px;
             padding: 0 16px;
             .time1 {
             .time1 {
@@ -760,7 +765,6 @@ export default {
             }
             }
         }
         }
         .card {
         .card {
-            // width: 590px;
             height: 112px;
             height: 112px;
             border-radius: 0px 0px 8px 8px;
             border-radius: 0px 0px 8px 8px;
             background: #1f2230;
             background: #1f2230;
@@ -787,6 +791,14 @@ export default {
                     line-height: 24px;
                     line-height: 24px;
                 }
                 }
             }
             }
+            &.init3 {
+                height: 79px;
+                padding-left: 16px;
+                font-size: 26px;
+                font-weight: 400;
+                color: #939599;
+                line-height: 36px;
+            }
         }
         }
     }
     }
     .content {
     .content {