调整

pages/search/search-library.vue

@@ -150,7 +150,8 @@ export default {
                 newFlag: 0, // 查询新品标记，默认0，新品1
                 promotionFlag: 0, // 查询促销标记，默认0，促销1
                 productFlag: 1, // 是否统计关键词 1 统计 0 不统计
-                linkageFlag: 1 // 关键词来源是否为用户搜索 0 是 1 不是
+                linkageFlag: 1 ,// 关键词来源是否为用户搜索 0 是 1 不是
+                serviceProviderId:''
             },
             brandListQuery: {
                 keyword: '',

pages/search/search.vue

@@ -560,13 +560,12 @@ export default {
 				pageSize: 20,
 				sortField: '',
 				sortType: 1,
-				newType: 1,
-				actiType: 1,
 				brandIds: '', // 品牌Id
 				newFlag: 0, // 查询新品标记，默认0，新品1
 				promotionFlag: 0, // 查询促销标记，默认0，促销1
 				productFlag: 1, // 是否统计关键词 1 统计 0 不统计
-				linkageFlag: 0 // 关键词来源是否为用户搜索 0 是 1 不是
+				linkageFlag: 0 ,// 关键词来源是否为用户搜索 0 是 1 不是
+                serviceProviderId:'' // 是否协销
 			},
 			brandParam: {
 				keyword: '',

pages/search/search_new.vue

@@ -131,7 +131,8 @@ export default {
                 actiType: 1,
                 brandIds: '', // 品牌Id
                 newFlag: 0, // 查询新品标记，默认0，新品1
-                promotionFlag: 0 // 查询促销标记，默认0，促销1
+                promotionFlag: 0 ,// 查询促销标记，默认0，促销1
+                serviceProviderId:''
             },
             // 历史记录相关
             showDisplay: true,

pages/seller/cart/components/immediatelyList.vue

@@ -6,13 +6,13 @@
 		<list-skeleton :listType="0" v-if="showSkeleton" />
 		<template v-else>
 			<view class="good-search clearfix" v-if="searchStatus">
-				<view class="nav-tab-bar u-f-ajc">
+<!-- 				<view class="nav-tab-bar u-f-ajc">
 					<block v-for="(tab, index) in tabBars" :key="tab.id" :class="{ current: tabIndex === index }">
 						<view class="tabstyle u-f-ajc" :class="{ addstyle: tabIndex == index }" @tap="changeTab(index)">
 							{{ tab.name }}<i v-if="tabIndex == index" class="nav-tab-line iconfont icon-gou"></i>
 						</view>
 					</block>
-				</view>
+				</view> -->
 				<view class="search-from name">
 					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
 					<input
@@ -329,7 +329,7 @@ export default {
 			tabIndex: 0,
 			goodsList: [],
 			tabBars: [{ name: '单一', id: 'danyi' }, { name: '组合', id: 'zuhe' }],
-			isShow: false
+			isShow: false,
 		}
 	},
 	created() {
@@ -344,7 +344,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapState(['hasLogin', 'userInfo'])
+		...mapState(['hasLogin', 'userInfo','serviceProviderId'])
 	},
 	methods: {
 		async initGetStotage() {
@@ -387,13 +387,14 @@ export default {
 				pageNum: this.pageNum,
 				pageSize: this.pageSize,
 				sortField: '',
-				sortType: ''
+				sortType: '',
+                serviceProviderId:this.serviceProviderId
 			})
             .then(response => {
                 this.isShowWrapper = true
-                const resData = JSON.parse(response.data)
-                if(resData){
-                    const resList = resData.items
+                const resData = response.data ? JSON.parse(response.data) : null
+                const resList = resData ? resData.items : []
+                if(resData && resList.length > 0){
                     this.totalPage = resData.total
                     this.showEmpty = false
                     if (loadMore) {
@@ -417,7 +418,7 @@ export default {
                     }
                 }else{
                     this.isShowEmpty = true
-                    this.isShowEmptyText = '暂无相关商品'
+                    this.isShowEmptyText = `暂无${this.searchInputVal}相关商品~`
                 }
                 this.showSkeleton = false
             })
@@ -524,7 +525,7 @@ export default {
                 } else {
                     this.isShowEmpty = true
                     this.showSkeleton = false
-                    this.isShowEmptyText = '暂无相关商品'
+                    this.isShowEmptyText = `暂无${this.searchInputVal}相关商品~`
                 }
             })
             .catch(error => {
@@ -837,10 +838,10 @@ export default {
 	left: 0;
 	z-index: 19;
 	.search-from {
-		width: 420rpx;
+		width: 705rpx;
 		height: 68rpx;
 		background: #f7f7f7;
-		border-radius: 8rpx;
+		border-radius: 34rpx;
 		float: left;
 		position: relative;
 		.input {

pages/seller/components/user.vue

@@ -204,7 +204,7 @@
             this.initData()
         },
         computed: {
-            ...mapState(['hasLogin', 'userInfo'])
+            ...mapState(['hasLogin', 'userInfo','isManage','insideFLag'])
         },
         methods: {
             ...mapMutations(['login', 'logout']),
@@ -332,7 +332,8 @@
                 color: #999;
                 position: absolute;
                 bottom: -20rpx;
-                left: 0;
+                left: 50%;
+                margin-left: -50rpx;
                 z-index: 999;
             }
         }

pages/seller/index/index.vue

@@ -5,9 +5,9 @@
 			<seller-home ref="home" v-if="isHomeData" />
 		</view>
 		<!-- 商品分类 -->
-<!-- 		<view class="content-main" :style="{ display: show_index == 1 ? 'block' : 'none' }">
+		<view class="content-main" :style="{ display: show_index == 1 ? 'block' : 'none' }">
 			<seller-category ref="category" v-if="isCategory" />
-		</view> -->
+		</view>
         <!-- 消息 -->
         <view class="content-main" :style="{ display: show_index == 2 ? 'block' : 'none' }">
         	<seller-message ref="message" v-if="isMessage" />
@@ -18,14 +18,21 @@
 		</view>
 		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
 		<view class="tabBar" :style="{ height: isIphoneX ? '140rpx' : '98rpx' }">
-			<!-- 导航的中间圆圈 -->
-			<view class="tabBar_list" :style="{ paddingBottom: isIphoneX ? '40rpx' : '' }">
-				<view v-for="item in tab_nav_list" :key="item.id" class="tabBar_item" @tap="cut_index(item.id)">
+			<!-- 导航的中间圆圈 -->
+			<view class="tabBar_list" :style="{ paddingBottom: isIphoneX ? '40rpx' : '' }" v-if="insideFLag === 0">
+				<view v-for="item in navList" :key="item.id" class="tabBar_item" @tap="cut_index(item.id)">
 					<image v-if="show_index == item.id" :src="item.iconAc"></image>
 					<image v-else :src="item.icon"></image>
 					<view :class="{ tabBar_name: true, nav_active: show_index == item.id }">{{ item.name }}</view>
 				</view>
-			</view>
+			</view>
+            <view class="tabBar_list inside" :style="{ paddingBottom: isIphoneX ? '40rpx' : '' }" v-else>
+            	<view v-for="item in userNavList" :key="item.id" class="tabBar_item" @tap="cut_index(item.id)">
+            		<image v-if="show_index == item.id" :src="item.iconAc"></image>
+            		<image v-else :src="item.icon"></image>
+            		<view :class="{ tabBar_name: true, nav_active: show_index == item.id }">{{ item.name }}</view>
+            	</view>
+            </view>
 		</view>
 	</view>
 </template>
@@ -51,33 +58,54 @@ export default {
 			isHomeData: false,
             isMessage: false,
 			isIphoneX: this.$store.state.isIphone,
-			tab_nav_list: [
+			navList: [
 				//菜单列表
 				{
 					id: 0,
-					name: '首页',
+					name: '首页',
 					icon: 'https://static.caimei365.com/app/img/icon/icon-home@3x.png',
 					iconAc: 'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'
 				},
-				// {
-				// 	id: 1,
-				// 	name: '分类',
-				// 	icon: 'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',
-				// 	iconAc: 'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'
-				// },
+				{
+					id: 1,
+					name: '分类',
+					icon: 'https://static.caimei365.com/app/img/icon/icon-sort@3x.png',
+					iconAc: 'https://static.caimei365.com/app/img/icon/icon-sort-active@3x.png'
+				},
                 {
                 	id: 2,
-                	name: '消息',
+                	name: '消息',
                 	icon: 'https://static.caimei365.com/app/img/icon/icon-news@3x.png',
                 	iconAc: 'https://static.caimei365.com/app/img/icon/icon-news-active@3x.png'
                 },
 				{
 					id: 3,
-					name: '我的',
+					name: '我的',
 					icon: 'https://static.caimei365.com/app/img/icon/icon-user@3x.png',
 					iconAc: 'https://static.caimei365.com/app/img/icon/icon-user-active@3x.png'
 				}
-			],
+			],
+            userNavList: [
+            	//菜单列表
+                {
+                	id: 0,
+                	name: '首页',
+                	icon: 'https://static.caimei365.com/app/img/icon/icon-home@3x.png',
+                	iconAc: 'https://static.caimei365.com/app/img/icon/icon-home-active@3x.png'
+                },
+                {
+                	id: 2,
+                	name: '消息',
+                	icon: 'https://static.caimei365.com/app/img/icon/icon-news@3x.png',
+                	iconAc: 'https://static.caimei365.com/app/img/icon/icon-news-active@3x.png'
+                },
+            	{
+            		id: 3,
+            		name: '我的',
+            		icon: 'https://static.caimei365.com/app/img/icon/icon-user@3x.png',
+            		iconAc: 'https://static.caimei365.com/app/img/icon/icon-user-active@3x.png'
+            	}
+            ],
 			nvabarData: {
 				//顶部自定义导航
 				showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
@@ -98,7 +126,7 @@ export default {
 		})
 	},
     computed: {
-        ...mapState(['userInfo'])
+        ...mapState(['userInfo','insideFLag'])
     },
 	methods: {
 		// 切换组件

pages/service/certificate-page.vue

@@ -1,101 +1,107 @@
 <template>
-    <!-- 资质证书 -->
-    <view class="container-copyright">
-    	<view class="copyright-titi">
-    		<view class="copyright-line"></view>
-    		<view class="copyright-image">
-    			<image class="image" :src="staticUrl + '/icon/icon-logo@1x.png'"></image>
-    		</view>
-    	</view>
-    	<view class="copyright-cell">
-    		<view class="copyright-cell-item" v-for="cell in certificates" :key="cell" @click="handleClick(cell.id)">
-    			{{ cell.name }}
-    			<text class="iconfont icon-xiayibu"></text>
-    		</view>
-    	</view>
-    </view>
-</template>
-
+    <view class="container clearfix">
+        <view class="foot-list">
+            <view class="list-cell-item">
+                <view class="list-cell" v-for="(item,index) in certificates" :key="index" @click="handleClick(item.id)"
+                    hover-class="cell-hover" :hover-stay-time="50">
+                    <text class="cell-tit">{{ item.name }}</text>
+                    <text class="cell-more">
+                        <text class="iconfont icon-xiayibu"></text>
+                    </text>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
 <script>
-    export default{
-    	name:'certificate-page',
-    	data() {
-    		return{
-    			staticUrl: this.$Static,
-    			certificates:[
-    				{name:'中华人民共和国增值电信业务经营许',id:1},
-    				{name:'医疗器械网络交易服务第三方平台备案凭证',id:2},
-    				{name:'互联网药品信息服务资格证编号(粤)-非经营性-2021-0339',id:3},
-    			]
-    		}
-    	},
-    	methods:{
-    		handleClick(id){// 跳转资质证书
-    			this.$api.navigateTo(`/pages/service/certificate?id=${id}`)
-    		}
-    	}
-    }
-</script>
-
-<style lang="scss">
-page{
-    background-color: #F7F7F7;
-}    
-.container-copyright {
-	width: 100%;
-	height: auto;
-	float: left;
-	box-sizing: border-box;
-	padding:300rpx 24rpx 24rpx 24rpx;
-	background-color: #f7f7f7;
-	.copyright-titi{
-		width: 100%;
-		height: 56rpx;
-		box-sizing: border-box;
-		padding: 0 230rpx;
-		position: relative;
-        margin-bottom: 30rpx;
-		.copyright-line{
-			width: 100%;
-			height: 1px;
-			background: #CECECE;
-			margin-top: 25rpx;
-		}
-		.copyright-image{
-			position: absolute;
-			width: 70rpx;
-			left: 50%;
-			top:-22rpx;
-			margin-left: -65rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background-color: #f7f7f7;
-			padding: 0 30rpx;
-			.image {
-				width: 70rpx;
-				height: 68rpx;
-				margin-right: 6rpx;
-			}
-			.text {
-				font-size: 24rpx;
-				color: #cccccc;
-			}
-		}
-		
-	}
-	.copyright-cell{
-		width: 100%;
-		.copyright-cell-item{
-			height: 55rpx;
-			line-height: 55rpx;
-			text-align: center;
-			font-size: 24rpx;
-			color: #999999;
-			.icon-xiayibu{
-				font-size: 22rpx;
-			}
-		}
-	}
-}
+    export default {
+        data() {
+            return {
+                certificates: [
+                    { name: '中华人民共和国增值电信业务经营许', id: 1 },
+                    { name: '医疗器械网络交易服务第三方平台备案凭证', id: 2 },
+                    { name: '互联网药品信息服务资格证编号(粤)-非经营性-2021-0339', id: 3 },
+                ]
+            }
+        },
+        onLoad(option) {
+
+        },
+        methods: {
+            handleClick(id) { // 跳转资质证书
+                this.$api.navigateTo(`/pages/service/certificate?id=${id}`)
+            }
+        },
+        onShow() {}
+    }
+</script>
+
+<style lang='scss'>
+    page {
+        height: auto;
+    }
+
+    page,
+    .container {
+        /* padding-bottom: 120upx; */
+        background: #fff;
+        /* border-top: 1px solid #EBEBEB; */
+    }
+
+    .foot-list {
+        width: 100%;
+        margin-top: 30rpx;
+    }
+
+    .list-cell-item {
+        width: 702rpx;
+        height: auto;
+        margin-bottom: 24rpx;
+        padding: 0 24rpx;
+        background: $bg-color;
+    }
+
+    .list-cell {
+        display: flex;
+        width: 100%;
+        align-items: baseline;
+        line-height: 100rpx;
+        position: relative;
+        background: $bg-color;
+        justify-content: center;
+        border-bottom: 1px solid #EBEBEB;
+
+        &.cell-hover {
+            background: #fafafa;
+        }
+
+        .cell-more {
+            align-self: baseline;
+            font-size: $font-size-28;
+            color: #b2b2b2;
+            margin-left: 10rpx;
+
+            .txt {
+                color: #999999;
+                padding-right: 10rpx;
+            }
+        }
+
+        .cell-tit {
+            flex: 1;
+            font-size: $font-size-24;
+            color: #666666;
+            margin-right: 10rpx;
+        }
+
+        .cell-tip {
+            font-size: $font-size-28;
+            color: $text-color;
+        }
+    }
+
+    .list-cell.last {
+        border-bottom: none;
+    }
 </style>

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com' 
-    // URL_CONFIG = 'https://core.caimei365.com'    
+    // URL_CONFIG = 'https://core-b.caimei365.com' 
+    URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     URL_CONFIG = 'https://core.caimei365.com'

store/index.js

@@ -24,7 +24,9 @@ const store = new Vuex.Store({
         isActivity: true, // 首页活动弹窗
         isLoginType: 0,
         isManage: false,// 是否是管理员或者小组长
-        shopAdvert:[] // 供应商广告图列表
+        shopAdvert:[] ,// 供应商广告图列表
+        serviceProviderId:0,
+        insideFLag:0 //内外部协销标记 0内部协销,1外部协销
     },
     mutations: {
         login(state, provider) { //用户身份 1、协销 2、资质机构 3、供应商 4.个人机构
@@ -65,7 +67,9 @@ const store = new Vuex.Store({
                 if(provider.userIdentity === 1){
                     if(provider.manager>0 || provider.leaderId > 0){
                         state.isManage = true
-                    }
+                    }
+                    state.insideFLag = provider.insideFLag
+                    state.serviceProviderId = provider.serviceProviderId
                 }
                 // 判断以下公司账户设置部分权限
                 if (provider.userId == 5261 || provider.userId == 10947 || provider.userId == 11579) {