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 @@ @@ -15,6 +15,8 @@
15 "pages/pet/p_detail", 15 "pages/pet/p_detail",
16 "pages/pet/p_edit", 16 "pages/pet/p_edit",
17 "pages/pet/p_add", 17 "pages/pet/p_add",
  18 + "pages/pet/p_aadd",
  19 + "pages/pet/p_basic",
18 "pages/topic/t_list", 20 "pages/topic/t_list",
19 "pages/topic/t_detail", 21 "pages/topic/t_detail",
20 "pages/activity/a_list" 22 "pages/activity/a_list"
  1 +<?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>
  1 +<?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>
  1 +var comfun = require('../../comjs/comfun.js');
  2 +Page({
  3 + data:{
  4 + petkind:{
  5 + cat:{
  6 + 0:[
  7 + {
  8 + title:"折耳猫",
  9 + imageurl:""
  10 + },
  11 + {
  12 + title:"英国短毛猫",
  13 + imageurl:""
  14 + },
  15 + {
  16 + title:"美国短毛猫",
  17 + imageurl:""
  18 + },
  19 + ],
  20 + 1:[
  21 +
  22 + {
  23 + title:"波斯猫",
  24 + imageurl:""
  25 + },
  26 + {
  27 + title:"加菲猫",
  28 + imageurl:""
  29 + },
  30 + {
  31 + title:"斯芬克斯猫",
  32 + imageurl:""
  33 + },
  34 + {
  35 + title:"布偶猫",
  36 + imageurl:""
  37 + },
  38 + ],
  39 + 2:[
  40 + {
  41 + title:"暹罗猫",
  42 + imageurl:""
  43 + },
  44 + {
  45 + title:"狸花猫",
  46 + imageurl:""
  47 + },
  48 + {
  49 + title:"矮脚猫",
  50 + imageurl:""
  51 + },
  52 +
  53 + ]
  54 + },
  55 + dog:{
  56 + 0:[
  57 + {
  58 + title:"泰迪",
  59 + imageurl:""
  60 + },
  61 + {
  62 + title:"博美",
  63 + imageurl:""
  64 + },
  65 + {
  66 + title:"金毛",
  67 + imageurl:""
  68 + },
  69 + ],
  70 + 1:[
  71 +
  72 + {
  73 + title:"哈士奇",
  74 + imageurl:""
  75 + },
  76 + {
  77 + title:"萨摩",
  78 + imageurl:""
  79 + },
  80 + {
  81 + title:"阿拉斯加",
  82 + imageurl:""
  83 + },
  84 + {
  85 + title:"比熊",
  86 + imageurl:""
  87 + },
  88 + ],
  89 + 2:[
  90 + {
  91 + title:"拉布拉多",
  92 + imageurl:""
  93 + },
  94 + {
  95 + title:"八哥犬",
  96 + imageurl:""
  97 + },
  98 + {
  99 + title:"牧羊犬",
  100 + imageurl:""
  101 + },
  102 + ],
  103 + 3:[
  104 + {
  105 + title:"柯基",
  106 + imageurl:""
  107 + },
  108 + {
  109 + title:"柴犬",
  110 + imageurl:""
  111 + },
  112 + {
  113 + title:"藏獒",
  114 + imageurl:""
  115 + },
  116 + {
  117 + title:"贵宾",
  118 + imageurl:""
  119 + },
  120 + ]
  121 +
  122 + },
  123 + },
  124 + },
  125 + onLoad:function (opt) {
  126 + comfun.setBarTitle('添加宠物');
  127 + this.setData({
  128 + petlist:this.data.petkind[opt.type]
  129 + })
  130 + },
  131 + onShow:function () {
  132 +
  133 + },
  134 + selectkind:function (e) {
  135 +
  136 + },
  137 + afterstep:function () {
  138 + wx.navigateTo({
  139 + url:'p_basic'
  140 + })
  141 + }
  142 +})
  1 +<view class="pet-kind fixed left bottom top bg-white pet-kind-after">
  2 + <!--<view class="gray-deep-font font30r pet-kind-select">选择宠物品种</view>-->
  3 + <block wx:for="{{petlist}}" wx:for-item="list">
  4 + <view class="pet-kind-kind flex-cm">
  5 + <block wx:for="{{list}}">
  6 + <view class="pet-kind-single flex-vc">
  7 + <view>
  8 + <image src="/pages/image/topic3.jpg" class="pet-kind-image"></image>
  9 + </view>
  10 + <view class="black-font font28r">{{item.title}}</view>
  11 + </view>
  12 + </block>
  13 + </view>
  14 + </block>
  15 + <view class="flex-lr kind-sort-button left">
  16 + <view class="orange-font font32r flex-cm step-button border" bindtap="prevstep">上一步</view>
  17 + <view class="white-font font32r bg-orange flex-cm step-button" bindtap="afterstep">下一步</view>
  18 + </view>
  19 +</view>
  1 +.pet-kind{
  2 + width:100%;
  3 +}
  4 +.pet-kind-after{
  5 +}
  6 +.pet-kind-kind{
  7 + width:680rpx;
  8 + margin:0 auto;
  9 +}
  10 +.pet-kind-single{
  11 + width:170rpx;
  12 + margin-bottom:50rpx;
  13 +}
  14 +.pet-kind-image{
  15 + width:120rpx;
  16 + height:120rpx;
  17 + border-radius:50%;
  18 + margin-bottom:20rpx;
  19 +}
  20 +.kind-sort-button{
  21 + width:630rpx;
  22 + height:80rpx;
  23 + margin:80rpx auto 0;
  24 +}
  25 +.step-button{
  26 + width:240rpx;
  27 + height:100%;
  28 + border-radius:10rpx;
  29 +}
  30 +.border{
  31 + border:1px solid #fcb34c;
  32 + box-sizing:border-box;
  33 +}
