戴艳蓉 преди 3 години
родител
ревизия
d91db45c86
променени са 6 файла, в които са добавени 190 реда и са изтрити 247 реда
  1. BIN
      src/assets/images/introduce/back@2x.png
  2. 35 35
      src/views/address/component/addrList.vue
  3. 9 6
      src/views/address/index.vue
  4. 3 4
      src/views/address/view.vue
  5. 19 44
      src/views/introduce/index.vue
  6. 124 158
      src/views/my/index.vue

BIN
src/assets/images/introduce/back@2x.png


+ 35 - 35
src/views/address/component/addrList.vue

@@ -17,23 +17,13 @@
           </p>
         </div>
         <div class="handle">
-          <div class="is_model" :class="{'checked':iconname==cardData[i].id}"
-               @click.stop="modelcheck(cardData[i].id)">
-
-            <!-- <van-icon name="checked" size="14" v-show="iconname==cardData[i].id"/>
-            <van-icon name="passed" size="14" v-show="iconname!=cardData[i].id"/>
-            <span>设为默认</span> -->
-          </div>
+          <div
+            class="is_model"
+            :class="{ checked: iconname == cardData[i].id }"
+            @click.stop="modelcheck(cardData[i].id)"
+          ></div>
           <div class="del" @click.stop="del(cardData[i].id)">
-              <!-- v-show="!cardData[i].isShow" -->
-
-            <img
-              src="@/assets/images/delete/del-active.png"
-            />
-            <!-- <img
-              src="@/assets/images/delete/del-active.png"
-              v-show="cardData[i].isShow"
-            /> -->
+            <img src="@/assets/images/delete/del-active.png" />
             <span>删除</span>
           </div>
           <div class="edit" @click.stop="handleEdit(cardData[i])">
@@ -43,6 +33,13 @@
         </div>
       </div>
     </div>
+    <div
+      class="addmore"
+      v-if="total > 0 && list.length < total && list.length > 0"
+      @click="pageData"
+    >
+      点击加载更多!
+    </div>
   </div>
 </template>
 
