Merge branch 'master' of ssh://git.tool.dwoodauto.com:2221/long/mes_mobile
# Conflicts: # App.vue # package-lock.json
This commit is contained in:
commit
632e19ceda
10
App.vue
10
App.vue
|
@ -2,10 +2,8 @@
|
|||
export default {
|
||||
onLaunch: function() {
|
||||
console.warn('当前组件仅支持 uni_modules 目录结构 ,请升级 HBuilderX 到 3.1.0 版本以上!')
|
||||
console.log('App Launch')
|
||||
|
||||
// 程序加载 隐藏默认的tabBar
|
||||
uni.hideTabBar();
|
||||
console.log('App Launch')
|
||||
// plus.navigator.setFullscreen(true);//隐藏状态栏
|
||||
},
|
||||
onShow: function() {
|
||||
console.log('App Show')
|
||||
|
@ -44,4 +42,8 @@
|
|||
.font12{font-size: $uni-font-size-sm;}
|
||||
.font13{font-size:13px;}
|
||||
.font14{font-size: $uni-font-size-base;}
|
||||
.font_bold{font-weight: bold;}
|
||||
//文字颜色
|
||||
.text_color_black{color: #000;}
|
||||
|
||||
</style>
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
/* 快应用特有相关 */
|
||||
"mp-weixin" : {
|
||||
/* 小程序特有相关 */
|
||||
"appid" : "",
|
||||
"appid" : "wx62bd7b72516b9017",
|
||||
"setting" : {
|
||||
"urlCheck" : false
|
||||
},
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
{
|
||||
"name": "mes_mobile",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 1
|
||||
}
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"name": "mes_mobile",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://git.tool.dwoodauto.com/long/mes_mobile.git"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC"
|
||||
}
|
17
pages.json
17
pages.json
|
@ -35,7 +35,16 @@
|
|||
"path" : "pages/login/login",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "登录",
|
||||
// "navigationBarTitleText" : "登录",
|
||||
"enablePullDownRefresh" : false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/index/productionOrder",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "生产工单管理",
|
||||
"enablePullDownRefresh" : false
|
||||
}
|
||||
}],
|
||||
|
@ -51,8 +60,8 @@
|
|||
"current": 0, //当前激活的模式(list 的索引项)
|
||||
"list": [
|
||||
{
|
||||
"name": "登录", //模式名称
|
||||
"path": "pages/login/login", //启动页面,必选
|
||||
"name": "首页", //模式名称
|
||||
"path": "pages/index/index", //启动页面,必选
|
||||
"query": "" //启动参数,在页面的onLoad函数里面得到
|
||||
}
|
||||
]
|
||||
|
@ -71,7 +80,7 @@
|
|||
"pagePath":"pages/index/index",
|
||||
"text":"首页"
|
||||
},{
|
||||
"pagePath":"pages/login/login",
|
||||
"pagePath":"pages/person/person",
|
||||
"text":"我的"
|
||||
}
|
||||
]
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<view class="content_box">
|
||||
<view class="content_title">工单管理</view>
|
||||
<view class="content_data">
|
||||
<view class="content_module">
|
||||
<view class="content_module" @click="toProductionOrder()">
|
||||
<view class="t-icon t-icon-shengchangongdan contenticon"></view>
|
||||
<view class="contentname">生产工单</view>
|
||||
</view>
|
||||
|
@ -75,6 +75,12 @@
|
|||
url: '/pages/index/message'
|
||||
})
|
||||
},
|
||||
//跳转生产工单页
|
||||
toProductionOrder(){
|
||||
uni.navigateTo({
|
||||
url:'/pages/index/productionOrder'
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
<template>
|
||||
<!-- 生产工单 -->
|
||||
<view class="pagepaddings">
|
||||
<view v-for="(item,index) in list" :key="index" class="page_list">
|
||||
<view class="list_top">
|
||||
<view class="top_left">
|
||||
工单号:{{item.name}}
|
||||
</view>
|
||||
<view class="top_right">
|
||||
工单详情
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_centre">
|
||||
|
||||
</view>
|
||||
<view class="list_below">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
list:[{
|
||||
name:'SO202401111004',
|
||||
|
||||
}]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
|
@ -1,9 +1,58 @@
|
|||
<template>
|
||||
<view class="">
|
||||
测试
|
||||
|
||||
|
||||
|
||||
<view class="login_page ">
|
||||
<view class="login_top">
|
||||
<view class="login_logo">
|
||||
<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/meslogo.png" class="logopng"></image>
|
||||
<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/demu.png" class="demupng"></image>
|
||||
</view>
|
||||
<view class="">
|
||||
自动化MES管理系统
|
||||
</view>
|
||||
</view>
|
||||
<view class="login_centre">
|
||||
<view class="login_switch text_color_black font14">
|
||||
<view class="login_name font_bold" >
|
||||
账号登录
|
||||
</view>
|
||||
<view class="login_name">
|
||||
手机号登录
|
||||
</view>
|
||||
</view>
|
||||
<view class="font12 text_color_black" v-if="type==1">
|
||||
<view class="login_input">
|
||||
<input placeholder="请输入账号" />
|
||||
</view>
|
||||
<view class="login_input">
|
||||
<input password type="text" placeholder="请输入密码" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="font12" v-if="type==2">
|
||||
<view class="login_input">
|
||||
<input placeholder="请输入手机号"/>
|
||||
</view>
|
||||
<view class="">
|
||||
<input placeholder="请输入手机号"/>
|
||||
<view class="getCaptcha">{{codename}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="" style="color: #C4C4C4;font-size: 11px; padding-top: 14px;">
|
||||
记住密码
|
||||
</view>
|
||||
<view class="loginbut">
|
||||
登录
|
||||
</view>
|
||||
<view class="" style="color: #009688;text-align: center;font-size: 13px;">
|
||||
手机号一键登录
|
||||
</view>
|
||||
</view>
|
||||
<view class="login_below">
|
||||
<view class="">
|
||||
|
||||
</view>
|
||||
<view class="">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
@ -11,7 +60,8 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
codename:'获取验证码',
|
||||
type:1,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
@ -20,6 +70,28 @@
|
|||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
<style>
|
||||
.login_page{
|
||||
padding: 0 32px;
|
||||
background: url('https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/background.png') no-repeat;
|
||||
background-position: center center;
|
||||
background-size: cover;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.login_top{padding-top: 160px;padding-bottom: 32px;}
|
||||
.login_logo{display: flex;align-items: center;margin-bottom: 17px;}
|
||||
.logopng{width: 53px;height: 44px;}
|
||||
.demupng{width: 60px;height: 36px;}
|
||||
.login_centre{border-radius: 16px;background: #FFF;padding: 20px 24px 40px;}
|
||||
.login_switch{display: flex;}
|
||||
.login_name{flex: 1;text-align: center;}
|
||||
.login_input{border-radius: 21.5px;background: #F3F5F9; margin-top: 12px; padding: 5px 15px;}
|
||||
.loginbut{
|
||||
background: #009688;
|
||||
text-align: center;
|
||||
margin-top: 60px;
|
||||
margin-bottom: 18px;
|
||||
padding: 9px;
|
||||
border-radius: 66rpx;}
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue