From cb06428cd2f35a8357e80db9c83c635729d1e5ea Mon Sep 17 00:00:00 2001
From: miko <136057505@qq.com>
Date: Thu, 8 Oct 2020 21:09:55 +0800
Subject: [PATCH] aa

---
 .idea/vcs.xml                |   6 +
 src/app.wpy                  |   2 +-
 src/assets/close.png         | Bin 0 -> 1385 bytes
 src/components/counter.wpy   |  77 ---------
 src/components/group.wpy     |  41 -----
 src/components/groupitem.wpy |  28 ----
 src/pages/index.wpy          | 294 ++++++++++++++++-------------------
 7 files changed, 138 insertions(+), 310 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 src/assets/close.png
 delete mode 100644 src/components/counter.wpy
 delete mode 100644 src/components/group.wpy
 delete mode 100644 src/components/groupitem.wpy

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/app.wpy b/src/app.wpy
index f728aa7..35ac16f 100644
--- a/src/app.wpy
+++ b/src/app.wpy
@@ -2,9 +2,9 @@
 .container {
   height: 100%;
   display: flex;
+  overflow-y: scroll;
   flex-direction: column;
   align-items: center;
-  box-sizing: border-box;
   background: #F5F5F5;
 }
   page{
diff --git a/src/assets/close.png b/src/assets/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..1445a3b0a55891c4641937cf9783903bc5262281
GIT binary patch
literal 1385
zcmV-v1(y1WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000FrNkl<ZXhZFp
z`->b!5XY-#Jbd6A-}qJxibSFkiH6zf**!%RCER-XNBqs7{mp+wy&#GrdOO{-gAWuR
zD54}pV>Bd2Lt-=}hRaMz9koN<-9CDE=k9Wl{q1hLyXxEZ>F(-kgf0HVE$%;D60q43
z92fy>Z6isN?q)m4_J{e>S3s6!mWT`h>?fkvk|f!;8A7bJbBOpl0Bl1<7sqk3+K)8?
z@;q-8MUkn7MOl`wG@H$LHc~{Irh9@QcpCu1p4~7E<0y(&P%$V1Jo67JhnI+`og~S7
z8zI74`w}890KiPo9wHuy<9OT12yg@ETpIx10$8z2{U;(mSWgkw+84z6E0i4qfO%sK
zi(2s;xQMeX+e1Vw;<8>3B03ucK|7A)57$FPmSxYEWx0TeSE=zYAmV%+$9)kVdJb4?
zUq-|?0pM~q;J+-Q(P(^Jr-*L1`z$*T0N1E-&lAz!BuU;KWNYL>=A3&`aJo_r@^=`9
z?I?=UIz;4o-YklOoxfg<cTTW*f0&Jt0=P4WR&csn;dHVr%XX{Pa?^<DbUG#o0><V>
zHO?8qW+bX!0^~4xPH?(T8TyMwG@H$Q5)o;dM(jKQ+^qVa7HmH98Pi*U>`pDg=>|3U
zAF?}r>SM6i##;M~>^8Tley0SRj_+7w2@sr&;B=G1>8RlJxsTyar?X42xkI%-A=r$C
z<k$iPr-tBkt8(CX!RgCkBGNS7DcIbl+8q~c#?HMa5+FG37MyNZjvOYUxg<%x?kB=p
z`vf9#UUiT9eoV0W#3y>I+e|D#aM~p}-Ps!$5r0`)T58YE&VH+nEiNwZn3<VbAfo%#
z|BnbZUg-4`IF$gw=_$cU&+5UVDCSzN*7w||)9Gvv!;okG!Bx@XL+Xo3X1<!RX*&1%
zI_I7gobFTOaY8u9e+xD`5j!N<d^N58sUy&Hpxf>4D9e&_r)riF@kjnnM2{#(4+cRn
z-)J;eAU3Ix+5`wrk8varQK#aSZ$xx}XFf@i?<RG))<xXU3Fq9Sg44sRzW*fH{7{$k
z%Xro~7>~831>||Yy(kJ^2WxIlGEw`(Fr1H~XnA+4<5yb*1}tL6h8MBM>Ec_&{kBnF
zu!y+4jS|tmRSWy#*+%m`-znHs2N@Cl3;>)`EblhfTHc*l!~^;u6P$+TPNOiJ3ZX2^
z)}#^ua7dE6Z?y3=O&^yeP9Jugmr6M2c5@0rL{&;mM87dM#+be*ETbkk-Cd;uh(|dS
zHO6dQGS}^PBRO?-I(<YgHbZk8Yc1zad<&}*Kma%{r}Nl1yRi|<vTV(T1^|u;HlK}R
zmcOTI`n2GrQ}Ok`&^YH>f=zV+C!#+Eo3RjJ1O=yC6iz1vr~0pyQn%qlN?+<v2sUHi
zq-1yEn;qj+T~7hvwBY1bck)80Us(kJP6;;F2b)1{(lkv3CtWD0udKp_Ey1QL_Yu)Q
zf{k~mhlyk~1*dBjPG<$D$qQQpN{eR%8?U;JZ*;7+Tz6ues^S>{OkP^#;w}L2K3|o%
z0pJ|Z{CXC5IT8R+l`#=<2>|wvRovzBx?mHi89WaFZDY*PkowN}pmtJ=<w#ToWkf6m
zC%^K#bB>d(dzFz3g3Z7x@wATX{(>$$Tb1?!;8$aePD7Tv_&hO@V6&l5O!7X#I8{D+
zKQTGyxV#q=(P2b<wcpD~oijcJr#2D2fry;xX2uwPcwF%tcn&z{Vq=Vc?Ar*R``Q@h
ri`PN6X`Xu+z9hh7lGe4!mXE;y@G6E+cqtua00000NkvXXu0mjfI{AmE

literal 0
HcmV?d00001

diff --git a/src/components/counter.wpy b/src/components/counter.wpy
deleted file mode 100644
index c6bc2ac..0000000
--- a/src/components/counter.wpy
+++ /dev/null
@@ -1,77 +0,0 @@
-<style lang="less">
-  .counter {
-    text-align: left;
-    font-size: 12px;
-  }
-  .count {
-    font-size: 18px;
-    font-weight: bold;
-    &.red {
-      color: red;
-    }
-    &.green {
-      color: green;
-    }
-  }
-</style>
-<template>
-  <div class="counter {{style}}">
-    <button @tap="plus" size="mini">  +  </button>
-    <button @tap="minus" size="mini">  -  </button>
-    <button @tap="increment" size="mini">  INCREMENT  </button>
-    <button @tap="decrement" size="mini">  DECREMENT  </button>
-    <button @tap="incrementAsync" size="mini">  ASYNC INCREMENT  </button>
-    <span class="count"> {{counter}} </span>
-  </div>
-</template>
-<script>
-  import wepy from '@wepy/core'
-  import store from '../store';
-  import { mapState, mapActions } from '@wepy/x';
-
-  wepy.component({
-    store,
-    props: {
-      num: {
-        type: [Number, String],
-        coerce: function (v) {
-          return +v
-        },
-        default: 50
-      }
-    },
-    computed: mapState([ 'counter' ]),
-
-    events: {
-      'index-broadcast': (...args) => {
-        let $event = args[args.length - 1]
-        console.log(`${this.$name} receive ${$event.name} from ${$event.source.$name}`)
-      }
-    },
-
-    watch: {
-      num (curVal, oldVal) {
-        console.log(`旧值：${oldVal}，新值：${curVal}`)
-      }
-    },
-
-    methods: {
-      ...mapActions([
-        'increment',
-        'decrement',
-        'incrementAsync'
-      ]),
-      plus () {
-        this.num = this.num + 1
-        console.log('plus tapped in component');
-
-        this.$emit('index-emit', this.num);
-      },
-      minus () {
-        this.num = this.num - 1
-        console.log(this.$name + ' minus tap')
-      }
-    }
-  })
-</script>
-
diff --git a/src/components/group.wpy b/src/components/group.wpy
deleted file mode 100644
index 94dcb8b..0000000
--- a/src/components/group.wpy
+++ /dev/null
@@ -1,41 +0,0 @@
-<style type="less">
-  .group {}
-</style>
-<template>
-  <div class="group">
-    <span class="id">{{grouplist.id}}. </span>
-    <span class="name" @tap="tap">{{grouplist.name}}</span>
-    <div>
-      <div v-for="item in grouplist.list">
-        <groupitem :gitem="item"></groupitem>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import wepy from '@wepy/core';
-  //import GroupItem from './groupitem'
-
-  wepy.component({
-    props: {
-      grouplist: {},
-      index: {}
-    },
-
-    methods: {
-      tap () {
-        this.grouplist.name = `Parent Random(${Math.random()})`
-        let groups = this.$parent.$children.filter(com => com.$is === 'components/group');
-        let index = groups.indexOf(this);
-        console.log(`Clicked Group ${index}, ID is ${this.grouplist.id}`)
-      }
-    }
-  });
-</script>
-<config>
-{
-  usingComponents: {
-    'groupitem': './groupitem'
-  }
-}
-</config>
diff --git a/src/components/groupitem.wpy b/src/components/groupitem.wpy
deleted file mode 100644
index a7db141..0000000
--- a/src/components/groupitem.wpy
+++ /dev/null
@@ -1,28 +0,0 @@
-<style type="less">
-.groupitem {
-}
-</style>
-<template>
-  <div class="groupitem">
-    --<span class="id">{{gitem.childid}}.</span>
-    <span class="name" @tap="tap"> {{gitem.childname}}</span>
-  </div>
-</template>
-<script>
-  import wepy from '@wepy/core';
-
-  wepy.component({
-    props: {
-      gitem: {}
-    },
-    data: {
-    },
-    methods: {
-      tap () {
-        this.gitem.childname = `Child Random(${Math.random()})`
-        let index = this.$parent.$children.indexOf(this);
-        console.log(`Item ${index}, ID is ${this.gitem.childid}`)
-      }
-    }
-  });
-</script>
diff --git a/src/pages/index.wpy b/src/pages/index.wpy
index 4fd384b..541a29c 100644
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -1,9 +1,13 @@
 <style lang="less">
-
 .panel-title {
   font-size: 36rpx;
   color: black;
 }
+.main{
+  flex: 1;
+  overflow-y: scroll;
+  width: 100%;
+}
 
 .header {
   width: 100%;
@@ -46,26 +50,47 @@
   border: 1px solid #EBEBEB;
   border-radius: 7px;
   background: #FFFFFFDB;
-  height: 228rpx;
+  min-height: 228rpx;
   width: 678rpx;
+  margin-left: 36rpx;
   margin-top: -80rpx;
+  max-height: 366rpx;
 
   .inner {
     border-radius: 7px;
-
+    box-sizing: border-box;
     background: white;
-    padding: 0 24rpx;
-    align-items: center;
     margin-top: 80rpx;
     display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    height: 148rpx;
+    flex-direction: column;
+    min-height: 148rpx;
 
-    .inner-left {
+    .inner-top{
+      min-height: 148rpx;
       display: flex;
+      flex-direction: row;
       align-items: center;
+      justify-content: space-between;
+      padding-right: 24rpx;
+      .scroll-container{
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        overflow-y: scroll;
+        min-height: 148rpx;
+        max-height: 200rpx;
+      }
+    }
+
+    .parse-result{
+      box-sizing: border-box;
+      justify-content: space-between;
+      border-top: 1px solid #EBEBEB;
+      display: flex;
       flex-direction: row;
+      align-items: center;
+      margin: 0 24rpx;
+      height: 90rpx;
     }
 
     image {
@@ -73,14 +98,34 @@
       width: 36rpx
     }
   }
+  .input-null{
+    font-size: 33rpx;
+    margin-left:25rpx;
+    width: 553rpx;border: none
+  }
+  .placeholder{
+    color: black!important;
+  }
+  .input-notnull{
+    min-height: 148rpx;
+    max-height: 170rpx;
+    padding: 15rpx 13rpx;
+    align-self: flex-start;
+    font-size: 28rpx;
+    height: 33rpx;
+    width: 553rpx;border: none
+  }
 }
 .bt-submit{
+  margin-left: 214rpx;
   color: white!important;
   margin-top: 43rpx;
   height: 91rpx!important;
   width: 322rpx;
 }
 .address {
+  margin-left: 36rpx;
+
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -119,6 +164,8 @@
 }
 
 .remark {
+  margin-left: 36rpx;
+
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -193,54 +240,76 @@ module.exports.getTime = getTime;
 <template>
   <div class="container" style="align-items: center">
     <header background="#FE991B" title_text="捎带"/>
-    <div class="header pc">
-      <div class="inner">
-        <image class="avatar-small"></image>
-        <image class="avatar-big"></image>
-        <image class="avatar-small"></image>
+    <div class="main">
+      <div class="header pc">
+        <div class="inner">
+          <image class="avatar-small"></image>
+          <image class="avatar-big"></image>
+          <image class="avatar-small"></image>
+        </div>
       </div>
 
-    </div>
-    <div class="message">
-      <div class="inner">
-        <div class="inner-left">
-          <input style="position: absolute;border: none"/>
-          <div style="width: 9rpx;height: 33rpx;" class="pc"/>
-          <span style="color: black;margin-left: 30rpx;font-size: 31rpx">粘贴短信或者识别截图</span>
+      <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="pc"/>
+
+              <textarea contenteditable="true" placeholder="粘贴短信或者识别截图"
+                        auto-height="true"
+                        placeholder-class="placeholder"
+                        v-bind:value="messageText" @input="messageInputChange" 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>百事</span>
+              <span>213213</span>
+            </div>
+            <van-button round type="primary" size="small">确认</van-button>
+
+          </div>
+
         </div>
-        <img src="@/assets/pic.png"/>
-      </div>
-    </div>
 
-    <div class="address">
-      <div class="top">
-        <span class="panel-title">送达宿舍</span>
-      </div>
-      <div class="bottom">
-        <div class="address-text">一号楼01层01号邹德宏邹德宏 15891396443</div>
-        <img src="@/assets/edit.png"/>
       </div>
-    </div>
 
-    <div class="remark">
-      <div class="top">
-        <span class="panel-title">留言</span>
+      <div class="address">
+        <div class="top">
+          <span class="panel-title">送达宿舍</span>
+        </div>
+        <div class="bottom">
+          <div class="address-text">一号楼01层01号邹德宏邹德宏 15891396443</div>
+          <img src="@/assets/edit.png"/>
+        </div>
       </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>
+      <div class="remark">
+        <div class="top">
+          <span class="panel-title">留言</span>
+        </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>
 
-      <div class="bottom">
-        <img src="@/assets/info.png"/>
-        <input placeholder="也可以填写其他留言"/>
+        <div class="bottom">
+          <img src="@/assets/info.png"/>
+          <input placeholder="也可以填写其他留言"/>
+        </div>
       </div>
+      <van-button round  custom-class="bt-submit pc">提 交</van-button>
     </div>
-    <van-button round  custom-class="bt-submit pc">提 交</van-button>
+
 <!--    <button class="bt-submit pc">提 交</button>-->
   </div>
 </template>
@@ -261,73 +330,22 @@ wepy.page({
   },
 
   hooks: {
-    // Page 级别 hook, 只对当前 Page 的 setData 生效。
-    'before-setData': function(dirty) {
-      if (Math.random() < 0.2) {
-        console.log('setData canceled')
-        return false // Cancel setData
-      }
-      dirty.time = +new Date()
-      return dirty
-    }
+    // // Page 级别 hook, 只对当前 Page 的 setData 生效。
+    // 'before-setData': function(dirty) {
+    //   if (Math.random() < 0.2) {
+    //     console.log('setData canceled')
+    //     return false // Cancel setData
+    //   }
+    //   dirty.time = +new Date()
+    //   return dirty
+    // }
   },
 
   mixins: [testMixin],
 
   data: {
-    inputmodel: 'v-model',
-    mynum: 20,
-    userInfo: {
-      nickName: '加载中...'
-    },
-    currentTime: +new Date(),
-    setTimeoutTitle: '标题三秒后会被修改',
-    count: 0,
-    netrst: '',
-    groupList: [
-      {
-        id: 1,
-        name: '点击改变',
-        list: [
-          {
-            childid: '1.1',
-            childname: '子项，点我改变'
-          }, {
-            childid: '1.2',
-            childname: '子项，点我改变'
-          }, {
-            childid: '1.3',
-            childname: '子项，点我改变'
-          }
-        ]
-      },
-      {
-        id: 2,
-        name: '点击改变',
-        list: [
-          {
-            childid: '2.1',
-            childname: '子项，点我改变'
-          }, {
-            childid: '2.2',
-            childname: '子项，点我改变'
-          }, {
-            childid: '2.3',
-            childname: '子项，点我改变'
-          }
-        ]
-      },
-      {
-        id: 3,
-        name: '点击改变',
-        list: [
-          {
-            childid: '3.1',
-            childname: '子项，点我改变'
-          }
-        ]
-      }
-    ]
+    messageText: '',
+    showMessageParse: true
   },
 
   computed: {
@@ -338,56 +356,11 @@ wepy.page({
   },
 
   methods: {
-    handleViewTap() {
-      console.log('handleVieTap clicked')
-    },
-    tap() {
-      throw 'can not go here'
-    },
-    plus() {
-      this.mynum++
-    },
-    toast() {
-      let promise = this.$invoke('toast', 'show', {
-        title: '自定义标题',
-        img: 'https://raw.githubusercontent.com/kiinlam/wetoast/master/images/star.png'
-      })
-
-      promise.then((d) => {
-        console.log('toast done')
-      })
-    },
-    mixintap() {
-      console.log('do noting from ' + this.$is)
-    },
-    communicate() {
-      let counters = this.$children.filter((com) => com.$is === 'components/counter')
-
-      // Get children counter
-      counters[0].num++
-      counters[1].num--
-
-      eventHub.$emit('app-launch', { a: 1 }, { b: 2 })
-    },
-    request() {
-      let self = this
-      let i = 10
-      let map = ['MA==', 'MQo=', 'Mg==', 'Mw==', 'NA==', 'NQ==', 'Ng==', 'Nw==', 'OA==', 'OQ==']
-      while (i--) {
-        wx.request({
-          url: 'https://www.madcoder.cn/tests/sleep.php?time=1&t=css&c=' + map[i] + '&i=' + i,
-          success: function(d) {
-            if (d.statusCode !== 200) {
-              self.netrst += d.statusCode + '.'
-            } else {
-              self.netrst += d.data + '.'
-            }
-          }
-        })
-      }
+    cleanMessage() {
+      this.messageText = ''
     },
-    counterEmit(num) {
-      console.log(`${this.$is} receive event, the number is: ${num}`)
+    messageInputChange({$wx}) {
+      this.messageText = $wx.detail.value
     }
   },
 
@@ -415,12 +388,7 @@ navigationBarBackgroundColor: "#45C9C3",
 navigationBarTitleText: '小树懒捎带',
 usingComponents: {
 header: '~@/components/header',
-panel: '~@/components/panel',
-'van-button': 'module:@vant/weapp/lib/button',
-counter: '~counter',
-list: '../components/list',
-group: '../components/group',
-"slide-view": "module:miniprogram-slide-view",
+'van-button': 'module:@vant/weapp/lib/button'
 }
 }
 </config>
-- 
2.24.1