测试修改，获取地址

manifest.json

@@ -55,8 +55,8 @@
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "android" ],
-                        "appkey_ios" : "b85f0c64b3c9a082d740912cf3019c88",
-                        "appkey_android" : "b85f0c64b3c9a082d740912cf3019c88"
+                        "appkey_ios" : "952fe442d644a282a7d933a4fbdba511",
+                        "appkey_android" : "952fe442d644a282a7d933a4fbdba511"
                     }
                 }
             },

pages/index/index.vue

@@ -6,7 +6,7 @@
 					<block slot="left">
 						<view class="topl flexc">
 							<image :src="adrimg" ></image>
-							<view class="over">潜山</view>
+							<view class="over">{{city}}</view>
 						</view>
 					</block>
 					<view class="topc flexc" v-if="checkPermi(['idcard:idcard:list'])">
@@ -14,9 +14,11 @@
 						<input  placeholder="请输入您要找的客户名称" confirm-type="search" v-model="usename" @confirm="getConfirm"/>
 					</view>
 					<block slot="right">
+						<!-- #ifndef H5 -->
 						<view class="topr flexcc" @click='getScanFn'>
 							<image :src="codeimg"></image>
 						</view>
+						<!-- #endif -->
 					</block>
 				</uni-nav-bar>
 			</view>
@@ -131,6 +133,9 @@
 	import banner from "@/components/toptab/banner.vue"
 	import hNotice from '@/components/swiper/notice.vue'
 	import footers from '@/components/footer/footer.vue'
+	import self from '@/utils/location.js';
+	import config from '@/config'
+	const baseUrl = config.baseUrl
   export default {
 	components:{banner,hNotice,waitList,footers,popUp},
 	data(){
@@ -179,6 +184,7 @@
 			bannerlist:[],
 			metaInfo:'',
 			mtype:false,
+			city:'',
 		}
 	},
 	onPageScroll(e) {
@@ -214,6 +220,19 @@
 		// })
 		
 		// this.init()
+		var that=this;
+		// #ifndef H5
+		self.getLocation(function(res){
+			if(res==-1){
+				
+			}else{
+				that.city=res.city;
+				// that.temperature=res.temperature;
+				// that.weather=res.weather;
+				// that.weathericon=res.icon;
+			}			
+		})
+		// #endif
 		if(checkPermi(['system:remind:list'])){
 			this.getDataFn()
 		}
@@ -321,9 +340,70 @@
 		getBushszListFn(){
 			this.$tab.navigateTo("/work/pages/business/hszlist")
 		},
+		getDown(e){
+			uni.showLoading({
+				title: '加载中'
+			});
+			var url=baseUrl+e;
+			uni.downloadFile({
+				url: url,//文件的下载路径
+				success(result) {
+						uni.hideLoading()
+					var filePath = result.tempFilePath;
+					   uni.openDocument({
+					     filePath: filePath,
+					     showMenu: true,
+					     success: function (res) {
+					       // console.log('打开文档成功');
+					     }
+					   });
+				},
+				fail(res) {uni.hideLoading()}
+			})
+		},
 		getScanFn(){
 			// 扫码识别
-			// this.$tab.navigateTo("/pages/index/notice")
+			var that = this;
+			uni.scanCode({
+				onlyFromCamera: true,
+				autoZoom:false,
+				scanType: ['qrCode'],
+				success: function(red) {
+					let result = red.result;
+					console.log(result,1)
+					if (typeof result == 'string') {
+						try {
+							//type1,认证，2 文件
+							if(result.type==1){
+								that.$tab.navigateTo(`/work/pages/prove/index`)
+							}else if(result.type==2){
+								that.getDown(result.url)
+							}else{
+								
+							}
+						} catch (e) {
+							uni.navigateBack({
+								delta: 1
+							})
+							uni.showToast({
+								title: '扫码查询失败,请检查二维码是否正确',
+								icon: "none"
+							})
+							return
+						}
+					}
+					
+				},
+				fail: function(e) {
+					if (e && e.errMsg && e.errMsg.indexOf('scanCode:fail cancel') != -1) {
+						return;
+					}
+					uni.showToast({
+						title: '扫码失败',
+						icon: "none"
+					})
+				},
+			});
 		},
 		getLedgerFn(){
 			this.$tab.navigateTo("/work/pages/file/ledgertable")
@@ -424,6 +504,7 @@
 			var params={
 				pageSize:this.pageSize,
 				pageNum: this.pageNum,
+				userId:this.userId,
 			}
 			if(this.tabval&&this.tabval!=0){
 				params.remindType=this.tabval

pages/index/notice.vue

@@ -55,6 +55,7 @@
 				ytzt:'',
 				ydztlist:[],//阅读状态
 				isRead:'',
+				userId:this.$store.state.user.userId,
 			}
 		},
 		onPageScroll(e) {
@@ -73,7 +74,10 @@
 				this.getDataFn()
 			}
 		},
-		onLoad() {
+		onLoad(e) {
+			if(e.type){
+				this.tabidx=e.type
+			}
 			this.init();
 			this.getDataFn()
 		},
@@ -160,6 +164,7 @@
 						}
 					}) 
 				}else {
+					params.userId=this.userId;
 					getRemindList(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {

pages/mine/index.vue

@@ -6,7 +6,7 @@
 				<block slot="right">
 					<view class="topr" @click='getNoticeFn'>
 						<image :src="noticimg"></image>
-						<view class="cir">99+</view>
+						<view class="cir"></view>
 						<!-- <block v-if="noticenum>99">99+</block>
 						<block v-else>{{noticenum}}</block> -->
 					</view>
@@ -89,21 +89,21 @@
 				</view>
 			</view>
 			<view class="mbgbox">
-				<view class="flexc mine_list" @click="handleToAddNews" v-if="checkPermi(['projectV2:sbbzb:add'])">
+				<view class="flexc mine_list" @click="handleToAddYwsb" v-if="checkPermi(['system:application:add'])&&checkPermi(['system:registered:user'])">
 					<view class="limg">
 						<image :src="listimga" class="imga"></image>
 					</view>
 					<view class="tit flex1">业务申报</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleToAddNews" v-if="checkPermi(['zxConference:conference:add'])">
+				<view class="flexc mine_list" @click="handleToMysb" v-if="checkPermi(['system:application:list'])&&checkPermi(['system:registered:user'])">
 					<view class="limg">
 						<image :src="listimgb" class="imga"></image>
 					</view>
 					<view class="tit flex1">我的申报</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleToAddNews" v-if="checkPermi(['proposalInfo:info:list'])">
+				<view class="flexc mine_list" @click="handleToDbsx" v-if="checkPermi(['system:remind:list'])">
 					<view class="limg">
 						<image :src="listimgc" class="imga"></image>
 					</view>
@@ -117,14 +117,14 @@
 					<view class="tit flex1">添加企业</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleToAddNews" v-if="checkPermi(['sqmyInfo:info:list'])">
+				<view class="flexc mine_list" @click="handleToMyzc" v-if="checkPermi(['system:application:list'])&&checkPermi(['system:registered:user'])">
 					<view class="limg">
 						<image :src="listimgd" class="imga"></image>
 					</view>
 					<view class="tit flex1">我的暂存</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleToAddNews" v-if="checkPermi(['member:info:list'])">
+				<view class="flexc mine_list" @click="handleToHsz" v-if="checkPermi(['system:system:user'])">
 					<view class="limg">
 						<image :src="listimge" class="imgb"></image>
 					</view>
@@ -141,7 +141,7 @@
 					<view class="tit flex1">台账表</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleToAddNews" v-if="checkPermi(['zxConference:conference:list'])">
+				<view class="flexc mine_list" @click="handleToDbcy" v-if="checkPermi(['system:document:list'])">
 					<view class="limg">
 						<image :src="listimgg" class="imga"></image>
 					</view>
@@ -157,14 +157,16 @@
 					<view class="tit flex1">修改密码</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
+				<!-- #ifdef APP-PLUS -->
 				<view class="flexc mine_list"@click="onlineWgt">
 					<view class="limg">
 						<image :src="listimgi" class="imga"></image>
 					</view>
 					<view class="tit flex1">版本号</view>
 					 <view  class="txt">{{wgtcode}}</view>
-
 				</view>
+				<!-- #endif -->
+				
 				<view class="flexc mine_list" @click="handleLogout">
 					<view class="limg">
 						<image :src="listimgj" class="imga"></image>
@@ -265,7 +267,11 @@
 			if(checkPermi(['system:statistics:loan'])){
 				this.time()
 			}
-			
+			// #ifdef APP-PLUS
+			plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+				that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {})
+			});
+			// #endif
 		},
 		mounted() {
 			this.getHeightFn()
@@ -329,6 +335,30 @@
 					}
 				}).exec();
 			},
