xiaozhan
/
crmeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 去除微信登录；导航栏调整

Browse Source
property-only-app
wx-jincw 2 months ago
parent 5a4a507604
commit a867b29754
15 changed files with 88 additions and 496 deletions
Show Stats Download Patch File Download Diff File

64
app/libs/login.js
Unescape View File

@ -39,39 +39,45 @@ export function _toLogin(push, pathLogin) {
Cache.set('login_back_url',path); Cache.set('login_back_url',path);
} }
// #ifdef H5 // // #ifdef H5
if (isWeixin()) { // if (isWeixin()) {
let urlData = location.pathname + location.search // let urlData = location.pathname + location.search
if (urlData.indexOf('?') !== -1) { // if (urlData.indexOf('?') !== -1) {
urlData += '&go_longin=1'; // urlData += '&go_longin=1';
} else { // } else {
urlData += '?go_longin=1'; // urlData += '?go_longin=1';
} // }
if (!Cache.has('snsapiKey')) { // if (!Cache.has('snsapiKey')) {
auth.oAuth('snsapi_base', urlData); // auth.oAuth('snsapi_base', urlData);
} else { // } else {
if (['/pages/user/index'].indexOf(login_back_url) == -1) { // if (['/pages/user/index'].indexOf(login_back_url) == -1) {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/users/wechat_login/index' // url: '/pages/users/wechat_login/index'
}) // })
} // }
} // }
} else { // } else {
if (['/pages/user/index'].indexOf(login_back_url) == -1) { // if (['/pages/user/index'].indexOf(login_back_url) == -1) {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/users/login/index' // url: '/pages/users/login/index'
}) // })
} // }
} // }
// #endif // // #endif
// if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) {
// // #ifdef MP
// uni.navigateTo({
// url: '/pages/users/wechat_login/index'
// })
// // #endif
// }
if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) { if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) {
// #ifdef MP
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/wechat_login/index' url: '/pages/users/login/index'
}) })
// #endif }
}
} }

44
app/pages.json
Unescape View File

@ -184,6 +184,10 @@
"navigationBarTitleText": "溯源信息查看", "navigationBarTitleText": "溯源信息查看",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -192,6 +196,10 @@
"navigationBarTitleText": "食材满意度评价", "navigationBarTitleText": "食材满意度评价",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -200,6 +208,10 @@
"navigationBarTitleText": "物供相关查询", "navigationBarTitleText": "物供相关查询",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -208,6 +220,10 @@
"navigationBarTitleText": "采购相关操作", "navigationBarTitleText": "采购相关操作",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -216,6 +232,10 @@
"navigationBarTitleText": "库存查询", "navigationBarTitleText": "库存查询",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -224,6 +244,10 @@
"navigationBarTitleText": "审批处理", "navigationBarTitleText": "审批处理",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -232,6 +256,10 @@
"navigationBarTitleText": "物资领用", "navigationBarTitleText": "物资领用",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -240,6 +268,10 @@
"navigationBarTitleText": "投诉与建议", "navigationBarTitleText": "投诉与建议",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -248,6 +280,10 @@
"navigationBarTitleText": "报修服务", "navigationBarTitleText": "报修服务",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -256,6 +292,10 @@
"navigationBarTitleText": "通知公告列表", "navigationBarTitleText": "通知公告列表",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
}, },
{ {
@ -264,6 +304,10 @@
"navigationBarTitleText": "通知详情", "navigationBarTitleText": "通知详情",
"navigationBarBackgroundColor": "#409EFF", "navigationBarBackgroundColor": "#409EFF",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
// #ifdef H5
,
"navigationStyle": "custom"
// #endif
} }
} }
] ]

6
app/pages/index/index.vue
Unescape View File

@ -105,6 +105,12 @@
<image src="/static/images/wg/wg_wx.png"></image> <image src="/static/images/wg/wg_wx.png"></image>
</view> </view>
<view class="menu-txt">报修服务</view> <view class="menu-txt">报修服务</view>
</navigator>
<navigator class='item' url='/pages/supply_chain/notice/index' hover-class='none'>
<view class='pictrue'>
<image src="/static/images/wg/wg_notice.png"></image>
</view>
<view class="menu-txt">通知公告</view>
</navigator> </navigator>
</view> </view>
<!-- menu --> <!-- menu -->

