feat: 增加注销，优化

pages/comm/comm.vue

@@ -593,6 +593,8 @@
 					fkBisNo: that.curItem.bisNo,
 					bisType: '2',
 					type: '1',
+					company: that.curItem.company,
+					companyNo: that.curItem.companyNo,
 					userNo: uni.getStorageSync('userNo'),
 				});
 				request.post('/slbBisContact/add', params).then(res => {

pages/discovery/discovery.vue

@@ -1,4 +1,7 @@
 <template>
+	<view class="discovery tn-safe-area-inset-bottom" style="max-height: 100vh">
+		
+	
 	<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
 		<view style="width: 100%;padding-bottom: 0;">
 			<view style="display: flex;width: 100%;background: linear-gradient(0deg, #fff, #f8f8f">
@@ -15,52 +18,25 @@
 			
 		</view>
 		
-		<view style="padding: 16px 0 0 16px;">
-			优质入驻企业
+		<view style="padding: 0px 0 4px 16px;">
+			 优质入驻企业 v 
 		</view>
 		
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" >
-			<swiper-item>
-				<view class="swiper-item uni-bg-red">A</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-green">B</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-blue">C</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-red">D</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-green">E</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-blue">F</view>
+			<swiper-item v-for="item of companyList" :key="item.id" style="position:relative">
+				<view style="position: absolute;bottom: 28px;right: 16px;color: #ffffff75;" class="swiper-item uni-bg-red">{{item.company}}</view>
+				<image src="../../static/bg.png" style="width: 100%;height: 100%;"></image>
 			</swiper-item>
 		</swiper>
-		<view style="padding: 16px 0 0 16px;">
-			优质供应
+		<view style="padding: 16px 0 4px 16px;">
+			 优质供应 v 
 		</view>
 		<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" >
-			<swiper-item>
-				<view class="swiper-item uni-bg-red">A</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-green">B</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-blue">C</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-red">D</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-green">E</view>
-			</swiper-item>
-			<swiper-item>
-				<view class="swiper-item uni-bg-blue">F</view>
+			<swiper-item v-for="item of prodList" :key="item.id">
+				<view style="position: absolute;bottom: 28px;right: 16px;color: #ffffff75;" class="swiper-item uni-bg-red">{{item.company}}</view>
+				<image src="../../static/bg.png" style="width: 100%;height: 100%;"></image>
 			</swiper-item>
+			 
 		</swiper>
 		<!-- <image style="width: 180px;height: 150px" src="../../static/logo.png"></image>
 		
@@ -69,26 +45,66 @@
 		<view><text style="font-size:30px">国际产品展示中心</text></view>
 		<view style="margin-top:24px"><text style="font-size:20px;">生物制药产业一站式产品资源供需平台</text></view> -->
 		 
-		<view style="display: flex;margin-top:32px">
-			<view style="flex: 1;padding: 0 16px;">
-				<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="showAdd">我要什么</button>
+		<view style="display: flex;margin-top:32px;margin: 24px;">
+			<view style="flex: 1;padding: 0 16px;" class="bg01" @click="showAdd">
+				<text style="font-size: 32px;margin-right: 10px;vertical-align: sub;" class="tn-icon-email-fill" ></text>
+				<text style="line-height: 72px;font-size: 18px;">我要什么</text>
+				
 			</view>
-			<view style="flex: 1;padding: 0 16px;">
-				<button type="primary" style="background-color:#1d60b1;border-radius: 23px" @click="showAdd2">我有什么</button>
+			<view style="flex: 1;padding: 0 16px;" class="bg02" @click="showAdd2">
+				<text style="font-size: 32px;margin-right: 10px;vertical-align: sub;" class="tn-icon-paperbag-fill" ></text>
+				<text style="line-height: 72px;font-size: 18px;">我有什么</text>
 			</view>
 		</view>
+		
+		<view class='tn-tabbar-height'></view>
+		
+	</view>
 	</view>
 </template>
 
 <script>
+	import request from '../../utils/request'
 	export default {
 		data() {
 			return {
 				  indicatorDots: true,
-				   autoplay: false,
+				  autoplay: false,
+				  companyList:[],
+				  prodList:[]
 			}
 		},
+		onLoad(){
+			this.loadData();
+		},
+		onReady() {
+			this.$nextTick(() => {
+				this.loadData()
+				this.loadData2()
+			})
+		},
 		methods: {
+			
+			loadData() {
+				let that = this;
+				request.post('/slbCompany/premiumCompanies', {
+					 
+				}).then(res => {
+					if (res&&res.success) {
+						that.companyList = res.list||[] 
+					}  
+				})
+			},
+			loadData2() {
+				let that = this;
+				request.post('/slbCompany/premiumShareCompanies', {
+					 
+				}).then(res => {
+					if (res&&res.success) {
+						 that.prodList = res.list||[] 
+					}  
+				})
+			},
 			showAdd(){
 				if(uni.getStorageSync('userNo')){
 					uni.navigateTo({
@@ -124,4 +140,27 @@
 .swiper{
 	height: 200px;
 }
+.bg01{
+	color: #fff;
+	background-image: url(./../../static/bg01.png);
+	background-size: cover;
+	height: 72px;
+	border-radius: 20px;
+	margin-right: 16px;
+}
+.bg02{
+	color: #fff;
+	background-image: url(./../../static/bg02.png);
+	background-size: cover;
+	height: 72px;
+	border-radius: 20px;
+}
+
+/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
+
 </style>

pages/home/home.vue

@@ -335,6 +335,8 @@
 					fkBisNo: that.curItem.bisNo,
 					bisType: '1',
 					type: '1',
+					company: that.curItem.company,
+					companyNo: that.curItem.companyNo,
 					userNo: uni.getStorageSync('userNo'),
 				});
 				request.post('/slbBisContact/add', params).then(res => {

pages/index/auth.vue

@@ -16,8 +16,7 @@
 				
 			}
 		},
-		onLoad(options) {
-			 
+		onLoad(options) {			 
 			let that = this;
 			uni.login({
 				success(res) {

pages/index/detail/detail.vue

@@ -346,6 +346,8 @@
 					fkBisNo: that.curItem.bisNo,
 					bisType: that.isNeed==1?'1':'2',
 					type: '1',
+					company: that.curItem.company,
+					companyNo: that.curItem.companyNo,
 					userNo: uni.getStorageSync('userNo'),
 				});
 				request.post('/slbBisContact/add', params).then(res => {
@@ -447,10 +449,29 @@
 			    return new Promise((resolve) => setTimeout(resolve, time));
 			},	
 			onShareAppMessage: function(option) {
+				this.addLog(this.curItem)
 				this.showSheet = false;
 				this.sleep(1500);
 				return;
-			}
+			},
+			addLog(shareData){
+				const that = this;
+				let params= {
+					bisNo:shareData.bisNo,
+					bisType:that.isNeed==1?'1':'2',
+					company: shareData.company,
+				 	companyNo: shareData.companyNo,
+					userNo:uni.getStorageSync('userNo')
+				};
+				
+				request.post('/slbForward/add',{slbForward:JSON.stringify(params)},{
+					  headers: {
+						'Content-Type': 'application/json', // 默认值
+					  },
+				}).then(res=>{
+							 
+				})
+			},
 		},
 		onLoad(props) {
 			 this.bisNo = props.id;

pages/index/index.vue

@@ -296,7 +296,7 @@
 					this.$refs.comm.loadMore();
 				}
 				if (this.currentIndex === 2) {
-					this.$refs.discovery.getRandomData && this.$refs.discovery.getRandomData()
+					
 				}
 			},
 			 onPulling(e) {
@@ -331,7 +331,7 @@
 			
 			addButton() {
 				
-				if (uni.getStorageSync('userNo')) {
+				if (!uni.getStorageSync('userNo')) {
 					uni.showToast({
 						title: '请登录',
 						icon:'none'

pages/mine/coll.vue

@@ -402,6 +402,8 @@ aspectFill		:src="image_item.ftpUrl" mode="aspectFill" @click="showImg(item.imgL
 					fkBisNo: that.curItem.bisNo,
 					bisType: that.current==0?'1':'2',
 					type: '1',
+					company: that.curItem.company,
+					companyNo: that.curItem.companyNo,
 					userNo: uni.getStorageSync('userNo'),
 				});
 				request.post('/slbBisContact/add', params).then(res => {

pages/mine/mine.vue

@@ -213,7 +213,7 @@
 		      class="icon1__item--icon tn-flex tn-flex-row-center tn-flex-col-center" style="color: #7C8191;">
 		      <view class="tn-icon-logout"></view>
 		    </view>
-		    <view class="tn-margin-left-sm tn-flex-1">注销</view>
+		    <view class="tn-margin-left-sm tn-flex-1">注销账户</view>
 		    <view class="tn-color-gray tn-icon-right"></view>
 		  </view>
 		</tn-list-cell>
@@ -222,7 +222,7 @@
 
     </view>
 	<uni-popup ref="alertDialog" type="dialog">
-		<uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确定" title="确定注销吗" content=" " @confirm="logOff()"
+		<uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确定" title="确定注销账户吗?" content=" " @confirm="logOff()"
 			@close="dialogClose"></uni-popup-dialog>
 	</uni-popup>
     <view class='tn-tabbar-height'></view>
@@ -232,12 +232,16 @@
 
 <script>
   import request from '../../utils/request'
+  import {
+  	uniShowModal
+  } from '../../utils/uni_api'
   export default {
     name: 'Mine',
     data() {
       return {
 		  personInfo: uni.getStorageSync('userInfo')?JSON.parse(uni.getStorageSync('userInfo')):{},
-		  showLogin: false
+		  showLogin: false,
+		  msgType:''
       }
     },
 	onReady() {
@@ -329,15 +333,26 @@
 		  })
 	  },
 	  showLog(){
+		 let that = this;
+		 
+		 uniShowModal('确定注销账户吗?', '', {
+			showCancel: true,
+		 	success: (res) => {
+				console.error(res);
+				if(res.confirm){
+					that.logOff(); 
+				}
+		 		
+		 	}
+		 })
 		 
-		this.msgType = 'warn'
-		this.$refs.alertDialog.open()
 					 
 	  },
 	  //注销
 	  logOff(){
 		  const that = this;
 		  request.post('/slbWxma/logOff', {
+			  userNo: uni.getStorageSync('userNo'),
 		  }).then(res => {
 		  	if (res&&res.success) {
 		  		 uni.showToast({
@@ -347,7 +362,12 @@
 				 uni.navigateTo({
 				   url: '/pages/index/auth'
 				 })
-		  	}
+		  	}else{
+				uni.showToast({
+					title: res.msg,
+					icon: 'none'
+				})
+			}
 		  })
 	  }
     }