panhui пре 4 година
родитељ
комит
96b45941d2
41 измењених фајлова са 61 додато и 47 уклоњено
  1. BIN
      src/main/comos/src/assets/bg1.png
  2. BIN
      src/main/comos/src/assets/bg2.png
  3. BIN
      src/main/comos/src/assets/fenxiang-icon.png
  4. BIN
      src/main/comos/src/assets/icon-dianzan.png
  5. BIN
      src/main/comos/src/assets/icon-lianshangxinxi(1).png
  6. BIN
      src/main/comos/src/assets/icon-lianshangxinxi(2).png
  7. BIN
      src/main/comos/src/assets/icon-lianshangxinxi(3).png
  8. BIN
      src/main/comos/src/assets/icon-lianshangxinxi.png
  9. BIN
      src/main/comos/src/assets/icon-miaoshu.png
  10. BIN
      src/main/comos/src/assets/icon_gouxuan.png
  11. BIN
      src/main/comos/src/assets/icon_gouxuan_next.png
  12. BIN
      src/main/comos/src/assets/info_icon_jiaoyijilu1.png
  13. BIN
      src/main/comos/src/assets/kong_png_dianzan.png
  14. BIN
      src/main/comos/src/assets/kong_png_duihuanquan.png
  15. BIN
      src/main/comos/src/assets/kong_png_duihuanquanhei.png
  16. BIN
      src/main/comos/src/assets/kong_png_fensi.png
  17. BIN
      src/main/comos/src/assets/kong_png_maichude.png
  18. BIN
      src/main/comos/src/assets/kong_png_wudingdan.png
  19. BIN
      src/main/comos/src/assets/kong_png_wudizhi (1).png
  20. BIN
      src/main/comos/src/assets/kong_png_wusousuo.png
  21. BIN
      src/main/comos/src/assets/kong_png_yongyoude (1).png
  22. BIN
      src/main/comos/src/assets/kong_png_yongyoude (2).png
  23. BIN
      src/main/comos/src/assets/kong_png_yongyoude .png
  24. BIN
      src/main/comos/src/assets/kong_png_yongyoude hei.png
  25. BIN
      src/main/comos/src/assets/png-biaokuag-01.png
  26. BIN
      src/main/comos/src/assets/png-biaokuag-02.png
  27. BIN
      src/main/comos/src/assets/qiaoqiaohua-icon-weidakai.png
  28. BIN
      src/main/comos/src/assets/renzheng-icon-geren-pre.png
  29. BIN
      src/main/comos/src/assets/renzheng-icon-geren.png
  30. BIN
      src/main/comos/src/assets/renzheng-icon-qiye-pre.png
  31. BIN
      src/main/comos/src/assets/renzheng-icon-qiye.png
  32. 19 21
      src/main/comos/src/components/CouponInfo.vue
  33. 1 1
      src/main/comos/src/components/PageBar.vue
  34. 10 10
      src/main/comos/src/components/product/ProductBanner.vue
  35. 11 2
      src/main/comos/src/styles/app.less
  36. 3 2
      src/main/comos/src/styles/common/theme.less
  37. 8 8
      src/main/comos/src/views/Store.vue
  38. 1 1
      src/main/comos/src/views/account/Authentication.vue
  39. 1 1
      src/main/comos/src/views/account/Verified.vue
  40. 1 1
      src/main/comos/src/views/account/VerifiedSucs.vue
  41. 6 0
      src/main/comos/src/views/asset/Detail.vue

BIN
src/main/comos/src/assets/bg1.png


BIN
src/main/comos/src/assets/bg2.png


BIN
src/main/comos/src/assets/fenxiang-icon.png


BIN
src/main/comos/src/assets/icon-dianzan.png


BIN
src/main/comos/src/assets/icon-lianshangxinxi(1).png


BIN
src/main/comos/src/assets/icon-lianshangxinxi(2).png


BIN
src/main/comos/src/assets/icon-lianshangxinxi(3).png


BIN
src/main/comos/src/assets/icon-lianshangxinxi.png


BIN
src/main/comos/src/assets/icon-miaoshu.png


BIN
src/main/comos/src/assets/icon_gouxuan.png


BIN
src/main/comos/src/assets/icon_gouxuan_next.png


BIN
src/main/comos/src/assets/info_icon_jiaoyijilu1.png


