Skip to content

7
7-Eleven
Commit 73af0c8c by 赵雅纹
Options

Merge branch 'dev' into feature-zyw

parents 3fe0e702 d6efa3aa
Showing with 131 additions and 70 deletions
src/app.js
......@@ -28,7 +28,7 @@ App({
if (res.windowHeight > 750) config.isAllScreen = true;
config.systemHeight = res.windowHeight;
console.log('config', config)
// console.log('config', config)
} catch (e) {
console.log(e);
}
......@@ -62,8 +62,18 @@ App({
baseUserInfo.wechatCardId = card_id
baseUserInfo.wechatCode = code
wx.setStorageSync('_baseUserInfo',baseUserInfo)
}
// 711_授权字体
wx.loadFontFace({
family: 'iconfont-711',
source: 'url("https://crm-b.bigaka.com/static/font/FZY3JW.TTF")',
success: function (res) {
console.log(res.status) // loaded
},
fail: function (res) {
console.log(res.status) // error
}
})
},
onHide: function () {
......@@ -103,6 +113,7 @@ App({
loginFirst: false,
imageUrl:"", //图片地址
isFullSucreen: false, // 当前设备是否为 FullSucreen
brandId:2005
brandId: 2005,
// brandId: 1001,
}
})
src/app.wxss
......@@ -7,4 +7,6 @@
justify-content: space-between;
padding: 200rpx 0;
box-sizing: border-box;
}
}
src/codeUtils/barcode.js
var CHAR_TILDE = 126;
var CODE_FNC1 = 102;
var SET_STARTA = 103;
var SET_STARTB = 104;
var SET_STARTC = 105;
......
src/component/imageSwiper/imageSwiper.js
......@@ -21,7 +21,7 @@ Component({
*/
data: {
imgUrls: [],
indicatorDots: true,
indicatorDots: false,
autoplay: true,
interval: 5000,
duration: 1000,
......
src/component/imageSwiper/imageSwiper.wxss
/* component/imageSwiper/imageSwiper.wxss */
swiper{
height: 374rpx;
height: 420rpx;
}
swiper image{
width: 100%;
height:100%;
border-radius:7rpx;
}
swiper-item{
......
src/component/personCenter/personCenter.js
......@@ -27,7 +27,7 @@ Component({
memberActivateStatus: false,
integralNum: 0,
couponNum: 0,
baseUrl:'/assets/imgs/user-bg.png',
baseUrl: '/assets/imgs/0606.png',
isAuthorization: false
},
attached () {
......
src/component/personCenter/personCenter.wxml
<!--component/personCenter/personCenter.wxml-->
<view class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">
<button type="primary" plain='false' wx:if='{{!memberActivateStatus}}' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
<!--<view wx:if='{{!memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{'background-image: url(../../assets/imgs/user-bg.png)'}}">
<button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
</view>-->
<view wx:if='{{!memberActivateStatus}}' class="member-unActive">
<text class="un-active-btn" bindtap="handleTtoActiveMemebr">激活立享会员特权</text>
</view>
<view wx:if='{{memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">
<!-- <button type="primary" plain='false' wx:if='{{!memberActivateStatus}}' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>-->
<view class='user-info' wx:if='{{memberActivateStatus}}'>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
......@@ -9,13 +17,13 @@
<view class='user-name'>
<open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data>
<navigator url='/pages/memberOfOwn/memberOfOwn' style='display:inline-block' hover-class="none">
<image class='icon-edit' src='/assets/imgs/icon-edit.png'></image>
<image class='icon-edit' src='/assets/imgs/711_12.png'></image>
</navigator>
</view>
<view class='user-id'>{{memberCardNo}}</view>
</view>
<view class='qr-code pr'>
<image src='/assets/imgs/qr-code.png' bindtap="handleGoWxCard"></image>
<image src='/assets/imgs/711_11.png' bindtap="handleGoWxCard"></image>
</view>
</view>
</view>
......
src/component/personCenter/personCenter.wxss
......@@ -3,7 +3,7 @@
.user-content{
height: 92rpx;
/* width: 598rpx; */
padding: 37rpx 46rpx;
padding: 28rpx 35rpx 0 50rpx;
box-sizing: border-box;
}
.activation-content{
......@@ -15,7 +15,7 @@
box-shadow: 0 0 40rpx 1rpx #ccc;
}
.point{
padding:36rpx 0 25rpx 0;
padding: 0 0 25rpx 0;
}
.person-detail {
margin-top: 10rpx;
......@@ -61,13 +61,14 @@
}
.user-name{
margin-bottom: 25rpx;
margin-bottom: 12rpx;
}
.icon-edit{
width: 28rpx;
height: 28rpx;
vertical-align: middle;
margin-left: 8rpx;
margin-left: 34rpx;
color: #fff;
}
.user-id{
color: #666666;
......@@ -81,4 +82,31 @@
border-right: 1px solid #c8c9c9;
padding: 0 0 5rpx 0;
box-sizing: border-box;
}
.userinfo-nickname,.user-id {
color: #fff;
}
.user-info {
position: relative;
}
.user-name-content {
position: absolute;
top: 7rpx;
}
.member-unActive{
margin: 18rpx 0;
background-color: rgb(11, 170, 52);
color: #FFF;
text-align: center;
height: 100rpx;
line-height: 100rpx;
border-radius: 6rpx;
font-size: 30rpx;
font-weight: 700;
letter-spacing:2rpx;
}
.un-active-btn{
font-family:"iconfont-711" !important;
}
\ No newline at end of file
src/pages/IntegralMall/IntegralMall.js
......@@ -50,6 +50,19 @@ wxService.page({
}).finally(() => {
wx.hideLoading();
})
// 查询所有生效中的活动
// wxService.get(`/coupon/pointsRedemptionCouponSetting/getAllValid`).then(res => {
// const {result,data} = res.data
// if(result == 0){
// wx.hideLoading()
// this.setData({
// })
// }
// }).finally(() => {
// wx.hideLoading();
// })
},
//立即兑换
exchange(e){
......
src/pages/consumptionDetails/consumptionDetails.js
......@@ -44,7 +44,6 @@ wxService.page({
wx.showLoading({
title: '加载中'
})
// brandId dev_1002 711_2005
wxService.get(`/sale/order/findByOrderNo?orderNo=${orderNo}&brandId=${app.globalData.brandId}`).then(res => {
const {result,data} = res.data
if(result == 0){
......
src/pages/couponCodeDetail/couponCodeDetail.js
......@@ -23,8 +23,6 @@ wxService.page({
cardno
})
this.getCouponDetail(cardno)
// 条形码
wxbarcode.barcode('barcode', cardno, 600, 180);
},
// 查询单个优惠券
......@@ -35,10 +33,12 @@ wxService.page({
wxService.post(`/coupon/coupon/get?cardNo=${cardno}`).then(res => {
const {result,data} = res.data
if(result == 0){
wx.hideLoading()
wx.hideLoading()
this.setData({
codeDetail: data
})
// 条形码
wxbarcode.barcode('barcode', cardno, 600, 180);
} else {
wx.hideLoading()
wx.showToast({
......
src/pages/coupons/coupons.js
......@@ -113,7 +113,8 @@ wxService.page({
if(result == 0){
wx.hideLoading()
// 处理时间显示
data.content.forEach(item=> {
if(!data.content) return false
data.content.forEach(item=> {
item.startTime = item.startTime.substring(0,10)
item.endTime = item.endTime.substring(0,10)
})
......
src/pages/deliveryService/deliveryService.js
......@@ -54,7 +54,6 @@ wxService.page({
wx.showLoading({
title: '加载中'
})
// brandId 1001 2005
wxService.post(`/merchant/modelPage/getDetailById?pageId=4&brandId=${app.globalData.brandId}`).then(res => {
const {result,data} = res.data
if(result == 0){
......
src/pages/memberOfOwn/memberOfOwn.js
......@@ -10,23 +10,29 @@ wxService.page({
* 页面的初始数据
*/
data: {
sexArray:[
{
id:'1',
name:'女'
},{
id:'2',
name:'男'
}
],
sexIndex: 0,
date:'',
focus: false,
memberCardNo: '',
memberInfo: {},
memberId: ''
memberId: '',
array: ['男', '女'],
objectArray: [
{
id: 0,
name: '男'
},
{
id: 1,
name: '女'
}
],
index: 0,
},
bindPickerChange (e) {
this.setData({
index: e.detail.value
})
},
/**
* 生命周期函数--监听页面加载
*/
......@@ -50,21 +56,19 @@ wxService.page({
},
formSubmit(e) {
// 生日 0 女 1 男
// 生日 0 男 1 女
const { birthday } = this.data.memberInfo
if(birthday) {
e.detail.value.birthday = birthday
}
if(e.detail.value.sex == '0'){
e.detail.value.sex = '女'
} else {
if(this.data.index == 0){
e.detail.value.sex = '男'
} else {
e.detail.value.sex = '女'
}
// e.detail.value.sex = e.detail.value.sex == '0' ? '女': '男'
const params = e.detail.value
// 保存接口
this.handelMemberUplate(params)
console.log('form发生了submit事件，携带数据为：', e.detail.value, params)
},
// 会员详情
getMemberFind(){
......@@ -79,8 +83,10 @@ wxService.page({
if (result == 0) {
wx.hideLoading()
data.member.birthday = data.member.birthday.substring(0,10)
data.member.sex = data.member.sex == '男'? 0 : 1
this.setData({
memberInfo: data.member
memberInfo: data.member,
index: data.member.sex
})
}
})
......@@ -110,12 +116,6 @@ wxService.page({
bindTextAreaBlur: function(e) {
console.log(e.detail.value)
},
//性别选择
bindSexChange(e){
this.setData({
sexIndex: e.detail.value
})
},
//日期选择
bindDateChange(e) {
......
src/pages/memberOfOwn/memberOfOwn.wxml
......@@ -2,7 +2,7 @@
<view class='page-memberOfOwn'>
<view class='own-content'>
<view class='user-info'>
<image class='own-bg' src='/assets/imgs/seven-bg.png'></image>
<image class='own-bg' src='/assets/imgs/711_08.png'></image>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
</view>
......@@ -13,7 +13,7 @@
<view class='user-id'>{{memberCardNo}}</view>
</view>
<view class='qr-code pr'>
<image src='/assets/imgs/qr-code.png' bindtap='handleGoWxCard'></image>
<image src='/assets/imgs/711_11.png' bindtap='handleGoWxCard'></image>
</view>
</view>
<view class='user-qr-code'>
......@@ -36,11 +36,11 @@
</view>
<view class='form-section'>
<label class='form-label'>性别</label>
<picker bindchange="bindSexChange" value="{{sexIndex}}" name="sex" range="{{sexArray}}" range-key="name" class='form-picker'>
<view class="picker">
{{memberInfo.sex ? memberInfo.sex : '请选择性别'}}
</view>
</picker>
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<view class="picker">
{{array[index]}}
</view>
</picker>
</view>
<view class='form-picker-section'>
<label class='form-label'>生日</label>
......
src/pages/memberOfOwn/memberOfOwn.wxss
......@@ -9,17 +9,18 @@
.user-info{
position: relative;
width: 650rpx;
height: 260rpx;
height: 298rpx;
box-shadow: 0 0 40rpx 1rpx #ccc;
border-radius: 7rpx;
padding-top: 30rpx;
box-sizing:border-box;
}
.picker {
color: rgb(119, 119, 119);
}
.own-bg{
width: 650rpx;
height: 290rpx;
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
......@@ -38,16 +39,17 @@
display: inline-block;
margin-right: 18rpx;
margin-left: 30rpx;
/* margin-top:-6rpx; */
}
.userinfo-nickname {
font-size: 28rpx;
color:#333;
color:#FFF;
}
.user-name-content{
display: inline-block;
}
.user-name{
margin-bottom: 11rpx;
margin-bottom: 10rpx;
}
.icon-edit{
width: 28rpx;
......@@ -56,13 +58,14 @@
margin-left: 8rpx;
}
.user-id{
color: #666666;
color: #FFF;
font-size: 24rpx;
}
.qr-code image{
width: 50rpx;
height: 50rpx;
margin-right: 36rpx
margin-right: 31rpx;
margin-top:15rpx;
}
.user-qr-code{
background-color: #ffffff;
......
src/pages/userCenter/userCenter.js
......@@ -137,7 +137,6 @@ wxService.page({
wx.showLoading({
title: '加载中'
})
// 1001 2005
wxService.post(`/merchant/modelPage/getDetailById?pageId=3&brandId=${app.globalData.brandId}`).then(res => {
const {result,data} = res.data
if(result == 0){
......
src/pages/userCenter/userCenter.wxss
......@@ -50,6 +50,9 @@ page {
.footer-text{
color: #ffffff;
font-size: 32rpx;
font-weight: 700;
letter-spacing:2rpx;
font-family:"iconfont-711" !important;
}
.footer-arrow {
......
src/project.config.json
......@@ -37,7 +37,7 @@
"list": []
},
"miniprogram": {
"current": 3,
"current": -1,
"list": [
{
"id": -1,
......@@ -82,12 +82,6 @@
"query": "id=585873719780577280"
},
{
"id": 7,
"name": "welcome",
"pathName": "pages/welcome/welcome",
"query": ""
},
{
"id": 8,
"name": "我的卡券",
"pathName": "pages/coupons/coupons",
......
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