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/index.wpy

@@ -6,7 +6,7 @@
 
 
 .main {
-  margin-bottom: 161rpx;
+  margin-bottom: 100rpx;
   box-sizing: border-box;
   flex: 1;
   overflow-y: scroll;
@@ -37,7 +37,6 @@
       border-radius: 50%;
       overflow: hidden;
       background: white;
-      z-index: 1000;
       width: 98rpx;
       height: 98rpx;
     }
@@ -48,7 +47,6 @@
       justify-content: center;
       border-radius: 50%;
       background: white;
-      z-index: 1000;
       width: 138rpx;
       height: 138rpx;
     }
@@ -61,7 +59,7 @@
 
 
 .message {
-  border: 1px solid #EBEBEB;
+  border: 1px solid white;
   border-radius: 7px;
   background: #FFFFFFDB;
   min-height: 228rpx;
@@ -93,7 +91,7 @@
         align-items: center;
         overflow-y: scroll;
         min-height: 148rpx;
-        max-height: 200rpx;
+        max-height: 152rpx;
       }
     }
 
@@ -122,7 +120,7 @@
   }
 
   .placeholder {
-    color: #0468C3  !important;
+    color: #45C9C3  !important;
   }
 
   .input-notnull {
@@ -169,7 +167,6 @@
   display: flex;
   flex-direction: column;
   margin-top: 22rpx;
-  border: 1px solid #EBEBEB;
   border-radius: 7px;
   background: #FFFFFFDB;
   min-height: 240rpx;
@@ -190,9 +187,12 @@
     justify-content: space-between;
 
     .address-text {
-      color: #636363;
-      width: 558rpx;
+      letter-spacing:2rpx;
       font-size: 29rpx;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #6C6565;
+      line-height: 40px;
     }
 
     image {
@@ -208,7 +208,6 @@
   display: flex;
   flex-direction: column;
   margin-top: 22rpx;
-  border: 1px solid #EBEBEB;
   border-radius: 7px;
   background: #FFFFFFDB;
   min-height: 422rpx;
@@ -231,11 +230,14 @@
     width: 100%;
 
     .tag-uncheck {
-      border: 1px solid #EBEBEB;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
       margin: 12rpx 24rpx 10rpx 0;
       box-sizing: border-box;
       height: 72rpx;
-      padding: 16rpx 31rpx;
+      padding: 0rpx 31rpx;
       font-size: 29rpx;
       color: #606060;
       border-radius: 34rpx;
@@ -243,13 +245,17 @@
     }
 
     .tag-checked {
-      border: 1px solid #FAC135;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid #45C9C2;
       margin: 12rpx 24rpx 10rpx 0;
       box-sizing: border-box;
       height: 72rpx;
-      padding: 16rpx 31rpx;
+      padding: 0rpx 31rpx;
       font-size: 29rpx;
-      color: #FAC135;
+      color: #45C9C2;
       border-radius: 34rpx;
       background: #F7F7F7;
     }
@@ -374,7 +380,7 @@
   label{
     font-size: 29rpx;
     font-weight: 400;
-    color: #0468C3;
+    color: #45C9C3;
     line-height: 40rpx;
   }
 }
@@ -393,7 +399,7 @@
   letter-spacing: 2rpx;
        width: 651rpx;
        height: 91rpx;
-       background: #0468C3;
+       background: #45C9C3;
        border-radius: 46rpx;
 }
 
@@ -402,14 +408,64 @@
   color: #969799!important;
 }
 .bt-service{
-  box-shadow:0 2rpx 4rpx rgba(0, 0, 0, .3);
-  width: 160rpx!important;
+  --button-normal-font-size: 30rpx!important;
+  display: flex!important;
+  flex-direction: row!important;
+  align-items: center!important;
+  padding-left: 33rpx!important;
+  background: white!important;
+  box-shadow:0 2rpx 4rpx rgba(0, 0, 0, .3)!important;
+  --button-default-height: 86rpx!important;
+  border-top-left-radius: 43rpx!important;
+  border-bottom-left-radius: 43rpx!important;
   position: fixed!important;
-  right: -30rpx!important;
+  right: -3rpx!important;
   bottom: 460rpx!important;
 }
+.pay-sheet-container{
+  align-items: center;
+  height: 800rpx;
+  width: 100%;
+  padding: 10rpx 55rpx 0 55rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  .choose-container{
+    width: 100%;height: 150rpx;display: flex;flex-direction: row;justify-content: space-between;margin-top: 20rpx;
+    .item{
+      width: 311rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;border: 1rpx solid #6F7270;border-radius: 8rpx;color: #6F7270;
+    }
+  }
+  .bt-pay{
+    margin-top: 30rpx;height: 84rpx;border-radius: 42rpx;width: 294rpx;background: #5BD0C7;display: flex;flex-direction: row;align-items: center;justify-content: center;font-size: 33rpx;color: white
+  }
 
+  .choose{
+    border: 1rpx solid #6FCAC2!important;
+    background: #ECFCF6!important;
+    color: #6FCAC2!important;
+  }
 
+}
+
+.sheet-title {
+  line-height: 52rpx;
+  height: 52rpx;
+  width: 100%;
+  font-size: 32rpx;
+  font-weight: 600;
+}
+.van-action-sheet__header{
+  --action-sheet-header-font-size: 43rpx!important;
+  --font-weight-bold: 400!important;
+  --action-sheet-header-height: 120rpx!important;
+}
+.auto-get{
+  width: 250rpx;font-size: 33rpx;background: white;border: 0px;font-weight: 500;letter-spacing: 2px;color: #0F8BFC;
+}
+.auto-get::after {
+  border: none;
+}
 </style>
 <!--<wxs module="m1" lang="babel">-->
 <!--const getTime = (time) => {-->
@@ -424,92 +480,92 @@
 <!--</wxs>-->
 <template>
   <div class="container" style="align-items: center">
-    <van-overlay show="{{ showMark }}" bind:click="onClickHide">
-      <header background="transparent" title_text="熊猫派捎带"/>
-      <scroll-view scroll-y="true" class="main">
-
-        <div class="header pc">
-          <div class="inner">
-            <div @tap="openChange" class="avatar-small">
-              <van-image
-                round
-                fit="cover"
-                width="88rpx"
-                height="88rpx"
-                :src="schoolIconUrl"
-              />
-            </div>
-            <div class="avatar-big">
-              <van-image
-                round
-                fit="cover"
-                width="126rpx"
-                height="126rpx"
-                src="../assets/main-logo.png"
-              />
-            </div>
-            <div class="avatar-small" @tap="mallClick">
-              <van-image
-                round
-                fit="cover"
-                width="88rpx"
-                height="88rpx"
-                src="../assets/mall.png"
-              />
-            </div>
-          </div>
-        </div>
-
-        <div class="message">
-          <div class="inner">
-            <div class="inner-top">
-              <div class="scroll-container">
-                <div v-if="!messageText"
-                     style="width: 9rpx;height: 40rpx;margin-top: -3rpx;align-self: center;margin-left: 24rpx"
-                     class="sc"/>
-
-                <textarea contenteditable="true" placeholder="粘贴短信或者识别截图"
-                          auto-height="true"
-                          fixed="true"
-                          @input="messageInput"
-                          placeholder-class="placeholder"
-                          v-model="messageText"
-                          class="{{messageText? 'input-notnull':'input-null'}}"/>
-              </div>
-              <img v-if="!messageText" src="@/assets/pic.png"/>
-              <img v-if="messageText" @tap="cleanMessage" src="@/assets/close.png"/>
-            </div>
+<!--    <van-overlay show="{{ showMark }}" bind:click="onClickHide">-->
+<!--      <header background="transparent" title_text="熊猫派捎带"/>-->
+<!--      <scroll-view scroll-y="true" class="main">-->
+
+<!--        <div class="header pc">-->
+<!--          <div class="inner">-->
+<!--            <div @tap="openChange" class="avatar-small">-->
+<!--              <van-image-->
+<!--                round-->
+<!--                fit="cover"-->
+<!--                width="88rpx"-->
+<!--                height="88rpx"-->
+<!--                :src="schoolIconUrl"-->
+<!--              />-->
+<!--            </div>-->
+<!--            <div class="avatar-big">-->
+<!--              <van-image-->
+<!--                round-->
+<!--                fit="cover"-->
+<!--                width="126rpx"-->
+<!--                height="126rpx"-->
+<!--                src="../assets/main-logo.png"-->
+<!--              />-->
+<!--            </div>-->
+<!--            <div class="avatar-small" @tap="mallClick">-->
+<!--              <van-image-->
+<!--                round-->
+<!--                fit="cover"-->
+<!--                width="88rpx"-->
+<!--                height="88rpx"-->
+<!--                src="../assets/mall.png"-->
+<!--              />-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+
+<!--        <div class="message">-->
+<!--          <div class="inner">-->
+<!--            <div class="inner-top">-->
+<!--              <div class="scroll-container">-->
+<!--                <div v-if="!messageText"-->
+<!--                     style="width: 9rpx;height: 40rpx;margin-top: -3rpx;align-self: center;margin-left: 24rpx"-->
+<!--                     class="sc"/>-->
+
+<!--                <textarea contenteditable="true" placeholder="粘贴短信或者输入快递及取货码"-->
+<!--                          auto-height="true"-->
+<!--                          fixed="true"-->
+<!--                          @input="messageInput"-->
+<!--                          placeholder-style="color:red;"-->
+<!--                          v-model="messageText"-->
+<!--                          class="{{messageText? 'input-notnull':'input-null'}}"/>-->
+<!--              </div>-->
+<!--              <img v-if="!messageText" src="@/assets/pic.png"/>-->
+<!--              <img v-if="messageText" @tap="cleanMessage" src="@/assets/close.png"/>-->
+<!--            </div>-->
 
-            <div class="parse-result" v-if="messageText">
-              <span style="font-size: 28rpx">识别结果</span>
-              <div>
-                <span style="color: #0468C3" v-if="messageComp">{{ messageComp }}</span>
-                <span style="color: #0468C3" v-else>未知快递公司</span>
-                <span v-if="messagePacketCode" style="margin-left: 25rpx;color: #0468C3;">{{ messagePacketCode }}</span>
-                <span v-else style="margin-left: 25rpx;color: #0468C3">无取件码</span>
-              </div>
-              <van-button icon="success" round type="primary" size="small" @tap="confirmMessage"
-                          v-bind:disabled="messageConfirmed">确认
-              </van-button>
-            </div>
-            <div v-if="messageText" class="parse-result" style="font-size: 24rpx;color: #BABABA;border: none">
-              识别仅供参考，若与实际意思不一致，请自行输入快递公司和取件码，例如："顺丰123"即可
-            </div>
+<!--            <div class="parse-result" v-if="messageText">-->
+<!--              <span style="font-size: 28rpx">识别结果</span>-->
+<!--              <div>-->
+<!--                <span style="color: #45C9C3" v-if="messageComp">{{ messageComp }}</span>-->
+<!--                <span style="color: #45C9C3" v-else>未知快递公司</span>-->
+<!--                <span v-if="messagePacketCode" style="margin-left: 25rpx;color: #45C9C3;">{{ messagePacketCode }}</span>-->
+<!--                <span v-else style="margin-left: 25rpx;color: #45C9C3">无取件码</span>-->
+<!--              </div>-->
+<!--              <van-button icon="success" round type="primary" size="small" @tap="confirmMessage"-->
+<!--                          v-bind:disabled="messageConfirmed">确认-->
+<!--              </van-button>-->
+<!--            </div>-->
+<!--            <div v-if="messageText" class="parse-result" style="font-size: 24rpx;color: #BABABA;border: none">-->
+<!--              识别仅供参考，若与实际意思不一致，请自行输入快递公司和取件码，例如："顺丰123"即可-->
+<!--            </div>-->
 
-          </div>
+<!--          </div>-->
 
-        </div>
+<!--        </div>-->
 
-        <image style="margin-left: 150rpx" src="@/assets/hint.png"/>
-        <span style="width: 482rpx!important;margin: 10rpx 160rpx;height: 91rpx!important;font-size: 33rpx;font-weight: 500;color: #FFFFFF;line-height: 46rpx;letter-spacing: 2rpx;">
-          注意不是快递运单号，而是取件时使用的短信取件码哦～～
-        </span>
+<!--        <image style="margin-left: 150rpx" src="@/assets/hint.png"/>-->
+<!--        <span style="width: 482rpx!important;margin: 10rpx 160rpx;height: 91rpx!important;font-size: 33rpx;font-weight: 500;color: #FFFFFF;line-height: 46rpx;letter-spacing: 2rpx;">-->
+<!--          注意不是快递运单号，而是取件时使用的短信取件码哦～～-->
+<!--        </span>-->
 
-        <van-button style="z-index: 1000!important;" @tap="know()" round color="#0468C3" custom-class="bt-submit">我知道了</van-button>
+<!--        <van-button style="z-index: 1000!important;" @tap="know()" round color="#45C9C3" custom-class="bt-submit">我知道了</van-button>-->
 
-      </scroll-view>
-    </van-overlay>
-    <header background="#FAC135" title_text="熊猫派捎带"/>
+<!--      </scroll-view>-->
+<!--    </van-overlay>-->
+    <header background="#45C9C2" title_text="熊猫派捎带"/>
 
     <div class="main">
 
@@ -525,20 +581,15 @@
             />
           </div>
           <div class="avatar-big">
-            <van-image
-              round
-              fit="cover"
-              width="126rpx"
-              height="126rpx"
+            <image
+              style="object-fit: cover;width:126rpx;height: 126rpx;border-radius: 50%;"
               src="../assets/main-logo.png"
             />
           </div>
           <div class="avatar-small" @tap="mallClick">
-            <van-image
+            <image
               round
-              fit="cover"
-              width="88rpx"
-              height="88rpx"
+              style="object-fit: cover;width:88rpx;height: 88rpx;border-radius: 50%;"
               src="../assets/mall.png"
             />
           </div>
@@ -553,24 +604,24 @@
                    style="width: 9rpx;height: 40rpx;margin-top: -3rpx;align-self: center;margin-left: 24rpx"
                    class="sc"/>
 
-              <textarea contenteditable="true" placeholder="粘贴短信或者识别截图"
+              <textarea contenteditable="true" placeholder="粘贴短信或者输入快递及取货码"
                         auto-height="true"
                         @input="messageInput"
-                        placeholder-class="placeholder"
+                        placeholder-style="color:#61BDBC;"
                         v-model="messageText"
                         class="{{messageText? 'input-notnull':'input-null'}}"/>
             </div>
-            <img v-if="!messageText" src="@/assets/pic.png"/>
+<!--            <img v-if="!messageText" src="@/assets/pic.png"/>-->
             <img v-if="messageText" @tap="cleanMessage" src="@/assets/close.png"/>
           </div>
 
           <div class="parse-result" v-if="messageText">
             <span style="font-size: 28rpx">识别结果</span>
-            <div>
-              <span style="color: #0468C3" v-if="messageComp">{{ messageComp }}</span>
-              <span style="color: #0468C3" v-else>未知快递公司</span>
-              <span v-if="messagePacketCode" style="margin-left: 25rpx;color: #0468C3;">{{ messagePacketCode }}</span>
-              <span v-else style="margin-left: 25rpx;color: #0468C3">无取件码</span>
+            <div style="max-width: 400rpx;">
+              <span style="color: #45C9C3" v-if="messageComp">{{ messageComp }}</span>
+              <span style="color: #45C9C3" v-else>未知快递公司</span>
+              <span v-if="messagePacketCode" style="margin-left: 25rpx;color: #45C9C3;">{{ messagePacketCode }}</span>
+              <span v-else style="margin-left: 25rpx;color: #45C9C3">无取件码</span>
             </div>
             <van-button icon="success" round type="primary" size="small" @tap="confirmMessage"
                         v-bind:disabled="messageConfirmed">确认
@@ -611,9 +662,9 @@
           <input v-model="remarkText" placeholder="也可以填写其他留言"/>
         </div>
       </div>
-      <van-button @tap="taskSubmit" round color="#0468C3" custom-class="bt-submit">提 交</van-button>
+      <van-button @tap="showPaySheet = true" round color="#45C9C3" custom-class="bt-submit">提 交</van-button>
     </div>
-      <van-button icon="service" open-type="contact" round custom-class="bt-service">客服</van-button>
+      <van-button icon="service" open-type="contact" custom-class="bt-service">客服</van-button>
 
     <van-action-sheet
       @close="closeAddressSheet"
@@ -633,14 +684,16 @@
         </div>
 
         <div class="item-container">
-          <div class="top">
-            <div style="width: 80%;display: flex;flex-direction: row;align-items: flex-end">
+          <div class="top" style="align-items: center">
+            <div style="width: 70%;display: flex;flex-direction: row;align-items: flex-end">
               <span>手机号</span>
               <input maxlength="11" v-model="addressSheet_Phone"
                      style="width: 220rpx;font-size: 34rpx;margin-left: 46rpx;"
                      placeholder="13000000000"/>
             </div>
-<!--            <div style="width: 20%;color: #FAC135" @tap="getPhone">-->
+<!--            <van-button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" hairline plain type="primary" size="normal">自动获取</van-button>-->
+            <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="auto-get">自动获取</button>
+<!--            <div style="width: 20%;color: #45C9C2" @tap="getPhone">-->
 <!--              自动获取-->
 <!--            </div>-->
           </div>
@@ -681,7 +734,7 @@
           </div>
 
         </van-cell-group>
-        <van-search @change="onChange" style="width: 90%;"
+        <van-search @change="onChange" style="width: 90%;border-radius: 10rpx"
                     @search="onSearch" :value="searchText" placeholder="请输入校区名" />
         <van-button @tap="updateSchool" round custom-class="bt-update sc">更 新</van-button>
 
@@ -740,6 +793,41 @@
       </button>
     </van-popup>
 
+    <van-action-sheet
+      title="订单支付"
+      @close="closePaySheet"
+      @click-overlay="closePaySheet"
+      v-bind:show="showPaySheet"
+    >
+      <div class="pay-sheet-container">
+        <div class="sheet-title">
+          服务说明
+        </div>
+        <span style="font-size: 24rpx;color: #787878">10秒下单，快递到寝</span>
+        <span style="font-size: 24rpx;color: #787878;margin-top: 5rpx">即使方寸大小的校园，也确保位置实时精确</span>
+
+        <div class="sheet-title" style="margin-top: 30rpx">
+          支付金额
+        </div>
+
+        <div class="choose-container">
+          <div class="item" :class="{'choose': paytype==1}" @tap="paytype = 1">
+            <span style="font-size: 38rpx;">2元/件</span>
+            <span style="font-size: 23rpx;margin-top: 18rpx;">普通快递</span>
+          </div>
+          <div class="item"  :class="{'choose': paytype==2}"  @tap="paytype = 2">
+            <span style="font-size: 36rpx;">5元/件</span>
+            <span style="font-size: 23rpx;margin-top: 18rpx;">比箱装饮料重或大</span>
+          </div>
+        </div>
+        <span style="margin-top: 35rpx;font-size: 28rpx;color: #6F7270">如未能取到快递，自动退还全部费用</span>
+        <span style="margin-top: 20rpx;font-size: 28rpx;color: #6F7270">大件实际为普通，自动退还多余费用</span>
+        <div class="bt-pay" @tap="pay">
+          支付
+        </div>
+      </div>
+    </van-action-sheet>
+
 
 
     <van-action-sheet
@@ -763,20 +851,20 @@
 
 <!--    自定义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>
@@ -786,13 +874,13 @@
           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>
@@ -828,8 +916,10 @@ wepy.page({
   mixins: [testMixin],
 
   data: {
+    paytype: 1,
     showMark: false,
     showUnOpenSheet: false,
+    showPaySheet: false,
     school: {},
     schoolSearchResult: [],
     showChangeSchoolSheet: false,
@@ -870,6 +960,53 @@ wepy.page({
   },
   computed: {},
   methods: {
+    getPhoneNumber (e) {
+      e = e.$wx
+      let _that = this
+
+      wx.login({
+        success: res => {
+          let param = {
+            encryptedData: encodeURIComponent(e.detail.encryptedData),
+            iv: encodeURIComponent(e.detail.iv),
+            code: res.code
+          }
+          http.post('/getWxPhone', param).then(data => {
+            _that.addressSheet_Phone = data.data.phoneNumber
+          })
+        }
+      })
+    },
+    pay(){
+      let _that = this
+      let param = {yuan: this.paytype===1?"0.02":"0.05"}
+      http.post('/task/pay',param).then(data => {
+        console.log(data)
+        data = data.data
+        console.log(data)
+
+        wx.requestPayment({
+          timeStamp: data.timeStamp,
+          nonceStr: data.nonceStr,
+          package: data.packageValue,
+          signType: 'MD5',
+          paySign: data.paySign,
+          success (res) {
+            _that.taskSubmit()
+          },
+          fail (res) {
+            wx.showToast({
+              title: '支付失败',
+              icon: 'none',
+              duration: 3000,
+              mask:true
+            })
+
+          }
+        })
+
+      })
+    },
     openChange(){
       this.showUnOpenSheet = false
       this.showChangeSchoolSheet = true
@@ -924,6 +1061,9 @@ wepy.page({
     closeSchoolSheet(){
       this.showChangeSchoolSheet = false
     },
+    closePaySheet(){
+      this.showPaySheet = false
+    },
     onTabChange(event){
       this.active = event.$wx.detail
 
@@ -971,10 +1111,12 @@ wepy.page({
         receiverName: this.address.name,
         parcelInfo: this.messageText,
         courierCompany: this.messageComp,
-        pickupCode: this.messagePacketCode
+        pickupCode: this.messagePacketCode,
+        pay: this.paytype===1?"2":"5"
       }
 
       http.post('/task/submit',param).then(data => {
+        this.closePaySheet()
         wx.showToast({
           title: '提交成功！',
           icon: 'success',
@@ -1162,7 +1304,7 @@ wepy.page({
 
           _that.initSchool()
 
-          http.post('/dormitory/getDormitoryBySchool', { pageIndex: 1, pageSize: 100 }).then(res => {
+          http.post('/dormitory/getBySchool', { pageIndex: 1, pageSize: 100 }).then(res => {
             _that.dormitoryList = res.data.map(v => {
               return v.name
             })
@@ -1183,6 +1325,7 @@ navigationBarTextStyle: "white",
 navigationBarBackgroundColor: "#45C9C3",
 navigationBarTitleText: '小树懒捎带',
 usingComponents: {
+"van-icon": "module:@vant/weapp/lib/icon/index",
 "van-overlay": "module:@vant/weapp/lib/overlay/index",
 "van-cell": "module:@vant/weapp/lib/cell/index",
 "van-cell-group": "module:@vant/weapp/lib/cell-group/index",

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",