From f01d077604d4cb07a556c32881301ef87a79a7c6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 九月 2023 09:17:59 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 241 ++++++++++++++++++++++++++---------------------
pages/login/login.vue | 22 ++--
pages.json | 23 ++++
main.js | 3
App.vue | 5
uni.scss | 3
6 files changed, 176 insertions(+), 121 deletions(-)
diff --git a/App.vue b/App.vue
index 8147dc3..b0c9d34 100644
--- a/App.vue
+++ b/App.vue
@@ -114,7 +114,10 @@
}
</script>
-<style>
+<style lang="scss">
+ /* 娉ㄦ剰瑕佸啓鍦ㄧ涓�琛岋紝鍚屾椂缁檚tyle鏍囩鍔犲叆lang="scss"灞炴�� */
+ @import "@/uni_modules/uview-ui/index.scss";
+
@import "static/css/colorUi/icon.css";
/*姣忎釜椤甸潰鍏叡css */
body {
diff --git a/main.js b/main.js
index e40b387..9b55e09 100644
--- a/main.js
+++ b/main.js
@@ -12,6 +12,9 @@
import Mock from '@/common/mock/index.js';
Vue.prototype.$Mock = Mock;
+import uView from '@/uni_modules/uview-ui'
+Vue.use(uView)
+
App.mpType = 'app'
try {
diff --git a/pages.json b/pages.json
index 46f2d41..c8004b0 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,10 @@
+
{
+ "easycom": {
+ "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
+ },
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+
{
"path": "pages/login/login",
"style": {
@@ -165,6 +170,24 @@
}
},
{
+ "path": "pages/out/checkOut",
+ "style": {
+ "navigationBarTitleText": "鍑哄簱纭"
+ }
+ },
+ {
+ "path": "pages/out/stockOut",
+ "style": {
+ "navigationBarTitleText": "閫�搴撶‘璁�"
+ }
+ },
+ {
+ "path": "pages/out/handIn",
+ "style": {
+ "navigationBarTitleText": "鎵嬪姩鍏ュ簱"
+ }
+ },
+ {
"path": "pages/login/logOut",
"style": {
"navigationBarTitleText": "閫�鍑虹櫥褰�"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index cfe7351..ba8be1b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -25,124 +25,145 @@
elements: [],
elements2: [
{
- title: '缁勬墭鍏ュ簱',
- name: 'pakin',
+ title: '鍑哄簱纭',
+ name: 'checkOut',
color: 'cyan',
cuIcon: 'pullup',
- url: '/pakin/pakin'
+ url: '/out/checkOut'
},
{
- title: '鍐嶆鎷ｆ枡',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/pakin/pickAgain'
- },
- {
- title: 'AGV缁勬墭',
- name: 'AGVPakin',
+ title: '閫�搴撶‘璁�',
+ name: 'stockOut',
color: 'blue',
cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakin'
+ url: '/out/stockOut'
},
{
- title: 'AGV涓婃灦缁戝畾',
- name: 'AGVPakinBing',
- color: 'mauve',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakinBing'
- },
- {
- title: 'AGV鍚姩鍏ュ簱',
- name: 'AGVStart',
- color: 'pink',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVStart'
- },
- {
- title: 'AGV涓婃灦缁勬墭',
- name: 'AGVPakinOn',
- color: 'brown',
- // cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakinOn'
- },
- {
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
- {
- title: '缁勬墭涓婃灦',
- name: 'putOn',
- color: 'orange',
- cuIcon: 'pullup',
- url: '/pakin/putOn'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
- color: 'purple',
- cuIcon: 'text',
- url: '/print/print'
- },
- {
- title: '璁㈠崟涓婃灦',
- name: 'orderPutOn',
- color: 'yellow',
- cuIcon: 'pullup',
- url: '/order/orderPutOn'
- },
- {
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
+ title: '鎵嬪姩鍏ュ簱',
+ name: 'handIn',
color: 'olive',
- cuIcon: 'pulldown',
- url: '/order/orderPutDown'
+ cuIcon: 'pullup',
+ url: '/out/handIn'
},
- {
- title: '搴撳瓨鏌ヨ',
- name: 'stockQuery',
- color: 'green',
- cuIcon: 'check',
- url: '/stock/stockQuery'
- },
- {
- title: '鐩樼偣',
- name: 'stockCheck',
- color: 'red',
- cuIcon: 'post',
- url: '/stock/stockCheck'
- },
- {
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
- },
- {
- title: '琛ヨ揣',
- name: 'restock',
- color: 'yellow',
- cuIcon: 'punch',
- url: '/stock/restock'
- },
- {
- title: '杞叏鏉�',
- name: 'piking',
- color: 'olive',
- cuIcon: 'order',
- url: '/pakin/piking'
- },
- {
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
- },
+ // {
+ // title: '缁勬墭鍏ュ簱',
+ // name: 'pakin',
+ // color: 'cyan',
+ // cuIcon: 'pullup',
+ // url: '/pakin/pakin'
+ // },
+ // {
+ // title: '鍐嶆鎷ｆ枡',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/pakin/pickAgain'
+ // },
+ // {
+ // title: 'AGV缁勬墭',
+ // name: 'AGVPakin',
+ // color: 'blue',
+ // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVPakin'
+ // },
+ // {
+ // title: 'AGV涓婃灦缁戝畾',
+ // name: 'AGVPakinBing',
+ // color: 'mauve',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVPakinBing'
+ // },
+ // {
+ // title: 'AGV鍚姩鍏ュ簱',
+ // name: 'AGVStart',
+ // color: 'pink',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVStart'
+ // },
+ // {
+ // title: 'AGV涓婃灦缁勬墭',
+ // name: 'AGVPakinOn',
+ // color: 'brown',
+ // // cuIcon: 'pullup',
+ // url: '/tzsk/AGV/AGVPakinOn'
+ // },
+ // {
+ // title: '璁㈠崟鍏ュ簱',
+ // name: 'orderPakin',
+ // color: 'red',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPakin'
+ // },
+ // {
+ // title: '缁勬墭涓婃灦',
+ // name: 'putOn',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/pakin/putOn'
+ // },
+ // {
+ // title: '鎵撳嵃',
+ // name: 'print',
+ // color: 'purple',
+ // cuIcon: 'text',
+ // url: '/print/print'
+ // },
+ // {
+ // title: '璁㈠崟涓婃灦',
+ // name: 'orderPutOn',
+ // color: 'yellow',
+ // cuIcon: 'pullup',
+ // url: '/order/orderPutOn'
+ // },
+ // {
+ // title: '璁㈠崟涓嬫灦',
+ // name: 'orderPutDown',
+ // color: 'olive',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPutDown'
+ // },
+ // {
+ // title: '搴撳瓨鏌ヨ',
+ // name: 'stockQuery',
+ // color: 'green',
+ // cuIcon: 'check',
+ // url: '/stock/stockQuery'
+ // },
+ // {
+ // title: '鐩樼偣',
+ // name: 'stockCheck',
+ // color: 'red',
+ // cuIcon: 'post',
+ // url: '/stock/stockCheck'
+ // },
+ // {
+ // title: '鍟嗗搧鎵撳嵃',
+ // name: 'matList',
+ // color: 'orange',
+ // cuIcon: 'post',
+ // url: '/mat/matList'
+ // },
+ // {
+ // title: '琛ヨ揣',
+ // name: 'restock',
+ // color: 'yellow',
+ // cuIcon: 'punch',
+ // url: '/stock/restock'
+ // },
+ // {
+ // title: '杞叏鏉�',
+ // name: 'piking',
+ // color: 'olive',
+ // cuIcon: 'order',
+ // url: '/pakin/piking'
+ // },
+ // {
+ // title: '鎹㈡澘缁戝畾',
+ // name: 'changePallet',
+ // color: 'green',
+ // cuIcon: 'order',
+ // url: '/stock/changePallet'
+ // },
{
title: '閫�鍑虹櫥褰�',
name: 'logOut',
@@ -158,7 +179,9 @@
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.getAuth()
+ setTimeout(()=>{
+ this.getAuth()
+ },10)
},
methods: {
getAuth() {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 78e9ddc..4e0725a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -66,15 +66,15 @@
<view class="title">閰嶇疆</view>
<view class="popup-item">
<view class="popup-item-left">IP:</view>
- <view class="popup-item-right"><input type="text" v-model="url.ip"></view>
+ <view class="popup-item-right"><input type="text" v-model="Lurl.ip"></view>
</view>
<view class="popup-item">
<view class="popup-item-left">绔彛:</view>
- <view class="popup-item-right"><input type="text" v-model="url.port"></view>
+ <view class="popup-item-right"><input type="text" v-model="Lurl.port"></view>
</view>
<view class="popup-item">
<view class="popup-item-left">椤圭洰:</view>
- <view class="popup-item-right"><input type="text" v-model="url.project"></view>
+ <view class="popup-item-right"><input type="text" v-model="Lurl.project"></view>
</view>
<view class="btn">
<view class="btn-left" @click="close">鍙栨秷</view>
@@ -110,7 +110,7 @@
showPassword: false,
value: '',
remberPassword: true,
- url: {
+ Lurl: {
ip: '',
port: '',
project: ''
@@ -131,13 +131,13 @@
},
onLoad() {
this.user = uni.getStorageSync('user')
- this.url = uni.getStorageSync('url')
+ this.Lurl = uni.getStorageSync('Lurl')
this.baseUrl = uni.getStorageSync('baseUrl')
if (!this.user) {
this.user = {userName: '',password: ''}
}
- if (!this.url) {
- this.url = {ip: '',port: '',project: ''}
+ if (!this.Lurl) {
+ this.Lurl = {ip: '',port: '',project: ''}
}
},
onShow () {
@@ -165,9 +165,9 @@
},
// 淇濆瓨ip
settingConfirm() {
- this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
+ this.baseUrl = "http://" + this.Lurl.ip + ':' + this.Lurl.port + '/' + this.Lurl.project
uni.setStorageSync('baseUrl', this.baseUrl);
- uni.setStorageSync('url', this.url);
+ uni.setStorageSync('Lurl', this.Lurl);
this.$refs.inputDialog.close()
},
onLogin() {
@@ -252,9 +252,9 @@
return
}
- let url = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
+ let Lurl = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
uni.request({
- url: url,
+ url: Lurl,
method: 'GET',
success(res) {
console.log(res);
diff --git a/uni.scss b/uni.scss
index a05adb4..aa6eb1c 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,6 +12,9 @@
* 濡傛灉浣犵殑椤圭洰鍚屾牱浣跨敤浜唖css棰勫鐞嗭紝浣犱篃鍙互鐩存帴鍦ㄤ綘鐨� scss 浠ｇ爜涓娇鐢ㄥ涓嬪彉閲忥紝鍚屾椂鏃犻渶 import 杩欎釜鏂囦欢
*/
+/* uView uni.scss */
+@import '@/uni_modules/uview-ui/theme.scss';
+
/* 棰滆壊鍙橀噺 */
/* 琛屼负鐩稿叧棰滆壊 */
--
Gitblit v1.9.1