高敬炎 2 лет назад
Родитель
Сommit
261936e2f8

+ 2 - 1
xiaochengxu/pages.json

@@ -108,7 +108,8 @@
 			"path": "pages/mySet/myHome",
 			"style": {
 				"navigationBarTitleText": "主页信息",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 
 		}, {

+ 18 - 19
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -427,6 +427,24 @@
 
 		},
 		onShow:function(){
+			this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
+				receiveId: uni.getStorageSync("userInfo").id,
+			}, failres => {
+				console.log('res+++++', failres.errmsg)
+				this.$refs.uToast.show({
+					type: 'error',
+					message: failres.errmsg,
+				})
+			}).then(res => {
+				this.noticeList = res.data.items
+				if (this.noticeList.length > 0) {
+					var data = this.noticeList.filter((item) => {
+						return item.newsFlag == 0
+					})
+					this.unread = data ? data.length : 0
+				}
+				console.log(this.unread)
+			})
 			this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
 			if(this.searchVal) this.mescroll.resetUpScroll();
 		},
@@ -1113,25 +1131,6 @@
 							
 							console.log(this.typeColumns)
 						})
-						
-						await this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
-							receiveId: uni.getStorageSync("userInfo").id,
-						}, failres => {
-							console.log('res+++++', failres.errmsg)
-							this.$refs.uToast.show({
-								type: 'error',
-								message: failres.errmsg,
-							})
-						}).then(res => {
-							this.noticeList = res.data.items
-							if (this.noticeList.length > 0) {
-								var data = this.noticeList.filter((item) => {
-									return item.newsFlag == 0
-								})
-								this.unread = data ? data.length : 0
-							}
-							console.log(this.unread)
-						})
 					}
 					
 				}

+ 1 - 1
xiaochengxu/pages/mySet/myCard.vue

@@ -73,7 +73,7 @@
 					</view>
 					<view v-else style='padding-left:20rpx;' >
 						<u-upload  @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
-						:maxCount="1" height='190' width='350'>
+						:maxCount="1" height='190' width='340'>
 							<view class="">
 								123
 							</view>

+ 8 - 2
xiaochengxu/pages/mySet/myHome.vue

@@ -1,5 +1,7 @@
 <template>
 	<view class="content">
+		<u-navbar placeholder title="我的证件" @leftClick="leftClick">
+		</u-navbar>
 		<u-loading-page loading-mode='spinner' image="/static/imgs/logo.png" iconSize='60' :loading='loading'></u-loading-page>
 		<view v-if='!loading'>
 			<view v-if='!editstatus&&fileList.length>0' class="swiper-wrap">
@@ -29,11 +31,11 @@
 		</view>
 		<view class="company-title row flex flex-between line" >
 			<view class='title' v-if='!editstatus'>{{companyData.companyName}}</view>
-			<view v-if='!editstatus' class='button flex align-item-center' @click='edit'>
+			<view v-if='!editstatus' style='border-radius:10rpx;' class='button flex align-item-center' @click='$u.debounce(edit, 500)'>
 				<image src="../../static/imgs/mySet/edit.png" style='width:26rpx;height:26rpx;' mode=""></image>
 				<view style='margin-left:10rpx;'>编辑</view>
 			</view>
-			<view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view>
+			<!-- <view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view> -->
 		</view>
 		<view class="content1" :class="editstatus?'content1-edit':''">
 			<view v-if='editstatus' class="row flex flex-between align-item-center line" >
@@ -163,6 +165,10 @@
 			this.id=''
 		},
 		methods: {
+			leftClick() {
+				console.log(11111111)
+					uni.switchTab({url:'/pages/mySet/mySet'})
+			},
 			getList(){
 				var that=this
 				var data={}

+ 1 - 1
xiaochengxu/pages/mySet/myInfo.vue

@@ -884,7 +884,7 @@
 			}
 
 			.right {
-				font-size: 26rpx;
+				font-size: 25rpx;
 				padding: 20rpx 0;
 				position: relative;
 				right: -278rpx;

+ 8 - 4
xiaochengxu/pages/mySet/newCard.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		
 		<view class="content1 relative">
 			<view class="relative">
 				<image :src="imgList[selectIndex].dictLabel" mode="widthFix" style="width: 100%;height: auto;"></image>
@@ -7,7 +8,7 @@
 			<view class="absolute card-content style1" v-if="imgList[selectIndex].dictSort==1">
 				<view class="left">
 					<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
-					<u--image :showLoading="true" src="../../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
+					<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 				</view>
 				<view class="right">
 					<view class="row1">
@@ -61,13 +62,13 @@
 				</view>
 				<view class="left">
 					<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
-					<u--image :showLoading="true" src="../../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
+					<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 				</view>
 			</view>
 			<view class="absolute card-content style2" v-if="imgList[selectIndex].dictSort==3">
 					<view class="top">
 						<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
-						<u--image :showLoading="true" src="../../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
+						<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 					</view>
 					<view class="bottom flex">
 						<view class="left">
@@ -112,7 +113,7 @@
 					<view class="bottom flex">
 						<view class="left">
 						<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
-						<u--image :showLoading="true" src="../../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
+						<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 						</view>
 						<view class="right">
 							<view class="row1 flex">
@@ -285,6 +286,9 @@
 			};
 		},
 		methods: {
+			leftClick() {
+					uni.navigateBack({delta:2})
+			},
 			changeTemplate(index) {
 				this.selectIndex = index
 				this.cardInfo.currentBackground = this.imgList[index].dictLabel