样式修改测试问题修改
This commit is contained in:
parent
da837ff623
commit
1c3ccd3564
22
pages.json
22
pages.json
|
|
@ -3,7 +3,6 @@
|
|||
"^u-(.*)": "uni_modules/uview-ui/components/u-$1/u-$1.vue"
|
||||
},
|
||||
"pages": [
|
||||
|
||||
{
|
||||
"path": "pages/login",
|
||||
"style": {
|
||||
|
|
@ -11,12 +10,11 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/system",
|
||||
"style": {
|
||||
"navigationBarTitleText": "皖送e餐"
|
||||
}
|
||||
"path": "pages/system",
|
||||
"style": {
|
||||
"navigationBarTitleText": "皖送e餐"
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path": "pages/shared-station",
|
||||
"style": {
|
||||
|
|
@ -140,24 +138,12 @@
|
|||
"navigationBarTitleText": "修改密码"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/setting/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "应用设置"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/help/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "常见问题"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/about/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "关于我们"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/common/webview/index",
|
||||
"style": {
|
||||
|
|
|
|||
|
|
@ -106,11 +106,11 @@
|
|||
</view>
|
||||
|
||||
<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}}
|
||||
<span class="name-type">{{ canteenType }}</span>
|
||||
</view>
|
||||
<view>
|
||||
<view style="font-size: 14px;">
|
||||
{{ newDate2 }}
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -137,21 +137,19 @@
|
|||
</view>
|
||||
<view class="right-cont">
|
||||
<view class="num-wrap" v-if="food.isDfficacy==1">
|
||||
<view style="width: 26rpx;">
|
||||
<view style="width: 40rpx;" @click="handleFoodNum(1, food)">
|
||||
<u-icon
|
||||
v-if="food.quantity > 0"
|
||||
name="../../static/images/del.png"
|
||||
size="16"
|
||||
@click="handleFoodNum(1, food)"
|
||||
size="16"
|
||||
/>
|
||||
</view>
|
||||
<span class="cont-num">{{ food.quantity || 0 }}</span>
|
||||
<view style="width: 26rpx;">
|
||||
<view style="width: 40rpx;" @click="handleFoodNum(2, food)">
|
||||
<u-icon
|
||||
v-if="food.quantity<food.restrictNum"
|
||||
name="../../static/images/add2.png"
|
||||
size="16"
|
||||
@click="handleFoodNum(2, food)"
|
||||
size="18"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -262,7 +260,8 @@ export default {
|
|||
async getMenuListData() {
|
||||
let param = {
|
||||
"recipeId":this.recipeId,
|
||||
"applyDate":this.newDate2,
|
||||
"applyDate":this.newDate2,
|
||||
// "applyDate":"2025-02-11",
|
||||
}
|
||||
const res = await getAdvanceDetailListAPI(param)
|
||||
console.log(res, '预订餐菜谱')
|
||||
|
|
@ -838,7 +837,7 @@ page {
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 12px;
|
||||
font-size: 14px;
|
||||
color: #0f274b;
|
||||
|
||||
// 第二个展示左右边框
|
||||
|
|
@ -881,6 +880,8 @@ page {
|
|||
color: #0f274b;
|
||||
|
||||
.name-type {
|
||||
width: 42px;
|
||||
text-align: center;
|
||||
margin-left: 5px;
|
||||
font-weight: 400;
|
||||
font-size: 10px;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<!-- 有效期 -->
|
||||
<view class="valid-time">有效时间15分钟</view>
|
||||
<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>
|
||||
|
|
@ -105,10 +105,10 @@
|
|||
}
|
||||
|
||||
.refresh-button {
|
||||
width: 70%;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
display: flex;
|
||||
justify-self: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.login-btn {
|
||||
|
|
|
|||
365
pages/index.vue
365
pages/index.vue
|
|
@ -6,14 +6,16 @@
|
|||
placeholder
|
||||
@leftClick="leftClick"
|
||||
leftIconColor="#000"
|
||||
rightIcon="list"
|
||||
@rightClick="onRefreshPages"
|
||||
|
||||
bgColor="#fff"
|
||||
:titleStyle="{ color: '#000', fontSize: '32rpx' }"
|
||||
>
|
||||
<view class="u-nav-slot" slot="right">
|
||||
<!--
|
||||
rightIcon="list"
|
||||
@rightClick="onRefreshPages"
|
||||
<view class="u-nav-slot" slot="right">
|
||||
<text style="color: #000" @tap="onRefreshPages">刷新</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</u-navbar>
|
||||
<view class="header">
|
||||
<text class="header-text">皖送e餐</text>
|
||||
|
|
@ -21,17 +23,59 @@
|
|||
<!-- 轮播图 -->
|
||||
<u-swiper :list="bannerList" @change="handleSwiperChange" :autoplay="true" :interval="3000"></u-swiper>
|
||||
<!-- 指示器 -->
|
||||
<view class="external-indicator">
|
||||
<!-- <view class="external-indicator">
|
||||
<view
|
||||
v-for="(item, index) in bannerList"
|
||||
:key="index"
|
||||
class="indicator-dot"
|
||||
: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 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="icon-box menu">
|
||||
<image src="/static/images/index/weeklyMenu.png" mode="aspectFit"></image>
|
||||
|
|
@ -44,33 +88,30 @@
|
|||
</view>
|
||||
<text class="function-text">预订餐</text>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<!-- 底部信息区 -->
|
||||
<view class="bottom-info">
|
||||
<!-- 左侧二维码区域 -->
|
||||
<view class="qr-area" @click="goCode">
|
||||
<view class="qr-title">个人二维码</view>
|
||||
<view class="qr-subtitle">核身、支付、核销</view>
|
||||
<view class="qr-code">
|
||||
<image src="/static/images/index/code.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 右侧余额区域 -->
|
||||
<view class="balance-area">
|
||||
<view class="balance-text" @click="goToRemainingSum">
|
||||
<text class="balance-label">余额/充值</text>
|
||||
<view class="balance-amount">
|
||||
<text class="currency">¥</text>
|
||||
<text class="amount">{{ (walletBal/100).toFixed(2) }}</text>
|
||||
</view>
|
||||
<view class="wallet-icon">
|
||||
<image src="/static/images/index/balance.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="bottom-info">
|
||||
<view class="qr-area" @click="goCode">
|
||||
<view class="qr-title">个人二维码</view>
|
||||
<view class="qr-subtitle">核身、支付、核销</view>
|
||||
<view class="qr-code">
|
||||
<image src="/static/images/index/code.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="balance-area">
|
||||
<view class="balance-text" @click="goToRemainingSum">
|
||||
<text class="balance-label">余额/充值</text>
|
||||
<view class="balance-amount">
|
||||
<text class="currency">¥</text>
|
||||
<text class="amount">{{ (walletBal/100).toFixed(2) }}</text>
|
||||
</view>
|
||||
<view class="wallet-icon">
|
||||
<image src="/static/images/index/balance.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<u-popup :show="showNotice" mode="center" @close="close" @open="open" >
|
||||
<view style="width: 70vw;height: 30vh;">
|
||||
|
|
@ -117,7 +158,7 @@ export default {
|
|||
noticeData:{}
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
onShow() {
|
||||
this.getUserInfo()
|
||||
this.getWalletBalanceData(uni.getStorageSync('custId') || '')
|
||||
this.getOrderQRCodeData(uni.getStorageSync('custId') || '')
|
||||
|
|
@ -125,114 +166,127 @@ export default {
|
|||
this.timer = setInterval(() => {
|
||||
this.getWalletBalanceData(uni.getStorageSync('custId')||'')
|
||||
}, 10000)
|
||||
},
|
||||
console.log(uni.getStorageSync('remember'))
|
||||
},
|
||||
onUnload() {
|
||||
clearInterval(this.timer)
|
||||
this.timer = null
|
||||
this.timer = null;
|
||||
uni.navigateBack()
|
||||
// uni.navigateTo({ url: '/pages/system' })
|
||||
},
|
||||
methods: {
|
||||
leftClick() {
|
||||
// console.log('返回')
|
||||
uni.navigateTo({ url: '/pages/system' })
|
||||
},
|
||||
/* 刷新页面 */
|
||||
onRefreshPages() {
|
||||
uni.reLaunch({
|
||||
url: '/pages/index'
|
||||
})
|
||||
},
|
||||
//获取用户信息
|
||||
getUserInfo(){
|
||||
getInfoNewAPI({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(result => {
|
||||
// console.log(result)
|
||||
uni.setStorageSync('openId', result.data.openid)
|
||||
uni.setStorageSync('placeId', result.data.placeId)
|
||||
leftClick() {
|
||||
// console.log('返回')
|
||||
uni.navigateTo({ url: '/pages/system' })
|
||||
},
|
||||
/* 刷新页面 */
|
||||
onRefreshPages() {
|
||||
uni.reLaunch({
|
||||
url: '/pages/index'
|
||||
})
|
||||
},
|
||||
//获取用户信息
|
||||
getUserInfo(){
|
||||
getInfoNewAPI({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(result => {
|
||||
// console.log(result)
|
||||
uni.setStorageSync('openId', result.data.openid)
|
||||
uni.setStorageSync('placeId', result.data.placeId)
|
||||
})
|
||||
},
|
||||
changeSwiper(e) {
|
||||
this.current = e.detail.current
|
||||
},
|
||||
goToMenu() {
|
||||
// 跳转到菜单页面
|
||||
uni.navigateTo({
|
||||
url: '/pages/weeklyMenu/index'
|
||||
})
|
||||
},
|
||||
changeSwiper(e) {
|
||||
this.current = e.detail.current
|
||||
},
|
||||
goToMenu() {
|
||||
// 跳转到菜单页面
|
||||
uni.navigateTo({
|
||||
url: '/pages/weeklyMenu/index'
|
||||
})
|
||||
},
|
||||
goToOrder() {
|
||||
// 跳转到订餐页面
|
||||
uni.navigateTo({
|
||||
// url: '/pages/advanceOrder/index'
|
||||
url: '/pages/advanceOrder/stopperSelection/index'
|
||||
})
|
||||
},
|
||||
goCode() {
|
||||
// 跳转到订餐页面
|
||||
uni.navigateTo({
|
||||
url: '/pages/code/index'
|
||||
})
|
||||
},
|
||||
handleSwiperChange(e) {
|
||||
this.current = e.current // 更新当前活动的指示点索引
|
||||
},
|
||||
goToRemainingSum() {
|
||||
// 跳转到余额/充值页面
|
||||
uni.navigateTo({
|
||||
url: '/pages/remainingSum/index'
|
||||
})
|
||||
},
|
||||
// 获取钱包余额
|
||||
async getWalletBalanceData(custId) {
|
||||
let param = {
|
||||
"custId": custId.toString(),
|
||||
"openid": uni.getStorageSync('openId'),
|
||||
"sourceType": "1"
|
||||
},
|
||||
goToOrder() {
|
||||
// 跳转到订餐页面
|
||||
uni.navigateTo({
|
||||
// url: '/pages/advanceOrder/index'
|
||||
url: '/pages/advanceOrder/stopperSelection/index'
|
||||
})
|
||||
},
|
||||
goCode() {
|
||||
// 跳转到订餐页面
|
||||
uni.navigateTo({
|
||||
url: '/pages/code/index'
|
||||
})
|
||||
},
|
||||
handleSwiperChange(e) {
|
||||
this.current = e.current // 更新当前活动的指示点索引
|
||||
},
|
||||
goToRemainingSum() {
|
||||
// 跳转到余额/充值页面
|
||||
uni.navigateTo({
|
||||
url: '/pages/remainingSum/index'
|
||||
})
|
||||
},
|
||||
// 获取钱包余额
|
||||
async getWalletBalanceData(custId) {
|
||||
let param = {
|
||||
"custId": custId.toString(),
|
||||
"openid": uni.getStorageSync('openId'),
|
||||
"sourceType": "1"
|
||||
}
|
||||
const { data: res } = await getWalletBalanceAPI(param)
|
||||
this.walletBal = res.walletBal
|
||||
// console.log(res, '余额信息--')
|
||||
},
|
||||
// 获取二维码
|
||||
async getOrderQRCodeData(custId) {
|
||||
const res = await getOrderQRCodeAPI({ custId })
|
||||
// console.log(res, '二维码信息--')
|
||||
},
|
||||
//通知消息数量
|
||||
async getUnReadNoticeNum() {
|
||||
let param = {
|
||||
"custId": uni.getStorageSync('custId'),
|
||||
}
|
||||
const res = await queryUnreadInformNumApi(param)
|
||||
console.log(res, '通知消息数量--')
|
||||
this.messageNumber = Number(res.data)
|
||||
if(this.messageNumber>0){
|
||||
this.getqueryUserInform()
|
||||
}
|
||||
|
||||
},
|
||||
//获取通知消息
|
||||
async getqueryUserInform() {
|
||||
let param = {
|
||||
"current": 1,
|
||||
"size": 10,
|
||||
"custId": uni.getStorageSync('custId'),
|
||||
}
|
||||
const res = await queryUserInformApi(param)
|
||||
console.log(res, '通知消息--')
|
||||
if(res.records.length>0){
|
||||
this.noticeData=res.records[0]
|
||||
this.showNotice=true
|
||||
}
|
||||
},
|
||||
open() {
|
||||
// console.log('open');
|
||||
},
|
||||
close() {
|
||||
this.showNotice = false
|
||||
// console.log('close');
|
||||
}
|
||||
const { data: res } = await getWalletBalanceAPI(param)
|
||||
this.walletBal = res.walletBal
|
||||
// console.log(res, '余额信息--')
|
||||
},
|
||||
// 获取二维码
|
||||
async getOrderQRCodeData(custId) {
|
||||
const res = await getOrderQRCodeAPI({ custId })
|
||||
// console.log(res, '二维码信息--')
|
||||
},
|
||||
//通知消息数量
|
||||
async getUnReadNoticeNum() {
|
||||
let param = {
|
||||
"custId": uni.getStorageSync('custId'),
|
||||
}
|
||||
const res = await queryUnreadInformNumApi(param)
|
||||
console.log(res, '通知消息数量--')
|
||||
this.messageNumber = Number(res.data)
|
||||
if(this.messageNumber>0){
|
||||
this.getqueryUserInform()
|
||||
}
|
||||
|
||||
},
|
||||
//获取通知消息
|
||||
async getqueryUserInform() {
|
||||
let param = {
|
||||
"current": 1,
|
||||
"size": 10,
|
||||
"custId": uni.getStorageSync('custId'),
|
||||
}
|
||||
const res = await queryUserInformApi(param)
|
||||
console.log(res, '通知消息--')
|
||||
if(res.records.length>0){
|
||||
this.noticeData=res.records[0]
|
||||
this.showNotice=true
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
open() {
|
||||
// console.log('open');
|
||||
},
|
||||
close() {
|
||||
this.showNotice = false
|
||||
// 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>
|
||||
|
||||
|
|
@ -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 {
|
||||
margin-top: 30rpx;
|
||||
border-radius: 16rpx;
|
||||
|
|
|
|||
213
pages/login.vue
213
pages/login.vue
|
|
@ -1,24 +1,29 @@
|
|||
<template>
|
||||
<view class="normal-login-container">
|
||||
<div class="logo">
|
||||
<u-image src="../static/images/login/logo.jpg" width="120px" height="120px" />
|
||||
</div>
|
||||
<view class="logo">
|
||||
<image src="/static/images/login/logo.png" style="width: 200rpx;height: 200rpx;" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="login-form-content">
|
||||
<view class="input-item">
|
||||
<div style="color: #777">手机号</div>
|
||||
<view style="color: #777;margin-bottom: 4px;">账号</view>
|
||||
<!-- <u-input
|
||||
v-model="loginForm.username"
|
||||
type="number"
|
||||
placeholder="请输入手机号"
|
||||
placeholder="请输入账号"
|
||||
border="none"
|
||||
maxlength="11"
|
||||
></u-input> -->
|
||||
<uni-easyinput v-model="loginForm.username" placeholder="请输入手机号" maxlength="11"/>
|
||||
<!-- <u-input v-model="loginForm.username" placeholder="请输入手机号" border="none" maxlength="11"></u-input> -->
|
||||
<view style="padding: 10rpx;background: #F7F9FC;border-radius: 32rpx;width: 100%;">
|
||||
<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 class="input-item flex align-center">
|
||||
<div style="color: #777">密码</div>
|
||||
<uni-easyinput type="password" v-model="loginForm.password" placeholder="请输入密码" />
|
||||
<view style="color: #777;margin-bottom: 4px;">密码</view>
|
||||
<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
|
||||
v-model="loginForm.password"
|
||||
type="password"
|
||||
|
|
@ -37,12 +42,12 @@
|
|||
<!-- <u-radio-group v-model="remember" style="margin-bottom: 20px" @change="rememberPassword">
|
||||
<u-radio label="记住密码" :name="rememberName"></u-radio>
|
||||
</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-group>
|
||||
<view class="action-btn">
|
||||
<u-button text="登录" shape="circle" color="#FF6F25" size="small" @click="handleLogin"></u-button>
|
||||
<div class="forget" @click="amendPassword">忘记密码?去修改</div>
|
||||
<view class="action-btn" style="margin-top: 10vh;">
|
||||
<u-button text="登录" shape="circle" color="#FF6F25" size="large " @click="handleLogin" style="height: 72rpx;font-weight: bold;"></u-button>
|
||||
<view class="forget" @click="amendPassword">忘记密码?去修改</view>
|
||||
</view>
|
||||
<!-- <view class="reg text-center" v-if="register">
|
||||
<text class="text-grey1">没有账号？</text>
|
||||
|
|
@ -69,9 +74,11 @@ export default {
|
|||
register: false,
|
||||
globalConfig: getApp().globalData.config,
|
||||
loginForm: {
|
||||
username: uni.getStorageSync('remember') ? uni.getStorageSync('remember').username : '', // 账号
|
||||
password: uni.getStorageSync('remember') ? uni.getStorageSync('remember').password : '', // 密码 1769fb2837e10e9d22c1c25add76355a', // bns - 1769fb2837e10e9d22c1c25add76355a
|
||||
loginType: '2',
|
||||
// username: uni.getStorageSync('remember') ? uni.getStorageSync('remember').username : '', // 账号
|
||||
// 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',
|
||||
sourceType: 7,
|
||||
code: '',
|
||||
uuid: ''
|
||||
|
|
@ -79,8 +86,15 @@ export default {
|
|||
remember: uni.getStorageSync('remember') ? uni.getStorageSync('remember').remember : []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// this.getCode()
|
||||
onShow() {
|
||||
// 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: {
|
||||
// 用户注册
|
||||
|
|
@ -123,13 +137,21 @@ export default {
|
|||
},
|
||||
// 密码登录
|
||||
async pwdLogin() {
|
||||
console.log(this.loginForm)
|
||||
console.log(this.loginForm)
|
||||
// console.log(AES.encrypt(this.loginForm.password))
|
||||
// console.log(AES.decrypt("PCAGz8j5ByU2AzoT6vtlLA=="))
|
||||
this.loginForm.encryptPassword = AES.encrypt(this.loginForm.password)
|
||||
this.$store.dispatch('Login', this.loginForm).then(() => {
|
||||
this.$modal.closeLoading() // 关闭加载框
|
||||
this.loginSuccess()
|
||||
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()
|
||||
}).catch(() => {
|
||||
// if (this.captchaEnabled) {
|
||||
// this.getCode()
|
||||
|
|
@ -149,13 +171,13 @@ export default {
|
|||
rememberPassword(e) {
|
||||
console.log(e)
|
||||
if (e.length > 0) {
|
||||
uni.setStorageSync('remember', {
|
||||
username: this.loginForm.username,
|
||||
password: this.loginForm.password,
|
||||
remember: e
|
||||
})
|
||||
uni.setStorageSync('remember', e)
|
||||
uni.setStorageSync('username', this.loginForm.username)
|
||||
uni.setStorageSync('password', this.loginForm.password)
|
||||
} else {
|
||||
uni.removeStorageSync('remember')
|
||||
// uni.removeStorageSync('username')
|
||||
uni.removeStorageSync('password')
|
||||
}
|
||||
},
|
||||
// 忘记密码
|
||||
|
|
@ -168,13 +190,17 @@ export default {
|
|||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style lang="scss" scoped>
|
||||
page {
|
||||
background-color: #ffffff;
|
||||
// background-color: #ffffff;
|
||||
min-height: 100vh;
|
||||
background-image: url('../static/images/login/back.png');
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
|
||||
.logo {
|
||||
margin-top: 119px;
|
||||
padding-top: 10vh;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
|
@ -183,81 +209,84 @@ page {
|
|||
margin-top: 20px;
|
||||
color: $u-primary;
|
||||
}
|
||||
|
||||
|
||||
.normal-login-container {
|
||||
width: 100%;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
|
||||
.logo-content {
|
||||
width: 100%;
|
||||
font-size: 21px;
|
||||
text-align: center;
|
||||
padding-top: 15%;
|
||||
.logo-content {
|
||||
width: 100%;
|
||||
font-size: 21px;
|
||||
text-align: center;
|
||||
padding-top: 15%;
|
||||
|
||||
image {
|
||||
border-radius: 4px;
|
||||
}
|
||||
image {
|
||||
|
||||
}
|
||||
|
||||
.title {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
.title {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.login-form-content {
|
||||
text-align: center;
|
||||
background: #FFF;
|
||||
margin: 0 auto;
|
||||
width: 80%;
|
||||
|
||||
.login-form-content {
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
width: 80%;
|
||||
.input-item {
|
||||
margin: 0 auto 20px;
|
||||
padding: 8px 15px;
|
||||
// background-color: #F7F9FC;
|
||||
// background-color: #f5f6f7;
|
||||
/* height: 45px; */
|
||||
border-radius: 3px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
align-items: flex-start;
|
||||
|
||||
.input-item {
|
||||
margin: 0 auto 20px;
|
||||
padding: 8px 15px;
|
||||
background-color: #f5f6f7;
|
||||
/* height: 45px; */
|
||||
border-radius: 3px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
align-items: flex-start;
|
||||
.icon {
|
||||
font-size: 38rpx;
|
||||
margin-left: 10px;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.icon {
|
||||
font-size: 38rpx;
|
||||
margin-left: 10px;
|
||||
color: #999;
|
||||
}
|
||||
.input {
|
||||
width: 100%;
|
||||
font-size: 14px;
|
||||
line-height: 20px;
|
||||
text-align: left;
|
||||
padding-left: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.input {
|
||||
width: 100%;
|
||||
font-size: 14px;
|
||||
line-height: 20px;
|
||||
text-align: left;
|
||||
padding-left: 15px;
|
||||
}
|
||||
}
|
||||
.login-btn {
|
||||
margin-top: 40px;
|
||||
height: 45px;
|
||||
}
|
||||
|
||||
.login-btn {
|
||||
margin-top: 40px;
|
||||
height: 45px;
|
||||
}
|
||||
.reg {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.reg {
|
||||
margin-top: 15px;
|
||||
}
|
||||
.xieyi {
|
||||
color: #333;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.xieyi {
|
||||
color: #333;
|
||||
margin-top: 20px;
|
||||
}
|
||||
.login-code {
|
||||
height: 38px;
|
||||
float: right;
|
||||
|
||||
.login-code {
|
||||
height: 38px;
|
||||
float: right;
|
||||
|
||||
.login-code-img {
|
||||
height: 38px;
|
||||
position: absolute;
|
||||
margin-left: 10px;
|
||||
width: 200rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.login-code-img {
|
||||
height: 38px;
|
||||
position: absolute;
|
||||
margin-left: 10px;
|
||||
width: 200rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -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 © 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>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<!-- 个人信息 -->
|
||||
<view class="grid-item" @click="navigateTo('/pages/mine/me/index')">
|
||||
<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>
|
||||
<text class="icon-text">个人信息</text>
|
||||
</view>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<!-- 通知公告 -->
|
||||
<view class="grid-item" @click="navigateTo('/pages/mine/announcement/index')">
|
||||
<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>
|
||||
<text class="icon-text">通知公告</text>
|
||||
</view>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<!-- 投诉建议 -->
|
||||
<view class="grid-item" @click="navigateTo('/pages/feedback/index')">
|
||||
<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>
|
||||
<text class="icon-text">投诉建议</text>
|
||||
</view>
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
<!-- 食堂评价 -->
|
||||
<view class="grid-item" @click="navigateTo('/pages/review/index')">
|
||||
<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>
|
||||
<text class="icon-text">食堂评价</text>
|
||||
</view>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
<!-- 体检报告 -->
|
||||
<view class="grid-item" @click="navigateTo('/pages/survey/index')">
|
||||
<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>
|
||||
<text class="icon-text">健康监测</text>
|
||||
</view>
|
||||
|
|
@ -205,14 +205,30 @@
|
|||
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>
|
||||
|
||||
<style lang="scss">
|
||||
.container {
|
||||
min-height: 10vh;
|
||||
background-color: #F9FBFF;
|
||||
height: 90vh;
|
||||
background-color: #F9FBFF;
|
||||
}
|
||||
|
||||
.header {
|
||||
|
|
@ -231,7 +247,7 @@
|
|||
align-items: center;
|
||||
padding: 16px;
|
||||
background: #fff;
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 20px;
|
||||
|
||||
.avatar-wrapper {
|
||||
margin-right: 12px;
|
||||
|
|
@ -262,6 +278,7 @@
|
|||
.services {
|
||||
background: #fff;
|
||||
padding: 16px;
|
||||
height: 80vh;
|
||||
|
||||
.services-title {
|
||||
font-size: 16px;
|
||||
|
|
@ -282,8 +299,8 @@
|
|||
align-items: center;
|
||||
|
||||
.icon-wrapper {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
// width: 48px;
|
||||
// height: 48px;
|
||||
//border-radius: 24px;
|
||||
//background: #f5f5f5;
|
||||
display: flex;
|
||||
|
|
@ -294,7 +311,7 @@
|
|||
|
||||
.icon-text {
|
||||
font-size: 14px;
|
||||
color: #666;
|
||||
color: #0F274B;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,8 @@
|
|||
getUserInfo() {
|
||||
getUserProfile({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(res => {
|
||||
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)
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -190,7 +190,9 @@ export default {
|
|||
}
|
||||
const res = await healthDetailApi(param)
|
||||
this.form = res.data;
|
||||
this.form.chronicDiseases = this.form.chronicIds.split(",")
|
||||
if(this.form.chronicIds){
|
||||
this.form.chronicDiseases = this.form.chronicIds.split(",")
|
||||
}
|
||||
console.log(res, '详情')
|
||||
},
|
||||
|
||||
|
|
@ -243,7 +245,9 @@ export default {
|
|||
this.$refs.uForm.validate().then(valid => {
|
||||
if (valid) {
|
||||
console.log('Form submitted:', this.form);
|
||||
this.form.chronicIds = this.form.chronicDiseases.join(",")
|
||||
if(this.form.chronicDiseases&&this.form.chronicDiseases.length>0){
|
||||
this.form.chronicIds = this.form.chronicDiseases.join(",")
|
||||
}
|
||||
editHealthInfoApi(this.form).then((res) => {
|
||||
uni.$u.toast('保存成功');
|
||||
this.getHealthDetail()
|
||||
|
|
|
|||
|
|
@ -87,7 +87,8 @@ export default {
|
|||
onLoginOut() {
|
||||
this.$modal.confirm('确定注销并退出系统吗？').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 {
|
||||
margin-top: -20px;
|
||||
background-color: #FFFFFF;
|
||||
height: 95vh;
|
||||
height: 100vh;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
<div class="content">
|
||||
<div class="top-cont">
|
||||
<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-item">
|
||||
<div>个人钱包</div>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -51,11 +51,16 @@ export default {
|
|||
methods: {
|
||||
handleItem(index) {
|
||||
console.log(index)
|
||||
if (index === 0) {
|
||||
this.$tab.reLaunch('/pages/index')
|
||||
if (index === 0) {
|
||||
// uni.switchTab({
|
||||
// url: '/pages/index'
|
||||
// })
|
||||
this.$router.push({ path: '/pages/index' })
|
||||
// this.$tab.navigateTo('/pages/index')
|
||||
// this.$tab.reLaunch('/pages/index')
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/index'
|
||||
// });
|
||||
// url: '/pages/index'
|
||||
// });
|
||||
} else if (index === 1) {
|
||||
|
||||
|
||||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<span style="color: #0f274b">{{ item.canteenName }}</span>
|
||||
<span class="intervalName">{{ item.mealtimeName }}</span>
|
||||
</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 class="img-cont" @click="goDetail(item)">
|
||||
<view class="img" v-for="(goods, index) in item.orderDetailList" :key="index">
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<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>
|
||||
</view>
|
||||
<view v-if="item.orderState == 3">
|
||||
|
|
@ -188,7 +188,7 @@ export default {
|
|||
searchValue: '',
|
||||
searchType:'',
|
||||
status: 'loadmore',
|
||||
tabList: ['全部订单', '待评价', '退款'],
|
||||
tabList: ['全部订单', '待评价', '待支付', '退款'],
|
||||
dateValue:new Date(),
|
||||
dateValue2:new Date(),
|
||||
sourceTypeList:[],
|
||||
|
|
@ -355,6 +355,8 @@ export default {
|
|||
if(index==1){
|
||||
this.searchType="3"
|
||||
}else if(index==2){
|
||||
this.searchType="4"
|
||||
}else if(index==3){
|
||||
this.searchType="2"
|
||||
}else{
|
||||
this.searchType=""
|
||||
|
|
@ -471,7 +473,23 @@ export default {
|
|||
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>
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 77 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 190 KiB After Width: | Height: | Size: 190 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 550 B After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 550 B |
Binary file not shown.
|
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 586 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 456 B |
Loading…
Reference in New Issue