mkm
/
wuliu_sy
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面更新

This commit is contained in:
jia 2023-12-02 15:29:39 +08:00
parent 3022db1349
commit 457590ce65
34 changed files with 257 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
App.vue
View File

@ -3,6 +3,8 @@
const jpushModule = uni.requireNativePlugin("JG-JPush"); const jpushModule = uni.requireNativePlugin("JG-JPush");
// #endif // #endif
import Cache from '@/utils/cache';
export default { export default {
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch')
@ -11,8 +13,15 @@
plus.screen.lockOrientation('landscape-primary'); plus.screen.lockOrientation('landscape-primary');
// #endif // #endif
},
onLoad() {
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show')
const audioContext = uni.createInnerAudioContext() const audioContext = uni.createInnerAudioContext()
// 设置音频文件地址 // 设置音频文件地址
@ -46,6 +55,5 @@
} }
@import "static/css/base.css"; @import "static/css/base.css";
@import url('static/iconfont/iconfont.css') @import url('static/iconfont/iconfont.css')
</style> </style>

35
androidPrivacy.json Normal file
View File

@ -0,0 +1,35 @@
{
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"hrefLoader" : "system|default",
"backToExit" : "false",
"second" : {
"title" : "确认提示",
"message" : "　　进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
"disagreeMode" : {
"support" : false,
"loadNativePlugins" : false,
"visitorEntry" : true,
"showAlways" : false
},
"styles" : {
"backgroundColor" : "#fff",
"borderRadius" : "5px",
"title" : {
"color" : "#000"
},
"buttonAccept" : {
"color" : "#000"
},
"buttonRefuse" : {
"color" : "#000"
}
}
}

15
components/index/detaila.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="dashboard-container"> <view >
<view class="content-top-con"> <view class="content-top-con">
<view class="content-img" @click="returnlog"> <view class="content-img" @click="returnlog">
@ -453,6 +453,7 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 10rpx;
.content-img { .content-img {
width: 22rpx; width: 22rpx;
@ -523,7 +524,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
padding-top: 10rpx;
} }
@ -541,7 +542,7 @@
background: #ffffff; background: #ffffff;
box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16); box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
border-radius: 15rpx 15rpx 15rpx 15rpx; border-radius: 15rpx 15rpx 15rpx 15rpx;
margin-top: 25px;
margin-bottom: 10rpx; margin-bottom: 10rpx;
position: relative; position: relative;
@ -629,13 +630,7 @@
} }
.container-content-right { .container-content-right {}
margin-top: 20px;
}
.map_btn { .map_btn {
width: 50px; width: 50px;

10
components/index/detailb.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="dashboard-container"> <view >
<view class="content-top-con"> <view class="content-top-con">
<view class="content-img" @click="returnlog"> <view class="content-img" @click="returnlog">
@ -310,7 +310,7 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 10rpx;
.content-img { .content-img {
width: 22rpx; width: 22rpx;
height: 22rpx; height: 22rpx;
@ -762,7 +762,11 @@
background: #FF7C32; background: #FF7C32;
border-radius: 23px 23px 23px 23px; border-radius: 23px 23px 23px 23px;
display: flex; display: flex;
margin: 0 auto; position: absolute;
left: 50%;
margin-left: -60rpx;
bottom:80rpx;
position: fixed;
} }
.btn1 image { .btn1 image {

11
components/index/detailc.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="dashboard-container"> <view >
<view class="content-top-con"> <view class="content-top-con">
<view class="content-img" @click="returnlog"> <view class="content-img" @click="returnlog">
<image src="@/static/images/xiangyou.png" mode=""></image> <image src="@/static/images/xiangyou.png" mode=""></image>
@ -203,7 +203,7 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-top: 10rpx;
.content-img { .content-img {
width: 22rpx; width: 22rpx;
height: 22rpx; height: 22rpx;
@ -259,7 +259,8 @@
background-color: #fff; background-color: #fff;
border-radius: 12rpx 12rpx; border-radius: 12rpx 12rpx;
width: 554rpx; width: 565rpx;
.content-one { .content-one {
height: 39rpx; height: 39rpx;
@ -270,7 +271,7 @@
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
padding-left: 38rpx; padding-left: 15rpx;
} }
.content-one1 { .content-one1 {
@ -283,7 +284,7 @@
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
padding-left: 38rpx; padding-left: 15rpx;
} }
.content-two { .content-two {

28
components/index/index.vue
View File

@ -1,21 +1,18 @@
<template> <template>
<view class=""> <view class="">
<you-scroll ref="scroll" @onPullDown="onPullDown">
<you-scroll ref="scroll" @onPullDown="onPullDown">
<view class="dashboard-container"> <view class="dashboard-container">
<view class="container-top"> <view class="container-top">
<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> --> <!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false' <u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false'
height="3" bgColor='#fff'></u-search> height="3" bgColor='#fff'></u-search>
<view class="serch" @click="serch">搜索</view> <view class="serch" @click="serch">搜索</view>
</view> </view>
<view class="container-content" v-if="list.length>0"> <view class="container-content" v-if="list.length>0">
<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;" <scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
@scrolltolower="loadMoreData"> @scrolltolower.stop="loadMoreData">
<view v-for="(item,i) in list" :key="i" class="content-one"> <view v-for="(item,i) in list" :key="i" class="content-one">
<view class="" @click="kk(item)"> <view class="" @click="kk(item)">
<view class="content-one-title">商户名称：{{item.shop_name}}</view> <view class="content-one-title">商户名称：{{item.shop_name}}</view>
@ -138,11 +135,11 @@
}, },
mounted() { mounted() {
this.initlist() this.initlist()
}, },
onShow() {
this.initlist()
},
methods: { methods: {
onPullDown(done) { // 下拉刷新 onPullDown(done) { // 下拉刷新
@ -151,6 +148,7 @@
done(); // 完成刷新 done(); // 完成刷新
}, 1000 * 1) }, 1000 * 1)
}, },
refresh() { refresh() {
this.initlist() this.initlist()
}, },
@ -168,12 +166,14 @@
} }
}, },
initlist() { initlist() {
this.list = [] this.list = []
this.page_no = 1 this.page_no = 1
this.getlist() this.getlist()
}, },
//列表 //列表
getlist(val) { getlist() {
let data = { let data = {
page_no: this.page_no, page_no: this.page_no,
page_size: this.page_size, page_size: this.page_size,
@ -184,12 +184,18 @@
lists( lists(
data data
).then(res => { ).then(res => {
if (res.code == 1) { if (res.code == 1) {
uni.hideLoading(); uni.hideLoading()
this.list = [...this.list, ...res.data] this.list = [...this.list, ...res.data]
this.page_no = this.page_no + 1 this.page_no = this.page_no + 1
this.$forceUpdate()
} }
}).catch((err) => {
console.log(err)
uni.hideLoading()
}) })
}, },
kk(item) { kk(item) {
@ -496,7 +502,7 @@
width: 23rpx; width: 23rpx;
height: 23rpx; height: 23rpx;
margin-left: 60rpx; margin-left: 60rpx;
margin-top: 2rpx; margin-top: 1rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
</style> </style>

15
components/index/index1.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class=""> <view class="">
<you-scroll ref="scroll" @onPullDown="onPullDown"> <you-scroll ref="scroll" @onPullDown="onPullDown">
<view class="dashboard-container"> <view class="dashboard-container">
<view class="container-top"> <view class="container-top">
<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> --> <!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false' <u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false'
@ -11,13 +11,13 @@
</view> </view>
<view class="container-content" v-if="list.length>0"> <view class="container-content" v-if="list.length>0">
<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;" <scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
@scrolltolower="loadMoreData"> @scrolltolower.stop="loadMoreData">
<view v-for="(item,i) in list" :key="i" class="content-one"> <view v-for="(item,i) in list" :key="i" class="content-one">
<view class="" @click="kk(item)"> <view class="" @click="kk(item)">
<view class="content-one-title">收货人名称：{{item.receiver_name}}</view> <view class="content-one-title">收货人名称：{{item.receiver_name}}</view>
<view class="content-one-con"> <view class="content-one-con">
<view>联系电话：{{item.receiver_phone}}</view> <view>联系电话：{{item.receiver_phone}}</view>
<view>商家地址：{{item.receiver_address}}</view> <view>联系地址：{{item.receiver_address}}</view>
<view>订单编号：{{item.order_sn}}</view> <view>订单编号：{{item.order_sn}}</view>
<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> --> <!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
</view> </view>
@ -140,6 +140,9 @@
this.initlist() this.initlist()
}, },
onShow() {
this.initlist()
},
methods: { methods: {
@ -186,9 +189,13 @@
data data
).then(res => { ).then(res => {
if (res.code == 1) { if (res.code == 1) {
uni.hideLoading()
this.list = [...this.list, ...res.data] this.list = [...this.list, ...res.data]
this.page_no = this.page_no + 1 this.page_no = this.page_no + 1
} }
}).catch((err) => {
console.log(err)
uni.hideLoading()
}) })
}, },
loadMoreData() { loadMoreData() {
@ -523,7 +530,7 @@
width: 23rpx; width: 23rpx;
height: 23rpx; height: 23rpx;
margin-left: 60rpx; margin-left: 60rpx;
margin-top: 2rpx; margin-top: 1rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
</style> </style>

14
components/index/indexg.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<view class=""> <view class="">
<you-scroll ref="scroll" @onPullDown="onPullDown"> <you-scroll ref="scroll" @onPullDown="onPullDown">
<view class="dashboard-container"> <view class="dashboard-container">
@ -12,7 +13,7 @@
</view> </view>
<view class="container-content" v-if="list.length>0"> <view class="container-content" v-if="list.length>0">
<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;" <scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
@scrolltolower="loadMoreData"> @scrolltolower.stop="loadMoreData">
<view v-for="(item,i) in list" :key="i" class="content-one" @click="kk(item)"> <view v-for="(item,i) in list" :key="i" class="content-one" @click="kk(item)">
<view class="" @click="kk(item)"> <view class="" @click="kk(item)">
<view :class="item.status==3?'content-one-title1':'content-one-title'"> <view :class="item.status==3?'content-one-title1':'content-one-title'">
@ -22,7 +23,7 @@
<view class="content-one-con"> <view class="content-one-con">
<view>联系电话：{{item.receiver_phone}}</view> <view>联系电话：{{item.receiver_phone}}</view>
<view>商家地址：{{item.shop_address}}</view> <view>联系地址：{{item.receiver_address}}</view>
<view>订单编号：{{item.order_sn}}</view> <view>订单编号：{{item.order_sn}}</view>
<view v-if="item.status!=3">取货时间：{{item.qh_time}}</view> <view v-if="item.status!=3">取货时间：{{item.qh_time}}</view>
@ -122,6 +123,9 @@
this.initlist() this.initlist()
}, },
onShow() {
this.initlist()
},
methods: { methods: {
@ -160,9 +164,13 @@
data data
).then(res => { ).then(res => {
if (res.code == 1) { if (res.code == 1) {
uni.hideLoading()
this.list = [...this.list, ...res.data] this.list = [...this.list, ...res.data]
this.page_no = this.page_no + 1 this.page_no = this.page_no + 1
} }
}).catch((err) => {
console.log(err)
uni.hideLoading()
}) })
}, },
@ -458,7 +466,7 @@
width: 23rpx; width: 23rpx;
height: 23rpx; height: 23rpx;
margin-left: 60rpx; margin-left: 60rpx;
margin-top: 2rpx; margin-top:1rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
</style> </style>

4
components/you-scroll.vue
View File

@ -10,8 +10,8 @@
</span> </span>
</slot> </slot>
</view> </view>
<scroll-view class="you-scroll-inner" ref="youScrollInner" :scroll-top="scrollToTop" scroll-with-animation scroll-y :style="{ transform: 'translateY('+translateY+'px)', transition: isDown ? '0s' : 'transform 0.3s' }" <scroll-view class="you-scroll-inner" ref="youScrollInner" :scroll-top.stop="scrollToTop" scroll-with-animation scroll-y :style="{ transform: 'translateY('+translateY+'px)', transition: isDown ? '0s' : 'transform 0.3s' }"
@touchstart="startFn" @touchmove="moveFn" @touchend="endFn" @touchcancel="endFn" @scroll="scroll"> @touchstart.stop="startFn" @touchmove.stop="moveFn" @touchend.stop="endFn" @touchcancel.stop="endFn" @scroll.stop="scroll">
<view class="you-scroll-content"> <view class="you-scroll-content">
<slot></slot> <slot></slot>
</view> </view>

49
manifest.json
View File

@ -1,5 +1,5 @@
{ {
"name" : "wuliu", "name" : "物流溯源平台",
"appid" : "__UNI__5A081C6", "appid" : "__UNI__5A081C6",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
@ -12,8 +12,8 @@
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3, "compilerVersion" : 3,
"splashscreen" : { "splashscreen" : {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender" : false,
"waiting" : true, "waiting" : false,
"autoclose" : true, "autoclose" : true,
"delay" : 0 "delay" : 0
}, },
@ -49,7 +49,8 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios" : {
@ -77,6 +78,46 @@
} }
}, },
"push" : {} "push" : {}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
},
"splashscreen" : {
"androidStyle" : "default",
"useOriginalMsgbox" : true,
"android" : {
"xhdpi" : "",
"xxhdpi" : "E:/公司/微信图片_20231201135226.png"
}
} }
}, },
"nativePlugins" : { "nativePlugins" : {

2
pages.json
View File

@ -1,6 +1,5 @@
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
@ -39,6 +38,7 @@
} }
}, },
{ {
"path": "pages/index/detail", "path": "pages/index/detail",
"style": { "style": {

2
pages/index/detail.vue
View File

@ -451,7 +451,7 @@
padding-top: 22rpx; padding-top: 22rpx;
padding-left: 15rpx; padding-left: 15rpx;
padding-right: 15rpx; padding-right: 15rpx;
width: 600rpx;
} }
} }

