Commit 2459e26a authored by 李苏's avatar 李苏 💬

修改样式等

parent e2a4ad0e
...@@ -87,6 +87,14 @@ ...@@ -87,6 +87,14 @@
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
},
"splashscreen" : {
"androidStyle" : "default",
"android" : {
"hdpi" : "C:/Users/84272/Desktop/qidong.png",
"xhdpi" : "C:/Users/84272/Desktop/qidong.png",
"xxhdpi" : "C:/Users/84272/Desktop/qidong.png"
}
} }
} }
}, },
......
{ {
"pages": [ "pages": [
// 云erp
{
"path": "pages/login/cusmerLogin",
"style": {}
},
{ {
"path": "pages/login/login", "path": "pages/login/login",
"style": {} "style": {}
},
// 云erp
{
"path": "pages/login/cusmerLogin",
"style": {}
}, },
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
...@@ -20,10 +19,6 @@ ...@@ -20,10 +19,6 @@
"path": "pages/basics/layout", "path": "pages/basics/layout",
"style": {} "style": {}
}, },
// {
// "path": "pages/index/index",
// "style": {}
// },
{ {
"path": "pages/basics/background", "path": "pages/basics/background",
"style": {} "style": {}
......
...@@ -190,6 +190,11 @@ ...@@ -190,6 +190,11 @@
methods: { methods: {
// 权限获取 // 权限获取
// api获取权限 // api获取权限
isNotshow(){
setTimeout(()=>{
this.show=false
},10)
},
apiqx(){ apiqx(){
let _self=this; let _self=this;
this.$http.post("/frame/init/mobile",{ this.$http.post("/frame/init/mobile",{
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
</view> </view>
<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]"> <view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
<block v-if="loginWay==1"> <block v-if="loginWay==1">
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']"> <view style="border-radius: 5px;" class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-people margin-right-xs"></text>账号:</view> <view class="title"><text class="cuIcon-people margin-right-xs"></text>账号:</view>
<input placeholder="请输入账号" name="input" v-model="userName"></input> <input placeholder="请输入账号" name="input" v-model="userName"></input>
</view> </view>
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']"> <view style="border-radius: 5px;" class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view> <view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
<input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" /> <input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
<view class="action text-lg"> <view class="action text-lg">
<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text> <text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
// 二次登录 // 二次登录
loginT(){ loginT(){
let _this =this; let _this =this;
http.config.baseUrl = "http://192.168.30.16:9090/erp"; http.config.baseUrl = "http://clouderp.gavelinfo.com/hderp";
this.$http.post(this.loginurl,{}).then((resp) => { this.$http.post(this.loginurl,{}).then((resp) => {
if(resp.data.success){ if(resp.data.success){
console.log("success") console.log("success")
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
onLogin: function (){ onLogin: function (){
// http.config.baseUrl='http://'+this.fwq+'/'+this.dkh // http.config.baseUrl='http://'+this.fwq+'/'+this.dkh
let _this=this; let _this=this;
http.config.baseUrl = "http://192.168.30.16:9080/" http.config.baseUrl = "http://clouderp.gavelinfo.com/login"
if(!this.userName || this.userName.length==0){ if(!this.userName || this.userName.length==0){
this.$tip.toast('请填写用户名'); this.$tip.toast('请填写用户名');
return; return;
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
this.$tip.toast('请检查网络,或服务器设置'); this.$tip.toast('请检查网络,或服务器设置');
} }
},3000) },3000)
this.$http.post("/erp/clouderp/cusmer/login",params).then((resp) => { this.$http.post("/clouderp/cusmer/login",params).then((resp) => {
if(resp.data.success){ if(resp.data.success){
this.loading=false; this.loading=false;
this.loginurl =resp.data.data.records+"&&tp='1'"; this.loginurl =resp.data.data.records+"&&tp='1'";
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<style> <style>
.dtxg{ .dtxg{
background:linear-gradient(to top,pink,blue); background:linear-gradient(to top,#8497FD,#7CB2F0);
} }
/* uni-page-body{ /* uni-page-body{
height: 100%; height: 100%;
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
</view> </view>
<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]"> <view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
<block v-if="loginWay==1"> <block v-if="loginWay==1">
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']"> <view style="border-radius: 5px;" class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-people margin-right-xs"></text>账号:</view> <view class="title"><text class="cuIcon-people margin-right-xs"></text>账号:</view>
<input placeholder="请输入账号" name="input" v-model="userName"></input> <input placeholder="请输入账号" name="input" v-model="userName"></input>
</view> </view>
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']"> <view style="border-radius: 5px;" class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
<view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view> <view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
<input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" /> <input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
<view class="action text-lg"> <view class="action text-lg">
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<style> <style>
.dtxg{ .dtxg{
background:linear-gradient(to top,pink,blue); background:linear-gradient(to top,#8497FD,#7CB2F0);
} }
/* uni-page-body{ /* uni-page-body{
height: 100%; height: 100%;
......
<template> <template>
<view class="bg-white"> <view class="bg-white">
<cu-custom bgColor="bg-white" isBack="true" cx=true modal="bottomModal"> <cu-custom bgColor="bg-white" isBack="true" cx=true modal="bottomModal" @open="cuopen" :modalName="modalName">
<slot slot="backText">返回</slot> <slot slot="backText">返回</slot>
</cu-custom> </cu-custom>
<view class="bg-white nav fixed" :style="[{top:CustomBar + 'px'}]"> <view class="bg-white nav fixed" :style="[{top:CustomBar + 'px'}]">
...@@ -55,7 +55,12 @@ ...@@ -55,7 +55,12 @@
</view> </view>
<!-- 查询框 --> <!-- 查询框 -->
<view class="cu-modal bottom-modal" style="z-index: 998;" :class="modalName=='bottomModal'?'show':''"> <view class="cu-modal bottom-modal" style="z-index: 998;" :class="modalName=='bottomModal'?'show':''">
<!-- #ifdef H5 -->
<view class="cu-dialog" style="height: calc(100vh - 135px);"> <view class="cu-dialog" style="height: calc(100vh - 135px);">
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view class="cu-dialog" style="height: calc(100vh - 170px);">
<!-- #endif -->
<view class="cu-bar bg-white cu-dialog-title"> <view class="cu-bar bg-white cu-dialog-title">
<view class="action cu-dialog-back"> <view class="action cu-dialog-back">
<text class="cuIcon-unfold" @tap="hideModal"></text> <text class="cuIcon-unfold" @tap="hideModal"></text>
...@@ -270,6 +275,9 @@ ...@@ -270,6 +275,9 @@
}, },
methods: { methods: {
cuopen(e){
this.modalName=e
},
// 获取上个月日期 // 获取上个月日期
// 获取上一个月时间,返回yyyy-MM-dd字符串 // 获取上一个月时间,返回yyyy-MM-dd字符串
getLastMonthTime(date){ getLastMonthTime(date){
......
<template> <template>
<view class="bg-white"> <view class="bg-white">
<cu-custom bgColor="bg-white" isBack="true" cx=true modal="bottomModal"> <cu-custom bgColor="bg-white" isBack="true" cx=true modal="bottomModal" @open="cuopen" :modalName="modalName">
<slot slot="backText">返回</slot> <slot slot="backText">返回</slot>
</cu-custom> </cu-custom>
<view class="bg-white nav fixed" :style="[{top:CustomBar + 'px'}]"> <view class="bg-white nav fixed" :style="[{top:CustomBar + 'px'}]">
...@@ -66,7 +66,12 @@ ...@@ -66,7 +66,12 @@
</view> </view>
<!-- 查询框 --> <!-- 查询框 -->
<view class="cu-modal bottom-modal" style="z-index: 998;" :class="modalName=='bottomModal'?'show':''"> <view class="cu-modal bottom-modal" style="z-index: 998;" :class="modalName=='bottomModal'?'show':''">
<view class="cu-dialog" style="height: calc(100vh - 195px);overflow: auto;"> <!-- #ifdef H5 -->
<view class="cu-dialog" style="height: calc(100vh - 195px);">
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view class="cu-dialog" style="height: calc(100vh - 233px);">
<!-- #endif -->
<view class="cu-bar bg-white cu-dialog-title"> <view class="cu-bar bg-white cu-dialog-title">
<view class="action cu-dialog-back"> <view class="action cu-dialog-back">
<text class="cuIcon-unfold" @tap="hideModal"></text> <text class="cuIcon-unfold" @tap="hideModal"></text>
...@@ -266,6 +271,9 @@ ...@@ -266,6 +271,9 @@
}, },
methods: { methods: {
cuopen(e){
this.modalName=e
},
// 获取上个月日期 // 获取上个月日期
// 获取上一个月时间,返回yyyy-MM-dd字符串 // 获取上一个月时间,返回yyyy-MM-dd字符串
getLastMonthTime(date){ getLastMonthTime(date){
......
<template> <template>
<view class="bg-white"> <view class="bg-white">
<cu-custom bgColor="bg-white" isBack="true" cx=true modal="bottomModal"> <cu-custom bgColor="bg-white" isBack="true" cx=true modal="bottomModal" @open="cuopen" :modalName="modalName">
<slot slot="backText">返回</slot> <slot slot="backText">返回</slot>
</cu-custom> </cu-custom>
<view class="bg-white nav fixed" :style="[{top:CustomBar + 'px'}]"> <view class="bg-white nav fixed" :style="[{top:CustomBar + 'px'}]">
...@@ -55,7 +55,12 @@ ...@@ -55,7 +55,12 @@
</view> </view>
<!-- 查询框 --> <!-- 查询框 -->
<view class="cu-modal bottom-modal" style="z-index: 998;" :class="modalName=='bottomModal'?'show':''"> <view class="cu-modal bottom-modal" style="z-index: 998;" :class="modalName=='bottomModal'?'show':''">
<view class="cu-dialog" style="height: calc(100vh - 135px);"> <!-- #ifdef H5 -->
<view class="cu-dialog" style="height: calc(100vh - 135px);">
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view class="cu-dialog" style="height: calc(100vh - 170px);">
<!-- #endif -->
<view class="cu-bar bg-white cu-dialog-title"> <view class="cu-bar bg-white cu-dialog-title">
<view class="action cu-dialog-back"> <view class="action cu-dialog-back">
<text class="cuIcon-unfold" @tap="hideModal"></text> <text class="cuIcon-unfold" @tap="hideModal"></text>
...@@ -250,6 +255,9 @@ ...@@ -250,6 +255,9 @@
}, },
methods: { methods: {
cuopen(e){
this.modalName=e
},
// 获取上个月日期 // 获取上个月日期
// 获取上一个月时间,返回yyyy-MM-dd字符串 // 获取上一个月时间,返回yyyy-MM-dd字符串
getLastMonthTime(date){ getLastMonthTime(date){
......
...@@ -44,6 +44,9 @@ ...@@ -44,6 +44,9 @@
} }
}, },
props: { props: {
modalName:{
default:null
},
modal:{ modal:{
default:null default:null
}, },
...@@ -70,12 +73,18 @@ ...@@ -70,12 +73,18 @@
}); });
}, },
openmodal(){ openmodal(){
if(this.$parent.$parent.modalName){ if(this.modalName){
// this.$parent.$parent.hideModal() this.$emit('open',this.modalName)
}else{ }else{
this.$parent.$parent.modalName=this.modal this.$emit('open',"bottomModal")
} }
// if(this.modalName){
// this.$emit('open',null)
// }else{
// this.$emit('open','bottomModal')
// }
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment