From c99fb191db1ac786218b11f04ba82d3c6fe1d932 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 二月 2026 16:34:55 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_new
---
src/pages/index.vue | 39 +++++++++----------
src/pages/login.vue | 12 ------
src/api/login.js | 3 -
src/store/modules/user.ts | 4 -
src/config.js | 7 ---
src/manifest.json | 5 +-
6 files changed, 23 insertions(+), 47 deletions(-)
diff --git a/src/api/login.js b/src/api/login.js
index 3305acb..87ab52c 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,11 +1,10 @@
import request from '@/utils/request'
// 鐧诲綍鏂规硶
-export function loginCheckFactory(username, password, factoryId) {
+export function loginCheckFactory(username, password) {
const data = {
username,
password,
- factoryId
}
return request({
url: '/loginCheckFactory',
diff --git a/src/config.js b/src/config.js
index e451dd8..9e93570 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,11 +1,6 @@
// 搴旂敤鍏ㄥ眬閰嶇疆
const config = {
- // baseUrl: 'https://vue.ruoyi.vip/prod-api',
- // baseUrl: 'http://localhost/prod-api',
- baseUrl: 'http://114.132.189.42:9068', // 鏂扮枂娴峰窛寮�蹇�
- // baseUrl: 'http://192.168.1.185:9988', // 鏈湴娴嬭瘯
- //cloud鍚庡彴缃戝叧鍦板潃
- // baseUrl: 'http://192.168.10.3:8080',
+ baseUrl: 'http://1.15.17.182:9003',
// 搴旂敤淇℃伅
appInfo: {
// 搴旂敤鍚嶇О
diff --git a/src/manifest.json b/src/manifest.json
index 5073852..076346e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "淇℃伅绠＄悊",
- "appid" : "__UNI__E1C100D",
+ "appid" : "__UNI__099A590",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@@ -23,8 +23,7 @@
/* 妯″潡閰嶇疆 */
"modules" : {
"Camera" : {},
- "Barcode" : {},
- "Push" : {}
+ "Barcode" : {}
},
/* 搴旂敤鍙戝竷淇℃伅 */
"distribute" : {
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 6be8435..dcda116 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,24 +1,24 @@
<template>
<view class="content">
- <view class="header-section">
- <view class="currentFactory">
- <up-text type="primary"
- :text="userStore.currentFactoryName"
- @click="show = true"
- size="18"
- class="factoryName"
- suffixIcon="arrow-right"
- :iconStyle="iconStyle"></up-text>
- </view>
- <up-picker :show="show"
- :columns="factoryList"
- @confirm="changeFactory"
- @cancel="show = false"></up-picker>
- </view>
+<!-- <view class="header-section">-->
+<!-- <view class="currentFactory">-->
+<!-- <up-text type="primary"-->
+<!-- :text="userStore.currentFactoryName"-->
+<!-- @click="show = true"-->
+<!-- size="18"-->
+<!-- class="factoryName"-->
+<!-- suffixIcon="arrow-right"-->
+<!-- :iconStyle="iconStyle"></up-text>-->
+<!-- </view>-->
+<!-- <up-picker :show="show"-->
+<!-- :columns="factoryList"-->
+<!-- @confirm="changeFactory"-->
+<!-- @cancel="show = false"></up-picker>-->
+<!-- </view>-->
<view class="hero-section">
<view class="bg-img">
<view class="hero-content">
- <text class="hero-title">鍐涙嘲浼熶笟</text>
+<!-- <text class="hero-title">鍐涙嘲浼熶笟</text>-->
</view>
<view class="hero-wave"></view>
</view>
@@ -220,8 +220,7 @@
import modal from "@/plugins/modal";
import useUserStore from "@/store/modules/user";
- const userStore = useUserStore();
- const factoryId = ref("");
+ const userStore = useUserStore();;
const show = ref(false);
const factoryList = ref([]);
const factoryListTem = ref([]);
@@ -700,8 +699,7 @@
factoryListTem.value = res.data;
res.data.forEach(item => {
factoryList.value[0].push(item.deptName);
- });
- factoryId.value = userStore.currentDeptId;
+ })
} else {
// 濡傛灉res.data涓嶆槸鏁扮粍锛岃缃负绌烘暟缁�
factoryList.value = [];
@@ -804,7 +802,6 @@
const loginForm = {
username: userStore.name,
password: uni.getStorageSync("remembered_password"),
- factoryId: factoryId,
};
modal.loading("鍒锋柊涓紝璇疯�愬績绛夊緟...");
userStore
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 1b997d8..cae7ce2 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -12,17 +12,6 @@
<view class="input-item flex align-center">
<up-input prefixIcon="lock" placeholder="璇疯緭鍏ュ瘑鐮�" border="bottom" maxlength="20" v-model="loginForm.password" clearable type="password"></up-input>
</view>
- <view class="input-item flex align-center select-container">
- <up-icon name="tags" size="18"></up-icon>
- <up-picker-data
- v-model="loginForm.factoryId"
- title="璇烽�夋嫨鍏徃"
- :options="factoryList"
- valueKey="id"
- style="width: 100%;"
- labelKey="name">
- </up-picker-data>
- </view>
<view>
<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">鐧诲綍</button>
</view>
@@ -63,7 +52,6 @@
const loginForm = ref({
userName: "",
password: "",
- factoryId: "",
currentFatoryName: "",
});
const factoryList = ref([]) // 鍏徃鍒楄〃
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 969943c..72722dd 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -7,7 +7,6 @@
export interface LoginForm {
userName: string;
password: string;
- factoryId: string;
}
const useUserStore = defineStore("user", {
@@ -29,9 +28,8 @@
loginCheckFactory(userInfo: any) {
const userName = userInfo.userName
const password = userInfo.password
- const factoryId = userInfo.factoryId
return new Promise((resolve, reject) => {
- loginCheckFactory(userName, password, factoryId).then((res: any) => {
+ loginCheckFactory(userName, password).then((res: any) => {
setToken(res.token)
this.token = res.token
resolve(null)
--
Gitblit v1.9.3