Skip to content

7
7-Eleven
Commit b56298b4 by 赵雅纹
Options

Merge branch 'dev_7.1.0' into feature-zyw-sc

parents c8b69f09 a4e68e84
Showing with 665 additions and 176 deletions
src/base/base.wxss
...@@ -116,6 +116,12 @@ a { ...@@ -116,6 +116,12 @@ a {
.clear:after { .clear:after {
clear: both; } clear: both; }
.clearfix::after {
content: '';
display: block;
clear: both; }
/*字体*/ /*字体*/
.fs-10 { .fs-10 {
font-size: 10px; } font-size: 10px; }
......
src/component/scrollDel/scrollDel.js 0 → 100644
// component/scrollDel/scrollDel.js
var app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
Component({
/**
* 组件的属性列表
*/
properties: {
cartList: {
type: Array,
value: []
}
},
attached () {
},
/**
* 组件的初始数据
*/
data: {
delBtnWidth: 132,
cartList: [{ content: "1", right: 0 }, { content: "2", right: 0 }],
isScroll:true,
windowHeight: 0,
checkedColor: 'rgb(203, 60, 60)',
},
ready() {
var that = this;
wx.getSystemInfo({
success: function (res) {
that.setData({
windowHeight: res.windowHeight
});
}
});
},
/**
* 组件的方法列表
*/
methods: {
checkPro(e) {
// index
var index = e.currentTarget.dataset.index
wxService.nextTick(() => {
this.triggerEvent('checkProChange', index)
})
},
minusNum(e){
// index
var index = e.currentTarget.dataset.index
wxService.nextTick(() => {
this.triggerEvent('minusNumChange', index)
})
},
addNum(e){
// index
var index = e.currentTarget.dataset.index
wxService.nextTick(() => {
this.triggerEvent('addNumChange', index)
})
},
blurNum(e){
// value index
var index = e.currentTarget.dataset.index
var value = e.detail.value
let params = {
index,value
}
wxService.nextTick(() => {
this.triggerEvent('blurNumChange', params)
})
},
inputNum(e){
// value index
var index = e.currentTarget.dataset.index
var value = e.detail.value
let params = {
index,value
}
wxService.nextTick(() => {
this.triggerEvent('inputNumChange', params)
})
},
delItem(e){
// skuId index
var params = e.currentTarget.dataset
wxService.nextTick(() => {
this.triggerEvent('delItemChange', params)
})
},
drawStart: function (e) {
var touch = e.touches[0]
for(var index in this.data.cartList) {
var item = this.data.cartList[index]
item.right = 0
}
this.setData({
cartList: this.data.cartList,
startX: touch.clientX,
})
},
drawMove: function (e) {
var touch = e.touches[0]
var item = this.data.cartList[e.currentTarget.dataset.index]
var disX = this.data.startX - touch.clientX
if (disX >= 20) {
if (disX > this.data.delBtnWidth) {
disX = this.data.delBtnWidth
}
item.right = disX
this.setData({
isScroll: false,
cartList: this.data.cartList
})
} else {
item.right = 0
this.setData({
isScroll: true,
cartList: this.data.cartList
})
}
},
drawEnd: function (e) {
var item = this.data.cartList[e.currentTarget.dataset.index]
if (item.right >= this.data.delBtnWidth/2) {
item.right = this.data.delBtnWidth
this.setData({
isScroll: true,
cartList: this.data.cartList,
})
} else {
item.right = 0
this.setData({
isScroll: true,
cartList: this.data.cartList,
})
}
}
}
})
src/component/scrollDel/scrollDel.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/scrollDel/scrollDel.wxml 0 → 100644
<!--component/scrollDel/scrollDel.wxml-->
<scroll-view scroll-y="{{isScroll}}" style='height:{{windowHeight}}px'>
<block class="cart-item" wx:key="item" wx:for="{{cartList}}">
<view data-index='{{index}}' class="order-item cart-list" bindtouchstart="drawStart" bindtouchmove="drawMove" bindtouchend="drawEnd" style="right:{{item.right}}rpx">
<view data-index="{{index}}">
<icon size="16" type="{{item.checked ? 'success' : 'circle'}}" color="{{checkedColor}}" data-index="{{index}}" catchtap="checkPro"></icon>
</view>
<view class="pro-info">
<image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image>
<view class="pro-right-info">
<view class="pro-name">{{item.productName}}</view>
<view class="pro-sku">{{item.skuSpec}}</view>
<view class="pro-price">
<view class="price">￥{{item.price}}</view>
<view class="pro-num-edit">
<button class="redus-num" data-index="{{index}}" catchtap="minusNum">-</button>
<input class="pro-num-edit-input" type="number" data-index="{{index}}" catchtap bindblur="blurNum" bindinput="inputNum" value="{{item.count}}"></input>
<button class="add-num" data-index="{{index}}" catchtap="addNum">+</button>
</view>
</view>
</view>
</view>
<view class="remove" data-index="{{index}}" data-skuId="{{item.skuId}}" bindtap="delItem">删除 </view>
</view>
</block>
</scroll-view>
\ No newline at end of file
src/component/scrollDel/scrollDel.wxss 0 → 100644
/* component/scrollDel/scrollDel.wxss */
@import './../../base/base.wxss';
.order-item {
width: 100%;
display: flex;
position: relative;
}
.remove{
width: 132rpx;
height: 100%;
background-color: rgba(149, 149, 149, 1);
color: white;
position: absolute;
top: 0;
right: -132rpx;
display: flex;
justify-content: center;
align-items: center;
}
.cart-item{
display: flex;
overflow: hidden;
}
.cart-item:last-child .pro-info{
border-bottom: none;
}
.cart-content {
background-color: #ffffff;
}
.cart-list,.overdue-list{
width: 692rpx;
display: flex;
padding: 30rpx 32rpx 0 30rpx;
align-items: center;
flex-shrink: 0;
}
.pro-info{
margin-left: 24rpx;
flex: 1;
display: flex;
border-bottom: 1rpx solid rgba(151,151,151,0.3);
padding-bottom: 32rpx;
align-items: center;
}
.cart-item:last-child .pro-info{
border-bottom: none;
}
.overdue-list:last-child .pro-info{
border-bottom: none;
}
.pro-img{
width: 180rpx;
height: 180rpx;
}
.pro-right-info{
flex: 1;
margin-left: 26rpx;
}.pro-name{
font-size: 25rpx;
width: 425rpx;
color: #333333;
}
.pro-sku{
color: #aaaaaa;
font-size: 22rpx;
margin-top: 10rpx;
}
.pro-price{
display: flex;
justify-content: space-between;
margin-top: 16rpx;
}
.pro-num-edit{
display: flex;
width:107rpx;
}
.pro-num-edit button {
padding: 4rpx;
width: 80rpx;
height: 40rpx;
line-height: 40rpx;
color: #868686;
font-size: 28rpx;
background-color: #ffffff;
}
.pro-num-edit button::after {
border-radius: 0;
border: 0;
}
.pro-num-edit-input {
line-height: 40rpx;
height: 40rpx ;
text-align: center;
color: #666660;
font-size: 28rpx;
}
.pro-price .price{
font-size: 32rpx;
color: #cb3c3c;
font-weight: 600;
}
.clear-btn{
width: 136rpx;
height: 38rpx;
line-height: 38rpx;
color: #989696;
font-size: 18rpx;
border-radius: 21rpx;
border: 1px solid #cccccc;
text-align: center;
float: right;
margin-top:16rpx;
margin-right: 30rpx;
}
.clear-btn:active{
opacity: 0.5;
}
.clearflex{
clear: both;
}
.overdue-status{
font-size: 16rpx;
color: #ffffff;
width: 44rpx;
height: 26rpx;
line-height: 26rpx;
text-align: center;
border-radius: 3rpx;
background-color: rgba(187, 187, 187, 1);
}
.cart-bottom{
position: fixed;
left: 0;
/* bottom: 124rpx; */
display: flex;
align-items: center;
}
.buy-btn{
width: 214rpx;
height: 88rpx;
text-align: center;
line-height: 88rpx;
color: #ffffff;
font-size: 25rpx;
flex: 1;
}
.total{
width: 468rpx;
height: 88rpx;
display: flex;
border-top: 1px solid rgba(151, 151, 151, 0.3);
text-align: right;
padding-right: 39rpx;
background-color: #ffffff;
padding-left: 30rpx;
align-items: center;
}
.total-label{
font-size: 26rpx;
color: #808080;
}
.total-price{
color: #cb3c3c;
font-size: 32rpx;
}
.total-amount{
flex: 1;
}
.all-radio{
display: flex;
align-items: center;
}
.all{
margin-left: 24rpx;
font-size: 26rpx;
color: #333333;
}
.pro-price .overdue-price{
color: #808080;
}
.overdue-name{
color: #787878;
}
.cart-item{
display: flex;
overflow: hidden;
}
.empty{
color: #808080;
text-align: center;
width: 100%;
margin-top: 458rpx;
}
\ No newline at end of file
src/pages/cart/cart.json
{ {
"navigationBarTitleText": "购物车", "navigationBarTitleText": "购物车",
"usingComponents": {} "usingComponents": {
"scroll-del": "/component/scrollDel/scrollDel"
}
} }
\ No newline at end of file
src/pages/cart/cart.wxml
...@@ -2,18 +2,29 @@ ...@@ -2,18 +2,29 @@
<view class="page-cart" style="padding-bottom:{{currentHeight + 88}}px"> <view class="page-cart" style="padding-bottom:{{currentHeight + 88}}px">
<view class="open-card"> <view class="open-card">
<view class="vip-desc"> <view class="vip-desc">
<image class="plus-img" src="/assets/imgs/7_1_0/plus-icon.png" mode="widthFix"></image> <image class="plus-img" src="/assets/imgs/7_1_0/plus-icon.png" mode="widthFix" />
<text class="vip-info">VIP尊享N大权益，本单立减</text> <text class="vip-info">VIP尊享N大权益，本单立减</text>
<text class="vip-price">￥145</text> <text class="vip-price">￥145</text>
</view> </view>
<view class="open-btn"> <view class="open-btn">
<text>去开卡</text> <text>去开卡</text>
<image class="arrow-right" mode="widthFix" src="/assets/imgs/7_1_0/small-arrow-right.png" ></image> <image class="arrow-right" mode="widthFix" src="/assets/imgs/7_1_0/small-arrow-right.png" />
</view> </view>
</view> </view>
<!-- 购物车列表 -->
<view class="cart-content" wx:if="{{cartList.length}}"> <view class="cart-content" wx:if="{{cartList.length}}">
<scroll-del
cartList="{{cartList}}"
bind:checkProChange="checkProChange"
bind:addNumChange="addNumChange"
bind:minusNumChange="minusNumChange"
bind:blurNumChange="blurNumChange"
bind:inputNumChange="inputNumChange"
bind:delItemChange="delItemChange"
/>
</view>
<!-- 购物车列表 -->
<!-- <view class="cart-content" wx:if="{{cartList.length}}">
<view class="cart-item" wx:for="{{cartList}}" wx:key="{{index}}"> <view class="cart-item" wx:for="{{cartList}}" wx:key="{{index}}">
<view class="cart-list" bindtouchstart="touchS" bindtouchmove="touchM" bindtouchend="touchE" style="{{item.shows}}" data-index="{{index}}"> <view class="cart-list" bindtouchstart="touchS" bindtouchmove="touchM" bindtouchend="touchE" style="{{item.shows}}" data-index="{{index}}">
<view class="select-radio" data-index="{{index}}"> <view class="select-radio" data-index="{{index}}">
...@@ -37,7 +48,7 @@ ...@@ -37,7 +48,7 @@
</view> </view>
<view class="delete" data-index="{{index}}" data-skuId="{{item.skuId}}" bindtap="deletePro">删除</view> <view class="delete" data-index="{{index}}" data-skuId="{{item.skuId}}" bindtap="deletePro">删除</view>
</view> </view>
</view> </view>-->
<!-- 失效宝贝 --> <!-- 失效宝贝 -->
<view class="overdue-pro" wx:if="{{outGoods.length}}"> <view class="overdue-pro" wx:if="{{outGoods.length}}">
...@@ -45,7 +56,7 @@ ...@@ -45,7 +56,7 @@
<view class="overdue-list clearflex"> <view class="overdue-list clearflex">
<view class="overdue-status">失效</view> <view class="overdue-status">失效</view>
<view class="pro-info"> <view class="pro-info">
<image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image> <image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix" />
<view class="pro-right-info"> <view class="pro-right-info">
<view class="pro-name overdue-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view> <view class="pro-name overdue-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
<view class="pro-sku">规格</view> <view class="pro-sku">规格</view>
...@@ -63,15 +74,16 @@ ...@@ -63,15 +74,16 @@
<view class="cart-bottom" style="bottom:{{currentHeight}}px"> <view class="cart-bottom" style="bottom:{{currentHeight}}px">
<view class="total"> <view class="total">
<view class="select-radio all-radio" bindtap="checkAll"> <view class="select-radio all-radio" bindtap="checkAll">
<icon type="{{checkAll ? 'success' : 'circle'}}" color="{{checkedColor}}" size="16" ></icon> <icon type="{{checkAll ? 'success' : 'circle'}}" color="{{checkedColor}}" size="16" />
<text class="all" >全选</text> <text class="all" >全选</text>
</view> </view>
<view class="total-amount"> <view class="total-amount">
<text class="total-label">合计：</text> <text class="total-label">合计：</text>
<text class="total-price">￥306</text> <text class="total-price">￥{{shopCartTotalFee}}</text>
</view> </view>
</view> </view>
<view class="theme-color buy-btn" bindtap="goBuy">立即购买</view> <view class="theme-color buy-btn" bindtap="goBuy">立即购买</view>
</view> </view>
</view> </view>
src/pages/order/order.js
// pages/order/order.js // pages/order/order.js
Page({ const app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
wxService.page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
swiperItem:[ swiperItem: [
{ {
type:'1', type: '1',
name:'全部' name: '全部'
}, },
{ {
type: '2', type: '2',
...@@ -27,7 +32,25 @@ Page({ ...@@ -27,7 +32,25 @@ Page({
name: '退款/售后' name: '退款/售后'
} }
], ],
currentIndex:1 currentIndex: 1,
pageNo: 1,
pageSize: 5,
noMoreFlag: false,
orderList: null,
totalPages: 0,
subImgs: [{
listUrl: "https://hwimagecdn.ihotwind.cn//544/201906/1b41a9a3247d42c89e0c461e2faaf6c1_512_512.jpg"
}, {
listUrl: "https://hwimagecdn.ihotwind.cn//544/201906/1b41a9a3247d42c89e0c461e2faaf6c1_512_512.jpg"
}, {
listUrl: "https://hwimagecdn.ihotwind.cn//544/201906/1b41a9a3247d42c89e0c461e2faaf6c1_512_512.jpg"
}, {
listUrl: "https://hwimagecdn.ihotwind.cn//544/201906/1b41a9a3247d42c89e0c461e2faaf6c1_512_512.jpg"
}, {
listUrl: "https://hwimagecdn.ihotwind.cn//544/201906/1b41a9a3247d42c89e0c461e2faaf6c1_512_512.jpg"
}, {
listUrl: "https://hwimagecdn.ihotwind.cn//544/201906/1b41a9a3247d42c89e0c461e2faaf6c1_512_512.jpg"
}]
}, },
/** /**
...@@ -41,11 +64,32 @@ Page({ ...@@ -41,11 +64,32 @@ Page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
this.initOrderList(this.data.pageNo, this.data.pageSize)
}, },
initOrderList(pageNo, pageSize) {
if (this.data.noMoreFlag) { // 没有更多数据了，不调用接口
return false
}
wx.showLoading({
title: '加载中',
mask: true
})
wxService.post(`/sale/order/list?pageNo=${pageNo}&pageSize=${pageSize}`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
this.setData({
orderList: this.data.pageNo == 1 ? [...data.content] : [...this.data.orderList, ...data.content],
totalPages: data.totalPages
})
}
}
})
},
//点击切换tab //点击切换tab
switchTab(e){ switchTab(e) {
this.setData({ this.setData({
currentIndex: e.currentTarget.dataset.type currentIndex: e.currentTarget.dataset.type
}) })
...@@ -63,7 +107,17 @@ Page({ ...@@ -63,7 +107,17 @@ Page({
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom: function () { onReachBottom: function () {
if (this.data.pageNo < this.data.totalPages) {
this.setData({
pageNo: this.data.pageNo + 1,
}, () => {
this.initOrderList(this.data.pageNo, this.data.pageSize)
})
} else {
this.setData({
noMoreFlag: true
})
}
}, },
/** /**
......
src/pages/order/order.json
{ {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarTitleText": "我的订单", "navigationBarTitleText": "我的订单",
"usingComponents": {} "usingComponents": {
"no-more": "/component/noMore/noMore"
}
} }
\ No newline at end of file
src/pages/order/order.wxml
<!--pages/order/order.wxml--> <!--pages/order/order.wxml-->
<view class='page-order'> <view class='page-order'>
<view class="swiper-tab"> <view class="swiper-tab">
<view class="swiper-tab-item {{currentIndex == item.type ? 'active' : ''}}" wx:for="{{swiperItem}}" wx:key="{{index}}" bindtap="switchTab" data-type="{{item.type}}"> <view
class="swiper-tab-item {{currentIndex == item.type ? 'active' : ''}}"
wx:for="{{swiperItem}}"
wx:key="{{index}}"
bindtap="switchTab"
data-type="{{item.type}}"
>
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
<scroll-view scroll-y="true">
<view class="order-content"> <view class="order-content">
<block
wx:for="{{orderList}}"
wx:for-item="item"
wx:for-index="k"
wx:key="{{k}}"
>
<view class="order-list"> <view class="order-list">
<view class="order-header"> <view class="order-header">
<view class="order-number"> <view class="order-number">
<text>订单号</text> <text>订单号</text>
<text class="number">784658743657</text> <text class="number">{{item.orderNo}}</text>
</view> </view>
<text class="order-status">待付款</text> <text class="order-status">待付款</text>
</view> </view>
<view class="pro-list"> <view class="pro-list">
<image class="pro-img"></image> <scroll-view scroll-x="true">
<image class="pro-img"></image> <view class="uploadWrap" scroll-x="true">
<image class="pro-img"></image> <block wx:for='{{subImgs}}' wx:for-item="sub" wx:key="s" >
<image class="pro-img"></image> <view class="upload_Item">
<text class="pro-img-dot">...</text> <image class="upload_Item_img" src="{{sub.listUrl}}" bindtap='goProDetail' data-id='{{sub.goodsId}}'></image>
</view>
</block>
</view>
</scroll-view>
</view> </view>
<view class="pro-number"> <view class="pro-number">
<text class="total-pro">共5件商品</text> <text class="total-pro">共5件商品</text>
<view class="total-price"> <view class="total-price">
实付 <text class="price">￥480</text> 实付
<text class="price">￥{{item.realPayMoney/100}}</text>
</view> </view>
</view> </view>
<view class="btn-group"> <view class="btn-group">
...@@ -38,6 +52,10 @@ ...@@ -38,6 +52,10 @@
<button class="btn btn-sm btn-default ">删除订单</button> <button class="btn btn-sm btn-default ">删除订单</button>
</view> </view>
</view> </view>
</block>
</view> </view>
</scroll-view>
</view> </view>
<view class="no-bottom">
<no-more wx:if="{{noMoreFlag}}"/>
</view>
src/pages/order/order.wxss
...@@ -13,6 +13,7 @@ scroll-view{ ...@@ -13,6 +13,7 @@ scroll-view{
background-color: #ffffff; background-color: #ffffff;
color: #000000; color: #000000;
position:fixed; position:fixed;
top: 0;
z-index:1; z-index:1;
justify-content: space-between; justify-content: space-between;
padding: 24rpx 85rpx 0; padding: 24rpx 85rpx 0;
...@@ -56,19 +57,6 @@ scroll-view{ ...@@ -56,19 +57,6 @@ scroll-view{
} }
.pro-list{ .pro-list{
margin-top: 16rpx; margin-top: 16rpx;
display: flex;
justify-content: space-between;
}
.pro-img{
width: 140rpx;
height: 140rpx;
border:1px solid red;
vertical-align: middle;
}
.pro-img-dot{
display: inline-block;
vertical-align: middle;
line-height: 144rpx;
} }
.pro-number{ .pro-number{
margin-top: 28rpx; margin-top: 28rpx;
...@@ -100,12 +88,30 @@ scroll-view{ ...@@ -100,12 +88,30 @@ scroll-view{
color: #cb3c3c; color: #cb3c3c;
font-weight: 600; font-weight: 600;
} }
.no-bottom {
margin: 50rpx 0;
}
.sub-imgs{
margin: 25rpx 0;
padding-left: 24rpx;
}
.uploadWrap{
height: 140rpx;
width:100%;
display: flex;
display: -webkit-box;
flex-direction: column;
}
.upload_Item{
width: 140rpx;
height: 140rpx;
flex: 1;
padding: 0rpx 15rpx 15rpx 0;
}
.upload_Item:last-child{
padding-right: 20rpx;
}
.upload_Item_img{
width: 140rpx;
height: 140rpx;
}
src/pages/refund/refund.js
// pages/refund/refund.js // pages/refund/refund.js
Page({ const app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
wxService.page({
/** /**
* 页面的初始数据 * 页面的初始数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment