Skip to content

7
7-Eleven
Commit 0d8051ed by 赵雅纹
Options

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

parents 81fd8ce3 b5c54889
Showing with 1352 additions and 59 deletions
src/app.js
...@@ -9,11 +9,9 @@ const envInfo = require('config/index').envInfo ...@@ -9,11 +9,9 @@ const envInfo = require('config/index').envInfo
App({ App({
onLaunch: function (e) { onLaunch: function (e) {
// this.checkFullSucreen()
// "navigationStyle": "custom" // "navigationStyle": "custom"
// 默认 false // 默认 false
wx.setStorageSync('reLoginErr', false) wx.setStorageSync('reLoginErr', false)
try { try {
let res = wx.getSystemInfoSync(); let res = wx.getSystemInfoSync();
config.pixelRate = res.windowWidth / 750; config.pixelRate = res.windowWidth / 750;
......
src/app.json
{ {
"pages": [ "pages": [
"pages/userCenter/userCenter", "pages/userCenter/userCenter",
"pages/home/home",
"pages/mySpend/mySpend", "pages/mySpend/mySpend",
"pages/memberOfOwn/memberOfOwn", "pages/memberOfOwn/memberOfOwn",
"pages/memberRules/memberRules", "pages/memberRules/memberRules",
...@@ -13,6 +14,10 @@ ...@@ -13,6 +14,10 @@
"pages/IntegralMall/IntegralMall", "pages/IntegralMall/IntegralMall",
"pages/integralMallDetail/integralMallDetail", "pages/integralMallDetail/integralMallDetail",
"pages/activateCard/activateCardCallback", "pages/activateCard/activateCardCallback",
"pages/category/category",
"pages/shareNumber/shareNumber",
"pages/cart/cart",
"pages/my/my",
"component/bottom/bottom", "component/bottom/bottom",
"pages/wantToBuyDetail/wantToBuyDetail", "pages/wantToBuyDetail/wantToBuyDetail",
"component/buyImageSwiper/buyImageSwiper", "component/buyImageSwiper/buyImageSwiper",
...@@ -32,7 +37,36 @@ ...@@ -32,7 +37,36 @@
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat", "navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
},
"tabBar": {
"custom": true,
"list": [
{
"pagePath": "pages/userCenter/userCenter",
"text": "首页",
"iconPath": "assets/imgs/7_1_0/home_un.png",
"selectedIconPath": "assets/imgs/7_1_0/home.png"
},
{
"pagePath": "pages/category/category",
"text": "分类",
"iconPath": "assets/imgs/7_1_0/category_un.png",
"selectedIconPath": "assets/imgs/7_1_0/category.png"
},
{
"pagePath": "pages/cart/cart",
"text": "购物车",
"iconPath": "assets/imgs/7_1_0/cart_un.png",
"selectedIconPath": "assets/imgs/7_1_0/cart.png"
},
{
"pagePath": "pages/my/my",
"text": "我的",
"iconPath": "assets/imgs/7_1_0/my_un.png",
"selectedIconPath": "assets/imgs/7_1_0/my.png"
}
]
}, },
"navigateToMiniProgramAppIdList": [ "navigateToMiniProgramAppIdList": [
"wxeb490c6f9b154ef9", "wxeb490c6f9b154ef9",
......
src/app.wxss
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
page { page {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
background-color: #f2f4f7; /* background-color: #f2f4f7; */
font-size: 30rpx; font-size: 30rpx;
font-family:"iconfont-711" !important; font-family:"iconfont-711" !important;
} }
......
src/base/base.wxss
...@@ -1299,3 +1299,19 @@ a { ...@@ -1299,3 +1299,19 @@ a {
color: #09BB07; color: #09BB07;
white-space: nowrap; white-space: nowrap;
} }
button {
background-color: none;
border-radius:0;
padding: 0;
}
button::after{
border:none;
}
.button-hover{
background-color:none;
}
input{
outline:none;
border:none;
list-style: none;
}
\ No newline at end of file
src/component/announcement/announcement.js 0 → 100644
// component/announcement/announcement.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/announcement/announcement.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/announcement/announcement.wxml 0 → 100644
<!--component/announcement/announcement.wxml-->
<view class="announcement df">
<view class="horn">
<image class="img" src="./../../assets/imgs/7_1_0/notice.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<text class="text">公告公告公告公告公告公告公告公告公告公告公告公告公告公告公告公告公告</text>
</view>
src/component/announcement/announcement.wxss 0 → 100644
/* component/announcement/announcement.wxss */
@import './../../base/base.wxss';
.announcement {
height: 58rpx;
margin: 20rpx;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
}
.text {
overflow: hidden;
white-space: nowrap;
width: 616rpx;
height: 30rpx;
line-height: 30rpx;
color: rgba(102, 102, 102, 1);
font-size: 22rpx;
text-align: left;
font-family: PingFangSC-Regular;
}
.horn {
width: 50rpx;
}
.img {
width: 29rpx;
height: 22rpx;
}
src/component/bannerAd/bannerAd.js 0 → 100644
// component/bannerAd/bannerAd.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/bannerAd/bannerAd.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/bannerAd/bannerAd.wxml 0 → 100644
<!--component/bannerAd/bannerAd.wxml-->
<view class="banner-ad">
<image class="" src="./../../assets/imgs/7_1_0/banner+.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view>
src/component/bannerAd/bannerAd.wxss 0 → 100644
/* component/bannerAd/bannerAd.wxss */
.banner-ad {
margin: 0 auto;
width: 710rpx;
height: 155rpx;
border-radius: 10rpx;
background-color: rgba(246, 243, 242, 1);
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.05);
}
src/component/hotItem/hotItem.js 0 → 100644
// 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 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/hotItem/hotItem.wxml 0 → 100644
<!--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 0 → 100644
/* 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/iconSwiper/iconSwiper.js 0 → 100644
// component/iconSwiper/iconSwiper.js
var app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
Component({
/**
* 组件的属性列表
*/
properties: {
},
attached () {
},
/**
* 组件的初始数据
*/
data: {
icons: [
{
url: '',
text: '砍价拿'
},
{
url: '',
text: '砍价拿'
},
{
url: '',
text: '砍价拿'
},
{
url: '',
text: '砍价拿'
}
]
},
/**
* 组件的方法列表
*/
methods: {
}
})
src/component/iconSwiper/iconSwiper.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/iconSwiper/iconSwiper.wxml 0 → 100644
<!--component/iconSwiper/iconSwiper.wxml-->
<view class="df">
<block wx:for="{{icons}}" wx:key="{{item}}">
<view class="icon-box border_box">
<view class="">
<image
class="img"
src="./../../assets/imgs/7_1_0/icon.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</view>
<text class="text">{{item.text}}</text>
</view>
</block>
</view>
src/component/iconSwiper/iconSwiper.wxss 0 → 100644
/* component/iconSwiper/iconSwiper.wxss */
@import './../../base/base.wxss';
.icon-box {
width: 25%;
text-align: center;
padding: 30rpx 0;
}
.img {
width: 102rpx;
height: 111rpx;
}
.text {
height: 30rpx;
color: rgba(102, 102, 102, 1);
font-size: 22rpx;
text-align: left;
font-family: PingFangSC-Regular;
}
src/component/imageSwiper/imageSwiper.js
...@@ -24,8 +24,12 @@ Component({ ...@@ -24,8 +24,12 @@ Component({
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
imgUrls: [], imgUrls: [
indicatorDots: false, 'https://images.unsplash.com/photo-1551334787-21e6bd3ab135?w=640',
'https://images.unsplash.com/photo-1551214012-84f95e060dee?w=640',
'https://images.unsplash.com/photo-1551446591-142875a901a1?w=640'
],
indicatorDots: true,
autoplay: true, autoplay: true,
circular: true, circular: true,
interval: 5000, interval: 5000,
......
src/component/imageSwiper/imageSwiper.wxml
<!--component/imageSwiper/imageSwiper.wxml--> <!--component/imageSwiper/imageSwiper.wxml-->
<swiper <!--<swiper
indicator-dots="{{indicatorDots}}" indicator-dots="{{indicatorDots}}"
autoplay="{{autoplay}}" autoplay="{{autoplay}}"
interval="{{interval}}" interval="{{interval}}"
...@@ -7,11 +7,29 @@ ...@@ -7,11 +7,29 @@
circular="{{circular}}" circular="{{circular}}"
class="image-swiper" class="image-swiper"
> >
<block wx:for="{{imageData}}" wx:key="{{item}}"> <block wx:for="{{imgUrls}}" wx:key="{{item}}">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<image wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindtap='preview' class="slide-image" /> <image wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindtap='preview' class="slide-image" />
</swiper-item> </swiper-item>
</block> </block>
</swiper>-->
<swiper
class="image-swiper"
indicator-dots="{{indicatorDots}}"
autoplay="{{autoplay}}"
interval="{{interval}}"
circular="{{circular}}"
duration="{{duration}}"
>
<block wx:for="{{imgUrls}}" wx:key="{{item}}">
<swiper-item>
<image
src="{{item}}"
class="slide-image"
width="355"
height="150"
/>
</swiper-item>
</block>
</swiper> </swiper>
<authorization-modal isAuthorization='{{isAuthorization}}'/>
src/component/imageSwiper/imageSwiper.wxss
/* component/imageSwiper/imageSwiper.wxss */ /* component/imageSwiper/imageSwiper.wxss */
.image-swiper{ .image-swiper{
height: 420rpx; height: 320rpx;
} }
.swiper-item{ .swiper-item{
border-radius: 10rpx; border-radius: 10rpx;
height: 374rpx; height: 320rpx;
} }
.slide-image { .slide-image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius:7rpx;
} }
\ No newline at end of file
src/component/picNav/picNav.js
...@@ -29,7 +29,12 @@ Component({ ...@@ -29,7 +29,12 @@ Component({
isAuthorization: false, isAuthorization: false,
isAuthorizationActiveText: '', isAuthorizationActiveText: '',
isAuthorizationType: 2, isAuthorizationType: 2,
baseImgUrl: '' baseImgUrl: '',
picNavH: [{
url: ''
}, {
url: ''
}]
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
...@@ -96,7 +101,7 @@ Component({ ...@@ -96,7 +101,7 @@ Component({
wxService.openCard() wxService.openCard()
} }
} }
} else if(link.type == 6){ } else if (link.type == 6) {
wxService.router(`${currentClickType}`) wxService.router(`${currentClickType}`)
} }
}, },
......
src/component/picNav/picNav.wxml
<!--component/picNav/picNav.wxml--> <!--component/picNav/picNav.wxml-->
<!--<view class="pic-nav"> <view class="pic-nav">
<block wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item"> <block
<view class="nav-block" style="width: {{imagewidth}}px;height: {{imageheight}}px;"> wx:for="{{picNavH}}"
<image style="width: {{imagewidth}}px;height: {{imageheight}}px;" wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindload="imageLoad" bindtap='preview' /> wx:key="{{index}}"
</view> wx:for-item="item"
</block> >
<view class="pic-item">
11
</view>
</block>
</view> </view>
<authorization-modal isAuthorization='{{isAuthorization}}'/> <!--
<view class="pic-nav">
<view
wx:for="{{picNav}}"
wx:key="{{index}}"
wx:for-item="item"
class="nav-block"
style="width: {{imagewidth}}px;height: {{imageheight}}px;"
>
<image
wx:if="{{baseImgUrl}}"
class="pic-img"
style="width: {{imagewidth}}px;height: {{imageheight}}px;"
src="{{baseImgUrl}}{{item.imageUrl}}"
data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}"
data-link="{{item.link}}"
data-item="{{item}}"
bindload="imageLoad"
bindtap='preview'
/>
</view>
</view>
<authorization-modal
isAuthorization='{{isAuthorization}}'
bind:activeTocard="activeTocard"
isAuthorizationType="{{isAuthorizationType}}"
isAuthorizationActiveText="{{isAuthorizationActiveText}}"
/>
--> -->
<view class="pic-nav"><view wx:for="{{picNav}}" wx:key="{{index}}" wx:for-item="item" class="nav-block" style="width: {{imagewidth}}px;height: {{imageheight}}px;"><image wx:if="{{baseImgUrl}}" class="pic-img" style="width: {{imagewidth}}px;height: {{imageheight}}px;" src="{{baseImgUrl}}{{item.imageUrl}}" data-appid="{{item.link.appid}}" data-path="{{item.link.url}}" data-link="{{item.link}}" data-item="{{item}}" bindload="imageLoad" bindtap='preview'/></view></view>
<authorization-modal isAuthorization='{{isAuthorization}}' bind:activeTocard="activeTocard" isAuthorizationType="{{isAuthorizationType}}" isAuthorizationActiveText="{{isAuthorizationActiveText}}"/>
\ No newline at end of file
src/component/picNav/picNav.wxss
/* component/picNav/picNav.wxss */ /* component/picNav/picNav.wxss */
/* .pic-nav { .pic-nav {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
margin: 0; margin: 0;
box-sizing:content-box; box-sizing:content-box;
} */ margin: 0 20rpx;
}
.pic-nav { .pic-item {
flex: 1;
height: 154rpx;
opacity: 0.5;
border-radius: 10rpx;
background-color: rgba(196, 186, 175, 0.22);
}
.pic-item:first-child {
margin:0 10rpx 10rpx 0;
}
/* .pic-nav {
display: flex; display: flex;
padding: 0; padding: 0;
margin: 0; margin: 0;
...@@ -15,9 +25,5 @@ ...@@ -15,9 +25,5 @@
box-sizing: border-box; box-sizing: border-box;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} } */
.pic-img {
display: block;
/* vertical-align: top; */
/* float: left; */
}
src/component/tabSort/tabSort.js 0 → 100644
// component/tabSort/tabSort.js
var app = getApp()
const wxService = require('../../utils/wxService')
const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo
var order = ['red', 'yellow', 'blue', 'green', 'red']
Component({
/**
* 组件的属性列表
*/
properties: {
},
attached() {
},
/**
* 组件的初始数据
*/
data: {
currentTab: 0,
navData: [{
label: '分类1'
},
{
label: '分类2'
},
{
label: '分类3'
},
{
label: '分类4'
},
{
label: '分类5'
},
{
label: '分类6'
}
]
},
/**
* 组件的方法列表
*/
methods: {
// 设置tab active
switchNav(event) {
const ev = event.currentTarget.dataset;
let cur = ev.current
if (this.data.currentTab == cur) {
return false
} else {
this.setData({
currentTab: cur,
})
}
},
switchTab(event) {
var cur = event.detail.current
this.setData({
currentTab: cur
})
}
}
})
src/component/tabSort/tabSort.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
src/component/tabSort/tabSort.wxml 0 → 100644
<!--component/tabSort/tabSort.wxml-->
<view class="tab-sort" wx:if="{{navData}}">
<scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}">
<block
wx:for="{{navData}}"
wx:for-index="idx"
wx:for-item="navItem"
wx:key="idx"
>
<view
class="scroll-view-item {{currentTab == idx ?'active':''}}"
style="width:{{navItemWidth}}%"
data-current="{{idx}}"
data-startTimeStr="{{navItem.startTimeStr}}"
data-endTimeStr="{{navItem.endTimeStr}}"
data-btnText="{{navItem.buttonText}}"
data-id="{{navItem.id}}"
bindtap="switchNav"
>
<view>{{navItem.label}}</view>
</view>
</block>
</scroll-view>
<view class="scroll-view-right">
<image class="right-img" src="./../../assets/imgs/7_1_0/scancode.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
<text class="active vip-text" selectable="false" space="false" decode="false">会员码</text>
</view>
</view>
<!-- 页面内容 -->
<!--<view>
<swiper
current="{{currentTab}}"
duration="300"
bindchange="switchTab"
>
<swiper-item
wx:for="{{navData}}"
wx:for-item="navItem"
wx:for-index="idx"
wx:key="idx"
class="tab-content-clock"
>
<view>{{navItem.label}}</view>
</swiper-item>
</swiper>
</view>-->
src/component/tabSort/tabSort.wxss 0 → 100644
/* component/tabSort/tabSort.wxss */
.tab-sort {
display: flex;
white-space: nowrap;
box-sizing: border-box;
height: 80rpx;
line-height: 80rpx;
}
.scroll-view_H {
width: 80%;
}
.scroll-view-item {
display: inline-block;
width: 100rpx;
font-size: 25rpx;
text-align: center;
font-family: PingFangSC-Medium;
}
.scroll-view-right {
width: 20%;
display: flex;
align-items: center;
justify-content: center;
box-shadow: -15px 0px 15px -15px rgb(168, 165, 165);
}
.active {
color: #C09A74;
}
.right-img {
width: 30rpx;
height: 30rpx;
}
.vip-text {
font-size: 22rpx;
font-family: PingFangSC-Regular;
padding-left: 8rpx;
box-sizing: border-box;
}
\ No newline at end of file
src/custom-tab-bar/index.js 0 → 100644
const app = getApp();
Component({
//数据
data: {
selected: 0,//当前tabBar页面
color: "#cdcdcd",//未选中tabBar时的文字颜色
selectedColor: "#22385d",//选中时tabBar文字颜色
addImgPath:'/assets/imgs/7_1_0/share_un.png',//添加发布图标
// tabBar对象集合
list: [
{
pagePath: "/pages/userCenter/userCenter",
iconPath: "/assets/imgs/7_1_0/home_un.png",
selectedIconPath: "/assets/imgs/7_1_0/home.png",
text: "首页"
},
{
pagePath: "/pages/category/category",
iconPath: "/assets/imgs/7_1_0/category_un.png",
selectedIconPath: "/assets/imgs/7_1_0/category.png",
text: "分类"
},
{
pagePath: "/pages/cart/cart",
iconPath: "/assets/imgs/7_1_0/cart_un.png",
selectedIconPath: "/assets/imgs/7_1_0/cart.png",
text: "购物车"
},
{
pagePath: "/pages/my/my",
iconPath: "/assets/imgs/7_1_0/my_un.png",
selectedIconPath: "/assets/imgs/7_1_0/my.png",
text: "我的"
}
]
},
ready() {
},
methods: {
// tabBar切换事件
tab_bar_index(e) {
const data = e.currentTarget.dataset
const url = data.path
wx.switchTab({ url })
},
// 发布添加按钮跳转
tab_bar_add() {
var url = "/pages/shareNumber/shareNumber"
wx.navigateTo({url})
}
}
})
\ No newline at end of file
src/custom-tab-bar/index.json 0 → 100644
{
"component":true
}
\ No newline at end of file
src/custom-tab-bar/index.wxml 0 → 100644
<cover-view class="tab-bar">
<!-- 背景图片 -->
<cover-image class='tab-bar-bg' src='/assets/imgs/7_1_0/bg.png' />
<!-- 首页 -->
<cover-view
class='tab-bar-index'
data-index='0'
data-path='{{list[0].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 0 ? list[0].selectedIconPath : list[0].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 0 ? selectedColor : color}}'>{{list[0].text}}</cover-view>
</cover-view>
</cover-view>
<!-- 分类 -->
<cover-view
class='tab-bar-index'
data-index='1'
data-path='{{list[1].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 1 ? list[1].selectedIconPath : list[1].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 1 ? selectedColor : color}}'>{{list[1].text}}</cover-view>
</cover-view>
</cover-view>
<!-- 分享号 -->
<cover-view class='tab-bar-index-add' bindtap='tab_bar_add'>
<cover-view class='tab-bar-icon_add'>
<cover-view style='width:100%;height:42rpx;' />
<cover-image class='tab-bar-img-add' src='{{addImgPath}}' />
</cover-view>
<cover-view class="share-text">分享号</cover-view>
</cover-view>
<!-- 购物车 -->
<cover-view
class='tab-bar-index'
data-index='2'
data-path='{{list[2].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 2 ? list[2].selectedIconPath : list[2].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 2 ? selectedColor : color}}'>{{list[2].text}}</cover-view>
</cover-view>
</cover-view>
<!-- 我的 -->
<cover-view
class='tab-bar-index'
data-index='3'
data-path='{{list[3].pagePath}}'
bindtap='tab_bar_index'
>
<cover-view class='tab-bar-icon'>
<cover-image src='{{selected == 3 ? list[3].selectedIconPath : list[3].iconPath}}' class='tab-bar-img' />
<cover-view class='tab-bar-tmp' />
<cover-view class='tab-bar-text' style='color:{{selected == 3 ? selectedColor : color}}'>{{list[3].text}}</cover-view>
</cover-view>
</cover-view>
</cover-view>
src/custom-tab-bar/index.wxss 0 → 100644
/* tabBar总体 */
.tab-bar{
width: 100%;
height: 144rpx;
display: flex;
flex-direction: row;
position: fixed;
bottom: 0;
}
/* 背景图片 */
.tab-bar-bg{
display: flex;
position: absolute;
width: 100%;
height: 100%;
z-index: -1;
}
/* 背景一条线 */
.tab-bar-bg-view{
width: 100%;
height: 1px;
background: rgba(0, 0, 0, 0.33);
position: absolute;
top: 17px;
z-index: -1;
}
/* tabBar内容快 */
.tab-bar-index{
display: flex;
flex: 1;
font-size: 30rpx;
height: 50px;
margin-top: 50rpx;
z-index: 1;
box-sizing: border-box;
}
/* tarBar添加发布单独内容快 */
.tab-bar-index-add{
font-size: 30rpx;
z-index: 1;
height: 70px;
text-align: center;
}
/* 图标字体结合内容快 */
.tab-bar-icon{
width: 100%;
height: 45px;
margin-top: 5px;
display: flex;
flex-direction: column;
}
/* 图标字体结合内容快添加发布单独设置 */
.tab-bar-icon_add{
width: 100%;
height: 50px;
display: flex;
flex-direction: column;
}
/* 内容快图片 */
.tab-bar-img{
width: 37rpx;
height: 37rpx;
margin: 0 auto;
}
/* 内容快添加发布单独图片设置 */
.tab-bar-img-add{
width: 74rpx;
height: 74rpx;
margin: 0 auto;
}
/* 内容快挤位置 */
.tab-bar-tmp{
width: 100%;
height: 3.5px;
}
/* 内容快文字 */
.tab-bar-text,.share-text{
width: 40px;
text-align: center;
font-size: 12px;
margin: 0 auto;
}
.share-text {
padding-top: 10rpx;
color: #cdcdcd;
}
.fix-Full-button {
bottom:68rpx!important;
}
\ No newline at end of file
src/pages/cart/cart.js 0 → 100644
// pages/cart/cart.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 2
})
}
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/pages/cart/cart.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/pages/cart/cart.wxml 0 → 100644
<!--pages/cart/cart.wxml-->
<text>pages/cart/cart.wxml</text>
src/pages/cart/cart.wxss 0 → 100644
/* pages/cart/cart.wxss */
\ No newline at end of file
src/pages/category/category.js 0 → 100644
// pages/category/category.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 1
})
}
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/pages/category/category.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/pages/category/category.wxml 0 → 100644
<!--pages/category/category.wxml-->
<text>pages/category/category.wxml</text>
src/pages/category/category.wxss 0 → 100644
/* pages/category/category.wxss */
\ No newline at end of file
src/pages/home/home.js 0 → 100644
// pages/home/home.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 0
})
}
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/pages/home/home.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/pages/home/home.wxml 0 → 100644
<!--pages/home/home.wxml-->
<text>pages/home/home.wxml</text>
src/pages/home/home.wxss 0 → 100644
/* pages/home/home.wxss */
\ No newline at end of file
src/pages/my/my.js 0 → 100644
// pages/my/my.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 3
})
}
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
src/pages/my/my.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/pages/my/my.wxml 0 → 100644
<!--pages/my/my.wxml-->
<text>pages/my/my.wxml</text>
src/pages/my/my.wxss 0 → 100644
/* pages/my/my.wxss */
\ No newline at end of file
src/pages/shareNumber/shareNumber.js 0 → 100644
// pages/shareNumber/shareNumber.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
src/pages/shareNumber/shareNumber.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
src/pages/shareNumber/shareNumber.wxml 0 → 100644
<!--pages/shareNumber/shareNumber.wxml-->
<text>pages/shareNumber/shareNumber.wxml</text>
src/pages/shareNumber/shareNumber.wxss 0 → 100644
/* pages/shareNumber/shareNumber.wxss */
\ No newline at end of file
src/pages/userCenter/userCenter.js
...@@ -121,6 +121,13 @@ wxService.page({ ...@@ -121,6 +121,13 @@ wxService.page({
outoHeigth: res.windowHeight outoHeigth: res.windowHeight
}) })
}) })
// 设置当前选中 Tab
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 0
})
}
}, },
// 查询积分信息 // 查询积分信息
getMemberPointInfo(){ getMemberPointInfo(){
......
src/pages/userCenter/userCenter.json
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
"person-center": "/component/personCenter/personCenter", "person-center": "/component/personCenter/personCenter",
"pic-nav": "/component/picNav/picNav", "pic-nav": "/component/picNav/picNav",
"bottom": "/component/bottom/bottom", "bottom": "/component/bottom/bottom",
"authorization-modal": "/component/authorization-modal/authorization-modal" "authorization-modal": "/component/authorization-modal/authorization-modal",
"tab-sort": "/component/tabSort/tabSort",
"announcement": "/component/announcement/announcement",
"icon-swiper": "/component/iconSwiper/iconSwiper",
"hot-item": "/component/hotItem/hotItem",
"bannerAd": "/component/bannerAd/bannerAd"
} }
} }
\ No newline at end of file
src/pages/userCenter/userCenter.wxml
<!--pages/userCenter.wxml--> <!--pages/userCenter.wxml-->
<view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px"> <view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px">
<!-- 1 轮播 2 个人中心 3 图片导航 4 底部--> <!-- 1 轮播 2 个人中心 3 图片导航 4 底部-->
<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem"> <!-- 分类Tab -->
<!--{{pItem.type}}--> <tab-sort/>
<!-- 轮播 --> <view class="page-bgc">
<view class="pd1530" wx:if="{{pItem.type == 1}}"> <!-- 轮播 -->
<image-swiper bind:updatePage="updatePage" image-data="{{pItem.rotationchart.images}}" /> <image-swiper/>
</view> <!--公告-->
<announcement/>
<!-- 导航图标 -->
<icon-swiper/>
<!-- 图片导航 -->
<pic-nav/>
</view>
<view class="person-hot border_box">
<text class="person-text">- 人气热卖</text>
<span class="hot border_box">HOT -</span>
</view>
<!-- 个人中心 {{pItem.customer}}--> <!-- 商品活动 人气hot -->
<view class="pd1530" wx:if="{{pItem.type == 2}}"> <hot-item/>
<person-center base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/> <!-- 图片广告 -->
</view> <bannerAd/>
<!-- 图片导航 {{pItem.navigation.images}} pd1530--> <!-- <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
<view class="pd1520" wx:if="{{pItem.type == 3}}"> <view class="pd1530" wx:if="{{pItem.type == 1}}">
<pic-nav bind:updatePage="updatePage" pic-nav="{{pItem.navigation.images}}" /> <image-swiper bind:updatePage="updatePage" image-data="{{pItem.rotationchart.images}}" />
</view> </view>
<!-- 底部 --> <view class="pd1530" wx:if="{{pItem.type == 2}}">
<view class="" wx:if="{{pItem.type == 4}}"> <person-center
<bottom bind:updatePage="updatePage" bottom="{{pItem.bottom}}"/> base-user-info="{{baseUserInfo}}"
</view> person-data="{{pItem.customer}}"
</block> integral-num="{{integralNum}}"
coupon-num="{{couponNum}}"
token="{{token}}"
/>
</view>
<view class="pd1520" wx:if="{{pItem.type == 3}}">
<pic-nav bind:updatePage="updatePage" pic-nav="{{pItem.navigation.images}}" />
</view>
<view class="" wx:if="{{pItem.type == 4}}">
<bottom bind:updatePage="updatePage" bottom="{{pItem.bottom}}" />
</view>
</block>-->
</view> </view>
<authorization-modal isAuthorization='{{isAuthorization}}'/> <!--<authorization-modal isAuthorization='{{isAuthorization}}' />-->
src/pages/userCenter/userCenter.wxss
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
@import './../../base/base.wxss'; @import './../../base/base.wxss';
.user-center{ .user-center{
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 120rpx; padding-bottom: 160rpx;
height: 100%; height: 100%;
} }
.main-content{ .main-content{
margin-top: 18rpx; margin-top: 18rpx;
} }
.top-content,.bottom-content{ .top-content,.bottom-content{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -35,3 +34,26 @@ ...@@ -35,3 +34,26 @@
height: 32rpx; height: 32rpx;
vertical-align: middle; vertical-align: middle;
} }
.page-bgc {
background-color: rgba(255, 255, 255, 1);
}
.person-hot {
text-align: center;
padding: 17rpx 0;
}
.person-text {
height: 32rpx;
color: rgba(51, 51, 48, 1);
font-size: 23rpx;
text-align: left;
font-family: PingFangSC-Regular;
}
.hot {
height: 32rpx;
color: rgba(192, 154, 116, 1);
font-size: 23rpx;
text-align: left;
font-family: PingFangSC-Regular;
padding-left: 10rpx;
}
\ No newline at end of file
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