Переглянути джерело

员工分享+建议与反馈

xhj 2 роки тому
батько
коміт
b0bc4ec71f

+ 1 - 1
card/cardList/cardList.css

@@ -23,7 +23,7 @@ page{
 	height: 76rpx;
 	line-height: 76rpx;;
 	background: #F5F5F5;
-	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	border-radius: 60rpx;
 	padding: 0 26rpx;
 	font-size: 24rpx;
 }

+ 2 - 2
card/cardList/cardList.vue

@@ -68,7 +68,7 @@
 		<view style="position: relative;overflow: hidden;" v-if="dataList.length>0">
 			<view class="register-box" v-for="item,index in dataList" :key="index" @click="jumpUrl('/card/cardDetail/cardDetail?id='+item.id)">
 				<view class="register-title ddflex fflex">
-					<image class="register-title-icon" :src="item.avatar?item.avatar:'/static/images/userimg.png'"></image>
+					<image class="register-title-icon" :src="item.avatar?item.avatar:'/static/images/userimg.png'" mode="aspectFill"></image>
 					<view class="flex" style="min-width: 0;">
 						<view class="ddflex">
 							<view class="card-name fflex tover">{{item.realName?item.realName:''}}</view>
@@ -98,7 +98,7 @@
 					<view class="card-line"></view>
 					<view class="flex">
 						<view class="card-data">{{item.thumbs?item.thumbs:0}}</view>
-						<view class="card-label">用户评价</view>
+						<view class="card-label">用户点赞</view>
 					</view>
 				</view>
 			</view>

+ 3 - 0
card/create/create.vue

