戴艳蓉 vor 3 Jahren
Ursprung
Commit
0db751be17

+ 4 - 1
src/App.vue

@@ -65,7 +65,7 @@ html {
         .van-nav-bar-my-fixed {
           .van-nav-bar__content {
             // background: linear-gradient(0deg, #fafafa 0%, #f3d028 100%);
-            background-color: #111;
+            background-color: #C42323;
           }
         }
         .van-tabbar--fixed {
@@ -73,6 +73,9 @@ html {
           // background-color: #111111;
         }
       }
+      .layout{
+        overflow-x:hidden;
+      }
     }
     .van-dialog {
       padding:20px 20px 20px;

+ 2 - 1
src/assets/css/index.css

@@ -36,7 +36,8 @@
 }
 
 .van-button.van-button--default.van-button--large.van-dialog__confirm.van-hairline--left {
-  background: linear-gradient(0deg, #F2C482, #A07947) !important;
+  background: #C52828 !important;
+  color: #fff!important;
 }
 
 

BIN
src/assets/images/1/1.0@2x.jpg


BIN
src/assets/images/1/2.0@2x.jpg


BIN
src/assets/images/1/3.0@2x.jpg


BIN
src/assets/images/1/4.0@2x.jpg


BIN
src/assets/images/delete/del-active.png


BIN
src/assets/images/delete/del.png


BIN
src/assets/images/delete/select.png


BIN
src/assets/images/home/bottomBtn1.png


BIN
src/assets/images/home/product-active.png


+ 16 - 48
src/views/address/component/addrList.vue

@@ -2,31 +2,24 @@
   <div class="addrList">
     <div
       class="addressList"
-      v-for="(n, i) in cardData.length"
+      v-for="(n, i) in cardData"
       :key="i"
-      @click.stop="handleSelect(cardData[i])"
+      @click.stop="handleSelect(n)"
     >
       <div class="addressDetai">
         <div class="addrTitle">
-          <span>{{ cardData[i].name }}</span>
-          <span>{{ cardData[i].mobile }}</span>
+          <span>{{ n.name }}</span>
+          <span>{{ n.mobile }}</span>
           <p>
-            {{
-              `${cardData[i].city_name} ${cardData[i].area_name} ${cardData[i].address}`
-            }}
+            {{ `${n.city_name} ${n.area_name} ${n.address}` }}
           </p>
         </div>
         <div class="handle">
-          <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)">
+          <div class="del" @click.stop="addrdel(i)">
             <img :src="del" />
             <span>删除</span>
           </div>
-          <div class="edit" @click.stop="handleEdit(cardData[i])">
+          <div class="edit" @click.stop="handleEdit(n)">
             <img :src="edit" />
             <span>编辑</span>
           </div>
@@ -99,52 +92,27 @@ export default {
       console.log(e);
       this.iconname = this.iconname == e ? "0" : e;
     },
