Skip to content

7
7-Eleven
Commit 71b435b7 by 赵雅纹
Options

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

Feature zyw sc

See merge request !75
parents 69ddb7ad 55e30a3a
Showing with 91 additions and 86 deletions
src/component/productListStyleOne/productListStyleOne.wxml
...@@ -13,19 +13,19 @@ ...@@ -13,19 +13,19 @@
</view> </view>
<template name="water-list"> <template name="water-list">
<view class="item"> <view class="item">
<image class="item-img" src="{{url}}" mode="widthFix"></image> <image class="item-img" src="{{indexUrl}}" mode="widthFix"></image>
<view class="item-title-box"> <view class="item-title-box">
<view class="item-title">{{title}}</view> <view class="item-title">{{productName}}</view>
</view> </view>
<view class="pro-price-wrap"> <view class="pro-price-wrap">
<view class="pro-plus-price"> <view class="pro-plus-price" wx:if="{{memberPrice}}">
<text>￥</text> <text>￥</text>
<text class="plus-price">228</text> <text class="plus-price">{{memberPrice}}</text>
<image mode="widthFix" src="/assets/imgs/7_1_0/member-icon.png"></image> <image mode="widthFix" src="/assets/imgs/7_1_0/member-icon.png"></image>
</view> </view>
<view class="pro-member-price"> <view class="pro-member-price" wx:if="{{plusPrice}}">
<text>￥</text> <text>￥</text>
<text class="member-price">228</text> <text class="member-price">{{plusPrice}}</text>
<image mode="widthFix" src="/assets/imgs/7_1_0/plus-sm.png"></image> <image mode="widthFix" src="/assets/imgs/7_1_0/plus-sm.png"></image>
</view> </view>
</view> </view>
......
src/component/productListStyleTwo/productListStyleTwo.js
...@@ -4,7 +4,10 @@ Component({ ...@@ -4,7 +4,10 @@ Component({
* 组件的属性列表 * 组件的属性列表
*/ */
properties: { properties: {
imageData: {
type: Array,
value: [],
},
}, },
/** /**
......
src/component/productListStyleTwo/productListStyleTwo.wxml
<!--component/productListStyleTwo/productListStyleTwo.wxml--> <!--component/productListStyleTwo/productListStyleTwo.wxml-->
<view class="hot-item border_box"> <view class="hot-item border_box" wx:for="{{imageData}}" wx:key="{{index}}">
<view class="hot-img-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="" /> <image class="hot-img" src="{{item.indexUrl}}" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view> </view>
<view class="hot-item-desc border_box"> <view class="hot-item-desc border_box">
<view class="item-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view> <view class="item-name">{{item.productName}}</view>
<view class="item-desc">商品描述商品描述商品描述商品描述商品描述商品描述商品描述</view> <view class="item-desc">{{item.productStatusDesc}}</view>
<view class="item-vip-price weui-flex"> <view class="item-vip-price weui-flex" wx:if="{{item.memberPrice}}">
<view class=""> <view class="" >
<image <image
class="item-vip" class="item-vip"
src="./../../assets/imgs/7_1_0/vip.png" src="./../../assets/imgs/7_1_0/vip.png"
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
bindload="" bindload=""
/> />
</view> </view>
<text class="vip-sale-price border_box">￥189</text> <text class="vip-sale-price border_box">￥{{item.memberPrice}}</text>
<text class="vip-original-price">￥189</text> <text class="vip-original-price">￥189</text>
</view> </view>
<view class="item-plus-price weui-flex"> <view class="item-plus-price weui-flex" wx:if="{{item.plusPrice}}">
<view class=""> <view class="">
<image <image
class="item-plus" class="item-plus"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
bindload="" bindload=""
/> />
</view> </view>
<text class="vip-plus-price vip-sale-price border_box">￥158</text> <text class="vip-plus-price vip-sale-price border_box">￥{{item.plusPrice}}</text>
</view> </view>
<view/> <view/>
......
src/component/productListStyleTwo/productListStyleTwo.wxss
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
margin: 0 auto; margin: 0 auto;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.05); box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.05);
margin-top: 20rpx;
} }
.hot-img { .hot-img {
width: 276rpx; width: 276rpx;
......
src/pages/category/category.js
...@@ -44,7 +44,7 @@ wxService.page({ ...@@ -44,7 +44,7 @@ wxService.page({
wx.showLoading({ wx.showLoading({
title: '加载中' title: '加载中'
}) })
wxService.get(`/sale/product/mallCategory/buyyer/findCategoryTree`).then(res => { wxService.get(`/sale/product/mallCategory/buyer/findCategoryTree`).then(res => {
const { result, data } = res.data const { result, data } = res.data
if (result == 0) { if (result == 0) {
wx.hideLoading() wx.hideLoading()
......
src/pages/category/category.wxml
...@@ -10,14 +10,16 @@ ...@@ -10,14 +10,16 @@
<scroll-view class="nav-contents" scroll-y="true"> <scroll-view class="nav-contents" scroll-y="true">
<view wx:for="{{navData}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="nav-content{{j == curMenu[1] ? ' active' : ''}}"> <view wx:for="{{navData}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="nav-content{{j == curMenu[1] ? ' active' : ''}}">
<navigator hover-class="none" class="sec-menu-image" open-type="navigate" url="/pages/productNav/productNav?id={{menuSec.id}}&name={{menuSec.label}}"> <navigator hover-class="none" class="sec-menu-image" open-type="navigate" url="/subPackage/page/pages/fun/fun?id={{menuSec.id}}&name={{menuSec.label}}">
<image src="{{menuSec.image}}" mode="widthFix"></image> <image src="{{menuSec.image}}" mode="widthFix"></image>
</navigator> </navigator>
<view class="menu-list"> <view class="menu-list">
<view wx:for="{{menuSec.children}}" wx:key="{{k}}" wx:for-index="k" wx:for-item="menuThr" class="menu-third" > <view wx:for="{{menuSec.children}}" wx:key="{{k}}" wx:for-index="k" wx:for-item="menuThr" class="menu-third" >
<view data-id="{{menuThr.id}}" data-name="{{menuThr.label}}" bindtap="navPage"> <view data-id="{{menuThr.id}}" data-name="{{menuThr.label}}" bindtap="navPage">
<navigator hover-class="none" class="sec-menu-image" open-type="navigate" url="/subPackage/page/pages/fun/fun?id={{menuThr.id}}&name={{menuThr.label}}">
<image src="{{menuThr.image}}" class="thr-menu-image" ></image> <image src="{{menuThr.image}}" class="thr-menu-image" ></image>
<view class="thr-menu-name">{{menuThr.label}}</view> <view class="thr-menu-name">{{menuThr.label}}</view>
</navigator>
</view> </view>
</view> </view>
</view> </view>
......
src/subPackage/page/pages/fun/fun.js
// subPackage/page/pages/fun/fun.js // subPackage/page/pages/fun/fun.js
Page({ const wxService = require('../../../../utils/wxService')
wxService.page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
imageData: [ proData: [],
{ pageNo: 1,
name: '大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼', pageSize: 10,
heart_num: '1', totalPages:'',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识', form:{
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72', queryDto: {
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg' mallCategoryId: ''
}, }
{
name: '大脸猫爱吃鱼',
heart_num: '2',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '3',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}, {
name: '大脸猫爱吃鱼',
heart_num: '4',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '5',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '6',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '7',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img4.imgtn.bdimg.com/it/u=2748975304,2710656664&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}, {
name: '大脸猫爱吃鱼',
heart_num: '8',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img2.imgtn.bdimg.com/it/u=1561660534,130168102&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
} }
],
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log(options)
}, if(options && options.id){
this.setData({
/** form: {
* 生命周期函数--监听页面初次渲染完成 queryDto: {
*/ mallCategoryId: options.id
onReady: function () { }
}
})
}
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
this.getProList();
},
//获取商品列表
getProList(){
wx.showLoading({
title: '加载中'
})
wxService.post(`/sale/product/buyer/findProductListPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, this.data.form.queryDto).then(res => {
const { result, data } = res.data
if (result == 0 && data.content) {
wx.hideLoading()
this.setData({
proData: this.data.pageNo == 1 ? [...data.content] : [...this.data.proData, ...data.content],
totalPages: data.totalPages,
totalElements: data.totalElements
})
}
}).finally(() => {
wx.hideLoading()
})
}, },
/** /**
...@@ -102,14 +79,24 @@ Page({ ...@@ -102,14 +79,24 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh: function () { onPullDownRefresh: function () {
this.setData({
pageNo: 1,
})
this.getProList()
wx.stopPullDownRefresh();
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom: function () { onReachBottom: function () {
const { pageNo, pageSize, totalPages } = this.data
if (pageNo < totalPages) {
this.setData({
pageNo: pageNo + 1,
})
this.getProList()
}
}, },
/** /**
......
src/subPackage/page/pages/fun/fun.json
{ {
"navigationBarTitleText": "聚FUN", "navigationBarTitleText": "聚FUN",
"enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"tab-sort": "/component/tabSort/tabSort", "tab-sort": "/component/tabSort/tabSort",
"product-list-style-one": "/component/productListStyleOne/productListStyleOne", "product-list-style-one": "/component/productListStyleOne/productListStyleOne",
......
src/subPackage/page/pages/fun/fun.wxml
...@@ -3,9 +3,13 @@ ...@@ -3,9 +3,13 @@
<view> <view>
<tab-sort/> <tab-sort/>
<product-list-style-one image-data="{{imageData}}"/> <product-list-style-one image-data="{{proData}}" wx:if="{{}}"/>
<product-list-style-two /> <product-list-style-two image-data="{{proData}}" />
<view class="empty" wx:if="{{proData.length < 1}}">
暂无商品哦~
</view>
</view> </view>
src/subPackage/page/pages/fun/fun.wxss
/* subPackage/page/pages/fun/fun.wxss */ /* subPackage/page/pages/fun/fun.wxss */
.empty{
width: 300rpx;
color: #808080;
margin: 40% auto;
text-align: center;
}
\ 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