miniprogram / shengxian · 提交

转到一个项目

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

页面串接

内嵌 并排对比
正在显示 44 个修改的文件 包含 538 行增加 和 35 行删除
... ... @@ -26,7 +26,8 @@
"pages/my/charger_code/charger_code",
"pages/my/balance _center/balance _center",
"pages/my/my",
"pages/cart/cart"
"pages/cart/cart",
"pages/index/selectAddress/selectAddress"
],
"window": {
"backgroundTextStyle": "dark",
... ... @@ -67,5 +68,6 @@
"connectSocket": 1000,
"uploadFile": 1000,
"downloadFile": 1000
}
},
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
... ...
... ... @@ -431,3 +431,26 @@ input, textarea {
.icon-dangqian:before { content: "\e64a"; }
.icon-meipingfen-copy:before { content: "\e6bf"; }
.top_label {
height: 85rpx;
display: flex;
background-color: #FFF;
font-size: 34rpx;
color: #26363A;
align-items: center;
font-weight: bold;
width: 100%;
justify-content: center;
position: relative;
}
.del_btn{
font-size: 28rpx;
color: #222222;
position: absolute;
top: 50%;
right: 26rpx;
transform: translateY(-50%);
}
\ No newline at end of file
... ...
<!--pages/cart/cart.wxml-->
<text>pages/cart/cart.wxml</text>
<view class='cart_box'>
<view class='top_label'>
购物车
<view class='del_btn'>删除</view>
</view>
<view class='tips'>
<view class='left'>
<view class='note'>提示</view>满200元包邮,还差36包邮
</view>
<view class='right'>再逛逛 <icon class='iconfont icon-icondayu'></icon></view>
</view>
<!-- 商品列表 -->
<view class='product_list'>
<view class='singlepart'>
<view class='single_part_top'>
<view class='single_part_left'>
<view class='iconfont icon-weixuanzhong'></view>
标签01商品
</view>
<view class='single_part_right'>
鲜橙促销 买1送1
<view class='iconfont icon-icondayu'></view>
</view>
</view>
<view class='single_part_items'>
<view class='single_part_item'>
<view class='iconfont icon-weixuanzhong'></view>
<view class='single_part_imgbox'>
<image src='/pages/imgs/icon32.png' mode='widthFix'></image>
</view>
<view class='single_part_detail'>
<view class='product_title'>泰式冬阴功秘制虾汤620g</view>
<view class='product_type'>小份 切丝</view>
<view class='product_action'>
<view class='price'>￥<text class='detail_price'>26</text></view>
<view class='action_box'>
<view class='short action_btn'>-</view>
<view class='detail_num'>1</view>
<view class='action_btn'>+</view>
</view>
</view>
</view>
</view>
<view class='single_part_item'>
<view class='iconfont icon-weixuanzhong'></view>
<view class='single_part_imgbox'>
<image src='/pages/imgs/icon32.png' mode='widthFix'></image>
</view>
<view class='single_part_detail'>
<view class='product_title'>泰式冬阴功秘制虾汤620g</view>
<view class='product_type'>小份 切丝</view>
<view class='product_action'>
<view class='price'>￥<text class='detail_price'>26</text></view>
<view class='action_box'>
<view class='short action_btn'>-</view>
<view class='detail_num'>1</view>
<view class='action_btn'>+</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class='singlepart'>
<view class='single_part_top'>
<view class='single_part_left'>
<view class='iconfont icon-weixuanzhong'></view>
标签01商品
</view>
<view class='single_part_right'>
鲜橙促销 买1送1
<view class='iconfont icon-icondayu'></view>
</view>
</view>
<view class='single_part_items'>
<view class='single_part_item'>
<view class='iconfont icon-weixuanzhong'></view>
<view class='single_part_imgbox'>
<image src='/pages/imgs/icon32.png' mode='widthFix'></image>
</view>
<view class='single_part_detail'>
<view class='product_title'>泰式冬阴功秘制虾汤620g</view>
<view class='product_type'>小份 切丝</view>
<view class='product_action'>
<view class='price'>￥<text class='detail_price'>26</text></view>
<view class='action_box'>
<view class='short action_btn'>-</view>
<view class='detail_num'>1</view>
<view class='action_btn'>+</view>
</view>
</view>
</view>
</view>
<view class='single_part_item'>
<view class='iconfont icon-weixuanzhong'></view>
<view class='single_part_imgbox'>
<image src='/pages/imgs/icon32.png' mode='widthFix'></image>
</view>
<view class='single_part_detail'>
<view class='product_title'>泰式冬阴功秘制虾汤620g</view>
<view class='product_type'>小份 切丝</view>
<view class='product_action'>
<view class='price'>￥<text class='detail_price'>26</text></view>
<view class='action_box'>
<view class='short action_btn'>-</view>
<view class='detail_num'>1</view>
<view class='action_btn'>+</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class='bottom_ac'>
<view class='choose'>
<view class='iconfont icon-weixuanzhong'></view> 全选
</view>
<view class='count'>
<view class='count_top'>
合计：<view class='price'>￥<text class='detail_price'>26</text></view>
</view>
<view class='fee'>
含运费10元
</view>
</view>
<view class='count_btn'>
结算
</view>
</view>
\ No newline at end of file
... ...
/* pages/cart/cart.wxss */
\ No newline at end of file
/* pages/cart/cart.wxss */
page{
background: #FFF;
display: flex;
flex-flow: column;
height: 100%;
}
.cart_box{
flex: 1;
display: flex;
flex-flow: column;
}
.top_label {
height: 85rpx;
display: flex;
background-color: #FFF;
font-size: 34rpx;
color: #26363A;
align-items: center;
font-weight: bold;
width: 100%;
justify-content: center;
position: relative;
}
.del_btn{
font-size: 28rpx;
color: #222222;
position: absolute;
top: 50%;
right: 26rpx;
transform: translateY(-50%);
}
.tips{
height: 50rpx;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FFDA44;
color: #333;
font-size: 24rpx;
padding: 0 40rpx;
}
.left,.right,icon{
display: flex;
align-items: center;
justify-content: center;
color: #222;
}
.note{
height: 32rpx;
border-radius: 16rpx;
font-size: 24rpx;
background-color: #fff;
padding: 0 12rpx;
width: 80rpx;
display: flex;
align-items: center;
justify-content: center;
margin-right: 30rpx;
}
.product_list{
padding: 0 25rpx;
flex: 1;
overflow-y: scroll;
}
.singlepart{
border-top: 22rpx solid #FAFAFA;
}
.single_part_top{
height: 90rpx;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 24rpx;
color: #888;
border-bottom: 1rpx solid #EDEDED;
}
.single_part_right,.single_part_left{
display: flex;
}
.single_part_left{
color: #222222;
font-size: 30rpx;
font-weight: 800;
}
.single_part_left .iconfont{
color: #EDEDED;
font-size: 40rpx;
margin-right: 24rpx;
}
.single_part_item{
display: flex;
margin: 30rpx 0 60rpx;
height: 140rpx;
align-items: center;
}
.iconfont{
font-size: 40rpx;
color: #EDEDED;
}
.single_part_imgbox{
width: 140rpx;
height: 140rpx;
overflow: hidden;
margin-left: 20rpx;
margin-right: 40rpx;
}
.single_part_imgbox image{
width: 100%;
}
.single_part_detail{
flex:1;
height: 100%;
display: flex;
flex-flow: column;
}
.product_action{
font-size: 28rpx;
color: #333;
line-height: 1;
margin-top: auto;
}
.product_title{
color: #333;
font-size: 28rpx;
margin-bottom: 10rpx;
}
.product_type {
color: #888;
font-size: 24rpx;
}
.product_action{
display: flex;
justify-content: space-between;
}
.price{
font-size: 24rpx;
color: #FF4444;
}
.detail_price{
font-size: 34rpx;
font-weight: bold;
}
.action_box{
display: flex;
align-items: center;
font-size: 30rpx;
}
.action_btn {
display: flex;
height: 38rpx;
width: 38rpx;
border-radius: 50%;
border: 1rpx solid #94999A;
align-items: center;
justify-content: center;
font-size: 30rpx;
}
.detail_num{
padding: 0 16rpx;
}
.bottom_ac{
height: 100rpx;
display: flex;
padding-left:25rpx;
background: #FFF;
align-items: center;
border-top: 1px solid #EFEFEF;
}
.choose{
display: flex;
font-size: 26rpx;
color: #888;
}
.choose .iconfont {
margin-right: 24rpx;
}
.count{
font-size: 26rpx;
margin-left: 45rpx;
}
.count_top{
display: flex;
align-items: center;
}
.fee{
color: #888;
font-size: 24rpx;
}
.count_btn{
width: 236rpx;
height: 100rpx;
background:linear-gradient(135deg, rgba(249, 145, 21, 1), rgba(245, 104, 0, 1));
display: flex;
align-items: center;
justify-content: center;
color: #FFF;
font-size: 26rpx;
justify-self: flex-end;
margin-left: auto;
-webkit-margin-start: auto;
}
\ No newline at end of file
... ...
不能预览此文件类型

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 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
<!--pages/index/goodsDetial/goodsDetial.wxml-->
<view>
<view class='detail_container'>
<view class='banner'>
<view class='iconfont icon-fanhui'></view>
<view class='coupons'>
... ...
... ... @@ -614,6 +614,9 @@ page {
display: flex;
justify-content: flex-end;
align-items: center;
position: fixed;
bottom: 0;
left: 0
}
.hint_btn {
... ...
... ... @@ -66,6 +66,21 @@ Page({
})
},
toMessage(){
wx.navigateTo({
url: '/pages/my/activityInformation/activityInformation',
})
},
chooseAdress(){
wx.navigateTo({
url: '/pages/my/selectAddress/selectAddress',
})
},
search(){
wx.navigateTo({
url: '/pages/my/serach/serach',
})
},
//控制广告
show_ad() {
this.setData({
... ...
<view class='index_top'>
<view class='index_add' bindtap='getaddress'>
<view class='index_add' bindtap='chooseAdress'>
<view class='iconfont icon-location'></view>
<text class='city_box'>{{city}}</text>
</view>
<view class='index_input'>
<view class='index_input' bindtap='search'>
<input placeholder='有机红颜草莓' placeholder-class='holder'></input>
<icon type='search' size='16' color='#222'></icon>
</view>
<view class='iconfont icon-message'></view>
<view class='iconfont icon-message' bindtap='toMessage'></view>
</view>
<view class='nav_box'>
<swiper display-multiple-items='{{num}}' class='swiper_nav_box'>
... ... @@ -93,7 +93,7 @@
<text class='oprice'>￥52.0</text>
</view>
</view>
<view class='new_person_item'>
<navigator url='/pages/index/goodsDetial/goodsDetial' class='new_person_item'>
<image src='../imgs/pic1.png'></image>
<view class='goods_name'>三纹鱼片</view>
<view>
... ... @@ -101,7 +101,7 @@
<text class='pprice'>26.0</text>
<text class='oprice'>￥52.0</text>
</view>
</view>
</navigator>
<view class='new_person_item'>
<image src='../imgs/pic1.png'></image>
<view class='goods_name'>三纹鱼片</view>
... ...
// pages/index/selectAddress/selectAddress.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--pages/index/selectAddress/selectAddress.wxml-->
<text>pages/index/selectAddress/selectAddress.wxml</text>
... ...
/* pages/index/selectAddress/selectAddress.wxss */
\ No newline at end of file
... ...
... ... @@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
msgType: 0
},
/**
... ... @@ -14,6 +14,11 @@ Page({
onLoad: function (options) {
},
changeTab(e){
this.setData({
msgType:e.currentTarget.id
})
},
/**
* 生命周期函数--监听页面初次渲染完成
... ...
<!--pages/my/coupons/coupons.wxml-->
<view class='banner'>
<view class='iconfont icon-fanhui'></view>
<view class='coupons'>消息</view>
<view class='clear_box'>
<view class='iconfont icon-shanchu'></view>
<view>全部清空</view>
<view class='banner top_label'>
消息
<view class='del_btn'>
<view class='clear_box'>
<view class='iconfont icon-shanchu'></view>
<view>全部清空</view>
</view>
</view>
</view>
<view class='tab'>
<view>活动消息</view>
<view>通知消息</view>
<view class='{{msgType==0?"active":""}}' id='0' bindtap='changeTab'>活动消息</view>
<view class='{{msgType==1?"active":""}}' id='1' bindtap='changeTab'>通知消息</view>
</view>
<view class='content_item'>
<view class='content_item' hidden='{{msgType==1}}'>
<view class='item_list'>
<view class='content_img'>
<image src='../../imgs/pic19.png'></image>
... ... @@ -27,8 +29,7 @@
</view>
</view>
</view>
<!-- <view class='item_list'>
<view class='item_list'>
<view class='content_img'>
<image src='../../imgs/pic19.png'></image>
</view>
... ... @@ -52,9 +53,9 @@
<view class='iconfont icon-diandian'></view>
</view>
</view>
</view> -->
</view>
</view>
<view class='content_item' hidden='{{msgType==0}}'>
<view class='item_list1'>
<view class='item_top'>
<view class='list_left'>
... ... @@ -72,8 +73,6 @@
<view>18/03/09</view>
</view>
</view>
<view class='item_list1'>
<view class='item_top'>
<view class='list_left'>
... ... @@ -91,7 +90,4 @@
<view>18/03/09</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
page {
background-color: #fafafa;
display: flex;
flex-flow: column;
height: 100%;
}
.banner {
... ... @@ -45,6 +48,8 @@ page {
.content_item {
padding: 0 25rpx;
flex: 1;
overflow-y:scroll;
}
.item_list {
... ... @@ -138,3 +143,16 @@ page {
height: 100%;
border-radius: 50rpx;
}
.active{
position: relative
}
.active:after{
position: absolute;
content: '';
height: 6rpx;
width: 136rpx;
background-color: #FFDA44;
bottom: -25rpx;
left: 50%;
transform: translateX(-50%);
}
\ No newline at end of file
... ...
<!--pages/my/edit_address/edit_address.wxml-->
<view>
<view class='banner'>
<view class='iconfont icon-fanhui'></view>
<!-- <view class='banner'>
<view class='iconfont '></view>
<view class='coupons'>选择地址</view>
<view class='add_address'>新增地址</view>
</view> -->
<view class='top_label'>
选择地址
<view class='del_btn'>新增地址</view>
</view>
<view class='select_list'>
... ...
<!--pages/my/edit_address/edit_address.wxml-->
<view>
<view class='banner'>
<view class='iconfont icon-fanhui'></view>
<!-- <view class='iconfont icon-fanhui'></view> -->
<view class='input_box'>
<view>
<input type="text" placeholder='有机红颜草莓' placeholder-class='banner_input'></input>
... ...
... ... @@ -12,9 +12,11 @@
},
"compileType": "miniprogram",
"libVersion": "1.9.98",
"appid": "wxdf7ee45f1c64c486",
"appid": "wx285c9973fc9c8423",
"projectname": "%E7%94%9F%E9%B2%9C",
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
... ... @@ -33,12 +35,34 @@
"list": []
},
"miniprogram": {
"current": 0,
"current": 3,
"list": [
{
"id": -1,
"name": "个人中心",
"pathName": "pages/my/my",
"query": "",
"scene": null
},
{
"id": -1,
"name": "购物车",
"pathName": "pages/cart/cart",
"query": "",
"scene": null
},
{
"id": -1,
"name": "地址选择",
"pathName": "pages/my/selectAddress/selectAddress",
"query": "",
"scene": null
},
{
"id": -1,
"name": "消息",
"pathName": "pages/my/activityInformation/activityInformation",
"query": "",
"scene": null
}
]
... ...
{
"desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
... ...