Browse Source

Merge branch 'master' of https://gitee.com/zc_gcb/gcb

# Conflicts:
#	components/titles.vue
carey0001 5 years ago
parent
commit
f8be14bbe9

+ 74 - 1
assets/a.scss

@@ -95,6 +95,7 @@ body {
         height    : 44px;
         padding   : 7px 17px;
         background: #fff;
+        text-align: center;
 
         input {
             width              : 73%;
@@ -194,7 +195,7 @@ table {
 
 $colour :#009688 #5FB878 #393D49 #1E9FFF #F7B824 #FF5722;
 
-// 支付弹窗
+// //组件---支付弹窗
 .payment {
 
     position             : fixed;
@@ -332,4 +333,76 @@ $colour :#009688 #5FB878 #393D49 #1E9FFF #F7B824 #FF5722;
 
     }
 
+}
+
+//组件---标题
+.head {
+    padding   : 10px 10px;
+    text-align: center;
+
+    img {
+        height: 20px;
+    }
+
+    img:last-child {
+        margin-left: 5px;
+    }
+
+    span {
+        display     : inline-block;
+        width       : calc(100% - 76px);
+        padding-left: 40px;
+        font-size   : 18px;
+        font-family : PingFang-SC-Bold;
+        font-weight : bold;
+        color       : rgba(32, 32, 32, 1);
+    }
+}
+
+.sub {
+    .add {
+        padding-left: 15px;
+        border-top  : 1px solid #7a7a7a;
+
+        li {
+            border-bottom: 1px solid #7a7a7a;
+            padding      : 35px*0.5 0;
+
+            .title {
+                font-size  : 16px;
+                font-family: PingFang-SC-Medium;
+                font-weight: 500;
+                color      : rgba(32, 32, 32, 1);
+            }
+
+            .name {
+                font-size    : 26px*0.5;
+                font-family  : PingFang-SC-Medium;
+                font-weight  : 500;
+                color        : rgba(175, 175, 175, 1);
+                float        : right;
+                padding-right: 15px;
+
+                img {
+                    width         : 8px;
+                    vertical-align: sub;
+                    margin-left   : 5px;
+                }
+            }
+        }
+    }
+
+    button {
+        width      : 100%;
+        height     : 5rem;
+        position   : absolute;
+        bottom     : 0;
+        left       : 0;
+        border     : none;
+        background : rgba(255, 92, 92, 1);
+        font-size  : 18px;
+        font-family: PingFang-SC-Medium;
+        font-weight: 500;
+        color      : rgba(255, 255, 255, 1);
+    }
 }

+ 15 - 35
assets/details.scss

@@ -6,28 +6,8 @@
         border-bottom: 1px solid rgba(240, 240, 240, 1);
     }
 
-    .head {
-        padding   : 10px 10px;
-        text-align: center;
 
-        img {
-            height: 20px;
-        }
-
-        img:last-child {
-            margin-left: 5px;
-        }
 
-        span {
-            display     : inline-block;
-            width       : calc(100% - 76px);
-            padding-left: 40px;
-            font-size   : 18px;
-            font-family : PingFang-SC-Bold;
-            font-weight : bold;
-            color       : rgba(32, 32, 32, 1);
-        }
-    }
 
     .name {
         margin       : 20px 15px 13px;
@@ -119,16 +99,16 @@
             }
 
             .img {
-                border-radius    : 0px 0px 10px 0px;
-                background       : rgba(255, 186, 186, 1);
-                width            : 118px*0.5+10px;
-                height           : 24px;
-                line-height      : 26px;
-                color            : rgba(255, 92, 92, 1);
-                font-size        : 14px;
-                margin-left      : -20px;
-                margin-bottom    : 10px;
-                text-align       : center;
+                border-radius: 0px 0px 10px 0px;
+                background   : rgba(255, 186, 186, 1);
+                width        : 118px*0.5+10px;
+                height       : 24px;
+                line-height  : 26px;
+                color        : rgba(255, 92, 92, 1);
+                font-size    : 14px;
+                margin-left  : -20px;
+                margin-bottom: 10px;
+                text-align   : center;
             }
 
             .mt40 {
@@ -146,10 +126,10 @@
         font-size  : 18px;
         font-family: PingFang-SC-Medium;
         font-weight: 500;
-        color: #fff;
-        text-align: center;
-        position: fixed;
-        bottom: 0;
-        left: 0;
+        color      : #fff;
+        text-align : center;
+        position   : fixed;
+        bottom     : 0;
+        left       : 0;
     }
 }