+			//业务申报
+			handleToAddYwsb(){
+				this.$tab.navigateTo("/work/pages/prove/zctype")
+			},
+			//我的申报
+			handleToMysb(){
+				this.$tab.navigateTo("/work/pages/business/list?from=my&type=0")
+			},
+			//待办事项
+			handleToDbsx(){
+				this.$tab.navigateTo("/pages/index/notice?type=dbtz")
+			},
+			//我的暂存
+			handleToMyzc(){
+				this.$tab.navigateTo("/work/pages/business/zclist")
+			},
+			//回收站
+			handleToHsz(){
+				this.$tab.navigateTo("/work/pages/business/hszlist")
+			},
+			//担保材料
+			handleToDbcy(){
+				this.$tab.navigateTo("/work/pages/prove/dbcltips")
+			},
 			// 修改密码
 			handleUpassword(){
 				this.$tab.navigateTo(`/pages/mine/pwd/index`)  
@@ -340,6 +370,7 @@
 			handleToAddNews(){
 				this.$tab.navigateTo('/work/pages/news/add')
 			},
+			//添加企业
 			handleToAddQy(){
 				this.$tab.navigateTo('/work/pages/prove/qylist')
 			},
@@ -454,10 +485,10 @@ page{background-color: #f6f6f6;}
 	.topl{width: 274rpx;height: 50rpx;margin-left: 14rpx;}
 	.topr{width: 36rpx;height: 36rpx;position: relative;margin-right: 10rpx;
 		image{width: 100%;height: 100%;}
-		.cir{background: #FF4747;font-size: 14rpx;color: #FFFFFF;border-radius: 50%;border: 2rpx solid #FFFFFF;min-width: 20rpx;height: 20rpx;
-			position: absolute;right: -5rpx;top: -5rpx;text-align: center;line-height: 16rpx;
-		}
-		// .cir{width: 14rpx;height: 14rpx;background: #DF0024;border-radius: 50%;position: absolute;right: -7rpx;top: -7rpx;}
+		// .cir{background: #FF4747;font-size: 14rpx;color: #FFFFFF;border-radius: 50%;border: 2rpx solid #FFFFFF;min-width: 20rpx;height: 20rpx;
+		// 	position: absolute;right: -5rpx;top: -5rpx;text-align: center;line-height: 16rpx;
+		// }
+		.cir{width: 14rpx;height: 14rpx;background: #DF0024;border-radius: 50%;position: absolute;right: -7rpx;top: -7rpx;}
 	}	
 }
 .zxbox{ 

store/modules/user.js

@@ -84,7 +84,7 @@ const user = {
     // 登录
     Login({ commit }, userInfo) {
       const username = userInfo.username.trim()
-      const password = userInfo.password
+      const password =userInfo.type==1 ? userInfo.password:''
       const code = userInfo.code
 	  const type = userInfo.type
       const uuid = userInfo.uuid

utils/initmap.js

@@ -5,10 +5,10 @@ var key='';
 key='fba818d626f91cf5a13cd61943a7667e'
 // #endif
 // #ifdef APP-PLUS
-key='ff70a5409eacd8b16a26fca91ee3aea3'
+key='ccbe52b1ec5f66295fa4609c90a819b7'
 // #endif
 // #ifdef MP-WEIXIN
-key='ff70a5409eacd8b16a26fca91ee3aea3'
+key='ccbe52b1ec5f66295fa4609c90a819b7'
 // #endif
 const myAmapFun =new amap.AMapWX({
 	key:key

work/pages/business/add.vue

@@ -643,92 +643,6 @@
 						</uni-forms-item>
 					</view>
 				</block>
-				
-				<!-- * 反担保人家庭婚姻信息 -->
-				<!-- <view class="addtit mt3"><text>*</text>反担保人家庭婚姻信息</view>
-				<view class="bgf plr12">
-					<picker  range-key='label' :value="qyidx" :range="qylist" class="isborder"  @change='bindDateChangea'>
-						<uni-forms-item label="婚姻状态" name="qymc">
-							<view class="lbtabp">
-								<view v-if="datainfo.qymcid&&!qymc">{{statusFormat(datainfo.qymcid,qylist,'qy')}}</view>
-								<view v-else :class="qymc?'':'coa'">{{qymc||"请选择婚姻状态"}}</view>
-								<image :src="hrimg" class="rimg"></image>
-							</view>
-						</uni-forms-item>
-					</picker>
-					<uni-forms-item label="配偶身份证" name="iszcy">
-						<view class="phobox">
-							<view class="phoboxa">
-								<view class="photop">
-									<image :src="cardz" class="bgimg"></image>
-									<image :src="phoicon" class="addimg"></image>
-								</view>
-								<view class="photit atit">上传人像面</view>
-							</view>
-							<view class="phoboxa">
-								<view class="photop">
-									<image :src="cardf" class="bgimg"></image>
-									<image :src="phoicon" class="addimg"></image>
-								</view>
-								<view class="photit">上传国徽面</view>
-							</view>
-						</view>
-					</uni-forms-item>
-					<uni-forms-item label="配偶姓名" name="email">
-						<uni-easyinput v-model="datainfo.email" :inputBorder='false' placeholder="自动识别" />
-					</uni-forms-item>
-					<uni-forms-item label="配偶身份证号" name="email">
-						<uni-easyinput v-model="datainfo.email" :inputBorder='false' placeholder="自动识别" />
-					</uni-forms-item>
-				</view> -->
-				<!-- * 反担保人婚姻证明-->
-				<!-- <view class="addtit mt3"><text>*</text>反担保人婚姻证明</view>
-				<view class="bgf plr12">
-					<uni-forms-item label="结婚证" name="iszcy">
-						<view class="phobox">
-							<view class="phoboxa">
-								<view class="photop">
-									<image :src="jhico" class="bgimg"></image>
-									<image :src="phoicon" class="addimg"></image>
-								</view>
-								<view class="photit atit">上传结婚证</view>
-							</view>
-						</view>
-					</uni-forms-item>
-				</view> -->
-				<!-- * 反担保人户口簿信息-->
-				<!-- <view class="addtit mt3"><text>*</text>反担保人户口簿信息</view>
-				<view class="bgf plr12">
-					<uni-forms-item label="户口簿首页" name="iszcy">
-						<view class="phobox">
-							<view class="phoboxa">
-								<view class="photop">
-									<image :src="hkico" class="bgimg"></image>
-									<image :src="phoicon" class="addimg"></image>
-								</view>
-								<view class="photit atit">上传户口簿第一页</view>
-							</view>
-						</view>
-					</uni-forms-item>
-					<uni-forms-item label="户口簿单页" name="iszcy">
-						<view class="phobox">
-							<view class="phoboxa">
-								<view class="photop">
-									<image :src="hkico" class="bgimg"></image>
-									<image :src="phoicon" class="addimg"></image>
-								</view>
-								<view class="photit atit">上传户口簿本人页</view>
-							</view>
-							<view class="phoboxa">
-								<view class="photop">
-									<image :src="hkico" class="bgimg"></image>
-									<image :src="phoicon" class="addimg"></image>
-								</view>
-								<view class="photit atit">上传户口簿配偶页</view>
-							</view>
-						</view>
-					</uni-forms-item>
-				</view> -->
 				<!-- * 反担保人信用担保证明-->
 				<view class="addtit mt3">反担保人信用担保证明</view>
 				<view class="bgf plr12">
@@ -1174,18 +1088,27 @@
 						</view>
 					</view>
 				</block>
-			</view>
-			
+			</view>	
 		</uni-forms>
 		<!-- btnd -->
-		<view class="addbtns">
-			<view class="addlbtn" @click="getZanFn"><image :src="zancio"></image>暂存</view>
+		<view class="addbtns" v-if="ftype">
+			<view class="addlbtn" @click.stop="getZanFn">
+				<image :src="zancio" class="addlbtna"></image>
+				<view class="addlbtnb">暂存</view>
+			</view>
 			<view class="addrbtn bga" @click="getPreFn" v-if="stepval>1">上一步</view>
 			<view class="addrbtn bgb" @click="getNextFn" v-if="stepval<4">下一步</view>
-			<!-- <view class="addrbtn bgb" @click="getSubmit" v-if="stepval<4">下一步</view> -->
 			<view class="addrbtn bgb" @click="getSubmit" v-if="stepval==4">提交</view>
 		</view>
-		<!--  -->
+		<cover-view class="addbtns" v-else>
+			<cover-view class="addlbtn" @click.stop="getZanFn">
+				<cover-image :src="zancio" class="addlbtna"></cover-image>
+				<cover-view class="addlbtnb">暂存</cover-view>
+			</cover-view>
+			<cover-view class="addrbtn bga" @click="getPreFn" v-if="stepval>1">上一步</cover-view>
+			<cover-view class="addrbtn bgb" @click="getNextFn" v-if="stepval<4">下一步</cover-view>
+			<cover-view class="addrbtn bgb" @click="getSubmit" v-if="stepval==4">提交</cover-view>
+		</cover-view>
 		<block v-if="lookflag">
 			<view class="bgbox" @click="lookflag=false" ></view>
 			<image :src="lookico" class="looimg" @click="getPreview(lookico)"></image>
@@ -1380,8 +1303,8 @@
 				yhlxidx:0,
 				sfidx:0,
 				frhyzkidx:0,
-				btfiles:[
-					{tit:'公司章程',type:'gszc'},{tit:'开户许可证',type:'khxkz'},{tit:'申请企业征信报告',type:'sqqyzxbg'},{tit:'关联企业征信报告',type:'glqyzxbg'},{tit:'企业法人征信报告',type:'qyfrzxbg'},{tit:'实际控股人征信报告',type:'sjkgrzxbg'},
+				btfiles:[{tit:'公司章程',type:'gszc'},
+					{tit:'开户许可证',type:'khxkz'},{tit:'申请企业征信报告',type:'sqqyzxbg'},{tit:'关联企业征信报告',type:'glqyzxbg'},{tit:'企业法人征信报告',type:'qyfrzxbg'},{tit:'实际控股人征信报告',type:'sjkgrzxbg'},
 				{tit:'户口簿首页',type:'frhkbsy'},
 				],
 				sqbtfiles:[{tit:'委托担保申请书',type:'wtdbsqs'},
@@ -2220,7 +2143,10 @@
 				}
 				getExportMb(params).then(res=>{
 					if(res.code==200){
-						var url=baseUrl+res.msg;
+						var data=res.data;
+						var url=baseUrl+data.path;
+						var name=data.fileName;
+						// var url=baseUrl+res.msg;
 						// var url = baseUrl + ite.url;
 						var name=res.name;
 						let dtask = plus.downloader.createDownload(url, {
@@ -2366,18 +2292,7 @@
 		}
 	}
 	.addgdbox{padding: 34rpx 10rpx 36rpx;}
-	.addbtns{z-index: 4;
-		width: 100%;height: 100rpx;position: fixed;left: 0;right: 0;bottom: 0;display: flex;
-		.addlbtn{background-color: #ffffff;font-weight: 500;justify-content: center;
-font-size: 30rpx;color: $com-cd3;display: flex;align-items: center;width: 232rpx;flex: 0 0 auto;height: 100rpx;
-			image{width: 32rpx;height: 32rpx;margin-right: 12rpx;}
-		}
-		.addrbtn{flex: 1;height: 100rpx;font-weight: bold;font-size: 30rpx;display: flex;align-items: center;justify-content: center;
-color: #FFFFFF;
-			&.bga{background: #29E18A;}
-			&.bgb{background: $com-cd3;}
-		}	
-	}
+	
 	// 附件
 	.fjbox{padding: 24rpx 0;
 		min-height: 150rpx;box-sizing: border-box;
@@ -2412,6 +2327,20 @@ color: #FFFFFF;
 		}
 	}
 }
+.addbtns{z-index: 4;
+		width: 100%;height: 100rpx;position: fixed;left: 0;right: 0;bottom: 0;display: flex;
+		.addlbtn{background-color: #ffffff;font-weight: 500;justify-content: center;
+display: flex;align-items: center;width: 232rpx;flex: 0 0 auto;height: 100rpx;
+			.addlbtna{width: 32rpx;height: 32rpx;margin-right: 12rpx;display: block;}
+			.addlbtnb{font-size: 30rpx;color: $com-cd3;}
+		}
+			
+	}
+.addrbtn{flex: 1;height: 100rpx;font-weight: bold;font-size: 30rpx;display: flex;align-items: center;justify-content: center;
+color: #FFFFFF;text-align: center;line-height: 100rpx;
+			&.bga{background: #29E18A;}
+			&.bgb{background: $com-cd3;}
+		}
 // 标准
 .looimg{width: 100%;height: 400rpx;position: fixed;left: 0;right: 0;top: 50%;margin-top: -200rpx;z-index: 10;}	
 </style>

work/pages/prove/dbcltips.vue

@@ -4,9 +4,9 @@
 			<view class="tit">皖源融资担保有限公司担保材料清单</view>
 			 <rich-text :nodes="content"></rich-text>
 		</view>
-		<view class="flex0 zcfbtns">
+		<!-- <view class="flex0 zcfbtns">
 			<view class="rzbtn" @click="getDownFn">一键下载模板</view>
-		</view>
+		</view> -->
 	</view>
 </template>