From fceed5d17e324058ae89185a1170f61d2d20d405 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Thu, 22 Nov 2018 16:19:27 +0800
Subject: [PATCH 01/18] fix the error of selectTap function

---
 pages/dialogs/index-list.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/dialogs/index-list.ui b/pages/dialogs/index-list.ui
index a8309c8..6f69854 100644
--- a/pages/dialogs/index-list.ui
+++ b/pages/dialogs/index-list.ui
@@ -439,7 +439,7 @@
       }, 
       singleTap(msg){
         console.log(msg)
-        this.place = this.tagsData[msg].text
+        this.place = this.tagsData[msg.index].text
         ui.hideDialog({country: this.place})
       },
       singleselect (msg) {
@@ -551,4 +551,4 @@
   padding: 0 10px;
 }
   </style>
-  
\ No newline at end of file
+  

From 3b829a45831cd3f975fe076eb2adc77dc71d9933 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Thu, 22 Nov 2018 16:26:25 +0800
Subject: [PATCH 02/18] Update index-list.ui

---
 pages/dialogs/index-list.ui | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/dialogs/index-list.ui b/pages/dialogs/index-list.ui
index 6f69854..260540d 100644
--- a/pages/dialogs/index-list.ui
+++ b/pages/dialogs/index-list.ui
@@ -551,4 +551,3 @@
   padding: 0 10px;
 }
   </style>
-  

From 1d9340bd8a18dd3d003d8371ff4a852234ddeb3d Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Fri, 23 Nov 2018 14:44:25 +0800
Subject: [PATCH 03/18] fix the bug of select function

---
 pages/templeteDemo/store/detail.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/templeteDemo/store/detail.ui b/pages/templeteDemo/store/detail.ui
