Skip to content

7
7-Eleven
Commit c1af7eda by 赵雅纹
Options

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

Feature zyw sc

See merge request !72
parents 89894e1f f4cbedfd
Showing with 131 additions and 104 deletions
src/app.js
...@@ -109,9 +109,9 @@ App({ ...@@ -109,9 +109,9 @@ App({
imageUrl: envInfo.imgCtx, //图片地址 imageUrl: envInfo.imgCtx, //图片地址
isFullSucreen: false, // 当前设备是否为 FullSucreen isFullSucreen: false, // 当前设备是否为 FullSucreen
commonFunc: commonFunc, commonFunc: commonFunc,
brandId: 2711, // brandId: 2711,
// brandId: 2005, // brandId: 2005,
// brandId: 1001, brandId: 1001,
// brandId: 1002, // brandId: 1002,
} }
}) })
src/app.json
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
"pages/grassCommunity/grassCommunity", "pages/grassCommunity/grassCommunity",
"pages/myInvite/myInvite", "pages/myInvite/myInvite",
"pages/share/share", "pages/share/share",
"pages/paymentStatus/paymentStatus" "pages/paymentStatus/paymentStatus",
"pages/fun/fun"
] ]
} }
], ],
......
src/config/index.js
const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test, 预生产 pre const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const needMock = '' // const needMock = '' //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
......
src/pages/category/category.js
// pages/category/category.js // pages/category/category.js
Page({ const wxService = require('../../utils/wxService')
wxService.page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
curMenu: [0, 0], curMenu: [0, 0],
navData: [ navData: [],
{
children:[
{
name:'1dsfkshdfsdf',
id:1,
children:[
{
name:'111111111',
pic_url:'http://pic39.nipic.com/20140321/18063302_210604412116_2.jpg'
}
]
},
{
name: 2,
id: 2,
pic_url:'http://pic68.nipic.com/file/20150601/8164280_104301508000_2.jpg',
children: [
{
name: '2222222',
pic_url:'http://pic68.nipic.com/file/20150601/8164280_104301508000_2.jpg'
},
{
name: '2222222',
pic_url: 'http://pic68.nipic.com/file/20150601/8164280_104301508000_2.jpg'
},
{
name: '2222222',
pic_url: 'http://pic68.nipic.com/file/20150601/8164280_104301508000_2.jpg'
},
{
name: '2222222',
pic_url: 'http://pic68.nipic.com/file/20150601/8164280_104301508000_2.jpg'
},
]
}
]
}
],
}, },
...@@ -73,6 +36,25 @@ Page({ ...@@ -73,6 +36,25 @@ Page({
selected: 1 selected: 1
}) })
} }
this.getCategoryList()
},
// 分类列表
getCategoryList() {
wx.showLoading({
title: '加载中'
})
wxService.get(`/sale/product/mallCategory/buyyer/findCategoryTree`).then(res => {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
this.setData({
navData: data
})
}
}).finally(() => {
wx.hideLoading()
})
}, },
selectMenu: function (event) { selectMenu: function (event) {
...@@ -98,6 +80,8 @@ Page({ ...@@ -98,6 +80,8 @@ Page({
// }) // })
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
......
src/pages/category/category.wxml
...@@ -2,72 +2,25 @@ ...@@ -2,72 +2,25 @@
<view class="nav-container search-top"> <view class="nav-container search-top">
<scroll-view class="nav-menu" scroll-y="true"> <scroll-view class="nav-menu" scroll-y="true">
<!-- <block > <view wx:for="{{navData}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="menu-item{{j == curMenu[1] ? ' active' : ''}}">
<view class="menu-item{{i == curMenu[0] && j == curMenu[1] ? ' active' : ''}}"> <view class="menu-name{{j == curMenu[1] ? ' theme-text-color' : ''}}" data-j="{{j}}"
<view class="menu-name{{i == curMenu[0] && j == curMenu[1] ? ' active-text' : ''}}" data-i="{{i}}" data-j="{{j}}" data-name="{{menuSec.label}}" data-id="{{menuSec.id}}" bindtap="selectMenu">{{menuSec.label}}</view>
data-name1="{{menuFir.name}}" data-id1="{{menuFir.id}}" data-id2="{{menuSec.id}}"
data-name2="{{menuSec.name}}" data-id="{{menuSec.id}}" bindtap="selectMenu">{{1111111}}</view>
</view> </view>
<view class="menu-item{{i == curMenu[0] && j == curMenu[1] ? ' active' : ''}}">
<view class="menu-name{{i == curMenu[0] && j == curMenu[1] ? ' active-text' : ''}}" data-i="{{i}}" data-j="{{j}}"
data-name1="{{menuFir.name}}" data-id1="{{menuFir.id}}" data-id2="{{menuSec.id}}"
data-name2="{{menuSec.name}}" data-id="{{menuSec.id}}" bindtap="selectMenu">{{22222}}</view>
</view>
</block> -->
<block wx:for="{{navData}}" wx:key="{{i}}" wx:for-index="i" wx:for-item="menuFir">
<view wx:for="{{menuFir.children}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="menu-item{{i == curMenu[0] && j == curMenu[1] ? ' active' : ''}}">
<view class="menu-name{{i == curMenu[0] && j == curMenu[1] ? ' theme-text-color' : ''}}" data-i="{{i}}" data-j="{{j}}"
data-name1="{{menuFir.name}}" data-id1="{{menuFir.id}}" data-id2="{{menuSec.id}}"
data-name2="{{menuSec.name}}" data-id="{{menuSec.id}}" bindtap="selectMenu">{{menuSec.name}}</view>
</view>
</block>
</scroll-view> </scroll-view>
<scroll-view class="nav-contents" scroll-y="true"> <scroll-view class="nav-contents" scroll-y="true">
<block wx:for="{{navData}}" wx:key="{{i}}" wx:for-index="i" wx:for-item="menuFir"> <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="{{menuFir.children}}" wx:key="{{j}}" wx:for-index="j" wx:for-item="menuSec" class="nav-content{{i == curMenu[0] && 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 class="sec-menu-image" open-type="navigate" url="/pages/productNav/productNav?id={{menuSec.id}}&name={{menuSec.name}}"> <image src="{{menuSec.image}}" mode="widthFix"></image>
<image src="{{menuSec.pic_url}}" 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.name}}" bindtap="navPage"> <view data-id="{{menuThr.id}}" data-name="{{menuThr.label}}" bindtap="navPage">
<image src="{{menuThr.pic_url}}" class="thr-menu-image" ></image> <image src="{{menuThr.image}}" class="thr-menu-image" ></image>
<view class="thr-menu-name">{{menuThr.name}}</view> <view class="thr-menu-name">{{menuThr.label}}</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</block>
<!-- <block >
<view class="nav-content{{i == curMenu[0] && j == curMenu[1] ? ' active' : ''}}">
<navigator class="sec-menu-image" open-type="navigate" url="/pages/productNav/productNav?id={{menuSec.id}}&name={{menuSec.name}}">
<image src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image>
</navigator>
<view class="menu-list">
<view class="menu-third" >
<view data-id="{{menuThr.id}}" data-name="{{menuThr.name}}" bindtap="navPage">
<image src="/assets/imgs/7_1_0/icon.png" class="thr-menu-image" mode="widthFix"></image>
<view class="thr-menu-name">111111</view>
</view>
</view> </view>
<view class="menu-third" >
<view data-id="{{menuThr.id}}" data-name="{{menuThr.name}}" bindtap="navPage">
<image src="/assets/imgs/7_1_0/icon.png" class="thr-menu-image" mode="widthFix"></image>
<view class="thr-menu-name">111111</view>
</view>
</view>
<view class="menu-third" >
<view data-id="{{menuThr.id}}" data-name="{{menuThr.name}}" bindtap="navPage">
<image src="/assets/imgs/7_1_0/icon.png" class="thr-menu-image" mode="widthFix"></image>
<view class="thr-menu-name">111111</view>
</view>
</view>
</view>
</view>
</block> -->
</scroll-view> </scroll-view>
</view> </view>
\ No newline at end of file
src/project.config.json
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.6.6", "libVersion": "2.6.6",
"appid": "wx700028bf32a3be66", "appid": "wxc3b64b09b1d3dfc2",
"projectname": "微商城", "projectname": "微商城",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 33, "current": 36,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -271,6 +271,20 @@ ...@@ -271,6 +271,20 @@
"pathName": "subPackage/page/pages/paymentStatus/paymentStatus", "pathName": "subPackage/page/pages/paymentStatus/paymentStatus",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "聚FUN",
"pathName": "pages/userCenter/userCenter",
"query": "",
"scene": null
},
{
"id": -1,
"name": "聚FUN",
"pathName": "subPackage/page/pages/fun/fun",
"query": "",
"scene": null
} }
] ]
} }
......
src/subPackage/page/pages/fun/fun.js 0 → 100644
// subPackage/page/pages/fun/fun.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/subPackage/page/pages/fun/fun.json 0 → 100644
{
"navigationBarTitleText": "聚FUN",
"usingComponents": {}
}
\ No newline at end of file
src/subPackage/page/pages/fun/fun.wxml 0 → 100644
<!--subPackage/page/pages/fun/fun.wxml-->
<text>subPackage/page/pages/fun/fun.wxml</text>
src/subPackage/page/pages/fun/fun.wxss 0 → 100644
/* subPackage/page/pages/fun/fun.wxss */
\ 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