切换导航条
此项目
正在载入...
登录
徐强
/
eej
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
xuqiang
2021-03-03 17:58:54 +0800
提交
a8fe2529a6073b45d35ad5d1a2bef211709d0a0d
1 个父辈
9d432a9b
提交
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
20 行增加
和
30 行删除
pages/index/license/checkDetail.vue
unpackage/dist/dev/app-plus/manifest.json
pages/index/license/checkDetail.vue
查看文件 @
a8fe252
...
...
@@ -1742,6 +1742,7 @@
method:'get',
data:{companyId:this.companyId,type:this.param.type},
success: (res) => {
console.log('打印测试数据',res)
for(var k = 0; k < this.checkList.length; k ++){
if(this.checkList[k].tempType == 'radio'){
for(var i = 0; i < this.checkList[k].keyList.length; i++){
...
...
@@ -2457,30 +2458,24 @@
for(var j = 0; j < this.checkList[i].keyList.length; j ++){
var check = this.checkList[i].keyList[j].check
var id = this.checkList[i].keyList[j].id
var moreInfo = this.checkList[i].keyList[j].moreInfo
var imgs = []
console.log('moreInfo',moreInfo)
console.log(moreInfo.IMGS.length)
if(moreInfo.IMGS.length > 0){
console.log('进来了')
this.returnImgs(moreInfo.IMGS)
if(this.checkList[i].keyList[j].moreInfo.IMGS.length > 0){
this.returnImgs(this.checkList[i].keyList[j].moreInfo)
}
console.log('imgs',imgs)
console.log('转码后的moreInfo',this.checkList[i].keyList[j].moreInfo)
if(check != -1){
saveParam.push({
filedstatic:check.toString(),
id:id,
lon:moreInfo.LON,
lat:moreInfo.LAT,
note:moreInfo.NOTE,
imgs:imgs
lon:this.checkList[i].keyList[j].moreInfo.LON,
lat:this.checkList[i].keyList[j].moreInfo.LAT,
note:this.checkList[i].keyList[j].moreInfo.NOTE,
imgs:this.checkList[i].keyList[j].moreInfo.IMGS
})
}
}
}
}
console.log('saveParam',saveParam)
if(saveParam.length == 0){
uni.showToast({
title:'请选择检查项',
...
...
@@ -2489,6 +2484,7 @@
uni.hideLoading()
return
}
console.log('saveParam',saveParam)
uni.request({
url:this.apiUrl + 'license/baseinfoupdate',
method:'post',
...
...
@@ -2515,22 +2511,17 @@
for(var j = 0; j < this.checkList[i].keyList.length; j ++){
var check = this.checkList[i].keyList[j].check
var id = this.checkList[i].keyList[j].id
var moreInfo = this.checkList[i].keyList[j].moreInfo
var imgs = []
console.log(moreInfo.IMGS.length)
if(moreInfo.IMGS.length > 0){
this.returnImgs(moreInfo.IMGS)
if(this.checkList[i].keyList[j].moreInfo.IMGS.length > 0){
this.returnImgs(this.checkList[i].keyList[j].moreInfo)
}
console.log('imgs',imgs)
if(check != -1){
saveParam.base.push({
filedstatic:check.toString(),
id:id,
lon:moreInfo.LON,
lat:moreInfo.LAT,
note:moreInfo.NOTE,
imgs:imgs
lon:this.checkList[i].keyList[j].moreInfo.LON,
lat:this.checkList[i].keyList[j].moreInfo.LAT,
note:this.checkList[i].keyList[j].moreInfo.NOTE,
imgs:this.checkList[i].keyList[j].moreInfo.IMGS
})
}
}
...
...
@@ -2550,7 +2541,6 @@
}
}
}
console.log('saveParam',saveParam)
if(saveParam.length == 0){
uni.showToast({
title:'请选择检查项',
...
...
@@ -2573,12 +2563,12 @@
uni.hideLoading()
}
},
async returnImgs(
IMGS
){
async returnImgs(
moreInfo
){
for(var j = 0; j < moreInfo.IMGS.length; j ++){
var base64 = (await this.imgToBase(moreInfo.IMGS[j])).base64
console.log(base64)
moreInfo.IMGS[j] = (await this.imgToBase(moreInfo.IMGS[j])).base64
}
},
imgToBase(imgUrl){
return new Promise((reslove,reject) => {
pathToBase64(imgUrl).then(base64 => {
...
...
unpackage/dist/dev/app-plus/manifest.json
查看文件 @
a8fe252
{
"@platforms"
:[
"android"
,
"iPhone"
,
"iPad"
],
"id"
:
"__UNI__8F3ECEE"
,
"name"
:
"eej"
,
"version"
:{
"name"
:
"1.0.0"
,
"code"
:
"100"
},
"description"
:
""
,
"launch_path"
:
"__uniappview.html"
,
"developer"
:{
"name"
:
""
,
"email"
:
""
,
"url"
:
""
},
"permissions"
:{
"UniNView"
:{
"description"
:
"UniNView原生渲染"
}},
"plus"
:{
"useragent"
:{
"value"
:
"uni-app"
,
"concatenate"
:
true
},
"splashscreen"
:{
"target"
:
"id:1"
,
"autoclose"
:
true
,
"waiting"
:
true
,
"delay"
:
0
},
"popGesture"
:
"close"
,
"launchwebview"
:{
"id"
:
"1"
,
"kernel"
:
"WKWebview"
},
"statusbar"
:{
"immersed"
:
"supportedDevice"
,
"style"
:
"dark"
,
"background"
:
"#FFFFFF"
},
"usingComponents"
:
true
,
"nvueCompiler"
:
"uni-app"
,
"compilerVersion"
:
3
,
"distribute"
:{
"google"
:{
"permissions"
:[
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>"
,
"<uses-permission android:name=\"android.permission.VIBRATE\"/>"
,
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>"
,
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>"
,
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>"
,
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.CAMERA\"/>"
,
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>"
,
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
,
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>"
,
"<uses-feature android:name=\"android.hardware.camera\"/>"
,
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]},
"apple"
:{},
"plugins"
:{
"ad"
:{},
"audio"
:{
"mp3"
:{
"description"
:
"Android平台录音支持MP3格式文件"
}}}},
"allowsInlineMediaPlayback"
:
true
,
"safearea"
:{
"background"
:
"#ffffff"
,
"bottom"
:{
"offset"
:
"auto"
}},
"uni-app"
:{
"compilerVersion"
:
"3.0.5"
,
"control"
:
"uni-v3"
,
"nvueCompiler"
:
"uni-app"
,
"renderer"
:
"auto"
,
"nvue"
:{
"flex-direction"
:
"column"
},
"nvueLaunchMode"
:
"normal"
},
"tabBar"
:{
"color"
:
"#646566"
,
"selectedColor"
:
"#4bb377"
,
"borderStyle"
:
"rgba(0,0,0,0.4)"
,
"backgroundColor"
:
"#ffffff"
,
"list"
:[{
"pagePath"
:
"pages/index/index"
,
"iconPath"
:
"static/image/ic_tabbar_home_n.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_home_s.png"
,
"text"
:
"首页"
},{
"pagePath"
:
"pages/map/map"
,
"iconPath"
:
"static/image/ic_tabbar_find_n.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_find_s.png"
,
"text"
:
"地图"
},{
"pagePath"
:
"pages/news/news"
,
"iconPath"
:
"static/image/ic_tabbar_oder_n.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_oder_s.png"
,
"text"
:
"消息"
},{
"pagePath"
:
"pages/my/my"
,
"iconPath"
:
"static/image/ic_tabbar_home_n_2.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_home_s_2.png"
,
"text"
:
"我的"
}],
"height"
:
"50px"
},
"launch_path"
:
"__uniappview.html"
}}
\ No newline at end of file
{
"@platforms"
:[
"android"
,
"iPhone"
,
"iPad"
],
"id"
:
"__UNI__8F3ECEE"
,
"name"
:
"eej"
,
"version"
:{
"name"
:
"1.0.0"
,
"code"
:
"100"
},
"description"
:
""
,
"launch_path"
:
"__uniappview.html"
,
"developer"
:{
"name"
:
""
,
"email"
:
""
,
"url"
:
""
},
"permissions"
:{
"Maps"
:{
"coordType"
:
"gcj02"
},
"UniNView"
:{
"description"
:
"UniNView原生渲染"
}},
"plus"
:{
"useragent"
:{
"value"
:
"uni-app"
,
"concatenate"
:
true
},
"splashscreen"
:{
"target"
:
"id:1"
,
"autoclose"
:
true
,
"waiting"
:
true
,
"delay"
:
0
},
"popGesture"
:
"close"
,
"launchwebview"
:{
"id"
:
"1"
,
"kernel"
:
"WKWebview"
},
"statusbar"
:{
"immersed"
:
"supportedDevice"
,
"style"
:
"dark"
,
"background"
:
"#FFFFFF"
},
"usingComponents"
:
true
,
"nvueCompiler"
:
"uni-app"
,
"compilerVersion"
:
3
,
"distribute"
:{
"google"
:{
"permissions"
:[
"<uses-feature android:name=\"android.hardware.camera\"/>"
,
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>"
,
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>"
,
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
,
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.CAMERA\"/>"
,
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>"
,
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>"
,
"<uses-permission android:name=\"android.permission.INTERNET\"/>"
,
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>"
,
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>"
,
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>"
,
"<uses-permission android:name=\"android.permission.VIBRATE\"/>"
,
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
,
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
,
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]},
"apple"
:{},
"plugins"
:{
"ad"
:{},
"maps"
:{
"amap"
:{
"appkey_ios"
:
"cfa49866c1d6499af910390d0619d810"
,
"appkey_android"
:
"cfa49866c1d6499af910390d0619d810"
}},
"audio"
:{
"mp3"
:{
"description"
:
"Android平台录音支持MP3格式文件"
}}}},
"allowsInlineMediaPlayback"
:
true
,
"safearea"
:{
"background"
:
"#ffffff"
,
"bottom"
:{
"offset"
:
"auto"
}},
"uni-app"
:{
"compilerVersion"
:
"3.1.2"
,
"control"
:
"uni-v3"
,
"nvueCompiler"
:
"uni-app"
,
"renderer"
:
"auto"
,
"nvue"
:{
"flex-direction"
:
"column"
},
"nvueLaunchMode"
:
"normal"
},
"tabBar"
:{
"color"
:
"#646566"
,
"selectedColor"
:
"#4bb377"
,
"borderStyle"
:
"rgba(0,0,0,0.4)"
,
"backgroundColor"
:
"#ffffff"
,
"list"
:[{
"pagePath"
:
"pages/index/index"
,
"iconPath"
:
"static/image/ic_tabbar_home_n.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_home_s.png"
,
"text"
:
"首页"
},{
"pagePath"
:
"pages/map/map"
,
"iconPath"
:
"static/image/ic_tabbar_find_n.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_find_s.png"
,
"text"
:
"地图"
},{
"pagePath"
:
"pages/news/news"
,
"iconPath"
:
"static/image/ic_tabbar_oder_n.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_oder_s.png"
,
"text"
:
"消息"
},{
"pagePath"
:
"pages/my/my"
,
"iconPath"
:
"static/image/ic_tabbar_home_n_2.png"
,
"selectedIconPath"
:
"static/image/ic_tabbar_home_s_2.png"
,
"text"
:
"我的"
}],
"height"
:
"50px"
},
"launch_path"
:
"__uniappview.html"
}}
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论