From 977b1ced07f9d543b924e120bfffb85509c095eb Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 23 Dec 2024 10:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 10 +---------
.../auth/loginAndRegisterAndForgetPassword.vue | 6 ++++--
pages_order/order/ProcessCardFour.vue | 4 ++--
pages_order/order/ProcessCardOne.vue | 17 +++++++++++------
pages_order/order/ProcessCardThree.vue | 21 +++++++++++++--------
pages_order/order/ProcessCardTo.vue | 18 ++++++++++++------
.../uv-number-box/components/uv-number-box/props.js | 2 +-
7 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/pages.json b/pages.json
index 95a5003..3ee4c73 100644
--- a/pages.json
+++ b/pages.json
@@ -21,18 +21,10 @@
},
"subPackages": [{
"root": "pages_order",
- "pages": [{
- "path": "auth/wxLogin"
- },
- {
- "path": "auth/wxUserInfo"
- },
+ "pages": [
{
"path": "auth/loginAndRegisterAndForgetPassword"
},
- {
- "path": "mine/help"
- },
{
"path": "order/WorkOrderTotalList"
},
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index 7dfcd2c..33120b8 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -130,8 +130,10 @@
checkboxValue: [],
form: {
image : '',
- account: '李靖1',
- password: '123456',
+ account: '',
+ password: '',
+ // account: '李靖1',
+ // password: '123456',
},
form1: {
userName: '',
diff --git a/pages_order/order/ProcessCardFour.vue b/pages_order/order/ProcessCardFour.vue
index 078b8a9..f9f0856 100644
--- a/pages_order/order/ProcessCardFour.vue
+++ b/pages_order/order/ProcessCardFour.vue
@@ -260,7 +260,7 @@
setTimeout(uni.navigateBack, 1000, -1)
},
upload(w, key){
- if(!isPermission('修改')){
+ if(!this.isPermission('修改')){
return
}
this.$Oss.ossUploadImage({
@@ -271,7 +271,7 @@
})
},
del(w, key){
- if(!isPermission('修改')){
+ if(!this.isPermission('修改')){
return
}
w[key] = ''
diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue
index ec8aa00..e6cee34 100644
--- a/pages_order/order/ProcessCardOne.vue
+++ b/pages_order/order/ProcessCardOne.vue
@@ -101,23 +101,27 @@
:key="wi"
v-for="(w, wi) in c.workorderParamSteponeList"
>
+
+
+
+ 规格：{{ w.specs }}
+
+
+
- 规格{{ xi + 1 }}：
+ 参数{{ xi + 1 }}：
-
- {{ w.specs}}
-
+
+
+
+ 规格：{{ w.specs }}
+
+
+
- 规格{{ xi + 1 }}：
+ 参数{{ xi + 1 }}：
-
- {{ w.specs }}
-
+
+
+
+
+ 规格：{{ w.specs }}
+
+
+
- 规格{{ xi + 1 }}：
+ 参数{{ xi + 1 }}：
-
- {{ w.specs }}
-