Skip to content

7
7-Eleven
Commit cdb28491 by 赵雅纹
Options

Merge branch 'dev' into feature-zyw 

# Conflicts:
#	src/project.config.json
parents 200dfa4f f9536d51
Showing with 333 additions and 161 deletions
src/app.json
......@@ -8,6 +8,7 @@
"pages/deliveryService/deliveryService",
"pages/coupons/coupons",
"pages/couponDetail/couponDetail",
"pages/couponCodeDetail/couponCodeDetail",
"pages/consumptionDetails/consumptionDetails",
"pages/IntegralMall/IntegralMall",
"pages/integralMallDetail/integralMallDetail",
......
src/pages/IntegralMall/IntegralMall.wxml
......@@ -9,9 +9,9 @@
<image wx:else src='/assets/imgs/qr-code.png'></image>
</view>
<view class='coupon-info'>
<view class='coupon-time fs-24'>{{item.point}}积分</view>
<view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-time fs-24'>{{item.startTime}}</view>
<view class='coupon-desc fs-24' data-id="{{item.id}}" bindtap="goCouponDetail">查看详情</view>
<view class='coupon-desc fs-24' data-id="{{item.id}}" bindtap="goCouponDetail">查看详情 >>></view>
</view>
<view class='coupon-code fs-24' data-id="{{item.id}}" data-point="{{item.point}}" bindtap='exchange'>立即兑换</view>
</view>
......
src/pages/IntegralMall/IntegralMall.wxss
......@@ -63,16 +63,18 @@
left: 236rpx;
}
.coupon-name{
color:#05c35b;
color:#333;
}
.coupon-time{
color:#999999;
color:#fc921e;
margin-top: 10rpx;
font-size: 26rpx;
}
.coupon-desc{
color:#666666;
margin-top: 6rpx;
color:#999;
margin-top: 20rpx;
width: 360rpx;
font-size: 24rpx;
}
.coupon-code{
color: #ffffff;
......
src/pages/consumptionDetails/consumptionDetails.js
......@@ -44,6 +44,7 @@ wxService.page({
wx.showLoading({
title: '加载中'
})
// brandId dev_1002 711_2005
wxService.get(`/sale/order/findByOrderNo?orderNo=${orderNo}&brandId=2005`).then(res => {
const {result,data} = res.data
if(result == 0){
......
src/pages/couponCodeDetail/couponCodeDetail.js 0 → 100644
// pages/couponCodeDetail.js
const app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
var wxbarcode = require('../../codeUtils/index.js');
wxService.page({
/**
* 页面的初始数据
*/
data: {
couponDetailTitle: '',
cardno: ''
},
/**
* 生命周期函数--监听页面显示
*/
onShow () {
const {title,cardno} = this.options
this.setData({
couponDetailTitle: title,
cardno
})
this.getCouponDetail(cardno)
// 条形码
wxbarcode.barcode('barcode', cardno, 600, 180);
},
// 查询单个优惠券
getCouponDetail(cardno){
wx.showLoading({
title: '加载中'
})
wxService.post(`/coupon/coupon/get?cardNo=${cardno}`).then(res => {
const {result,data} = res.data
if(result == 0){
wx.hideLoading()
} else {
wx.hideLoading()
wx.showToast({
title: `${res.desc}`,
icon: 'none'
})
}
}).finally(() => {})
}
})
\ No newline at end of file
src/pages/couponCodeDetail/couponCodeDetail.json 0 → 100644
{
"navigationBarTitleText": "券码详情页",
"usingComponents": {}
}
\ No newline at end of file
src/pages/couponCodeDetail/couponCodeDetail.wxml 0 → 100644
<!--pages/couponCodeDetail.wxml-->
<view class="container-coupon page">
<view class="panel">
<view class="qrcode">
<view class='avatar-img'>
<image src='/assets/imgs/avatar.png'></image>
</view>
<view class='title fs-36'>{{couponDetailTitle}}</view>
</view>
<view class='line'>
<image src='/assets/imgs/line.png'></image>
</view>
<view class="barcode">
<canvas canvas-id="barcode" />
</view>
<view class='bottom-code'>{{cardno}}</view>
</view>
</view>
\ No newline at end of file
src/pages/couponCodeDetail/couponCodeDetail.wxss 0 → 100644
/* pages/couponCodeDetail/couponCodeDetail.wxss */
@import './../../base/base.wxss';
page {
background-color: #fff;
}
.page {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.container-coupon {
padding-bottom: 10rpx;
}
.panel {
width:642rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: stretch;
margin: 52rpx 60rpx;
box-sizing: border-box;
border-radius: 10rpx;
background-color: #fff;
box-shadow: 0 0 30rpx 10rpx rgba(0,0,0,0.1);
}
.barcode {
display: flex;
height: 320rpx;
flex-direction: column;
justify-content: center;
align-items: center;
padding:0 20rpx;
box-sizing: border-box;
}
.barnum {
width: 670rpx;
height: 100rpx;
line-height: 100rpx;
font-size: 38rpx;
font-weight: bold;
text-align: center;
letter-spacing: 10rpx;
white-space: nowrap;
}
.barcode > canvas {
width: 600rpx;
height: 200rpx;
}
.qrcode {
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: center;
}
.bottom-code{
font-size: 40rpx;
color: #05c35b;
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: center;
margin-top: 30rpx;
padding-bottom: 140rpx;
}
.avatar-img image{
width: 81rpx;
height: 81rpx;
margin-top: 58rpx;
}
.title{
color: #333333;
margin-top: 66rpx;
}
.line image{
width: 100%;
height: 42rpx;
margin: 40rpx 0;
}
src/pages/couponDetail/couponDetail.js
// pages/coupons.js
// pages/couponDetail/couponDetail.js
const app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
var wxbarcode = require('../../codeUtils/index.js');
wxService.page({
/**
* 页面的初始数据
*/
data: {
couponDetailTitle: '',
cardno: ''
isExchange:false,
couponDetail:{}
},
/**
* 生命周期函数--监听页面显示
*/
onShow () {
const {title,cardno} = this.options
const {cardno} = this.options
this.getCouponDetail(cardno)
},
//立即兑换
exchange(){
this.setData({
couponDetailTitle: title,
cardno
isExchange :true
})
this.getCouponDetail(cardno)
// 条形码
wxbarcode.barcode('barcode', cardno, 600, 180);
},
// 查询单个优惠券
getCouponDetail(cardno){
// 卡券详情
getCouponDetail(id){
wx.showLoading({
title: '加载中'
})
wxService.post(`/coupon/coupon/get?cardNo=${cardno}`).then(res => {
wxService.post(`/coupon/coupon/get?cardNo=${id}`).then(res => {
const {result,data} = res.data
if(result == 0){
wx.hideLoading()
} else {
wx.hideLoading()
wx.showToast({
title: `${res.desc}`,
icon: 'none'
})
data.coupon.startTime = data.coupon.startTime.substring(0,10)
data.coupon.endTime = data.coupon.endTime.substring(0,10)
this.setData({
couponDetail: data
})
}
}).finally(() => {})
}).finally(() => {
wx.hideLoading()
})
},
handelPresentCouponCode(e) {
let data = e.currentTarget.dataset
wxService.router(`/pages/couponCodeDetail/couponCodeDetail`).search(data)
}
})
\ No newline at end of file
src/pages/couponDetail/couponDetail.json
{
"navigationBarTitleText": "券码详情页",
"navigationBarTitleText": "我的卡券",
"usingComponents": {}
}
\ No newline at end of file
src/pages/couponDetail/couponDetail.wxml
<!--pages/userCenter.wxml-->
<!--<view class='page-couponDetail'>
<view class='coupon-detail-content'>
<view class='coupon-detail-header'>
<view class='avatar-img'>
<image src='/assets/imgs/avatar.png'></image>
</view>
<view class='title fs-36'>{{couponDetailTitle}}</view>
</view>
<view class='line'>
<image src='/assets/imgs/line.png'></image>
</view>
<view class='qr-code'>
<view class='code-img'>
<canvas canvas-id="barcode" />
</view>
<view class='bottom-code'>{{cardno}}</view>
</view>
</view>
</view>-->
<view class="container-coupon page">
<view class="panel">
<view class="qrcode">
<view class='avatar-img'>
<image src='/assets/imgs/avatar.png'></image>
</view>
<view class='title fs-36'>{{couponDetailTitle}}</view>
</view>
<view class='line'>
<image src='/assets/imgs/line.png'></image>
</view>
<view class="barcode">
<canvas canvas-id="barcode" />
</view>
<view class='bottom-code'>{{cardno}}</view>
</view>
</view>
\ No newline at end of file
<!--pages/couponDetail/couponDetail.wxml-->
<view class='page-integral-detail'>
<view class='coupon-wrap'>
<view class='coupon-list'>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
<view class='coupon-img'>
<image wx:if="{{couponDetail.couponDetail.style.takeCouponBgimg}}" src='{{couponDetail.couponDetail.style.takeCouponBgimg}}'></image>
<image wx:else src='/assets/imgs/qr-code.png'></image>
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>{{couponDetail.couponSetting.title}}</view>
<view class='coupon-desc fs-28'>{{couponDetail.coupon.startTime}} 至 {{couponDetail.coupon.endTime}}</view>
</view>
<view class='coupon-code fs-24' bindtap='exchange' bindtap="handelPresentCouponCode">出示券码</view>
</view>
<view class='integral-detail' wx:if="{{couponDetail.couponDetail.style.takeCouponBgimg}}">
<image src='{{couponDetail.couponDetail.style.takeCouponBgimg}}' mode="widthFix" style="width: 100%;"></image>
</view>
<button type='primary' class="redeem-now" bindtap='exchange' bindtap="handelPresentCouponCode">出示券码</button>
</view>
</view>
src/pages/couponDetail/couponDetail.wxss
/* pages/couponDetail/couponDetail.wxss */
@import './../../base/base.wxss';
page {
background-color: #fff;
.coupon-wrap{
padding: 20rpx;
clear: both;
}
.page {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.redeem-now{
font-size: 28rpx!important;
height: 88rpx;
line-height: 88rpx;
background-color: rgb(0, 188, 112)!important;
}
.container-coupon {
padding-bottom: 10rpx;
.coupon-list{
width: 712rpx;
height: 209rpx;
position: relative;
margin-bottom: 20rpx;
}
.panel {
width:642rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: stretch;
margin: 52rpx 60rpx;
box-sizing: border-box;
border-radius: 10rpx;
background-color: #fff;
box-shadow: 0 0 30rpx 10rpx rgba(0,0,0,0.1);
.coupon-bg{
width: 712rpx;
height: 209rpx;
position: absolute;
top: 0;
left: 0;
z-index: -1;
}
.barcode {
display: flex;
height: 320rpx;
flex-direction: column;
justify-content: center;
align-items: center;
padding:0 20rpx;
box-sizing: border-box;
.coupon-img image{
width: 172rpx;
height: 172rpx;
position: absolute;
top: 18rpx;
left: 16rpx;
}
.barnum {
width: 670rpx;
height: 100rpx;
line-height: 100rpx;
font-size: 38rpx;
font-weight: bold;
text-align: center;
letter-spacing: 10rpx;
white-space: nowrap;
.coupon-info{
position: absolute;
top: 30rpx;
left: 236rpx;
}
.coupon-name{
color:#000;
}
.barcode > canvas {
width: 600rpx;
height: 200rpx;
.coupon-desc{
width: 360rpx;
color:#999999;
margin-top: 10rpx;
}
.qrcode {
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: center;
.coupon-code{
color: #ffffff;
position: absolute;
right: 20rpx;
top: 30rpx;
width: 24rpx;
word-wrap: break-word;
font-weight: bold;
}
.bottom-code{
font-size: 40rpx;
color: #05c35b;
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: center;
margin-top: 30rpx;
padding-bottom: 140rpx;
.integral-detail{
margin-top: 90rpx;
}
.avatar-img image{
width: 81rpx;
height: 81rpx;
margin-top: 58rpx;
.integral-list{
margin-bottom: 60rpx;
}
.title{
color: #333333;
margin-top: 66rpx;
.integral-title,.integral-desc{
display: inline-block;
}
.line image{
width: 100%;
height: 42rpx;
margin: 40rpx 0;
.integral-title{
color: #999999;
vertical-align: top;
margin-right: 50rpx;
text-align: right;
width: 120rpx;
}
.integral-desc{
width: 500rpx;
color: #666666;
}
\ No newline at end of file
src/pages/coupons/coupons.js
......@@ -51,7 +51,6 @@ wxService.page({
// invalidCouponList: [],
})
}
// 可使用
if( current == 0 ){
this.getCouponList(1,10,1)
......@@ -68,11 +67,17 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow () {
// 可使用 已失效
this.getCouponList(1,10,1)
this.getCouponList(1,10,0)
},
handelPresentCouponDetail(e) {
let {cardno} = e.currentTarget.dataset
wxService.router(`/pages/couponDetail/couponDetail`).search({cardno})
},
handelPresentCouponCode(e) {
let data = e.currentTarget.dataset
wxService.router(`/pages/couponDetail/couponDetail`).search(data)
wxService.router(`/pages/couponCodeDetail/couponCodeDetail`).search(data)
},
//获取优惠券列表
......
src/pages/coupons/coupons.wxml
......@@ -16,7 +16,7 @@
wx:for-index="k"
wx:key="{{k}}"
>
<view data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" bindtap="handelPresentCouponCode">
<view data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/>
<view class='coupon-img'>
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
......@@ -27,7 +27,7 @@
<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
<view class='coupon-desc fs-24'>{{item.notice}}</view>
</view>
<view class='coupon-code fs-24'>出示劵码</view>
<view class='coupon-code fs-24' bindtap="handelPresentCouponCode">出示劵码</view>
</view>
</view>
</view>
......
src/pages/integralWater/integralWater.wxml
......@@ -21,7 +21,7 @@
<view class="detail-title">{{item.changeTypeDesc}}</view>
<view class="detail-time">{{item.createTime}}</view>
</view>
<view class="detail-num {{item.operation==true ? 'add' : 'less'}}">{{item.operation*item.changeValue}}</view>
<view class="detail-num {{item.operation==true ? 'add' : 'less'}}">{{item.operation == 1? '+':''}}{{item.operation*item.changeValue}}</view>
</view>
<no-more wx:if="{{noMore}}"/>
</view>
......
src/pages/integralWater/integralWater.wxss
......@@ -22,14 +22,14 @@
padding-top: 34rpx;
}
.integral-vip-rules{
width:140rpx;
height:35rpx;
line-height: 35rpx;
width:100rpx;
height:33rpx;
line-height: 33rpx;
display: inline-block;
text-align: center;
margin-left: 29%;
margin-left:38%;
color: rgb(64, 205, 147);
font-size: 28rpx;
font-size: 19rpx;
font-weight: 700;
border: 4rpx solid rgb(64, 205, 147);
padding: 5rpx 8rpx;
......@@ -75,7 +75,8 @@
.detail-num{
font-size: 25rpx;
text-align: left;
width:26%;
width:10%;
padding-top:20rpx;
}
.add {
color: #fc921e;
......
src/pages/memberOfOwn/memberOfOwn.wxml
......@@ -70,7 +70,7 @@
<view><label class='address-label'>地址</label></view>
<view class="textarea-wrp">
<span wx:if="{{memberInfo.address}}">{{memberInfo.address}}</span>
<textarea wx:if="{{!memberInfo.address}}" bindblur="bindTextAreaBlur" name="address" auto-height maxlength='30'/>
<textarea wx:if="{{!memberInfo.address}}" bindblur="bindTextAreaBlur" placeholder="请填写真实收件地址" name="address" auto-height maxlength='30'/>
</view>
</view>
</view>
......
src/pages/memberOfOwn/memberOfOwn.wxss
/* pages/userCenter.wxss */
@import './../../base/base.wxss';
.textarea-wrp {
padding-left: 46rpx;
}
.own-content{
padding: 60rpx 50rpx 0;
padding: 30rpx 50rpx 0;
}
.user-info{
position: relative;
......@@ -28,19 +31,23 @@
padding: 37rpx 46rpx;
}
.user-avatar{
width: 100rpx;
height: 100rpx;
width: 90rpx;
height: 90rpx;
overflow:hidden;
border-radius: 50%;
display: inline-block;
margin-right: 18rpx;
margin-left: 30rpx;
}
.userinfo-nickname {
font-size: 28rpx;
color:#333;
}
.user-name-content{
display: inline-block;
}
.user-name{
margin-bottom: 25rpx;
margin-bottom: 11rpx;
}
.icon-edit{
width: 28rpx;
......@@ -90,11 +97,15 @@
.form-label,.form-input,.form-picker{
display: inline-block;
vertical-align: middle;
font-size:26rpx;
}
.form-label{
width: 150rpx;
}
.form-label, .address-label {
color: #333;
}
.btn-primary{
width: 650rpx;
margin-top: 100rpx;
......@@ -107,6 +118,9 @@
border-bottom: 1px solid #ccc;
padding: 30rpx 0;
}
.form-picker-section .form-label{
vertical-align: top;
}
.birthday-desc{
color: red;
font-size: 20rpx;
......@@ -126,11 +140,12 @@
width: 100%;
margin-bottom: 60rpx;
display: flex;
padding-top: 10rpx;
}
textarea {
width:280px;
padding: 25rpx 0;
padding: 33rpx 0;
margin-right: 20rpx;
}
......@@ -156,3 +171,4 @@ canvas{
top: 20rpx;
left: 70rpx;
}
src/pages/mySpend/mySpend.js
......@@ -26,8 +26,9 @@ wxService.page({
*/
onShow: function () {
// const { orderNo } = this.options
const orderNo = '700000000013545'
// 取会员id
const {memberId} = wx.getStorageSync('_baseUserInfo')
const orderNo = memberId
if(orderNo){
this.initOrderList(this.data.pageNo,this.data.pageSize,orderNo)
}
......@@ -36,7 +37,6 @@ wxService.page({
const { orderNo } = e.currentTarget.dataset
// pages/consumptionDetails/consumptionDetails
wxService.router(`/pages/consumptionDetails/consumptionDetails?orderNo=${orderNo}`)
},
//获取消费列表
initOrderList(pageNo,pageSize,orderNo){
......
src/project.config.json
......@@ -39,7 +39,7 @@
"list": []
},
"miniprogram": {
"current": 4,
"current": 14,
"list": [
{
"id": -1,
......@@ -62,7 +62,7 @@
{
"id": 3,
"name": "券码详情页",
"pathName": "pages/couponDetail/couponDetail",
"pathName": "pages/couponCodeDetail/couponCodeDetail",
"query": "cardno=24390355190533807720&title=新券"
},
{
......@@ -124,6 +124,12 @@
"name": "外卖",
"pathName": "pages/deliveryService/deliveryService",
"query": ""
},
{
"id": -1,
"name": "优惠券详情",
"pathName": "pages/couponDetail/couponDetail",
"query": "cardno=60022785092189546586"
}
]
}
......
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