From 7dee6b67d0c7374125c1a309e0afd2fb774bcbaa Mon Sep 17 00:00:00 2001
From: miko <136057505@qq.com>
Date: Mon, 12 Oct 2020 21:17:16 +0800
Subject: [PATCH] aa

---
 .idea/inspectionProfiles/Project_Default.xml |   1 -
 src/app.wpy                                  |  30 +-
 src/assets/info.png                          | Bin 1615 -> 1723 bytes
 src/assets/question.png                      | Bin 0 -> 1453 bytes
 src/common/eventHub.js                       |   6 +-
 src/common/http.js                           | 165 +++++
 src/pages/index.wpy                          | 605 ++++++++++++++++---
 src/pages/progress.wpy                       | 114 ++++
 8 files changed, 848 insertions(+), 73 deletions(-)
 create mode 100644 src/assets/question.png
 create mode 100644 src/common/http.js
 create mode 100644 src/pages/progress.wpy

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 5ba210e..822039b 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,7 +2,6 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="CssInvalidPropertyValue" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="HtmlRequiredTitleAttribute" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myValues">
diff --git a/src/app.wpy b/src/app.wpy
index 35ac16f..70e025b 100644
--- a/src/app.wpy
+++ b/src/app.wpy
@@ -14,6 +14,12 @@
   .pc{
     background: #FE991B!important;
   }
+
+.mytabbar {
+  --tabbar-item-font-size: 32rpx;
+  //--tabbar-item-icon-size:61px;
+  --tabbar-height: 161rpx;
+}
 </style>
 
 <script>
@@ -83,7 +89,8 @@ wepy.app({
 <config>
 {
     pages: [
-      'pages/index'
+      'pages/index',
+      'pages/progress'
     ],
     window: {
       navigationStyle: "custom",
@@ -91,5 +98,26 @@ wepy.app({
       navigationBarTitleText: 'WeChat',
       navigationBarTextStyle: 'black'
     }
+,
+"tabBar": {
+
+"custom": true,
+"selectedColor": "#A6C185",
+"list": [
+
+{
+"pagePath": "pages/progress",
+"text": "我的捎带",
+"iconPath": "assets/close.png",
+"selectedIconPath": "assets/close.png"
+},
+{
+"pagePath": "pages/index",
+"text": "捎带快递",
+"iconPath": "assets/close.png",
+"selectedIconPath": "assets/close.png"
+},
+]
+}
 }
 </config>
diff --git a/src/assets/info.png b/src/assets/info.png
index 7d10ff6897163c05d06d3b00cb10e2b8390ebd7f..5049069a11f08b703f5d613d622a4887e6d6274b 100644
GIT binary patch
delta 1707
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
BCN%&6

delta 1598
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

diff --git a/src/assets/question.png b/src/assets/question.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bee66ab1a565f86507c21af8ba488cbea5fd8cb
GIT binary patch
literal 1453
zcmV;e1ycHnP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000GaNkl<ZXhX$X
zU1(fY5T3bVAuRgfi`W*8;1AVOt<^p#E!ZCwi+!-5Pg44$mOi+(uxC!X5xPF4-7|L~
zRuP(7yIOqF3Kc2^t5HEgQAt5cEw+77NEG{GS`#0V+>x{FU6Rdi?zul}7eY4dH{Z;c
zbI#1%Ig60dt5T_~Ma0dX=PebHWdN`Y5$$gfkud-mL&UKl2*yR^On-m>w^_KxG$hq(
z^@$(|o&<pB0H7}>*KYuD((}Bt#bWXEn6^!LYystR`KEk6ze7ZJAmT$w9nZBBk#mSx
zo0^)cmCNOS;&3_(VCLHpu^u=8+!M!14D2N<L_}&t^rwrRlK^JkEFy;y@opE=v=|Y&
zjEH-Q=u8w>qyT2#2>|a#5q0VFT|{(zG44eL_`a`1gu4`+6D=Z=Qp)cH?kK<*V-M+~
z>YXCU03;$iwbr$ERBZ(qW7Z?$ml^oZj6y^<Xsy3$C0roD81o1s{+OBP42eW!jn?|7
zxs>w+*i;Ds_CJ4LhJLf8`UL<s%uTWL1o*zcUqlXO=`m|AL@X(#4u!l;0gVbfnn97e
zf{4QaaKZlM^ZBcjlamhuzypZ*f`~kpQq-lXsj1ar#cm2<=2rmV&6MPC_xARd3WdV8
zPCUk#G9n&G>8C(MZ&{9}0N?jVMI>==gNTDlsn;y2@B0UWAXsjDB@wwD5ibM4cK~pd
zh(;@w%JZJ*eV9}PBA!!9t!@fn=4SxlbW%b9_;+SzW>u+F`qdb73=wyA;F6h{nfptn
z(na6*k2m_Nq;9tm(WmtlU}n2#Urx#d07r;u4>R`zK=Xig;5$V`TbX$~0JJSmj&a!4
z+#L$A4;)J!4cozX6VXv-{uuyPM)3SjM17S?WrgQ?=TrC`C!%F&jM<2YU!))cL|m_w
z`kI-=f#+``x@CBHI6pBlG3kKs2oaG@===Ub5!s)HsJFNG)<U6h)ltAFMD%R6T3r(a
z!4GNtBH|%r=Jx?$TN<L-+1d5ET&^z&g7>0$MC5g?b(xv>0>B$l_=wL>SOIqXY)nby
zYF<CU7Ho_;gNRSN8g{^qSOK=bSe}x|#e9T_HZ`)I%|12@rF~tr0&La1IW1F!eLdw_
zj4g5^QqIWV^{xv*M5C0l^&#uvZT7p?)h#3<A8W1c%qa8V8!K4fLR~w=BJ!x#`g>-!
zB0kD!+carJq<)A~r_m09ohPD|%)AN_ZKD`D0ZAb6L?(r-o#Qay8)JqL@zn&uMVg4n
zA*@!bYl9&8CK4SJAR>FT)<>AxK8Qaa)7%N}dEUCPnX`k|JDjW>L5R3jDRrug0_sg+
zD8LSmijJ|l!s`7xGutV`!>&d#a8)8wp#VD~|15^F3-m7lxC#I(T)+u1PZ81C%pNHd
z1d!Nd!6T(*GR71T@o-|+7DExCAP7$O^z_(6d}mg?mPbVPYOU)7h~^3yV{AV(n$-wh
zM7H<z^jw&oo&5k2@6Aep9lZm<YOVG4c>?So%v=J1!K|EhiD!U_n!~qw)p2lea7iwg
zvo+zaE;&z2du4ihdfmXlz#k#eg7Tihh$U^1i`myx^ISmN{)Cxd1b}zC8A$@}mx$<C
ztKDK392yZT2^?i^A|m}-YtxQ6>WazUO5V_08bsWwl<GJDi)?Xk<ZVr-Tbal+(7IHO
z8P19S>EYkHzvy}1wqmguc~ca*0->0pp`j(y)6?M%eOK;_8~4MtTrOAJw{KrFRW5d@
zoCSm=jf%a)^Ste8#_{vE0phvFP^=bKSl3JtTfki6M$Om)0CqedcQ`x_05+$eZq4nk
z!7pef;uyAK?U2~>yp40eYSVac#~))YU%464T92gh7ux;@#R5r?j3e?600000NkvXX
Hu0mjf*h{bW

literal 0
HcmV?d00001

diff --git a/src/common/eventHub.js b/src/common/eventHub.js
index 491ddae..fcbb402 100644
--- a/src/common/eventHub.js
+++ b/src/common/eventHub.js
@@ -1,5 +1,5 @@
-import wepy from '@wepy/core';
+import wepy from '@wepy/core'
 
-let eventHub = new wepy();
+let eventHub = new wepy()
 
-export default eventHub;
+export default eventHub
diff --git a/src/common/http.js b/src/common/http.js
new file mode 100644
index 0000000..fa93721
--- /dev/null
+++ b/src/common/http.js
@@ -0,0 +1,165 @@
+module.exports = {
+  post,
+  get,
+  upload
+}
+
+// LOG控制
+const isLog = false
+// 网络请求超时
+const timeOut = 30 * 1000
+
+const prefix = 'http://127.0.0.1:8888/api'
+
+// MARK 网络请求
+function get(url, data) {
+  let token = wx.getStorageSync("token")
+  let header = {
+    'content-type': 'application/json',
+  }
+  if (token){
+    header.token = token
+  }
+
+  let schoolID = wx.getStorageSync("schoolID")
+  if(schoolID){
+    header.schoolID = schoolID
+  }
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: prefix+url,
+      data: data,
+      method: 'GET',
+      dataType: 'json',
+      timeout: timeOut,
+      responseType: 'text',
+      header: header,
+      success: function (res) {
+        let token = res.header.token
+        if(token){
+          wx.setStorageSync("token", token)
+        }
+        if(res.statusCode!==200){
+
+          wx.showToast({
+            title: '内部错误',
+            icon: 'none',
+            duration: 3000,
+            mask:true
+          })
+
+          reject(res.statusCode)
+        }
+        resolve(res.data)
+      },
+      fail: function (error) {
+
+        wx.showToast({
+          title: '内部错误',
+          icon: 'none',
+          duration: 3000,
+          mask:true
+        })
+        reject(error)
+      },
+      complete: (res) => {
+        wx.hideLoading()
+        wx.stopPullDownRefresh()
+        if (isLog) {
+          console.log('请求回调:', res)
+        }
+      },
+    })
+  })
+}
+
+
+
+// MARK 网络请求
+function post(url, data) {
+  let token = wx.getStorageSync("token")
+  let header = {
+    'content-type': 'application/json',
+  }
+  if (token){
+    header.token = token
+  }
+
+  let schoolID = wx.getStorageSync("schoolID")
+  if(schoolID){
+    header.schoolID = schoolID
+  }
+
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: prefix+url,
+      data: data,
+      method: 'POST',
+      dataType: 'json',
+      timeout: timeOut,
+      responseType: 'text',
+      header: header,
+      success: function (res) {
+        let token = res.header.token
+        if(token){
+          wx.setStorageSync("token", token)
+        }
+        if(res.statusCode!==200){
+
+          wx.showToast({
+            title: '内部错误',
+            icon: 'none',
+            duration: 3000,
+            mask:true
+          })
+
+          reject(res.statusCode)
+        }
+        resolve(res.data)
+      },
+      fail: function (error) {
+
+        wx.showToast({
+          title: '内部错误',
+          icon: 'none',
+          duration: 3000,
+          mask:true
+        })
+        reject(error)
+      },
+      complete: (res) => {
+        wx.hideLoading()
+        wx.stopPullDownRefresh()
+        if (isLog) {
+          console.log('请求回调:', res)
+        }
+      },
+    })
+  })
+}
+
+
+// MARK 上传文件
+function upload(event) {
+  var upTask = wx.uploadFile({
+    url: event.url,
+    filePath: event.filePath,
+    name: Date.parse(new Date()),
+    formData: event.formData,
+    complete: (res) => {
+      if (isLog) {
+        console.log('文件上传:', res)
+      }
+    },
+  })
+
+  // UploadTask.abort()
+  // 中断上传任务
+
+  // UploadTask.onProgressUpdate(function callback)
+  // 监听上传进度变化事件
+
+  // UploadTask.offProgressUpdate(function callback)
+  // 取消监听上传进度变化事件
+  return upTask
+}
diff --git a/src/pages/index.wpy b/src/pages/index.wpy
index 541a29c..3ed68f3 100644
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -3,12 +3,14 @@
   font-size: 36rpx;
   color: black;
 }
-.main{
+
+
+.main {
+  box-sizing: border-box;
   flex: 1;
   overflow-y: scroll;
   width: 100%;
 }
-
 .header {
   width: 100%;
   height: 170rpx;
@@ -54,7 +56,6 @@
   width: 678rpx;
   margin-left: 36rpx;
   margin-top: -80rpx;
-  max-height: 366rpx;
 
   .inner {
     border-radius: 7px;
@@ -65,14 +66,15 @@
     flex-direction: column;
     min-height: 148rpx;
 
-    .inner-top{
+    .inner-top {
       min-height: 148rpx;
       display: flex;
       flex-direction: row;
       align-items: center;
       justify-content: space-between;
       padding-right: 24rpx;
-      .scroll-container{
+
+      .scroll-container {
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -82,7 +84,7 @@
       }
     }
 
-    .parse-result{
+    .parse-result {
       box-sizing: border-box;
       justify-content: space-between;
       border-top: 1px solid #EBEBEB;
@@ -98,31 +100,55 @@
       width: 36rpx
     }
   }
-  .input-null{
+
+  .input-null {
     font-size: 33rpx;
-    margin-left:25rpx;
-    width: 553rpx;border: none
+    margin-left: 25rpx;
+    width: 553rpx;
+    border: none
   }
-  .placeholder{
-    color: black!important;
+
+  .placeholder {
+    color: black !important;
   }
-  .input-notnull{
+
+  .input-notnull {
     min-height: 148rpx;
     max-height: 170rpx;
     padding: 15rpx 13rpx;
     align-self: flex-start;
     font-size: 28rpx;
     height: 33rpx;
-    width: 553rpx;border: none
+    width: 553rpx;
+    border: none
   }
 }
-.bt-submit{
+
+.bt-submit {
+  margin-bottom: 40rpx;
   margin-left: 214rpx;
-  color: white!important;
+  color: white !important;
   margin-top: 43rpx;
-  height: 91rpx!important;
+  height: 91rpx !important;
   width: 322rpx;
 }
+
+.bt-submit-d {
+  margin-left: 214rpx;
+  color: white !important;
+  margin-top: 13rpx;
+  margin-bottom: 30rpx;
+  height: 91rpx !important;
+  width: 322rpx;
+}
+
+.bt-update {
+  color: white !important;
+  margin-top: 13rpx;
+  height: 91rpx !important;
+  width: 322rpx;
+}
+
 .address {
   margin-left: 36rpx;
 
@@ -165,7 +191,6 @@
 
 .remark {
   margin-left: 36rpx;
-
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -182,16 +207,17 @@
     height: 65rpx;
   }
 
-  .middle{
+  .middle {
     padding-top: 17rpx;
     display: flex;
-    align-content:flex-start;
+    align-content: flex-start;
     flex-direction: row;
     flex-wrap: wrap;
     box-sizing: border-box;
     height: 203rpx;
     width: 100%;
-    .tag-uncheck{
+
+    .tag-uncheck {
       border: 1px solid #EBEBEB;
       margin: 12rpx 24rpx 10rpx 0;
       box-sizing: border-box;
@@ -202,6 +228,18 @@
       border-radius: 34rpx;
       background: #F7F7F7;
     }
+
+    .tag-checked {
+      border: 1px solid #FE991B;
+      margin: 12rpx 24rpx 10rpx 0;
+      box-sizing: border-box;
+      height: 72rpx;
+      padding: 16rpx 31rpx;
+      font-size: 29rpx;
+      color: #FE991B;
+      border-radius: 34rpx;
+      background: #F7F7F7;
+    }
   }
 
   .bottom {
@@ -225,18 +263,104 @@
   }
 }
 
-</style>
-<wxs module="m1" lang="babel">
-const getTime = (time) => {
-let date = getDate(time);
-let hour = date.getHours();
-let mins = date.getMinutes();
-let sec = date.getSeconds();
-let milli = date.getMilliseconds();
-return `${hour}:${mins}:${sec}.${milli}`;
+.address-sheet {
+  --action-sheet-header-font-size: 36rpx;
+  --action-sheet-header-height: 108rpx;
+  --font-weight-bold: 400;
+  --popup-round-border-radius: 15rpx;
+
+  .container {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    background: white;
+    height: 820rpx;
+    width: 100%;
+  }
+
+  .item-container {
+    margin-top: 42rpx;
+    margin-bottom: 22rpx;
+
+    box-sizing: border-box;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    height: 132rpx;
+    padding: 0rpx 44rpx;
+
+    .top {
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+      height: 66rpx;
+      align-items: flex-end;
+      display: flex;
+      flex-direction: row;
+
+      label {
+        font-weight: 600;
+        font-size: 34rpx
+      }
+
+      .right {
+        align-items: flex-end;
+        margin-left: 46rpx;
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+
+        input {
+          margin-bottom: 2rpx;
+          font-size: 33rpx;
+          width: 83rpx;
+          margin-right: 10rpx;
+        }
+
+        label {
+          margin-right: 30rpx;
+          font-weight: 600;
+          font-size: 34rpx
+        }
+      }
+
+    }
+
+    .bottom {
+      color: #858585;
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+      height: 66rpx;
+      display: flex;
+      align-items: flex-end;
+      flex-direction: row;
+
+      label {
+        font-size: 26rpx;
+        margin-left: 26rpx
+      }
+
+
+    }
+  }
 }
-module.exports.getTime = getTime;
-</wxs>
+
+
+
+</style>
+<!--<wxs module="m1" lang="babel">-->
+<!--const getTime = (time) => {-->
+<!--let date = getDate(time);-->
+<!--let hour = date.getHours();-->
+<!--let mins = date.getMinutes();-->
+<!--let sec = date.getSeconds();-->
+<!--let milli = date.getMilliseconds();-->
+<!--return `${hour}:${mins}:${sec}.${milli}`;-->
+<!--}-->
+<!--module.exports.getTime = getTime;-->
+<!--</wxs>-->
 <template>
   <div class="container" style="align-items: center">
     <header background="#FE991B" title_text="捎带"/>
@@ -253,12 +377,16 @@ module.exports.getTime = getTime;
         <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="pc"/>
+              <div v-if="!messageText"
+                   style="width: 9rpx;height: 40rpx;margin-top: -3rpx;align-self: center;margin-left: 24rpx"
+                   class="pc"/>
 
               <textarea contenteditable="true" placeholder="粘贴短信或者识别截图"
                         auto-height="true"
+                        @input="messageInput"
                         placeholder-class="placeholder"
-                        v-bind:value="messageText" @input="messageInputChange" class="{{messageText? 'input-notnull':'input-null'}}"/>
+                        v-model="messageText"
+                        class="{{messageText? 'input-notnull':'input-null'}}"/>
 
             </div>
             <img v-if="!messageText" src="@/assets/pic.png"/>
@@ -268,23 +396,31 @@ module.exports.getTime = getTime;
           <div class="parse-result" v-if="messageText">
             <span style="font-size: 28rpx">识别结果</span>
             <div>
-              <span>百事</span>
-              <span>213213</span>
+              <span v-if="messageComp">{{ messageComp }}</span>
+              <span v-else>未知快递公司</span>
+              <span v-if="messagePacketCode" style="margin-left: 25rpx">{{ messagePacketCode }}</span>
+              <span v-else style="margin-left: 25rpx">无取件码</span>
             </div>
-            <van-button round type="primary" size="small">确认</van-button>
-
+            <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 class="address">
+      <div class="address" @tap="showAddressSheet = !showAddressSheet">
         <div class="top">
           <span class="panel-title">送达宿舍</span>
         </div>
         <div class="bottom">
-          <div class="address-text">一号楼01层01号邹德宏邹德宏 15891396443</div>
+          <div class="address-text" v-if="address">{{ address.dormitoryName }}楼{{address.floor}}层{{address.room}} {{address.name}} {{address.phone}}</div>
+          <div class="address-text" v-else>1号楼1层101 姓名 13300000000</div>
+
           <img src="@/assets/edit.png"/>
         </div>
       </div>
@@ -295,39 +431,138 @@ module.exports.getTime = getTime;
         </div>
 
         <div class="middle">
-          <div class="tag-uncheck">晚上再送</div>
-          <div class="tag-uncheck">我很着急</div>
-          <div class="tag-uncheck">请敲门</div>
-          <div class="tag-uncheck">易碎物品</div>
-          <div class="tag-uncheck">冷藏物品 请勿暴晒</div>
+          <div class="{{item.checked?'tag-checked':'tag-uncheck'}}" @tap="remarkCheck(index)"
+               v-for="(item,index) in remarkList">{{ item.label }}
+          </div>
         </div>
 
         <div class="bottom">
           <img src="@/assets/info.png"/>
-          <input placeholder="也可以填写其他留言"/>
+          <input v-model="remarkText" placeholder="也可以填写其他留言"/>
         </div>
       </div>
-      <van-button round  custom-class="bt-submit pc">提 交</van-button>
+      <van-button @tap="taskSubmit" round custom-class="bt-submit pc">提 交</van-button>
     </div>
 
-<!--    <button class="bt-submit pc">提 交</button>-->
+    <van-action-sheet
+      @close="closeAddressSheet"
+      class="address-sheet"
+      @click-overlay="closeAddressSheet"
+      v-bind:show="showAddressSheet" title="更新地址">
+      <div class="container">
+        <div class="item-container">
+          <div class="top">
+            <span>收件人</span>
+            <input v-model="addressSheet_Name" style="font-size: 34rpx;margin-left: 46rpx" placeholder="姓名"/>
+          </div>
+          <div class="bottom">
+            <image style="height: 32rpx;width: 32rpx" src="@/assets/info.png"></image>
+            <span>请注意, 是快递收件人的姓名</span>
+          </div>
+        </div>
+
+        <div class="item-container">
+          <div class="top">
+            <div style="width: 80%;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: #FE991B" @tap="getPhone">
+              自动获取
+            </div>
+          </div>
+          <div class="bottom">
+            <image style="height: 32rpx;width: 32rpx" src="@/assets/info.png"></image>
+            <span>请注意, 是快递的收件联系方式</span>
+          </div>
+        </div>
+        <div class="item-container">
+          <div class="top">
+            <span>宿舍号</span>
+            <div class="right">
+              <input v-model="addressSheet_Dormitory" disabled="true" @tap="domi_input_tap" placeholder="其他"/>
+              <span>楼</span>
+              <input v-model="addressSheet_Floor" maxlength="5" placeholder="其他"/>
+              <span>层</span>
+              <input v-model="addressSheet_Room" maxlength="5" placeholder="其他"/>
+              <span>号</span>
+            </div>
+          </div>
+        </div>
+        <van-button @tap="updateAddress" round custom-class="bt-update pc">更 新</van-button>
+
+      </div>
+    </van-action-sheet>
+
+
+    <van-action-sheet
+      title="选择宿舍楼"
+      @close="closeDormitorySheet"
+      @click-overlay="closeDormitorySheet"
+      v-bind:show="showDormitorySheet"
+    >
+      <van-picker
+        default-index="{{ 0 }}"
+        @change="onDormitorySelect"
+        columns="{{ dormitoryList }}"
+      />
+      <van-button @tap="DormitoryConfirm" round custom-class="bt-submit-d pc" style="margin-bottom: 30rpx">确认
+      </van-button>
+
+    </van-action-sheet>
+
+
+<!--    自定义tabbar-->
+    <van-tabbar active="{{ active }}" @change="onTabChange" class="mytabbar">
+      <van-tabbar-item>
+        <image
+          slot="icon"
+          src="@/assets/close.png"
+          mode="aspectFit"
+          style="width: 30px; height: 18px;"
+        />
+        <image
+          slot="icon-active"
+          src="@/assets/close.png"
+          mode="aspectFit"
+          style="width: 30px; height: 18px;"
+        />
+        捎带快递
+      </van-tabbar-item>
+
+      <van-tabbar-item>
+        <image
+          slot="icon"
+          src="@/assets/close.png"
+          mode="aspectFit"
+          style="width: 30px; height: 18px;"
+        />
+        <image
+          slot="icon-active"
+          src="@/assets/close.png"
+          mode="aspectFit"
+          style="width: 30px; height: 18px;"
+        />
+        我的捎带
+      </van-tabbar-item>
+    </van-tabbar>
+
   </div>
 </template>
 
 <script>
 import wepy from '@wepy/core'
-import eventHub from '../common/eventHub'
 import { mapState } from '@wepy/x'
 import store from '../store'
 import testMixin from '../mixins/test'
+import http from '../common/http.js'
 
 const app = getApp().$wepy.$options
 
 wepy.page({
   store,
-  config: {
-    navigationBarTitleText: 'test'
-  },
 
   hooks: {
     // // Page 级别 hook, 只对当前 Page 的 setData 生效。
@@ -344,40 +579,269 @@ wepy.page({
   mixins: [testMixin],
 
   data: {
+    active: 0,
+    messageComp: '',
+    messagePacketCode: '',
+    messageConfirmed: false,
+    carrierCoList: ['德邦', 'EMS',
+      '百世', '国通', '汇通', '联邦', '申通', '顺丰', '天天', '菜鸟', '韵达', '圆通', '邮政', '中铁', '中通', '宅急送', '中邮', '中环'],
+
+    dormitoryList: [],
+    showDormitorySheet: false,
+
+    showAddressSheet: false,
+    addressSheet_Name: '',
+    addressSheet_Phone: '',
+    addressSheet_Dormitory: '',
+    addressSheet_Floor: '',
+    addressSheet_Room: '',
+    address: '',
+
     messageText: '',
+
+    remarkText: '',
+    remarkList: [{
+      label: '晚上再送', checked: false
+    }, {
+      label: '我很着急', checked: false
+    }, {
+      label: '请敲门', checked: false
+    }, {
+      label: '易碎物品', checked: false
+    }, {
+      label: '冷藏物品 请勿暴晒', checked: false
+    }],
+
     showMessageParse: true
   },
 
-  computed: {
-    ...mapState(['counter']),
-    testcomputed() {
-      return 'computed - ' + this.mynum
-    }
-  },
+  computed: {},
 
   methods: {
+    onTabChange(event){
+      this.active = event.detail
+      if(this.active === 0){
+
+      }else{
+        wx.switchTab({
+          url: '/pages/progress'
+        })
+      }
+
+    },
+    taskSubmit(){
+      //TODO 学校是否开启的判断
+
+      if (!this.messageComp || !this.messagePacketCode) {
+        wx.showToast({
+          title: '未识别成功，请自行输入快递公司以及取货码',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+      this.messageConfirmed = true
+      if(!this.address){
+        if (!this.messageComp || !this.messagePacketCode) {
+          wx.showToast({
+            title: '请填写正确的收货地址',
+            icon: 'none',
+            duration: 4000
+          })
+          return
+        }
+        this.messageConfirmed = true
+      }
+
+      let remark = this.remarkText
+      this.remarkList.forEach(item=>{
+        if(item.checked){
+          remark+= item.label
+        }
+      })
+
+
+      let param = {
+        remark: remark,
+        phone: this.address.phone,
+        addressID: this.address.addressID,
+        parcelInfo: this.messageText,
+        courierCompany: this.messageComp,
+        pickupCode: this.messagePacketCode
+      }
+
+      http.post('/task/submit',param).then(data => {
+        wx.showToast({
+          title: '提交成功！',
+          icon: 'success',
+          duration: 4000
+        })
+        return
+
+      })
+    },
+    updateAddress() {
+      if (!this.addressSheet_Name) {
+        wx.showToast({
+          title: '请输入收件人姓名',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+      if (!this.addressSheet_Phone) {
+        wx.showToast({
+          title: '请输入收件人电话',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+
+      if (!this.addressSheet_Dormitory || this.addressSheet_Dormitory === '其他') {
+        wx.showToast({
+          title: '请选择宿舍楼',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+      if (!this.addressSheet_Floor) {
+        wx.showToast({
+          title: '请输入楼层',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+      if (!this.addressSheet_Room) {
+        wx.showToast({
+          title: '请输入房间号',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+
+      http.post('/address/updateAddress', {
+        dormitoryName: this.addressSheet_Dormitory,
+        floor: this.addressSheet_Floor,
+        room: this.addressSheet_Room,
+        name: this.addressSheet_Name,
+        phone: this.addressSheet_Phone
+      }).then(res => {
+        if(res.code === 200){
+          this.address = res.data
+          this.showAddressSheet = false
+        }
+      })
+
+    },
+
+    confirmMessage() {
+      if (!this.messageComp || !this.messagePacketCode) {
+        wx.showToast({
+          title: '未识别成功，请自行输入快递公司以及取货码',
+          icon: 'none',
+          duration: 4000
+        })
+        return
+      }
+      this.messageConfirmed = true
+    },
+    messageInput() {
+      this.messageConfirmed = false
+      this.messageComp = ''
+      this.messagePacketCode = ''
+      for (var idx in this.carrierCoList) {
+        let item = this.carrierCoList[idx]
+        if (this.messageText.indexOf(item) !== -1) {
+          this.messageComp = item
+          break
+        }
+      }
+      this.messagePacketCode = this.parsePaketCode(this.messageText)
+    },
+    remarkCheck(e, item) {
+      this.remarkList[e].checked = !this.remarkList[e].checked
+    },
+    DormitoryConfirm() {
+      this.showDormitorySheet = false
+    },
+    onDormitorySelect(event) {
+      const { picker, value, index } = event.$wx.detail
+      this.addressSheet_Dormitory = value
+    },
+    closeDormitorySheet() {
+      this.showDormitorySheet = false
+    },
+    domi_input_tap() {
+      this.showDormitorySheet = true
+    },
+    closeAddressSheet() {
+      this.showAddressSheet = false
+    },
     cleanMessage() {
       this.messageText = ''
     },
-    messageInputChange({$wx}) {
-      this.messageText = $wx.detail.value
+    parsePaketCode(str) {
+      let result = ''
+      var pattern = /\d(\-|\/|.)\d{1,}\1\d{1,}/
+      var arr = str.match(pattern)
+      if (arr && arr.length > 0) {
+        result = arr[0]
+      }
+
+      pattern = /\d{3,}/
+
+      arr = str.match(pattern)
+      if (arr && arr.length > 0 && !result) {
+        result = arr[0]
+      }
+      return result
+    },
+    getPhone() {
+
     }
   },
 
   created() {
-    let self = this
-    self.currentTime = +new Date()
 
-    self.setTimeoutTitle = '标题三秒后会被修改'
-    setTimeout(() => {
-      self.setTimeoutTitle = '到三秒了'
-    }, 3000)
+    //TODO 初始化学校 id
+    wx.setStorageSync('schoolID', 2)
+    const _that = this
 
-    wx.getUserInfo({
+    wx.login({
       success(res) {
-        self.userInfo = res.userInfo
+        var code = res.code
+        http.post('/wxLogin', { code: code }).then(data => {
+          let customerID = data.data.customerID
+          if (customerID) {
+            wx.setStorageSync('customerID', customerID)
+          }
+          http.post('/address/getAddressByUser').then(data => {
+            data = data.data
+            if (data) {
+              _that.address = data
+              _that.addressSheet_Dormitory = data.dormitoryName
+              _that.addressSheet_Floor = data.floor
+              _that.addressSheet_Name = data.name
+              _that.addressSheet_Phone = data.phone
+              _that.addressSheet_Room = data.room
+            } else {
+              _that.address = null
+            }
+          })
+        })
       }
     })
+
+    http.post('/dormitory/getDormitoryBySchool', { pageIndex: 1, pageSize: 100 }).then(res => {
+      this.dormitoryList = res.data.records.map(v => {
+        return v.name
+      })
+      this.dormitoryList.unshift('其他')
+    })
   }
 })
 </script>
@@ -388,7 +852,12 @@ navigationBarBackgroundColor: "#45C9C3",
 navigationBarTitleText: '小树懒捎带',
 usingComponents: {
 header: '~@/components/header',
-'van-button': 'module:@vant/weapp/lib/button'
+"van-picker": "module:@vant/weapp/lib/picker/index",
+"van-popup": "module:@vant/weapp/lib/popup/index",
+'van-button': 'module:@vant/weapp/lib/button',
+"van-action-sheet": "module:@vant/weapp/lib/action-sheet/index",
+"van-tabbar": "module:@vant/weapp/lib/tabbar/index",
+"van-tabbar-item": "module:@vant/weapp/lib/tabbar-item/index"
 }
 }
 </config>
diff --git a/src/pages/progress.wpy b/src/pages/progress.wpy
new file mode 100644
index 0000000..7df242e
--- /dev/null
+++ b/src/pages/progress.wpy
@@ -0,0 +1,114 @@
+<style lang="less" type="text/less" scoped>
+  .list-item{
+    margin-top: 18rpx;
+    border-radius: 5rpx;
+    background: white;
+    box-sizing: border-box;
+    height: 266rpx;
+    width: 100%;
+  }
+
+  .main {
+    width: 716rpx;
+    flex: 1;
+    overflow-y: scroll;
+  }
+</style>
+
+<template>
+  <div class="container" style="align-items: center">
+    <header background="#FE991B " title_text="进度查询"/>
+    <div class="main">
+      <div class="list-item">
+
+      </div>
+    </div>
+  </div>
+
+  <!--    自定义tabbar-->
+  <van-tabbar active="{{ active }}" @change="onTabChange" class="mytabbar">
+    <van-tabbar-item>
+      <image
+        slot="icon"
+        src="@/assets/close.png"
+        mode="aspectFit"
+        style="width: 30px; height: 18px;"
+      />
+      <image
+        slot="icon-active"
+        src="@/assets/close.png"
+        mode="aspectFit"
+        style="width: 30px; height: 18px;"
+      />
+      捎带快递
+    </van-tabbar-item>
+
+    <van-tabbar-item>
+      <image
+        slot="icon"
+        src="@/assets/close.png"
+        mode="aspectFit"
+        style="width: 30px; height: 18px;"
+      />
+      <image
+        slot="icon-active"
+        src="@/assets/close.png"
+        mode="aspectFit"
+        style="width: 30px; height: 18px;"
+      />
+      我的捎带
+    </van-tabbar-item>
+  </van-tabbar>
+
+</template>
+
+<script>
+import wepy from '@wepy/core'
+import { mapState } from '@wepy/x'
+import store from '../store'
+import testMixin from '../mixins/test'
+import http from '../common/http.js'
+
+const app = getApp().$wepy.$options
+
+
+wepy.page({
+    data:{
+      active: 1
+
+    },
+    methods: {
+      onTabChange(event){
+        this.active = event.detail
+        if(this.active === 1){
+
+        }else{
+          wx.switchTab({
+            url: '/pages/index'
+          })
+        }
+
+      }
+
+    },
+    created() {
+
+    }
+  })
+</script>
+<config>
+{
+navigationBarTextStyle: "white",
+navigationBarBackgroundColor: "#45C9C3",
+navigationBarTitleText: '',
+usingComponents: {
+header: '~@/components/header',
+"van-picker": "module:@vant/weapp/lib/picker/index",
+"van-popup": "module:@vant/weapp/lib/popup/index",
+'van-button': 'module:@vant/weapp/lib/button',
+"van-tabbar": "module:@vant/weapp/lib/tabbar/index",
+"van-tabbar-item": "module:@vant/weapp/lib/tabbar-item/index",
+"van-action-sheet": "module:@vant/weapp/lib/action-sheet/index"
+}
+}
+</config>
-- 
2.24.1