@@ -15,104 +15,6 @@ Page({ @@ -15,104 +15,6 @@ Page({
15 isactive:false 15 isactive:false
16 }, 16 },
17 ], 17 ],
18 - petkind:{  
19 - cat:{  
20 -  
21 - }  
22 - [  
23 - {  
24 - title:"折耳猫",  
25 - imageurl:""  
26 - },  
27 - {  
28 - title:"英国短毛猫",  
29 - imageurl:""  
30 - },  
31 - {  
32 - title:"美国短毛猫",  
33 - imageurl:""  
34 - },  
35 - {  
36 - title:"波斯猫",  
37 - imageurl:""  
38 - },  
39 - {  
40 - title:"加菲猫",  
41 - imageurl:""  
42 - },  
43 - {  
44 - title:"斯芬克斯猫",  
45 - imageurl:""  
46 - },  
47 - {  
48 - title:"布偶猫",  
49 - imageurl:""  
50 - },  
51 - {  
52 - title:"暹罗猫",  
53 - imageurl:""  
54 - },  
55 - {  
56 - title:"狸花猫",  
57 - imageurl:""  
58 - },  
59 - {  
60 - title:"矮脚猫",  
61 - imageurl:""  
62 - },  
63 - ],  
64 - dog:[  
65 - {  
66 - title:"泰迪",  
67 - imageurl:""  
68 - },  
69 - {  
70 - title:"博美",  
71 - imageurl:""  
72 - },  
73 - {  
74 - title:"金毛",  
75 - imageurl:""  
76 - },  
77 - {  
78 - title:"哈士奇",  
79 - imageurl:""  
80 - },  
81 - {  
82 - title:"萨摩",  
83 - imageurl:""  
84 - },  
85 - {  
86 - title:"阿拉斯加",  
87 - imageurl:""  
88 - },  
89 - {  
90 - title:"比熊",  
91 - imageurl:""  
92 - },  
93 - {  
94 - title:"拉布拉多",  
95 - imageurl:""  
96 - },  
97 - {  
98 - title:"八哥犬",  
99 - imageurl:""  
100 - },  
101 - {  
102 - title:"牧羊犬",  
103 - imageurl:""  
104 - },  
105 - {  
106 - title:"柯基",  
107 - imageurl:""  
108 - },  
109 - {  
110 - title:"柴犬",  
111 - imageurl:""  
112 - },  
113 -  
114 - ]  
115 - },  
116 }, 18 },
117 onLoad:function () { 19 onLoad:function () {
118 comfun.setBarTitle('添加宠物') 20 comfun.setBarTitle('添加宠物')
@@ -135,8 +37,8 @@ Page({ @@ -135,8 +37,8 @@ Page({
135 }) 37 })
136 }, 38 },
137 afterstep:function () { 39 afterstep:function () {
138 - this.setData({  
139 - petlist:this.data.petkind[this.data.pettype] 40 + wx.navigateTo({
  41 + url:'p_aadd?type='+this.data.pettype
140 }) 42 })
141 } 43 }
142 }) 44 })
1 -<view class="pet-kind fixed left bottom top"> 1 +<view class="pet-kind">
2 <view class="pet-kind-list flex-vc"> 2 <view class="pet-kind-list flex-vc">
3 <block wx:for="{{kindlist}}"> 3 <block wx:for="{{kindlist}}">
4 <view class="kind-pet flex-vc" bindtap="selectkind" data-type="{{item.type}}"> 4 <view class="kind-pet flex-vc" bindtap="selectkind" data-type="{{item.type}}">
@@ -8,19 +8,4 @@ @@ -8,19 +8,4 @@
8 </block> 8 </block>
9 </view> 9 </view>
10 <view class="pet-after-button bg-orange white-font font32r left right flex-cm" bindtap="afterstep">下一步</view> 10 <view class="pet-after-button bg-orange white-font font32r left right flex-cm" bindtap="afterstep">下一步</view>
11 -</view>  
12 -<block wx:if="{{petlist}}">  
13 - <view class="pet-kind fixed left bottom top bg-white pet-kind-after">  
14 - <view class="gray-deep-font font30r pet-kind-select">选择宠物品种</view>  
15 - <view class="pet-kind-kind flex-rs">  
16 - <block wx:for="{{petlist}}">  
17 - <view class="pet-kind-single flex-vc">  
18 - <view>  
19 - <image src="/pages/image/topic3.jpg" class="pet-kind-image"></image>  
20 - </view>  
21 - <view class="black-font font28r">{{item.title}}</view>  
22 - </view>  
23 - </block>  
24 - </view>  
25 - </view>  
26 -</block>  
  11 +</view>
