Skip to content

W
wx-boss
Commit 705fa1e5 by 姜雷
Options

Merge branch 'develop' into test

parents e425e647 836c791f
Showing with 140 additions and 77 deletions
miniprogram/pages/homeAndReport/homeAndReport.js
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var app = getApp();
var tabList = [
{
pagePath: '/pages/home/home',
iconPath: '/images/tab_shuju_nor@2x.png',
selectedIconPath: '/images/tab_shuju_pre@2x.png',
text: '数据首页',
code: '9001',
},
{
pagePath: '/pages/report/report',
iconPath: '/images/tab_baobiao_nor@2x.png',
selectedIconPath: '/images/tab_baobiao_pre@2x.png',
text: '运营管理',
code: '9002',
},
];
Page({
onLoad: function () {
var userRoles = app.globalData.userRoles;
var list = userRoles
.map(function (item) { return tabList.find(function (menu) { return menu.code === item.menuCode; }); })
.filter(function (menu) { return (menu ? true : false); });
this.setData({
selected: list.length ? list[0].code : '',
list: list,
});
},
onShow: function () {
if (wx.hideHomeButton) {
wx.hideHomeButton();
}
},
data: {
selected: 0,
list: [
{
pagePath: '/pages/home/home',
iconPath: '/images/tab_shuju_nor@2x.png',
selectedIconPath: '/images/tab_shuju_pre@2x.png',
text: '数据首页',
},
{
pagePath: '/pages/report/report',
iconPath: '/images/tab_baobiao_nor@2x.png',
selectedIconPath: '/images/tab_baobiao_pre@2x.png',
text: '运营管理',
},
],
selected: '',
list: [],
},
clickHandle: function (e) {
console.log('in click', e);
......@@ -30,4 +45,4 @@ Page({
});
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILE1BQU07UUFDSixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsQ0FBQztRQUNYLElBQUksRUFBRTtZQUNKO2dCQUNFLFFBQVEsRUFBRSxrQkFBa0I7Z0JBQzVCLFFBQVEsRUFBRSw4QkFBOEI7Z0JBQ3hDLGdCQUFnQixFQUFFLDhCQUE4QjtnQkFDaEQsSUFBSSxFQUFFLE1BQU07YUFDYjtZQUNEO2dCQUNFLFFBQVEsRUFBRSxzQkFBc0I7Z0JBQ2hDLFFBQVEsRUFBRSxnQ0FBZ0M7Z0JBQzFDLGdCQUFnQixFQUFFLGdDQUFnQztnQkFDbEQsSUFBSSxFQUFFLE1BQU07YUFDYjtTQUNGO0tBQ0Y7SUFDRCxXQUFXLFlBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLElBQUEsYUFBMEIsRUFBeEIsY0FBSSxFQUFFLGdCQUFLLENBQWM7UUFHL0IsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNYLFFBQVEsRUFBRSxLQUFLO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJQYWdlKHtcbiAgb25TaG93KCkge1xuICAgIGlmICh3eC5oaWRlSG9tZUJ1dHRvbikge1xuICAgICAgd3guaGlkZUhvbWVCdXR0b24oKTtcbiAgICB9XG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzZWxlY3RlZDogMCxcbiAgICBsaXN0OiBbXG4gICAgICB7XG4gICAgICAgIHBhZ2VQYXRoOiAnL3BhZ2VzL2hvbWUvaG9tZScsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfbm9yQDJ4LnBuZycsXG4gICAgICAgIHNlbGVjdGVkSWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9zaHVqdV9wcmVAMngucG5nJyxcbiAgICAgICAgdGV4dDogJ+aVsOaNrummlumhtScsXG4gICAgICB9LFxuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9yZXBvcnQvcmVwb3J0JyxcbiAgICAgICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19wcmVAMngucG5nJyxcbiAgICAgICAgdGV4dDogJ+i/kOiQpeeuoeeQhicsXG4gICAgICB9LFxuICAgIF0sXG4gIH0sXG4gIGNsaWNrSGFuZGxlKGUpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gY2xpY2snLCBlKTtcbiAgICBsZXQgeyBwYXRoLCBpbmRleCB9ID0gZS5kZXRhaWw7XG4gICAgLy8gY29uc29sZS5sb2cocGF0aCwgaW5kZXgpO1xuICAgIC8vIHd4LnN3aXRjaFRhYih7IHVybDogcGF0aCB9KTtcbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgc2VsZWN0ZWQ6IGluZGV4LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFTQSxJQUFNLEdBQUcsR0FBRyxNQUFNLEVBQVUsQ0FBQztBQUM3QixJQUFNLE9BQU8sR0FBVztJQUN0QjtRQUNFLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsUUFBUSxFQUFFLDhCQUE4QjtRQUN4QyxnQkFBZ0IsRUFBRSw4QkFBOEI7UUFDaEQsSUFBSSxFQUFFLE1BQU07UUFDWixJQUFJLEVBQUUsTUFBTTtLQUNiO0lBQ0Q7UUFDRSxRQUFRLEVBQUUsc0JBQXNCO1FBQ2hDLFFBQVEsRUFBRSxnQ0FBZ0M7UUFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO1FBQ2xELElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLE1BQU07S0FDYjtDQUNGLENBQUM7QUFFRixJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxTQUFTLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7UUFDekMsSUFBSSxJQUFJLEdBQUcsU0FBUzthQUNqQixHQUFHLENBQUMsVUFBQSxJQUFJLElBQUksT0FBQSxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsUUFBUSxFQUEzQixDQUEyQixDQUFDLEVBQWpELENBQWlELENBQUM7YUFDOUQsTUFBTSxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQXJCLENBQXFCLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDekMsSUFBSSxNQUFBO1NBQ0wsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELE1BQU07UUFDSixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsRUFBRTtRQUNaLElBQUksRUFBRSxFQUFFO0tBQ1Q7SUFDRCxXQUFXLFlBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLElBQUEsYUFBMEIsRUFBeEIsY0FBSSxFQUFFLGdCQUFLLENBQWM7UUFHL0IsSUFBSSxDQUFDLE9BQVEsQ0FBQztZQUNaLFFBQVEsRUFBRSxLQUFLO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG50eXBlIE1lbnUgPSB7XG4gIHBhZ2VQYXRoOiBzdHJpbmc7XG4gIGljb25QYXRoOiBzdHJpbmc7XG4gIHNlbGVjdGVkSWNvblBhdGg6IHN0cmluZztcbiAgdGV4dDogc3RyaW5nO1xuICBjb2RlOiBzdHJpbmc7XG59O1xuY29uc3QgYXBwID0gZ2V0QXBwPElNeUFwcD4oKTtcbmNvbnN0IHRhYkxpc3Q6IE1lbnVbXSA9IFtcbiAge1xuICAgIHBhZ2VQYXRoOiAnL3BhZ2VzL2hvbWUvaG9tZScsXG4gICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9zaHVqdV9ub3JAMngucG5nJyxcbiAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgdGV4dDogJ+aVsOaNrummlumhtScsXG4gICAgY29kZTogJzkwMDEnLFxuICB9LFxuICB7XG4gICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX25vckAyeC5wbmcnLFxuICAgIHNlbGVjdGVkSWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX3ByZUAyeC5wbmcnLFxuICAgIHRleHQ6ICfov5DokKXnrqHnkIYnLFxuICAgIGNvZGU6ICc5MDAyJyxcbiAgfSxcbl07XG5cblBhZ2Uoe1xuICBvbkxvYWQoKSB7XG4gICAgbGV0IHVzZXJSb2xlcyA9IGFwcC5nbG9iYWxEYXRhLnVzZXJSb2xlcztcbiAgICBsZXQgbGlzdCA9IHVzZXJSb2xlc1xuICAgICAgLm1hcChpdGVtID0+IHRhYkxpc3QuZmluZChtZW51ID0+IG1lbnUuY29kZSA9PT0gaXRlbS5tZW51Q29kZSkpXG4gICAgICAuZmlsdGVyKG1lbnUgPT4gKG1lbnUgPyB0cnVlIDogZmFsc2UpKTtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHNlbGVjdGVkOiBsaXN0Lmxlbmd0aCA/IGxpc3RbMF0uY29kZSA6ICcnLFxuICAgICAgbGlzdCxcbiAgICB9KTtcbiAgfSxcbiAgb25TaG93KCkge1xuICAgIGlmICh3eC5oaWRlSG9tZUJ1dHRvbikge1xuICAgICAgd3guaGlkZUhvbWVCdXR0b24oKTtcbiAgICB9XG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzZWxlY3RlZDogJycsXG4gICAgbGlzdDogW10sXG4gIH0sXG4gIGNsaWNrSGFuZGxlKGUpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gY2xpY2snLCBlKTtcbiAgICBsZXQgeyBwYXRoLCBpbmRleCB9ID0gZS5kZXRhaWw7XG4gICAgLy8gY29uc29sZS5sb2cocGF0aCwgaW5kZXgpO1xuICAgIC8vIHd4LnN3aXRjaFRhYih7IHVybDogcGF0aCB9KTtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
miniprogram/pages/homeAndReport/homeAndReport.ts
import { IMyApp } from '../../app';
type Menu = {
pagePath: string;
iconPath: string;
selectedIconPath: string;
text: string;
code: string;
};
const app = getApp<IMyApp>();
const tabList: Menu[] = [
{
pagePath: '/pages/home/home',
iconPath: '/images/tab_shuju_nor@2x.png',
selectedIconPath: '/images/tab_shuju_pre@2x.png',
text: '数据首页',
code: '9001',
},
{
pagePath: '/pages/report/report',
iconPath: '/images/tab_baobiao_nor@2x.png',
selectedIconPath: '/images/tab_baobiao_pre@2x.png',
text: '运营管理',
code: '9002',
},
];
Page({
onLoad() {
let userRoles = app.globalData.userRoles;
let list = userRoles
.map(item => tabList.find(menu => menu.code === item.menuCode))
.filter(menu => (menu ? true : false));
this.setData!({
selected: list.length ? list[0].code : '',
list,
});
},
onShow() {
if (wx.hideHomeButton) {
wx.hideHomeButton();
}
},
data: {
selected: 0,
list: [
{
pagePath: '/pages/home/home',
iconPath: '/images/tab_shuju_nor@2x.png',
selectedIconPath: '/images/tab_shuju_pre@2x.png',
text: '数据首页',
},
{
pagePath: '/pages/report/report',
iconPath: '/images/tab_baobiao_nor@2x.png',
selectedIconPath: '/images/tab_baobiao_pre@2x.png',
text: '运营管理',
},
],
selected: '',
list: [],
},
clickHandle(e) {
console.log('in click', e);
let { path, index } = e.detail;
// console.log(path, index);
// wx.switchTab({ url: path });
this.setData({
this.setData!({
selected: index,
});
},
......
miniprogram/pages/homeAndReport/homeAndReport.wxml
<!-- miniprogram/pages/homeAndReport/homeAndReport.wxml -->
<view class="container">
<home wx:if="{{selected === 0}}" />
<report wx:elif="{{selected === 1}}" class="report-wrap" />
<home wx:if="{{selected === '9001'}}" />
<report wx:elif="{{selected === '9002'}}" class="report-wrap" />
<tab-bar checked="{{selected}}" listData="{{list}}" bindcustomevent="clickHandle"></tab-bar>
</view>
\ No newline at end of file
miniprogram/pages/index/index.ts
......@@ -106,7 +106,7 @@ Page({
const { account, pwd } = this.data;
console.log(account, pwd);
wx.requestSubscribeMessage({
tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],
tmplIds: ['WU2yMHKM_yNPLGHRsstggnnGIgcRgDEIaJQiWWNJ9ss'],
success(res) {
console.log('in success', res);
},
......
miniprogram/pages/report/report.ts
import { IMyApp } from '../../app';
import { operatorFetch } from '../../api/fetch';
const navList = [
{
name: '月度运营分析',
icon: '../../../images/btn_yuedu@2x.png',
url: '/pages/monthOperator/monthOperator',
code: '9102',
reLaunch: false,
},
// {
// name: '用户增长分析',
// icon: '../../../images/btn_yonghu@2x.png',
// url: '/pages/userGrowth/userGrowth',
// code:'9103',
// reLaunch: false,
// },
{
name: '会员反馈',
icon: '../../../images/btn_fsnkui@2x.png',
url: '/pages/feedback/feedback',
code: '9104',
reLaunch: false,
},
{
name: '服务费明细',
icon: '../../../images/btn_jiaona@2x.png',
url: '/pages/platformFee/platformFee',
code: '9105',
reLaunch: false,
},
// {
// name: '账户提现',
// icon: '../../../images/btn_tixian@2x.png',
// url: '',
// reLaunch: false,
// },
{
name: '退出登录',
icon: '../../../images/btn_Sign_out@2x.png',
url: '/pages/index/index?logout=true',
reLaunch: true,
},
];
// miniprogram/pages/report/report.js
const app = getApp<IMyApp>();
Component({
lifetimes: {
attached() {
console.log(app.globalData.userInfo);
let itemList = [];
let showBalance = false;
let pageItem = app.globalData.userRoles.find(
menu => menu.menuCode === '9002',
);
if (pageItem) {
itemList = pageItem.childs
.map(item => navList.find(menu => menu.code === item.menuCode))
.filter(menu => (menu ? true : false));
if (pageItem.childs.find(item => item.menuCode === '9101'))
showBalance = true;
}
itemList.push(navList[navList.length - 1]);
while (itemList.length % 3) {
itemList.push({});
}
this.setData!({
userInfo: app.globalData.userInfo,
itemList,
showBalance,
});
this.fetchPlatformFee();
},
......@@ -18,46 +79,8 @@ Component({
*/
data: {
userInfo: app.globalData.userInfo,
itemList: [
{
name: '月度运营分析',
icon: '../../../images/btn_yuedu@2x.png',
url: '/pages/monthOperator/monthOperator',
reLaunch: false,
},
// {
// name: '用户增长分析',
// icon: '../../../images/btn_yonghu@2x.png',
// url: '/pages/userGrowth/userGrowth',
// reLaunch: false,
// },
{
name: '会员反馈',
icon: '../../../images/btn_fsnkui@2x.png',
url: '/pages/feedback/feedback',
reLaunch: false,
},
{
name: '服务费明细',
icon: '../../../images/btn_jiaona@2x.png',
url: '/pages/platformFee/platformFee',
reLaunch: false,
},
// {
// name: '账户提现',
// icon: '../../../images/btn_tixian@2x.png',
// url: '',
// reLaunch: false,
// },
{
name: '退出登录',
icon: '../../../images/btn_Sign_out@2x.png',
url: '/pages/index/index?logout=true',
reLaunch: true,
},
{},
{},
],
itemList: [],
showBalance: false,
account: 0,
platformFee: '0.00',
},
......
miniprogram/pages/report/report.wxml
......@@ -24,7 +24,7 @@
<view class="report-header-accountItemValue">10000</view>
</view>
</view> -->
<view class="report-header-platform">
<view class="report-header-platform" wx:if="{{showBalance}}">
<view class="report-header-platform-info">
待缴纳服务费
<text class="report-header-platform-fee" selectable="false" space="false" decode="false">
......
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