index e968350..9080aeb 100644
--- a/pages/templeteDemo/store/detail.ui
+++ b/pages/templeteDemo/store/detail.ui
@@ -752,15 +752,15 @@ export default {
       // ui.showToast({
       //   title: this.colors[opt].text
       // })
-      this.colorText = this.colors[opt].text
+      this.colorText = this.colors[opt.index].text
       this.colors.forEach((item, index) => {
-        item.checked = (index === opt)
+        item.checked = (index === opt.index)
       })
     },
     singleTap2 (opt) {
-      this.size = this.sizes[opt].text
+      this.size = this.sizes[opt.index].text
       this.sizes.forEach((item, index) => {
-        item.checked = (index === opt)
+        item.checked = (index === opt.index)
       })
     },
     subtraction (val) {

From 03f560d2a872a1f9b5263cf037fd5164167c574c Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Sat, 24 Nov 2018 17:46:39 +0800
Subject: [PATCH 04/18] fix the bug of back to top when tap again & again

I have tested it when activate backTop function again and again, nothing to do
---
 pages/componentDemo/scrollView.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/componentDemo/scrollView.ui b/pages/componentDemo/scrollView.ui
index 88ddf90..e842f9a 100644
--- a/pages/componentDemo/scrollView.ui
+++ b/pages/componentDemo/scrollView.ui
@@ -38,8 +38,8 @@ export default {
       this.scrollTop = this.scrollTop + 20
     },
     backTop () {
-      this.scrollTop = 0
-      this.scrollTop = this.scrollTop + 1
+      // this.scrollTop = 0
+      this.scrollTop += 1
     },
     bindscrolltoupper(){
       console.log('1231312')

From 813e89b732ab2b2064b57973d008e8ecaf869048 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Sun, 25 Nov 2018 19:28:17 +0800
Subject: [PATCH 05/18] fix the attribute of not exist

fix it to form-type from formType
---
 pages/dialogs/loginInterface.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/dialogs/loginInterface.ui b/pages/dialogs/loginInterface.ui
index 12e49ca..3084cec 100644
--- a/pages/dialogs/loginInterface.ui
+++ b/pages/dialogs/loginInterface.ui
@@ -29,7 +29,7 @@
                       <ui-view>
                         <ui-input ui:model="{{ loginPassword }}" type="password" name="password" placeholder="登录密码" placeholder-style="color:#9C9C9C" ></ui-input>
                       </ui-view>
-                      <ui-button formType="submit" type="primary" class="submit" bindtap="login">登录</ui-button>
+                      <ui-button form-type="submit" type="primary" class="submit" bindtap="login">登录</ui-button>
                     </ui-form>
                   </ui-view>
                   <!-- 3 -->
@@ -86,7 +86,7 @@
                       </ui-col>
                     </ui-row>
                     <!-- <ui-view class="submit">下一步</ui-view> -->
-                    <ui-button formType="submit" type="primary" class="submit" bindtap="register">注册</ui-button>
+                    <ui-button form-type="submit" type="primary" class="submit" bindtap="register">注册</ui-button>
                     <ui-view class="have_account" bindtap="loginPage2">已有账户，点击登录</ui-view>
                   </ui-form>
                 </ui-view>
@@ -116,7 +116,7 @@
                 <ui-input ui:model="{{ pwd }}" type="password" name="pwd" placeholder="登录密码" placeholder-style="color:#9C9C9C" ></ui-input>
               </ui-view>
               <ui-view style="line-height:45px;padding-left:10px;margin-top:20px;border:0;color:#999;">如果该手机号账号未注册，会自动注册并绑定</ui-view>
-              <ui-button formType="submit" type="primary" class="" bindtap="bindAccount">绑定该账号</ui-button>
+              <ui-button form-type="submit" type="primary" class="" bindtap="bindAccount">绑定该账号</ui-button>
             </ui-form>
           </ui-view>
         </ui-view>
@@ -529,4 +529,4 @@ export default {
     color: #D4D4D4;
   }
 }
-</style>
\ No newline at end of file
+</style>

From f62604f02585cdf20e8acfa25de0afb9d88b5d37 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Sun, 25 Nov 2018 19:34:14 +0800
Subject: [PATCH 06/18] fix the error of syntax

fix it to init-text from initType
---
 pages/dialogs/loginInterface.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/dialogs/loginInterface.ui b/pages/dialogs/loginInterface.ui
index 3084cec..e229f9f 100644
--- a/pages/dialogs/loginInterface.ui
+++ b/pages/dialogs/loginInterface.ui
@@ -74,7 +74,7 @@
                     <ui-row height="50" border-bottom>
                       <ui-col vertical-align="bottom">
                         <!-- <ui-input name="code" placeholder="请输入验证码" maxlength="8" placeholder-style="color:#9C9C9C" ></ui-input> -->
-                        <ui-sms-input ui:model="{{ code }}" second="30" initText="获取验证码" bindsend="smsCode"></ui-sms-input>
+                        <ui-sms-input ui:model="{{ code }}" second="30" init-text="获取验证码" bindsend="smsCode"></ui-sms-input>
                       </ui-col>
                       <!-- <ui-col width="80" align="center" vertical-align="middle">
                         <ui-view>获取验证码<ui-view>

From 795983d3df013477071dfad1c4b377a85aea90e2 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 12:37:17 +0800
Subject: [PATCH 07/18] fix the same bug of above about index

To 'opt.index' from 'opt', although I see more same error in other files
---
 pages/templeteDemo/userCenter/updateAddress.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/templeteDemo/userCenter/updateAddress.ui b/pages/templeteDemo/userCenter/updateAddress.ui
index f7f4af5..061e132 100644
--- a/pages/templeteDemo/userCenter/updateAddress.ui
+++ b/pages/templeteDemo/userCenter/updateAddress.ui
@@ -133,12 +133,12 @@ export default {
     },
     singleTap1 (opt) {
       this.tag1.forEach((item, index) => {
-        item.checked = (index === opt)
+        item.checked = (index === opt.index)
       })
     },
     singleTap2 (opt) {
       this.tag2.forEach((item, index) => {
-        item.checked = (index === opt)
+        item.checked = (index === opt.index)
       })
     },
     pick () {
@@ -231,4 +231,4 @@ export default {
   color: #fff;
   border: 0;
 }
-</style>
\ No newline at end of file
+</style>

From 95a6bb6c7462f00cacb156a043d47b821d865c50 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 12:39:15 +0800
Subject: [PATCH 08/18] fix the error of CSS of select function

---
 .../templeteDemo/userCenter/updateAddress.ui  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/templeteDemo/userCenter/updateAddress.ui b/pages/templeteDemo/userCenter/updateAddress.ui
index 061e132..00c0da0 100644
--- a/pages/templeteDemo/userCenter/updateAddress.ui
+++ b/pages/templeteDemo/userCenter/updateAddress.ui
@@ -212,18 +212,18 @@ export default {
       text-align: center;
       line-height: 25px;
       margin-top: 5px;
-      &.select-class{
-        border-radius: 5px;
-        width: 65px;
-        text-align: center;
-        line-height: 25px;
-        margin-top: 5px;
-        border: 1px solid #B9DAFE;
-        background: #F8FBFF;
-        color: #3785E4;
-      }
+      
+    }
+    .select-class{
+      border-radius: 5px;
+      width: 65px;
+      text-align: center;
+      line-height: 25px;
+      margin-top: 5px;
+      border: 1px solid #B9DAFE;
+      background: #F8FBFF;
+      color: #3785E4;
     }
-    
   }
 }
 .sure{

From ec87ed467a0c00854bc0fc8b50fbb735b7199763 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 12:48:48 +0800
Subject: [PATCH 09/18] adjust the position of element to look good

---
 pages/templeteDemo/userCenter/updateAddress.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/templeteDemo/userCenter/updateAddress.ui b/pages/templeteDemo/userCenter/updateAddress.ui
index 00c0da0..b6bd407 100644
--- a/pages/templeteDemo/userCenter/updateAddress.ui
+++ b/pages/templeteDemo/userCenter/updateAddress.ui
@@ -189,7 +189,7 @@ export default {
       font-weight: 600;
       color: #050505;
       &.name1{
-        padding-top: 10px;
+        padding-top: 7px;
       }
     }
     .ui-input{

From 76422cbdc5e94ec4c3dec05f3f06be7eb77f14aa Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 13:10:57 +0800
Subject: [PATCH 10/18] make CSS to right

---
 pages/templeteDemo/userCenter/address.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/templeteDemo/userCenter/address.ui b/pages/templeteDemo/userCenter/address.ui
index ab5cc0b..baad3a8 100644
--- a/pages/templeteDemo/userCenter/address.ui
+++ b/pages/templeteDemo/userCenter/address.ui
@@ -49,7 +49,7 @@ export default {
   data () {
     return {
       list: [
-        { height: 70, addressName: '丰台区马家堡搜宝商务中心3号楼1205', tel: 'TOUCH UI(先生)13716365888', switcher: 'off' }
+        { height: 80, addressName: '丰台区马家堡搜宝商务中心3号楼1205', tel: 'TOUCH UI(先生)13716365888', switcher: 'off' }
       ]
     }
   },
@@ -117,7 +117,7 @@ export default {
 
 .delete{
   width: 80px;
-  height: 80px;
+  line-height: 80px;
   .mix-flex-center();
   font-size: 14px;
   color: #fff;

From c40a4db6056c506b0d489fc196f7f165db6cfc6a Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 19:38:11 +0800
Subject: [PATCH 11/18] fix the error of close tag syntax

---
 pages/templeteDemo/store/sort.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/templeteDemo/store/sort.ui b/pages/templeteDemo/store/sort.ui
index 23c6ae9..9cdd14a 100644
--- a/pages/templeteDemo/store/sort.ui
+++ b/pages/templeteDemo/store/sort.ui
@@ -34,7 +34,7 @@
             <ui-v-tab ui:for="{{ tabItems }}">
               {{ item.name }}
             </ui-v-tab>
-          </ui-tabs>
+          </ui-v-tabs>
         </ui-view>
         <ui-ex-swiper
           class="tab-content"

From 4e7d4bba2fd51b720c1bc855862722f094272625 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 21:32:00 +0800
Subject: [PATCH 12/18] fix the error of syntax

---
 app.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.ui b/app.ui
index 372695b..b5c18c8 100644
--- a/app.ui
+++ b/app.ui
@@ -96,7 +96,7 @@
         <ui-row>
           <ui-col width="80">
             <span class="back" bindtap="handleBack" ui:show="{{showBack}}">
-              <ui-icon type="arrow-left" font-size="24"></ui-icon>返回
+              <ui-icon type="arrow-left" size="24"></ui-icon>返回
             </span>
             <span class="back" ui:show="{{!showBack}}" bindtap="handleNavIconTap">
               <ui-icon type="list" color="#2B333B" size="16"></ui-icon>

From b6cb8e54f8a90b429335ed581b4198d7eca7538b Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 21:36:03 +0800
Subject: [PATCH 13/18] fix the error of syntax

---
 pages/componentDemo/tabs8.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/componentDemo/tabs8.ui b/pages/componentDemo/tabs8.ui
index 95d1c17..9196fd8 100644
--- a/pages/componentDemo/tabs8.ui
+++ b/pages/componentDemo/tabs8.ui
@@ -4,7 +4,7 @@
     <ui-nav-bar class="ui-nav-bar" slot="nav-bar" ui:show="{{swiper1}}">
       <ui-row>
         <ui-col width="40" bindtap="handleBack">
-          <ui-icon type="arrow-left" font-size="24"></ui-icon>
+          <ui-icon type="arrow-left" size="24"></ui-icon>
         </ui-col>
         <ui-col align="center">
           <ui-text>商品详情</ui-text>
@@ -16,7 +16,7 @@
     <ui-nav-bar class="ui-nav-bar" slot="nav-bar" ui:show="{{swiper2}}">
       <ui-row>
         <ui-col width="40" vertiacl-align="middle" bindtap="backTop">
-          <ui-icon type="arrow-left" font-size="24"></ui-icon>
+          <ui-icon type="arrow-left" size="24"></ui-icon>
         </ui-col>
         <ui-col align="center">
          <ui-view style="width:150px;margin:0 auto;">
@@ -1025,4 +1025,4 @@ export default {
 
 
 
-</style>
\ No newline at end of file
+</style>

From 212bb42cc165c6dc68dc1fee144acca59ea46b7c Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 21:37:42 +0800
Subject: [PATCH 14/18] Update infoList.ui

---
 pages/templeteDemo/information/infoList.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/templeteDemo/information/infoList.ui b/pages/templeteDemo/information/infoList.ui
index b55cce3..b051434 100644
--- a/pages/templeteDemo/information/infoList.ui
+++ b/pages/templeteDemo/information/infoList.ui
@@ -20,7 +20,7 @@
         <ui-row>
           <ui-col width="80" bindtap="navigateBack" algin="center">
             <ui-view style="width:80px">
-              <ui-icon type="arrow-left" font-size="24"></ui-icon>
+              <ui-icon type="arrow-left" size="24"></ui-icon>
               <ui-text>返回</ui-text>
             </ui-view>
           </ui-col>

From e2b9fcc0a4c4f5defc7f026471a3fe7a61c6abc2 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 21:38:20 +0800
Subject: [PATCH 15/18] Update detail.ui

---
 pages/templeteDemo/store/detail.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/templeteDemo/store/detail.ui b/pages/templeteDemo/store/detail.ui
index 9080aeb..7326489 100644
--- a/pages/templeteDemo/store/detail.ui
+++ b/pages/templeteDemo/store/detail.ui
@@ -3,7 +3,7 @@
     <ui-nav-bar class="ui-nav-bar" slot="nav-bar" ui:show="{{swiper1}}">
       <ui-row height="46">
         <ui-col vertical-align="middle" width="80" bindtap="handleBack">
-          <ui-icon type="arrow-left" font-size="24"></ui-icon>
+          <ui-icon type="arrow-left" size="24"></ui-icon>
         </ui-col>
         <ui-col align="center" vertical-align="middle">
           <ui-text>商品简介</ui-text>
@@ -15,7 +15,7 @@
     <ui-nav-bar class="ui-nav-bar" slot="nav-bar" ui:show="{{swiper2}}">
       <ui-row height="46" style="line-height:1">
         <ui-col width="40" vertical-align="middle" bindtap="backTop">
-          <ui-icon type="arrow-left" font-size="24"></ui-icon>
+          <ui-icon type="arrow-left" size="24"></ui-icon>
         </ui-col>
         <ui-col align="center" vertical-align="middle">
             <ui-tabs index="{{ current2 }}" width="{{width-80}}" tab-style="{{tabStyle}}" auto-width="{{false}}"  bindchange="handleChange($event, 'current2')">

From ffeb674620931f44c563397317901f13fac45619 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 27 Nov 2018 21:38:47 +0800
Subject: [PATCH 16/18] Update list.ui

---
 pages/templeteDemo/store/list.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/templeteDemo/store/list.ui b/pages/templeteDemo/store/list.ui
index 77f0b51..9d3de87 100644
--- a/pages/templeteDemo/store/list.ui
+++ b/pages/templeteDemo/store/list.ui
@@ -3,7 +3,7 @@
       <ui-nav-bar class="ui-nav-bar" slot="nav-bar">
       <ui-row>
         <ui-col width="40" bindtap="navigateBack">
-          <ui-icon type="arrow-left" font-size="24"></ui-icon>
+          <ui-icon type="arrow-left" size="24"></ui-icon>
         </ui-col>
         <ui-col align="center">
           <ui-text>商品列表</ui-text>
@@ -234,4 +234,4 @@ export default {
   height: 100%;
   .mix-flex-center();
 }
-</style>
\ No newline at end of file
+</style>

From 6c57a012ae7e27487710becc0cc2150bbfc4c8f8 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 4 Dec 2018 16:13:19 +0800
Subject: [PATCH 17/18] fix the bug of the function method

---
 pages/componentDemo/tabs.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/componentDemo/tabs.ui b/pages/componentDemo/tabs.ui
index eaf539f..4897ad0 100755
--- a/pages/componentDemo/tabs.ui
+++ b/pages/componentDemo/tabs.ui
@@ -280,7 +280,7 @@ export default {
     },
     handleChangeBadge(index, key){
       this[key] = index
-      if(key === 1){
+      if(index === 1){
         this.showBadge3 = false
       }
     },
@@ -315,4 +315,4 @@ export default {
   line-height: 60px;
 }
 
-</style>
\ No newline at end of file
+</style>

From 88c7a2c5f687275104a10eb401b6ccc37b4f7874 Mon Sep 17 00:00:00 2001
From: gayshub <jl@zhangxianglei.com>
Date: Tue, 4 Dec 2018 17:00:31 +0800
Subject: [PATCH 18/18] fix the duplicate attribute

---
 pages/componentDemo/navBar3.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/componentDemo/navBar3.ui b/pages/componentDemo/navBar3.ui
index fc533ff..845bda1 100644
--- a/pages/componentDemo/navBar3.ui
+++ b/pages/componentDemo/navBar3.ui
@@ -34,7 +34,7 @@
                   <ui-col vertical-align="middle" align="center" width="30">
                     <ui-icon type="qrcode"></ui-icon>
                   </ui-col>
-                  <ui-col vertical-align="middle" space-left="5" vertical-align="middle" space-left="5">收付款</ui-col>
+                  <ui-col vertical-align="middle" space-left="5">收付款</ui-col>
                 </ui-row>
               </ui-view>
               <ui-view class="popover_item">
@@ -161,4 +161,4 @@ export default {
   }
 }
 
-</style>
\ No newline at end of file
+</style>