This commit is contained in:
13405411873 2024-09-18 19:09:42 +08:00
parent 189a677150
commit 2a46391d53
14 changed files with 53 additions and 50 deletions

View File

@ -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: {
// 应用名称

View File

@ -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)

View File

@ -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)=>{

View File

@ -11,7 +11,7 @@
</view>
<view class="c-tap">
<view class="tap-box" v-for="(item,index) in taplist" :key="index" @click="gettap(index,item)">
<view :class="{'lan' : actindex == index}" >{{item.dictLabel}}</view>
<view :class="{'lan' : actindex == index}" >{{item.label}}</view>
<view class="gang" v-if="actindex == index"></view>
</view>
</view>
@ -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',

View File

@ -50,8 +50,8 @@
<view class="xinput" v-if="category ">
<view class="text1"> <text class="hong1">*</text> 分类</view>
<view class="xz">
<view :class="{'xlan':maneizhi == index}" class="kuang" v-for="(item,index) in taplist" :key="index" @click="getzhi2(index,item.dictValue)">
<view class="">{{item.dictLabel}}</view>
<view :class="{'xlan':maneizhi == index}" class="kuang" v-for="(item,index) in taplist" :key="index" @click="getzhi2(index,item.value)">
<view class="">{{item.label}}</view>
</view>
</view>
</view>
@ -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
},

View File

@ -48,8 +48,8 @@
<view class="xinput" v-if="type == 'hygg'">
<view class="text1"> <text class="hong1">*</text> 分类</view>
<view class="xz">
<view :class="{'xlan':maneizhi == index}" class="kuang" v-for="(item,index) in taplist" :key="index" @click="getzhi2(index,item.dictValue)">
<view class="">{{item.dictLabel}}</view>
<view :class="{'xlan':maneizhi == index}" class="kuang" v-for="(item,index) in taplist" :key="index" @click="getzhi2(index,item.value)">
<view class="">{{item.label}}</view>
</view>
</view>
</view>
@ -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
},

View File

@ -66,7 +66,7 @@
<view class="annniu">
<view @click="takeOut()" class="">确认提交</view>
</view>
<u-picker :show="show" :columns="columns" keyName="dictLabel" @close="close" @confirm="confirm" @change="change"
<u-picker :show="show" :columns="columns" keyName="label" @close="close" @confirm="confirm" @change="change"
@cancel="cancel"></u-picker>
<u-popup :show="xling" @close="closexl" :round="10" @open="openxl">
<view class="popup-box">

View File

@ -16,7 +16,7 @@
<image src="../../static/detection/touxiang.png" mode=""></image>
</view>
<view class="touxiang" v-else>
<image :src="detailData.workerAvatar" mode=""></image>
<image :src="baseImageUrl+detailData.workerAvatar" mode=""></image>
</view>
<view class="sanniu">
<text>{{detailData.workerName}}</text>
@ -27,7 +27,7 @@
</view>
<view class="box-dis">
<view class="shop-img">
<image :src="detailData.goodsImage" mode=""></image>
<image :src="baseImageUrl+detailData.goodsImage" mode=""></image>
</view>
<view class="ds-right">
<view class="h-title">{{detailData.goodsName}} </view>
@ -113,7 +113,7 @@
@click="dialogToggle">
<view class="">制证完成</view>
</view>
<u-picker :show="show" :columns="columns" keyName="dictLabel" @close="close" @confirm="confirm" @change="change"
<u-picker :show="show" :columns="columns" keyName="label" @close="close" @confirm="confirm" @change="change"
@cancel="cancel"></u-picker>
<u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
<view class="popup-box">
@ -170,9 +170,9 @@
</view>
<view class="warp-box">
<view class="lan-box" :class=" {'lantong':payType == item.dictValue } "
<view class="lan-box" :class=" {'lantong':payType == item.value } "
v-for="(item,index) in shelist" :key="index" @click="xuanxiaolan(item)">
{{item.dictLabel}}
{{item.label}}
</view>
</view>
<view class="on-inputx">
@ -193,7 +193,7 @@
</view>
</u-popup>
<u-picker :show="bankShow" :columns="bankList" @confirm="chooseBank" @cancel="bankShow=false"
keyName="dictLabel"></u-picker>
keyName="label"></u-picker>
<uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog cancelText="关闭" confirmText="确定" title="通知" content="您确定制证完成吗" @confirm="dialogConfirm"
@ -209,6 +209,7 @@
export default {
data() {
return {
baseImageUrl:this.$baseImageUrl,
reduceMoney: null,
payMoney: null,
payType: '',
@ -432,7 +433,7 @@
let tempList = []
if (bankRes.data && bankRes.data.length > 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);

View File

@ -9,7 +9,7 @@
<view class="top-two">
<view class="dix">
<view class="touxiang">
<image :src="user.partnerLogo" mode=""></image>
<image :src="baseImageUrl+user.partnerLogo" mode=""></image>
</view>
<view class="t-title">{{user.partnerName}} 欢迎您</view>
</view>
@ -180,7 +180,8 @@
appAndPick: {
appointNum: 0,
pickNum: 0
}
},
baseImageUrl:this.$baseImageUrl
}
},

View File

@ -270,7 +270,7 @@
getzhi2(id,text){
if(this.type == 'add'){
this.maneizhi = id
this.dictValue =text
this.value =text
this.box.type = id
}

View File

@ -81,7 +81,7 @@
<view @click="takeOut()" class="annniu">
<view class="">开始检测</view>
</view>
<u-picker :show="show" :columns="columns" keyName="dictLabel" @close="close" @confirm="confirm" @change="change" @cancel="cancel"></u-picker>
<u-picker :show="show" :columns="columns" keyName="label" @close="close" @confirm="confirm" @change="change" @cancel="cancel"></u-picker>
<u-popup :show="xling" @close="closexl" :round="10" @open="openxl">
<view class="popup-box">
<view class="sousuo">
@ -223,9 +223,9 @@
},
confirm(e){
this.show = false,
console.log(e.value[0].dictLabel);
this.lei = e.value[0].dictLabel
this.carType = e.value[0].dictValue
console.log(e.value[0].label);
this.lei = e.value[0].label
this.carType = e.value[0].value
},
change(e){
console.log(e);

View File

@ -30,7 +30,7 @@
<view class="a-box" v-for="(item,index) in goodsList" :key="index">
<view class="t-box">
<view class="s-img">
<image :src="item.goodsImage" mode=""></image>
<image :src="baseImageUrl+item.goodsImage" mode=""></image>
</view>
<view class="s-right">
<view class="s-title">{{item.goodsTitle}}</view>
@ -97,6 +97,7 @@
pageNum: 1,//
pageSize: 10,//
totalPages: 0,//
baseImageUrl:this.$baseImageUrl
}
},
onLoad() {

View File

@ -111,7 +111,7 @@
<view class="annniu" v-if="detailData.status&&detailData.status == 1&&detailData.isPass&&detailData.isPass ==1&&detailData.makeCert!=1" @click="dialogToggle" >
<view class="">制证完成</view>
</view>
<u-picker :show="show" :columns="columns" keyName="dictLabel" @close="close" @confirm="confirm" @change="change" @cancel="cancel"></u-picker>
<u-picker :show="show" :columns="columns" keyName="label" @close="close" @confirm="confirm" @change="change" @cancel="cancel"></u-picker>
<u-popup :show="hge" @close="closehge" :round="10" @open="openxl">
<view class="popup-box">
<view class="t-title">是否合格</view>
@ -164,8 +164,8 @@
</view>
<view class="warp-box">
<view class="lan-box" :class=" {'lantong':payType == item.dictValue } " v-for="(item,index) in shelist" :key="index" @click="xuanxiaolan(item)">
{{item.dictLabel}}
<view class="lan-box" :class=" {'lantong':payType == item.value } " v-for="(item,index) in shelist" :key="index" @click="xuanxiaolan(item)">
{{item.label}}
</view>
</view>
<view class="on-inputx">
@ -398,7 +398,7 @@
},
xuanxiaolan(item){
console.log(item);
this.payType = item.dictValue
this.payType = item.value
},
getback(){
@ -425,8 +425,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);

View File

@ -19,7 +19,7 @@
<view class="hongdian" v-if="item.isRead == '0'"></view>
<view class="c-b-top">
<view class="t-left">
<image :src="item.newsCover" mode="aspectFill"></image>
<image :src="baseImageUrl+item.newsCover" mode="aspectFill"></image>
</view>
<view class="t-right">
<view class="t-tilte">{{item.newsTitle}}</view>
@ -68,6 +68,7 @@
pageNum: 1,//
pageSize: 20,//
totalPages: 0,//
baseImageUrl:this.$baseImageUrl
}
},