Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pages/componentDemo/navBar3.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -161,4 +161,4 @@ export default {
}
}

</style>
</style>
4 changes: 2 additions & 2 deletions pages/componentDemo/scrollView.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions pages/componentDemo/tabs.ui
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ export default {
},
handleChangeBadge(index, key){
this[key] = index
if(key === 1){
if(index === 1){
this.showBadge3 = false
}
},
Expand Down Expand Up @@ -315,4 +315,4 @@ export default {
line-height: 60px;
}

</style>
</style>
6 changes: 3 additions & 3 deletions pages/componentDemo/tabs8.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;">
Expand Down Expand Up @@ -1025,4 +1025,4 @@ export default {



</style>
</style>
3 changes: 1 addition & 2 deletions pages/dialogs/index-list.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -551,4 +551,3 @@
padding: 0 10px;
}
</style>

10 changes: 5 additions & 5 deletions pages/dialogs/loginInterface.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -529,4 +529,4 @@ export default {
color: #D4D4D4;
}
}
</style>
</style>
2 changes: 1 addition & 1 deletion pages/templeteDemo/information/infoList.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions pages/templeteDemo/store/detail.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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')">
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pages/templeteDemo/store/list.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -234,4 +234,4 @@ export default {
height: 100%;
.mix-flex-center();
}
</style>
</style>
2 changes: 1 addition & 1 deletion pages/templeteDemo/store/sort.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pages/templeteDemo/userCenter/address.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
]
}
},
Expand Down Expand Up @@ -117,7 +117,7 @@ export default {

.delete{
width: 80px;
height: 80px;
line-height: 80px;
.mix-flex-center();
font-size: 14px;
color: #fff;
Expand Down
30 changes: 15 additions & 15 deletions pages/templeteDemo/userCenter/updateAddress.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -189,7 +189,7 @@ export default {
font-weight: 600;
color: #050505;
&.name1{
padding-top: 10px;
padding-top: 7px;
}
}
.ui-input{
Expand All @@ -212,23 +212,23 @@ 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{
background-color: #36D34F;
color: #fff;
border: 0;
}
</style>
</style>