@@ -177,6 +177,7 @@ export default {
 			city: '',
 			areaCode: '',
 			morCity: [],
+			companyCode:'',
 			location:{},
 			longitude:'',
 			latitude:'',
@@ -228,6 +229,7 @@ export default {
 						this.companyName = this.employmentInfo.branchName
 						this.job = this.employmentInfo.actrankName
 						this.inDate = this.employmentInfo.inDate
+						this.companyCode = this.employmentInfo.branchNo
 					}
 					else return req.msg("员工信息不存在")
 					resolve();
@@ -525,6 +527,7 @@ export default {
 			dataP.jobNumber = this.jobNumber;
 			dataP.honorImg = this.honorImgUrls.join(',');
 			dataP.styleImg = this.styleImgUrls.join(',');
+			dataP.companyCode = this.companyCode
 			var url = '';
 			if (this.id) {
 				dataP.id = this.id;

+ 2 - 2
card/index/index.vue

@@ -143,7 +143,7 @@
 		<view class="pf-box">
 			<view class="ddflex" style="justify-content: space-between;">
 				<view class="pf-nav">客户评价</view>
-				<view class="ddflex pf-more" @click="jumpUrl('/card/evaluateList/evaluateList?groupId='+cardInfo.id)">
+				<view class="ddflex pf-more" @click="jumpUrl('/card/evaluateList/evaluateList?groupId='+cardInfo.id)" v-if="evaluateInfo.evaluateDTO">
 					全部评价
 					<image style="width: 9rpx;height: 19rpx;margin-left: 10rpx;" src="/static/pages/images/more.png"></image>
 				</view>
@@ -459,7 +459,7 @@ import util from '../../utils/util.js';
 				this.userBehavior(6)
 				return {
 					title: this.cardInfo.realName,
-					path: '/card/index/index?cardId=' + this.cardInfo.id + '&userId=' + userInfo.id + (userInfo.userType==1?('&shareId=' + userInfo.id):''),
+					path: '/card/index/index?cardId=' + this.cardInfo.id + '&userId=' + userInfo.id + (userInfo.userType==1?('&shareId=' + userInfo.saleNo):''),
 					imageUrl: this.cardInfo.avatar + '?x-oss-process=style/w375', // 分享图
 				};
 			}

+ 2 - 2
components/service-contact/index.vue

@@ -53,14 +53,14 @@
 							this.recommendCard = res.visitingCardDTO
 							this.loading = false
 						}else{
-							req.getRequest('/api/visiting/card/recommendCardInfo', {}, res => {
+							req.getRequest('/api/visiting/card/recommendCardInfo', {shareSaleNo:req.getStorage("shareId")?req.getStorage("shareId"):null}, res => {
 								this.recommendCard = res
 								this.loading = false
 							})
 						}
 					})
 				}else{
-					req.getRequest('/api/visiting/card/recommendCardInfo', {}, res => {
+					req.getRequest('/api/visiting/card/recommendCardInfo', {shareSaleNo:req.getStorage("shareId")?req.getStorage("shareId"):null}, res => {
 						this.recommendCard = res
 						this.loading = false
 					})

+ 2 - 2
match/activityDetail/activityDetail.vue

@@ -160,7 +160,7 @@ export default {
 			url += '&userId=' + req.getStorage('userInfo').id
 		}
 		if(req.getStorage('userInfo').userType==1){
-			url += '&shareId=' + req.getStorage('userInfo').id
+			url += '&shareId=' + req.getStorage('userInfo').saleNo
 		}
 		return {
 			title: this.detail.title,
@@ -176,7 +176,7 @@ export default {
 			query.userId = req.getStorage('userInfo').id
 		}
 		if(req.getStorage('userInfo').userType==1){
-			url += '&shareId=' + req.getStorage('userInfo').id
+			url += '&shareId=' + req.getStorage('userInfo').saleNo
 		}
 		return {
 			title: this.detail.title,

+ 2 - 2
mine/feedback/feedback.vue

@@ -55,7 +55,7 @@ export default {
     },
 
     getData() {
-      req.getRequest('/api/aboutAs', {}, res => {
+      req.getRequest('/api/user/aboutUs', {}, res => {
         this.setData({
           phone: res.hotLine
         });
@@ -80,7 +80,7 @@ export default {
         return false;
       }
 
-      req.postRequest('/api/feedback', {
+      req.postRequest('/api/user/feedback', {
         name: that.name,
         mobile: that.mobile,
         text: that.text

+ 1 - 1
pages/about/about.vue

@@ -41,7 +41,7 @@ export default {
     getAbout() {
       var _this = this;
 
-      req.getRequest('/api/aboutAs', {}, function (res) {
+      req.getRequest('/api/user/aboutUs', {}, function (res) {
         _this.setData({
           about: res
         });

+ 1 - 1
pages/authorize/authorize.vue

@@ -244,7 +244,7 @@ export default {
 		getAbout() {
 			var _this = this;
 			req.getRequest(
-				'/api/aboutAs',
+				'/api/user/aboutUs',
 				{},
 				function(res) {
 					_this.setData({

+ 3 - 1
pages/found/found.vue

@@ -169,7 +169,9 @@
 					req.loadIng('加载中');
 					isShowLoading = true;
 				}
-
+				if(req.getStorage("shareId")){
+					form.shareSaleNo = req.getStorage("shareId")
+				}
 				req.getRequest('/api/content/list', form, data => {
 					if (data && data.length == 10) that.isLoad = true;
 					if (that.page > 1) data = that.pageList.concat(data);

+ 7 - 2
pages/index/index.vue

@@ -552,6 +552,9 @@
 			// 获取推荐销售
 			getRecommendCard(loction) {
 				let params = loction
+				if(req.getStorage("shareId")){
+					params.shareSaleNo = req.getStorage("shareId")
+				}
 				req.getRequest('/api/visiting/card/recommendCardInfo', params, res => {
 					this.recommendCard = res
 					console.log('获取推荐销售》》》》》', res);
@@ -633,7 +636,8 @@
 					req.getRequest('/api/content/list', {
 						code: code,
 						page: 1,
-						limit: 2
+						limit: 2,
+						shareSaleNo : req.getStorage("shareId")?req.getStorage("shareId"):null
 					}, res => {
 						r(res ? res : [])
 					})
@@ -646,7 +650,8 @@
 					req.getRequest('/api/content/list', {
 						code: code,
 						page: 1,
-						limit: 10
+						limit: 10,
+						shareSaleNo : req.getStorage("shareId")?req.getStorage("shareId"):null
 					}, res => {
 						this.fxContentList = res ? res : []
 						r(res ? res : [])

+ 5 - 2
topic/content/content.vue

@@ -100,14 +100,14 @@ export default {
 		return {
 			title: this.detaile.title,
 			imageUrl: this.detaile.pic,
-			path: '/topic/content/content?id=' + this.id +'&isShare=' + true+(this.userInfo.userType==1?('&shareId='+this.userInfo.id):'')
+			path: '/topic/content/content?id=' + this.id +'&isShare=' + true+(this.userInfo.userType==1?('&shareId='+this.userInfo.saleNo):'')
 		};
 	},
 	onShareTimeline() {
 		return {
 			title: this.detaile.title,
 			imageUrl: this.detaile.pic,
-			path: '/topic/content/content?id=' + this.id +'&isShareTimeline=' + true+(this.userInfo.userType==1?('&userId='+this.userInfo.id):'')
+			path: '/topic/content/content?id=' + this.id +'&isShareTimeline=' + true+(this.userInfo.userType==1?('&userId='+this.userInfo.saleNo):'')
 		};
 	},
 	methods: {
@@ -205,6 +205,9 @@ export default {
 		getContentList() {
 			let form = this.form;
 			form.cid = this.detaile.cid;
+			if(req.getStorage("shareId")){
+				form.shareSaleNo = req.getStorage("shareId")
+			}
 			req.getRequest('/api/content/list',form,res => {
 				this.contentList = res;
 				for (var i = 0; i < this.contentList.length; i++) {

+ 3 - 0
topic/contentList/contentList.vue

@@ -120,6 +120,9 @@ export default {
 			}
 			if(this.searchVal) form.title = this.searchVal
 			else form.title = ''
+			if(req.getStorage("shareId")){
+				form.shareSaleNo = req.getStorage("shareId")
+			}
 			req.getRequest('/api/content/list', form,res => {
 				res = res?res:[]
 				if (res && res.length == 10) {