样式修改

src/components/orderBtn.vue

@@ -117,7 +117,7 @@ export default {
 </script>
 <style lang="less" scoped>
 /deep/ .van-popup {
-    margin-bottom: 73px;
+    // padding-bottom: 73px;
     border-radius: 12px 12px 0 0;
 }
 .box-total {

src/pages/Home.vue

@@ -17,15 +17,17 @@
                     <img class="avatar" v-if="userInfo" :src="userInfo.avatar" />
                     <div @click.stop="navigateTo('/pages/schoolsearch')">
                         <div class="text1">南京***大学</div>
-                        <div class="text1">江宁校区</div>
+                        <div style="display: flex;justify-content: space-between;">
+                            <div class="text1">江宁校区</div>
+                            <van-image
+                                style="margin:5rpx 0 0 12rpx"
+                                width="32rpx"
+                                height="32rpx"
+                                lazy-load
+                                src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-10-33-11pcsYuQkQ.png"
+                            />
+                        </div>
                     </div>
-                    <van-image
-                        style="margin: 25px 0 0 -13px;"
-                        width="16"
-                        height="16"
-                        lazy-load
-                        src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-10-33-11pcsYuQkQ.png"
-                    />
                 </div>
             </van-sticky>
             <div class="con">
@@ -37,16 +39,18 @@
                 <div class="search">
                     <van-field
                         :value="searchVal"
+                        readonly
                         placeholder="搜索"
                         @click="navigateTo('/pages/shopsearch')"
                         type="text"
                         clearable
                     />
-                    <img
-                        class="sousuo"
-                        src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-16-09-53-26QAqibCrM.png"
-                        alt=""
-                    />
+                    <!-- <span slot="right-icon">
+                        <img
+                            class="sousuo"
+                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-16-09-53-26QAqibCrM.png"
+                            alt=""
+                    /></span> -->
                 </div>
                 <swiper class="swiper" :autoplay="true" :indicator-dots="true">
                     <swiper-item v-for="(item, index) in banners" :key="index">
@@ -70,6 +74,9 @@
                     @click="tab(item)"
                 >
                     {{ item }}
+                    <div style="margin-top:12px">
+                        <div class="slip" :class="{ active: item === active }"></div>
+                    </div>
                 </div>
             </div>
         </van-sticky>
@@ -168,11 +175,11 @@ export default {
                 }
             }
             .search {
-                margin: 30rpx 0 40rpx;
+                margin: 20px 0 20px;
                 /deep/ .van-cell {
                     --cell-vertical-padding: 4px;
                     width: 100%;
-                    height: 64rpx;
+                    height: 32px;
                     background: rgb(99, 184, 252);
                     border-radius: 21px;
                 }
@@ -181,13 +188,13 @@ export default {
                 }
                 /deep/ .van-field__placeholder {
                     color: #fff;
-                    margin-left: 50%;
+                    margin-left: 156px;
                 }
                 .sousuo {
-                    position: absolute;
-                    left: 163px;
-                    top: 17.5%;
-                    // top: 16.7%;
+                    // position: absolute;
+                    // left: 163px;
+                    // top: 17.5%;
+                    // // top: 16.7%;
                     width: 16px;
                     height: 16px;
                     // background: red;
@@ -216,13 +223,18 @@ export default {
             line-height: 22px;
             z-index: 88;
             margin: 9px 34px 0 0;
-            padding-bottom: 10px;
             &.active {
                 font-size: 18px;
                 color: @prim;
                 font-weight: bold;
-                border-bottom: 2px solid @prim;
-                // width: 6px;
+            }
+            .slip {
+                width: 16px;
+                margin: 0 auto;
+                &.active {
+                    border-bottom: 2px solid @prim;
+                    border-radius: 2px;
+                }
             }
         }
         .tabs:last-child {

src/pages/allorder.vue

@@ -15,6 +15,9 @@
                 @click="chageFn(item)"
             >
                 {{ item }}
+                <div style="margin-top:2px">
+                    <div class="slip" :class="{ active: item === active }"></div>
+                </div>
             </div>
         </div>
         <!-- <div v-for="(item, index) in allList" :key="index + 2">
@@ -101,11 +104,17 @@ export default {
             font-size: 14px;
             color: #cccccc;
             line-height: 24px;
-
             &.active {
                 color: @prim;
                 font-weight: bold;
-                border-bottom: 2px solid @prim;
+            }
+            .slip {
+                width: 16px;
+                margin: 0 auto;
+                &.active {
+                    border-bottom: 2px solid @prim;
+                    border-radius: 2px;
+                }
             }
         }
     }

src/pages/confirmorder.vue

@@ -24,12 +24,14 @@
                             @click="change(item)"
                         >
                             {{ item }}
+                            <div class="slip" :class="{ active: item === active }"></div>
                         </div>
                     </div>
                     <div class="address" @click.stop="navigateTo('/pages/chooseAddress')">
                         <div>
                             <div class="text">
                                 <img
+                                    v-if="active == '外卖配送'"
                                     src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-50JDBrQbgB.png"
                                     alt=""
                                 />
@@ -40,12 +42,20 @@
                                     {{ userInfo.nickname }} {{ userInfo.phone }}
                                 </div>
                             </div>
-                            <div v-if="active == '到店自取'" class="text2">商家地址</div>
+                            <div v-if="active == '到店自取'" class="text2 text3">商家地址</div>
                         </div>
                         <img
+                            v-if="active == '外卖配送'"
+                            class="imgBox1"
                             src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-16-00-00LxfIfsLZ.png"
                             alt=""
                         />
+                        <img
+                            v-else
+                            class="imgBox2"
+                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-16-16-40-17lRmfLjlp.png"
+                            alt=""
+                        />
                     </div>
                     <div class="border"></div>
                     <div class="time" @click="show = true">
@@ -341,8 +351,31 @@ export default {
     /deep/ .van-popup {
         margin-bottom: 0;
     }
+    /deep/ .van-sidebar-item--selected {
+        border: 0;
+    }
+    /deep/ .van-sidebar-item {
+        height: 56px;
+        line-height: 34px;
+        // color: #939599;
+    }
     /deep/ .van-action-sheet__description {
-        color: #000;
+        color: #939599;
+        height: 32px;
+        line-height: 32px;
+        border-bottom: 1px solid @bg;
+    }
+    /deep/ .van-tree-select {
+        height: 250px !important;
+    }
+    /deep/ .van-ellipsis {
+        height: 56px;
+        line-height: 56px;
+        text-align: center;
+        border-bottom: 1px solid @bg;
+    }
+    /deep/ .van-bottom-enter-to {
+        padding-bottom: 0;
     }
     /deep/ .van-cell {
         --cell-vertical-padding: 0px;
@@ -371,9 +404,16 @@ export default {
                 .tab {
                     &.active {
                         color: @prim;
-                        padding-bottom: 10px;
-                        font-weight: 400;
-                        border-bottom: 2px solid @prim;
+                        font-weight: bold;
+                    }
+                    .slip {
+                        width: 60px;
+                        margin: 0 auto;
+                        &.active {
+                            border-bottom: 2px solid @prim;
+                            border-radius: 2px;
+                            margin-top: 12px;
+                        }
                     }
                 }
                 border-bottom: 1px solid @bg;
@@ -391,21 +431,28 @@ export default {
                     font-weight: 400;
                     color: #000000;
                     line-height: 24px;
-                    margin-left: 5px;
                 }
                 img {
-                    width: 16px;
-                    height: 16px;
+                    width: 18px;
+                    height: 18px;
+                    margin-right: 5px;
                 }
             }
             .text2 {
                 .text14();
                 margin: 4px 0 0 20px;
+                &.text3 {
+                    margin: 4px 0 0;
+                }
             }
-            img {
+            .imgBox1 {
                 width: 12px;
                 height: 24px;
             }
+            .imgBox2 {
+                width: 28px;
+                height: 28px;
+            }
         }
         .border {
             border-bottom: 1px solid @bg;
@@ -535,7 +582,7 @@ export default {
         margin: 20px 0 0 12px;
         padding: 14px 0;
         .border {
-            border: 1px solid @bg;
+            border-bottom: 1px solid @bg;
             margin: 10px 14px 16px;
         }
         .remark {

src/pages/merchantorders.vue

@@ -37,6 +37,7 @@
                     @click="tab(item)"
                 >
                     {{ item }}
+                    <div class="slip" :class="{ active: item === active }"></div>
                 </div>
                 <div class="text">
                     <img src="../native/imgs/icon-shoucang@3x.png" alt="" />
@@ -55,6 +56,7 @@
                 <van-tree-select
                     :items="items"
                     height="115vw"
+                    :main-item-class="red"
                     :main-active-index="mainActiveIndex"
                     :active-id="activeId"
                     @onClickNav="onClickNav"
@@ -103,16 +105,36 @@
                             <div
                                 @click="navigateTo('/pages/storedetails')"
                                 class="merchantroCon"
-                                v-for="(item, index) in merchantorListss"
+                                v-for="(item, index) in merchantorListsData"
                                 :key="index"
                             >
-                                <img :src="item.image" alt="" />
+                                <img class="imgLeft" :src="item.image" alt="" />
                                 <div>
                                     <div class="text1">{{ item.name }}</div>
-                                    <div class="text2">月销{{ item.num }}&nbsp;&nbsp; 赞60</div>
+                                    <div class="text2">月销{{ item.num }}&nbsp;&nbsp; 赞{{ item.fabulous }}</div>
                                     <div class="bottom" @click.stop>
                                         <div class="price">¥{{ item.price }}.00</div>
-                                        <van-stepper :value="1" @change="onChange" />
+                                        <div class="addcon">
+                                            <div v-if="item.currentNum > 0">
+                                                <img
+                                                    class="add"
+                                                    src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-16-10-33-22neKqYgYm.png"
+                                                    alt=""
+                                                    @click="minus(item)"
+                                                />
+                                            </div>
+                                            <div class="text" v-show="item.currentNum > 0">
+                                                {{ item.currentNum }}
+                                            </div>
+                                            <div>
+                                                <img
+                                                    class="add"
+                                                    src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-16-10-41-46reAOWvaa.png"
+                                                    alt=""
+                                                    @click="add(item)"
+                                                />
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -331,43 +353,21 @@ export default {
     /deep/ .van-button {
         .button();
     }
-    /deep/ .van-popup {
-        margin-bottom: 73px;
-        border-radius: 12px 12px 0 0;
-    }
     /deep/ .van-tree-select {
-        margin: 21px -20px 0;
+        margin-top: 20px;
     }
-    /deep/ .van-sidebar-item {
-        padding: 8px 0 8px 16px;
+    /deep/ .van-sidebar-item--selected {
+        border: 0;
+    }
+    /deep/ .van-sidebar-item__text {
+        margin-left: 3px;
     }
     /deep/ .van-tree-select__nav {
         -webkit-flex: 0.56;
         --sidebar-padding: 12px 8px 12px 12px;
     }
-    /deep/ .van-stepper__minus {
-        width: 24px;
-        height: 24px;
-        background: @prim;
-        border-radius: 2px;
-        color: #fff;
-    }
-    /deep/ .van-stepper__plus {
-        width: 24px;
-        height: 24px;
-        border-radius: 2px;
-        background: @prim;
-        color: #fff;
-    }
-    /deep/ .van-stepper__input {
-        width: 24px;
-        height: 24px;
-        background: #f5f7fa;
-        border-radius: 2px;
-        margin: 0 2px;
-    }
     .top {
-        padding: 96px 16px 0;
+        padding-top: 96px;
         .mytest {
             height: 155px;
             .mytest();
@@ -379,6 +379,7 @@ export default {
         .box {
             width: 343px;
             height: 120px;
+            margin: 0 16px;
             background: #ffffff;
             border-radius: 12px 12px 0 0;
             .title {
@@ -387,6 +388,7 @@ export default {
                 padding: 20px 12px;
                 .text {
                     display: flex;
+
                     .text1 {
                         font-size: 18px;
                         font-weight: bold;
@@ -433,13 +435,20 @@ export default {
             color: #000000;
             line-height: 22px;
             margin-right: 36px;
-            padding-bottom: 11px;
             &.active {
                 color: @prim;
                 font-weight: bold;
-                border-bottom: 2px solid @prim;
+            }
+            .slip {
+                margin: 10px 0 0 7px;
+                &.active {
+                    border-bottom: 2px solid @prim;
+                    width: 16px;
+                    border-radius: 2px;
+                }
             }
         }
+
         border-bottom: 1px solid @bg;
         .text {
             .flex();
@@ -460,7 +469,6 @@ export default {
         }
     }
     .content {
-        padding: 0 16px 0 16px;
         .merchantroCon {
             .flex();
             margin-bottom: 20px;
@@ -507,6 +515,7 @@ export default {
 
         .tabs2 {
             .flex();
+            padding: 0 16px;
             margin-top: 20px;
             .tab2 {
                 width: 38px;
@@ -526,6 +535,7 @@ export default {
             }
         }
         .evaluateCon {
+            padding: 0 16px;
             display: flex;
             margin-top: 20px;
             img {
@@ -580,6 +590,7 @@ export default {
             }
         }
         .characteristic {
+            padding: 0 16px;
             .title {
                 .span();
                 margin: 20px 0 6px;

src/pages/orderdetails.vue

@@ -3,7 +3,6 @@
     "navigationBarTextStyle": "white",
     "backgroundTextStyle":"light",
     "navigationStyle": "custom",
-    "backgroundColorTop":'#159EFF',
     "backgroundColorBottom":'#ffffff'
 }
 </config>