@@ -33,19 +33,3 @@ @@ -33,19 +33,3 @@
33 padding:0 30rpx 60rpx; 33 padding:0 30rpx 60rpx;
34 box-sizing:border-box; 34 box-sizing:border-box;
35 } 35 }
36 -.pet-kind-after{  
37 -}  
38 -.pet-kind-kind{  
39 - width:680rpx;  
40 - margin:0 auto;  
41 -}  
42 -.pet-kind-single{  
43 - width:170rpx;  
44 - margin-bottom:50rpx;  
45 -}  
46 -.pet-kind-image{  
47 - width:130rpx;  
48 - height:130rpx;  
49 - border-radius:50%;  
50 - margin-bottom:20rpx;  
51 -}  
  1 +var comfun = require('../../comjs/comfun.js');
  2 +Page({
  3 + data:{
  4 + sex:[
  5 + {
  6 + pet_sex:'male',
  7 + iconurl:'/pages/image/pet-male.svg'
  8 + },
  9 + {
  10 + pet_sex:'female',
  11 + iconurl:'/pages/image/pet-female.svg'
  12 + }
  13 + ]
  14 + },
  15 + onLoad:function () {
  16 + comfun.setBarTitle('添加宠物')
  17 + },
  18 + onShow:function () {
  19 +
  20 + },
  21 +})
  1 +<view class="pet-basic flex-vc">
  2 + <image src="/pages/image/topic2.jpg" class="pet-headimg"></image>
  3 + <view class="black-font font30r">头像</view>
  4 + <view class="pet-sex flex-lr">
  5 + <block wx:for="{{sex}}">
  6 + <view class="flex-lm">
  7 + <image src="{{item.iconurl}}" class="sex-icon"></image>
  8 + <view class="pet-radio flex-cm">
  9 + <view class="cirle-radio bg-orange"></view>
  10 + </view>
  11 + </view>
  12 + </block>
  13 + </view>
  14 +</view>
  1 +.pet-headimg{
  2 + width:120rpx;
  3 + height:120rpx;
  4 + border-radius:50%;
  5 + margin-bottom:30rpx;
  6 +}
  7 +.pet-sex{
  8 + width:300rpx;
  9 + margin:0 auto;
  10 + padding-top:40rpx;
  11 +}
  12 +.sex-icon{
  13 + width:40rpx;
  14 + height:40rpx;
  15 + margin-right:18rpx;
  16 +}
  17 +.pet-radio{
  18 + width:32rpx;
  19 + height:32rpx;
  20 + border:1px solid #fcb34c;
  21 + border-radius:50%;
  22 +}
  23 +.cirle-radio{
  24 + width:16rpx;
  25 + height:16rpx;
  26 + border-radius:50%;
  27 +}