样式修改

src/components/AllorderInfo.vue

@@ -16,11 +16,11 @@
                     />
                     <div>
                         <div class="text1">订单将在 4:22 后自动取消</div>
-                        <div class="text1">请尽快完成支付</div>
+                        <div class="text1 text2">请尽快完成支付</div>
                     </div>
                     <img
-                        class="inter"
-                        src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-03-15-55-47ydOMSMGa.png"
+                        class="inter2"
+                        src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-15-14-15-50oEVgXoZN.png"
                         alt=""
                     />
                 </div>
@@ -128,23 +128,31 @@ export default {
                 justify-content: space-between;
                 margin: 14px 0 17px;
                 .avatar {
-                    margin-right: 6px;
+                    // margin-right: 6px;
                     width: 48px;
                     height: 48px;
                     border-radius: 8px !important;
                 }
                 .text1 {
                     font-size: 14px;
-                    font-weight: 400;
+                    font-weight: bold;
                     color: #000;
                     line-height: 20px;
                     margin-left: -72px;
+                    &.text2 {
+                        color: #c8c9cc;
+                        font-weight: 400;
+                    }
                 }
                 .inter {
                     width: 28px;
                     height: 28px;
                     margin-right: -10px;
                 }
+                .inter2 {
+                    width: 12px;
+                    height: 24px;
+                }
             }
             .btn {
                 display: flex;

src/pages/Home.vue

@@ -186,6 +186,7 @@ export default {
             &.active {
                 font-size: 18px;
                 color: @prim;
+                font-weight: bold;
                 border-bottom: 2px solid @prim;
                 // width: 6px;
             }

src/pages/allorder.vue

@@ -87,7 +87,7 @@ export default {
 <style lang="less" scoped>
 .container {
     background: @bg;
-    padding-top: 40px;
+    padding-top: 35px;
     min-height: 562px;
     .box-tab {
         background: #ffffff;
@@ -95,8 +95,8 @@ export default {
         justify-content: space-between;
         position: fixed;
         top: 0;
-        width: 77%;
-        padding: 18px 65px 10px 20px;
+        width: 92%;
+        padding: 18px 16px 10px 16px;
         .tab-item {
             font-size: 14px;
             color: #cccccc;
@@ -104,7 +104,8 @@ export default {
 
             &.active {
                 color: @prim;
-                border-bottom: 1px solid @prim;
+                font-weight: bold;
+                border-bottom: 2px solid @prim;
             }
         }
     }

src/pages/confirmorder.vue

@@ -360,13 +360,15 @@ export default {
             border-radius: 12px;
             .tabs {
                 padding: 16px 59px 0;
+                color: #878787;
                 display: flex;
                 justify-content: space-between;
                 .tab {
                     &.active {
                         color: @prim;
                         padding-bottom: 10px;
-                        border-bottom: 1px solid @prim;
+                        font-weight: 400;
+                        border-bottom: 2px solid @prim;
                     }
                 }
                 border-bottom: 1px solid @bg;
@@ -401,7 +403,7 @@ export default {
             }
         }
         .border {
-            border: 1px solid @bg;
+            border-bottom: 1px solid @bg;
             margin: 16px 12px 20px;
         }
         .time {
@@ -472,7 +474,7 @@ export default {
             }
         }
         .border {
-            border: 1px solid @bg;
+            border-bottom: 1px solid @bg;
             margin: 10px 14px 16px;
         }
         .content1 {

src/pages/merchantorders.vue

@@ -209,7 +209,7 @@
                 <img
                     :src="
                         `https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/${
-                            tal ? '2021-09-01-16-30-24QYDxYMzU.png' : '2021-09-01-16-30-03wvZqsAeX.png'
+                            tal ? '2021-09-15-13-52-40fgNrakko.png' : '2021-09-01-16-30-03wvZqsAeX.png'
                         }`
                     "
                     alt=""
@@ -267,6 +267,8 @@ export default {
             active2: '全部',
             falg: 0,
             min: 0,
+            or_amount: 0,
+            // now_amount: 0,
             show: false,
             count: 0,
             tal: 0,
@@ -388,6 +390,9 @@ export default {
             this.min = 1;
         },
         add(price) {
+            var that = this;
+            this.or_amount = 0;
+            this.now_amount = 0;
             this.tal = this.tal + price + this.count;
         },
         minus(price) {
@@ -421,11 +426,13 @@ export default {
         width: 28px;
         height: 24px;
         background: @prim;
+        border-radius: 2px;
         color: #fff;
     }
     /deep/ .van-stepper__plus {
         width: 28px;
         height: 24px;
+        border-radius: 2px;
         background: @prim;
         color: #fff;
     }
@@ -465,13 +472,13 @@ export default {
                     }
                     .text2 {
                         width: 64px;
-                        height: 20px;
+                        height: 22px;
                         background: #d3edff;
                         font-size: 13px;
                         border-radius: 2px;
-                        line-height: 20px;
+                        line-height: 22px;
                         text-align: center;
-                        margin: 6px 0 0 12px;
+                        margin: 4px 0 0 12px;
                         color: @prim;
                     }
                 }
@@ -574,6 +581,7 @@ export default {
                 margin-right: 20px;
                 font-size: 13px;
                 color: #939599;
+                background: #efefef;
                 text-align: center;
                 line-height: 20px;
                 &.active2 {

src/pages/mine.vue

@@ -210,7 +210,7 @@ export default {
                 height: 24px;
             }
             &.text2 {
-                margin-top: 20px;
+                margin-top: 16px;
             }
         }
     }

src/pages/orderdetails.vue

@@ -10,20 +10,20 @@
 <template>
     <div class="container">
         <nav-header></nav-header>
-        <van-sticky>
-            <div class="top">
-                <img
-                    class="mytest"
-                    src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-02-16-02-06RPYZopsT.png"
-                    alt=""
-                />
-                <div class="text1">待支付</div>
-                <div class="text2">
-                    请尽快支付，<span v-if="minters < 10">0</span>{{ minters }}分<span v-if="seconds < 10">0</span
-                    >{{ seconds }} 后未支付将自动取消订单
-                </div>
+        <!-- <van-sticky> -->
+        <div class="top">
+            <img
+                class="mytest"
+                src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-02-16-02-06RPYZopsT.png"
+                alt=""
+            />
+            <div class="text1">待支付</div>
+            <div class="text2">
+                请尽快支付，<span v-if="minters < 10">0</span>{{ minters }}分<span v-if="seconds < 10">0</span
+                >{{ seconds }} 后未支付将自动取消订单
             </div>
-        </van-sticky>
+        </div>
+        <!-- </van-sticky> -->
         <div class="conBox">
             <div class="store">
                 <div class="title">
@@ -255,7 +255,7 @@ export default {
         }
     }
     .conBox {
-        padding-top: 60px;
+        padding-top: 50px;
         .store {
             .flex();
             justify-content: space-between;
@@ -281,8 +281,8 @@ export default {
         }
         .border {
             padding: 0 16px;
-            border: 1px solid @bg;
-            margin: 10px 0 16px;
+            border-bottom: 1px solid @bg;
+            margin: 10px 16px 16px;
         }
         .content {
             display: flex;
@@ -381,9 +381,9 @@ export default {
                 line-height: 20px;
             }
             .text1 {
-                font-size: 13px;
+                font-size: 16px;
                 font-weight: 400;
-                color: #c8c9cc;
+                color: #000000;
                 line-height: 22px;
             }
         }
@@ -399,7 +399,7 @@ export default {
                         width: 38px;
                         height: 18px;
                         border-radius: 2px;
-                        border: 2px solid #c8c9cc;
+                        border: 1px solid #c8c9cc;
                         font-size: 12px;
                         font-weight: 400;
                         color: #c8c9cc;

src/pages/schoolsearch.vue

@@ -80,7 +80,10 @@ export default {
             }
         }
         .text {
-            .span();
+            font-size: 14px;
+            color: #000000;
+            line-height: 24px;
+            font-weight: 400px;
             margin-left: 12px;
         }
     }

src/pages/shopsearch.vue

@@ -101,7 +101,10 @@ export default {
             }
         }
         .text {
-            .span();
+            font-size: 14px;
+            color: #000000;
+            line-height: 24px;
+            font-weight: 400px;
             margin-left: 12px;
         }
     }

src/pages/storedetails.vue

@@ -7,47 +7,47 @@
 <template>
     <div class="container">
         <nav-header></nav-header>
-        <van-sticky>
-            <swiper class="swiper" @change="swiperChange" :current="current">
-                <swiper-item v-for="(item, index) in banners" :key="index">
-                    <img :src="item.image" alt="" />
-                </swiper-item>
-            </swiper>
-            <div class="index">{{ swiperCurrent + 1 }}/{{ banners.length }}</div>
-            <div class="title">
-                <div class="top">
-                    <div class="text1">茶树菇老鸭套餐</div>
-                    <div class="text">
-                        <img src="../native/imgs/icon-shoucang@3x.png" alt="" />
-                        <div class="text2">收藏</div>
-                    </div>
+        <!-- <van-sticky> -->
+        <swiper class="swiper" @change="swiperChange" :current="current">
+            <swiper-item v-for="(item, index) in banners" :key="index">
+                <img :src="item.image" alt="" />
+            </swiper-item>
+        </swiper>
+        <div class="index">{{ swiperCurrent + 1 }}/{{ banners.length }}</div>
+        <div class="title">
+            <div class="top">
+                <div class="text1">茶树菇老鸭套餐</div>
+                <div class="text">
+                    <img src="../native/imgs/icon-shoucang@3x.png" alt="" />
+                    <div class="text2">收藏</div>
                 </div>
-                <div class="con">
-                    <div class="text1">已售 238</div>
-                    <div class="text1">赞 60</div>
+            </div>
+            <div class="con">
+                <div class="text1">已售 238</div>
+                <div class="text1">赞 60</div>
+            </div>
+            <div class="buttom" v-for="(item, index) in merchantorLists" :key="index">
+                <div class="text">
+                    <img
+                        src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-02-16-03-40cShzZQEk.png"
+                        alt=""
+                    />
+                    <div class="text1">{{ item.price }}</div>
+                    <div class="text3">.00</div>
+                    <div class="text2">另外配送费2元</div>
                 </div>
-                <div class="buttom" v-for="(item, index) in merchantorLists" :key="index">
-                    <div class="text">
-                        <img
-                            src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-09-02-16-03-40cShzZQEk.png"
-                            alt=""
-                        />
-                        <div class="text1">{{ item.price }}</div>
-                        <div class="text3">.00</div>
-                        <div class="text2">另外配送费2元</div>
-                    </div>
-                    <div class="calculationCon">
-                        <van-stepper
-                            :min="0"
-                            disable-input
-                            @minus="minus(item.price)"
-                            @plus="add(item.price)"
-                            @change="onChange"
-                        />
-                    </div>
+                <div class="calculationCon">
+                    <van-stepper
+                        :min="0"
+                        disable-input
+                        @minus="minus(item.price)"
+                        @plus="add(item.price)"
+                        @change="onChange"
+                    />
                 </div>
             </div>
-        </van-sticky>
+        </div>
+        <!-- </van-sticky> -->
 
         <div class="conTent">
             <div class="text">详情</div>
@@ -236,12 +236,14 @@ export default {
         width: 28px;
         height: 24px;
         background: @prim;
+        border-radius: 2px;
         color: #fff;
     }
     /deep/ .van-stepper__plus {
         width: 28px;
         height: 24px;
         background: @prim;
+        border-radius: 2px;
         color: #fff;
     }
     /deep/ .van-stepper__input {
@@ -355,7 +357,7 @@ export default {
         }
     }
     .evaluate {
-        margin-top: 20px;
+        margin-top: 16px;
         background: #ffffff;
         border-radius: 12px;
         padding: 20px 14px;
@@ -460,9 +462,8 @@ export default {
         }
     }
     .conTent {
-        margin-top: 145px;
+        margin-top: 141px;
         background: #ffffff;
-        border-radius: 12px;
         padding: 20px 14px;
         .text {
             font-size: 18px;

src/styles/common.less

@@ -97,7 +97,7 @@
      text-align: center;
      font-weight: bold;
      color: #fff;
-     border-radius: 0 4px 4px 0;
+     border-radius: 2px;
 }
 .mytest(){
     position: absolute;