BIN
src/main/comos/src/assets/kong_png_dianzan.png


BIN
src/main/comos/src/assets/kong_png_duihuanquan.png


BIN
src/main/comos/src/assets/kong_png_duihuanquanhei.png


BIN
src/main/comos/src/assets/kong_png_fensi.png


BIN
src/main/comos/src/assets/kong_png_maichude.png


BIN
src/main/comos/src/assets/kong_png_wudingdan.png


BIN
src/main/comos/src/assets/kong_png_wudizhi (1).png


BIN
src/main/comos/src/assets/kong_png_wusousuo.png


BIN
src/main/comos/src/assets/kong_png_yongyoude (1).png


BIN
src/main/comos/src/assets/kong_png_yongyoude (2).png


BIN
src/main/comos/src/assets/kong_png_yongyoude .png


BIN
src/main/comos/src/assets/kong_png_yongyoude hei.png


BIN
src/main/comos/src/assets/png-biaokuag-01.png


BIN
src/main/comos/src/assets/png-biaokuag-02.png


BIN
src/main/comos/src/assets/qiaoqiaohua-icon-weidakai.png


BIN
src/main/comos/src/assets/renzheng-icon-geren-pre.png


BIN
src/main/comos/src/assets/renzheng-icon-geren.png


BIN
src/main/comos/src/assets/renzheng-icon-qiye-pre.png


BIN
src/main/comos/src/assets/renzheng-icon-qiye.png


+ 19 - 21
src/main/comos/src/components/CouponInfo.vue

@@ -1,4 +1,5 @@
 <template>
+    <!-- <div class="coupon" @click="choose"> -->
     <div class="coupon" @click="choose" :class="{ notUse: notUse }">
         <div class="coupon-top">
             <div class="text1">{{ info.name }}</div>
