xt / xt-ac · Commits

Go to a project

Commit 6bdaefe5c1d297cf2c02ae92e128d4cc1efa5c95

Authored by zhangyan
1 parent eaf3db4a
build: skipped

no message

Inline Side-by-side
Showing 28 changed files with 552 additions and 155 deletions
@@ -12,6 +12,9 @@ @@ -12,6 +12,9 @@
12 "pages/person/person", 12 "pages/person/person",
13 "pages/person/p_list", 13 "pages/person/p_list",
14 "pages/person/p_photo", 14 "pages/person/p_photo",
  15 + "pages/pet/p_detail",
  16 + "pages/pet/p_edit",
  17 + "pages/pet/p_add",
15 "pages/topic/t_list", 18 "pages/topic/t_list",
16 "pages/topic/t_detail", 19 "pages/topic/t_detail",
17 "pages/activity/a_list" 20 "pages/activity/a_list"
1 <view class="top-tab flex-cm bg-white fixed left top"> 1 <view class="top-tab flex-cm bg-white fixed left top">
2 <block wx:for="{{list}}"> 2 <block wx:for="{{list}}">
3 - <view class="font28r {{item.isactive==true ? 'white-font tab-block-active' : 'orange-font'}} top-tab-block flex-cm {{index!=2 ? 'border-right-none' : ''}}">{{item.title}}</view> 3 + <view class="font30r {{item.isactive==true ? 'orange-font' : 'black-font'}} top-tab-block flex-cm {{index!=2 ? 'border-right-none' : ''}}">{{item.title}}</view>
4 </block> 4 </block>
5 </view> 5 </view>
1 @import '../../app.wxss' 1 @import '../../app.wxss'
2 .top-tab{ 2 .top-tab{
3 width:100%; 3 width:100%;
4 - height:100rpx; 4 + height:80rpx;
5 padding:0 20rpx; 5 padding:0 20rpx;
6 - padding-bottom:20rpx; 6 + /*padding-bottom:20rpx;*/
7 box-sizing:border-box; 7 box-sizing:border-box;
8 z-index:99; 8 z-index:99;
  9 + border-bottom:1px solid #efeef3;
9 } 10 }
10 .top-tab-block{ 11 .top-tab-block{
11 - padding:0 24rpx; 12 + padding:0 50rpx;
12 height:60rpx; 13 height:60rpx;
13 - border:1px solid #fcb34c; 14 + /*border:1px solid #fcb34c;*/
14 box-sizing:border-box; 15 box-sizing:border-box;
15 } 16 }
16 .border-right-none{ 17 .border-right-none{
  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="1541663173031" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5327" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M725.290667 405.248a192 192 0 0 1-170.666667 190.677333v86.656h74.666667c5.973333 0 10.666667 4.693333 10.666666 10.666667v21.333333c0 5.973333-4.693333 10.666667-10.666666 10.666667h-74.666667v74.666667c0 5.973333-4.693333 10.666667-10.666667 10.666666h-21.333333c-5.973333 0-10.666667-4.693333-10.666667-10.666666v-74.666667h-74.666666c-5.973333 0-10.666667-4.693333-10.666667-10.666667v-21.333333c0-5.973333 4.693333-10.666667 10.666667-10.666667h74.666666v-86.656A191.872 191.872 0 0 1 341.930667 389.546667c7.338667-90.666667 79.36-164.992 169.386666-175.018667a191.829333 191.829333 0 0 1 213.973334 190.677333z m-341.333334 0c0 82.346667 66.986667 149.333333 149.333334 149.333333s149.333333-66.986667 149.333333-149.333333-66.986667-149.333333-149.333333-149.333333-149.333333 66.986667-149.333334 149.333333z" fill="#fe9401" p-id="5328"></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="1541667732058" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="42357" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M974.4 936H46.4c-19.2 0-38.4 19.2-38.4 38.4s19.2 38.4 38.4 38.4h928c19.2 0 38.4-19.2 38.4-38.4s-12.8-38.4-38.4-38.4z m-704-134.4l262.4-115.2c6.4 0 6.4-6.4 12.8-6.4l448-448c32-32 32-83.2 0-115.2l-89.6-83.2c-32-32-83.2-32-115.2 0l-448 448-6.4 6.4-115.2 262.4c-6.4 12.8 0 32 6.4 38.4s25.6 19.2 44.8 12.8z m576-710.4l89.6 89.6-70.4 70.4-89.6-89.6 70.4-70.4z m-441.6 441.6l313.6-313.6 89.6 89.6-313.6 307.2-153.6 64 64-147.2z" p-id="42358" fill="#999999"></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="1541665316620" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33199" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M234.4 638.48a286.8 180.4 0 1 0 573.6 0 286.8 180.4 0 1 0-573.6 0Z" p-id="33200" fill="#fcb34c"></path><path d="M194.36337 443.657856a70.88 46.8 60 1 0 81.059978-46.8 70.88 46.8 60 1 0-81.059978 46.8Z" p-id="33201" fill="#fcb34c"></path><path d="M344.939931 341.85791a86.24 59.44 79.43 1 0 116.862789-21.80695 86.24 59.44 79.43 1 0-116.862789 21.80695Z" p-id="33202" fill="#fcb34c"></path><path d="M613.230287 403.430056a62.56 106.56 7.63 1 0 28.297087-211.233069 62.56 106.56 7.63 1 0-28.297087 211.233069Z" p-id="33203" fill="#fcb34c"></path><path d="M758.202431 487.453064a45.92 77.76 30 1 0 77.76-134.684271 45.92 77.76 30 1 0-77.76 134.684271Z" p-id="33204" fill="#fcb34c"></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="1541389691470" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4927" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M898.2 155.8C649.2 308.6 468.5 501.5 387 598.2L187.9 442.1l-88 70.9 343.7 349.8c59-151.6 246.6-447.7 475.5-658.2l-20.9-48.8" p-id="4928" fill="#fcb34c"></path></svg>
1 -<!--<topTab></topTab>-->  
2 <view class="banner"> 1 <view class="banner">
3 <swiper> 2 <swiper>
4 <block wx:for="{{banners}}"> 3 <block wx:for="{{banners}}">
@@ -136,12 +135,12 @@ @@ -136,12 +135,12 @@
136 </view> 135 </view>
137 136
138 137
139 -<view class="menu fixed" style="right:{{menuright}}rpx;bottom:{{menubottom}}rpx;" catchtouchmove="menumove"> 138 +<!--<view class="menu fixed" style="right:{{menuright}}rpx;bottom:{{menubottom}}rpx;" catchtouchmove="menumove">
140 <view class="black-font font-siny font24r flex-cm menu-menu" style="background:#fff;"bindtap="menushow">菜单</view> 139 <view class="black-font font-siny font24r flex-cm menu-menu" style="background:#fff;"bindtap="menushow">菜单</view>
141 <view class="white-font font-siny font24r flex-cm menu-scale {{isshow==true ? 'menu-team' : 'menu-hide'}}" bindtap="team">组队</view> 140 <view class="white-font font-siny font24r flex-cm menu-scale {{isshow==true ? 'menu-team' : 'menu-hide'}}" bindtap="team">组队</view>
142 <view class="white-font font-siny font24r flex-cm menu-scale {{isshow==true ? 'menu-home' : 'menu-hide'}}" bindtap="home">社区</view> 141 <view class="white-font font-siny font24r flex-cm menu-scale {{isshow==true ? 'menu-home' : 'menu-hide'}}" bindtap="home">社区</view>
143 <view class="white-font font-siny font24r flex-cm menu-scale {{isshow==true ? 'menu-sort' : 'menu-hide'}}" bindtap="sort">榜单</view> 142 <view class="white-font font-siny font24r flex-cm menu-scale {{isshow==true ? 'menu-sort' : 'menu-hide'}}" bindtap="sort">榜单</view>
144 -</view> 143 +</view>-->
145 144
146 145
147 <tabbar></tabbar> 146 <tabbar></tabbar>
@@ -32,10 +32,10 @@ Page({ @@ -32,10 +32,10 @@ Page({
32 title:'粉丝', 32 title:'粉丝',
33 count:100, 33 count:100,
34 }, 34 },
35 - {  
36 - title:'卡券',  
37 - count:2,  
38 - }, 35 + // {
  36 + // title:'卡券',
  37 + // count:2,
  38 + // },
39 { 39 {
40 title:'积分', 40 title:'积分',
41 count:200, 41 count:200,
@@ -61,5 +61,10 @@ Page({ @@ -61,5 +61,10 @@ Page({
61 }) 61 })
62 } 62 }
63 } 63 }
  64 + },
  65 + petdetail:function () {
  66 + wx.navigateTo({
  67 + url:'../pet/p_detail'
  68 + })
64 } 69 }
65 }) 70 })
1 -<!--<view class="person-info flex-lr">  
2 - <view class="flex-vl">  
3 - <view class="black-font font38r font-bold flex-lm">喵玖铲屎官 <image src="http://qn.colorcun.com/ac/bianji.png" style="width:30rpx; height:30rpx;margin-left:14rpx;"></image></view>  
4 - <view class="flex-lt" style="margin-top:30rpx;">  
5 - <view class="person-fan gray-deep-font font22r font-siny flex-cm">关注 20</view>  
6 - <view class="person-fan gray-deep-font font22r font-siny flex-cm">粉丝 198</view>  
7 - </view>  
8 - </view>  
9 - <image src="/pages/image/topic3.jpg" class="person-headimg"></image>  
10 -</view>  
11 -<view class="setting flex-lr">  
12 - <block wx:for="{{setting}}">  
13 - <view class="flex-vc">  
14 - <image src="{{item.iconurl}}" class="setting-icon"></image>  
15 - <view class="gray-deep-font font26r font-siny">{{item.title}}</view>  
16 - </view>  
17 - </block>  
18 -</view>-->  
19 -<!--<view class="cut"></view>-->  
20 -<!--<view class="person-pet">  
21 - <view class="font34r font-bold black-font flex-lr" style="padding:40rpx 0;">  
22 - <view>我的爱宠</view>  
23 - <image src="/pages/image/add.svg" class="add-icon"></image>  
24 - </view>  
25 - <block wx:for="{{blocks}}">  
26 - <view class="flex-lm person-pet-block">  
27 - <image src="/pages/image/topic3.jpg" class="pet-headimg"></image>  
28 - <view class="flex-vl">  
29 - <view class="black-font font30r font-bold">美琪琪</view>  
30 - <view class="gray-deep-font font24r font-siny" style="line-height:1.5;margin-top:20rpx;">作为一只金毛mm,保持傲娇绝对是她的生活状态！</view>  
31 - </view>  
32 - </view>  
33 - </block>  
34 -</view>-->  
35 -<!--<view class="person-pet">  
36 - <view class="font34r font-bold black-font" style="padding:40rpx 0;">生活相册</view>  
37 - <view class="pet-picture flex-lrt">  
38 - <view class="pet-picture-block">  
39 - <block wx:for="{{blocks}}">  
40 - <block wx:if="{{index%2==0}}">  
41 - <image src="/pages/image/{{item}}.jpg" class="pet-picture-image" mode="widthFix"></image>  
42 - </block>  
43 - </block>  
44 - </view>  
45 - <view class="pet-picture-block">  
46 - <block wx:for="{{blocks}}">  
47 - <block wx:if="{{index%2==1}}">  
48 - <image src="/pages/image/{{item}}.jpg" class="pet-picture-image" mode="widthFix"></image>  
49 - </block>  
50 - </block>  
51 - </view>  
52 - </view>  
53 -</view>-->  
54 -  
55 <view class="me"> 1 <view class="me">
56 <view class="me-top"> 2 <view class="me-top">
57 <view class="flex-lr"> 3 <view class="flex-lr">
@@ -91,9 +37,9 @@ @@ -91,9 +37,9 @@
91 </view> 37 </view>
92 <view class="my-pet-list flex-vl"> 38 <view class="my-pet-list flex-vl">
93 <block wx:for="{{blocks}}"> 39 <block wx:for="{{blocks}}">
94 - <view class="flex-lm my-pet-block"> 40 + <view class="flex-lm my-pet-block" bindtap="petdetail">
95 <view> 41 <view>
96 - <image src="/pages/image/topic2.jpg" style="width:120rpx;height:120rpx;border-radius:50%;margin-right:20rpx;"></image> 42 + <image src="/pages/image/topic2.jpg" style="width:120rpx;height:120rpx;border-radius:50%;margin-right:20rpx;"></image>
97 </view> 43 </view>
98 <view class="flex-vl"> 44 <view class="flex-vl">
99 <view class="black-font font30r font-bold">小煎包</view> 45 <view class="black-font font30r font-bold">小煎包</view>
1 page{ 1 page{
2 background:#f7f7f7; 2 background:#f7f7f7;
3 } 3 }
4 -.person-info{  
5 - width:690rpx;  
6 - padding:60rpx 0;  
7 - margin:0 auto;  
8 -}  
9 -.person-fan{  
10 - height:38rpx;  
11 - padding:0 20rpx;  
12 - border-radius:6rpx;  
13 - background:#f7f7f7;  
14 - margin-right:20rpx;  
15 -}  
16 -.person-headimg{  
17 - width:140rpx;  
18 - height:140rpx;  
19 - border-radius:50%;  
20 -}  
21 -.setting{  
22 - width:690rpx;  
23 - margin:30rpx auto;  
24 - padding:25rpx 0;  
25 - border-top:1px dotted #666;  
26 - border-bottom:1px dotted #666;  
27 -}  
28 -.setting-icon{  
29 - width:50rpx;  
30 - height:50rpx;  
31 - margin-bottom:20rpx;  
32 -}  
33 -.cut{  
34 - width:100%;  
35 - height:20rpx;  
36 - background:#f7f7f7;  
37 -}  
38 -.person-pet{  
39 - width:100%;  
40 - padding:0 30rpx;  
41 - box-sizing:border-box;  
42 -}  
43 -.add-icon{  
44 - width:50rpx;  
45 - height:50rpx;  
46 -}  
47 -swiper{  
48 - width:100%;  
49 - height:240rpx;  
50 -}  
51 -swiper-item{  
52 - width:440rpx!important;  
53 -}  
54 -.person-pet-block{  
55 - width:690rpx;  
56 - heigth:200rpx;  
57 - margin-right:40rpx;  
58 - border-radius:14rpx;  
59 - /*box-shadow:1px 1px 5px rgba(0,0,0,.2);*/  
60 - padding:30rpx;  
61 - box-sizing:border-box;  
62 - margin-bottom:30rpx;  
63 -}  
64 -.pet-headimg{  
65 - width:140rpx;  
66 - height:140rpx;  
67 - border-radius:50%;  
68 - margin-right:20rpx;  
69 -}  
70 -.pet-picture-block{  
71 - width:330rpx;  
72 -}  
73 -.pet-picture-image{  
74 - width:100%;  
75 - margin-bottom:30rpx;  
76 - border-radius:12rpx;  
77 -}  
78 -  
79 -  
80 4
81 .me-top{ 5 .me-top{
82 width:100%; 6 width:100%;
  1 +var comfun = require('../../comjs/comfun.js');
  2 +Page({
  3 + data:{
  4 + kindlist:[
  5 + {
  6 + image:'/pages/image/topic1.jpg',
  7 + kindtitle:'猫咪',
  8 + type:'cat',
  9 + isactive:false
  10 + },
  11 + {
  12 + image:'/pages/image/topic3.jpg',
  13 + kindtitle:'狗狗',
  14 + type:'dog',
  15 + isactive:false
  16 + },
  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 + },
  117 + onLoad:function () {
  118 + comfun.setBarTitle('添加宠物')
  119 + },
  120 + onShow:function () {
  121 +
  122 + },
  123 + selectkind:function (e) {
  124 + var type=e.currentTarget.dataset.type;
  125 + var kindlist=this.data.kindlist;
  126 + kindlist.forEach(function (v,i) {
  127 + v.isactive=false;
  128 + if(v.type==type){
  129 + v.isactive=true
  130 + }
  131 + })
  132 + this.setData({
  133 + kindlist:kindlist,
  134 + pettype:type,
  135 + })
  136 + },
  137 + afterstep:function () {
  138 + this.setData({
  139 + petlist:this.data.petkind[this.data.pettype]
  140 + })
  141 + }
  142 +})
  1 +{
  2 + "backgroundTextStyle":"light",
  3 + "navigationBarBackgroundColor": "#ffffff",
  4 + "navigationBarTextStyle":"black"
  5 +}
  1 +<view class="pet-kind fixed left bottom top">
  2 + <view class="pet-kind-list flex-vc">
  3 + <block wx:for="{{kindlist}}">
  4 + <view class="kind-pet flex-vc" bindtap="selectkind" data-type="{{item.type}}">
  5 + <view class="kind-pet-des" style="border:{{item.isactive==true ? '2px solid #fcb34c' : 0}};"><image src="{{item.image}}" class="kind-pet-img"></image></view>
  6 + <view class="{{item.isactive==true ? 'orange-font' : 'black-font'}} font34r">{{item.kindtitle}}</view>
  7 + </view>
  8 + </block>
  9 + </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>
  1 +.pet-kind{
  2 + width:100%;
  3 +}
  4 +.pet-kind-list{
  5 + width:100%;
  6 + height:60%;
  7 +}
  8 +.kind-pet{
  9 + padding:80rpx 0;
  10 +}
  11 +.kind-pet-des{
  12 + width:160rpx;
  13 + height:160rpx;
  14 + padding:10rpx;
  15 + border-radius:50%;
  16 + margin-bottom:30rpx;
  17 +}
  18 +.kind-pet-img{
  19 + width:160rpx;
  20 + height:160rpx;
  21 + border-radius:50%;
  22 +}
  23 +.pet-after-button{
  24 + width:560rpx;
  25 + height:80rpx;
  26 + position:absolute;
  27 + bottom:200rpx;
  28 + margin:0 auto;
  29 + border-radius:10rpx;
  30 +}
  31 +.pet-kind-select{
  32 + width:100%;
  33 + padding:0 30rpx 60rpx;
  34 + box-sizing:border-box;
  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 +
  5 + },
  6 + onLoad:function () {
  7 + comfun.setBarTitle('宠物详情')
  8 + },
  9 + onShow:function () {
  10 +
  11 + },
  12 + petdetail:function () {
  13 + wx.navigateTo({
  14 + url:'p_edit'
  15 + })
  16 + }
  17 +})
  1 +<view class="pet-list bg-white">
  2 + <image class="pet-headimg" src="/pages/image/topic3.jpg"></image>
  3 +</view>
  4 +<view class="pet-info">
  5 + <view class="pet-name-sex flex-cm">
  6 + <view class="black-font font36r font-bold">小煎包</view>
  7 + <image src="/pages/image/female.svg" class="pet-sex"></image>
  8 + </view>
  9 + <view class="pet-other-single flex-lm">
  10 + <image src="/pages/image/pet-foot.svg" class="pet-food-icon"></image>
  11 + <view class="black-font font28r">年龄：1岁半</view>
  12 + </view>
  13 + <view class="pet-other-single flex-lm">
  14 + <image src="/pages/image/pet-foot.svg" class="pet-food-icon"></image>
  15 + <view class="black-font font28r">体重：6kg</view>
  16 + </view>
  17 + <view class="pet-other-single flex-lm">
  18 + <image src="/pages/image/pet-foot.svg" class="pet-food-icon"></image>
  19 + <view class="black-font font28r">种类：拉布拉多</view>
  20 + </view>
  21 + <view class="pet-edit" bindtap="petdetail">
  22 + <image src="/pages/image/pet-edit.svg" class="edit-icon"></image>
  23 + </view>
  24 +</view>
  1 +page{
  2 + overflow:hidden;
  3 +}
  4 +.pet-list{
  5 + width:800rpx;
  6 + height:800rpx;
  7 + border-radius:50%;
  8 + box-shadow:0 0 5px rgba(0,0,0,.2);
  9 + position:relative;
  10 + margin-top:-540rpx;
  11 + margin-left:-25rpx;
  12 + z-index:2;
  13 +}
  14 +.pet-name-sex{
  15 + width:100%;
  16 + padding-top:16rpx;
  17 + margin-bottom:40rpx;
  18 +}
  19 +.pet-sex{
  20 + width:46rpx;
  21 + height:46rpx;
  22 + margin-left:2rpx;
  23 +}
  24 +.pet-headimg{
  25 + width:120rpx;
  26 + height:120rpx;
  27 + border-radius:50%;
  28 + position:absolute;
  29 + left:0;
  30 + right:0;
  31 + margin:0 auto;
  32 + bottom:-50rpx;
  33 +}
  34 +.pet-info{
  35 + width:280rpx;
  36 + height:380rpx;
  37 + padding:60rpx 40rpx;
  38 + box-sizing:border-box;
  39 + margin:0 auto;
  40 + box-shadow:0 0 5px rgba(0,0,0,.2);
  41 + border-bottom-left-radius:60rpx;
  42 + border-top-left-radius:100rpx;
  43 + border-top-right-radius:100rpx;
  44 + position:relative;
  45 +}
  46 +.pet-other-single{
  47 + height:60rpx;
  48 + position:relative;
  49 +}
  50 +.pet-food-icon{
  51 + width:56rpx;
  52 + height:56rpx;
  53 + position:absolute;
  54 + left:0;
  55 + top:-4rpx;
  56 + z-index:-1;
  57 +}
  58 +.pet-edit{
  59 + width:76rpx;
  60 + height:76rpx;
  61 + padding:20rpx;
  62 + position:absolute;
  63 + top:110rpx;
  64 + right:-40rpx;
  65 +}
  66 +.edit-icon{
  67 + width:36rpx;
  68 + height:36rpx;
  69 +}
  1 +var comfun = require('../../comjs/comfun.js');
  2 +Page({
  3 + data:{
  4 +
  5 + },
  6 + onLoad:function () {
  7 + comfun.setBarTitle('修改宠物信息')
  8 + },
  9 + onShow:function () {
  10 +
  11 + },
  12 +})
  1 +{
  2 + "backgroundTextStyle":"light",
  3 + "navigationBarBackgroundColor": "#fcb34c",
  4 + "navigationBarTextStyle":"white"
  5 +}
  1 +<view class="bg-white flex-lr pet-info">
  2 + <view class="black-font font28r">头像</view>
  3 + <image src="/pages/image/topic3.jpg" class="pet-img"></image>
  4 +</view>
  5 +<view class="bg-white flex-lr pet-info">
  6 + <view class="black-font font28r">昵称</view>
  7 + <input placeholder-class="gray-font font28r" value="小煎包" placeholder="请输入宠物昵称" class="black-font font28r" maxlength="5"/>
  8 +</view>
  9 +<view class="bg-white flex-lr pet-info">
  10 + <view class="black-font font28r">年龄</view>
  11 + <input placeholder-class="gray-font font28r" value="1岁半" placeholder="请输入宠物年龄" class="black-font font28r"/>
  12 +</view>
  13 +<view class="bg-white flex-lr pet-info">
  14 + <view class="black-font font28r">体重</view>
  15 + <view class="flex-rr">
  16 + <input placeholder-class="gray-font font28r" value="6" placeholder="请输入宠物体重" class="black-font font28r" type="digit"/>
  17 + <view class="black-font font30r">kg</view>
  18 + </view>
  19 +</view>
  20 +<view class="bg-white flex-lr pet-info">
  21 + <view class="black-font font28r">种类</view>
  22 + <input placeholder-class="gray-font font28r" value="拉布拉多" placeholder="请输入宠物种类" class="black-font font28r" type="text"/>
  23 +</view>
  24 +<view class="bg-orange white-font font32r save-button flex-cm fixed left bottom">保存</view>
  1 +page{
  2 + background:#efeef3;
  3 +}
  4 +.pet-info{
  5 + width:100%;
  6 + padding:30rpx;
  7 + box-sizing:border-box;
  8 + border-bottom:1px solid #efeef3;
  9 +}
  10 +.pet-img{
  11 + width:100rpx;
  12 + height:100rpx;
  13 +}
  14 +.pet-info input{
  15 + text-align:right;
  16 +}
  17 +.save-button{
  18 + width:100%;
  19 + height:100rpx;
  20 + border-radius:10rpx;
  21 + margin:0 auto;
  22 + margin-top:120rpx;
  23 +}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!--<view class="banner"> 2 <!--<view class="banner">
3 <image src="/pages/image/seller-detail.jpg" class="banner-img"></image> 3 <image src="/pages/image/seller-detail.jpg" class="banner-img"></image>
4 </view>--> 4 </view>-->
5 -<view style="height:100rpx;"></view> 5 +<view style="height:80rpx;"></view>
6 <!--<view class="search flex-cm"> 6 <!--<view class="search flex-cm">
7 <view class="search-con flex-cm"> 7 <view class="search-con flex-cm">
8 <view class="search-image"> 8 <view class="search-image">
@@ -12,14 +12,14 @@ @@ -12,14 +12,14 @@
12 </view> 12 </view>
13 </view>--> 13 </view>-->
14 <view class="seller-list"> 14 <view class="seller-list">
15 - <view class="best-info-title flex-cm"> 15 + <!--<view class="best-info-title flex-cm">
16 <view class="best-line bg-black"></view> 16 <view class="best-line bg-black"></view>
17 <view class="best-react bg-black"></view> 17 <view class="best-react bg-black"></view>
18 <view class="black-font font34r font-siny" style="margin:0 30rpx;">附近推荐</view> 18 <view class="black-font font34r font-siny" style="margin:0 30rpx;">附近推荐</view>
19 <view class="best-react bg-black"></view> 19 <view class="best-react bg-black"></view>
20 <view class="best-line bg-black"></view> 20 <view class="best-line bg-black"></view>
21 - </view>  
22 - <swiper next-margin="90rpx" display-multiple-items="2"> 21 + </view>-->
  22 + <!--<swiper next-margin="90rpx" display-multiple-items="2">
23 <block wx:for="{{sellericons}}"> 23 <block wx:for="{{sellericons}}">
24 <swiper-item> 24 <swiper-item>
25 <view class="recommand-seller"> 25 <view class="recommand-seller">
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </view> 31 </view>
32 </swiper-item> 32 </swiper-item>
33 </block> 33 </block>
34 - </swiper> 34 + </swiper>-->
35 <block wx:for="{{sellericons}}"> 35 <block wx:for="{{sellericons}}">
36 <view class="flex-lm seller-block" bindtap="sellerdetail"> 36 <view class="flex-lm seller-block" bindtap="sellerdetail">
37 <image src="/pages/image/pet-seller.jpg" class="seller-image"></image> 37 <image src="/pages/image/pet-seller.jpg" class="seller-image"></image>
@@ -63,7 +63,7 @@ swiper-item{ @@ -63,7 +63,7 @@ swiper-item{
63 height:260rpx; 63 height:260rpx;
64 margin:0 auto; 64 margin:0 auto;
65 box-sizing:border-box; 65 box-sizing:border-box;
66 - border-radius:10rpx; 66 + /*border-radius:10rpx;*/
67 /*box-shadow:0 0 5px rgba(0,0,0,.1);*/ 67 /*box-shadow:0 0 5px rgba(0,0,0,.1);*/
68 border-bottom:1px solid #efeef3; 68 border-bottom:1px solid #efeef3;
69 } 69 }
@@ -71,7 +71,7 @@ swiper-item{ @@ -71,7 +71,7 @@ swiper-item{
71 width:260rpx; 71 width:260rpx;
72 height:180rpx; 72 height:180rpx;
73 margin-right:30rpx; 73 margin-right:30rpx;
74 - border-radius:12rpx; 74 + /*border-radius:12rpx;;*/
75 } 75 }
76 .seller-book{ 76 .seller-book{
77 height:40rpx; 77 height:40rpx;
1 Page({ 1 Page({
2 data:{ 2 data:{
3 - votelist:['洁癖晚期','一个字"穷"','各有所爱','嫌麻烦','心软害怕失去','其他'], 3 + votelist:[
  4 + {
  5 + id:1,
  6 + title:'洁癖晚期',
  7 + selected:false
  8 + },
  9 + { id:2,
  10 + title:'一个字"穷"',
  11 + selected:false
  12 + },
  13 + {
  14 + id:3,
  15 + title:'各有所爱',
  16 + selected:false
  17 + },
  18 + {
  19 + id:4,
  20 + title:'嫌麻烦',
  21 + selected:false
  22 + },
  23 + {
  24 + id:5,
  25 + title:'心软害怕失去',
  26 + selected:false
  27 + },
  28 + {
  29 + id:6,
  30 + title:'其他',
  31 + selected:false
  32 + }
  33 + ],
4 voteres:[ 34 voteres:[
5 { 35 {
6 per:10, 36 per:10,
@@ -26,6 +56,41 @@ Page({ @@ -26,6 +56,41 @@ Page({
26 per:10, 56 per:10,
27 title:'其他' 57 title:'其他'
28 }, 58 },
29 - ]  
30 - } 59 + ],
  60 + votehide:true
  61 + },
  62 + onLoad:function(){
  63 +
  64 + },
  65 + onShow:function(){
  66 +
  67 + },
  68 + vote:function () {
  69 + this.setData({
  70 + votehide:!this.data.votehide
  71 + })
  72 + },
  73 + selectreason:function (e) {
  74 + var id=e.currentTarget.dataset.id;
  75 + var votelist=this.data.votelist;
  76 + var vote_name;
  77 + votelist.forEach(function (v,i) {
  78 + v.selected=false;
  79 + if(v.id==id){
  80 + v.selected=true;
  81 + vote_name=v.title;
  82 + }
  83 + })
  84 + this.setData({
  85 + votelist:votelist,
  86 + vote_name:vote_name
  87 + })
  88 + },
  89 + voteconfim:function(){
  90 + if(this.data.vote_name){
  91 + this.vote();
  92 + }else{
  93 +
  94 + }
  95 + },
31 }) 96 })
@@ -26,4 +26,18 @@ @@ -26,4 +26,18 @@
26 </view> 26 </view>
27 </block> 27 </block>
28 </view> 28 </view>
29 -<view class="vote-act bg-orange white-font font32r fixed left bottom flex-cm">投票</view> 29 +<view class="vote-act bg-orange white-font font32r fixed left bottom flex-cm" bindtap="vote">投票</view>
  30 +<view class="vote-mask fixed left right top bottom" hidden="{{votehide}}" bindtap="vote"></view>
  31 +<view class="vote-list fixed left bottom bg-white {{votehide==false ? 'vote-list-active' : ''}}">
  32 + <block wx:for="{{votelist}}">
  33 + <view class="vote-single flex-lr" bindtap="selectreason" data-id="{{item.id}}">
  34 + <view class="black-font font30r">{{item.title}}</view>
  35 + <view class="vote-right flex-cc">
  36 + <block wx:if="{{item.selected==true}}">
  37 + <image src="/pages/image/right.svg" class="vote-right-icon"></image>
  38 + </block>
  39 + </view>
  40 + </view>
  41 + </block>
  42 + <view class="vote-button bg-orange white-font font30r flex-cm" bindtap="voteconfim">确认</view>
  43 +</view>
@@ -81,4 +81,41 @@ @@ -81,4 +81,41 @@
81 width:100%; 81 width:100%;
82 height:100rpx; 82 height:100rpx;
83 background:#ffc16a; 83 background:#ffc16a;
  84 +}
  85 +.vote-mask{
  86 + width:100%;
  87 + background:rgba(0,0,0,.4);
  88 + z-index:999;
  89 +}
  90 +.vote-list{
  91 + width:100%;
  92 + padding:40rpx 0 0;
  93 + box-sizing:border-box;
  94 + box-shadow:0 0 5px rgba(0,0,0,.2);
  95 + bottom:-800rpx;
  96 + transition:bottom .4s ease;
  97 + z-index:1000;
  98 +}
  99 +.vote-list-active{
  100 + bottom:0;
  101 +}
  102 +.vote-single{
  103 + width:100%;
  104 + padding:0 80rpx;
  105 + box-sizing:border-box;
  106 + height:80rpx;
  107 +}
  108 +.vote-right{
  109 + width:30rpx;
  110 + height:30rpx;
  111 + border:1px solid #ccc;
  112 +}
  113 +.vote-right-icon{
  114 + width:30rpx;
  115 + height:30rpx;
  116 +}
  117 +.vote-button{
  118 + width:100%;
  119 + height:90rpx;
  120 + margin-top:30rpx;
84 } 121 }