-    // getNewTime() {
-    //   this.newTime = new Date().valueOf();
-    // },
-    selected() {},
-    async delAddr(id) {
+    async delAddr(index) {
       this.loading = true;
-      let res = await asyncRequest.del({ id: id });
+      let res = await asyncRequest.del({ id: this.cardData[index].id });
       this.loading = false;
       if (res && res.code == 0) {
-        Toast.success("地址删除成功!");
         this.$emit("refresh");
-
-        // await this.searchList();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        Toast.fail(res.msg);
+        this.show_title(res.msg);
       }
     },
-    del(e) {
-      let aDom = document.getElementsByClassName("del")[0];
-      aDom.cancelBubble = true;
-      this.cardData.map((ele) => {
-        if (ele.id === e) {
-          ele.isShow = true;
-        } else {
-          ele.isShow = false;
-        }
-      });
+    addrdel(index) {
       Dialog.confirm({
         title: "温馨提示?",
         message: "确认删除该地址?",
       })
         .then(async () => {
-          await this.delAddr(e);
+          await this.delAddr(index);
         })
-        .catch(() => {
-          // on cancel
-          this.cardData.map((ele) => {
-            if (ele.id === e) {
-              ele.isShow = false;
-            } else {
-              ele.isShow = true;
-            }
-          });
-        });
+        .catch(() => {});
     },
     async searchList() {
       if (this.parmValue.page === 1) {
@@ -194,7 +162,7 @@ export default {
   .addressList {
     width: 90%;
     margin: 16.5px auto;
-    background: #fcfcf0;
+    background: #f5f5f5;
     border-radius: 8px;
     .addressDetai {
       padding: 25px 0 0 0;
@@ -202,7 +170,7 @@ export default {
         width: calc(100% - 40px);
         margin: 0 auto;
         padding: 0 20px 10px;
-        border-bottom: 1px solid #a5a5a3;
+        border-bottom: 1px solid #ebebeb;
         span:first-child {
           padding-right: 15px;
         }
@@ -256,7 +224,7 @@ export default {
             font-size: 1em;
             font-family: Source Han Sans CN;
             font-weight: 400;
-            color: #333333;
+            color: #888;
             display: inline-block;
             padding: 0 0 0 2px;
           }

+ 1 - 1
src/views/address/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="address" style="padding-top: 46px; background: #e6e6dc">
+  <div class="address" style="padding-top: 46px; background: #fff">
     <van-nav-bar
       title="我的地址"
       class="van-nav-bar-my-fixed"

+ 4 - 4
src/views/goods/index.vue

@@ -38,7 +38,7 @@ export default {
   },
   async created() {
     this.showList = [];
-     let index = this.$route.query.index;
+    let index = this.$route.query.index;
     this.getImgList(index ? index : 0);
   },
 
@@ -47,14 +47,14 @@ export default {
       window.history.back(-1);
     },
     getImgList(index) {
-       let total = 0;
-      let findi = this.list.findIndex((v) => v.index === (Number(index)+1) );
+      let total = 0;
+      let findi = this.list.findIndex((v) => v.index === Number(index) + 1);
       if (findi !== -1) {
         total = this.list[findi].total;
       }
       for (let i = 0; i < total; i++) {
         this.showList.push(
-          require(`@/assets/images/goods/${(Number(index)+1)}/${i + 1}.png`)
+          require(`@/assets/images/goods/${Number(index) + 1}/${i + 1}.png`)
         );
       }
     },

+ 17 - 11
src/views/my/index.vue

@@ -203,13 +203,15 @@ export default {
   width: 100%;
   height: 100%;
   background: #fff;
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
   .mine-resume {
     position: relative;
     box-sizing: border-box;
     width: 100%;
     background: #fff;
 
-   
     /**vip开通框 */
     .vip-box {
       width: 100%;
@@ -262,6 +264,8 @@ export default {
       p {
         font-size: 16px;
         font-weight: 400;
+        height: 40px;
+        line-height: 40px;
         color: #242424;
         font-weight: bolder;
         margin: 10px 0;
@@ -295,6 +299,7 @@ export default {
       padding: 16px 6px 10px 6px;
       display: flex;
       margin: 0 0 0 0px;
+      background: #f5f5f5;
       .cell-my-img {
         display: block;
         width: 60px;
@@ -333,6 +338,8 @@ export default {
   .common {
     font-size: 16px;
     font-weight: 400;
+    height: 40px;
+    line-height: 40px;
     font-weight: bolder;
     color: #242424;
     margin: 10px 0;
@@ -341,7 +348,7 @@ export default {
   .bottom {
     width: 100%;
     box-sizing: border-box;
-    padding:0 16px;
+    padding: 0 16px;
     margin: 12px auto;
 
     /**地址栏收获样式 */
@@ -351,6 +358,7 @@ export default {
       display: -ms-flexbox;
       display: flex;
       padding: 15px 4px;
+      background: #f5f5f5;
       .van-cell__title {
         width: 200px;
         position: relative;
@@ -417,7 +425,7 @@ export default {
       width: 100%;
       padding: 0;
       margin: 0;
-      color: #5C3501;
+      color: #5c3501;
       .headerBox {
         width: 100%;
         padding-top: 16px;
@@ -470,16 +478,14 @@ export default {
         }
       }
       @media screen and (min-width: 413px) {
-.headerBox{
-  padding-top:35px;
-}
-.headerDesc{
-  padding-top:78px;
-}
+        .headerBox {
+          padding-top: 35px;
+        }
+        .headerDesc {
+          padding-top: 78px;
+        }
       }
     }
   }
-
-
 }
 </style>

+ 6 - 2
src/views/product/index.vue

@@ -328,7 +328,7 @@ export default {
   }
 
   .item-ad {
-    background-color: #e6e6dc;
+    background-color: #f5f5f5;
     color: #999999;
     padding: 10px 16px;
     box-sizing: border-box;
@@ -341,7 +341,11 @@ export default {
       font-weight: 600;
       color: #111111;
       margin: 5px 0;
+     
     }
+     .tel {
+        padding: 0 0 0 5px;
+      }
 
     .item-ad__address {
       text-align: justify;
@@ -401,7 +405,7 @@ export default {
       color: #111111;
     }
     button {
-      background: #C42323;
+      background: #c42323;
       color: #fff;
       padding: 0;
       border: 0px;