首页页面样式修改

This commit is contained in:
zmj 2024-01-02 22:59:17 +08:00
parent 439a2ce678
commit 4a213dc890
13 changed files with 869 additions and 1006 deletions

View File

@ -2,16 +2,16 @@ let httpApiThree;
let httpApi; // 总域名 let httpApi; // 总域名
let httpApiTwo; // 物流系统域名 let httpApiTwo; // 物流系统域名
const env = 'dev'; // 开发 // const env = 'dev'; // 开发
// const env = 'prod'; // 生产 const env = 'prod'; // 生产
// const env = 'prew'; // 预上线 // const env = 'prew'; // 预上线
// const env = 'local'; // 本地 // const env = 'local'; // 本地
switch (env) { switch (env) {
case 'prod': case 'prod':
httpApi = 'https://worker-task.lihaink.cn' //正式 httpApi = 'https://new-worker.lihaink.cn/' //正式
httpApiTwo = 'https://logistics.lihaink.cn' //正式环境 httpApiTwo = 'https://new-worker.lihaink.cn/' //正式环境
httpApiThree = 'https://worker-task.lihaink.cn' //正式 httpApiThree = 'https://new-worker.lihaink.cn/' //正式
break; break;
case 'prew': case 'prew':
httpApi = 'https://preview-worker-task.lihaink.cn' //预上线 httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
@ -24,9 +24,9 @@ switch (env) {
httpApiTwo = 'http://192.168.1.21:8083' //预上线 httpApiTwo = 'http://192.168.1.21:8083' //预上线
break; break;
default: default:
httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApi = 'https://ceshi-new-wokr.lihaink.cn/' //测试
httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 httpApiThree = 'https://ceshi-new-wokr.lihaink.cn/' //测试
httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境 httpApiTwo = 'https://ceshi-new-wokr.lihaink.cn/' //测试环境
//测试环境 //测试环境
} }

View File

@ -1,10 +1,10 @@
{ {
"name": "里海社区", "name": "里海社区",
// "appid" : "__UNI__3A527D1", // "appid" : "__UNI__3A527D1",
"appid": "__UNI__B5B1EDD", "appid": "__UNI__A495155",
"description": "", "description": "",
"versionName": "1.3.0", "versionName": "1.3.1",
"versionCode": 130, "versionCode": 131,
"transformPx": false, "transformPx": false,
/* 5+App */ /* 5+App */
"app-plus": { "app-plus": {

View File

@ -962,30 +962,8 @@
"iconPath": "static/tabs-icon/home.png", "iconPath": "static/tabs-icon/home.png",
"selectedIconPath": "static/tabs-icon/home-a.png" "selectedIconPath": "static/tabs-icon/home-a.png"
}, },
{
"pagePath": "pages/oaExamine/oaExamine",
"text": "审批",
"iconPath": "static/tabs-icon/Task.png",
"selectedIconPath": "static/tabs-icon/Task-a.png"
},
{
"pagePath": "pages/oaTask/oaTask",
"text": "任务",
"iconPath": "static/tabs-icon/approval.png",
"selectedIconPath": "static/tabs-icon/approval-a.png"
},
// {
// "pagePath": "pages/oaManager/oaManager",
// "text": "片区经理",
// "iconPath": "static/tabs-icon/manager.png",
// "selectedIconPath": "static/tabs-icon/manager-a.png"
// },
{
"pagePath": "pages/business/business",
"text": "商机",
"iconPath": "static/tabs-icon/manager.png",
"selectedIconPath": "static/tabs-icon/manager-a.png"
},
{ {
"pagePath": "pages/oaMy/oaMy", "pagePath": "pages/oaMy/oaMy",
"text": "我的", "text": "我的",

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@
<!-- <view style="height: var(--status-bar-height)"></view> --> <!-- <view style="height: var(--status-bar-height)"></view> -->
<!-- #endif --> <!-- #endif -->
<view class="body"> <view class="body">
<view class="title">欢迎进入里海供销平台</view> <view class="title">欢迎进入里海工作平台</view>
<view class="login-card"> <view class="login-card">
<view class="top"> <view class="top">
<view class="text item"> <view class="text item">
@ -22,17 +22,7 @@
type="tel" placeholder="输入账号" /> type="tel" placeholder="输入账号" />
<input @click="getId" class="mobile item" v-model="formData.password" maxlength="26" <input @click="getId" class="mobile item" v-model="formData.password" maxlength="26"
placeholder="输入密码" password type="safe-password" /> placeholder="输入密码" password type="safe-password" />
<!-- <input v-if="current == 1" class="mobile item" v-model="formData.account" placeholder="输入手机号" />
<view v-if="current == 1" class="code item">
<input placeholder="输入验证码" v-model="formData.code" maxlength="6" />
<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-code>
<view class="get-code" @click="getCode">{{ tips }}</view>
</view>
<view class="btn">
</view> -->
<view class="">
还没有账号? <text class="enroll-text" @click="navgo('/pages/oaLogin/oaEnroll')">点击注册</text>
</view>
</view> </view>
<button class="submit_btn" @click="login">登录</button> <button class="submit_btn" @click="login">登录</button>

View File

@ -2,20 +2,21 @@
<view class="my"> <view class="my">
<view class="head_box" style="position: relative;"> <view class="head_box" style="position: relative;">
<!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> --> <!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
<view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0;"> <view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0;">
<hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;"/> <hx-lottie :options="options" ref="lottie"
</view> style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;" />
<!-- <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)" </view>
<!-- <u-navbar v-if="uniMP" @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
leftIconColor=" #fff" :autoBack="false"> leftIconColor=" #fff" :autoBack="false">
</u-navbar> --> </u-navbar> -->
<!-- #ifdef APP-PLUS||H5 --> <!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height)"></view> <view style="height: var(--status-bar-height)"></view>
<view v-if="uniMP" style="height: 44px;"> <view v-if="uniMP" style="height: 44px;">
<u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon> <u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
</view> </view>
<view v-else style="height: 30rpx"></view> <view v-else style="height: 30rpx"></view>
<!-- <view style="height: 100rpx"></view> --> <!-- <view style="height: 100rpx"></view> -->
<!-- <view v-if="uniMP" style="height: 44px"></view> --> <!-- <view v-if="uniMP" style="height: 44px"></view> -->
<!-- #endif --> <!-- #endif -->
<view class="personage"> <view class="personage">
<view class="my_msg flex_a_c_j_sb"> <view class="my_msg flex_a_c_j_sb">
@ -34,22 +35,21 @@
<view v-else class="name_work"> <view v-else class="name_work">
<view class="name"> <view class="name">
<text class="nickname">姓名:{{ oaUserInfo.nickname }}</text> <text class="nickname">姓名:{{ oaUserInfo.nickname }}</text>
{{ oaUserInfo.admin_id?'超级管理员':'普通用户'}}
<!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> --> <!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
</view> </view>
<view class="work"> <view class="work">
<view class="wr_item"> <view class="wr_item">
<view class="wr_t_left">电话:</view> <view class="wr_t_left">电话:</view>
<view class="wr_t_right">{{oaUserInfo.account}}</view> <view class="wr_t_right">{{oaUserInfo.account}}</view>
</view> </view>
<view class="wr_item">
<view class="wr_t_left">公司:</view> <view class="wr_item">
<view class="wr_t_right" v-if="oaUserInfo.company">{{oaUserInfo.company.company_name}}</view> <view class="wr_t_left">类型:</view>
</view> <view class="wr_t_right">
<view class="wr_item"> {{oaUserInfo.user_role_name}}
<view class="wr_t_left">公司类型:</view> </view>
<view class="wr_t_right" v-if="oaUserInfo.company">{{oaUserInfo.company.company_type_name}}</view> </view>
</view>
<!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) --> <!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
</view> </view>
</view> </view>
@ -100,7 +100,7 @@
import { import {
myOaData myOaData
} from '@/static/server/server.js' } from '@/static/server/server.js'
import bj from "@/static/animation/home.json" import bj from "@/static/animation/home.json"
// import tabbar from '../components/tabbar' // import tabbar from '../components/tabbar'
export default { export default {
components: { components: {
@ -108,20 +108,20 @@
}, },
data() { data() {
return { return {
options: { options: {
data: '', data: '',
}, },
uniMP: false, uniMP: false,
// myOaData: [], // myOaData: [],
src: 'https://cdn.uviewui.com/uview/album/1.jpg', src: 'https://cdn.uviewui.com/uview/album/1.jpg',
modelShow: false modelShow: false
} }
}, },
onLoad() { onLoad() {
this.options.data = bj; this.options.data = bj;
}, },
onShow() { onShow() {
if(uni.getStorageSync('uniMP'))this.uniMP = true; if (uni.getStorageSync('uniMP')) this.uniMP = true;
this.getOaUserInfo(); this.getOaUserInfo();
}, },
onHide() { onHide() {
@ -141,30 +141,30 @@
} }
}; };
}, },
myOaData(){ myOaData() {
const route = 'pages/oaMy/oaMy'; const route = 'pages/oaMy/oaMy';
let arr = []; let arr = [];
this.$store.state.config?.config?.menu?.forEach((item)=>{ this.$store.state.config?.config?.menu?.forEach((item) => {
if(item.paths.includes(route)){ if (item.paths.includes(route)) {
arr=item.children; arr = item.children;
} }
}) })
return arr; return arr;
} }
},
watch: {
modelShow: function(n, o) {
}
}, },
watch:{
modelShow: function(n,o){
}
},
methods: { methods: {
...mapActions(['getWxLogin']), ...mapActions(['getWxLogin']),
leftClick(e) { leftClick(e) {
uni.sendHostEvent('closeApp', e, (ret) => { uni.sendHostEvent('closeApp', e, (ret) => {
// //
console.log('关闭应用'+JSON.stringify(ret)); console.log('关闭应用' + JSON.stringify(ret));
}); });
}, },
login() { login() {
uni.reLaunch({ uni.reLaunch({
url: '/pages/oaLogin/oaLogin' url: '/pages/oaLogin/oaLogin'
@ -189,25 +189,25 @@
async getOaUserInfo() { async getOaUserInfo() {
const res = await userInfo(); const res = await userInfo();
this.$store.commit('setUserInfo', res.data); this.$store.commit('setUserInfo', res.data);
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
navTo (url) { navTo(url) {
if(url){ if (url) {
uni.showLoading({ uni.showLoading({
title: '加载中', title: '加载中',
mask: true mask: true
}); });
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
success() { success() {
uni.hideLoading() uni.hideLoading()
}, },
fail (e) { fail(e) {
uni.hideLoading() uni.hideLoading()
console.log(e); console.log(e);
}, },
}) })
}else Toast('暂未开放') } else Toast('暂未开放')
}, },
alterMyInfo() { alterMyInfo() {
uni.navigateTo({ uni.navigateTo({
@ -223,7 +223,8 @@
<style lang="scss"> <style lang="scss">
.my { .my {
padding-bottom: 160rpx; padding-bottom: 160rpx;
.head_box { .head_box {
position: relative; position: relative;
padding: 28rpx; padding: 28rpx;
@ -290,13 +291,15 @@
.work { .work {
margin-top: 14.04rpx; margin-top: 14.04rpx;
.wr_item{
display: flex; .wr_item {
.wr_t_left{ display: flex;
flex-shrink: 0;
margin-right: 12rpx; .wr_t_left {
} flex-shrink: 0;
} margin-right: 12rpx;
}
}
} }
.omit { .omit {

View File

@ -1,174 +1,178 @@
<template> <template>
<view style="padding: 28rpx 0;"> <view style="padding: 28rpx 0;">
<view class="other_guide"> <view class="other_guide">
<block v-for="(item,i) in myOaData" :key="i"> <block v-for="(item,i) in myOaData" :key="i">
<view class="other_item flex_a_c_j_sb" @click="clickItem(item)"> <view class="other_item flex_a_c_j_sb" @click="clickItem(item)">
<view class="flex_a_c left"> <view class="flex_a_c left">
<!-- <view class="iconfont2" :class="item.icon"></view> --> <!-- <view class="iconfont2" :class="item.icon"></view> -->
<image v-if="item.icon" :src="item.icon"></image> <image v-if="item.icon" :src="item.icon"></image>
<view class="text">{{ item.name }}</view> <view class="text">{{ item.name }}</view>
</view> </view>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<view v-if="i==0">{{version}}</view> <view v-if="i==0">1.0.1</view>
<uni-icons type="forward"></uni-icons> <uni-icons type="forward"></uni-icons>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
<view class="us" @click="copyPhone"> <view class="us" @click="copyPhone">
<view>联系我们</view> <view>联系我们</view>
<view>0830-2669767</view> <view>0830-2669767</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { Toast } from '../../libs/uniApi'; import {
import { destroyAccount } from '@/api/oaUser.js'; Toast
export default { } from '../../libs/uniApi';
data() { import {
return { destroyAccount
myOaData: [{ } from '@/api/oaUser.js';
name: '版本更新' export default {
}, data() {
{ return {
name: '注销账户' myOaData: [{
}, name: '版本更新'
{ },
name: '隐私政策', {
url: 'https://worker-task.lihaink.cn/pc/policy/privacy' name: '注销账户'
}, },
{ {
name: '用户协议', name: '隐私政策',
url: 'https://worker-task.lihaink.cn/pc/policy/service' url: 'https://worker-task.lihaink.cn/pc/policy/privacy'
}, },
{ {
name: '投诉反馈', name: '用户协议',
url: '/subpkg/complaint/complaint' url: 'https://worker-task.lihaink.cn/pc/policy/service'
}, },
{ {
name: '联系我们' name: '投诉反馈',
}, url: '/subpkg/complaint/complaint'
], },
version: '', {
us: "0830-2669767", name: '联系我们'
}; },
}, ],
onLoad() { version: '',
let os = uni.getSystemInfoSync(); us: "0830-2669767",
this.version = 'v' + (os?.appWgtVersion || os?.appVersion); };
}, },
methods: { onLoad() {
clickItem(e) { let os = uni.getSystemInfoSync();
switch (e.name) { this.version = 'v' + (os?.appWgtVersion || os?.appVersion);
case '版本更新': },
this.updateVersion(); methods: {
break; clickItem(e) {
case '注销账户': switch (e.name) {
this.unsubscribe(); case '版本更新':
break; this.updateVersion();
case '联系我们': break;
this.connectUs(); case '注销账户':
break; this.unsubscribe();
case '隐私政策': break;
this.navToWebView(e.url, '隐私政策'); case '联系我们':
break; this.connectUs();
case '用户协议': break;
this.navToWebView(e.url, '用户协议'); case '隐私政策':
break; this.navToWebView(e.url, '隐私政策');
case '投诉反馈': break;
uni.navigateTo({ case '用户协议':
url: e.url this.navToWebView(e.url, '用户协议');
}); break;
break; case '投诉反馈':
} uni.navigateTo({
}, url: e.url
updateVersion() { });
this.$store.dispatch('initConfig', true); break;
}, }
async unsubscribe() { },
uni.showModal({ updateVersion() {
content: '注销账号后不可恢复,确认要注销吗?', this.$store.dispatch('initConfig', true);
success: async (e) => { },
if (e.confirm) { async unsubscribe() {
let res = await destroyAccount(); uni.showModal({
uni.reLaunch({ content: '注销账号后不可恢复,确认要注销吗?',
url: '/pages/oaLogin/oaLogin' success: async (e) => {
}) if (e.confirm) {
} let res = await destroyAccount();
} uni.reLaunch({
}) url: '/pages/oaLogin/oaLogin'
}, })
connectUs() { }
// }
uni.makePhoneCall({ })
phoneNumber: this.us + "", },
success: (e) => { connectUs() {
console.log(e); //
}, uni.makePhoneCall({
fail: (e) => { phoneNumber: this.us + "",
Toast('页面跳转失败,请检查是否开启权限'); success: (e) => {
this.copyPhone(); console.log(e);
} },
}); fail: (e) => {
}, Toast('页面跳转失败,请检查是否开启权限');
copyPhone() { this.copyPhone();
// }
uni.setClipboardData({ });
data: this.us + "", },
showToast: false, copyPhone() {
success: (e) => { //
Toast('号码已复制') uni.setClipboardData({
}, data: this.us + "",
fail: (e) => { showToast: false,
Toast('复制失败') success: (e) => {
} Toast('号码已复制')
}) },
}, fail: (e) => {
navToWebView(uri, title) { Toast('复制失败')
uni.navigateTo({ }
url: `/pages/webView/webView?title=${title}&uri=${uri}` })
}) },
} navToWebView(uri, title) {
} uni.navigateTo({
} url: `/pages/webView/webView?title=${title}&uri=${uri}`
})
}
}
}
</script> </script>
<style lang="scss"> <style lang="scss">
.other_guide { .other_guide {
width: 694.74rpx; width: 694.74rpx;
margin: 0 auto; margin: 0 auto;
padding: 28.07rpx; padding: 28.07rpx;
background-color: #fff; background-color: #fff;
border-radius: 12px; border-radius: 12px;
.other_item { .other_item {
height: 87.72rpx; height: 87.72rpx;
border-bottom: 1px solid #F0F5F7; border-bottom: 1px solid #F0F5F7;
.text { .text {
font-size: 28.07rpx; font-size: 28.07rpx;
margin-left: 20.56rpx; margin-left: 20.56rpx;
} }
.left { .left {
align-items: center; align-items: center;
} }
image { image {
width: 42rpx; width: 42rpx;
height: 42rpx; height: 42rpx;
} }
.iconfont2 { .iconfont2 {
font-size: 42.11rpx; font-size: 42.11rpx;
} }
} }
} }
.us { .us {
margin: 60rpx 0; margin: 60rpx 0;
text-align: center; text-align: center;
color: #aaa; color: #aaa;
} }
</style> </style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
static/newWork/index/YJ.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB