Skip to content

E
eMall_miniapp
Commit 1f092ca4 authored by wdy's avatar wdy
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 59a6ea42 5a2562a4
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 111 deletions
homePage/MallPlus/index.vue
View file @ 1f092ca4
......@@ -32,7 +32,6 @@
</view>
</view>
</template>
<script>
export default {
data() {
......@@ -48,15 +47,33 @@
arr: [],
scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
timer: null, // 定时器
baseApi: this.baseApi
baseApi: this.baseApi,
businessMessage:{} // 商圈数据
}
},
onLoad() {
this.init()
this.getMessage()
// this.init()
},
methods: {
getMessage(){
const that = this
uni.getStorage({
key:'business',
success:function(res){
// that.ishaveBusiness = true
that.businessMessage = res.data
console.log("商圈数据",that.businessMessage)
}
})
this.$nextTick(()=>{
this.init()
},1000)
},
init() {
this.$u.get('category/list').then(res => {
this.$u.get('category/list?tenantId='+this.businessMessage.id).then(res => {
this.tabbar = res
this.getMenuItemTop()
})
......@@ -183,7 +200,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>
.u-wrap {
height: calc(100vh);
/* #ifdef H5 */
......@@ -192,17 +209,17 @@
display: flex;
flex-direction: column;
}
.u-search-box {
padding: 10rpx 30rpx;
}
.u-menu-wrap {
flex: 1;
display: flex;
overflow: hidden;
}
.u-search-inner {
background-color: rgb(234, 234, 234);
border-radius: 100rpx;
......@@ -210,18 +227,18 @@
align-items: center;
padding: 10rpx 16rpx;
}
.u-search-text {
font-size: 24rpx;
color: $u-tips-color;
margin-left: 10rpx;
}
.u-tab-view {
width: 200rpx;
height: 100%;
}
.u-tab-item {
height: 110rpx;
background: #f6f6f6;
......@@ -234,7 +251,7 @@
font-weight: 400;
line-height: 1;
}
.u-tab-item-active {
position: relative;
color: #000;
......@@ -242,7 +259,7 @@
font-weight: 600;
background: #fff;
}
.u-tab-item-active::before {
content: "";
position: absolute;
......@@ -251,47 +268,47 @@
left: 0;
top: 39rpx;
}
.u-tab-view {
height: 100%;
}
.right-box {
background-color: rgb(250, 250, 250);
}
.page-view {
padding: 16rpx;
}
.class-item {
margin-bottom: 30rpx;
background-color: #fff;
padding: 16rpx;
border-radius: 8rpx;
}
.class-item:last-child {
min-height: 100vh;
}
.item-title {
font-size: 26rpx;
color: $u-main-color;
font-weight: bold;
}
.item-menu-name {
font-weight: normal;
font-size: 24rpx;
color: $u-main-color;
}
.item-container {
display: flex;
flex-wrap: wrap;
}
.thumb-box {
width: 33.333333%;
display: flex;
......@@ -300,9 +317,9 @@
flex-direction: column;
margin-top: 20rpx;
}
.item-menu-image {
width: 120rpx;
height: 120rpx;
}
</style>
\ No newline at end of file
</style>
homePage/filmReceipt/index.vue
View file @ 1f092ca4
......@@ -35,7 +35,7 @@
<!-- 底部按钮 -->
<view style="position: fixed;bottom: 0;">
<view class="bottom-button">
<view class="button" style="background-color: #1aa034;" @click="handlClick">微信自动积分</view>
<!-- <view class="button" style="background-color: #1aa034;" @click="handlClick">微信自动积分</view> -->
<view class="button" @click="handleshoot">拍摄小票</view>
</view>
</view>
......@@ -195,8 +195,8 @@
.bottom-button {
padding-top: 30rpx;
height: 288rpx;
padding: 30rpx 0;
// height: 288rpx;
background: #FFFFFF;
box-shadow: 0px -1px 0px 1px #F5F5F5;
border-radius: 0px 0px 0px 0px;
......
homePage/filmReceipt/shopList/index.vue
View file @ 1f092ca4
......@@ -3,88 +3,88 @@
<!-- 搜索区 -->
<view class="top">
<view class="search">
<u-search placeholder="输入购物中心名称" v-model="keyword" :show-action="false" input-align="center" style="margin-left: 2%; width: 96%;"></u-search>
<u-search placeholder="请输入店铺名关键字" v-model="keyword" :show-action="false" input-align="center"
style="margin-left: 2%; width: 96%;"></u-search>
</view>
</view>
<!-- 主体区 -->
<view style="height: 30rpx; background-color: #fff;"></view>
<view class="content">
<view class="left">
<view class="list" v-for="(item,index) in list" :key="index">
<view :class="item.check? 'checkListItem' : '.list-item'" @click="handclick(item)">{{item.value}}</view>
<!-- 主体区 -->
<view style="height: 30rpx; background-color: #fff;"></view>
<view class="content">
<view class="left">
<view class="list" v-for="(item,index) in list" :key="index">
<view :class="item.check? 'checkListItem' : '.list-item'" @click="handclick(item)">{{item.value}}
</view>
</view>
<view class="right">
<view>
<view class="shop">
<view class="shop-item">
<view class="text">马府私家菜</view>
<view class="icon">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view style="width: 100%;height: 1rpx; background-color: #eee;"></view>
</view>
<view class="right">
<view>
<view class="shop">
<view class="shop-item">
<view class="text">马府私家菜</view>
<view class="icon">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view style="width: 100%;height: 1rpx; background-color: #eee;"></view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data(){
return{
data() {
return {
keyword: '',
list:[
{
value: '全部',
check: false
},
{
value: 'A1',
check: false
},
{
value: 'A2',
check: false
},
{
value: 'A3',
check: false
},
{
value: 'A4',
check: false
},
{
value: 'A5',
check: false
},
{
value: 'A6',
check: false
},
{
value: 'B1',
check: false
},
{
value: 'B2',
check: false
},
{
value: 'B3',
check: false
},
]
businessMessage: {},
list: [],
shopList: [],
floor: '',
name: ''
}
},
onLoad() {
this.getColumn()
},
methods: {
handclick(item){
getColumn() {
const that = this
uni.getStorage({
key: 'business',
success: function(res) {
that.businessMessage = res.data
console.log("商圈数据", that.businessMessage)
that.getFloor()
that.getShop()
}
})
},
getFloor() {
this.$u.get('/shop/mobile/selectShopFloor?tenantId=' + this.businessMessage.id).then(res => {
console.log("商铺楼层", res)
this.list = [{
value: '全部',
check: true
}]
res.forEach(item => {
this.list.push({
value: item,
check: false
})
})
})
},
getShop() {
this.$u.get('/shop/mobile/selectShopList?tenantId=' + this.businessMessage.id+'&floor'+this.floor+'&name='+this.name).then(res => {
console.log("商铺", res)
})
},
handclick(item) {
item.check = true
this.list.forEach(obj =>{
if(obj.value !== item.value) {
this.list.forEach(obj => {
if (obj.value !== item.value) {
obj.check = false
}
})
......@@ -93,26 +93,32 @@
}
</script>
<style lang="scss" scoped>
.shopList{
.top{
<style lang="scss" scoped>
.shopList {
.top {
background-color: #fff;
}
.search{
.search {
width: 96%;
margin-left: 2%;
}
background-color: #eeeeee;
min-height: 100vh;
.content{
.content {
display: flex;
.left{
.left {
width: 20%;
height: 100vh;
overflow: scroll;
.list{
.list {
width: 100%;
.list-item{
.list-item {
background-color: #eeeeee;
color: #333;
width: 100%;
......@@ -121,7 +127,8 @@
align-items: center;
justify-content: center;
}
.checkListItem{
.checkListItem {
background-color: #fff;
color: red;
width: 100%;
......@@ -132,31 +139,36 @@
}
}
}
.right{
.right {
width: 80%;
min-height: 100vh;
background-color: #fff;
.shop{
.shop {
width: 100%;
height: 80rpx;
.shop-item{
.shop-item {
display: flex;
height: 80rpx;
align-items: center;
.text{
margin-left: 30rpx;
display: flex;
height: 80rpx;
align-items: center;
.text {
margin-left: 30rpx;
display: flex;
height: 80rpx;
align-items: center;
}
.right{
.right {
position: absolute;
right: 18rpx;
}
}
}
}
}
}
</style>
\ 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