@@ -70,7 +71,7 @@ export default {
 <style lang="less" scoped>
 .coupon {
     border-radius: 8px;
-    background: linear-gradient(135deg, @prim, @warn);
+    background: #ebeff1;
     position: relative;
     padding: 0 10px;
     margin: 8px;
@@ -101,11 +102,8 @@ export default {
         .text1 {
             font-size: 18px;
             font-weight: bold;
-            color: @text3;
+            color: @text0;
             line-height: 24px;
-            background: linear-gradient(0deg, @prim 0%, @warn 100%);
-            -webkit-background-clip: text;
-            -webkit-text-fill-color: transparent;
         }
 
         .text2 {
@@ -115,7 +113,7 @@ export default {
             color: @text3;
             span {
                 &:last-child {
-                    color: #fff;
+                    color: @text0;
                     margin-left: 6px;
                 }
             }
@@ -134,7 +132,7 @@ export default {
         &::before {
             content: '';
             position: absolute;
-            background-color: @bg3;;
+            background-color: @bg3;
             width: 16px;
             height: 16px;
             left: -18px;
@@ -144,7 +142,7 @@ export default {
         &::after {
             content: '';
             position: absolute;
-            background-color: @bg3;;
+            background-color: @bg3;
             width: 16px;
             height: 16px;
             right: -18px;
@@ -188,23 +186,23 @@ export default {
     width: 70px;
     height: 26px;
     font-size: 12px;
-    color: @prim;
+    color: #fff;
     line-height: 26px;
     text-align: center;
     border-radius: 16px;
     background: linear-gradient(135deg, @prim, @warn);
-    &::after {
-        content: '';
-        position: absolute;
-        top: 1px;
-        left: 1px;
-        right: 1px;
-        bottom: 1px;
-        background-color: @bg;
-        border-radius: 16px;
-        z-index: 0;
-        transition: backgroundColor ease-in-out 0.3s;
-    }
+    // &::after {
+    //     content: '';
+    //     position: absolute;
+    //     top: 1px;
+    //     left: 1px;
+    //     right: 1px;
+    //     bottom: 1px;
+    //     background-color: @bg;
+    //     border-radius: 16px;
+    //     z-index: 0;
+    //     transition: backgroundColor ease-in-out 0.3s;
+    // }
 
     span {
         position: relative;

+ 1 - 1
src/main/comos/src/components/PageBar.vue

@@ -33,7 +33,7 @@ export default {};
         line-height: 22px;
         margin-top: 4px;
         .prim {
-            color: @prim;
+            color: @tipsColor;
         }
     }
 }

+ 10 - 10
src/main/comos/src/components/product/ProductBanner.vue

@@ -20,8 +20,8 @@
                             v-else
                             @click="preview(index, changeImgs(banners))"
                             :src="getImg(item.url, '', 1200)"
-                            width="calc(100vw - 134px)"
-                            height="calc(100vw - 134px)"
+                            width="calc(100vw - 84px)"
+                            height="calc(100vw - 84px)"
                             fit="cover"
                         />
                     </div>
@@ -155,11 +155,11 @@ export default {
     .swiper-pic {
         overflow: hidden;
         border-radius: @radius;
-        border: 2px solid #ffffff;
-        padding: 5px;
-        width: calc(100vw - 124px) !important;
-        height: calc(100vw - 128px);
-        margin-top: calc(25vw - 50px);
+        border: 2px solid #26273c;
+        padding: 3px;
+        width: calc(100vw - 84px) !important;
+        height: calc(100vw - 80px);
+        margin-top: 10px;
         .detail-animate();
         .swiper-content {
             display: flex;
@@ -176,15 +176,15 @@ export default {
 }
 
 .swiper-video {
-    width: calc(100vw - 134px);
-    height: calc(100vw - 134px);
+    width: calc(100vw - 94px);
+    height: calc(100vw - 94px);
     display: block;
 }
 
 .share-content {
     display: flex;
     // margin-top: 20px;
-    transform: translateY(-50px);
+    transform: translateY(-40px);
     z-index: 20;
 }
 .share-icon {

+ 11 - 2
src/main/comos/src/styles/app.less

@@ -128,10 +128,19 @@ input:-webkit-autofill {
     height: 50px;
     padding-bottom: env(safe-area-inset-bottom);
 }
-
+.van-empty {
+    padding: 95px 30px 30px;
+}
 .van-empty__image {
     width: 235px;
-    height: 170px;
+    // height: 170px;
+    display: block;
+
+    img {
+        width: 235px;
+        display: block;
+        height: auto;
+    }
 }
 
 .van-tab {

+ 3 - 2
src/main/comos/src/styles/common/theme.less

@@ -24,8 +24,8 @@
 @menu-bg-active: #1f2d3d;
 @menu-bg-hover: #232e3b;
 @background-color-light: #181818;
-@font1: 14px;
-@font2: 16px;
+@font1: 12px;
+@font2: 14px;
 @font3: 18px;
 @font4: 20px;
 @hotBg: #f5f7fa;
@@ -37,3 +37,4 @@
 @salesBgFont: #26273c;
 @salesBgPrim: #ffe4c3;
 @priveBg: #e0e2ff;
+@tipsColor: #ff6464;

+ 8 - 8
src/main/comos/src/views/Store.vue

@@ -388,18 +388,18 @@ export default {
 }
 /deep/.coupon {
     &::after {
-        background-color: @bg3;
+        background-color: @bg;
     }
 
-    .coupon-bottom {
-        &::before,
-        &::after {
-            background-color: @bg3;
-        }
-    }
+    // .coupon-bottom {
+    //     &::before,
+    //     &::after {
+    //         background-color: @bg;
+    //     }
+    // }
     .btn {
         &::after {
-            background-color: @bg3;
+            background-color: @bg;
         }
     }
 }

+ 1 - 1
src/main/comos/src/views/account/Authentication.vue

@@ -99,7 +99,7 @@ export default {
         margin-top: 4px;
     }
     span {
-        color: @prim;
+        color: @tipsColor;
     }
     .box {
         display: flex;

+ 1 - 1
src/main/comos/src/views/account/Verified.vue

@@ -205,7 +205,7 @@ export default {
         margin-top: 4px;
         span {
             &:last-child {
-                color: @prim;
+                color: @tipsColor;
             }
         }
     }

+ 1 - 1
src/main/comos/src/views/account/VerifiedSucs.vue

@@ -296,7 +296,7 @@ export default {
         margin-top: 4px;
         span {
             &:last-child {
-                color: @prim;
+                color: @tipsColor;
             }
         }
     }

+ 6 - 0
src/main/comos/src/views/asset/Detail.vue

@@ -1189,6 +1189,12 @@ export default {
 
         .add {
             margin-right: 25px;
+            .flex-col();
+            align-items: center;
+            img {
+                width: 18px;
+                height: 18px;
+            }
         }
     }
     .van-button {