From 2a46391d53909c806356e7b51754f3af990183d4 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Wed, 18 Sep 2024 19:09:42 +0800
Subject: [PATCH] 11
---
config.js | 9 +++------
main.js | 2 ++
pages/Login/login.vue | 4 ++--
pages/authority/announcement.vue | 8 ++++----
pages/authority/editDete.vue | 10 +++++-----
pages/authority/newadd.vue | 14 +++++++-------
pages/index/order-home.vue | 2 +-
pages/index/orderdetails.vue | 21 +++++++++++----------
pages/index/synthesis.vue | 5 +++--
pages/manage/deviceAdd.vue | 2 +-
pages/my/my-order.vue | 8 ++++----
pages/order/order.vue | 3 ++-
pages/staff/orderdetails.vue | 12 ++++++------
pages/xiaoxi/xiaoxi.vue | 3 ++-
14 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/config.js b/config.js
index 1865569..cad7bf8 100644
--- a/config.js
+++ b/config.js
@@ -1,11 +1,8 @@
// 应用全局配置
module.exports = {
- baseUrl: 'http://192.168.1.8:48080/admin-api',
- // baseUrl: 'https://vue.ruoyi.vip/prod-api',
- // baseUrl: 'https://www.nuoyunr.com/cdJdc',
- //baseUrl: 'http://127.0.0.1:8002/cdJdc',
- imagesUrl: 'http://www.nuoyunr.com/lananRsc/',
-
+ baseUrl: 'http://127.0.0.1:48080/admin-api',
+ imagesUrl: 'http://www.nuoyunr.com/lananRsc',
+ baseImageUrl: 'https://www.nuoyunr.com/minio',
// 应用信息
appInfo: {
// 应用名称
diff --git a/main.js b/main.js
index b3cb0c1..908e974 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,8 @@ import uView from '@/uni_modules/uview-ui'
import config from '@/config'
const baseUrl = config.baseUrl
Vue.prototype.$baseUrl = baseUrl;
+const baseImageUrl = config.baseImageUrl
+Vue.prototype.$baseImageUrl = baseImageUrl;
Vue.use(uView)
diff --git a/pages/Login/login.vue b/pages/Login/login.vue
index 507858d..5e6dfd9 100644
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@@ -99,7 +99,7 @@
yzm:'',
wrod:'',
activeid:0,
- tenantCode: 'lighting'
+ tenantCode: 'lanan'
}
},
mounted(){
@@ -159,7 +159,7 @@
type:0
}
request({
- url: '/rescue/loginApp',
+ url: '/rescue/loginJcApp',
method: 'post',
data: data
}).then((res)=>{
diff --git a/pages/authority/announcement.vue b/pages/authority/announcement.vue
index 05c9cd6..804e5ed 100644
--- a/pages/authority/announcement.vue
+++ b/pages/authority/announcement.vue
@@ -11,7 +11,7 @@
- {{item.dictLabel}}
+ {{item.label}}
@@ -125,7 +125,7 @@
},
gettap(index,item){
this.actindex = index
- this.type = item.dictValue
+ this.type = item.value
this.getlistindex()
},
getback(){
@@ -141,8 +141,8 @@
})
console.log(ress);
this.taplist = ress.data
- // this.taplist.unshift({ dictLabel:'全部',
- // dictValue:'',})
+ // this.taplist.unshift({ label:'全部',
+ // value:'',})
//行业公告
let res = await request({
url: '/appInspection/news/list',
diff --git a/pages/authority/editDete.vue b/pages/authority/editDete.vue
index 3239269..6e2ca19 100644
--- a/pages/authority/editDete.vue
+++ b/pages/authority/editDete.vue
@@ -50,8 +50,8 @@
* 分类
-
- {{item.dictLabel}}
+
+ {{item.label}}
@@ -105,7 +105,7 @@
fileList2: [],
videoList:[],
taplist:[],
- dictValue:[],
+ value:[],
category:'',
newsCover:'',
videoUrl:'',
@@ -322,8 +322,8 @@
getzhi(index){
this.carzhi = index
},
- getzhi2(index,dictValue){
- this.category =dictValue
+ getzhi2(index,value){
+ this.category =value
this.maneizhi = index
},
diff --git a/pages/authority/newadd.vue b/pages/authority/newadd.vue
index 6866fcf..a288bcc 100644
--- a/pages/authority/newadd.vue
+++ b/pages/authority/newadd.vue
@@ -48,8 +48,8 @@
* 分类
-
- {{item.dictLabel}}
+
+ {{item.label}}
@@ -99,7 +99,7 @@
newsTitle:'',
publishUnit:'',
newsContent:'',
- dictValue:'',
+ value:'',
type:'hmzc',
id:1,
carzhi:0,
@@ -156,7 +156,7 @@
})
console.log(ress);
this.taplist = ress.data
- this.dictValue = ress.data[0].dictValue
+ this.value = ress.data[0].value
},
@@ -249,7 +249,7 @@
newsContent:this.newsContent,
videoUrl:this.videoUrl,
- category:this.dictValue,
+ category:this.value,
type:this.type,
}
let res = await request({
@@ -278,8 +278,8 @@
getzhi(index){
this.carzhi = index
},
- getzhi2(index,dictValue){
- this.dictValue =dictValue
+ getzhi2(index,value){
+ this.value =value
this.maneizhi = index
},
diff --git a/pages/index/order-home.vue b/pages/index/order-home.vue
index 39b7ba6..a78aba4 100644
--- a/pages/index/order-home.vue
+++ b/pages/index/order-home.vue
@@ -66,7 +66,7 @@
确认提交
-
-
+
{{detailData.workerName}}
@@ -27,7 +27,7 @@
-
+
{{detailData.goodsName}}
@@ -113,7 +113,7 @@
@click="dialogToggle">
制证完成
-
-
- {{item.dictLabel}}
+ {{item.label}}
@@ -193,7 +193,7 @@
+ keyName="label">
0) {
bankRes.data.forEach(it => {
- tempList.push((it.remark) + it.dictLabel)
+ tempList.push((it.remark) + it.label)
})
}
this.bankList.push(tempList)
@@ -442,7 +443,7 @@
},
xuanxiaolan(item) {
console.log(item);
- this.payType = item.dictValue
+ this.payType = item.value
},
getback() {
@@ -469,8 +470,8 @@
},
confirm(e) {
this.show = false,
- console.log(e.value[0].dictLabel);
- this.lei = e.value[0].dictLabel
+ console.log(e.value[0].label);
+ this.lei = e.value[0].label
},
change(e) {
console.log(e);
diff --git a/pages/index/synthesis.vue b/pages/index/synthesis.vue
index 23c7301..807882c 100644
--- a/pages/index/synthesis.vue
+++ b/pages/index/synthesis.vue
@@ -9,7 +9,7 @@
-
+
{{user.partnerName}} 欢迎您
@@ -180,7 +180,8 @@
appAndPick: {
appointNum: 0,
pickNum: 0
- }
+ },
+ baseImageUrl:this.$baseImageUrl
}
},
diff --git a/pages/manage/deviceAdd.vue b/pages/manage/deviceAdd.vue
index 2df2c7f..26ef8cd 100644
--- a/pages/manage/deviceAdd.vue
+++ b/pages/manage/deviceAdd.vue
@@ -270,7 +270,7 @@
getzhi2(id,text){
if(this.type == 'add'){
this.maneizhi = id
- this.dictValue =text
+ this.value =text
this.box.type = id
}
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index e091536..d0870d3 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -81,7 +81,7 @@
开始检测
-
+