@@ -53,15 +50,12 @@ import { Dialog, Toast } from "vant";
 export default {
   name: "addrList",
   props: ["list", "disabledList", "newTime"],
-  //    @add="onAdd"
-  //       @select="onSelect"
-  //       @edit="onEdit"
   data() {
     return {
       id: "",
       sum: 0,
       isShow: false,
-      iconname:0,
+      iconname: 0,
       //   newTime: "",
       cardData: [],
       parmValue: {
@@ -99,10 +93,9 @@ export default {
     handleSelect(e) {
       this.$emit("select", e);
     },
-    modelcheck(e){
-      console.log(e)
-      this.iconname = this.iconname==e ? '0':e;
-
+    modelcheck(e) {
+      console.log(e);
+      this.iconname = this.iconname == e ? "0" : e;
     },
     // getNewTime() {
     //   this.newTime = new Date().valueOf();
@@ -186,9 +179,16 @@ export default {
 
 <style lang="scss" scoped>
 .addrList {
-  width: 100vw;
-  height: 50vh;
-  //   border: 1px solid red;
+  width: 100%;
+  position: relative;
+  overflow-y: scroll;
+  .addmore {
+    text-align: center;
+    color: #999;
+    height: 30px;
+    line-height: 30px;
+    width: 100%;
+  }
   .addressList {
     width: 90%;
     margin: 16.5px auto;
@@ -199,7 +199,7 @@ export default {
       .addrTitle {
         width: calc(100% - 40px);
         margin: 0 auto;
-        padding:0 20px 10px ;
+        padding: 0 20px 10px;
         border-bottom: 1px solid #a5a5a3;
         span:first-child {
           padding-right: 15px;
@@ -211,7 +211,7 @@ export default {
           color: #4d4d4d;
         }
         p {
-          font-size:1em;
+          font-size: 1em;
           font-family: Source Han Sans CN;
           font-weight: 400;
           color: #999999;
@@ -224,9 +224,9 @@ export default {
         margin: 0 auto;
         height: 20px;
         padding: 10px;
-        .is_model{
+        .is_model {
           display: inline-block;
-          span{
+          span {
             margin-left: 5px;
             font-size: 1em;
             font-family: Source Han Sans CN;
@@ -234,10 +234,10 @@ export default {
             color: #888888;
           }
         }
-        .checked{
-          color:#C69C63;
-          span{
-            color:#C69C63;
+        .checked {
+          color: #c69c63;
+          span {
+            color: #c69c63;
           }
         }
         .edit,

+ 9 - 6
src/views/address/index.vue

@@ -2,13 +2,16 @@
   <div class="address" style="padding-top: 46px; background: #e6e6dc">
     <van-nav-bar
       title="我的地址"
+      
       class="van-nav-bar-my-fixed"
       left-arrow
       @click-left="onClickLeft"
       :right-text="isRes === '1' || total === 0 ? '' : ''"
-      @click-right="onClickRight"
+      @click-right="onAdd"
       fixed
-    />
+    ><template #right>
+    <van-icon name="plus" size="18" />
+  </template></van-nav-bar>
     <addr-list
       v-if="newTime !== ''"
       :newTime="newTime"
@@ -20,7 +23,7 @@
       @select="onSelect"
       @edit="onEdit"
     />
-    <van-address-list :disabled-list="[]" @add="onAdd" @edit="onEdit" />
+    <!-- <van-address-list :disabled-list="[]" @add="onAdd" @edit="onEdit" /> -->
     <!-- <div class="edit">编辑</div>
     <div class="del">删除</div>
     <div class="normal">设为默认</div> -->
@@ -214,7 +217,9 @@ export default {
   height: 100%;
   padding: 48px 0 0 0;
   box-sizing: border-box;
-  background-color: red;
+  overflow-y:scroll;
+  // background-color: red;
+
   .van-tag--danger {
     background: rgb(255, 131, 39);
   }
@@ -233,7 +238,6 @@ export default {
       border-radius: 10px!important;
       color:#282826;
       font-size: 1.2em;
-      font-family: Source Han Sans CN;
       font-weight: 400;
     }
   }
@@ -250,7 +254,6 @@ export default {
   width: 72px;
   height: 17px;
   font-size: 18px;
-  font-family: Source Han Sans CN;
   font-weight: 500;
   // color: #1a1a1a;
   color: #daad70;

+ 3 - 4
src/views/address/view.vue

@@ -28,6 +28,7 @@
 import asyncRequest from "@/apis/address/index";
 import resToken from "@/mixins/resToken";
 import { areaList } from "@vant/area-data";
+import { isMobile } from "@/utils/validate";
 export default {
   mixins: [resToken],
   data() {
@@ -59,9 +60,7 @@ export default {
   },
   methods: {
     validator(e) {
-      let myreg1 = /^[1][3,4,5,7,8][0-9]{9}$/;
-      let myreg2 = /^[2][3,4,5,7,8][0-9]{6}$/;
-      if (!myreg1.test(e) && !myreg2.test(e)) {
+      if (!isMobile(e)) {
         return false;
       } else {
         return true;
@@ -136,7 +135,7 @@ export default {
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  background: rgb(230, 230, 220)!important;
+  background: rgb(230, 230, 220) !important;
   .van-address-edit__buttons {
     button {
       float: right;

+ 19 - 44
src/views/introduce/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="introduce">
-    <div v-if="showList&&showList.length>0">
+    <div class="header">
+      <img :src="back" alt="" @click="onClickLeft">
+    </div>
+    <div class="list" v-if="showList&&showList.length>0">
       <img v-for="(img,index) in showList" :key="img+index" :src="img" alt="">
     </div>
     <!-- <div class="addr-null">
@@ -20,6 +23,7 @@ export default {
   data() {
     return {
       title: null,
+      back:require(`@/assets/images/introduce/back@2x.png`),
       showList: [],
       list: [
         {
@@ -86,54 +90,25 @@ export default {
  width: 100%;
  height: 100%;
  overflow-y: scroll;
+ .list{
+
+ 
  img{
    display: inline-block;
    width: 100%;
 
+ }}
+ .header{
+   position: absolute;
+   height: 46px;
+   width: 100%;
+   top:0;
+   left:0;
+   img{
+     width: 9px;
+     margin: 18px 0 0 16px;
+   }
  }
 }
-
-//空地址时候的样式
-// .addr-null {
-//   width: 230px;
-//   height: 227.5px;
-//   box-sizing: border-box;
-//   position: fixed;
-//   left: 50%;
-//   top: 150px;
-//   transform: translateX(-50%);
-//   text-align: center;
-//   font-size: 12px;
-//   font-weight: 400;
-//   color: #959595;
-//   // line-height: 7px;
-//   img {
-//     width: 230px;
-//     height: 227.5px;
-//   }
-//   .addr-null-title {
-//     display: flex;
-//     justify-content: center;
-//     p {
-//       margin: 0 0 10px 0;
-//       width: 68.5px;
-//       height: 16px;
-//       font-size: 17px;
-//       font-family: Source Han Sans CN;
-//       font-weight: 500;
-//       color: #1a1a1a;
-//       line-height: 20px;
-//     }
-//     .p1 {
-//       width: 262px;
-//       height: 23px;
-//       font-size: 25px;
-//       font-family: Source Han Sans CN;
-//       font-weight: 400;
-//       color: #999999;
-//       line-height: 44px;
-//     }
-//   }
-// }
 </style>
 

+ 124 - 158
src/views/my/index.vue

@@ -2,35 +2,38 @@
   <div class="my">
     <div class="mine-resume">
       <div class="bgImg">
+        <img src="@/assets/images/my/personal/bgImg.png" alt="" />
+      </div>
 
       <div class="my-info">
-<!--        <img src="@/assets/images/my/personal/my-info.png" alt="" />-->
+        <div class="my-info-bg">
+          <img src="@/assets/images/my/personal/my-info.png" alt="" />
+        </div>
         <div class="mine-resume-main">
-          <ul class="clear headerBox">
-            <div class="headerImg">
+          <div class="clear headerBox">
+            <div class="clear headerImg">
               <img :src="header" alt="" />
               <div class="header-info">
                 <p>欢迎您!</p>
                 <span>尊敬的金卡用户</span>
               </div>
             </div>
-            <div class="headerDesc">
+            <ul class="headerDesc clear">
               <li v-if="userData === null">
                 <p class="title"><span>登录</span></p>
               </li>
               <li v-else class="usable">
-                <span>有效期至{{ userData.expiretime }}</span>
+                <div>有效期至:{{ userData.expiretime }}</div>
               </li>
               <li class="header-username">
-                <span>NO:{{ username }}</span>
+                <div>NO:{{ username }}</div>
               </li>
-            </div>
-          </ul>
+            </ul>
+          </div>
         </div>
       </div>
-      </div>
+
       <div class="top">
-        <!-- 我的页面下待收,待发、售后盒子 -->
         <p>我的订单</p>
         <ul class="cell-vip">
           <li
@@ -65,9 +68,9 @@
             </div>
           </div>
         </div>
-
       </div>
-      <div class="my-btn-main">
+    
+    <div class="my-btn-main">
       <!-- <van-button
         class="my-button"
         block
@@ -79,7 +82,6 @@
       <div class="footer">
         <img src="@/assets/images/my/footer.png" />
       </div>
-      <div style="height: 50px"></div>
     </div>
     </div>
   </div>
@@ -88,7 +90,6 @@
 <script>
 import asyncRequest from "@/apis/my/index";
 import resToken from "@/mixins/resToken";
-import { Dialog } from "vant";
 export default {
   mixins: [resToken],
   data() {
@@ -219,100 +220,7 @@ export default {
     width: 100%;
     background: #e6e6dc;
 
-    .mine-resume-main {
-      // background:linear-gradient(0deg, rgba(255,255,255,.1) 0%, #fff 80%);;
-      // background-color: #fff;
-      padding: 20px;
-      ul {
-        background: transparent;
-        li {
-          &:first-child {
-            width: calc(100% - 60px);
-            p {
-              width: 188px;
-              padding: 0 16px 0 0;
-              margin: 0;
-              color: #daad70;
-
-              // color: #1a1a1a;
-              font-size: 12px;
-              line-height: 16px;
-              color: #999999;
-              &.title {
-                color: #daad70;
-
-                // color: #1a1a1a;
-                font-weight: bolder;
-                font-size: 16px;
-                height: 100px;
-                line-height: 21px;
-                padding: 0 16px 0 0;
-              }
-            }
-          }
-          &:last-child {
-            // width: 60px;
-            text-align: center;
-            margin: 0 0 0 0;
-          }
-        }
-      }
-      .headerBox {
-        margin: 0 auto;
-      }
-      .headerImg {
-        width: 47.5px;
-        height: 47.5px;
-        border-radius: 50%;
-        img {
-          width: 100%;
-          border-radius: 50%;
-        }
-        .header-info {
-          width: 86px;
-          height: 29.5px;
-          float: left;
-          margin: -43px 0 0 60px;
-          // position: absolute;
-          // left: 55px;
-          // top: 7px;
-          p {
-            margin: 0;
-            // width: 74px;
-            height: 15px;
-            font-size: 15px;
-            font-family: Source Han Sans CN;
-            font-weight: 500;
-            color: #5c3501;
-            line-height: 15px;
-            opacity: 0.8;
-          }
-          span {
-            color: #5c3501;
-          }
-        }
-      }
-      .headerDesc {
-        display: flex;
-        height: 19px;
-        width: 100%;
-        justify-content: space-between;
-        margin-top: 80px;
-        .usable {
-          font-size: 0.5rem;
-          font-family: Source Han Sans CN;
-          font-weight: 400;
-          color: #5c3501;
-        }
-        .header-username {
-          margin: 0 0px 0 10px;
-          font-size: 0.5rem;
-          font-family: Source Han Sans CN;
-          font-weight: 500;
-          color: #5c3501;
-        }
-      }
-    }
+   
     /**vip开通框 */
     .vip-box {
       width: 100%;
@@ -348,7 +256,7 @@ export default {
       width: 90%;
       margin: 40px auto;
       box-sizing: border-box;
-     padding-bottom: 60px;
+      padding-bottom: 60px;
       .footer {
         img {
           width: 100%;
@@ -357,18 +265,18 @@ export default {
     }
     //  <!-- 我的页面下待收,待发、售后盒子 -->
     .top {
-      width: 90%;
-      margin:auto;
+      width: 100%;
       box-sizing: border-box;
       background: #e6e6dc;
-      margin-top: 90px;
+      margin: -110px 0 0 0;
+      padding: 0 16px;
       // height:140px;
       p {
         font-size: 16px;
-        font-family: Source Han Sans CN;
         font-weight: 400;
         color: #242424;
-        margin:10px 0;
+        font-weight: bolder;
+        margin: 10px 0;
       }
       .vip-box {
         height: 70px;
@@ -397,19 +305,18 @@ export default {
       // width: 331px;
       background: #fcfcf0;
       border-radius: 16px;
-      padding: 10px 20px;
+      padding: 16px 6px 10px 6px;
       display: flex;
       margin: 0 0 0 0px;
       .cell-my-img {
         display: block;
-        width: 45px;
-        height: 45px;
+        width: 60px;
+        height: 60px;
       }
       .vip-title {
         display: inline-block;
         height: 10px;
         line-height: 20px;
-        font-family: Source Han Sans CN;
         font-weight: 400;
         color: #8a8a8a;
       }
@@ -427,7 +334,9 @@ export default {
           display: inline-block;
         }
         span {
-          height: 16px;
+          height: 20px;
+
+          line-height: 20px;
           display: block;
         }
       }
@@ -436,17 +345,18 @@ export default {
 
   .common {
     font-size: 16px;
-    font-family: Source Han Sans CN;
     font-weight: 400;
+    font-weight: bolder;
     color: #242424;
-    margin:10px 0;
+    margin: 10px 0;
   }
 
   .bottom {
-    width: 90%;
+    width: 100%;
     box-sizing: border-box;
     background: #e6e6dc;
-    margin:20px auto;
+    padding:0 16px;
+    margin: 12px auto;
 
     /**地址栏收获样式 */
     .cell-list {
@@ -455,7 +365,7 @@ export default {
       display: -webkit-box;
       display: -ms-flexbox;
       display: flex;
-      padding:  20px;
+      padding: 15px 4px;
       .van-cell__title {
         width: 200px;
         position: relative;
@@ -473,60 +383,116 @@ export default {
           margin: 0 auto;
           text-align: center;
           .cell-my-img {
-            height: 25px;
+            height: 28px;
 
             width: 100%;
             overflow: hidden;
             img {
               display: inline-block;
-              height: 25px;
-              width: 25px;
+              height: 28px;
               margin: 0 auto;
             }
           }
           .custom-title {
-            margin-top: 8px;
+            margin-top: 4px;
           }
         }
       }
     }
   }
 
-  //常用功能下的按钮
-
-  // 改
   .bgImg {
     width: 100%;
-    height: 246px;
-    background: url("../../assets/images/my/personal/bgImg.png") no-repeat center;
-    background-size:100% 100%;
     position: relative;
+    img {
+      display: inline-block;
+      width: 100%;
+    }
   }
   .my-info {
-    width: 90%;
-    position: absolute;
-    left: 5%;
-    bottom: -65px;
-    margin: auto;
-    background: url("../../assets/images/my/personal/my-info.png") no-repeat center;
-    background-size:100% 100%;
+    position: relative;
+    top: -110px;
+    left: 0;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 16px;
+    .my-info-bg {
+      width: 100%;
+      position: relative;
+      img {
+        width: 100%;
+      }
+    }
+    .mine-resume-main {
+      position: absolute;
+      top: 0;
+      left: 16px;
+      box-sizing: border-box;
+      width: 100%;
+      padding: 0;
+      margin: 0;
+      .headerBox {
+        width: 100%;
+        padding-top: 16px;
+        position: relative;
+        box-sizing: border-box;
+        .headerImg {
+          float: left;
+          width: calc(100% - 32px);
+          box-sizing: border-box;
+          padding: 0 0 0 16px;
+          img {
+            float: left;
+            width: 40px;
+          }
+          div.header-info {
+            height: 50px;
+            width: 70%;
+            float: left;
+            p,
+            span {
+              width: 100%;
+              margin: 0 0 0 10px;
+              padding: 0;
+              float: left;
+              display: block;
+              line-height: 20px;
+            }
+          }
+        }
+      }
+      .headerDesc {
+        position: relative;
+        padding: 65px 0 0 0;
+        width: calc(100% - 32px);
+        li {
+          float: left;
+          width: 50%;
+          text-align: left;
+          box-sizing: border-box;
+          padding: 0 0 0 16px;
+          &:last-child {
+            float: right;
+            width: 50%;
+            text-align: right;
+            padding: 0 16px 0 0;
+          }
+          div {
+            line-height: 20px;
+          }
+        }
+      }
+      @media screen and (min-width: 413px) {
+.headerBox{
+  padding-top:35px;
+}
+.headerDesc{
+  padding-top:78px;
+}
+      }
+    }
   }
-  //@media screen and (min-width: 320px) {
-  //  .mine-resume .mine-resume-main .headerDesc {
-  //    margin-top: 27px;
-  //  }
-  //}
-  //@media screen and (min-width: 375px) {
-  //  .mine-resume .mine-resume-main .headerDesc {
-  //    margin-top: 53px;
-  //    margin: 53px 0 0 5px;
-  //  }
-  //}
-  //@media screen and (min-width: 414px) {
-  //  .mine-resume .mine-resume-main .headerDesc {
-  //    margin-top: 53px;
-  //    margin: 66px 0 0 5px;
-  //  }
-  //}
+
+
 }
 </style>