xt / xt-ac · Commits

Go to a project

Commit ef9d225b611df5a01a908a90f75f92f1ba78fbc9

Authored by zhangyan
1 parent 6bdaefe5
build: skipped

no message

Inline Side-by-side
Showing 14 changed files with 266 additions and 133 deletions
... ... @@ -15,6 +15,8 @@
"pages/pet/p_detail",
"pages/pet/p_edit",
"pages/pet/p_add",
"pages/pet/p_aadd",
"pages/pet/p_basic",
"pages/topic/t_list",
"pages/topic/t_detail",
"pages/activity/a_list"
... ...
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1541751186281" class="icon" style="" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4458" xmlns:xlink="http://www.w3.org/1999/xlink" width="64.0625" height="64"><defs><style type="text/css"></style></defs><path d="M436.1797 659.381032c143.121464 109.044925 347.580699 98.821963 480.479202-34.076539 143.121464-143.121464 143.121464-374.84193 0-517.963395-143.121464-143.121464-374.84193-143.121464-517.963395 0-132.898502 132.898502-143.121464 337.357737-34.076539 480.479202L238.535774 713.903494 71.560732 546.928453 0 618.489185 166.975042 785.464226 0 952.439268 71.560732 1024 238.535774 857.024958l166.975041 166.975042 71.560732-71.560732L310.096506 785.464226l126.083194-126.083194z m34.07654-477.071548c102.229617-102.229617 272.612313-102.229617 374.84193 0s102.229617 272.612313 0 374.84193-272.612313 102.229617-374.84193 0c-105.637271-105.637271-105.637271-272.612313 0-374.84193z" fill="#fcb34c" p-id="4459"></path></svg>
\ No newline at end of file
... ...
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1541751195730" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4631" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M657.677205 436.1797L920.066556 173.790349v136.306157h102.229617V0h-310.096506v102.229617h136.306157l-262.389351 262.389351C442.995008 255.574043 238.535774 265.797005 105.637271 398.695507c-143.121464 143.121464-143.121464 374.84193 0 517.963395 143.121464 143.121464 374.84193 143.121464 517.963395 0 132.898502-132.898502 143.121464-337.357737 34.076539-480.479202z m-477.071548 408.91847c-102.229617-102.229617-102.229617-272.612313 0-374.84193s272.612313-102.229617 374.84193 0 102.229617 272.612313 0 374.84193c-105.637271 102.229617-272.612313 102.229617-374.84193 0z" fill="#666666" p-id="4632"></path></svg>
\ No newline at end of file
... ...
var comfun = require('../../comjs/comfun.js');
Page({
data:{
petkind:{
cat:{
0:[
{
title:"折耳猫",
imageurl:""
},
{
title:"英国短毛猫",
imageurl:""
},
{
title:"美国短毛猫",
imageurl:""
},
],
1:[
{
title:"波斯猫",
imageurl:""
},
{
title:"加菲猫",
imageurl:""
},
{
title:"斯芬克斯猫",
imageurl:""
},
{
title:"布偶猫",
imageurl:""
},
],
2:[
{
title:"暹罗猫",
imageurl:""
},
{
title:"狸花猫",
imageurl:""
},
{
title:"矮脚猫",
imageurl:""
},
]
},
dog:{
0:[
{
title:"泰迪",
imageurl:""
},
{
title:"博美",
imageurl:""
},
{
title:"金毛",
imageurl:""
},
],
1:[
{
title:"哈士奇",
imageurl:""
},
{
title:"萨摩",
imageurl:""
},
{
title:"阿拉斯加",
imageurl:""
},
{
title:"比熊",
imageurl:""
},
],
2:[
{
title:"拉布拉多",
imageurl:""
},
{
title:"八哥犬",
imageurl:""
},
{
title:"牧羊犬",
imageurl:""
},
],
3:[
{
title:"柯基",
imageurl:""
},
{
title:"柴犬",
imageurl:""
},
{
title:"藏獒",
imageurl:""
},
{
title:"贵宾",
imageurl:""
},
]
},
},
},
onLoad:function (opt) {
comfun.setBarTitle('添加宠物');
this.setData({
petlist:this.data.petkind[opt.type]
})
},
onShow:function () {
},
selectkind:function (e) {
},
afterstep:function () {
wx.navigateTo({
url:'p_basic'
})
}
})
\ No newline at end of file
... ...
{}
\ No newline at end of file
... ...
<view class="pet-kind fixed left bottom top bg-white pet-kind-after">
<!--<view class="gray-deep-font font30r pet-kind-select">选择宠物品种</view>-->
<block wx:for="{{petlist}}" wx:for-item="list">
<view class="pet-kind-kind flex-cm">
<block wx:for="{{list}}">
<view class="pet-kind-single flex-vc">
<view>
<image src="/pages/image/topic3.jpg" class="pet-kind-image"></image>
</view>
<view class="black-font font28r">{{item.title}}</view>
</view>
</block>
</view>
</block>
<view class="flex-lr kind-sort-button left">
<view class="orange-font font32r flex-cm step-button border" bindtap="prevstep">上一步</view>
<view class="white-font font32r bg-orange flex-cm step-button" bindtap="afterstep">下一步</view>
</view>
</view>
\ No newline at end of file
... ...
.pet-kind{
width:100%;
}
.pet-kind-after{
}
.pet-kind-kind{
width:680rpx;
margin:0 auto;
}
.pet-kind-single{
width:170rpx;
margin-bottom:50rpx;
}
.pet-kind-image{
width:120rpx;
height:120rpx;
border-radius:50%;
margin-bottom:20rpx;
}
.kind-sort-button{
width:630rpx;
height:80rpx;
margin:80rpx auto 0;
}
.step-button{
width:240rpx;
height:100%;
border-radius:10rpx;
}
.border{
border:1px solid #fcb34c;
box-sizing:border-box;
}
\ No newline at end of file
... ...
... ... @@ -15,104 +15,6 @@ Page({
isactive:false
},
],
petkind:{
cat:{
}
[
{
title:"折耳猫",
imageurl:""
},
{
title:"英国短毛猫",
imageurl:""
},
{
title:"美国短毛猫",
imageurl:""
},
{
title:"波斯猫",
imageurl:""
},
{
title:"加菲猫",
imageurl:""
},
{
title:"斯芬克斯猫",
imageurl:""
},
{
title:"布偶猫",
imageurl:""
},
{
title:"暹罗猫",
imageurl:""
},
{
title:"狸花猫",
imageurl:""
},
{
title:"矮脚猫",
imageurl:""
},
],
dog:[
{
title:"泰迪",
imageurl:""
},
{
title:"博美",
imageurl:""
},
{
title:"金毛",
imageurl:""
},
{
title:"哈士奇",
imageurl:""
},
{
title:"萨摩",
imageurl:""
},
{
title:"阿拉斯加",
imageurl:""
},
{
title:"比熊",
imageurl:""
},
{
title:"拉布拉多",
imageurl:""
},
{
title:"八哥犬",
imageurl:""
},
{
title:"牧羊犬",
imageurl:""
},
{
title:"柯基",
imageurl:""
},
{
title:"柴犬",
imageurl:""
},
]
},
},
onLoad:function () {
comfun.setBarTitle('添加宠物')
... ... @@ -135,8 +37,8 @@ Page({
})
},
afterstep:function () {
this.setData({
petlist:this.data.petkind[this.data.pettype]
wx.navigateTo({
url:'p_aadd?type='+this.data.pettype
})
}
})
\ No newline at end of file
... ...
<view class="pet-kind fixed left bottom top">
<view class="pet-kind">
<view class="pet-kind-list flex-vc">
<block wx:for="{{kindlist}}">
<view class="kind-pet flex-vc" bindtap="selectkind" data-type="{{item.type}}">
... ... @@ -8,19 +8,4 @@
</block>
</view>
<view class="pet-after-button bg-orange white-font font32r left right flex-cm" bindtap="afterstep">下一步</view>
</view>
<block wx:if="{{petlist}}">
<view class="pet-kind fixed left bottom top bg-white pet-kind-after">
<view class="gray-deep-font font30r pet-kind-select">选择宠物品种</view>
<view class="pet-kind-kind flex-rs">
<block wx:for="{{petlist}}">
<view class="pet-kind-single flex-vc">
<view>
<image src="/pages/image/topic3.jpg" class="pet-kind-image"></image>
</view>
<view class="black-font font28r">{{item.title}}</view>
</view>
</block>
</view>
</view>
</block>
\ No newline at end of file
</view>
\ No newline at end of file
... ...
... ... @@ -33,19 +33,3 @@
padding:0 30rpx 60rpx;
box-sizing:border-box;
}
.pet-kind-after{
}
.pet-kind-kind{
width:680rpx;
margin:0 auto;
}
.pet-kind-single{
width:170rpx;
margin-bottom:50rpx;
}
.pet-kind-image{
width:130rpx;
height:130rpx;
border-radius:50%;
margin-bottom:20rpx;
}
... ...
var comfun = require('../../comjs/comfun.js');
Page({
data:{
sex:[
{
pet_sex:'male',
iconurl:'/pages/image/pet-male.svg'
},
{
pet_sex:'female',
iconurl:'/pages/image/pet-female.svg'
}
]
},
onLoad:function () {
comfun.setBarTitle('添加宠物')
},
onShow:function () {
},
})
\ No newline at end of file
... ...
{}
\ No newline at end of file
... ...
<view class="pet-basic flex-vc">
<image src="/pages/image/topic2.jpg" class="pet-headimg"></image>
<view class="black-font font30r">头像</view>
<view class="pet-sex flex-lr">
<block wx:for="{{sex}}">
<view class="flex-lm">
<image src="{{item.iconurl}}" class="sex-icon"></image>
<view class="pet-radio flex-cm">
<view class="cirle-radio bg-orange"></view>
</view>
</view>
</block>
</view>
</view>
\ No newline at end of file
... ...
.pet-headimg{
width:120rpx;
height:120rpx;
border-radius:50%;
margin-bottom:30rpx;
}
.pet-sex{
width:300rpx;
margin:0 auto;
padding-top:40rpx;
}
.sex-icon{
width:40rpx;
height:40rpx;
margin-right:18rpx;
}
.pet-radio{
width:32rpx;
height:32rpx;
border:1px solid #fcb34c;
border-radius:50%;
}
.cirle-radio{
width:16rpx;
height:16rpx;
border-radius:50%;
}
\ No newline at end of file
... ...