Skip to content

7
7-Eleven
Commit b98b5dd9 by 赵雅纹
Options

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

parents ebe9d5be 0c2bad3b
Showing with 263 additions and 325 deletions
src/app.wxss
/**app.wxss**/ /**app.wxss**/
page {
width: 100%;
box-sizing: border-box;
/* background-color: #f2f4f7; */
font-size: 30rpx;
font-family:"iconfont-711" !important;
}
.container { .container {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 200rpx 0; padding: 200rpx 0;
box-sizing: border-box; box-sizing: border-box;
} }
/* 主题色 */ /* 主题色 */
.theme-color{ .theme-color {
background-color: #CB3C3C; background-color: #cb3c3c;
} }
.theme-text-color{ .theme-text-color {
color: #CB3C3C; color: #cb3c3c;
} }
/* 按钮样式 */ /* 按钮样式 */
.btn{ .btn {
width: 100%; width: 100%;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
border-radius: 0; border-radius: 0;
} }
.btn:active{ .btn:active {
opacity: 0.5; opacity: 0.5;
} }
.btn-default{ .btn-default {
background: none; background: none;
color: #808080; color: #808080;
border: 1px solid #808080; border: 1px solid #808080;
} }
.btn-primary{ .btn-primary {
background-color: #CB3C3C; background-color: #cb3c3c;
color: #ffffff; color: #ffffff;
border: 1px solid #CB3C3C; border: 1px solid #cb3c3c;
font-size: 25rpx; font-size: 25rpx;
} }
.btn-gray{ .btn-gray {
background-color: #959595; background-color: #959595;
color: #ffffff; color: #ffffff;
border: 1px solid #959595; border: 1px solid #959595;
font-size: 25rpx; font-size: 25rpx;
} }
.btn-outline{ .btn-outline {
background: none; background: none;
color: #CB3C3C; color: #cb3c3c;
} }
/* 按钮大小 */ /* 按钮大小 */
.btn-xs{ .btn-xs {
height: 39rpx; height: 39rpx;
line-height: 39rpx; line-height: 39rpx;
} }
.btn-sm{ .btn-sm {
height: 46rpx; height: 46rpx;
line-height: 46rpx; line-height: 46rpx;
} }
.btn-lg{ .btn-lg {
height: 88rpx; height: 88rpx;
line-height: 88rpx; line-height: 88rpx;
}
.fixed-bottom0 {
position: fixed;
bottom: 0;
width: 100%;
z-index: 9999;
} }
.pr {
float: right;
}
.df {
display: flex;
align-items: center;
justify-content: center;
}
/*文字居中*/
.tc {
text-align: center;
}
.df-1 {
flex: 1;
}
src/component/announcement/announcement.wxml
<!--component/announcement/announcement.wxml--> <!--component/announcement/announcement.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" /> <wxs src="../../wxs/utils.wxs" module="utils" />
<view class="announcement" style="background-color:{{notice.backgroundColor}}" data-redirectId="{{notice.redirectId}}" bindtap="handelToAnn">
<view class="announcement df" style="background-color:{{notice.backgroundColor}}" data-redirectId="{{notice.redirectId}}" bindtap="handelToAnn">
<view class="horn"> <view class="horn">
<image class="img" src="{{notice.iconImageUrl? utils.formateUrl(notice.iconImageUrl,baseImgUrl) : '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" /> <image class="img" src="{{notice.iconImageUrl? utils.formateUrl(notice.iconImageUrl,baseImgUrl) : '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" />
<!--<image class="img" src="{{notice.iconImageUrl? 'notice.iconImageUrl': '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" />--> <!--<image class="img" src="{{notice.iconImageUrl? 'notice.iconImageUrl': '/assets/imgs/7_1_0/notice.png'}}" mode="widthFix" />-->
......
src/component/announcement/announcement.wxss
/* component/announcement/announcement.wxss */ /* component/announcement/announcement.wxss */
@import './../../base/base.wxss';
.announcement { .announcement {
height: 58rpx; height: 58rpx;
margin: 20rpx; margin: 20rpx;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
display: flex;
align-items: center;
justify-content: center;
} }
.text { .text {
overflow: hidden; overflow: hidden;
...@@ -15,7 +18,6 @@ ...@@ -15,7 +18,6 @@
color: rgba(102, 102, 102, 1); color: rgba(102, 102, 102, 1);
font-size: 22rpx; font-size: 22rpx;
text-align: left; text-align: left;
font-family: PingFangSC-Regular;
} }
.horn { .horn {
width: 50rpx; width: 50rpx;
......
src/component/bottomTabs/bottomTabs.wxss
/* component/bottomTabs/bottomTabs.wxss */ /* component/bottomTabs/bottomTabs.wxss */
@import './../../base/base.wxss'; /* @import './../../base/base.wxss'; */
@import "/app.wxss";
.bottom-tab { .bottom-tab {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.tab-img { .tab-img {
/* width: 50rpx;
height: 50rpx; */
width: 70rpx; width: 70rpx;
height: 70rpx; height: 70rpx;
} }
.tab { .tab {
flex: 1; flex: 1;
} }
.btn-tab,.tab { .btn-tab .tab {
height: 100%; height: 100%;
} }
.bgc { .bgc {
...@@ -30,7 +29,3 @@ ...@@ -30,7 +29,3 @@
.pdt { .pdt {
padding-top: 50rpx; padding-top: 50rpx;
} }
/* .btn-tab {
display: flex;
justify-content: center;
} */
\ No newline at end of file
src/component/goHome/goHome.wxml
<!--component/goHome/goHome.wxml--> <!--component/goHome/goHome.wxml-->
<view class="bottom-img df" bindtap="handelGoHome"> <view class="bottom-img" bindtap="handelGoHome">
<text>首页</text> <text>首页</text>
<!--<image class="img-top" mode="widthFix" src="/assets/imgs/7_1_0/go-top.png"></image>--> <!--<image class="img-top" mode="widthFix" src="/assets/imgs/7_1_0/go-top.png"></image>-->
</view> </view>
\ No newline at end of file
src/component/goHome/goHome.wxss
/* component/goHome/goHome.wxss */ /* component/goHome/goHome.wxss */
@import './../../base/base.wxss';
.bottom-img{ .bottom-img{
display: flex;
align-items: center;
justify-content: center;
position: fixed; position: fixed;
bottom: 143rpx; bottom: 143rpx;
right: 25rpx; right: 25rpx;
......
src/component/hotItem/hotItem.js deleted 100644 → 0
// component/hotItem/hotItem.js
var app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
Component({
/**
* 组件的属性列表
*/
properties: {
},
attached () {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
src/component/hotItem/hotItem.json deleted 100644 → 0
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/hotItem/hotItem.wxml deleted 100644 → 0
<!--component/hotItem/hotItem.wxml-->
<view class="hot-item border_box">
<view class="hot-img-box">
<image class="hot-img" src="./../../assets/imgs/7_1_0/scancode.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="hot-item-desc border_box">
<view class="item-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
<view class="item-vip-price weui-flex">
<view class="">
<image
class="item-vip"
src="./../../assets/imgs/7_1_0/vip.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</view>
<text class="vip-sale-price border_box">￥189</text>
<text class="vip-original-price">￥189</text>
</view>
<view class="item-plus-price weui-flex">
<view class="">
<image
class="item-plus"
src="./../../assets/imgs/7_1_0/plus.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</view>
<text class="vip-plus-price vip-sale-price border_box">￥158</text>
</view>
<view class="buy-btn">
<button class="buy">立即购买</button>
</view>
<view/>
</view>
</view>
src/component/hotItem/hotItem.wxss deleted 100644 → 0
/* component/hotItem/hotItem.wxss */
@import './../../base/base.wxss';
.hot-item {
display: flex;
padding: 28rpx;
width: 710rpx;
height: 236rpx;
border-radius: 10px;
margin: 0 auto;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.05);
}
.hot-img {
width: 180rpx;
height: 180rpx;
}
.hot-item-desc {
margin-left: 28rpx;
}
.item-name {
overflow: hidden;
white-space: nowrap;
width: 440rpx;
height: 30rpx;
color: rgba(0, 0, 0, 1);
font-size: 22rpx;
text-align: left;
font-family: PingFangSC-Light;
padding: 10rpx 0 20rpx 0;
}
.item-vip,
.item-plus {
width: 88rpx;
height: 30rpx;
border-radius: 3rpx;
background-color: #fff;
}
.item-plus-price,
.item-vip-price{
display: flex;
height: 45rpx;
color: rgba(51, 51, 51, 1);
font-size: 32rpx;
font-family: PingFangSC-Medium;
flex-direction: row;
align-items: baseline;
}
.vip-sale-price {
padding: 0 10rpx;
}
.vip-original-price {
width: 62rpx;
color: rgba(170, 170, 170, 1);
font-size: 22rpx;
font-family: PingFangSC-Regular;
text-decoration: line-through;
}
.vip-plus-price {
color: rgba(203, 60, 60, 1);
}
.buy-btn {
text-align: right;
}
.buy {
display: inline-block;
width: 125rpx;
height: 39rpx;
line-height: 35rpx;
border-radius: 19rpx;
text-align: center;
background-color: rgba(203, 60, 60, 1);
border: 2rpx solid rgba(151, 151, 151, 1);
color: rgba(255, 255, 255, 1);
font-size: 18rpx;
font-family: PingFangSC-Regular;
}
src/component/html2wxml/wxHtml.wxss
/* component/html2wxml/wxHtml.wxss */ /* component/html2wxml/wxHtml.wxss */
@import '../../wxParser/index.wxss'; @import '../../wxParser/index.wxss';
.wxParser image { /* .wxParser image {
width:100%; width:100%;
} } */
\ No newline at end of file \ No newline at end of file
src/component/iconSwiper/iconSwiper.wxml
<!--component/iconSwiper/iconSwiper.wxml--> <!--component/iconSwiper/iconSwiper.wxml-->
<view class="df"> <view class="icon-swiper">
<block wx:for="{{icons}}" wx:key="{{item}}"> <block wx:for="{{icons}}" wx:key="{{item}}">
<view class="icon-box border_box"> <view class="icon-box border_box">
<view class=""> <view class="">
......
src/component/iconSwiper/iconSwiper.wxss
/* component/iconSwiper/iconSwiper.wxss */ /* component/iconSwiper/iconSwiper.wxss */
@import './../../base/base.wxss'; /* @import './../../base/base.wxss'; */
.icon-swiper {
display: flex;
align-items: center;
justify-content: center;
}
.icon-box { .icon-box {
width: 25%; width: 25%;
text-align: center; text-align: center;
......
src/component/personCenter/personCenter.wxml
<!--component/personCenter/personCenter.wxml--> <!--component/personCenter/personCenter.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" /> <wxs src="../../wxs/utils.wxs" module="utils" />
<view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr"> <view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<image src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}" class="no-active-img" mode="widthFix"></image> <image src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}" class="no-active-img" mode="widthFix" />
</view> </view>
<view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ baseImgUrl +''+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}"> <view
<view class='user-info' wx:if='{{currentMobile}}'> wx:if='{{currentMobile}}'
<view class="user-avatar"> catchtap="handleToMemberOfOwn"
<open-data type="userAvatarUrl"></open-data> class="activation-content activation-bg {{true ? 'user-content' : ''}}"
</view> style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}"
<view class='user-name-content'> >
<view class='user-name'> <view class='user-info' wx:if='{{currentMobile}}'>
<!-- 1 浅色 2 黑色--> <view class="user-avatar">
<open-data type="userNickName" style="color:{{personCenter.fontColor == 2? '#000' : '#fff'}};" class="userinfo-nickname" lang="zh_CN"></open-data> <open-data type="userAvatarUrl" />
</view> </view>
<view class='user-id' style="color:{{personCenter.fontColor == 2? '#000' : '#fff'}};">{{memberCardNo}}</view> <view class='user-name-content'>
</view> <view class='user-name'>
<!-- 1 浅色 2 黑色-->
<open-data
type="userNickName"
style="color:{{personCenter.fontColor == 2? '#000' : '#fff'}};"
class="userinfo-nickname"
lang="zh_CN"
/>
</view>
<view class='user-id' style="color:{{personCenter.fontColor == 2? '#000' : '#fff'}};">{{memberCardNo}}</view>
</view>
<view class='qr-code pr'>
<image class="qr-code-img" src='/assets/imgs/711_11.png' />
</view>
</view>
</view>
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
</view>
<view class='df-1 point' bindtap="toCouponList" wx:if="{{personCenter.coupon == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{couponNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">优惠券</view>
</view>
</view>
<!--plus-->
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<!--plus-->
</view>
<authorization-modal isAuthorization='{{isAuthorization}}' />
<view class='qr-code pr'>
<image src='/assets/imgs/711_11.png'></image>
</view>
</view>
</view>
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
</view>
<view class='df-1 point' bindtap="toCouponList" wx:if="{{personCenter.coupon == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{couponNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">优惠券</view>
</view>
</view>
<authorization-modal isAuthorization='{{isAuthorization}}'/>
src/component/personCenter/personCenter.wxss
/* component/personCenter/personCenter.wxss */ /* component/personCenter/personCenter.wxss */
@import './../../base/base.wxss'; /* @import './../../base/base.wxss'; */
@import "/app.wxss";
.user-content{ .user-content{
height: 92rpx; height: 92rpx;
padding: 28rpx 35rpx 0 50rpx; padding: 28rpx 35rpx 0 50rpx;
...@@ -12,9 +14,10 @@ ...@@ -12,9 +14,10 @@
margin: 18rpx 0; margin: 18rpx 0;
border-radius: 7rpx; border-radius: 7rpx;
box-shadow: 0 0 40rpx 1rpx #ccc; box-shadow: 0 0 40rpx 1rpx #ccc;
margin: 0 auto;
} }
.person-num { .person-num {
margin-bottom: 20rpx; margin: 20rpx 0;
} }
.person-detail { .person-detail {
margin-top: 10rpx; margin-top: 10rpx;
...@@ -117,7 +120,7 @@ ...@@ -117,7 +120,7 @@
right: 0; right: 0;
top: 6rpx; top: 6rpx;
} }
.qr-code>image{ .qr-code .qr-code-img{
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
} }
\ No newline at end of file
src/component/plus/plus.js
// component/plus/plus.js // component/plus/plus.js
const app = getApp()
const wxService = require('../../utils/wxService') const wxService = require('../../utils/wxService')
const utils = require('../../utils/util') const utils = require('../../utils/util')
...@@ -11,34 +12,58 @@ Component({ ...@@ -11,34 +12,58 @@ Component({
type: Array, type: Array,
value: [], value: [],
}, },
plusBgi:{ plusBgi: {
type: Object, type: Object,
value: null value: null
}, },
currentHasUserInfo:{ currentHasUserInfo: {
type: Boolean, type: Boolean,
type: false type: false
} }
}, },
ready() {
this.getPlusPurchase()
},
/** /**
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
currentTab:'999', currentTab: '999',
currentPrice:0 currentPrice: 0
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
*/ */
methods: { methods: {
// 获取plus购买信息
getPlusPurchase() {
wx.showLoading({
title: '加载中'
})
wxService.request({
url: app.globalData.ctx + '/sale/premium/query',
header: {
'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
},
success: (res) => {
const { result, data } = res.data
if (result == 0) {
this.setData({
skuVOList: data
})
}
wx.hideLoading()
}
})
},
_getUserInfo(res = {}) { _getUserInfo(res = {}) {
const userInfo = res.detail || {} const userInfo = res.detail || {}
console.log('userInfo',userInfo) console.log('userInfo', userInfo)
// 先授权再领卡 // 先授权再领卡
if (res.detail.userInfo) { if (res.detail.userInfo) {
utils.getUserInfoByBtn(userInfo).then( (data = {} ) => { utils.getUserInfoByBtn(userInfo).then((data = {}) => {
const {token} = data const { token } = data
wx.setStorageSync('_accreditUserInfo', userInfo) wx.setStorageSync('_accreditUserInfo', userInfo)
wx.hideNavigationBarLoading() wx.hideNavigationBarLoading()
if (token) { if (token) {
...@@ -48,7 +73,7 @@ Component({ ...@@ -48,7 +73,7 @@ Component({
} }
wx.setStorageSync('_baseUserInfo', data) // 缓存用户信息 wx.setStorageSync('_baseUserInfo', data) // 缓存用户信息
this.setUserInfo() // 判断有无开卡 this.setUserInfo() // 判断有无开卡
}).catch(err=> { }).catch(err => {
if (err) { if (err) {
wx.showToast({ wx.showToast({
title: `会员系统异常请稍后重试!`, title: `会员系统异常请稍后重试!`,
...@@ -58,14 +83,14 @@ Component({ ...@@ -58,14 +83,14 @@ Component({
}) })
} }
}, },
setUserInfo () { setUserInfo() {
const userInfo = wx.getStorageSync('_baseUserInfo') const userInfo = wx.getStorageSync('_baseUserInfo')
// 新用户去激活领卡 // 新用户去激活领卡
if (userInfo && userInfo.member && !userInfo.member.mobile) { if (userInfo && userInfo.member && !userInfo.member.mobile) {
console.log('去开') console.log('去开')
wxService.openCard() wxService.openCard()
return false return false
}else { } else {
console.log('已开') console.log('已开')
} }
// 跳转 // 跳转
...@@ -84,7 +109,7 @@ Component({ ...@@ -84,7 +109,7 @@ Component({
} }
}, 200) }, 200)
}, },
switchNav(e){ switchNav(e) {
console.log(e) console.log(e)
this.setData({ this.setData({
currentTab: e.currentTarget.dataset.current, currentTab: e.currentTarget.dataset.current,
...@@ -93,7 +118,7 @@ Component({ ...@@ -93,7 +118,7 @@ Component({
}) })
}, },
payPlus() { payPlus() {
if (!this.data.id){ if (!this.data.id) {
wx.showToast({ wx.showToast({
title: '请先选择会员卡', title: '请先选择会员卡',
icon: 'none', icon: 'none',
...@@ -137,6 +162,6 @@ Component({ ...@@ -137,6 +162,6 @@ Component({
} }
}) })
}, },
} }
}) })
src/component/plus/plus.wxml
<!--component/plus/plus.wxml--> <!--component/plus/plus.wxml-->
<view class="plus-wrap" wx:if="{{skuList}}"> <view class="plus-wrap" wx:if="{{skuVOList}}">
<scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}"> <scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}">
<block <block
wx:for="{{skuList}}" wx:for="{{skuVOList}}"
wx:for-index="idx" wx:for-index="idx"
wx:for-item="navItem" wx:for-item="navItem"
wx:key="idx" wx:key="idx"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
bindgetuserinfo="_getUserInfo" bindgetuserinfo="_getUserInfo"
data-jflag="false" data-jflag="false"
open-type='getUserInfo' open-type='getUserInfo'
class='btn btn-primary' class='btn btn-primary pay-btn'
hover-class="btn-hover" hover-class="btn-hover"
> >
<text>立即支付</text> <text>立即支付</text>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</button> </button>
</block> </block>
<block wx:else> <block wx:else>
<button class="btn btn-primary" bindtap="payPlus"> <button class="btn btn-primary pay-btn" bindtap="payPlus">
<text>立即支付</text> <text>立即支付</text>
<text>￥{{currentPrice}}</text> <text>￥{{currentPrice}}</text>
</button> </button>
......
src/component/plus/plus.wxss
/* component/plus/plus.wxss */ /* component/plus/plus.wxss */
@import '../../base/base.wxss'; /* @import '../../base/base.wxss'; */
@import "/app.wxss"; @import "/app.wxss";
.plus-wrap { .plus-wrap {
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -28,14 +29,14 @@ ...@@ -28,14 +29,14 @@
background-repeat: no-repeat; background-repeat: no-repeat;
position: relative; position: relative;
} }
.poster-tips{ /* .poster-tips{
position: fixed; position: fixed;
bottom: 220rpx; bottom: 220rpx;
left: 33rpx; left: 33rpx;
} }
.poster-tips image{ .poster-tips image{
width: 362rpx; width: 362rpx;
} } */
.pay{ .pay{
height: 88rpx; height: 88rpx;
line-height: 88rpx; line-height: 88rpx;
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
flex-direction: row-reverse; flex-direction: row-reverse;
margin-right: 30rpx; margin-right: 30rpx;
} }
.pay button{ .pay .pay-btn{
width: 280rpx; width: 280rpx;
height: 52rpx; height: 52rpx;
line-height: 52rpx; line-height: 52rpx;
......
src/component/sharePoster/sharePoster.wxss
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
padding-top: 20rpx; padding-top: 20rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
.codeImg{ /* .codeImg{
text-align: center; text-align: center;
margin-top: 35px; margin-top: 35px;
} }
.codeImg image{ .codeImg image{
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
} } */
.shareCode{ .shareCode{
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
font-size: 32rpx; font-size: 32rpx;
padding-left: 50rpx; padding-left: 50rpx;
} }
.content_product{ /* .content_product{
width: 93%; width: 93%;
margin-left: auto; margin-left: auto;
margin-right:auto; margin-right:auto;
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
.content_product image{ .content_product image{
width: 630rpx; width: 630rpx;
height: 630rpx; height: 630rpx;
} } */
.footer-desc{ .footer-desc{
width: 93%; width: 93%;
margin-top: 30rpx; margin-top: 30rpx;
...@@ -123,13 +123,13 @@ ...@@ -123,13 +123,13 @@
font-size: 18rpx; font-size: 18rpx;
color: #5D5D5D; color: #5D5D5D;
} }
.border-code image{ /* .border-code image{
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
left: 70rpx; left: 70rpx;
z-index: 999; z-index: 999;
position:absolute; position:absolute;
} } */
.product-price{ .product-price{
padding-top: 50rpx; padding-top: 50rpx;
color: #D80122; color: #D80122;
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
width: 100%; width: 100%;
border-top: 1rpx solid #ddd; border-top: 1rpx solid #ddd;
} }
.saveposte image{ /* .saveposte image{
width: 100%; width: 100%;
} }
.close-poste{ .close-poste{
...@@ -177,8 +177,8 @@ ...@@ -177,8 +177,8 @@
height: 50rpx; height: 50rpx;
z-index: 9999; z-index: 9999;
border-radius: 50%; border-radius: 50%;
} }*/
.showImages{ .showImages{
position: absolute; position: absolute;
top: 0; top: 0;
width: 56rpx; width: 56rpx;
......
src/component/skuPopup/skuPopup.wxml
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<view class="spec-name">数量</view> <view class="spec-name">数量</view>
<view class="num-panel"> <view class="num-panel">
<button bindtap="minusNum">-</button> <button bindtap="minusNum">-</button>
<input value="{{proNum}}" type="number" bindblur="inputNum" /> <input class="num-panel-ipt" value="{{proNum}}" type="number" bindblur="inputNum" />
<button bindtap="addNum">+</button> <button bindtap="addNum">+</button>
</view> </view>
</view> </view>
......
src/component/skuPopup/skuPopup.wxss
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
border:none; border:none;
} }
.num-panel input { .num-panel .num-panel-ipt {
line-height: 44rpx; line-height: 44rpx;
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
......
src/component/tabSort/tabSort.wxss
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
} }
.scroll-view-right { .scroll-view-right {
width: 20%; width: 18%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
......
src/pages/my/my.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement", "announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention", "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal", "guide-page-modal": "/component/guidePageModal/guidePageModal",
......
src/pages/userCenter/userCenter.js
...@@ -90,9 +90,9 @@ wxService.page({ ...@@ -90,9 +90,9 @@ wxService.page({
isAuthorization: false isAuthorization: false
}, () => { }, () => {
// 积分数量 // 积分数量
// this.getMemberPointInfo() this.getMemberPointInfo()
// 优惠券数量 // 优惠券数量
// this.getMemberCouponInfo() this.getMemberCouponInfo()
}) })
} }
else if (!baseUserInfo && reLoginErrFlag) { else if (!baseUserInfo && reLoginErrFlag) {
...@@ -123,7 +123,7 @@ wxService.page({ ...@@ -123,7 +123,7 @@ wxService.page({
// }) // })
// } // }
// 获取plus购买信息 // 获取plus购买信息
this.getPlusPurchase() // this.getPlusPurchase()
// 获取手机信息 // 获取手机信息
wxService.getSystemInfo().then(res => { wxService.getSystemInfo().then(res => {
this.setData({ this.setData({
...@@ -138,7 +138,40 @@ wxService.page({ ...@@ -138,7 +138,40 @@ wxService.page({
}) })
} }
}, },
// 查询积分信息
getMemberPointInfo() {
wx.showLoading({
title: '加载中'
})
wxService.get(`/member/memberPoint/getMyPointInfo`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
this.setData({
integralNum: data && data.point || 0
})
}
}
})
},
// 查询优惠券数量
getMemberCouponInfo() {
wx.showLoading({
title: '加载中'
})
wxService.post(`/coupon/coupon/memberCouponCount`).then(res => {
if (res) {
const { result, data } = res && res.data
if (result == 0) {
wx.hideLoading()
this.setData({
couponNum: data && data[1] || 0
})
}
}
})
},
// page 信息 // page 信息
initPage(pageId) { initPage(pageId) {
this.setData({ this.setData({
...@@ -215,18 +248,18 @@ wxService.page({ ...@@ -215,18 +248,18 @@ wxService.page({
}, },
// 获取plus购买信息 // 获取plus购买信息
getPlusPurchase() { // getPlusPurchase() {
wxService.get(`/sale/premium/query`).then(res => { // wxService.get(`/sale/premium/query`).then(res => {
if(!res) return false // if(!res) return false
const { result, data } = res.data // const { result, data } = res.data
if (result == 0) { // if (result == 0) {
this.setData({ // this.setData({
skuVOList: data // skuVOList: data
}) // })
} // }
}).finally(() => { // }).finally(() => {
}) // })
}, // },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
......
src/pages/userCenter/userCenter.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement", "announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention", "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal", "guide-page-modal": "/component/guidePageModal/guidePageModal",
......
src/pages/userCenter/userCenter.wxml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<image-swiper image-data="{{pItem.rotationchart.images}}" /> <image-swiper image-data="{{pItem.rotationchart.images}}" />
</view> </view>
<view class="" wx:if="{{pItem.type == 2}}"> <view class="" wx:if="{{pItem.type == 2}}">
<person-center person-data="{{pItem.customer}}" /> <person-center base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
</view> </view>
<view class="" wx:if="{{pItem.type == 3}}"> <view class="" wx:if="{{pItem.type == 3}}">
<pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/> <pic-nav pic-nav="{{pItem.navigation.images}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}"/>
......
src/subPackage/page/pages/subPage/subPage.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement", "announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper", "icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd", "bannerAd": "/component/bannerAd/bannerAd",
"attention": "/component/attention/attention", "attention": "/component/attention/attention",
"guide-page-modal": "/component/guidePageModal/guidePageModal", "guide-page-modal": "/component/guidePageModal/guidePageModal",
......
src/utils/wxService.js
...@@ -165,12 +165,14 @@ class WXService extends Http { ...@@ -165,12 +165,14 @@ class WXService extends Http {
wechatInfo: null, wechatInfo: null,
brandId: app.globalData.brandId, brandId: app.globalData.brandId,
}).then(response => { }).then(response => {
let dataResp = response.data.data if (response) {
wx.setStorageSync('token', dataResp.token) let dataResp = response.data.data
wx.setStorageSync('_baseUserInfo', dataResp) wx.setStorageSync('token', dataResp.token)
return Promise.resolve({ wx.setStorageSync('_baseUserInfo', dataResp)
response return Promise.resolve({
}) response
})
}
}).catch(err => { }).catch(err => {
return Promise.reject(err) return Promise.reject(err)
}) })
......
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