bonus
/
Dining_Hall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

样式修改测试问题修改

This commit is contained in:
zzyuan 2025-03-24 15:46:35 +08:00
parent da837ff623
commit 1c3ccd3564
35 changed files with 473 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages.json
View File

@ -3,7 +3,6 @@
"^u-(.*)": "uni_modules/uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "uni_modules/uview-ui/components/u-$1/u-$1.vue"
}, },
"pages": [ "pages": [
{ {
"path": "pages/login", "path": "pages/login",
"style": { "style": {
@ -16,7 +15,6 @@
"navigationBarTitleText": "皖送e餐" "navigationBarTitleText": "皖送e餐"
} }
}, },
{ {
"path": "pages/shared-station", "path": "pages/shared-station",
"style": { "style": {
@ -140,24 +138,12 @@
"navigationBarTitleText": "修改密码" "navigationBarTitleText": "修改密码"
} }
}, },
{
"path": "pages/mine/setting/index",
"style": {
"navigationBarTitleText": "应用设置"
}
},
{ {
"path": "pages/mine/help/index", "path": "pages/mine/help/index",
"style": { "style": {
"navigationBarTitleText": "常见问题" "navigationBarTitleText": "常见问题"
} }
}, },
{
"path": "pages/mine/about/index",
"style": {
"navigationBarTitleText": "关于我们"
}
},
{ {
"path": "pages/common/webview/index", "path": "pages/common/webview/index",
"style": { "style": {

17
pages/advanceOrder/index.vue
View File

@ -106,11 +106,11 @@
</view> </view>
<view class="flex justify-between align-center" style="margin: 20.5px 0 12.5px"> <view class="flex justify-between align-center" style="margin: 20.5px 0 12.5px">
<view class="flex align-center"> <view class="flex align-center" style="font-size: 15px;width: 80%;">
{{ canteenName }}/{{stallName}} {{ canteenName }}/{{stallName}}
<span class="name-type">{{ canteenType }}</span> <span class="name-type">{{ canteenType }}</span>
</view> </view>
<view> <view style="font-size: 14px;">
{{ newDate2 }} {{ newDate2 }}
</view> </view>
</view> </view>
@ -137,21 +137,19 @@
</view> </view>
<view class="right-cont"> <view class="right-cont">
<view class="num-wrap" v-if="food.isDfficacy==1"> <view class="num-wrap" v-if="food.isDfficacy==1">
<view style="width: 26rpx;"> <view style="width: 40rpx;" @click="handleFoodNum(1, food)">
<u-icon <u-icon
v-if="food.quantity > 0" v-if="food.quantity > 0"
name="../../static/images/del.png" name="../../static/images/del.png"
size="16" size="16"
@click="handleFoodNum(1, food)"
/> />
</view> </view>
<span class="cont-num">{{ food.quantity || 0 }}</span> <span class="cont-num">{{ food.quantity || 0 }}</span>
<view style="width: 26rpx;"> <view style="width: 40rpx;" @click="handleFoodNum(2, food)">
<u-icon <u-icon
v-if="food.quantity<food.restrictNum" v-if="food.quantity<food.restrictNum"
name="../../static/images/add2.png" name="../../static/images/add2.png"
size="16" size="18"
@click="handleFoodNum(2, food)"
/> />
</view> </view>
</view> </view>
@ -263,6 +261,7 @@ export default {
let param = { let param = {
"recipeId":this.recipeId, "recipeId":this.recipeId,
"applyDate":this.newDate2, "applyDate":this.newDate2,
// "applyDate":"2025-02-11",
} }
const res = await getAdvanceDetailListAPI(param) const res = await getAdvanceDetailListAPI(param)
console.log(res, '预订餐菜谱') console.log(res, '预订餐菜谱')
@ -838,7 +837,7 @@ page {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 12px; font-size: 14px;
color: #0f274b; color: #0f274b;
// 第二个展示左右边框 // 第二个展示左右边框
@ -881,6 +880,8 @@ page {
color: #0f274b; color: #0f274b;
.name-type { .name-type {
width: 42px;
text-align: center;
margin-left: 5px; margin-left: 5px;
font-weight: 400; font-weight: 400;
font-size: 10px; font-size: 10px;

6
pages/code/index.vue
View File

@ -18,7 +18,7 @@
<!-- 有效期 --> <!-- 有效期 -->
<view class="valid-time">有效时间15分钟</view> <view class="valid-time">有效时间15分钟</view>
<view class="refresh-button"> <view class="refresh-button">
<button @click="refreshQrCode" class="login-btn cu-btn block bg-blue lg round">点击刷新二维码</button> <button @click="refreshQrCode" class="login-btn cu-btn block bg-blue lg round" style="width: 70%;">点击刷新二维码</button>
</view> </view>
</view> </view>
</view> </view>
@ -105,10 +105,10 @@
} }
.refresh-button { .refresh-button {
width: 70%; width: 100%;
height: auto; height: auto;
display: flex; display: flex;
justify-self: center; justify-content: center;
} }
.login-btn { .login-btn {

127
pages/index.vue
View File

@ -6,14 +6,16 @@
placeholder placeholder
@leftClick="leftClick" @leftClick="leftClick"
leftIconColor="#000" leftIconColor="#000"
rightIcon="list"
@rightClick="onRefreshPages"
bgColor="#fff" bgColor="#fff"
:titleStyle="{ color: '#000', fontSize: '32rpx' }" :titleStyle="{ color: '#000', fontSize: '32rpx' }"
> >
<!--
rightIcon="list"
@rightClick="onRefreshPages"
<view class="u-nav-slot" slot="right"> <view class="u-nav-slot" slot="right">
<text style="color: #000" @tap="onRefreshPages">刷新</text> <text style="color: #000" @tap="onRefreshPages">刷新</text>
</view> </view> -->
</u-navbar> </u-navbar>
<view class="header"> <view class="header">
<text class="header-text">皖送e餐</text> <text class="header-text">皖送e餐</text>
@ -21,17 +23,59 @@
<!-- 轮播图 --> <!-- 轮播图 -->
<u-swiper :list="bannerList" @change="handleSwiperChange" :autoplay="true" :interval="3000"></u-swiper> <u-swiper :list="bannerList" @change="handleSwiperChange" :autoplay="true" :interval="3000"></u-swiper>
<!-- 指示器 --> <!-- 指示器 -->
<view class="external-indicator"> <!-- <view class="external-indicator">
<view <view
v-for="(item, index) in bannerList" v-for="(item, index) in bannerList"
:key="index" :key="index"
class="indicator-dot" class="indicator-dot"
:class="{ active: index === current }" :class="{ active: index === current }"
></view> ></view>
</view> -->
<view class="handle-box">
<view class="handle-box-item" @click="goCode" style="background: #F7FFF5;">
<view class="image-box">
<image src="/static/images/index/code.png" style="width: 100%;height: 100%;" mode="aspectFit"></image>
</view>
<view class="box-title">个人二维码</view>
<view class="box-subtitle">核身、支付、核销</view>
</view> </view>
<view class="handle-box-item" @click="goToRemainingSum" style="background: #F4FFFF;">
<view class="image-box">
<image src="/static/images/index/balance.png" style="width: 100%;height: 100%;" mode="aspectFit"></image>
</view>
<view class="box-title">个人余额</view>
<view class="box-subtitle">
<text style="font-size: 24rpx;color: #333;margin-right: 6rpx;">¥</text>
<text style="font-size: 48rpx;font-weight: 700;color: #FF6816;">{{ (walletBal/100).toFixed(2) }}</text>
<text style="font-size: 24rpx;color: #333;margin-left: 6rpx;">元</text>
</view>
</view>
<view class="handle-box-item" @click="goToMenu" style="background: #FFFBF4;">
<view class="image-box">
<image src="/static/images/index/weeklyMenu.png" style="width: 100%;height: 100%;" mode="aspectFit"></image>
</view>
<view class="box-title">一周菜谱</view>
<view class="box-subtitle">营养、时令、定制</view>
</view>
<view class="handle-box-item" @click="goToOrder" style="background: #FFF6F4;">
<view class="image-box">
<image src="/static/images/index/food.png" style="width: 100%;height: 100%;" mode="aspectFit"></image>
</view>
<view class="box-title">预定餐</view>
<view class="box-subtitle">智能、预定、鲜活</view>
</view>
</view>
<!-- 功能按钮区 --> <!-- 功能按钮区 -->
<view class="function-area"> <!-- <view class="function-area">
<view class="function-item" @click="goToMenu"> <view class="function-item" @click="goToMenu">
<view class="icon-box menu"> <view class="icon-box menu">
<image src="/static/images/index/weeklyMenu.png" mode="aspectFit"></image> <image src="/static/images/index/weeklyMenu.png" mode="aspectFit"></image>
@ -44,11 +88,10 @@
</view> </view>
<text class="function-text">预订餐</text> <text class="function-text">预订餐</text>
</view> </view>
</view> </view> -->
<!-- 底部信息区 --> <!-- 底部信息区 -->
<view class="bottom-info"> <!-- <view class="bottom-info">
<!-- 左侧二维码区域 -->
<view class="qr-area" @click="goCode"> <view class="qr-area" @click="goCode">
<view class="qr-title">个人二维码</view> <view class="qr-title">个人二维码</view>
<view class="qr-subtitle">核身、支付、核销</view> <view class="qr-subtitle">核身、支付、核销</view>
@ -56,8 +99,6 @@
<image src="/static/images/index/code.png" mode="aspectFit"></image> <image src="/static/images/index/code.png" mode="aspectFit"></image>
</view> </view>
</view> </view>
<!-- 右侧余额区域 -->
<view class="balance-area"> <view class="balance-area">
<view class="balance-text" @click="goToRemainingSum"> <view class="balance-text" @click="goToRemainingSum">
<text class="balance-label">余额/充值</text> <text class="balance-label">余额/充值</text>
@ -70,7 +111,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
<u-popup :show="showNotice" mode="center" @close="close" @open="open" > <u-popup :show="showNotice" mode="center" @close="close" @open="open" >
<view style="width: 70vw;height: 30vh;"> <view style="width: 70vw;height: 30vh;">
@ -117,7 +158,7 @@ export default {
noticeData:{} noticeData:{}
} }
}, },
onLoad() { onShow() {
this.getUserInfo() this.getUserInfo()
this.getWalletBalanceData(uni.getStorageSync('custId') || '') this.getWalletBalanceData(uni.getStorageSync('custId') || '')
this.getOrderQRCodeData(uni.getStorageSync('custId') || '') this.getOrderQRCodeData(uni.getStorageSync('custId') || '')
@ -125,10 +166,13 @@ export default {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.getWalletBalanceData(uni.getStorageSync('custId')||'') this.getWalletBalanceData(uni.getStorageSync('custId')||'')
}, 10000) }, 10000)
console.log(uni.getStorageSync('remember'))
}, },
onUnload() { onUnload() {
clearInterval(this.timer) clearInterval(this.timer)
this.timer = null this.timer = null;
uni.navigateBack()
// uni.navigateTo({ url: '/pages/system' })
}, },
methods: { methods: {
leftClick() { leftClick() {
@ -222,8 +266,6 @@ export default {
this.noticeData=res.records[0] this.noticeData=res.records[0]
this.showNotice=true this.showNotice=true
} }
}, },
open() { open() {
// console.log('open'); // console.log('open');
@ -233,6 +275,18 @@ export default {
// console.log('close'); // console.log('close');
} }
}, },
// onUnload() {
// uni.navigateTo({ url: '/pages/system' })
// },
// onBackPress(e) {
// //e.from === 'backbutton' 说明如果点击的是物理返回键或导航栏的返回键就进行以下操作
// if (e.from === 'backbutton') {
// //返回值为true 时,表示不执行默认的返回（默认返回上一页），执行自定义的返回
// uni.redirectTo({ url: '/pages/system' })
// //如果要限制必须写成true
// return true;
// }
// }
} }
</script> </script>
@ -304,6 +358,49 @@ view {
} }
} }
.handle-box{
margin-top: 30rpx;
width: 100%;
height: auto;
display: flex;
flex-wrap: wrap;
margin-bottom: 30rpx;
.handle-box-item {
width: 44%;
margin: 3%;
background-color: #ffffff;
border-radius: 12rpx;
padding: 40rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
.image-box{
width: 160rpx;
height: 140rpx;
margin-bottom: 20rpx;
}
.box-title{
font-size: 28rpx;
margin-bottom: 20rpx;
}
.box-subtitle{
font-size: 24rpx;
}
}
}
.function-area { .function-area {
margin-top: 30rpx; margin-top: 30rpx;
border-radius: 16rpx; border-radius: 16rpx;

83
pages/login.vue
View File

@ -1,24 +1,29 @@
<template> <template>
<view class="normal-login-container"> <view class="normal-login-container">
<div class="logo"> <view class="logo">
<u-image src="../static/images/login/logo.jpg" width="120px" height="120px" /> <image src="/static/images/login/logo.png" style="width: 200rpx;height: 200rpx;" mode="aspectFit"></image>
</div> </view>
<view class="login-form-content"> <view class="login-form-content">
<view class="input-item"> <view class="input-item">
<div style="color: #777">手机号</div> <view style="color: #777;margin-bottom: 4px;">账号</view>
<!-- <u-input <!-- <u-input
v-model="loginForm.username" v-model="loginForm.username"
type="number" type="number"
placeholder="请输入手机号" placeholder="请输入账号"
border="none" border="none"
maxlength="11" maxlength="11"
></u-input> --> ></u-input> -->
<uni-easyinput v-model="loginForm.username" placeholder="请输入手机号" maxlength="11"/> <view style="padding: 10rpx;background: #F7F9FC;border-radius: 32rpx;width: 100%;">
<!-- <u-input v-model="loginForm.username" placeholder="请输入手机号" border="none" maxlength="11"></u-input> --> <uni-easyinput v-model="loginForm.username" placeholder="请输入账号" :inputBorder="false" maxlength="11" :styles="{backGround:'#F7F9FC'}"/>
</view>
<!-- <u-input v-model="loginForm.username" placeholder="请输入账号" border="none" maxlength="11"></u-input> -->
</view> </view>
<view class="input-item flex align-center"> <view class="input-item flex align-center">
<div style="color: #777">密码</div> <view style="color: #777;margin-bottom: 4px;">密码</view>
<uni-easyinput type="password" v-model="loginForm.password" placeholder="请输入密码" /> <view style="padding: 10rpx;background: #F7F9FC;border-radius: 32rpx;width: 100%;">
<uni-easyinput type="password" v-model="loginForm.password" placeholder="请输入密码" :inputBorder="false" :styles="{backGround:'#F7F9FC'}"/>
</view>
<!-- <u-input <!-- <u-input
v-model="loginForm.password" v-model="loginForm.password"
type="password" type="password"
@ -37,12 +42,12 @@
<!-- <u-radio-group v-model="remember" style="margin-bottom: 20px" @change="rememberPassword"> <!-- <u-radio-group v-model="remember" style="margin-bottom: 20px" @change="rememberPassword">
<u-radio label="记住密码" :name="rememberName"></u-radio> <u-radio label="记住密码" :name="rememberName"></u-radio>
</u-radio-group> --> </u-radio-group> -->
<u-checkbox-group v-model="remember" shape="circle" @change="rememberPassword" style="margin-bottom: 20px"> <u-checkbox-group v-model="remember" shape="circle" @change="rememberPassword" style="margin-bottom: 20px;margin-left: 20rpx;">
<u-checkbox label="记住密码" name="remember"></u-checkbox> <u-checkbox label="记住密码" name="remember"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<view class="action-btn"> <view class="action-btn" style="margin-top: 10vh;">
<u-button text="登录" shape="circle" color="#FF6F25" size="small" @click="handleLogin"></u-button> <u-button text="登录" shape="circle" color="#FF6F25" size="large " @click="handleLogin" style="height: 72rpx;font-weight: bold;"></u-button>
<div class="forget" @click="amendPassword">忘记密码?去修改</div> <view class="forget" @click="amendPassword">忘记密码?去修改</view>
</view> </view>
<!-- <view class="reg text-center" v-if="register"> <!-- <view class="reg text-center" v-if="register">
<text class="text-grey1">没有账号？</text> <text class="text-grey1">没有账号？</text>
@ -69,8 +74,10 @@ export default {
register: false, register: false,
globalConfig: getApp().globalData.config, globalConfig: getApp().globalData.config,
loginForm: { loginForm: {
username: uni.getStorageSync('remember') ? uni.getStorageSync('remember').username : '', // 账号 // username: uni.getStorageSync('remember') ? uni.getStorageSync('remember').username : '', // 账号
password: uni.getStorageSync('remember') ? uni.getStorageSync('remember').password : '', // 密码 1769fb2837e10e9d22c1c25add76355a', // bns - 1769fb2837e10e9d22c1c25add76355a // password: uni.getStorageSync('remember') ? uni.getStorageSync('remember').password : '', // 密码 1769fb2837e10e9d22c1c25add76355a', // bns - 1769fb2837e10e9d22c1c25add76355a
username: uni.getStorageSync('remember') ? uni.getStorageSync('username') : '', // 账号
password: uni.getStorageSync('remember') ? uni.getStorageSync('password') : '', // 密码 1769fb2837e10e9d22c1c25add76355a', // bns - 1769fb2837e10e9d22c1c25add76355a
loginType: '2', loginType: '2',
sourceType: 7, sourceType: 7,
code: '', code: '',
@ -79,8 +86,15 @@ export default {
remember: uni.getStorageSync('remember') ? uni.getStorageSync('remember').remember : [] remember: uni.getStorageSync('remember') ? uni.getStorageSync('remember').remember : []
} }
}, },
created() { onShow() {
// this.getCode() // console.log(uni.getStorageSync('remember'))
// console.log(uni.getStorageSync('username'))
// console.log(uni.getStorageSync('password'))
this.remember = uni.getStorageSync('remember') || []
this.loginForm.username = uni.getStorageSync('username')
if(this.remember.length>0){
this.loginForm.password = uni.getStorageSync('password')
}
}, },
methods: { methods: {
// 用户注册 // 用户注册
@ -129,6 +143,14 @@ export default {
this.loginForm.encryptPassword = AES.encrypt(this.loginForm.password) this.loginForm.encryptPassword = AES.encrypt(this.loginForm.password)
this.$store.dispatch('Login', this.loginForm).then(() => { this.$store.dispatch('Login', this.loginForm).then(() => {
this.$modal.closeLoading() // 关闭加载框 this.$modal.closeLoading() // 关闭加载框
if(this.remember.length>0){
uni.setStorageSync('username', this.loginForm.username)
uni.setStorageSync('password', this.loginForm.password)
}else{
uni.removeStorageSync('remember')
// uni.removeStorageSync('username')
uni.removeStorageSync('password')
}
this.loginSuccess() this.loginSuccess()
}).catch(() => { }).catch(() => {
// if (this.captchaEnabled) { // if (this.captchaEnabled) {
@ -149,13 +171,13 @@ export default {
rememberPassword(e) { rememberPassword(e) {
console.log(e) console.log(e)
if (e.length > 0) { if (e.length > 0) {
uni.setStorageSync('remember', { uni.setStorageSync('remember', e)
username: this.loginForm.username, uni.setStorageSync('username', this.loginForm.username)
password: this.loginForm.password, uni.setStorageSync('password', this.loginForm.password)
remember: e
})
} else { } else {
uni.removeStorageSync('remember') uni.removeStorageSync('remember')
// uni.removeStorageSync('username')
uni.removeStorageSync('password')
} }
}, },
// 忘记密码 // 忘记密码
@ -168,13 +190,17 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
page { page {
background-color: #ffffff; // background-color: #ffffff;
min-height: 100vh;
background-image: url('../static/images/login/back.png');
background-size: 100% 100%;
} }
.logo { .logo {
margin-top: 119px; padding-top: 10vh;
width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -186,6 +212,7 @@ page {
.normal-login-container { .normal-login-container {
width: 100%; width: 100%;
height: auto;
.logo-content { .logo-content {
width: 100%; width: 100%;
@ -194,7 +221,7 @@ page {
padding-top: 15%; padding-top: 15%;
image { image {
border-radius: 4px;
} }
.title { .title {
@ -204,13 +231,15 @@ page {
.login-form-content { .login-form-content {
text-align: center; text-align: center;
background: #FFF;
margin: 0 auto; margin: 0 auto;
width: 80%; width: 80%;
.input-item { .input-item {
margin: 0 auto 20px; margin: 0 auto 20px;
padding: 8px 15px; padding: 8px 15px;
background-color: #f5f6f7; // background-color: #F7F9FC;
// background-color: #f5f6f7;
/* height: 45px; */ /* height: 45px; */
border-radius: 3px; border-radius: 3px;
display: flex; display: flex;

75
pages/mine/about/index.vue
View File

@ -1,75 +0,0 @@
<template>
<view class="about-container">
<view class="header-section text-center">
<image style="width: 150rpx;height: 150rpx;" src="/static/logo200.png" mode="widthFix">
</image>
<uni-title type="h2" title="若依移动端"></uni-title>
</view>
<view class="content-section">
<view class="menu-list">
<view class="list-cell list-cell-arrow">
<view class="menu-item-box">
<view>版本信息</view>
<view class="text-right">v{{version}}</view>
</view>
</view>
<view class="list-cell list-cell-arrow">
<view class="menu-item-box">
<view>官方邮箱</view>
<view class="text-right">ruoyi@xx.com</view>
</view>
</view>
<view class="list-cell list-cell-arrow">
<view class="menu-item-box">
<view>服务热线</view>
<view class="text-right">400-999-9999</view>
</view>
</view>
<view class="list-cell list-cell-arrow">
<view class="menu-item-box">
<view>公司网站</view>
<view class="text-right">
<uni-link :href="url" :text="url" showUnderLine="false"></uni-link>
</view>
</view>
</view>
</view>
</view>
<view class="copyright">
<view>Copyright &copy; 2022 ruoyi.vip All Rights Reserved.</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
url: getApp().globalData.config.appInfo.site_url,
version: getApp().globalData.config.appInfo.version
}
}
}
</script>
<style lang="scss">
page {
background-color: #f8f8f8;
}
.copyright {
margin-top: 50rpx;
text-align: center;
line-height: 60rpx;
color: #999;
}
.header-section {
display: flex;
padding: 30rpx 0 0;
flex-direction: column;
align-items: center;
}
</style>

39
pages/mine/index.vue
View File

@ -25,7 +25,7 @@
<!-- 个人信息 --> <!-- 个人信息 -->
<view class="grid-item" @click="navigateTo('/pages/mine/me/index')"> <view class="grid-item" @click="navigateTo('/pages/mine/me/index')">
<view class="icon-wrapper"> <view class="icon-wrapper">
<image style="width: 28px;height: 28px;" src="/static/images/my/personalInfo.png"></image> <image style="width: 120rpx;height: 120rpx;" src="/static/images/my/personalInfo.png"></image>
</view> </view>
<text class="icon-text">个人信息</text> <text class="icon-text">个人信息</text>
</view> </view>
@ -33,7 +33,7 @@
<!-- 通知公告 --> <!-- 通知公告 -->
<view class="grid-item" @click="navigateTo('/pages/mine/announcement/index')"> <view class="grid-item" @click="navigateTo('/pages/mine/announcement/index')">
<view class="icon-wrapper"> <view class="icon-wrapper">
<image style="width: 28px;height: 28px;" src="/static/images/my/notice.png"></image> <image style="width: 120rpx;height: 120rpx;" src="/static/images/my/notice.png"></image>
</view> </view>
<text class="icon-text">通知公告</text> <text class="icon-text">通知公告</text>
</view> </view>
@ -41,7 +41,7 @@
<!-- 投诉建议 --> <!-- 投诉建议 -->
<view class="grid-item" @click="navigateTo('/pages/feedback/index')"> <view class="grid-item" @click="navigateTo('/pages/feedback/index')">
<view class="icon-wrapper"> <view class="icon-wrapper">
<image style="width: 28px;height: 28px;" src="/static/images/my/complaints.png"></image> <image style="width: 120rpx;height: 120rpx;" src="/static/images/my/complaints.png"></image>
</view> </view>
<text class="icon-text">投诉建议</text> <text class="icon-text">投诉建议</text>
</view> </view>
@ -49,7 +49,7 @@
<!-- 食堂评价 --> <!-- 食堂评价 -->
<view class="grid-item" @click="navigateTo('/pages/review/index')"> <view class="grid-item" @click="navigateTo('/pages/review/index')">
<view class="icon-wrapper"> <view class="icon-wrapper">
<image style="width: 28px;height: 28px;" src="/static/images/my/evaluation.png"></image> <image style="width: 120rpx;height: 120rpx;" src="/static/images/my/evaluation.png"></image>
</view> </view>
<text class="icon-text">食堂评价</text> <text class="icon-text">食堂评价</text>
</view> </view>
@ -57,7 +57,7 @@
<!-- 体检报告 --> <!-- 体检报告 -->
<view class="grid-item" @click="navigateTo('/pages/survey/index')"> <view class="grid-item" @click="navigateTo('/pages/survey/index')">
<view class="icon-wrapper"> <view class="icon-wrapper">
<image style="width: 28px;height: 28px;" src="/static/images/my/report.png"></image> <image style="width: 120rpx;height: 120rpx;" src="/static/images/my/report.png"></image>
</view> </view>
<text class="icon-text">健康监测</text> <text class="icon-text">健康监测</text>
</view> </view>
@ -205,13 +205,29 @@
url url
}) })
} }
} },
// onUnload() {
// uni.switchTab({
// url: '/pages/index'
// })
// },
// onBackPress(e) {
// //e.from === 'backbutton' 说明如果点击的是物理返回键或导航栏的返回键就进行以下操作
// if (e.from === 'backbutton') {
// //返回值为true 时,表示不执行默认的返回（默认返回上一页），执行自定义的返回
// uni.switchTab({
// url: '/pages/index'
// })
// //如果要限制必须写成true
// return true;
// }
// }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.container { .container {
min-height: 10vh; height: 90vh;
background-color: #F9FBFF; background-color: #F9FBFF;
} }
@ -231,7 +247,7 @@
align-items: center; align-items: center;
padding: 16px; padding: 16px;
background: #fff; background: #fff;
margin-bottom: 10px; margin-bottom: 20px;
.avatar-wrapper { .avatar-wrapper {
margin-right: 12px; margin-right: 12px;
@ -262,6 +278,7 @@
.services { .services {
background: #fff; background: #fff;
padding: 16px; padding: 16px;
height: 80vh;
.services-title { .services-title {
font-size: 16px; font-size: 16px;
@ -282,8 +299,8 @@
align-items: center; align-items: center;
.icon-wrapper { .icon-wrapper {
width: 48px; // width: 48px;
height: 48px; // height: 48px;
//border-radius: 24px; //border-radius: 24px;
//background: #f5f5f5; //background: #f5f5f5;
display: flex; display: flex;
@ -294,7 +311,7 @@
.icon-text { .icon-text {
font-size: 14px; font-size: 14px;
color: #666; color: #0F274B;
} }
} }
} }

3
pages/mine/me/basicInfo.vue
View File

@ -154,7 +154,8 @@
getUserInfo() { getUserInfo() {
getUserProfile({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(res => { getUserProfile({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(res => {
this.userInfo = res.data; this.userInfo = res.data;
this.userInfo.sexStr = this.columns[0][(this.userInfo.sex-1)] this.userInfo.sex = this.userInfo.sex-1
this.userInfo.sexStr = this.columns[0][this.userInfo.sex]
console.log('this.userInfo',this.userInfo) console.log('this.userInfo',this.userInfo)
}) })
}, },

4
pages/mine/me/healthInformation.vue
View File

@ -190,7 +190,9 @@ export default {
} }
const res = await healthDetailApi(param) const res = await healthDetailApi(param)
this.form = res.data; this.form = res.data;
if(this.form.chronicIds){
this.form.chronicDiseases = this.form.chronicIds.split(",") this.form.chronicDiseases = this.form.chronicIds.split(",")
}
console.log(res, '详情') console.log(res, '详情')
}, },
@ -243,7 +245,9 @@ export default {
this.$refs.uForm.validate().then(valid => { this.$refs.uForm.validate().then(valid => {
if (valid) { if (valid) {
console.log('Form submitted:', this.form); console.log('Form submitted:', this.form);
if(this.form.chronicDiseases&&this.form.chronicDiseases.length>0){
this.form.chronicIds = this.form.chronicDiseases.join(",") this.form.chronicIds = this.form.chronicDiseases.join(",")
}
editHealthInfoApi(this.form).then((res) => { editHealthInfoApi(this.form).then((res) => {
uni.$u.toast('保存成功'); uni.$u.toast('保存成功');
this.getHealthDetail() this.getHealthDetail()

5
pages/mine/me/index.vue
View File

@ -87,7 +87,8 @@ export default {
onLoginOut() { onLoginOut() {
this.$modal.confirm('确定注销并退出系统吗？').then(() => { this.$modal.confirm('确定注销并退出系统吗？').then(() => {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
this.$tab.reLaunch('/pages/login') uni.reLaunch({ url: '/pages/login' })
// this.$tab.reLaunch('/pages/login')
}) })
}) })
}, },
@ -130,7 +131,7 @@ export default {
.container { .container {
margin-top: -20px; margin-top: -20px;
background-color: #FFFFFF; background-color: #FFFFFF;
height: 95vh; height: 100vh;
position: relative; position: relative;
} }

78
pages/mine/setting/index.vue
View File

@ -1,78 +0,0 @@
<template>
<view class="setting-container" :style="{height: `${windowHeight}px`}">
<view class="menu-list">
<view class="list-cell list-cell-arrow" @click="handleToPwd">
<view class="menu-item-box">
<view class="iconfont icon-password menu-icon"></view>
<view>修改密码</view>
</view>
</view>
<view class="list-cell list-cell-arrow" @click="handleToUpgrade">
<view class="menu-item-box">
<view class="iconfont icon-refresh menu-icon"></view>
<view>检查更新</view>
</view>
</view>
<view class="list-cell list-cell-arrow" @click="handleCleanTmp">
<view class="menu-item-box">
<view class="iconfont icon-clean menu-icon"></view>
<view>清理缓存</view>
</view>
</view>
</view>
<view class="cu-list menu">
<view class="cu-item item-box">
<view class="content text-center" @click="handleLogout">
<text class="text-black">退出登录</text>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
windowHeight: uni.getSystemInfoSync().windowHeight
}
},
methods: {
handleToPwd() {
this.$tab.navigateTo('/pages/mine/pwd/index')
},
handleToUpgrade() {
this.$modal.showToast('模块建设中~')
},
handleCleanTmp() {
this.$modal.showToast('模块建设中~')
},
handleLogout() {
this.$modal.confirm('确定注销并退出系统吗？').then(() => {
this.$store.dispatch('LogOut').then(() => {
this.$tab.reLaunch('/pages/login')
})
})
}
}
}
</script>
<style lang="scss" scoped>
.page {
background-color: #f8f8f8;
}
.item-box {
background-color: #FFFFFF;
margin: 30rpx;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 10rpx;
border-radius: 8rpx;
color: #303133;
font-size: 32rpx;
}
</style>

2
pages/remainingSum/index.vue
View File

@ -4,7 +4,7 @@
<div class="content"> <div class="content">
<div class="top-cont"> <div class="top-cont">
<div>总余额(元)</div> <div>总余额(元)</div>
<div class="acc-bal">{{ (balanceInfo.walletBal/100).toFixed(2) }}</div> <div class="acc-bal">{{ (balanceInfo.accAllBal/100).toFixed(2) }}</div>
<div class="money"> <div class="money">
<div class="money-item"> <div class="money-item">
<div>个人钱包</div> <div>个人钱包</div>

38
pages/system.vue
View File

@ -52,7 +52,12 @@ export default {
handleItem(index) { handleItem(index) {
console.log(index) console.log(index)
if (index === 0) { if (index === 0) {
this.$tab.reLaunch('/pages/index') // uni.switchTab({
// url: '/pages/index'
// })
this.$router.push({ path: '/pages/index' })
// this.$tab.navigateTo('/pages/index')
// this.$tab.reLaunch('/pages/index')
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/index' // url: '/pages/index'
// }); // });
@ -69,7 +74,36 @@ export default {
// }); // });
} }
} }
} },
onUnload() {
// uni.showModal({
// title: "提示",
// content: "是否确认退出，您可以继续留在该页面，或者重新登录?",
// success: function (res) {
// if (res.confirm) {
// uni.redirectTo({ url: `/pages/login` });
// }
// }
// })
},
// onBackPress(e) {
// console.log(e)
// //e.from === 'backbutton' 说明如果点击的是物理返回键或导航栏的返回键就进行以下操作
// if (e.from === 'backbutton') {
// //返回值为true 时,表示不执行默认的返回（默认返回上一页），执行自定义的返回
// uni.showModal({
// title: "提示",
// content: "是否确认退出，您可以继续留在该页面，或者重新登录?",
// success: function (res) {
// if (res.confirm) {
// uni.redirectTo({ url: `/pages/login` });
// }
// }
// })
// //如果要限制必须写成true
// return true;
// }
// },
} }
</script> </script>

26
pages/work/index.vue
View File

@ -47,7 +47,7 @@
<span style="color: #0f274b">{{ item.canteenName }}</span> <span style="color: #0f274b">{{ item.canteenName }}</span>
<span class="intervalName">{{ item.mealtimeName }}</span> <span class="intervalName">{{ item.mealtimeName }}</span>
</view> </view>
<view style="color: rgba(15, 39, 75, 0.8)">就餐时间：{{ item.orderDate }}</view> <view style="color: rgba(15, 39, 75, 0.8)">就餐日期：{{ item.orderDate }}</view>
</view> </view>
<view class="img-cont" @click="goDetail(item)"> <view class="img-cont" @click="goDetail(item)">
<view class="img" v-for="(goods, index) in item.orderDetailList" :key="index"> <view class="img" v-for="(goods, index) in item.orderDetailList" :key="index">
@ -63,7 +63,7 @@
</view> </view>
</view> </view>
<view class="btn-cont"> <view class="btn-cont">
<view v-if="item.orderState != 3"> <view v-if="item.orderState == 2">
<u-button size="small" style="background: #ff6816;color: #FFF;" @click="goEvaluate(item)">评价</u-button> <u-button size="small" style="background: #ff6816;color: #FFF;" @click="goEvaluate(item)">评价</u-button>
</view> </view>
<view v-if="item.orderState == 3"> <view v-if="item.orderState == 3">
@ -188,7 +188,7 @@ export default {
searchValue: '', searchValue: '',
searchType:'', searchType:'',
status: 'loadmore', status: 'loadmore',
tabList: ['全部订单', '待评价', '退款'], tabList: ['全部订单', '待评价', '待支付', '退款'],
dateValue:new Date(), dateValue:new Date(),
dateValue2:new Date(), dateValue2:new Date(),
sourceTypeList:[], sourceTypeList:[],
@ -355,6 +355,8 @@ export default {
if(index==1){ if(index==1){
this.searchType="3" this.searchType="3"
}else if(index==2){ }else if(index==2){
this.searchType="4"
}else if(index==3){
this.searchType="2" this.searchType="2"
}else{ }else{
this.searchType="" this.searchType=""
@ -471,7 +473,23 @@ export default {
url: `/pages/work/evaluateCenter?startDate=${this.startDate}&endDate=${this.endDate}` url: `/pages/work/evaluateCenter?startDate=${this.startDate}&endDate=${this.endDate}`
}) })
}, },
} },
// onUnload() {
// uni.switchTab({
// url: '/pages/index'
// })
// },
// onBackPress(e) {
// //e.from === 'backbutton' 说明如果点击的是物理返回键或导航栏的返回键就进行以下操作
// if (e.from === 'backbutton') {
// //返回值为true 时,表示不执行默认的返回（默认返回上一页），执行自定义的返回
// uni.switchTab({
// url: '/pages/index'
// })
// //如果要限制必须写成true
// return true;
// }
// },
} }
</script> </script>

BIN
static/images/index/balance.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/images/index/balance2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
static/images/index/code.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/images/index/code2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
static/images/index/food.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
static/images/index/food2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/images/index/weeklyMenu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
static/images/index/weeklyMenu2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
static/images/login/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

BIN
static/images/login/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

0
static/images/login/logo.jpg → static/images/login/logo2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 190 KiB

After

Width:  |  Height:  |  Size: 190 KiB

BIN
static/images/my/complaints.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 22 KiB

BIN
static/images/my/complaints2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 550 B

BIN
static/images/my/evaluation.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 22 KiB

BIN
static/images/my/evaluation2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

BIN
static/images/my/notice.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
static/images/my/notice2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
static/images/my/personalInfo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
static/images/my/personalInfo2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/my/report.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 22 KiB

BIN
static/images/my/report2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 456 B