+ 754 - 2
assets/new.scss

@@ -1,7 +1,7 @@
 @charset "utf-8";
 //font 
 
-$bg-color:#f8f9fa;  // 全局背景色
+$bg:#f8f9fa;  // 全局背景色
 $tag-bg:#f2f2fa;  // 标签背景色
 $highlight-color: #f0f0f0;  // 弱线分割
 $grey-color: #efefef;  // 列表分隔
@@ -107,6 +107,7 @@ $f0f0f0:#f0f0f0;
         background-color: #fff;
     }
   }
+// end:我的界面嵌套样式css
 
 //   菜单列表
 .menu-list{
@@ -175,4 +176,755 @@ $f0f0f0:#f0f0f0;
             }
         }
     }
-}
+}
+//  end:菜单列表
+
+
+// 身份认证
+.page_identity{
+    height: auto;
+    background-color: $bg;
+    form{
+        height: 100%;
+        .info_basic{
+            padding-left: 1.5rem;
+            margin-bottom: 1rem;
+            background-color: #fff;
+            .item_form{
+                background-color: #fff;
+               height: 5rem;
+               line-height: 5rem;
+                label{
+                    float: left;
+                    display: block;
+                }
+                .form_input{
+                    margin-left: 5rem;
+                    input{
+                        border: 0;
+                        text-align: left;
+                        width: 100%;
+                        padding-right: 1.5rem;
+                        padding-left: 1rem;
+                        outline: none;
+                    }
+                }
+            }
+        } 
+    }
+}
+
+// 身份证上传
+.img_upload{
+    padding: 1rem 1.5rem;
+    background-color: #fff;
+    // padding-bottom: 1rem;
+    .upload_box{
+        position: relative;
+        input{
+            width: 100%;
+            height: 16rem;
+            padding: 0 2rem;
+            opacity: 0;
+            z-index: 100;
+            position: relative;
+        }
+        &::after{
+            content: '';
+            display: block;
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            margin-top: -0.6px;
+            background-image: url('../static/img/icon_card.png');
+            background-repeat: no-repeat;
+            background-size: 80%;
+            background-position: center;
+            z-index: 10;
+        }
+    }
+    
+    .require{
+        text-align: center;
+        font-size: 1.6rem;
+        span{
+            font-size: 1rem;
+            color: $blackafafaf;
+        }
+    }
+}
+
+.notice{
+    font-size: 1rem;
+    color: $blackafafaf;
+    height: 3rem;
+    line-height: 3rem;
+    padding-left: 1.5rem;
+    margin-bottom: 2rem;
+}
+
+// 我的会员VIP页面
+.page_vip{
+    height: 16rem;
+    position: relative;
+    .vip_nav{
+        width: 100%;
+        p{
+            width: 50%;
+            float: left;
+            height: 5rem;
+            line-height: 5rem;
+            text-align: center;
+            font-size: 1.5rem;
+            color: #ccc;
+            transition: .1s;
+        }
+    }
+
+    // 会员切换
+    .vip_content{
+        position: absolute;
+        top: 6.4rem;
+        width: 100%;
+        height: auto;
+        .slide_box{
+            background-color: rgba($color: #000000, $alpha: 0);
+            width: 200%;
+            overflow: hidden;
+            margin: 0 auto;
+            margin-left: -100%;
+            transform: .2s;
+            .vip_item{
+                float: left;
+                width: 50%;
+                background-color: rgba($color: #000000, $alpha: 0);
+                padding: 0 1.5rem;
+                padding-bottom: 40px;
+                .vip_card{
+                    width: 100%;
+                    background-color: #765d45;
+                    border-radius: 0.8rem;
+                    padding: 1.5rem;
+                    height: 14rem;
+                    color: #fff;
+                    background-image: url('../static/img/bg_vip-card.png');
+                    background-repeat: no-repeat;
+                    background-size: cover;
+                    background-position: center;
+                    position: relative;
+                    h4{
+                        font-weight: bold;
+                        font-size: 2rem;
+                        padding-top: 1rem;
+                    }
+                    div{
+                        position: absolute;
+                        height: auto;
+                        bottom: 2rem;
+                        p{
+                            margin-bottom: 0.5rem;
+                            i{
+                                padding-right: 1rem;
+                                color: #FFD6D6;
+                                font-size: 1rem,
+                            }
+                        }
+                    }
+                    .pay_more{
+                        padding: 0 0.8rem;
+                        border-radius: 5rem;
+                        color: #A17046;
+                        background-color: #F9F0E8;
+                        font-weight: bold;
+                        height: 3rem;
+                        line-height: 3rem;
+                        position: absolute;
+                        top: 50%;
+                        right: 2rem;
+                        margin-top: -1.5rem;
+                        font-size: 1.5rem;
+                    }
+                }
+                .options{
+                    div{
+                        margin-top: 25px;
+                        
+                        h3{
+                            font-weight: bold;
+                            font-size: 1.8rem;
+                            height: 36px;
+                            line-height: 36px;
+                            margin-bottom: 10px;
+                        }
+                        ul{
+                            li{
+                                display: inline-block;
+                                margin-right: 15px;
+                                border-radius: 8px;
+                                padding: 0 12px;
+                                background-color: #f0ebeb;
+                                height: 36px;
+                                line-height: 36px;
+                                position: relative;
+                                i{
+                                    display: inline-block;
+                                    width: 20px;
+                                    height: 20px;
+                                    background-image: url('../static/img/icon_delete.png');
+                                    background-repeat: no-repeat;
+                                    background-size: 60%;
+                                    margin-left: 4px;
+                                    vertical-align: middle;
+                                    background-position: center;
+                                }
+                                &.add{
+                                    border: 1px solid $red;
+                                    background-color: #fff;
+                                    color: $red;
+                                }
+                            }
+                        }
+                    }
+                    // 套餐价格
+                    .opt_price{
+                        h3{
+                            margin-bottom: 0;
+                        }
+                        i{
+                            color: #afafaf;
+                            font-style: normal;
+                            font-size: 12px;
+                            display: block;
+                            margin-bottom: 20px;
+                        }
+                        .opt_buy{
+                            width: 100%;
+                            li{
+                                width: 25%;
+                                margin: 0;
+                                background-color: rgba($color: #000000, $alpha: 0);
+                                height: 11rem;
+                                float: left;
+                                padding: 0 4px;
+                                .to_buy{
+                                    background-color: #fff;
+                                    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+                                    border-radius: 16px;
+                                    text-align: center;
+                                    padding: 20px 0;
+                                    width: 100%;
+                                    height: 100%;
+                                    margin: 0;
+                                    position: relative;
+                                    p{
+                                        line-height: 0;
+                                        margin: 10px 0;
+                                    }
+                                    .tag_yh{
+                                        position: absolute;
+                                        top: 0;
+                                        left: 50%;
+                                        width: 70%;
+                                        height: 20px;
+                                        margin-left: -35%;
+                                        margin-top: -2px;
+                                        line-height: 20px;
+                                        color: #fff;
+                                        background-color: $red;
+                                        font-size: 10px;
+                                        border-bottom-left-radius: 8px;
+                                        border-bottom-right-radius: 8px;
+                                        &::before{
+                                            content: '';
+                                            display: block;
+                                            width: 6px;
+                                            height: 6px;
+                                            position: absolute;
+                                            top: 0;
+                                            left: 0;
+                                            margin-left: -4px;
+                                            margin-top: 2px;
+                                            border-top: 4px solid rgba($color: #000000, $alpha: 0);
+                                            border-bottom: 4px solid rgba($color: #000000, $alpha: 0);
+                                            border-left: 4px solid rgba($color: #000000, $alpha: 0);
+                                            border-right: 4px solid rgba($color: #cd2b25, $alpha: 1);
+                                            transform: rotate(-135deg);
+                                        }
+                                        &::after{
+                                            content: '';
+                                            display: block;
+                                            width: 6px;
+                                            height: 6px;
+                                            position: absolute;
+                                            top: 0;
+                                            right: 0;
+                                            margin-right: -4px;
+                                            margin-top: 2px;
+                                            border-top: 4px solid rgba($color: #000000, $alpha: 0);
+                                            border-bottom: 4px solid rgba($color: #000000, $alpha: 0);
+                                            border-left: 4px solid rgba($color: #000000, $alpha: 0);
+                                            border-right: 4px solid rgba($color: #cd2b25, $alpha: 1);
+                                            transform: rotate(-45deg);
+                                        }
+                                    }
+                                    .buy_month{
+                                        font-weight: bold;
+                                        color: #7B5839;
+                                        margin-top: 16px;
+                                    }
+                                    .buy_price{
+                                        font-weight: bold;
+                                        color: $red;
+                                        margin-top: 30px;
+                                        font-size: 18px;
+                                        span{
+                                            font-size: 10px;
+                                        }
+                                    }
+                                    del{
+                                        color: #ccc;
+                                        text-decoration: line-through;
+                                        font-size: 14px;
+                                    }
+                                    a{
+                                        padding: 0 0.8rem;
+                                        border-radius: 10rem;
+                                        color: #fff;
+                                        font-weight: bold;
+                                        height: 2.4rem;
+                                        line-height: 2.4rem;
+                                        position: absolute;
+                                        width: 4rem;
+                                        margin-left: -2rem;
+                                        bottom: 0;
+                                        left: 50%;
+                                        margin-bottom: -1.2rem;
+                                        font-size: 1.2rem;
+                                    }
+                                }
+                            }
+                        }
+                        .all_buy{
+                            margin-top: 40px;
+                            .to_buy{
+                                background-color: #fff;
+                                box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+                                border-radius: 16px;
+                                padding: 20px 0;
+                                width: 100%;
+                                height: 80px;
+                                margin: 0;
+                                position: relative;
+                                padding-left: 1.5rem;
+                                padding-right: 1.5rem;
+                                p{
+                                    line-height: 0;
+                                    margin: 10px 0;
+                                    display: inline-block;
+                                }
+                                .tag_yh{
+                                    position: absolute;
+                                    top: 0;
+                                    left: 20px;
+                                    width: 100px;
+                                    height: 20px;
+                                    margin-top: -6px;
+                                    line-height: 20px;
+                                    color: #fff;
+                                    background-color: $red;
+                                    font-size: 10px;
+                                    border-top-left-radius: 10px;
+                                    border-bottom-right-radius: 10px;
+                                    text-align: center;
+                                }
+                                .buy_month{
+                                    font-weight: bold;
+                                    color: #7B5839;
+                                    line-height: 40px;
+                                    margin: 0;
+                                    text-align: left;
+                                    margin-right: 20px;
+                                }
+                                .buy_price{
+                                    font-weight: bold;
+                                    color: $red;
+                                    line-height: 40px;
+                                    margin: 0;
+                                    text-align: left;
+                                    font-size: 18px;
+                                    span{
+                                        font-size: 10px;
+                                        
+                                    }
+                                }
+                                del{
+                                    color: #ccc;
+                                    text-decoration: line-through;
+                                    font-size: 14px;
+                                }
+                                a{
+                                    padding: 0 0.8rem;
+                                    border-radius: 10rem;
+                                    color: #fff;
+                                    font-weight: bold;
+                                    height: 2.4rem;
+                                    line-height: 2.4rem;
+                                    position: absolute;
+                                    width: 4rem;
+                                    top: 50%;
+                                    right: 20px;
+                                    margin-top: -1.2rem;
+                                    font-size: 1.2rem;
+                                    text-align: center;
+                                }
+                            }
+                        }
+                        
+                    }
+                }
+            }
+            .vip_ztb{
+               
+                border: 2px solid red;
+            }
+            .vip_gcxm{
+              
+                border: 2px solid green;
+            }
+        }
+    }
+    
+}
+
+.priv{
+    width: 100%;
+    margin-top: 30px;
+    h4{
+        font-weight: bold;
+        position: relative;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        font-size: 18px;
+        &::before{
+            content: '';
+            position: absolute;
+            width: 16px;
+            height: 4px;
+            background-color: $red;
+            top: 50%;
+            margin-top: -2px;
+            left: 50%;
+            margin-left: -150px;
+            border-radius: 5px;
+        }
+        &::after{
+            content: '';
+            position: absolute;
+            width: 16px;
+            height: 4px;
+            background-color: $red;
+            top: 50%;
+            margin-top: -2px;
+            right: 50%;
+            margin-right: -150px;
+            border-radius: 5px;
+        }
+    }
+    ul{
+        width: 100%;
+        
+        li{
+           padding: 15px 0;
+           position: relative;
+            &::after{
+                content: '';
+                position: absolute;
+                left: 0;
+                right: 0;
+                bottom: 0;
+                height: 1px;
+                background-color: $f0f0f0;
+            }
+            p{
+                font-weight: bold;
+               font-size: 16px;
+            }
+            span{
+                color: $blackafafaf;
+                margin-bottom: 10px;
+                font-size: 14px;
+            }
+            
+        }
+    }
+}
+
+
+.explain{
+    width: 100%;
+    margin-top: 20px;
+    font-size: 12px;
+    padding-bottom: 40px;
+    
+    p{
+        color: $blackafafaf;
+        margin-bottom: 10px;
+    }
+    ul{
+        li{
+            color: $blackafafaf;
+            line-height: 20px;
+        }
+    }
+}
+
+// 我的账户
+.page_account{
+    height: 16rem;
+    position: relative;
+    // 顶部切换
+    .account_nav{
+        width: 100%;
+        p{
+            width: 50%;
+            float: left;
+            height: 5rem;
+            line-height: 5rem;
+            text-align: center;
+            font-size: 1.5rem;
+            color: $black7a7a7a;
+            transition: .1s;
+        }
+    }
+
+    // 账号内容切换
+    .account_content{
+        position: absolute;
+        top: 6.4rem;
+        width: 100%;
+        height: auto;
+        .slide_box{
+            background-color: rgba(0, 0, 0, 0);
+            width: 200%;
+            overflow: hidden;
+            margin: 0 auto;
+            margin-left: -100%;
+            -webkit-transform: .2s;
+            transform: .2s;
+            .account_item{
+                float: left;
+                width: 50%;
+                background-color: rgba(0, 0, 0, 0);
+                padding: 0 1.5rem;
+                padding-bottom: 40px;
+                .account_card{
+                    width: 100%;
+                    background-color: $red;
+                    border-radius: 0.8rem;
+                    padding: 0 1.5rem;
+                    // height: 14rem;
+                    color: #fff;
+                    background-image: url('../static/img/bg_vip-card.png');
+                    background-repeat: no-repeat;
+                    background-size: cover;
+                    background-position: center;
+                    position: relative;
+                    div{
+                        &:not(:last-child){
+                            border-bottom: 1px solid rgba($color: #fff, $alpha: 0.3);
+                        }
+                        padding: 2.2rem 0;
+                        position: relative;
+                        h4{
+                            font-weight: bold;
+                            font-size: 2rem;
+                            padding-bottom: 1rem;
+                        }
+                        p{
+                            i{
+                                padding-right: 1rem;
+                                color: #FFD6D6;
+                                font-size: 1rem;
+                            }
+                        }
+                        a{
+                            padding: 0 1.2rem;
+                            border-radius: 5rem;
+                            color: #A17046;
+                            background-color: #F9F0E8;
+                            font-weight: bold;
+                            height: 3rem;
+                            line-height: 3rem;
+                            position: absolute;
+                            top: 50%;
+                            right: 0;
+                            margin-top: -1.5rem;
+                            font-size: 1.5rem;
+                            // width: 6rem;
+                            // text-align: center;
+                        }
+                    }
+                }
+                .shiming{
+                    width: 100%;
+                    height: 32px;
+                    line-height: 32px;
+                    border-radius: 50px;
+                    background-color: #F2E0BD;
+                    color: #fff;
+                    margin-top: 10px;
+                    i{
+                        border-radius: 50%;
+                        background-color: #F84C45;
+                        width: 16px;
+                        height: 16px;
+                        color: #fff;
+                        display: inline-block;
+                        text-align: center;
+                        line-height: 16px;
+                        margin-left: 10px;
+                    }
+                    p{
+                        display: inline-block;
+                        color: #B76012;
+                        font-size: 14px;
+                    }
+                    span{
+                        float: right;
+                        margin-right: 10px;
+                        color: #765D45;
+                        font-size: 14px;
+                    }
+                }
+
+                
+            }
+        }
+    }
+}
+
+// 公用泪飙头部
+.title_dy{
+    height: 4rem;
+    line-height: 4rem;
+    margin-top: 2rem;
+    position: relative;
+    &::after {
+        content: '';
+        position: absolute;
+        height: 1px;
+        background-color: #f0f0f0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin-left: -1.5rem;
+        margin-right: -1.5rem;
+    }
+    h3{
+        font-weight: bold;
+        display: inline-block;
+    }
+    a{
+        float: right;
+        color: $black202020;
+        font-size: 1.5rem;
+    }
+}
+
+// 账户详情
+.account_detail{
+    .detail_list{
+        li{
+         height: 5rem;
+         line-height: 5rem;
+         position: relative;
+         &::after{
+             position: absolute;
+             content: '';
+             display: block;
+             height: 1px;
+             left: 0;
+             bottom: 0;
+             right: 0;
+             background-color: $f0f0f0;
+             margin-right: -1.5rem;
+         }
+         a{
+             color: $black202020;
+             // font-size: 1.8rem;
+             span{
+                 color: $red;
+                 font-weight: bold;
+             }
+             i{
+                 float: right;
+                 color: $blackafafaf;
+                 position: relative;
+                 padding-right: 2rem;
+                 font-size: 1.5rem;
+                 &::after{
+                     position: absolute;
+                     content: '';
+                     display: block;
+                     width: 1.2rem;
+                     height: 1.2rem;
+                     top: 50%;
+                     right: 0;
+                     margin-top: -0.6rem;
+                     background-image: url('../static/img/arr_tototo.png');
+                     background-size: 60%;
+                     background-position: center;
+                     background-repeat: no-repeat;
+                 }
+             }
+         }
+        }
+    }
+ }
+
+// 一条交易详情
+.one_detail{
+    padding: 0 1.5rem;
+    .detail_money{
+        text-align: center;
+        position: relative;
+        height: auto;
+        padding: 3rem 0;
+        &::after{
+            position: absolute;
+             content: '';
+             display: block;
+             height: 1px;
+             left: 0;
+             bottom: 0;
+             right: 0;
+             background-color: $f0f0f0;
+        }
+        p{
+            font-size: 4rem;
+            // margin-bottom: 1rem;
+        }
+        span{
+            color: $blackafafaf;
+        }
+    }
+    .detail_content{
+        margin-top: 1rem;
+        li{
+            line-height: 4rem;
+            span{
+                color: $blackafafaf;
+            }
+            p{
+                float: right;
+            }
+        }
+    }
+}
+
+

+ 1 - 1
components/areaSelect.vue

@@ -217,7 +217,7 @@ export default {
   width: 100%;
   height: 50px;
   line-height: 50px;
-  position: absolute;
+  position: fixed;
   background-color: #ff5c5c;
   text-align: center;
   bottom: 0;

+ 2 - 2
components/industrySelect.vue

@@ -6,7 +6,7 @@
         v-for="(item,index) in industry"
         :key="index"
         @click="addClass(index)"
-        :class="{active:index==current}"
+        :class="{chooseOne:index==current}"
       >{{ item.text }}</li>
     </ul>
     <!-- end:选择大区 -->
@@ -39,7 +39,7 @@ export default {
     }
   },
  methods:{
-   addClass: function(index){
+   chooseOne: function(index){
      this.current=index;
    }
  }

+ 0 - 46
components/title.vue

@@ -1,46 +0,0 @@
-<template>
-  <div class="title_diy">
-    <h3>{{ heads }}</h3>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      head: ''
-    }
-  },
-  props: {
-    //第二种方式
-    heads: {
-      type: String,
-      default: function() {
-        return ''
-      }
-    }
-  },
-  created() {
-  
-  },
-  watch: {}
-}
-</script>
-  
-<style>
-.title_diy {
-  width: 100%;
-  height: 6rem;
-  line-height: 6rem;
-  position: relative;
-}
-.title_diy::after {
-  position: absolute;
-  height: 1px;
-  background-color: #f0f0f0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin-left: -1.5rem;
-  margin-right: -1.5rem;
-}
-</style>

+ 0 - 31
components/titles.vue

@@ -1,31 +0,0 @@
-<template>
-  <section class="head">
-    <img src="~/static/img/back.png" alt @click="go">
-    <span>{{tname}}</span>
-  </section>
-</template>
-<script>
-export default {
-  props: {
-    tname: String, //定义传值的类型<br>
-    required: true
-  },
-  methods: {
-    go(e) {
-      this.$router.go(-1)
-    }
-  },
-  watch: {}
-}
-</script>
-<style>
-.head img {
-  float: left;
-  padding-left: 6px;
-}
-.head span {
-  width: auto;
-  padding: 0;
-  padding-right: 20px;
-}
-</style>

+ 5 - 8
pages/bidding/index.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="detaile">
     <div class="head">
-      <img src="~/static/img/back.png" alt>
+      <img src="~/static/img/back.png" alt @click="go">
       <span>项目详情</span>
       <img src="~/static/img/NotCollection.png" alt>
       <img src="~/static/img/share.png" alt>
@@ -203,11 +203,6 @@ export default {
   components: {
     payment
   },
-  computed: {
-    todos() {
-      return this.$store.state.todos.list
-    }
-  },
   data() {
     return {
       payment: false,
@@ -215,8 +210,7 @@ export default {
     }
   },
   created: function() {
-    console.log(this.$store.state.counter)
-    this.$store.commit('equal',30)
+    this.$store.commit('equal', 30)
   },
   mounted() {
     console.log(this.$store.state.counter)
@@ -230,6 +224,9 @@ export default {
   methods: {
     payments(e) {
       this.payment = true
+    },
+    go(e) {
+      this.$router.go(-1)
     }
   }
 }

+ 65 - 0
pages/bidding/sub.vue

@@ -0,0 +1,65 @@
+<template>
+  <section class="sub">
+    <tit :tname="name"/>
+    <ul class="add">
+      <li>
+        <span class="title">项目行业</span>
+        <span class="name">
+          工业建筑/勘探设计/酒店建筑
+          <img src="~/static/img/to.png" alt>
+        </span>
+      </li>
+      <li>
+        <span class="title">项目行业</span>
+        <span class="name">
+          工业建筑/勘探设计/酒店建筑
+          <img src="~/static/img/to.png" alt>
+        </span>
+      </li>
+      <li>
+        <span class="title">项目行业</span>
+        <span class="name">
+          工业建筑/勘探设计/酒店建筑
+          <img src="~/static/img/to.png" alt>
+        </span>
+      </li>
+      <li>
+        <span class="title">项目行业</span>
+        <span class="name">
+          工业建筑/勘探设计/酒店建筑
+          <img src="~/static/img/to.png" alt>
+        </span>
+      </li>
+      <li>
+        <span class="title">项目行业</span>
+        <span class="name">
+          工业建筑/勘探设计/酒店建筑
+          <img src="~/static/img/to.png" alt>
+        </span>
+      </li>
+    </ul>
+    <button>确认</button>
+  </section>
+</template>
+
+<script>
+import tit from '~/components/titles.vue'
+export default {
+  components: {
+    tit
+  },
+  data() {
+    return {
+      name: '前期项目订阅管理'
+    }
+  },
+  methods: {
+    Subscribe(e) {
+      this.$router.push({ path: '/bidding/sub?id=20' })
+    }
+  }
+}
+</script>
+
+<style>
+</style>

+ 4 - 5
pages/index.vue

@@ -2,7 +2,7 @@
   <section class="bid">
     <div class="search">
       <input type="text" placeholder="请输入搜索内容">
-      <span>我的订阅</span>
+      <span @click="Subscribe">我的订阅</span>
     </div>
     <sel/>
     <ul class="bidlist">
@@ -92,9 +92,8 @@ export default {
     }
   },
   methods: {
-    addTodo(e) {
-      this.$store.commit('todos/add', e.target.value)
-      e.target.value = ''
+    Subscribe(e) {
+      this.$router.push({ path: '/bidding/sub' })
     }
   }
 }
@@ -104,7 +103,7 @@ export default {
 .bid {
   height: 100%;
 }
-body div {
+body  div {
   height: 100%;
 }
 .p1 {

+ 4 - 1
pages/me/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="page_me">
     <!-- 顶部个人消息 -->
     <div class="top_info">
       <!-- 头像名字 -->
@@ -87,6 +87,9 @@ body{
   padding-bottom: 6rem;
   background-color: #f8f9fa
 }
+.page_me{
+  padding-bottom: 6rem;
+}
 .list_item{
   font-size: 1.6rem;
   font-weight: bold;

+ 2 - 15
pages/project/index.vue

@@ -100,19 +100,6 @@ export default {
 }
 </script>
 
-<style>
-.bid {
-  height: 100%;
-}
-body div {
-  height: 100%;
-}
-.p1 {
-  display: -webkit-box;
-  /* -webkit-box-orient: vertical; */
-  /*! autoprefixer: ignore next */
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
+<style scoped>
+
 </style>

+ 16 - 0
static/css/style.css

@@ -11,4 +11,20 @@
   background: -o-linear-gradient(right, #ff5c5c, #ff8f8f); /* Opera 11.1 - 12.0 */
   background: -moz-linear-gradient(right, #ff5c5c, #ff8f8f); /* Firefox 3.6 - 15 */
   background: linear-gradient(to right, #ff5c5c , #ff8f8f); /* 标准的语法 */
+}
+.page_vip{
+  background: -webkit-linear-gradient(45deg, #262729, #3e484d); /* Safari 5.1 - 6.0 */
+  background: -o-linear-gradient(45deg, #262729, #3e484d); /* Opera 11.1 - 12.0 */
+  background: -moz-linear-gradient(45deg, #262729, #3e484d); /* Firefox 3.6 - 15 */
+  background: linear-gradient(45deg, #262729, #3e484d); /* 标准的语法 */
+}
+.to_buy a{
+  background: -webkit-linear-gradient(left, #ff5c5c , #ff8f8f); /* Safari 5.1 - 6.0 */
+  background: -o-linear-gradient(right, #ff5c5c, #ff8f8f); /* Opera 11.1 - 12.0 */
+  background: -moz-linear-gradient(right, #ff5c5c, #ff8f8f); /* Firefox 3.6 - 15 */
+  background: linear-gradient(to right, #ff5c5c , #ff8f8f); /* 标准的语法 */
+}
+
+i{
+  font-style: normal;
 }

static/img/arr_tototo.png → static/img/to.png