80
pages/index/index.vue
View File

@ -58,6 +58,7 @@
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app.js' } from '@/config/app.js'
import Cache from '@/utils/cache';
import index from '@/components/index/index.vue' import index from '@/components/index/index.vue'
import index1 from '@/components/index/index1.vue' import index1 from '@/components/index/index1.vue'
import pindex from '@/components/index/indexg.vue' import pindex from '@/components/index/indexg.vue'
@ -124,8 +125,30 @@
onLoad() { onLoad() {
if (!Cache.get("TOKEN")) {
uni.showModal({
title: '提示',
content: '用户信息不存在,是否确定登录？',
cancelText: "取消", // 取消按钮的文字
confirmText: "确认", // 确认按钮的文字
showCancel: true, // 是否显示取消按钮，默认为 true
confirmColor: '#f55850',
cancelColor: '#39B54A',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: '/pages/oaLogin/oaLogin'
})
console.log('comfirm') //点击确定之后执行的代码
} else {
console.log('cancel') //点击取消之后执行的代码
}
}
})
}
}, },
// onPullDownRefresh() { // onPullDownRefresh() {
@ -141,32 +164,37 @@
// } // }
// }, // },
onShow() { onShow() {
this.$nextTick(() => {
setTimeout(() => {
if (this.num == 0 && this.isshow) { if (this.num == 0 && this.isshow) {
this.$refs.list.refresh() this.$refs.list.refresh()
uni.stopPullDownRefresh()
} else if (this.num == 1 && this.isshow1) { } else if (this.num == 1 && this.isshow1) {
this.$refs.list1.refresh() this.$refs.list1.refresh()
uni.stopPullDownRefresh()
} else if (this.num == 2 && this.isshow2) { } else if (this.num == 2 && this.isshow2) {
this.$refs.list2.refresh() this.$refs.list2.refresh()
uni.stopPullDownRefresh()
} }
}, 0)
})
}, },
mounted() { mounted() {
if (this.num == 0 && this.isshow) {
this.$refs.list.refresh()
uni.stopPullDownRefresh()
} else if (this.num == 1 && this.isshow1) {
this.$refs.list1.refresh()
uni.stopPullDownRefresh()
} else if (this.num == 2 && this.isshow2) {
this.$refs.list2.refresh()
uni.stopPullDownRefresh()
}
}, },
methods: { methods: {
login() { login() {
uni.clearStorageSync()
uni.reLaunch({ uni.reLaunch({
url: '/pages/oaLogin/oaLogin' url: '/pages/oaLogin/oaLogin'
}) })
@ -200,14 +228,24 @@
this.$refs.list1.refresh() this.$refs.list1.refresh()
this.isshow2 = true this.isshow2 = true
this.isshow = true this.isshow = true
uni.showLoading({
title: '加载中'
})
} }
if (index == 2) { if (index == 2) {
this.isshow1 = true this.isshow1 = true
this.isshow = true this.isshow = true
this.$refs.list2.refresh() this.$refs.list2.refresh()
uni.showLoading({
title: '加载中'
})
} }
if (index == 0) { if (index == 0) {
uni.showLoading({
title: '加载中'
})
this.$refs.list.refresh() this.$refs.list.refresh()
this.isshow1 = true this.isshow1 = true
@ -216,7 +254,7 @@
}, },
onfunction(e, id) { onfunction(e, id) {
console.log(e,id)
if (id == 1) { if (id == 1) {
this.isshow = false this.isshow = false
this.type = e this.type = e
@ -250,7 +288,6 @@
<style lang="scss"> <style lang="scss">
page { page {
// background: #Fff; // background: #Fff;
// width: 1024px; // width: 1024px;
// border: 1px solid red; // border: 1px solid red;
@ -261,14 +298,17 @@
position: relative; position: relative;
height: 100vh; height: 100vh;
.content-con { .content-con {
display: flex; display: flex;
justify-content: space-between;
} }
.content-left { .content-left {
width: 136rpx; width: 136rpx;
margin-left: 10rpx; margin-left: 10rpx;
margin-right: 10rpx; margin-right: 10rpx;
@ -287,17 +327,20 @@
.content-left-one { .content-left-one {
text-align: center; text-align: center;
width: 136rpx;
height: 39rpx;
line-height: 39rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.left-one { .left-one {
width: 136rpx;
font-size: 13rpx; font-size: 13rpx;
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
height: 29px;
line-height: 29px;
margin: 0 auto; margin: 0 auto;
@ -398,6 +441,7 @@
padding-top: 5rpx; padding-top: 5rpx;
padding-left: 15rpx; padding-left: 15rpx;
padding-right: 15rpx; padding-right: 15rpx;
width: calc(100% - 156rpx);
} }

2
pages/index/subnvue.nvue
View File

@ -19,7 +19,7 @@
<script> <script>
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.popup-content { .popup-content {
width: 308rpx; width: 308rpx;
height: 220rpx; height: 220rpx;

18
pages/oaLogin/oaLogin.vue
View File

@ -7,7 +7,7 @@
<!-- #ifdef APP-PLUS||H5 --> <!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height)"></view> <view style="height: var(--status-bar-height)"></view>
<!-- #endif --> <!-- #endif -->
<view class="body"> <view class="login_body">
<view class="title">欢迎进入里海供销平台！</view> <view class="title">欢迎进入里海供销平台！</view>
<view class="login-card"> <view class="login-card">
<view class="login-card-img"> <view class="login-card-img">
@ -34,7 +34,7 @@
loginAccount, loginAccount,
userInfo userInfo
} from "@/api/oaUser.js" } from "@/api/oaUser.js"
import Cache from '@/utils/cache';
import { import {
Toast Toast
} from "../../libs/uniApi"; } from "../../libs/uniApi";
@ -76,9 +76,7 @@
}; };
}, },
onLoad() { onLoad() {
this.APP_token = uni.getStorageSync('APP_token');
this.options.data = bj;
// this.$refs.lottie.call('play');
}, },
onShow() { onShow() {
@ -125,6 +123,7 @@
// uni.showLoading({ // uni.showLoading({
// title: '正在登录中' // title: '正在登录中'
// }) // })
console.log(that.formData) console.log(that.formData)
let res = await loginAccount(that.formData); let res = await loginAccount(that.formData);
// console.log(res) // console.log(res)
@ -143,9 +142,16 @@
uni.hideLoading() uni.hideLoading()
if (res.data.token) { if (res.data.token) {
// console.log('111111111') // console.log('111111111')
uni.showLoading({
title: '加载中'
})
setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
}) })
uni.hideLoading()
Toast('登录成功')
}, 500)
// uni.showLoading({ // uni.showLoading({
// mask: true, // mask: true,
@ -220,7 +226,7 @@
background-color: #0022c7; background-color: #0022c7;
.body { .login_body {
position: absolute; position: absolute;
top: 45%; top: 45%;
left: 50%; left: 50%;

20
static/css/base.css
View File

@ -1,19 +1,7 @@
@charset "UTF-8"; @charset "UTF-8";
* {
scrollbar-color: #e5e5e5 #f7f7f9;
scrollbar-width: thin;
}
html {
margin: 0 auto;
}
body {
overflow-x: hidden;
}
.font-color, .font-color,
.font-color-red { .font-color-red {
@ -244,9 +232,6 @@ body {
background-position: 0 -175rpx; background-position: 0 -175rpx;
} }
* {
box-sizing: border-box
}
page { page {
font-size: 28rpx; font-size: 28rpx;
@ -254,10 +239,7 @@ page {
color: #333 color: #333
} }
body,
html {
height: unset
}
button { button {
padding: 0; padding: 0;

BIN
unpackage/res/icons/1024x1024.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 372 KiB

BIN
unpackage/res/icons/120x120.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
unpackage/res/icons/144x144.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
unpackage/res/icons/152x152.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
unpackage/res/icons/167x167.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
unpackage/res/icons/180x180.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
unpackage/res/icons/192x192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
unpackage/res/icons/20x20.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
unpackage/res/icons/29x29.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
unpackage/res/icons/40x40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
unpackage/res/icons/58x58.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
unpackage/res/icons/60x60.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
unpackage/res/icons/72x72.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
unpackage/res/icons/76x76.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
unpackage/res/icons/80x80.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
unpackage/res/icons/87x87.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
unpackage/res/icons/96x96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

8
utils/oahttp.js
View File

@ -25,10 +25,10 @@ function baseRequestTwo(url, method, data, {
let Url = HTTP_REQUEST_URL_THREE, let Url = HTTP_REQUEST_URL_THREE,
header = HEADER; header = HEADER;
if (!noAuth) { if (!noAuth) {
// 已经未登录了,禁止请求
if (!store.state.config.request) return Promise.reject({
msg: '未登录'
});
//登录过期自动登录 //登录过期自动登录
if (!store.state.app.token) { if (!store.state.app.token) {
toLogin(); toLogin();