信息完善取消

components/popup/popup.vue

@@ -24,6 +24,7 @@
 				<view class="ztit">您的认证信息暂未完善，请完善</view>
 			</view>
 			<view class="fixedbtn flexcj">
+				<view class="btns btn1 flex1" @click="getClose">取消</view>
 				<view class="btns btn2 flex1" @click="getXxwsFn">去完善</view>
 			</view>
 		</view>
@@ -93,7 +94,7 @@
 	.fixedbtn{margin-top: 48rpx;
 		.btns{width: 192rpx;height: 70rpx;border-radius: 35rpx;font-weight: bold;
 font-size: 26rpx;display: flex;align-items: center;justify-content: center;box-sizing: border-box;
-			&.btn1{color: #00A9F0;border: 2rpx solid #00A9F0;}
+			&.btn1{color: #00A9F0;border: 2rpx solid #00A9F0;margin-right: 24rpx;}
 			&.btn2{color: #ffffff;background: #00A9F0;}
 		}
 		

manifest.json

@@ -2,8 +2,8 @@
     "name" : "皖源融资担保",
     "appid" : "__UNI__FA20DEF",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages.json

@@ -181,7 +181,7 @@
 			{
 				"path": "pages/prove/zctype",
 				"style": {
-					"navigationBarTitleText": "注册类型",
+					"navigationBarTitleText": "申报类型",
 					"navigationBarBackgroundColor": "#00A9F0",
 					"navigationBarTextStyle": "white",
 					"h5":{"titleNView":false}

pages/index/index.vue

@@ -219,12 +219,9 @@
 		}	
 	},
 	onLoad: function() {
-		// uni.$on('refreshdatalist',(e) => {
-		// 	this.reachflag=false;
-		// 	this.pageNum=1;
-		// 	this.list=[];
-		// 	this.getDataFn();
-		// })
+		uni.$on('refreshdatalist',(e) => {
+			this.getrefreshData()
+		})
 		
 		// this.init()
 		var that=this;
@@ -274,6 +271,10 @@
 		getClose(){
 			this.type='';
 			this.mtype=false;
+			this.initFace='Y';
+			this.$store.dispatch('checkInitFace', this.initFace).then(() => {
+				
+			})
 		},
 		getXxwsFn(){
 			this.$tab.navigateTo(`/work/pages/prove/index`)
@@ -338,7 +339,18 @@
 			this.$tab.reLaunch('/pages/custom/index?name='+this.usename)
 		},
 		getProveFn(){
-			this.$tab.navigateTo("/work/pages/prove/zctype")
+			if(checkPermi(['system:registered:user'])&&!checkPermi(['system:system:user'])){
+				this.$store.dispatch('GetInfo').then(vres => {
+					// 添加企业
+					this.initFace=this.$store.state.user.initFace;
+					if(this.initFace=='Y'){
+						this.$tab.navigateTo("/work/pages/prove/zctype")
+					}
+				})
+			}else{
+				this.$tab.navigateTo("/work/pages/prove/zctype")
+			}
+			
 		},
 		getBusListFn(type,from){
 			// this.$tab.navigateTo("/work/pages/business/list?type="+type)
@@ -461,7 +473,7 @@
 			let query = uni.createSelectorQuery().in(this);
 			//需要给黄色区域设置一个id标识，在这里是demo
 			query.select('.zxtop').boundingClientRect(data => {
-				console.log(data)
+				// console.log(data)
 				var top=data.top<0 ? -data.top : data.top;
 				this.listTop = data.height//赋值，待会要用
 				if (top <=this.nvaHeight) {

pages/index/notice.vue

@@ -1,9 +1,9 @@
 <template>
-	<view class="notice" :style="'padding-top:196rpx;'">
+	<view class="notice" :style="tabidx=='dbtz'?'padding-top:188rpx;':'padding-top:100rpx;'">
 		<view class="pfixed" style="background: transparent;">
 			<tab-list :tablist="tablist" :height="height" :tabidx="tabidx" @getCheck="getCheck"></tab-list>
 			<!-- 筛选条件 -->
-			<view class="flexc checkbox" :class="scroflag?'scbg':''">
+			<view class="flexc checkbox" v-if="tabidx=='dbtz'" :class="scroflag?'scbg':''">
 				<!-- <picker mode="date"    @change='bindDateChangea'>
 					<view class="chekt">
 						<view>{{tzsj|| "通知时间"}}</view>
@@ -52,7 +52,7 @@
 				wtdt:'',
 				tzsj:'',//通知时间
 				ydidx:0,
-				ytzt:'',
+				ydzt:'',
 				ydztlist:[],//阅读状态
 				isRead:'',
 				userId:this.$store.state.user.userId,
@@ -134,9 +134,7 @@
 				// if(this.tzsj){
 				// 	params.createTime=this.tzsj
 				// }
-				if(this.ydzt){
-					params.isRead=this.isRead
-				}
+				
 				var tabidx=this.tabidx;
 				if(tabidx=='xttz'){
 					getNoticeList(params).then(res=>{
@@ -164,6 +162,9 @@
 						}
 					}) 
 				}else {
+					if(this.ydzt){
+						params.isRead=this.isRead
+					}
 					params.userId=this.userId;
 					getRemindList(params).then(res=>{
 						if(res.code==200){
@@ -199,7 +200,7 @@
 <style lang="scss" scoped>
 .notice /deep/	uni-picker{flex: 1;}
 
-.checkbox{padding-top: 4rpx;
+.checkbox{
 	&.scbg{background-color: #FFFFFF;}
 	.chekt{display: flex;align-items: center;margin:0 20rpx;height:88rpx;
 		view{text-align: center;font-weight: bold;font-size: 26rpx;color: #374B61;flex:1;word-break: break-all;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: normal;}

pages/mine/index.vue

@@ -175,6 +175,7 @@
 			</view>
 		</view>
 		<view class="ztit">安徽中新云计算有限公司提供支持</view>
+		<pop-up :initFace="initFace"  @getClose="getClose" @getXxwsFn="getXxwsFn"></pop-up>
 		<footers v-if="isfootflag" :footerindex="footerindex" :isHomeIndex="false"></footers>
 
 	</view>
@@ -183,6 +184,7 @@
 <script>
 	import storage from '@/utils/storage'
 	import footers from '@/components/footer/footer.vue'
+	import popUp from "@/components/popup/popup.vue"
 	import {getCount} from "@/api/common.js"
 	import {updateUserProfile,findVersion} from "@/api/system/user.js"
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
@@ -233,10 +235,11 @@
 				monthtime:'',//月份
 				yearcont:{},
 				monthcont:{},
+				initFace:'Y',//initFace Y不需要,N需要人脸认证
 			}
 		},
 		components: {
-			footers
+			footers,popUp
 		},
 		computed: {
 			avatar() {
@@ -267,7 +270,9 @@
 			}
 			// #ifdef APP-PLUS
 			plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
-				that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {})
+				that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {
+					that.wgtcode=widgetInfo.version
+				})
 			});
 			// #endif
 		},
@@ -333,9 +338,28 @@
 					}
 				}).exec();
 			},
+			getClose(){
+				this.initFace='Y';
+				this.$store.dispatch('checkInitFace', this.initFace).then(() => {
+					
+				})
+			},
+			getXxwsFn(){
+				this.$tab.navigateTo(`/work/pages/prove/index`)
+			},
 			//业务申报
 			handleToAddYwsb(){
-				this.$tab.navigateTo("/work/pages/prove/zctype")
+				if(checkPermi(['system:registered:user'])&&!checkPermi(['system:system:user'])){
+					this.$store.dispatch('GetInfo').then(vres => {
+						this.initFace=this.$store.state.user.initFace;
+						if(this.initFace=='Y'){
+							this.$tab.navigateTo("/work/pages/prove/zctype")
+						}
+					})
+				}else{
+					this.$tab.navigateTo("/work/pages/prove/zctype")
+				}	
+				
 			},
 			//我的申报
 			handleToMysb(){
@@ -388,7 +412,9 @@
 			onlineWgt() {
 				let that = this;
 				plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
-					that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {})
+					that.$store.dispatch('SetwgtFn', widgetInfo.version).then(() => {
+						that.wgtcode=widgetInfo.version
+					})
 					that.comparisonVersionNo(widgetInfo.versionCode);
 				});
 				// that.comparisonVersionNo()

work/pages/file/list.vue

@@ -28,10 +28,11 @@
 		<view class="plr18">
 			<bus-list :datalist="list" :wtdt="wtdt" :type="type" @getXzFn="getXzFn"></bus-list>
 		</view>
-		<view class="scanbox flexcc">
+		<!-- <view style="height: 100rpx;"></view> -->
+		<!-- <view class="scanbox flexcc">
 			<image :src="scanimg"></image>
 			扫码查看
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -227,7 +228,8 @@
 	input{font-weight: 500;font-size: 26rpx;color: #222327;}
 	image{width: 30rpx;height: 30rpx;margin-right: 16rpx;flex: 0 0 auto;}
 }
-.listbox{padding-top: 120rpx;padding-bottom: 100rpx;}
+// .listbox{padding-top: 120rpx;padding-bottom: 100rpx;}
+.listbox{padding-top: 120rpx;}
 .scanbox{position: fixed;left: 0;right: 0;bottom: 0;height: 100rpx;
 background: #00A9F0;font-weight: bold;font-size: 30rpx;color: #FFFFFF;
 	image{width: 26rpx;height: 26rpx;margin-right: 24rpx;}