aa

src/app.wpy

@@ -12,17 +12,17 @@
     height: 100%;
   }
   .pc{
-    background: #FAC135!important;
+    background: #45C9C2!important;
   }
-
 .sc{
-  background: #0468C3!important;
+  background: #45C9C3!important;
 }
 
 .mytabbar {
-  --tabbar-item-font-size: 32rpx;
+  --tabbar-item-font-size: 20rpx;
+  --tabbar-item-margin-bottom: 5rpx;
   //--tabbar-item-icon-size:61px;
-  --tabbar-height: 161rpx;
+  --tabbar-height: 100rpx;
 }
 </style>
 
@@ -84,17 +84,17 @@ wepy.app({
     title_top: "24",
     title_text: "xxx", // iphone X + 24
     prefix: 24,
-    urlPrefix: 'https://tmallab.com/sd/api'
-    // urlPrefix: "http://127.0.0.1:8888/api"
-
+    // urlPrefix: 'https://sd.tmallab.com/spring/api'
+    urlPrefix: "http://127.0.0.1:8888/api"
   }
 });
 </script>
 <config>
 {
     pages: [
+'pages/progress',
+
       'pages/index',
-      'pages/progress',
     ],
 <!--"plugins": {-->
 <!--"ocr-plugin": {-->

src/components/header.wpy

@@ -66,7 +66,7 @@
   <div class="title"
        style="height:{{title_height}}px;padding-top:{{statusbarHeight}}px;background-color:{{background}}">
     <div class="title_text" style="height:{{title_height-statusbarHeight}}px;color:white">
-      <text>{{title_text}}</text>
+      <text style="color:{{textColor}};letter-spacing:2rpx">{{title_text}}</text>
 
       <div class="title_text" style="justify-content: flex-start;height:{{title_height-statusbarHeight}}px;width: 100vw;position: fixed;z-index: 100000;">
 
@@ -120,6 +120,10 @@ const app = getApp().$wepy.$options
         type: String,
         default: app.config.title_text,
       },
+      textColor: {
+        type: String,
+        default: 'white',
+      },
       background: {
         type: String,
         default: '#A6C185',

src/pages/progress.wpy

 <style lang="less" type="text/less" scoped>
   .list-item{
-    padding: 0 19rpx;
-    margin-top: 18rpx;
-    border-radius: 10rpx;
+    padding: 0 31rpx;
+    margin-bottom: 25rpx;
     background: white;
     box-sizing: border-box;
     height: 265rpx;
@@ -16,7 +15,8 @@
       width: 100%;
       .right{
         label{
-          font-size: 30rpx;
+          letter-spacing:2rpx;
+          font-size: 31rpx;
           font-weight: 400;
         }
       }
@@ -35,10 +35,11 @@
         align-items: center;
         width: 100%;
         position: absolute;
-        margin-top: -44rpx;height: 52rpx;
+        margin-top: -46rpx;height: 52rpx;
       }
       .p1{
-        border-radius: 26rpx;
+        border: 8rpx solid white;
+        border-radius: 50%;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -47,13 +48,14 @@
         background: #BABABA;width: 52rpx;height: 52rpx;
       }
       .pp1{
-        border-radius: 26rpx;
+        border: 8rpx solid white;
+        border-radius: 50%;
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: center;
         position: absolute;
-        background: #FAC135;
+        background: #45C9C2;
         width: 52rpx;height: 52rpx;
       }
 
@@ -75,13 +77,14 @@
   }
 
   .main {
-    margin-bottom: 165rpx;
-    width: 716rpx;
+    padding-top: 25rpx;
+    margin-bottom: 100rpx;
+    width: 750rpx;
     flex: 1;
     overflow-y: scroll;
   }
   .progress{
-    --progress-height: 36rpx;
+    --progress-height: 40rpx;
   }
 
 
@@ -133,7 +136,7 @@
         align-items: center;
         justify-content: center;
         position: absolute;
-        background: #FAC135;
+        background: #45C9C2;
         width: 52rpx;height: 52rpx;
       }
       label{
@@ -162,18 +165,26 @@
     width: 272px;
     height: 91px;
     color: white!important;
-    background: #0468C3!important;
+    background: #45C9C3!important;
     border-radius: 46px!important;
   }
   .bt-subscribe{
-    border-radius: 19rpx;
+    border-radius: 28rpx;
     text-align: center;
-    font-size: 19rpx;
-    line-height: 37rpx;
-    width: 118rpx;
-    height: 37rpx;
+    font-size: 25rpx;
+    line-height: 60rpx;
+    width: 150rpx;
+    height: 60rpx;
     color: white;
-    background: #FAC135;
+    background: #45C9C2;
+  }
+  .tab{
+    height: 100%;
+    width: 50%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
   }
 </style>
 
@@ -191,9 +202,19 @@ module.exports.getTime = getTime;
 
 <template>
   <div class="container" style="align-items: center">
-    <header background="#FAC135 " title_text="进度查询"/>
-    <div class="main">
+    <header background="white" textColor="black" title_text="进度查询"/>
 
+    <div style="width: 100%;height: 100rpx;background: white;display: flex;flex-direction: row">
+      <div class="tab" style="border-bottom: 4rpx solid #45C9C3">
+        <image style="width: 33rpx;height: 33rpx" src="@/assets/kd.png"/>
+        <span style="margin-left: 9rpx;font-size: 33rpx;color: #45C9C3">快递</span>
+      </div>
+      <div class="tab">
+        <image style="width: 33rpx;height: 33rpx" src="@/assets/cs.png"/>
+        <span style="margin-left: 9rpx;font-size: 33rpx;color: #272727">超市</span>
+      </div>
+    </div>
+    <div class="main">
       <van-empty v-if="list.length===0" description="您还没有发布过捎带订单哦">
         <van-button custom-class="bottom-button">
           发布捎带
@@ -205,7 +226,7 @@ module.exports.getTime = getTime;
             <span>{{item.courierCompany}}</span>
             <span style="margin-left: 20rpx">{{item.pickupCode}}</span>
           </div>
-          <span style="font-size: 23rpx;color: #BABABA">{{item.create}}</span>
+          <span style="font-size: 30rpx;color: #BABABA">{{item.createTime}}</span>
         </div>
 
         <div class="middle">
@@ -214,22 +235,22 @@ module.exports.getTime = getTime;
               :percentage="item.percentage"
               track-color="#B9b9b9"
                           pivot-text=" "
-                          color="linear-gradient(to right, #FAC135 30%, #FEC135 100%);"
+                          color="linear-gradient(to right, #45C9C2 30%, #33BFF6 100%);"
                           stroke-width="" />
           <div class="cover">
-            <span style="margin-left: 30rpx">取件点</span>
+            <span style="margin-left: 30rpx;font-size: 25rpx">取件点</span>
 
 
-            <div @tap.stop="photo1(item)" class="{{[item.status>=1?'pp1':'p1']}}" style="margin-left: 116rpx">
-              <van-icon color="white" name="photograph" />
-            </div>
+<!--            <div @tap.stop="photo1(item)" class="{{[item.status>=1?'pp1':'p1']}}" style="margin-left: 116rpx">-->
+<!--              <van-icon color="white" name="photograph" />-->
+<!--            </div>-->
 
-            <span style="margin-left:78rpx" >快到楼下</span>
+            <span style="margin-left:78rpx;font-size: 25rpx" >快到楼下</span>
             <div @tap.stop="photo2(item)" class="{{[item.status>=2?'pp1':'p1']}}" style="margin-left: 296rpx">
               <van-icon color="white" name="photograph" />
             </div>
-            <span style="margin-left: 110rpx" >楼内配送</span>
-            <span style="margin-left: 40rpx" >订单送达</span>
+            <span style="margin-left: 110rpx;font-size: 25rpx" >楼内配送</span>
+            <span style="margin-left: 40rpx;font-size: 25rpx" >订单送达</span>
 
             <div @tap.stop="photo3(item)" class="{{[item.status==3 ?'pp1':'p1']}}" style="margin-left: 637rpx">
               <van-icon color="white"  name="photograph" />
@@ -261,7 +282,7 @@ module.exports.getTime = getTime;
           :percentage="currentItem.percentage"
           track-color="#B9b9b9"
           pivot-text=" "
-          color="linear-gradient(162deg, #FAC135 0%, #0468C3 100%);"
+          color="linear-gradient(162deg, #45C9C2 0%, #45C9C3 100%);"
           stroke-width="" />
         <div class="cover">
           <span style="margin-left: 30rpx">取件点</span>
@@ -328,20 +349,20 @@ module.exports.getTime = getTime;
 
   <!--    自定义tabbar-->
   <van-tabbar
-    active-color="#FAC135"
+    active-color="#45C9C2"
     active="{{ active }}" @change="onTabChange" class="mytabbar">
     <van-tabbar-item>
       <image
         slot="icon"
         src="@/assets/tab1.png"
         mode="aspectFit"
-        style="width: 67rpx; height: 67rpx;"
+        style="width: 50rpx; height: 50rpx;"
       />
       <image
         slot="icon-active"
         src="@/assets/tab1s.png"
         mode="aspectFit"
-        style="width: 67rpx; height: 67rpx;"
+        style="width: 50rpx; height: 50rpx;"
       />
       捎带快递
     </van-tabbar-item>
@@ -351,13 +372,13 @@ module.exports.getTime = getTime;
         slot="icon"
         src="@/assets/tab2.png"
         mode="aspectFit"
-        style="width: 67rpx; height: 67rpx;"
+        style="width: 50rpx; height: 50rpx;"
       />
       <image
         slot="icon-active"
         src="@/assets/tab2s.png"
         mode="aspectFit"
-        style="width: 67rpx; height: 67rpx;"
+        style="width: 50rpx; height: 50rpx;"
       />
       我的捎带
     </van-tabbar-item>
@@ -488,6 +509,8 @@ navigationBarTextStyle: "white",
 navigationBarBackgroundColor: "#45C9C3",
 navigationBarTitleText: '',
 usingComponents: {
+"van-tab": "module:@vant/weapp/lib/tab/index",
+"van-tabs": "module:@vant/weapp/lib/tabs/index",
 "van-empty": "module:@vant/weapp/lib/empty/index",
 header: '~@/components/header',
 "van-picker": "module:@vant/weapp/lib/picker/index",