diff --git a/common/http/config.ts b/common/http/config.ts
index 8306e16..f615bcf 100644
--- a/common/http/config.ts
+++ b/common/http/config.ts
@@ -2,8 +2,8 @@ export default {
//正式接口
base_scm:'http://192.168.1.222:7002',
- base_auth:'https://cloud.goodsilk.cn/auth',//登录
- base_mes:'https://cloud.goodsilk.cn/mes',//面料
+ base_auth:'http://192.168.1.2:7000',//登录
+ base_mes:'http://120.26.196.222:8981',//面料
base_process:'http://120.26.196.222:8981',//工艺
diff --git a/common/http/interface.ts b/common/http/interface.ts
index 7abe20b..2bb3b40 100644
--- a/common/http/interface.ts
+++ b/common/http/interface.ts
@@ -20,9 +20,9 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) {
// 合并请求头
const finalHeader = Object.assign({}, header, headerCustom);
let base_url=''
- if(url==='/v1/auth/login'){
+ if(url.includes('/v1')){
base_url=myconfig.base_auth
- }else if(url==='/fabric/info/all'){
+ }else if(url==='/fabric/info/all'||url==='/color/list'){
base_url=myconfig.base_mes
}else if(url.includes('fabric/craft')){
base_url=myconfig.base_process
@@ -43,6 +43,10 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) {
icon:'error',
title:'登录过期！'
})
+ uni.clearStorage()
+ uni.reLaunch({
+ url:'/pages/login/login'
+ })
reject(new Error('请求失败: ' + (res.data && res.data?.message || '未知错误')));
}else {
uni.showToast({
diff --git a/pages.json b/pages.json
index 152f069..03a1094 100644
--- a/pages.json
+++ b/pages.json
@@ -233,17 +233,27 @@
}
},
{
- "path" : "pages/tailorMade/tailorMade",
+ "path" : "pages/customOrder/customOrder",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "disableScroll": true,
+ "app-plus": {
+ "bounce": "none"
+ }
}
},
{
- "path" : "pages/tailorMade/list",
+ "path" : "pages/customOrder/list",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false,
+ "disableScroll": true,
+ "app-plus": {
+ "bounce": "none"
+ }
}
}
],
diff --git a/pages/tailorMade/tailorMade.vue b/pages/customOrder/customOrder.vue
similarity index 64%
rename from pages/tailorMade/tailorMade.vue
rename to pages/customOrder/customOrder.vue
index 45eb4f6..d2545c9 100644
--- a/pages/tailorMade/tailorMade.vue
+++ b/pages/customOrder/customOrder.vue
@@ -6,7 +6,18 @@
const showDialog = ref(false)
const formList = ref([] as any[])
+ const otherList = ref([] as any[])
onMounted(() => {
+ uni.getStorage({
+ key: 'info',
+ success(res) {
+ let data = JSON.parse(res.data)
+ form.value.supplier = data.userName
+ },
+ fail: (err : any) => {
+ console.log(err);
+ }
+ })
getAction('/fabric/craft/info').then((res : any) => {
if (res.code === 200) {
formList.value = res.data
@@ -37,6 +48,17 @@
})
}
})
+ getAction('/color/list').then((res : any) => {
+ if (res.code === 200) {
+
+ }
+ })
+ getAction('/extraOption').then((res : any) => {
+ if (res.code === 200) {
+ otherList.value = JSON.parse(res.data.payload)
+ console.log(otherList.value);
+ }
+ })
})
const onClickLeft = () => {
@@ -172,33 +194,73 @@
-
+
-
+
-
面料添加
-
- 面料名称
- 匹数
- 库存
- 谁定
- 操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其他要求
+
+
+
+ 复制新增
-
- {{item.ml}}
- 匹数
- 库存
- 谁定
- 操作
-
-
+
+
+
+
+
+
+
@@ -209,37 +271,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -281,6 +312,7 @@
flex-direction: column;
height: 100vh;
width: 100vw;
+ overflow-y: hidden;
.van-nav-bar {
width: 100%;
@@ -289,23 +321,16 @@
.content {
flex: 1;
padding: 0 10px;
-
- .grid-container {
- display: grid;
- grid-template-columns: 2fr 1fr 1.5fr 1fr 1fr;
-
- .grid-item {
- border: 1px solid #f2f2f2;
- text-align: center;
-
- ::v-deep .van-cell {
- padding: 0 5px;
- }
- }
- }
+ overflow-y: scroll;
}
}
+ .card {
+ border: 1rpx solid #d7d7d7;
+ border-radius: 5rpx;
+ padding: 10rpx;
+ }
+
.footer-button {
margin: 20px;
display: flex;
@@ -342,6 +367,12 @@
}
}
+ .bor-n {
+ ::v-deep .van-field__control {
+ border: none;
+ }
+ }
+
::v-deep .van-field__control {
border-bottom: 1px solid #d7d7d7;
text-align: center;
diff --git a/pages/tailorMade/list.vue b/pages/customOrder/list.vue
similarity index 97%
rename from pages/tailorMade/list.vue
rename to pages/customOrder/list.vue
index 8ffcdcc..b89f3d6 100644
--- a/pages/tailorMade/list.vue
+++ b/pages/customOrder/list.vue
@@ -39,7 +39,7 @@ import { formatDate } from '../../utils/date';
}
const onClickRight = () => {
uni.navigateTo({
- url: '/pages/spot/spot'
+ url: '/pages/customOrder/customOrder'
})
}
@@ -183,7 +183,7 @@ import { formatDate } from '../../utils/date';
-
-
-
-
-
-
-
-
-
- 登录
-
-
-
-
+
+
+
+
+
+
+
+ 登录
+
+
+
+
请选择品种
-
-
-
-
-
-
-
-
-
-
-
-
-
+