Commit 87a2827c authored by 刘杰's avatar 刘杰

企业微信前端

parent e77f4c77
<template> <template>
<view class="report-container"> <view class="report-container">
<!-- <scroll-view class="scroll-list" scroll-y> --> <scroll-view class="scroll-list" scroll-y>
<!-- 顶部统计卡片 --> <!-- 顶部统计卡片 -->
<view class="top-stats-wrapper"> <view class="top-stats-wrapper">
<!-- 异常统计环状进度 --> <!-- 异常统计环状进度 -->
...@@ -8,16 +8,17 @@ ...@@ -8,16 +8,17 @@
<view class="circle-wrapper"> <view class="circle-wrapper">
<view class="progress-ring" :style="{ <view class="progress-ring" :style="{
background: `conic-gradient( background: `conic-gradient(
#faad14 0% ${currentSearchData.overview.rate1}%, #FF4D4F 0% ${currentSearchData.overview.rate1}%,
#1890ff ${currentSearchData.overview.rate1}% ${currentSearchData.overview.rate2}%, #faad14 ${currentSearchData.overview.rate1}% ${currentSearchData.overview.rate2}%,
#52c41a ${currentSearchData.overview.rate2}% 100% #52C41A ${currentSearchData.overview.rate2}% 100%
)` )`
}"> }">
<view class="inner-circle"> <view class="inner-circle">
<view class="submit-info"> <view class="submit-info">
<view class="count-row"> <view class="count-row">
<text class="submitted error">{{currentSearchData.overview.newCount}}</text> <text class="submitted error">{{currentSearchData.overview.newCount}}</text>
<text class="submitted approving">/{{currentSearchData.overview.approving}}</text> <text
class="submitted approving">/{{currentSearchData.overview.approving}}</text>
<text class="submitted approved">/{{currentSearchData.overview.approved}}</text> <text class="submitted approved">/{{currentSearchData.overview.approved}}</text>
</view> </view>
<text class="label">异常统计</text> <text class="label">异常统计</text>
...@@ -86,23 +87,24 @@ ...@@ -86,23 +87,24 @@
</view> </view>
<view class="stat-row"> <view class="stat-row">
<view class="stat-item"> <view class="stat-item">
<view class="stat-block light-orange"> <view class="stat-block green">
<text class="number">{{currentSearchData.overview.stats.orderCount}}</text> <text class="number">{{currentSearchData.overview.stats.orderCount}}</text>
<text class="rate">单量</text> <text class="rate">单量</text>
</view> </view>
</view> </view>
<view class="stat-item"> <view class="stat-item">
<view class="stat-block green"> <view class="stat-block green">
<text class="number">{{currentSearchData.overview.stats.volumeCount}}</text> <text class="number">{{currentSearchData.overview.stats.weightCount}}</text>
<text class="rate">方量m³</text> <text class="rate">重量T</text>
</view> </view>
</view> </view>
<view class="stat-item"> <view class="stat-item">
<view class="stat-block orange"> <view class="stat-block green">
<text class="number">{{currentSearchData.overview.stats.weightCount}}</text> <text class="number">{{currentSearchData.overview.stats.volumeCount}}</text>
<text class="rate">重量T</text> <text class="rate">方量m³</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
...@@ -115,8 +117,11 @@ ...@@ -115,8 +117,11 @@
<view class="finance-block"> <view class="finance-block">
<view class="finance-item receivable"> <view class="finance-item receivable">
<!-- 左侧图标 --> <!-- 左侧图标 -->
<view class="left-section"> <!-- <view class="left-section">
<view class="icon"></view> <view class="icon"></view>
</view> -->
<view class="left-section">
<view class="icon"><img class="shou" src="../../static/img/boss/sou.png" alt="图标" /></view>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
...@@ -124,7 +129,7 @@ ...@@ -124,7 +129,7 @@
<view class="main-info"> <view class="main-info">
<view class="amount-section"> <view class="amount-section">
<text class="amount">{{currentSearchData.finance.receivable.total}}</text> <text class="amount">{{currentSearchData.finance.receivable.total}}</text>
<text class="label">应收</text> <!-- <text class="label">应收</text> -->
</view> </view>
<view class="extra-info"> <view class="extra-info">
<view class="info-row"> <view class="info-row">
...@@ -159,16 +164,21 @@ ...@@ -159,16 +164,21 @@
<view class="finance-block"> <view class="finance-block">
<view class="finance-item payable"> <view class="finance-item payable">
<!-- 左侧图标 --> <!-- 左侧图标 -->
<view class="left-section"> <!-- <view class="left-section">
<view class="icon"></view> <view class="icon"></view>
</view> -->
<view class="left-section">
<view class="icon">
<img src="../../static/img/boss/zhichu.png" alt="图标" />
</view> </view>
</view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="right-section"> <view class="right-section">
<view class="main-info"> <view class="main-info">
<view class="amount-section"> <view class="amount-section">
<text class="amount">{{currentSearchData.finance.payable.totalStr}}</text> <text class="amount">{{currentSearchData.finance.payable.totalStr}}</text>
<text class="label">应付</text> <!-- <text class="label">应付</text> -->
</view> </view>
<view class="extra-info"> <view class="extra-info">
<view class="info-row"> <view class="info-row">
...@@ -177,14 +187,15 @@ ...@@ -177,14 +187,15 @@
</view> </view>
<view class="info-row"> <view class="info-row">
<text class="label">月结</text> <text class="label">月结</text>
<text class="value monthly">{{currentSearchData.finance.payable.monthlyStr}}</text> <text
class="value monthly">{{currentSearchData.finance.payable.monthlyStr}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="progress-bar" <view class="progress-bar"
style="position: relative; height: 4px; background: #f0f0f0; border-radius: 2px; overflow: hidden;"> style="position: relative; height: 4px; background: #f0f0f0; border-radius: 2px; overflow: hidden;">
<view class="progress cash" :style="{ <view class="progress cash" :style="{
backgroundColor: '#FFA940', backgroundColor: '#FF4D4F',
width: cashRatio, width: cashRatio,
position: 'absolute', position: 'absolute',
height: '100%', height: '100%',
...@@ -192,7 +203,7 @@ ...@@ -192,7 +203,7 @@
top: 0 top: 0
}"></view> }"></view>
<view class="progress monthly" :style="{ <view class="progress monthly" :style="{
backgroundColor: '#13C2C2', backgroundColor: '#52C41A',
position: 'absolute', position: 'absolute',
height: '100%', height: '100%',
left: cashRatio, left: cashRatio,
...@@ -227,7 +238,7 @@ ...@@ -227,7 +238,7 @@
</text> </text>
</view> </view>
</view> </view>
<scroll-view class="chart-scroll" scroll-x @touchmove.prevent> <scroll-view class="chart-scroll" scroll-x>
<canvas class="chart-wrapper" id="myLeaderChart"></canvas> <canvas class="chart-wrapper" id="myLeaderChart"></canvas>
</scroll-view> </scroll-view>
</view> </view>
...@@ -255,7 +266,7 @@ ...@@ -255,7 +266,7 @@
</text> </text>
</view> </view>
</view> </view>
<scroll-view class="chart-scroll" scroll-x @touchmove.stop> <scroll-view class="chart-scroll" scroll-x>
<canvas class="chart-wrapper" id="myProjectChart"></canvas> <canvas class="chart-wrapper" id="myProjectChart"></canvas>
</scroll-view> </scroll-view>
</view> </view>
...@@ -268,7 +279,9 @@ ...@@ -268,7 +279,9 @@
<view class="table"> <view class="table">
<view class="table-header"> <view class="table-header">
<view class="table-row"> <view class="table-row">
<view class="table-cell-title">{{tableName}}</view> <view class="table-cell-title fixed-column" style="background-color: #f5f5f5;">
{{tableName}}
</view>
<view class="table-cell-title">应收(万)</view> <view class="table-cell-title">应收(万)</view>
<view class="table-cell-title">应付(万)</view> <view class="table-cell-title">应付(万)</view>
<view class="table-cell-title">应付现结(万)</view> <view class="table-cell-title">应付现结(万)</view>
...@@ -281,7 +294,7 @@ ...@@ -281,7 +294,7 @@
</view> </view>
<view class="table-body"> <view class="table-body">
<view class="table-row" v-for="(item, index) in currentData.tableData" :key="index"> <view class="table-row" v-for="(item, index) in currentData.tableData" :key="index">
<view class="table-cell">{{ item.boss }}</view> <view class="table-cell fixed-column">{{ item.boss }}</view>
<view class="table-cell">{{ item.receivable }}</view> <view class="table-cell">{{ item.receivable }}</view>
<view class="table-cell">{{ item.payable }}</view> <view class="table-cell">{{ item.payable }}</view>
<view class="table-cell">{{ item.cashPayable }}</view> <view class="table-cell">{{ item.cashPayable }}</view>
...@@ -295,13 +308,13 @@ ...@@ -295,13 +308,13 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<!-- </scroll-view> --> </scroll-view>
<view style="height: 10vh;"></view> <view style="height: 10px;"></view>
</view> </view>
</template> </template>
<script> <script module="test" lang="renderjs">
import { import {
searchBossCard searchBossCard
} from '../../api/apiList' } from '../../api/apiList'
...@@ -334,7 +347,7 @@ ...@@ -334,7 +347,7 @@
projectSortType: 'receivable', projectSortType: 'receivable',
timeData: {}, timeData: {},
showOrderEvent: false, showOrderEvent: false,
tableName:"" tableName: ""
} }
}, },
computed: { computed: {
...@@ -371,11 +384,12 @@ ...@@ -371,11 +384,12 @@
this.staffKind = uni.getStorageSync(`uc_staff_kind`); this.staffKind = uni.getStorageSync(`uc_staff_kind`);
if (this.staffKind === 'boss') { if (this.staffKind === 'boss') {
this.initLeaderChart() this.initLeaderChart()
this.tableName='模拟老板' this.tableName = '模拟老板'
}else{ } else {
this.tableName='项目' this.tableName = '项目'
} }
this.initProjectChart() this.initProjectChart()
// 在 Vue 的下一个 DOM 更新循环中执行 // 在 Vue 的下一个 DOM 更新循环中执行
this.$nextTick(() => { this.$nextTick(() => {
// 检查当前数据的表格数据是否存在且长度大于 0 // 检查当前数据的表格数据是否存在且长度大于 0
...@@ -390,8 +404,10 @@ ...@@ -390,8 +404,10 @@
// 对项目图表进行排序,按应收数据排序 // 对项目图表进行排序,按应收数据排序
this.sortProjectChart('receivable', 'myProjectChart') this.sortProjectChart('receivable', 'myProjectChart')
// 监听窗口的 resize 事件,调用 onResize 方法以适应图表大小 // 监听窗口的 resize 事件,调用 onResize 方法以适应图表大小
window.addEventListener('resize', this.onResize)
}) })
window.addEventListener('resize', this.onResize)
}, },
methods: { methods: {
orderEventClose() { orderEventClose() {
...@@ -420,8 +436,8 @@ ...@@ -420,8 +436,8 @@
// 获取数据点数量 // 获取数据点数量
const dataCount = this.currentData.leaderChartData.receivable.length; const dataCount = this.currentData.leaderChartData.receivable.length;
// 计算所需的最小宽度(假设每个数据点需要100px) // 计算所需的最小宽度(假设每个数据点需要100px)
const minWidth = Math.max(dataCount * 60, 500); const minWidth = Math.max(dataCount * 60, 300);
console.log("minWidth:"+minWidth) console.log("minWidth:" + minWidth)
// 设置容器宽度 // 设置容器宽度
const wrapper = document.getElementById('myLeaderChart'); const wrapper = document.getElementById('myLeaderChart');
...@@ -471,6 +487,7 @@ ...@@ -471,6 +487,7 @@
} }
}, },
axisLabel: { axisLabel: {
interval: 0, interval: 0,
color: '#666', color: '#666',
fontSize: 12 fontSize: 12
...@@ -490,7 +507,10 @@ ...@@ -490,7 +507,10 @@
color: '#666' color: '#666'
}, },
axisLabel: { axisLabel: {
color: '#666' color: '#666',
formatter: function(value) {
return value + 'w'; // 为纵坐标添加单位“万”
},
} }
}, },
{ {
...@@ -559,7 +579,7 @@ ...@@ -559,7 +579,7 @@
// 获取数据点数量 // 获取数据点数量
const dataCount = this.currentData.projectChartData.receivable.length; const dataCount = this.currentData.projectChartData.receivable.length;
// 计算所需的最小宽度(假设每个数据点需要100px) // 计算所需的最小宽度(假设每个数据点需要100px)
const minWidth = Math.max(dataCount * 60, 500); const minWidth = Math.max(dataCount * 60, 300);
// 设置容器宽度 // 设置容器宽度
const wrapper = document.getElementById('myProjectChart'); const wrapper = document.getElementById('myProjectChart');
...@@ -581,7 +601,7 @@ ...@@ -581,7 +601,7 @@
return `{name|${item.seriesName}}: {value|${item.value}${item.seriesName === '利润率' ? '%' : '万元'}}`; return `{name|${item.seriesName}}: {value|${item.value}${item.seriesName === '利润率' ? '%' : '万元'}}`;
}).join('<br>'); }).join('<br>');
return tips; return `<div>${tips}</div>`;
}, },
rich: { rich: {
name: { name: {
...@@ -636,7 +656,10 @@ ...@@ -636,7 +656,10 @@
color: '#666' color: '#666'
}, },
axisLabel: { axisLabel: {
color: '#666' color: '#666',
formatter: function(value) {
return value + 'w'; // 为纵坐标添加单位“万”
},
} }
}, },
{ {
...@@ -710,6 +733,7 @@ ...@@ -710,6 +733,7 @@
}, },
onResize() { onResize() {
if (this.myLeaderChart) { if (this.myLeaderChart) {
console.log("this.myLeaderChart.resize")
this.myLeaderChart.resize() this.myLeaderChart.resize()
} }
if (this.myProjectChart) { if (this.myProjectChart) {
...@@ -916,6 +940,22 @@ ...@@ -916,6 +940,22 @@
$secondary-color: #1890FF; $secondary-color: #1890FF;
$circle-size: 120px; $circle-size: 120px;
.fixed-column {
position: sticky;
/* 使用 sticky 定位 */
left: 0;
/* 固定在左侧 */
background-color: white;
/* 背景色 */
z-index: 1;
/* 确保在其他单元格之上 */
}
.shou {
width: 25px;
height: 25px;
}
// 在样式文件顶部添加重置样式 // 在样式文件顶部添加重置样式
page { page {
width: 100%; width: 100%;
...@@ -977,7 +1017,7 @@ ...@@ -977,7 +1017,7 @@
} }
.scroll-list { .scroll-list {
height: calc(100vh - 60px); height: calc(100vh- 45px);
touch-action: pan-x; touch-action: pan-x;
/* 允许横向滚动 */ /* 允许横向滚动 */
overflow-x: auto; overflow-x: auto;
...@@ -994,6 +1034,8 @@ ...@@ -994,6 +1034,8 @@
min-height: calc(100vh - 60px); min-height: calc(100vh - 60px);
// max-height: 100vh; // max-height: 100vh;
padding: 10px; padding: 10px;
padding-top: 45px;
>view { >view {
...@@ -1007,6 +1049,7 @@ ...@@ -1007,6 +1049,7 @@
display: flex; display: flex;
gap: 15px; gap: 15px;
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 10px;
.stats-card { .stats-card {
flex: 1; flex: 1;
...@@ -1058,13 +1101,15 @@ ...@@ -1058,13 +1101,15 @@
color: #52C41A; color: #52C41A;
&.error { &.error {
color: #faad14; // 异常统计使用红色 color: #FF4D4F; // 异常统计使用红色
} }
&.approving { &.approving {
color: #1890ff; // 异常统计使用红色 color: #faad14; // 异常统计使用红色
} }
&.approved { &.approved {
color: #52c41a; // 异常统计使用红色 color: #52C41A; // 异常统计使用红色
} }
} }
...@@ -1262,6 +1307,7 @@ ...@@ -1262,6 +1307,7 @@
display: block; display: block;
font-size: 14px; font-size: 14px;
color: #999; color: #999;
font-weight: bold;
} }
} }
} }
...@@ -1304,7 +1350,10 @@ ...@@ -1304,7 +1350,10 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #fff; color: #fff;
} }
} }
.right-section { .right-section {
...@@ -1475,11 +1524,11 @@ ...@@ -1475,11 +1524,11 @@
.info-row { .info-row {
.value { .value {
&.cash { &.cash {
color: #FFA940; color: #FF4D4F;
} }
&.monthly { &.monthly {
color: #13C2C2; color: #52C41A;
} }
} }
} }
...@@ -1610,8 +1659,9 @@ ...@@ -1610,8 +1659,9 @@
width: 100%; width: 100%;
overflow-x: auto; overflow-x: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
touch-action: pan-y; height: 30vh;
overflow-y: auto;
/* 允许垂直滚动 */
&::-webkit-scrollbar { &::-webkit-scrollbar {
height: 6px; height: 6px;
...@@ -1628,6 +1678,7 @@ ...@@ -1628,6 +1678,7 @@
width: 100%; width: 100%;
padding: 0 0 5px 0; padding: 0 0 5px 0;
min-width: 100%; min-width: 100%;
pointer-events: auto;
} }
} }
} }
...@@ -1724,6 +1775,11 @@ ...@@ -1724,6 +1775,11 @@
src: url('/static/fonts/icomoon.ttf') format('truetype'); src: url('/static/fonts/icomoon.ttf') format('truetype');
} }
.legend {
pointer-events: auto;
/* 确保可以接收触摸事件 */
}
.sort-icon::before { .sort-icon::before {
content: '\ea4d'; content: '\ea4d';
font-family: "custom-icon" !important; font-family: "custom-icon" !important;
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
return { return {
formData: { formData: {
reporterTo:'', reporterTo: '',
reporter: '', reporter: '',
date: formattedDate, // 使用带时间的日期格式 date: formattedDate, // 使用带时间的日期格式
todayWork: '', todayWork: '',
...@@ -106,9 +106,9 @@ ...@@ -106,9 +106,9 @@
methods: { methods: {
initReporter() { initReporter() {
this.staffKind = uni.getStorageSync('uc_staff_kind'); this.staffKind = uni.getStorageSync('uc_staff_kind');
const data={ const data = {
"aux":{ "aux": {
staffKind:this.staffKind staffKind: this.staffKind
} }
} }
selectReporter(data).then(res => { selectReporter(data).then(res => {
...@@ -209,14 +209,15 @@ ...@@ -209,14 +209,15 @@
<style lang="scss"> <style lang="scss">
.daily-report-create { .daily-report-create {
padding: 20px; // padding: 20px;
background-color: #f5f5f5; background-color: #f5f5f5;
min-height: 100vh; min-height: 100vh;
padding-top: 45px;
.page-title { .page-title {
text-align: center; text-align: center;
padding: 15px 0; padding: 15px 0;
margin-bottom: 20px; margin-bottom: 10px;
text { text {
font-size: 18px; font-size: 18px;
......
{ {
"name" : "兆驰运输管理系统", "name": "兆驰运输管理系统",
"appid" : "__UNI__EFB25AB", "appid": "__UNI__EFB25AB",
"description" : "TMS-承运商", "description": "TMS-承运商",
"versionName" : "1.0.0", "versionName": "1.0.0",
"versionCode" : "100", "versionCode": "100",
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : {}, "modules": {},
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
...@@ -41,83 +41,83 @@ ...@@ -41,83 +41,83 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : {}, "ios": {},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : {} "sdkConfigs": {}
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp": {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin": {
"appid" : "ww5b68e5106ed852c5", "appid": "ww5b68e5106ed852c5",
"setting" : { "setting": {
"urlCheck" : false, "urlCheck": false,
"es6" : true, "es6": true,
"postcss" : false, "postcss": false,
"minified" : true "minified": true
}, },
"usingComponents" : true, "usingComponents": true,
"lazyCodeLoading" : "requiredComponents", "lazyCodeLoading": "requiredComponents",
"requiredPrivateInfos" : [ "getLocation" ], "requiredPrivateInfos": ["getLocation"],
"permission" : {} "permission": {}
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : false "enable": false
}, },
"vueVersion" : "2", "vueVersion": "2",
"h5" : { "h5": {
"devServer" : { "devServer": {
"https" : false, "https": false,
"disableHostCheck" : true, "disableHostCheck": true,
"port" : 8083, "port": 8083,
"proxy" : { "proxy": {
"/api" : { "/api": {
// "target" : "http://122.112.220.204:8089", // "target" : "http://122.112.220.204:8089",
// "target" : "http://localhost:8083", "target": "http://localhost:8083",
"target" : "https://stms.bjzc-scs.com", // "target" : "https://stms.bjzc-scs.com",
"changeOrigin" : true, "changeOrigin": true,
"secure" : false "secure": false
}, },
"/handler" : { "/handler": {
// "target" : "http://122.112.220.204:8089", // "target" : "http://122.112.220.204:8089",
// "target" : "http://localhost:8083", "target": "http://localhost:8083",
"target" : "https://stms.bjzc-scs.com", // "target" : "https://stms.bjzc-scs.com",
"changeOrigin" : true, "changeOrigin": true,
"secure" : false "secure": false
}, },
"/sandtable" : { "/sandtable": {
// "target" : "http://122.112.220.204:8089", // "target" : "http://122.112.220.204:8089",
// "target" : "http://localhost:8083", "target": "http://localhost:8083",
"target" : "https://stms.bjzc-scs.com", // "target" : "https://stms.bjzc-scs.com",
"changeOrigin" : true, "changeOrigin": true,
"secure" : false "secure": false
}, },
"/tmsca" : { "/tmsca": {
// "target" : "http://122.112.220.204:8089", // "target" : "http://122.112.220.204:8089",
// "target" : "http://localhost:8083", "target": "http://localhost:8083",
"target" : "https://stms.bjzc-scs.com", // "target" : "https://stms.bjzc-scs.com",
"changeOrigin" : true, "changeOrigin": true,
"secure" : false "secure": false
} }
} }
}, },
"router" : { "router": {
"mode" : "hash", "mode": "hash",
"base" : "./" "base": "./"
}, },
"template" : "template.h5.html", "template": "template.h5.html",
"sdkConfigs" : { "sdkConfigs": {
"maps" : {} "maps": {}
} }
} }
} }
\ No newline at end of file
...@@ -178,7 +178,7 @@ module.exports = { ...@@ -178,7 +178,7 @@ module.exports = {
uni.redirectTo({ uni.redirectTo({
url: "/pages/index/index", url: "/pages/index/index",
}); });
_this.initWeCom(); // _this.initWeCom();
} }
}) })
.catch((err) => { .catch((err) => {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"style": { "style": {
"navigationBarTitleText": "主页", "navigationBarTitleText": "主页",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true "disableScroll": false
} }
}, },
{ {
......
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view v-if="currentShow === 'orderQuery'">
<orderQueryContent></orderQueryContent>
</view>
<!-- <view v-if="currentShow === 'dailyReport'"> <!-- <view v-if="currentShow === 'dailyReport'">
<dailyReport></dailyReport> <dailyReport></dailyReport>
</view> --> </view> -->
...@@ -74,7 +72,7 @@ ...@@ -74,7 +72,7 @@
if (this.uc_staff_kind === 'boss') { if (this.uc_staff_kind === 'boss') {
this.topUserList = [{ this.topUserList = [{
name: '老板看板', name: '运营监控',
key: 'bossCard', key: 'bossCard',
url: '/pages/index/index' url: '/pages/index/index'
}, },
...@@ -86,7 +84,7 @@ ...@@ -86,7 +84,7 @@
]; ];
} else if (this.uc_staff_kind === 'simulatedBoss') { } else if (this.uc_staff_kind === 'simulatedBoss') {
this.topUserList = [{ this.topUserList = [{
name: '老板看板', name: '运营监控',
key: 'bossCard', key: 'bossCard',
url: '/pages/index/index' url: '/pages/index/index'
}, },
...@@ -244,7 +242,8 @@ ...@@ -244,7 +242,8 @@
.transport-content { .transport-content {
background-color: #FAFAFA; background-color: #FAFAFA;
height: 100vh;
...@@ -255,6 +254,9 @@ ...@@ -255,6 +254,9 @@
align-items: center; align-items: center;
flex-direction: row; flex-direction: row;
justify-content: space-evenly; justify-content: space-evenly;
position: fixed;
z-index: 999;
width: 100%;
.top-item { .top-item {
height: 22px; height: 22px;
...@@ -273,6 +275,9 @@ ...@@ -273,6 +275,9 @@
.content { .content {
padding: 0px 12px 12px 12px; padding: 0px 12px 12px 12px;
// margin-top: 45px;
// height: calc(100vh- 50px);
} }
} }
</style>s </style>
\ No newline at end of file \ No newline at end of file
...@@ -9,9 +9,9 @@ let BASEURL = { ...@@ -9,9 +9,9 @@ let BASEURL = {
// url: 'http://192.168.1.199:7080' //唐浩然 // url: 'http://192.168.1.199:7080' //唐浩然
// url: 'http://192.168.0.230:8080' // xiaohan // url: 'http://192.168.0.230:8080' // xiaohan
// url: "https://botms-demo.logwirecloud.com", // url: "https://botms-demo.logwirecloud.com",
// url: "http://localhost:8083", //开发 url: "http://localhost:8083", //开发
// url: "http://122.112.220.204:8089", //开发 // url: "http://122.112.220.204:8089", //开发
url: "https://stms.bjzc-scs.com", //生产 // url: "https://stms.bjzc-scs.com", //生产
}; };
//当使用多域名代理服务时生效,用于统一添加API前缀以区分服务代理地址。本地开发H5注意修改manifest.json中Proxy代理规则 //当使用多域名代理服务时生效,用于统一添加API前缀以区分服务代理地址。本地开发H5注意修改manifest.json中Proxy代理规则
......
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