42
app/pages/supply_chain/approval/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="approval-page"> <view class="approval-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">审批处理</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 审批状态筛选 --> <!-- 审批状态筛选 -->
<view class="filter-section"> <view class="filter-section">
@ -88,9 +80,6 @@ export default {
} }
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
approveApproval(id) { approveApproval(id) {
// 模拟同意审批 // 模拟同意审批
uni.showToast({ uni.showToast({
@ -125,37 +114,6 @@ export default {
<style lang="scss"> <style lang="scss">
.approval-page { .approval-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

42
app/pages/supply_chain/complaint/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="complaint-page"> <view class="complaint-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">投诉与建议</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 顶部标签：我要反馈 / 我的记录 --> <!-- 顶部标签：我要反馈 / 我的记录 -->
<view class="tabs"> <view class="tabs">
@ -233,9 +225,6 @@ export default {
} }
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
switchToList() { switchToList() {
this.activeTab = 'list'; this.activeTab = 'list';
if (!this.records.length) { if (!this.records.length) {
@ -344,37 +333,6 @@ export default {
<style lang="scss"> <style lang="scss">
.complaint-page { .complaint-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

42
app/pages/supply_chain/evaluation/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="evaluation-page"> <view class="evaluation-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">食材满意度评价</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 食材选择 --> <!-- 食材选择 -->
<view class="food-section"> <view class="food-section">
@ -72,9 +64,6 @@ export default {
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
selectFood(food) { selectFood(food) {
this.selectedFood = food; this.selectedFood = food;
this.qualityRating = 0; this.qualityRating = 0;
@ -110,37 +99,6 @@ export default {
<style lang="scss"> <style lang="scss">
.evaluation-page { .evaluation-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

42
app/pages/supply_chain/material_receipt/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="material-receipt-page"> <view class="material-receipt-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">物资领用</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 发起领用申请 --> <!-- 发起领用申请 -->
<view class="form-section"> <view class="form-section">
@ -101,9 +93,6 @@ export default {
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
submitReceipt() { submitReceipt() {
if (!this.receiptForm.materialName || !this.receiptForm.quantity || !this.receiptForm.purpose || !this.receiptForm.applicant) { if (!this.receiptForm.materialName || !this.receiptForm.quantity || !this.receiptForm.purpose || !this.receiptForm.applicant) {
uni.showToast({ uni.showToast({
@ -144,37 +133,6 @@ export default {
<style lang="scss"> <style lang="scss">
.material-receipt-page { .material-receipt-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

43
app/pages/supply_chain/notice/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="notice-list-page"> <view class="notice-list-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">通知公告</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 搜索与筛选 --> <!-- 搜索与筛选 -->
<view class="search-section"> <view class="search-section">
@ -141,7 +133,6 @@ export default {
}; };
}, },
onLoad() { onLoad() {
uni.setNavigationBarTitle({ title: '通知公告' });
this.refreshList(); this.refreshList();
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -151,9 +142,6 @@ export default {
if (!this.records.length) this.refreshList(); if (!this.records.length) this.refreshList();
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
switchType(type) { switchType(type) {
this.typeTab = type; this.typeTab = type;
this.refreshList(); this.refreshList();
@ -261,37 +249,6 @@ export default {
<style lang="scss"> <style lang="scss">
.notice-list-page { .notice-list-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409eff;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;
} }

43
app/pages/supply_chain/notice_detail/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="notice-detail-page"> <view class="notice-detail-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">通知详情</view>
<view class="right"></view>
</view>
<view class="content" v-if="!loading"> <view class="content" v-if="!loading">
<view class="detail-card" v-if="notice && (notice.noticeTitle || notice.noticeId)"> <view class="detail-card" v-if="notice && (notice.noticeTitle || notice.noticeId)">
<view class="title-section"> <view class="title-section">
@ -116,14 +108,10 @@ export default {
}; };
}, },
onLoad(options) { onLoad(options) {
uni.setNavigationBarTitle({ title: '通知详情' });
this.noticeId = options.noticeId || options.id || ''; this.noticeId = options.noticeId || options.id || '';
if (this.noticeId) this.fetchDetail(); if (this.noticeId) this.fetchDetail();
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
async fetchDetail() { async fetchDetail() {
this.loading = true; this.loading = true;
try { try {
@ -179,37 +167,6 @@ export default {
<style lang="scss"> <style lang="scss">
.notice-detail-page { .notice-detail-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409eff;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;
} }

42
app/pages/supply_chain/purchase/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="purchase-page"> <view class="purchase-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">采购相关操作</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 操作菜单 --> <!-- 操作菜单 -->
<view class="menu-grid"> <view class="menu-grid">
@ -163,9 +155,6 @@ export default {
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
openPurchaseRequest() { openPurchaseRequest() {
this.activeForm = 'request'; this.activeForm = 'request';
this.purchaseRequest = { this.purchaseRequest = {
@ -273,37 +262,6 @@ export default {
<style lang="scss"> <style lang="scss">
.purchase-page { .purchase-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

42
app/pages/supply_chain/repair/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="repair-page"> <view class="repair-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">报修服务</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 顶部标签：我要报修 / 报修记录 --> <!-- 顶部标签：我要报修 / 报修记录 -->
<view class="tabs"> <view class="tabs">
@ -290,9 +282,6 @@ export default {
} }
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
handleFaultTypeChange(e) { handleFaultTypeChange(e) {
const index = e.detail.value; const index = e.detail.value;
this.faultTypeIndex = index; this.faultTypeIndex = index;
@ -543,37 +532,6 @@ export default {
<style lang="scss"> <style lang="scss">
.repair-page { .repair-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

44
app/pages/supply_chain/stock/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="stock-page"> <view class="stock-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">库存查询</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 搜索和筛选 --> <!-- 搜索和筛选 -->
<view class="search-section"> <view class="search-section">
@ -107,9 +99,6 @@ export default {
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
searchStock() { searchStock() {
uni.showToast({ uni.showToast({
title: '搜索功能开发中', title: '搜索功能开发中',
@ -134,37 +123,6 @@ export default {
<style lang="scss"> <style lang="scss">
.stock-page { .stock-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;
@ -346,7 +304,7 @@ export default {
} }
.item-footer { .item-footer {
.display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
.detail-btn { .detail-btn {

46
app/pages/supply_chain/supply_query/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="supply-query-page"> <view class="supply-query-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">物供相关查询</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 标签页 --> <!-- 标签页 -->
<view class="tabs"> <view class="tabs">
@ -157,9 +149,6 @@ export default {
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
searchPurchase() { searchPurchase() {
uni.showToast({ uni.showToast({
title: '搜索功能开发中', title: '搜索功能开发中',
@ -218,37 +207,6 @@ export default {
<style lang="scss"> <style lang="scss">
.supply-query-page { .supply-query-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;
@ -388,7 +346,7 @@ export default {
} }
.item-footer { .item-footer {
.display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
.detail-btn { .detail-btn {
@ -438,7 +396,7 @@ export default {
} }
.upload-box { .upload-box {
.display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.upload-btn { .upload-btn {

42
app/pages/supply_chain/traceability/index.vue
Unescape View File

@ -1,13 +1,5 @@
<template> <template>
<view class="traceability-page"> <view class="traceability-page">
<view class="header">
<view class="back" @click="goBack">
<text class="iconfont icon-xiangzuo"></text>
</view>
<view class="title">溯源信息查看</view>
<view class="right"></view>
</view>
<view class="content"> <view class="content">
<!-- 扫码按钮 --> <!-- 扫码按钮 -->
<view class="scan-section"> <view class="scan-section">
@ -81,9 +73,6 @@ export default {
}; };
}, },
methods: { methods: {
goBack() {
uni.navigateBack();
},
scanCode() { scanCode() {
// 模拟扫码功能 // 模拟扫码功能
uni.showToast({ uni.showToast({
@ -128,37 +117,6 @@ export default {
<style lang="scss"> <style lang="scss">
.traceability-page { .traceability-page {
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 30rpx;
background-color: #409EFF;
color: #fff;
.back {
width: 60rpx;
height: 100%;
display: flex;
align-items: center;
.iconfont {
font-size: 32rpx;
color: #fff;
}
}
.title {
font-size: 32rpx;
font-weight: 600;
}
.right {
width: 60rpx;
}
}
.content { .content {
padding: 30rpx; padding: 30rpx;

BIN
app/static/images/wg/wg_notice.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

Write Preview
Loading…
Cancel
Save