miniprogram / shengxian · 提交

转到一个项目

作者 朱振飞
提交 a61966116dc2c92c6b931b0c585095a7a455becb 1 个父辈 c6e09dc6

页面串接

内嵌 并排对比
正在显示 44 个修改的文件 包含 534 行增加 和 31 行删除
@@ -26,7 +26,8 @@ @@ -26,7 +26,8 @@
26 "pages/my/charger_code/charger_code", 26 "pages/my/charger_code/charger_code",
27 "pages/my/balance _center/balance _center", 27 "pages/my/balance _center/balance _center",
28 "pages/my/my", 28 "pages/my/my",
29 - "pages/cart/cart" 29 + "pages/cart/cart",
  30 + "pages/index/selectAddress/selectAddress"
30 ], 31 ],
31 "window": { 32 "window": {
32 "backgroundTextStyle": "dark", 33 "backgroundTextStyle": "dark",
@@ -67,5 +68,6 @@ @@ -67,5 +68,6 @@
67 "connectSocket": 1000, 68 "connectSocket": 1000,
68 "uploadFile": 1000, 69 "uploadFile": 1000,
69 "downloadFile": 1000 70 "downloadFile": 1000
70 - } 71 + },
  72 + "sitemapLocation": "sitemap.json"
71 } 73 }
@@ -431,3 +431,26 @@ input, textarea { @@ -431,3 +431,26 @@ input, textarea {
431 .icon-dangqian:before { content: "\e64a"; } 431 .icon-dangqian:before { content: "\e64a"; }
432 432
433 .icon-meipingfen-copy:before { content: "\e6bf"; } 433 .icon-meipingfen-copy:before { content: "\e6bf"; }
  434 +
  435 +
  436 +
  437 +.top_label {
  438 + height: 85rpx;
  439 + display: flex;
  440 + background-color: #FFF;
  441 + font-size: 34rpx;
  442 + color: #26363A;
  443 + align-items: center;
  444 + font-weight: bold;
  445 + width: 100%;
  446 + justify-content: center;
  447 + position: relative;
  448 +}
  449 +.del_btn{
  450 + font-size: 28rpx;
  451 + color: #222222;
  452 + position: absolute;
  453 + top: 50%;
  454 + right: 26rpx;
  455 + transform: translateY(-50%);
  456 +}
1 <!--pages/cart/cart.wxml--> 1 <!--pages/cart/cart.wxml-->
2 -<text>pages/cart/cart.wxml</text> 2 +<view class='cart_box'>
  3 + <view class='top_label'>
  4 + 购物车
  5 + <view class='del_btn'>删除</view>
  6 + </view>
  7 + <view class='tips'>
  8 + <view class='left'>
  9 + <view class='note'>提示</view>满200元包邮,还差36包邮
  10 + </view>
  11 + <view class='right'>再逛逛 <icon class='iconfont icon-icondayu'></icon></view>
  12 + </view>
  13 + <!-- 商品列表 -->
  14 + <view class='product_list'>
  15 + <view class='singlepart'>
  16 + <view class='single_part_top'>
  17 + <view class='single_part_left'>
  18 + <view class='iconfont icon-weixuanzhong'></view>
  19 + 标签01商品
  20 + </view>
  21 + <view class='single_part_right'>
  22 + 鲜橙促销 买1送1
  23 + <view class='iconfont icon-icondayu'></view>
  24 + </view>
  25 + </view>
  26 + <view class='single_part_items'>
  27 + <view class='single_part_item'>
  28 + <view class='iconfont icon-weixuanzhong'></view>
  29 + <view class='single_part_imgbox'>
  30 + <image src='/pages/imgs/icon32.png' mode='widthFix'></image>
  31 + </view>
  32 + <view class='single_part_detail'>
  33 + <view class='product_title'>泰式冬阴功秘制虾汤620g</view>
  34 + <view class='product_type'>小份 切丝</view>
  35 + <view class='product_action'>
  36 + <view class='price'>￥<text class='detail_price'>26</text></view>
  37 + <view class='action_box'>
  38 + <view class='short action_btn'>-</view>
  39 + <view class='detail_num'>1</view>
  40 + <view class='action_btn'>+</view>
  41 + </view>
  42 + </view>
  43 + </view>
  44 + </view>
  45 + <view class='single_part_item'>
  46 + <view class='iconfont icon-weixuanzhong'></view>
  47 + <view class='single_part_imgbox'>
  48 + <image src='/pages/imgs/icon32.png' mode='widthFix'></image>
  49 + </view>
  50 + <view class='single_part_detail'>
  51 + <view class='product_title'>泰式冬阴功秘制虾汤620g</view>
  52 + <view class='product_type'>小份 切丝</view>
  53 + <view class='product_action'>
  54 + <view class='price'>￥<text class='detail_price'>26</text></view>
  55 + <view class='action_box'>
  56 + <view class='short action_btn'>-</view>
  57 + <view class='detail_num'>1</view>
  58 + <view class='action_btn'>+</view>
  59 + </view>
  60 + </view>
  61 + </view>
  62 + </view>
  63 + </view>
  64 + </view>
  65 + <view class='singlepart'>
  66 + <view class='single_part_top'>
  67 + <view class='single_part_left'>
  68 + <view class='iconfont icon-weixuanzhong'></view>
  69 + 标签01商品
  70 + </view>
  71 + <view class='single_part_right'>
  72 + 鲜橙促销 买1送1
  73 + <view class='iconfont icon-icondayu'></view>
  74 + </view>
  75 + </view>
  76 + <view class='single_part_items'>
  77 + <view class='single_part_item'>
  78 + <view class='iconfont icon-weixuanzhong'></view>
  79 + <view class='single_part_imgbox'>
  80 + <image src='/pages/imgs/icon32.png' mode='widthFix'></image>
  81 + </view>
  82 + <view class='single_part_detail'>
  83 + <view class='product_title'>泰式冬阴功秘制虾汤620g</view>
  84 + <view class='product_type'>小份 切丝</view>
  85 + <view class='product_action'>
  86 + <view class='price'>￥<text class='detail_price'>26</text></view>
  87 + <view class='action_box'>
  88 + <view class='short action_btn'>-</view>
  89 + <view class='detail_num'>1</view>
  90 + <view class='action_btn'>+</view>
  91 + </view>
  92 + </view>
  93 + </view>
  94 + </view>
  95 + <view class='single_part_item'>
  96 + <view class='iconfont icon-weixuanzhong'></view>
  97 + <view class='single_part_imgbox'>
  98 + <image src='/pages/imgs/icon32.png' mode='widthFix'></image>
  99 + </view>
  100 + <view class='single_part_detail'>
  101 + <view class='product_title'>泰式冬阴功秘制虾汤620g</view>
  102 + <view class='product_type'>小份 切丝</view>
  103 + <view class='product_action'>
  104 + <view class='price'>￥<text class='detail_price'>26</text></view>
  105 + <view class='action_box'>
  106 + <view class='short action_btn'>-</view>
  107 + <view class='detail_num'>1</view>
  108 + <view class='action_btn'>+</view>
  109 + </view>
  110 + </view>
  111 + </view>
  112 + </view>
  113 + </view>
  114 + </view>
  115 + </view>
  116 +
  117 +
  118 +</view>
  119 + <view class='bottom_ac'>
  120 + <view class='choose'>
  121 + <view class='iconfont icon-weixuanzhong'></view> 全选
  122 + </view>
  123 +
  124 + <view class='count'>
  125 + <view class='count_top'>
  126 + 合计：<view class='price'>￥<text class='detail_price'>26</text></view>
  127 + </view>
  128 + <view class='fee'>
  129 + 含运费10元
  130 + </view>
  131 + </view>
  132 + <view class='count_btn'>
  133 + 结算
  134 + </view>
  135 + </view>
1 /* pages/cart/cart.wxss */ 1 /* pages/cart/cart.wxss */
  2 +page{
  3 + background: #FFF;
  4 + display: flex;
  5 + flex-flow: column;
  6 + height: 100%;
  7 +}
  8 +.cart_box{
  9 + flex: 1;
  10 + display: flex;
  11 + flex-flow: column;
  12 +}
  13 +.top_label {
  14 + height: 85rpx;
  15 + display: flex;
  16 + background-color: #FFF;
  17 + font-size: 34rpx;
  18 + color: #26363A;
  19 + align-items: center;
  20 + font-weight: bold;
  21 + width: 100%;
  22 + justify-content: center;
  23 + position: relative;
  24 +}
  25 +.del_btn{
  26 + font-size: 28rpx;
  27 + color: #222222;
  28 + position: absolute;
  29 + top: 50%;
  30 + right: 26rpx;
  31 + transform: translateY(-50%);
  32 +}
  33 +.tips{
  34 + height: 50rpx;
  35 + display: flex;
  36 + align-items: center;
  37 + justify-content: space-between;
  38 + background-color: #FFDA44;
  39 + color: #333;
  40 + font-size: 24rpx;
  41 + padding: 0 40rpx;
  42 +}
  43 +.left,.right,icon{
  44 + display: flex;
  45 + align-items: center;
  46 + justify-content: center;
  47 + color: #222;
  48 +}
  49 +.note{
  50 + height: 32rpx;
  51 + border-radius: 16rpx;
  52 + font-size: 24rpx;
  53 + background-color: #fff;
  54 + padding: 0 12rpx;
  55 + width: 80rpx;
  56 + display: flex;
  57 + align-items: center;
  58 + justify-content: center;
  59 + margin-right: 30rpx;
  60 +}
  61 +.product_list{
  62 + padding: 0 25rpx;
  63 + flex: 1;
  64 + overflow-y: scroll;
  65 +}
  66 +.singlepart{
  67 + border-top: 22rpx solid #FAFAFA;
  68 +}
  69 +.single_part_top{
  70 + height: 90rpx;
  71 + display: flex;
  72 + align-items: center;
  73 + justify-content: space-between;
  74 + font-size: 24rpx;
  75 + color: #888;
  76 + border-bottom: 1rpx solid #EDEDED;
  77 +}
  78 +.single_part_right,.single_part_left{
  79 + display: flex;
  80 +}
  81 +.single_part_left{
  82 + color: #222222;
  83 + font-size: 30rpx;
  84 + font-weight: 800;
  85 +}
  86 +.single_part_left .iconfont{
  87 + color: #EDEDED;
  88 + font-size: 40rpx;
  89 + margin-right: 24rpx;
  90 +}
  91 +.single_part_item{
  92 + display: flex;
  93 + margin: 30rpx 0 60rpx;
  94 + height: 140rpx;
  95 + align-items: center;
  96 +}
  97 + .iconfont{
  98 + font-size: 40rpx;
  99 + color: #EDEDED;
  100 +}
  101 +.single_part_imgbox{
  102 + width: 140rpx;
  103 + height: 140rpx;
  104 + overflow: hidden;
  105 + margin-left: 20rpx;
  106 + margin-right: 40rpx;
  107 +}
  108 +.single_part_imgbox image{
  109 + width: 100%;
  110 +}
  111 +.single_part_detail{
  112 + flex:1;
  113 + height: 100%;
  114 + display: flex;
  115 + flex-flow: column;
  116 +}
  117 +.product_action{
  118 + font-size: 28rpx;
  119 + color: #333;
  120 + line-height: 1;
  121 + margin-top: auto;
  122 +}
  123 +.product_title{
  124 + color: #333;
  125 + font-size: 28rpx;
  126 + margin-bottom: 10rpx;
  127 +}
  128 +.product_type {
  129 + color: #888;
  130 + font-size: 24rpx;
  131 +}
  132 +.product_action{
  133 + display: flex;
  134 + justify-content: space-between;
  135 +}
  136 +.price{
  137 + font-size: 24rpx;
  138 + color: #FF4444;
  139 +}
  140 +.detail_price{
  141 + font-size: 34rpx;
  142 + font-weight: bold;
  143 +}
  144 +.action_box{
  145 + display: flex;
  146 + align-items: center;
  147 + font-size: 30rpx;
  148 +}
  149 +.action_btn {
  150 + display: flex;
  151 + height: 38rpx;
  152 + width: 38rpx;
  153 + border-radius: 50%;
  154 + border: 1rpx solid #94999A;
  155 + align-items: center;
  156 + justify-content: center;
  157 + font-size: 30rpx;
  158 +}
  159 +.detail_num{
  160 + padding: 0 16rpx;
  161 +}
  162 +.bottom_ac{
  163 + height: 100rpx;
  164 + display: flex;
  165 + padding-left:25rpx;
  166 + background: #FFF;
  167 + align-items: center;
  168 + border-top: 1px solid #EFEFEF;
  169 +}
  170 +.choose{
  171 + display: flex;
  172 + font-size: 26rpx;
  173 + color: #888;
  174 +}
  175 +.choose .iconfont {
  176 + margin-right: 24rpx;
  177 +}
  178 +.count{
  179 + font-size: 26rpx;
  180 + margin-left: 45rpx;
  181 +}
  182 +.count_top{
  183 + display: flex;
  184 + align-items: center;
  185 +}
  186 +.fee{
  187 + color: #888;
  188 + font-size: 24rpx;
  189 +}
  190 +.count_btn{
  191 + width: 236rpx;
  192 + height: 100rpx;
  193 + background:linear-gradient(135deg, rgba(249, 145, 21, 1), rgba(245, 104, 0, 1));
  194 + display: flex;
  195 + align-items: center;
  196 + justify-content: center;
  197 + color: #FFF;
  198 + font-size: 26rpx;
  199 + justify-self: flex-end;
  200 + margin-left: auto;
  201 + -webkit-margin-start: auto;
  202 +}
不能预览此文件类型

587.3 KB | 宽: | 高:

196.6 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

8.7 KB | 宽: | 高:

3.6 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

221.9 KB | 宽: | 高:

63.9 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

3.2 KB | 宽: | 高:

1.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.9 KB | 宽: | 高:

1.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.4 KB | 宽: | 高:

1.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.0 KB | 宽: | 高:

696 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

31.8 KB | 宽: | 高:

9.0 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

904 字节 | 宽: | 高:

492 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

905 字节 | 宽: | 高:

495 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.8 KB | 宽: | 高:

578 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.3 KB | 宽: | 高:

684 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.7 KB | 宽: | 高:

634 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.8 KB | 宽: | 高:

736 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.1 KB | 宽: | 高:

673 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.8 KB | 宽: | 高:

901 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

432.0 KB | 宽: | 高:

125.8 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

259.3 KB | 宽: | 高:

77.0 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

400.9 KB | 宽: | 高:

96.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

20.2 KB | 宽: | 高:

7.7 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

72.5 KB | 宽: | 高:

23.7 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

55.3 KB | 宽: | 高:

16.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

55.9 KB | 宽: | 高:

19.2 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.1 KB | 宽: | 高:

721 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
1 <!--pages/index/goodsDetial/goodsDetial.wxml--> 1 <!--pages/index/goodsDetial/goodsDetial.wxml-->
2 -<view> 2 +<view class='detail_container'>
3 <view class='banner'> 3 <view class='banner'>
4 <view class='iconfont icon-fanhui'></view> 4 <view class='iconfont icon-fanhui'></view>
5 <view class='coupons'> 5 <view class='coupons'>
@@ -614,6 +614,9 @@ page { @@ -614,6 +614,9 @@ page {
614 display: flex; 614 display: flex;
615 justify-content: flex-end; 615 justify-content: flex-end;
616 align-items: center; 616 align-items: center;
  617 + position: fixed;
  618 + bottom: 0;
  619 + left: 0
617 } 620 }
618 621
619 .hint_btn { 622 .hint_btn {
@@ -66,6 +66,21 @@ Page({ @@ -66,6 +66,21 @@ Page({
66 }) 66 })
67 67
68 }, 68 },
  69 + toMessage(){
  70 + wx.navigateTo({
  71 + url: '/pages/my/activityInformation/activityInformation',
  72 + })
  73 + },
  74 + chooseAdress(){
  75 + wx.navigateTo({
  76 + url: '/pages/my/selectAddress/selectAddress',
  77 + })
  78 + },
  79 + search(){
  80 + wx.navigateTo({
  81 + url: '/pages/my/serach/serach',
  82 + })
  83 + },
69 //控制广告 84 //控制广告
70 show_ad() { 85 show_ad() {
71 this.setData({ 86 this.setData({
1 <view class='index_top'> 1 <view class='index_top'>
2 - <view class='index_add' bindtap='getaddress'> 2 + <view class='index_add' bindtap='chooseAdress'>
3 <view class='iconfont icon-location'></view> 3 <view class='iconfont icon-location'></view>
4 <text class='city_box'>{{city}}</text> 4 <text class='city_box'>{{city}}</text>
5 </view> 5 </view>
6 - <view class='index_input'> 6 + <view class='index_input' bindtap='search'>
7 <input placeholder='有机红颜草莓' placeholder-class='holder'></input> 7 <input placeholder='有机红颜草莓' placeholder-class='holder'></input>
8 <icon type='search' size='16' color='#222'></icon> 8 <icon type='search' size='16' color='#222'></icon>
9 </view> 9 </view>
10 - <view class='iconfont icon-message'></view> 10 + <view class='iconfont icon-message' bindtap='toMessage'></view>
11 </view> 11 </view>
12 <view class='nav_box'> 12 <view class='nav_box'>
13 <swiper display-multiple-items='{{num}}' class='swiper_nav_box'> 13 <swiper display-multiple-items='{{num}}' class='swiper_nav_box'>
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <text class='oprice'>￥52.0</text> 93 <text class='oprice'>￥52.0</text>
94 </view> 94 </view>
95 </view> 95 </view>
96 - <view class='new_person_item'> 96 + <navigator url='/pages/index/goodsDetial/goodsDetial' class='new_person_item'>
97 <image src='../imgs/pic1.png'></image> 97 <image src='../imgs/pic1.png'></image>
98 <view class='goods_name'>三纹鱼片</view> 98 <view class='goods_name'>三纹鱼片</view>
99 <view> 99 <view>
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <text class='pprice'>26.0</text> 101 <text class='pprice'>26.0</text>
102 <text class='oprice'>￥52.0</text> 102 <text class='oprice'>￥52.0</text>
103 </view> 103 </view>
104 - </view> 104 + </navigator>
105 <view class='new_person_item'> 105 <view class='new_person_item'>
106 <image src='../imgs/pic1.png'></image> 106 <image src='../imgs/pic1.png'></image>
107 <view class='goods_name'>三纹鱼片</view> 107 <view class='goods_name'>三纹鱼片</view>
  1 +// pages/index/selectAddress/selectAddress.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * 生命周期函数--监听页面初次渲染完成
  20 + */
  21 + onReady: function () {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * 生命周期函数--监听页面显示
  27 + */
  28 + onShow: function () {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * 生命周期函数--监听页面隐藏
  34 + */
  35 + onHide: function () {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面卸载
  41 + */
  42 + onUnload: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 页面相关事件处理函数--监听用户下拉动作
  48 + */
  49 + onPullDownRefresh: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 页面上拉触底事件的处理函数
  55 + */
  56 + onReachBottom: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 用户点击右上角分享
  62 + */
  63 + onShareAppMessage: function () {
  64 +
  65 + }
  66 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<!--pages/index/selectAddress/selectAddress.wxml-->
  2 +<text>pages/index/selectAddress/selectAddress.wxml</text>
  1 +/* pages/index/selectAddress/selectAddress.wxss */
@@ -5,7 +5,7 @@ Page({ @@ -5,7 +5,7 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - 8 + msgType: 0
9 }, 9 },
10 10
11 /** 11 /**
@@ -14,6 +14,11 @@ Page({ @@ -14,6 +14,11 @@ Page({
14 onLoad: function (options) { 14 onLoad: function (options) {
15 15
16 }, 16 },
  17 + changeTab(e){
  18 + this.setData({
  19 + msgType:e.currentTarget.id
  20 + })
  21 + },
17 22
18 /** 23 /**
19 * 生命周期函数--监听页面初次渲染完成 24 * 生命周期函数--监听页面初次渲染完成
1 <!--pages/my/coupons/coupons.wxml--> 1 <!--pages/my/coupons/coupons.wxml-->
2 2
3 -<view class='banner'>  
4 - <view class='iconfont icon-fanhui'></view>  
5 - <view class='coupons'>消息</view> 3 +
  4 +<view class='banner top_label'>
  5 + 消息
  6 + <view class='del_btn'>
6 <view class='clear_box'> 7 <view class='clear_box'>
7 <view class='iconfont icon-shanchu'></view> 8 <view class='iconfont icon-shanchu'></view>
8 <view>全部清空</view> 9 <view>全部清空</view>
9 </view> 10 </view>
  11 + </view>
10 </view> 12 </view>
11 13
12 <view class='tab'> 14 <view class='tab'>
13 - <view>活动消息</view>  
14 - <view>通知消息</view> 15 + <view class='{{msgType==0?"active":""}}' id='0' bindtap='changeTab'>活动消息</view>
  16 + <view class='{{msgType==1?"active":""}}' id='1' bindtap='changeTab'>通知消息</view>
15 </view> 17 </view>
16 18
17 -<view class='content_item'> 19 +<view class='content_item' hidden='{{msgType==1}}'>
18 <view class='item_list'> 20 <view class='item_list'>
19 <view class='content_img'> 21 <view class='content_img'>
20 <image src='../../imgs/pic19.png'></image> 22 <image src='../../imgs/pic19.png'></image>
@@ -27,8 +29,7 @@ @@ -27,8 +29,7 @@
27 </view> 29 </view>
28 </view> 30 </view>
29 </view> 31 </view>
30 -  
31 - <!-- <view class='item_list'> 32 + <view class='item_list'>
32 <view class='content_img'> 33 <view class='content_img'>
33 <image src='../../imgs/pic19.png'></image> 34 <image src='../../imgs/pic19.png'></image>
34 </view> 35 </view>
@@ -52,9 +53,9 @@ @@ -52,9 +53,9 @@
52 <view class='iconfont icon-diandian'></view> 53 <view class='iconfont icon-diandian'></view>
53 </view> 54 </view>
54 </view> 55 </view>
55 - </view> -->  
56 -  
57 - 56 + </view>
  57 +</view>
  58 +<view class='content_item' hidden='{{msgType==0}}'>
58 <view class='item_list1'> 59 <view class='item_list1'>
59 <view class='item_top'> 60 <view class='item_top'>
60 <view class='list_left'> 61 <view class='list_left'>
@@ -72,8 +73,6 @@ @@ -72,8 +73,6 @@
72 <view>18/03/09</view> 73 <view>18/03/09</view>
73 </view> 74 </view>
74 </view> 75 </view>
75 -  
76 -  
77 <view class='item_list1'> 76 <view class='item_list1'>
78 <view class='item_top'> 77 <view class='item_top'>
79 <view class='list_left'> 78 <view class='list_left'>
@@ -91,7 +90,4 @@ @@ -91,7 +90,4 @@
91 <view>18/03/09</view> 90 <view>18/03/09</view>
92 </view> 91 </view>
93 </view> 92 </view>
94 -  
95 -  
96 -  
97 </view> 93 </view>
1 page { 1 page {
2 background-color: #fafafa; 2 background-color: #fafafa;
  3 + display: flex;
  4 + flex-flow: column;
  5 + height: 100%;
3 } 6 }
4 7
5 .banner { 8 .banner {
@@ -45,6 +48,8 @@ page { @@ -45,6 +48,8 @@ page {
45 48
46 .content_item { 49 .content_item {
47 padding: 0 25rpx; 50 padding: 0 25rpx;
  51 + flex: 1;
  52 + overflow-y:scroll;
48 } 53 }
49 54
50 .item_list { 55 .item_list {
@@ -138,3 +143,16 @@ page { @@ -138,3 +143,16 @@ page {
138 height: 100%; 143 height: 100%;
139 border-radius: 50rpx; 144 border-radius: 50rpx;
140 } 145 }
  146 +.active{
  147 + position: relative
  148 +}
  149 +.active:after{
  150 + position: absolute;
  151 + content: '';
  152 + height: 6rpx;
  153 + width: 136rpx;
  154 + background-color: #FFDA44;
  155 + bottom: -25rpx;
  156 + left: 50%;
  157 + transform: translateX(-50%);
  158 +}
1 <!--pages/my/edit_address/edit_address.wxml--> 1 <!--pages/my/edit_address/edit_address.wxml-->
2 <view> 2 <view>
3 - <view class='banner'>  
4 - <view class='iconfont icon-fanhui'></view> 3 + <!-- <view class='banner'>
  4 + <view class='iconfont '></view>
5 <view class='coupons'>选择地址</view> 5 <view class='coupons'>选择地址</view>
6 <view class='add_address'>新增地址</view> 6 <view class='add_address'>新增地址</view>
  7 + </view> -->
  8 + <view class='top_label'>
  9 + 选择地址
  10 + <view class='del_btn'>新增地址</view>
7 </view> 11 </view>
8 12
9 <view class='select_list'> 13 <view class='select_list'>
1 <!--pages/my/edit_address/edit_address.wxml--> 1 <!--pages/my/edit_address/edit_address.wxml-->
2 <view> 2 <view>
3 <view class='banner'> 3 <view class='banner'>
4 - <view class='iconfont icon-fanhui'></view> 4 + <!-- <view class='iconfont icon-fanhui'></view> -->
5 <view class='input_box'> 5 <view class='input_box'>
6 <view> 6 <view>
7 <input type="text" placeholder='有机红颜草莓' placeholder-class='banner_input'></input> 7 <input type="text" placeholder='有机红颜草莓' placeholder-class='banner_input'></input>
@@ -12,9 +12,11 @@ @@ -12,9 +12,11 @@
12 }, 12 },
13 "compileType": "miniprogram", 13 "compileType": "miniprogram",
14 "libVersion": "1.9.98", 14 "libVersion": "1.9.98",
15 - "appid": "wxdf7ee45f1c64c486", 15 + "appid": "wx285c9973fc9c8423",
16 "projectname": "%E7%94%9F%E9%B2%9C", 16 "projectname": "%E7%94%9F%E9%B2%9C",
17 "isGameTourist": false, 17 "isGameTourist": false,
  18 + "simulatorType": "wechat",
  19 + "simulatorPluginLibVersion": {},
18 "condition": { 20 "condition": {
19 "search": { 21 "search": {
20 "current": -1, 22 "current": -1,
@@ -33,12 +35,34 @@ @@ -33,12 +35,34 @@
33 "list": [] 35 "list": []
34 }, 36 },
35 "miniprogram": { 37 "miniprogram": {
36 - "current": 0, 38 + "current": 3,
37 "list": [ 39 "list": [
38 { 40 {
39 "id": -1, 41 "id": -1,
40 "name": "个人中心", 42 "name": "个人中心",
41 "pathName": "pages/my/my", 43 "pathName": "pages/my/my",
  44 + "query": "",
  45 + "scene": null
  46 + },
  47 + {
  48 + "id": -1,
  49 + "name": "购物车",
  50 + "pathName": "pages/cart/cart",
  51 + "query": "",
  52 + "scene": null
  53 + },
  54 + {
  55 + "id": -1,
  56 + "name": "地址选择",
  57 + "pathName": "pages/my/selectAddress/selectAddress",
  58 + "query": "",
  59 + "scene": null
  60 + },
  61 + {
  62 + "id": -1,
  63 + "name": "消息",
  64 + "pathName": "pages/my/activityInformation/activityInformation",
  65 + "query": "",
42 "scene": null 66 "scene": null
43 } 67 }
44 ] 68 ]
  1 +{
  2 + "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
  3 + "rules": [{
  4 + "action": "allow",
  5 + "page": "*"
  6 + }]
  7 +}