Merge branch 'developerB' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developerB

api/order.js

@@ -1,241 +0,0 @@
-/**
- *@des 订单模块接口
- *@author zhengjinyi
- *@date 2020/03/19 14:56:57
- *@param registerByPass
- */
-import request from '@/common/config/caimeiApi.js'
-import $reg from '@/common/config/common.js'
-/**
- *@获取订单列表
- *@param orderState 订单状态 1 2 3 4
- *@param pageNum	页码
- *@param pageSize	条数
- */
-export function queryOrderList(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/order/list',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *查询订单详情
- *@param orderID 订单ID
- */
-export function queryOrderDetails(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/detail',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *取消订单
- * @param orderID
- */
-export function cancelOrder(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/cancel',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *删除订单
- * @param orderID
- */
-export function deleteOrder(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/delete',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *确认订单
- * @param orderID
- */
-export function affirmOrder(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/order/affirmOrder',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *确认收货
- * @param orderID
- */
-export function confirmReceipt(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/affirm',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *查询物流信息
- * @param orderID
- */
-export function queryLogistics(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/logistics',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *获取订单分享码
- * @param orderID
- */
-export function queryOrderShareCode(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/share',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *分享订单登录
- * @param orderID
- */
-export function orderShareCode(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/shareCode',params, res => {
-			resolve(res)
-		})
-	})
-}
-/**
- *机构搜索订单
- *@param searchWord 关键词
- *@param userId		用户ID
- *@param pageNum	页码
- *@param pageSize	条数
- */
-export function searchOrderInfo(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/order/search',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *搜索订单历史记录
- *@param userId
- */
-export function searchOrderHistory(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/order/searchHistory',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *清楚订单历史记录
- *@param
- */
-export function clearOrderHistory(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/order/searchHistory/delete',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *初始化收银台
- *@param  orderId 订单ID
- */
-export function PayOrderCheckoutCounter(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/PayOrder/checkoutCounter',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-
-/**
- *微信支付
- *@param  amount支付金额，单位分，必须大于2
- *@param  payWay银联：UNIONPAY，微信：WEIXIN，支付宝：ALIPAY
- *@param  payType 微信小程序支付: MINIAPP_WEIXIN ,微信公众号支付: JSAPI_WEIXIN
- *@param  code  微信小程序code,微信小程序支付使用
- *@param  orderId  主订单ID
- */
-export function WeChatMiniWxPay(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/PayOrder/miniWxPay',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *生成支付链接
- *@param  unpaidAmount 本次待付款金额
- *@param  orderId  主订单ID
- */
-export function PayOrderPayLink(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/PayOrder/payLink',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-

api/seller.js

@@ -1,255 +0,0 @@
-/**
- *@des 协销模块接口管理
- *@author zhengjinyi
- *@date 2020/03/19 14:56:57
- *@param registerByPass
- */
-import request from '@/common/config/caimeiApi.js'
-import $reg from '@/common/config/common.js'
-
-/**
- *@协销微信授权登录
- *@param code 微信Code
- */
-export function sellerWxLogin(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/wxLogin',params, true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销登录
- *@param mobile 手机号
- *@param password 密码
- */
-export function sellerLogin(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/login',params, true,res => {
-			resolve(res)
-		})
-	})
-}
-
-/**
- *@协销账户中心
- *@param userID 协销ID
- */
-export function getSellerHome(params) {
-	return new Promise(function(resolve,reject) {
-		request.get('/seller/home',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销拉机构上线
- *@param userID 协销ID
- */
-export function sellerClubRegister(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/club/register',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销拉机构上线检测手机号和邮箱
- *@param mobileOrEmail 手机号和邮箱
- */
-export function sellerClubCheck(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/club/check',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销修改机构资料
- *@param userID 协销ID
- */
-export function sellerClubUpdate(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/club/update',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销机构列表
- *@param name 	  机构名字关键字（搜索用）
- *@param pageNum  页码
- *@param pageSize 条数
- *@param spId 	  协销ID
- *@param status   机构状态
- */
-export function getSellerClubList(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/club/list',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销机构列表
- *@param name 	  机构名字关键字（搜索用）
- *@param pageNum  页码
- *@param pageSize 条数
- */
-export function getFindAllClubList(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/findAllClub',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-
-/**
- *@协销订单列表（搜索订单）
- *@param listType 订单类型
- *@param orderNo  订单号
- *@param pageNum  页码
- *@param pageSize 条数
- *@param serviceProviderId 协销ID
- */
-export function getSellerOrderList(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/order/list',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销下机构订单列表
- *@param clubID   机构ID
- *@param pageNum  页码
- *@param pageSize 条数
- */
-export function getSellerClubOrderList(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/clubOrder',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销帮机构下单商品搜索
- *@param clubUserId 机构的userID
- *@param pageNum 	页码
- *@param pageSize 	条数
- *@param searchWord 搜索关键词
- */
-export function getSellerProduct(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/product/search',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销帮机构下单组合商品搜索
- *@param clubUserId 机构的userID
- *@param pageNum 	页码
- *@param pageSize 	条数
- *@param searchWord 搜索关键词
- */
-export function getcombinationProduct(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/combinationProduct/search',params,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销购物车删除商品
- *@param clubId 会所ID
- *@param serviceProviderId 页码
- */
-export function shoppingCartDelete(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/shoppingCart/delete',params, true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销购物车商品增减
- *@param clubId 会所ID
- *@param serviceProviderId 页码
- */
-export function shoppingCartUpdate(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/shoppingCart/update',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *@协销邀请运营人员
- *@param userID  机构userID
- */
-export function sellerBindingOperation(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/seller/bindingOperation',params,true,res => {
-			if(res.code == 0 || res.code == 4){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-
-

api/utils.js

@@ -4,7 +4,7 @@
  *@date 2020/03/19 14:56:57
  *@param registerByPass
  */
-import requestUrl from '@/common/config/config.js'
+import requestUrl from '@/services/ajax.env.js'
 import request from '@/common/config/caimeiApi.js'
 import $reg from '@/common/config/common.js'
 

common/config/caimeiApi.js

@@ -3,7 +3,7 @@
  * @Author Zhengjingyi
  * @Action 全局公共方法
  */
-import requestUrl from './config.js'
+import requestUrl from '@/services/ajax.env.js'
 const caimeiApi = {
 	/**
 	 * @封装公共get数据请求方法无加载动画

common/config/config.js

@@ -1,14 +0,0 @@
-let URL_CONFIG = ""
-if(process.env.NODE_ENV === 'development'){
-    // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 	//涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
-	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-	URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
-}else{
-    // 生产环境
-    URL_CONFIG = 'https://spi-b.caimei365.com'
-    // URL_CONFIG = 'https://spi.caimei365.com'
-}
-export default URL_CONFIG

components/cm-custom/custom-p.vue

@@ -144,7 +144,7 @@
 		height: 100%;
 		background: rgba(255, 255, 255, 0.6);
 		font-size: 28rpx;
-		color: #666666;
+		color: #999999;
 		position: relative;
 		box-sizing: border-box;
 		position:absolute ;
@@ -158,7 +158,7 @@
 			left: 0;
 			top: 0;
 			font-size: 34rpx;
-			color: #666666;
+			color: #999999;
 			z-index: 10;
 		}
 		.input{

components/cm-module/cm-seller/home.vue

@@ -10,14 +10,28 @@
 			<navbars :list="navBarsList" v-if="isRequest"></navbars>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<!-- 推荐专区 -->
-			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
-			<!-- 楼层 -->
-			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
-			<!-- 商品专题 -->
-			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
-			<!-- 供应商专题 -->
-			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
+			<view v-for="(item,index) in flootData" :key="index">
+				<template v-if="item.type === 1">
+					<!-- 推荐专区 -->
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+				</template>
+				<template v-if="item.type === 3">
+					<!-- 供应商专题 -->
+					<supplier-list :list="item.floorData" v-if="isRequest"></supplier-list>
+				</template>
+				<template v-if="item.type === 4">
+					<!-- 商品专题 -->
+					<special-product :list="item.floorData" v-if="isRequest"></special-product>
+				</template>
+				<template v-if="item.type === 5">
+					<!-- 小专题 -->
+					<small-product :list="item.floorData" v-if="isRequest"></small-product>
+				</template>
+				<template v-if="item.type === 6">
+					<!-- 楼层 -->
+					<pages-product :list="item.subFloors" v-if="isRequest"></pages-product>
+				</template>
+			</view>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -33,6 +47,7 @@
 	import hotProduct from '@/components/cm-module/homeIndex/hotProduct.vue'
 	import pagesProduct from '@/components/cm-module/homeIndex/pagesProduct.vue'
 	import specialProduct from '@/components/cm-module/homeIndex/specialProduct.vue'
+	import smallProduct from '@/components/cm-module/homeIndex/smallProduct.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
@@ -45,6 +60,7 @@
 			navbars,
 			pagesProduct,
 			specialProduct,
+			smallProduct,
 			supplierList
 		},
 		data() {
@@ -75,41 +91,14 @@
 				navBarsList:[],//导航分类
 				pagesList:[],//楼层
 				RecommendList:[],//热门推荐
-				specialList:[],//商品专题轮播
-				specialProList:[],//商品专题商品
-				supplierList:[],//供应商列表
-				organizeProducts:[],//常用商品
-				productsClassifyList:[
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'}
-				],//分类导航
-				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
-				secondModulesName:'', //优惠模块2
-				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
-				secondModulesImage:'',//优惠模块icon2
-				thirdModulesName:'', //优惠模块3
-				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9LCABdf_AAAfdMmM_xY655.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9BSAXPobAAApo6I0Tlo684.png'}
-				],
-				navServerList:[
-					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
-					{text:'售后无忧',icon:'../../../static/temp/server2@2x.png',path:'/pages/service/aftersale'},
-					{text:'购物须知',icon:'../../../static/temp/server3@2x.png',path:'/pages/service/shoppingnotice'},
-					{text:'联系我们',icon:'../../../static/temp/server4@2x.png',path:''},
-				],
 				isScrollTop:false,
 				isRequest:false
 			}
 		},
 		created() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userID ? resolve.userID : 0
 				this.userIdentity = resolve.userIdentity
-				this.GetHomeFloorInfo()
 				this.getHomeInformation()
 			})
 		},
@@ -133,23 +122,7 @@
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
-					let data = response.data
-					data.forEach((item,index) => {
-						switch(item.type){
-							case 3:
-								this.supplierList = item.floorData
-								break;	
-							case 4:
-								this.specialList = item.floorData
-								break;	
-							case 5:
-								this.specialProList = item.floorData
-								break;	
-							case 6:
-								this.pagesList = item.subFloors
-								break;
-						}
-					})
+					this.flootData = response.data
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -158,15 +131,9 @@
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
-					this.mallPageModules = data.mallPageModules
-					this.firstModulesName= data.firstModulesName
-					this.secondModulesName= data.secondModulesName
-					this.firstModulesImage= data.firstModulesImage
-					this.secondModulesImage= data.secondModulesImage
-					this.thirdModulesName= data.thirdModulesName
-					this.productsClassifyList = data.productsClassifyList
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
 					this.GetHomeInit();
+					this.GetHomeFloorInfo()
 					this.GetHomeRecommendInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)

components/cm-module/cm-seller/user.vue

@@ -12,7 +12,7 @@
 							<text class="u-tips">协销人员</text>
 						</view>
 					</view>
-					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-seller@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic == null? 'http://static-b.caimei365.com/app/img/icon/icon-seller@3x.png' : headpic" mode=""></image></view>
 				</view>
 				<!-- 订单 -->
 				<view class="user-order">
@@ -102,7 +102,6 @@
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
 	import { userInfoLogin } from "@/api/use.js"
-	import { getSellerHome } from "@/api/seller.js"
 	
 	export default{
 		components: {
@@ -172,7 +171,7 @@
 			getUserSellerHome(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userId = resolve.userID
-					getSellerHome({userId:this.userId}).then(response =>{
+					this.SellerService.GetSellerHome({userId:this.userId}).then(response =>{
 						let sellerData = response.data
 						this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
 						this.headpic = sellerData.seller.logo //会所头像

components/cm-module/headerNavbar/header-poduct.vue

@@ -144,7 +144,7 @@
 		height: 100%;
 		background: rgba(255, 255, 255, 0.6);
 		font-size: 28rpx;
-		color: #666666;
+		color: #999999;
 		position: relative;
 		box-sizing: border-box;
 		position:absolute ;
@@ -158,7 +158,7 @@
 			left: 0;
 			top: 0;
 			font-size: 34rpx;
-			color: #666666;
+			color: #999999;
 			z-index: 10;
 		}
 		.input{

components/cm-module/homeIndex/banner.vue

@@ -64,10 +64,9 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

components/cm-module/homeIndex/index.vue

@@ -124,7 +124,7 @@
 				</view>
 				<view class="f-text tui-skeleton-fillet">
 					<view class="">
-						<image class="logo" src="../../../static/logo-c@2x.png" mode=""></image>
+						<image class="logo" src="http://static-b.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
 						<text class="">采美365网</text>
 					</view>
 				</view>

components/cm-module/homeIndex/pagesProduct.vue

@@ -64,9 +64,8 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

components/cm-module/homeIndex/smallProduct.vue

@@ -0,0 +1,124 @@
+<template>
+	<view class="special-content clearfix">
+		<view class="swiper-goods-box">
+			<view class="goods-box-item" v-for="(item,index) in productList" :key="index" @click="NavToDetailPage(item)">
+				<image :src="item.image" mode="" class="box-item-image"></image>
+				<view class="box-item-mask">{{ item.title }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:"specialContent",
+		props:{
+			list:{
+				type:Array
+			}
+		},
+		data() {
+			return{
+				current:0,
+				productList:[]
+			}
+		},
+		created(){
+			this.initData(this.list)
+		},
+		computed: {
+	
+		},
+		methods:{
+			initData(list){
+				this.productList = list
+			},
+			swiperChange(e) {//轮播图切换
+				const index = e.detail.current;
+				this.current = index;
+			},
+			NavToDetailPage(floor) {//跳转
+				console.log(floor)
+				/**
+				 * 页面跳转类型
+				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
+				 * 8、专题活动页,9、二手市场介绍,10、二手商品列表,11、二手商品发布,12、商品搜索,13、信息详情
+				 * 14、品牌招商介绍页,15、维修保养介绍页,16、首页,17、注册页,18、信息中心,19、供应商列表
+				 **/
+				 if(floor.linkType){
+					 const typeMap = {
+					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
+					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
+					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
+					 	8:`/h5/pages/activity/activity-list`,
+					 	9:`/second/pages/form/introduce`,
+					 	10:`/second/pages/product/product-list`,
+					 	11:`/second/pages/form/form`,
+					 	12:`/pages/search/search?keyWord=${floor.title}`,
+					 	13:`/h5/pages/article/page?link=${floor.link}`,
+					 	14:`/h5/pages/article/page?link=${floor.link}`,
+					 	15:`/h5/pages/article/page?link=${floor.link}`,
+					 	17:`/pages/login/register-select`,
+					 	18:`/h5/pages/article/page?link=${floor.link}`,
+					 	19:`/pages/search/search-supplier?keyWord=${floor.title}`
+					 }
+					 const url = typeMap[floor.linkType];
+					 this.$api.navigateTo(url)
+				 }
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.special-content{
+		background-color: #F7F7F7;
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+	.swiper-goods-box{
+		width: 100%;
+		height: auto;
+		float: left;
+		.goods-box-item{
+			width: 340rpx;
+			height: 340rpx;
+			float: left;
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
+			&:nth-child(2n){
+				margin-right: 0;
+			}
+			position: relative;
+			.box-item-image{
+				width: 340rpx;
+				height: 340rpx;
+				display: block;
+			}
+			.box-item-mask{
+				width: 100%;
+				height: 64rpx;
+				background: rgba(0,0,0,.36);
+				line-height: 64rpx;
+				font-size: $font-size-26;
+				text-align: center;
+				color: #FFFFFF;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+				box-sizing: border-box;
+				padding:0 20rpx;
+				white-space: normal;
+				word-break: break-all;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+			}
+		}
+	}
+</style>

components/cm-module/homeIndex/specialProduct.vue

@@ -1,6 +1,12 @@
 <template>
 	<view class="special-content clearfix">
-		<view class="swiper-banner-title">商品专题</view>
+		<view class="swiper-banner-title">
+			<view class="title-left">商品专题</view>
+			<view class="title-more" @click="NavToDetailMoreSpecia">
+				<text>更多商品专题</text>
+				<text class="iconfont icon-xiangyou"></text>
+			</view>
+		</view>
 		<view class="swiper-banner-box" >
 			<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
 				<swiper-item v-for="(item,index) in bannerList" :key="index" @click="NavToDetailPage(item)">
@@ -10,17 +16,11 @@
 			<view class="swiper__dots-box" v-if="bannerList.length > 1">
 				<view v-for="(item,idx) in bannerList" 
 					  :key="idx" 
-					  :class="[idx===current?'swiper__dots-long':'none']" 
+					  :class="[idx===current?'swiper__dots-long':'none']"   
 					  :data-index="current" class="swiper__dots-item">
 				</view>	  
 			</view>
 		</view>
-		<view class="swiper-goods-box">
-			<view class="goods-box-item" v-for="(item,index) in productList" :key="index" @click="NavToDetailPage(item)">
-				<image :src="item.image" mode="" class="box-item-image"></image>
-				<view class="box-item-mask">{{ item.title }}</view>
-			</view>
-		</view>
 	</view>
 </template>
 
@@ -30,34 +30,31 @@
 		props:{
 			list:{
 				type:Array
-			},
-			listB:{
-				type:Array
 			}
-			
 		},
 		data() {
 			return{
 				current:0,
-				bannerList:[],
-				productList:[]
+				bannerList:[]
 			}
 		},
 		created(){
-			this.initData(this.list,this.listB)
+			this.initData(this.list)
 		},
 		computed: {
 	
 		},
 		methods:{
-			initData(list,listB){
+			initData(list){
 				this.bannerList = list
-				this.productList = listB
 			},
 			swiperChange(e) {//轮播图切换
 				const index = e.detail.current;
 				this.current = index;
 			},
+			NavToDetailMoreSpecia(){//跳转商品专题列表
+				 this.$api.navigateTo('/h5/pages/activity/activity-list')
+			},
 			NavToDetailPage(floor) {//跳转
 				console.log(floor)
 				/**
@@ -69,9 +66,8 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,
@@ -118,7 +114,20 @@
 		text-align: left;
 		line-height: 49rpx;
 		color: #333;
-		ackground:#F7F7F7;
+		background:#F7F7F7;
+		.title-left{
+			float: left;
+		}
+		.title-more{
+			float: right;
+			font-size: $font-size-24;
+			font-weight: normal;
+			color: #999999;
+			.icon-xiangyou{
+				font-size: $font-size-26;
+				font-weight: normal;
+			}
+		}
 	}
 	.tui-banner-swiper {
 		width: 700rpx;
@@ -165,46 +174,5 @@
 			transition: all 0.4s;
 		}
 	}
-	.swiper-goods-box{
-		width: 100%;
-		height: auto;
-		float: left;
-		.goods-box-item{
-			width: 340rpx;
-			height: 340rpx;
-			float: left;
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
-			&:nth-child(2n){
-				margin-right: 0;
-			}
-			position: relative;
-			.box-item-image{
-				width: 340rpx;
-				height: 340rpx;
-				display: block;
-			}
-			.box-item-mask{
-				width: 100%;
-				height: 64rpx;
-				background: rgba(0,0,0,.36);
-				line-height: 64rpx;
-				font-size: $font-size-26;
-				text-align: center;
-				color: #FFFFFF;
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				box-sizing: border-box;
-				padding:0 20rpx;
-				white-space: normal;
-				word-break: break-all;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-			}
-		}
-	}
+	
 </style>

components/cm-module/homeIndex/supplierList.vue

@@ -77,6 +77,7 @@
 		width: 100%;
 		height: auto;
 		float: left;
+		margin-top: 24rpx;
 		.goods-box-item{
 			width: 160rpx;
 			height: 200rpx;

components/cm-module/listTemplate/immediatelyList.vue

@@ -155,7 +155,6 @@
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import cmDrag from '@/components/cm-custom/cm-drag.vue'
-	import { getcombinationProduct } from "@/api/seller.js"
 	import { mapState,mapMutations } from 'vuex';
 	export default{
 		name:'productList',
@@ -343,7 +342,7 @@
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
 				let params = {clubUserId:this.clubUserId,pageNum:this.pageNum,pageSize:this.zuhepageSize,searchWord:this.searchInputVal}
-				getcombinationProduct(params).then(response =>{
+				this.SellerService.GetCombinationProduct(params).then(response =>{
 					this.isShowWrapper = true
 					const responseData = response.data;
 					if(responseData.results && responseData.results.length > 0){

components/cm-module/modelAlert/order-alert.vue

@@ -32,7 +32,6 @@
 </template>
 
 <script>
-	import { queryOrderShareCode } from "@/api/order.js" 
 	export default{
 		name:'sharealert',
 		props:{

components/cm-module/modelAlert/sellerShareAlert.vue

@@ -21,7 +21,6 @@
 </template>
 
 <script>
-	import { queryOrderShareCode } from "@/api/order.js" 
 	export default{
 		name:'sharealert',
 		props:{
@@ -39,7 +38,7 @@
 		},
 		methods:{
 			getShareCode(res){
-				queryOrderShareCode({orderID:res}).then(response =>{
+				this.OrderService.QueryOrderShareCode({orderID:res}).then(response =>{
 					this.shareCode = response.data
 					this.$parent.shareCode = this.shareCode;
 				}).catch(error =>{

components/cm-module/modelAlert/shareAlert.vue

@@ -21,7 +21,6 @@
 </template>
 
 <script>
-	import { queryOrderShareCode } from "@/api/order.js" 
 	export default{
 		name:'sharealert',
 		props:{
@@ -39,7 +38,7 @@
 		},
 		methods:{
 			getShareCode(res){
-				queryOrderShareCode({orderID:res}).then(response =>{
+				this.OrderService.QueryOrderShareCode({orderID:res}).then(response =>{
 					this.shareCode = response.data
 					this.$parent.shareCode = this.shareCode;
 				}).catch(error =>{

components/cm-module/modelAlert/supplierRegisreAlert.vue

@@ -6,6 +6,7 @@
 				<view class="text">采美采购商城(隶属于采美365网)是美容行业一站式B2B采购交易服务平台，供应商入驻需平台审核。注册说明如下，请您仔细阅读：</view>
 				<view class="text">1、本商城商品需绝对保证正品，谢绝非自营/自有品牌（以登记备案为准），代理商应出具授权书等说明文件，杜绝山寨、假冒伪劣等侵权、侵害他人利益的行为。</view>
 				<view class="text">2、注册需要提供公司名称、营业执照、公司地址、联系人等基本信息。</view>
+				<view class="text">3、供应商注册审核通过后需缴纳平台信息服务管理费用。</view>
 				<view class="register-agree">
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button>
@@ -82,7 +83,7 @@
 		}
 		.content{
 			width: 580rpx;
-			height: 650rpx;
+			height: 720rpx;
 			position: absolute;
 			left: 0;
 			right: 0;

components/cm-module/modelAlert/supplierShareAlert.vue

@@ -21,7 +21,6 @@
 
 <script>
 	const thorui = require("@/components/clipboard/clipboard.thorui.js")
-	import { queryOrderShareCode } from "@/api/order.js" 
 	export default{
 		name:'alert',
 		props:{

components/cm-module/orderDetails/orderInformation.vue

@@ -7,7 +7,7 @@
 					<!-- <text class="bage-buss" v-if="orderData.orderSubmitType == 3 || orderData.orderSubmitType == 4">协销</text>
 					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text> -->
 					<text class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></text>
-					<!-- <image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image> -->
+					<!-- <image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image> -->
 				</view>
 			</view>
 			<view class="information-view same">

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-cancel"  @click.stop="btnConfirm('again',order)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnagainConfirm('again',order,serviceProviderId)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-cancel" @click.stop="onShareCode">
@@ -33,6 +33,9 @@
 			},
 			shareCode:{
 				type:String
+			},
+			serviceProviderId:{
+				type:Number
 			}
 		},
 		watch:{
@@ -125,7 +128,15 @@
 						order:order
 					}
 				this.$emit('buttonConfirm',data)
-			}
+			},
+			btnagainConfirm(type,id,serviceid){
+				let data = {
+					type:type,
+					orderId:id,
+					serviceProviderId:serviceid,
+				}
+				this.$emit('buttonConfirm',data)
+			},
 		}
 	}
 </script>

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -4,7 +4,7 @@
 		<view class="button-content"> 
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view>
-			<view class="btn btn-cancel"  @click.stop="btnConfirm('again',orderID)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnagainConfirm('again',orderID,serviceProviderId)">再来一单</view>
 			<view class="btn btn-cancel"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 		</view>
@@ -23,6 +23,9 @@
 			},
 			userID:{
 				type:Number
+			},
+			serviceProviderId:{
+				type:Number
 			}
 		},
 		data() {
@@ -92,9 +95,17 @@
 			btnConfirm(type,id){
 				let data = {
 						type:type,
-						orderId:id
+						orderId:id,
 					}
 				this.$emit('buttonConfirm',data)
+			},
+			btnagainConfirm(type,id,serviceid){
+				let data = {
+					type:type,
+					orderId:id,
+					serviceProviderId:serviceid,
+				}
+				this.$emit('buttonConfirm',data)
 			}
 		}
 	}

components/cm-module/productDetails/instrument-recommend.vue

@@ -21,8 +21,7 @@
 		props:{
 			list: {
 				// Unistars类型
-				type: Array,
-				default: []
+				type: Array
 			}
 		},
 		components:{
@@ -48,9 +47,8 @@
 				 if(value.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${value.linkParam.id}&title=${value.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${value.title}`,
+						2:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${value.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${value.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

components/cm-module/supplier/home.vue

@@ -10,14 +10,28 @@
 			<navbars :list="navBarsList" v-if="isRequest"></navbars>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<!-- 推荐专区 -->
-			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
-			<!-- 楼层 -->
-			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
-			<!-- 商品专题 -->
-			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
-			<!-- 供应商专题 -->
-			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
+			<view v-for="(item,index) in flootData" :key="index">
+				<template v-if="item.type === 1">
+					<!-- 推荐专区 -->
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+				</template>
+				<template v-if="item.type === 3">
+					<!-- 供应商专题 -->
+					<supplier-list :list="item.floorData" v-if="isRequest"></supplier-list>
+				</template>
+				<template v-if="item.type === 4">
+					<!-- 商品专题 -->
+					<special-product :list="item.floorData" v-if="isRequest"></special-product>
+				</template>
+				<template v-if="item.type === 5">
+					<!-- 小专题 -->
+					<small-product :list="item.floorData" v-if="isRequest"></small-product>
+				</template>
+				<template v-if="item.type === 6">
+					<!-- 楼层 -->
+					<pages-product :list="item.subFloors" v-if="isRequest"></pages-product>
+				</template>
+			</view>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -33,6 +47,7 @@
 	import hotProduct from '@/components/cm-module/homeIndex/hotProduct.vue'
 	import pagesProduct from '@/components/cm-module/homeIndex/pagesProduct.vue'
 	import specialProduct from '@/components/cm-module/homeIndex/specialProduct.vue'
+	import smallProduct from '@/components/cm-module/homeIndex/smallProduct.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
@@ -45,6 +60,7 @@
 			navbars,
 			pagesProduct,
 			specialProduct,
+			smallProduct,
 			supplierList
 		},
 		data() {
@@ -71,45 +87,18 @@
 				isLogin:false,
 				skeletonShow: true,
 				userIdentity:'',
+				flootData:[],//楼层
 				bannerImageList:[],//轮播
 				navBarsList:[],//导航分类
-				pagesList:[],//楼层
 				RecommendList:[],//热门推荐
-				specialList:[],//商品专题轮播
-				specialProList:[],//商品专题商品
-				supplierList:[],//供应商列表
-				organizeProducts:[],//常用商品
-				productsClassifyList:[
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'},
-					{classifyImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E7%BB%84%201238.png',classifyName:'采美'}
-				],//分类导航
-				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
-				secondModulesName:'', //优惠模块2
-				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
-				secondModulesImage:'',//优惠模块icon2
-				thirdModulesName:'', //优惠模块3
-				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9LCABdf_AAAfdMmM_xY655.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9BSAXPobAAApo6I0Tlo684.png'}
-				],
-				navServerList:[
-					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
-					{text:'售后无忧',icon:'../../../static/temp/server2@2x.png',path:'/pages/service/aftersale'},
-					{text:'购物须知',icon:'../../../static/temp/server3@2x.png',path:'/pages/service/shoppingnotice'},
-					{text:'联系我们',icon:'../../../static/temp/server4@2x.png',path:''},
-				],
 				isScrollTop:false,
 				isRequest:false
 			}
 		},
 		created() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
+				this.userID = resolve.userID ? resolve.userID : 0
 				this.userIdentity = resolve.userIdentity
-				this.GetHomeFloorInfo()
 				this.getHomeInformation()
 			})
 		},
@@ -133,23 +122,7 @@
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
-					let data = response.data
-					data.forEach((item,index) => {
-						switch(item.type){
-							case 3:
-								this.supplierList = item.floorData
-								break;	
-							case 4:
-								this.specialList = item.floorData
-								break;	
-							case 5:
-								this.specialProList = item.floorData
-								break;	
-							case 6:
-								this.pagesList = item.subFloors
-								break;
-						}
-					})
+					this.flootData = response.data
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -158,15 +131,9 @@
 				this.CommonService.GetHomeModulesDataInfo({ userId:this.userID }).then(res =>{
 					let data = res.data;
 					this.bannerImageList = data.bannerImageList
-					this.mallPageModules = data.mallPageModules
-					this.firstModulesName= data.firstModulesName
-					this.secondModulesName= data.secondModulesName
-					this.firstModulesImage= data.firstModulesImage
-					this.secondModulesImage= data.secondModulesImage
-					this.thirdModulesName= data.thirdModulesName
-					this.productsClassifyList = data.productsClassifyList
 					this.$store.commit('updateAllNum',data.shoppingCartCount)
 					this.GetHomeInit();
+					this.GetHomeFloorInfo()
 					this.GetHomeRecommendInfo()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)

components/cm-module/supplier/supplierDetails.vue

@@ -2,7 +2,7 @@
 	<!-- 供应商信息 -->
 	<view class="supplier clearfix">
 		<view class="product-supplier" @click="goSupplier">
-			<view class="logo"><img :src="shopData.logo" alt=""></view>
+			<view class="logo"><img :src="shopData.logo ? shopData.logo : 'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 			<view class="main">
 				<view class="name">{{ shopData.name }}</view>
 				<view class="massgs">

components/cm-module/supplier/user.vue

@@ -91,12 +91,10 @@
 	</view>
 </template>
 <script>
-	import defalutLogo from '@/static/temp/logo@3x.png'
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
 	import { userInfoLogin } from "@/api/use.js"
-	import { getSellerHome } from "@/api/seller.js"
 	
 	export default{
 		components: {
@@ -115,7 +113,7 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
-				defalutLogo:defalutLogo,
+				defalutLogo:'http://static-b.caimei365.com/app/img/icon/logo@3x.png',
 				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
 				name:'这里是供应商的名字',
 				headpic:'',
@@ -143,7 +141,7 @@
 			},
 			BadgeType(n){
 				let num ='';
-				if( n>100 ){ num = '99+' } else{ num = n;}
+				if( n>999 ){ num = '999+' } else{ num = n;}
 				return num;
 			},
 		},

h5/pages/activity/activity-list.vue

@@ -4,10 +4,10 @@
 			<view class="list" v-for="(item, index) in list" :key="index" @click="NavigateToActivity(item)">
 				<image class="list-image" :src="item.image" mode="scaleToFill"></image>
 				<view class="title">{{item.title}}</view>
-				<view class="time" v-show="item.status!=3">
+				<view class="time" v-if="item.status!=3">
 					<view class="text">{{ item.detail }}</view>
 				</view>
-				<view class="mack" v-show="item.status == 3">
+				<view class="mack" v-if="item.status == 3">
 					<view class="mack-text">活动已经结束</view>
 				</view>
 			</view>
@@ -173,11 +173,12 @@
 			top: 0;
 			left: 0;
 			z-index: 9999;
-			background: rbba(255,255,255,.6);
+			background: rgba(0,0,0,.1);
 			border-radius: 2rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+			justify-content: center;
 			.mack-text{
 				width: 220rpx;
 				height: 70rpx;
@@ -186,6 +187,7 @@
 				background: rgba(0,0,0,.4);
 				color: #FFFFFF;
 				line-height: 70rpx;
+				font-size: $font-size-26;
 			}
 		}
 	}

h5/pages/activity/activity.vue

@@ -24,19 +24,19 @@
 			console.log(option)
 			switch(option.id){
 				case '277':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_01.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_01.html'
 					uni.setNavigationBarTitle({title:'三昭国际优惠'});
 					break;
 				case '278':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_02.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_02.html'
 					uni.setNavigationBarTitle({title:'点斗优惠'});
 					break;
 				case '280':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_03.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_03.html'
 					uni.setNavigationBarTitle({title:'唯美概念DEP优惠'});
 					break;
 				case '223':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_99.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});
 					break;
 			}

pages.json

@@ -250,7 +250,12 @@
 		},{
 			"path": "pages/search/search-order",
 			"style": {
-				"navigationBarTitleText": "搜索"
+				"navigationBarTitleText": "订单搜索"
+			}
+		},{
+			"path": "pages/search/search-second",
+			"style": {
+				"navigationBarTitleText": "二手搜索"
 			}
 		},{
 			"path": "pages/login/register",

pages/authorization/authorization.vue

@@ -2,7 +2,7 @@
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
-			<image class="logo" src="../../static/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-content">

pages/goods/cart.vue

@@ -600,7 +600,7 @@
 			},
 			updateShoppogNum(pros){//加减购物车商品更新到后台
 				let params ={userID:this.userID,productID:pros.productId,productCount:pros.number}
-				this.ProductService.shoppingCartUpdate(params).then(response =>{
+				this.ProductService.ShoppingCartUpdate(params).then(response =>{
 					this.isshowDelbtn = false;
 					this.initGetCartGoodsList();
 				}).catch(error =>{
@@ -722,7 +722,7 @@
 					return
 				}else{			
 					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
-						this.ProductService.shoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
+						this.ProductService.ShoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
 							this.$util.msg('删除成功',2000);
 							setTimeout(()=>{
 								this.isshowDelbtn = false;
@@ -737,7 +737,7 @@
 			deletefailureList(){
 				this.failureList.forEach(failure=>{ this.delGoodsList += failure.productId+',' })
 				this.$util.modal('','确定清空全部失效商品吗？','确定','取消',true,() =>{
-					this.ProductService.shoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
+					this.ProductService.ShoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
 						this.$util.msg('删除成功',2000);
 						setTimeout(()=>{
 							this.isshowDelbtn = false;

pages/goods/goods-instrument.vue

@@ -13,7 +13,7 @@
 						<view class="title" :class="item.link ? 'float' : ''">
 							<text>{{ item.title }}</text>
 						</view>
-						<view class="more" v-if="item.link" @click="details(item)">
+						<view class="more" v-if="item.link" @click="NavToDetailPage(item)">
 							<text>查看更多</text>
 							<text class="iconfont icon-xiangyou"></text>
 						</view>

pages/goods/goods-secondary.vue

@@ -230,9 +230,8 @@
 				 if(floor.linkType){
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
-					 	2:`/pages/search/search-instrument?keyword=${floor.title}`,
+					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
-					 	6:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,
 					 	9:`/second/pages/form/introduce`,

pages/goods/instrument-details.vue

@@ -53,14 +53,20 @@
 				</view>
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 1">
-				<view class="content service">
+				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
 					{{ crmDetailList[tabCurrentIndex].content }}
 				</view>
+				<view class="content service">
+					<view class="content-none">暂无内容</view>
+				</view>
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 2">
-				<view class="content service">
+				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
 					{{ crmDetailList[tabCurrentIndex].content }}
 				</view>
+				<view class="content service">
+					<view class="content-none">暂无内容</view>
+				</view>
 			</view>	
 			<view class="product-details recommend">
 				<!-- 相关推荐 -->
@@ -424,6 +430,14 @@
 				font-size: $font-size-26;
 				color: #666666;
 			}
+			.content-none{
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				font-size: $font-size-26;
+				color: #999999;
+				text-align: center;
+			}
 		}
 		&.recommend{
 			background-color: #F7F7F7;

pages/goods/product.vue

@@ -89,7 +89,7 @@
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="product-supplier" @click="goSupplier">
-						<view class="logo"><img :src="shop.logo" alt=""></view>
+						<view class="logo"><img :src="shop.logo ? shop.logo :'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 						<view class="main">
 							<view class="name">{{shop.name}}</view>
 							<view class="massgs">
@@ -173,7 +173,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="userIdentity!=1 && userIdentity != 3">
+				<view class="menu" v-if="userIdentity!=1 || userIdentity != 3">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">

pages/login/bindOperator.vue

@@ -82,7 +82,6 @@
 	import wxLogin from "@/common/config/wxLogin.js"
 	import { userInfoLogin } from "@/api/use.js"
 	import { getbindOperatorCode } from "@/api/utils.js"
-	import { sellerBindingOperation } from "@/api/seller.js"
 	export default{
 		data() {
 			return{
@@ -235,7 +234,7 @@
 								nickName: this.wxUserInfo.nickName,
 								headimgurl: this.wxUserInfo.avatarUrl,
 						}
-						sellerBindingOperation(params).then(response =>{
+						this.SellerService.SellerBindingOperation(params).then(response =>{
 							this.login(response.data)
 							this.$api.switchTabTo('/pages/tabBar/home/index')
 						}).catch(error =>{

pages/login/information.vue

@@ -127,7 +127,7 @@
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMedicalImage == ''||uploadMedicalImage == null" @click="chooseMedicalImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-zizhi.png"></image>
+							<image src="http://static-b.caimei365.com/app/img/upload/club-yiliao.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
@@ -830,7 +830,6 @@
 						}
 					}
 					&.picker{
-						padding: 0 24rpx;
 						width: 654rpx;
 						height: 88rpx;
 						line-height: 88rpx;
@@ -1120,9 +1119,9 @@
 				}
 			}
 			.register-btn{
-				width: 702rpx;
+				width: 600rpx;
 				height: 88rpx;
-				border-radius: 14rpx;
+				border-radius: 44rpx;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;

pages/search/search-instrument.vue

@@ -41,8 +41,6 @@
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	
-	import { getFindAllsupplierList } from "@/api/seller.js"
 	export default {
 		components:{
 			tuiLoadmore,

pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
-									<image class="bage-icon" src="../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
@@ -121,16 +121,6 @@
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import authorize from '@/common/config/authorize.js'
-	import { 
-		searchOrderInfo, 
-		searchOrderHistory,
-		clearOrderHistory,
-		queryOrderList,
-		cancelOrder,
-		deleteOrder,
-		confirmReceipt,
-		affirmOrder
-	} from "@/api/order.js"
 	export default {
 		components: {
 			orSearch,
@@ -193,7 +183,7 @@
 			initGetSerachRecord(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userID = resolve.userID
-					searchOrderHistory({userId:this.userID}).then(response =>{
+					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
 						this.serachRecordList = response.data
 						if(this.serachRecordList.length>0){
 							this.isSearchHistory = true
@@ -226,7 +216,7 @@
 			},
 			confirmDetele () {//清空历史记录
 				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					clearOrderHistory({userId:this.userID}).then(response =>{
+					this.OrderService.ClearOrderHistory({userId:this.userID}).then(response =>{
 						this.$util.msg('删除记录成功',2000,true,'success')
 						this.serachRecordList=[]
 					}).catch(error =>{
@@ -252,7 +242,7 @@
 				 * @param：organizeID(全局变量组织ID)
 				 */ 
 				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:1,pageSize:this.pageSize};
-				searchOrderInfo(params).then(response =>{
+				this.OrderService.SearchOrderInfo(params).then(response =>{
 					this.isShowWrapper = true
 					this.showSkeleton = true
 					const _responseData = response.data.results;
@@ -289,7 +279,7 @@
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
 				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				searchOrderInfo(params).then(response =>{
+				this.OrderService.SearchOrderInfo(params).then(response =>{
 					let resData = response.data.results
 					this.hasNextPage = response.data.hasNextPage;
 					this.orderList = this.orderList.concat(resData)
@@ -345,7 +335,7 @@
 			},
 			handOrderConfirm (id){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					confirmReceipt({orderID:id}).then(response =>{
+					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.getOrderDatainit()
 					}).catch(error =>{
@@ -355,7 +345,7 @@
 			},
 			handOrderConfirmation (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -367,7 +357,7 @@
 			},
 			handOrderDetele(id){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -379,7 +369,7 @@
 			},
 			handCenceConfirm(id){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()

pages/search/search-second.vue

@@ -0,0 +1,438 @@
+<template>
+	<view class="search-container">
+		<view class="search-main">
+			<view class="gosearch-btn">
+				<text class="iconfont icon-sousuo"></text>
+				<input class="input" maxlength="20" type="text" value="" confirm-type="search" @input="onShowClose" @focus="onFocus"  @confirm="subMitSearch()" placeholder="请输入关键词" v-model.trim="name"/>
+				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
+			</view>
+		</view>
+		<view  class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
+			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="listData.length > 0">
+				<view class="Listitem" v-for="(item, index) in listData" :key="index" :class="item.sold==1?'activeImg':''"
+				 :productid="item.productID" @click.stop="navToDetailPage(item.productID)">
+				    <view class="itemImg onhref" >
+				        <image :src="item.imageList[0]" class="bigImg"></image>
+						<image src="http://static-b.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
+				    </view>
+				   <view class="ItemInfo">
+						<text class="infotag news" v-if="item.sold==0&&item.newAdded==1">新</text>
+				        <view class="productname" href="" :style="item.sold==0&&item.newAdded==1?'text-indent:60rpx':''">
+				            {{item.name}}
+				        </view>
+				        <view class="targetprice" >
+				            <text v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</text>
+				            <text v-else-if="!hasLogin" class="priceparam">登录查看价格</text>
+				            <text v-else-if="hasLogin && item.detailTalkFlag==2">价格详聊</text>
+				            <text v-else>￥{{item.price1Str}}</text>
+				        </view>
+						<view class="shijian">
+							<text class="iconfont  icon-shijian"></text> {{item.onLineDateStr}}
+						</view>
+				        <view class="dizhi">
+							<view class="dizhi_left">
+								<text class="iconfont  icon-dizhi1"></text>
+								{{item.provinceCityDistrict}}
+							</view>
+				            <view class="liulan_right">
+								<text class="iconfont  icon-kejian1"></text>
+				               {{item.viewingNum}}
+				            </view>
+				        </view>
+				    </view>
+				</view>
+				<view v-if="showLoading && listData.length > 4">
+					<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
+					<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
+				</view>
+			</scroll-view>
+			<view class="empty-container" v-if="showEmpty">
+				<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWAHCoqAAELHadZ9Xg365.png"></image>
+				<text class="error-text">抱歉，没有相关商品！</text>
+			</view>
+		</view>
+		<!-- 透明模态层 -->
+		<modal-layer v-if='isModallayer'></modal-layer>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import modalLayer from "@/components/modal-layer"
+	import uniGrader from '@/components/uni-grade/uni-grade.vue'
+	import authorize from '@/common/config/authorize.js'
+	
+	export default {
+		components: {
+			modalLayer,
+			uniGrader
+		},
+		data() {
+			return {
+				shopId:0,
+				userID:0,
+				themeClass: 'block',
+				show:false,
+				userIdentity:'',	
+				identity:2,
+				searchKeyType:1,
+				isShowClose:false,	//是否显示清空输入框图标
+				isSearchHistory:false,//是都显示搜索历史
+				isShowWrapper:false,
+				isModallayer:false,
+				isFocus:false,
+				priceLoading:true,
+				windowHeight: '',
+				showEmpty: false,
+				scrollHeight: '',
+				listData: [],
+				showLoading: false,
+				loadingNow: true,
+				loadingText: '上拉加载更多',
+				pullFlag: true,
+				pageNum: 1,
+				pageSize: 10,
+				secondHandType:1,
+				instrumentType:0,
+				name:'',
+				total:0,
+				hasNextPage:false
+			}
+		},
+		created() {
+			this.getListFromServer()
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		methods:{
+			subMitSearch() {//搜索
+				if (this.name == '') {
+					this.$util.msg('请输入商品关键词',2000);
+				}else{
+					this.getListFromServer()
+				}
+			},
+			getListFromServer(loadMore) {
+				this.showLoading = true;
+				this.loadingNow = true;
+				this.loadingText = '加载中';
+				this.showEmpty = false;				
+				if(loadMore) {
+					this.pageNum += 1;
+				}
+				let params = {
+						secondHandType:1,
+						instrumentType:0,
+						name:this.name,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize
+				}
+				this.SecondService.SeconHandProductList(params).then(response =>{
+					this.isShowWrapper = true
+					const resData = response.data;
+					const resList = resData.results;
+					if(resList && resList.length > 0){
+						this.total = resData.totalRecord;
+						this.hasNextPage = resData.hasNextPage;
+						this.showEmpty = false;
+						if(loadMore) {
+							this.listData = [...this.listData,...resList];
+						} else {
+							this.listData = [...resList];
+						}
+						// 防上拉暴滑
+						this.pullFlag = false;
+						setTimeout(()=>{ this.pullFlag = true; },500)
+						// 底部提示文案
+						if(hasNextPage) {
+							this.loadingText = '上拉加载更多';
+						} else {
+							this.showLoading = true;
+							this.loadingNow = false;
+						}
+					} else {
+						if(!loadMore) {
+							this.showEmpty = true;
+						}
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			scrolltolower() {
+				if(this.hasNextPage && this.pullFlag) {
+					this.getListFromServer(true);
+				}
+			},
+			onShowClose () {//输入框失去焦点时触发
+				if(this.name != ''){
+					this.isShowClose = true;
+				}else{					
+					this.isShowClose = false
+				}
+			},
+			onFocus () { //输入框获取焦点时触发
+				this.inputEmpty(this.searchInputVal)
+			},
+			inputEmpty(val){
+				this.isShowWrapper = false
+				if(val != ''){
+					this.isShowClose = true
+				}else{					
+					this.isShowClose = false
+				}
+			},
+			delInputText () { //清除输入框内容
+				this.name = ''
+				this.isShowClose = false
+				this.isShowWrapper = false
+				this.getListFromServer()
+			},
+			keywordsClick (item) {//关键词搜索与历史搜索
+				this.name = item;
+				this.isShowClose = true;
+				this.subMitSearch();
+			},
+			navToDetailPage(id) {
+				this.isModallayer = true;
+				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
+				this.isModallayer = false;
+			},
+			setScrollHeight() {
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
+				this.windowHeight = windowHeight - 1;
+				this.scrollHeight = windowHeight - 1;
+			},
+			toLoginPage() {
+				let searchLoginType = 'search'
+				uni.navigateTo({
+					url:`/pages/login/login?type=${searchLoginType}`
+				})
+			},
+			topBubble() {//显隐搜索项
+				this.show = !this.show;
+			},
+		},
+		onShow() {
+			this.setScrollHeight();
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni.scss";
+	page{
+		background-color:#fff;
+	}
+	.search-main{
+		width: 100%;
+		height: 88rpx;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: #FFFFFF;
+		z-index: 1001;
+		box-sizing: border-box;
+		padding: 9rpx 0;
+		.gosearch-btn{
+			width: 702rpx;
+			height: 100%;
+			border-radius: 40rpx;
+			background: #F0F0F0;
+			margin: 0 auto;
+			padding:0 20rpx;
+			font-size: 28rpx;
+			line-height: 70rpx;
+			padding-left: 70rpx;
+			color: #8A8A8A;
+			background: #F7F7F7;
+			position: relative;
+			box-sizing: border-box;
+			.icon-sousuo{
+				width: 70rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				display: block;
+				position: absolute;
+				left: 0;
+				top: 0;
+				font-size: 34rpx;
+				color: #8A8A8A;
+				z-index: 10;
+			}
+			.icon-shanchu1{
+				font-size: 36rpx;
+				color: #8A8A8A;
+				position: absolute;
+				right: 10rpx;
+				top: 0;
+				padding: 0 10rpx;
+				z-index: 100;
+			}
+			.input{
+				width: 400rpx;
+				height: 100%;
+				float: left;
+				font-size: $font-size-24;
+				box-sizing: border-box;
+				padding-right: 66rpx;
+			}
+		}
+		.search-btn{
+			width: 120rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			float: right;
+			text-align: center;
+			color: #666666;
+			font-size: $font-size-24;
+		}
+	}
+	.search-container{
+		padding-top: 96rpx;
+	}
+	.s-block{
+		background: #FFFFFF;
+		.header{
+			font-size: 32rpx;
+			padding:40rpx 24rpx 22rpx 24rpx;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			font-weight: bold;
+			position: relative;
+			.icon-shanchu{
+				font-size: 36rpx;
+				color: #333333;
+				float: right;
+				padding: 0 10rpx;
+				z-index: 10;
+				font-weight: normal;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			padding-bottom: 40rpx;
+			view{
+				color: #8A8A8A;
+				font-size: 24rpx;
+				box-sizing: border-box;
+				text-align: center;
+				height: 48rpx;
+				line-height: 48rpx;
+				border-radius: 24rpx;
+				margin:12rpx;
+				padding:.0 30rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				background-color: #F3F3F3;
+			}
+		}
+	}
+	.commodity-list-wrapper {
+		scroll-view {
+			height: 100%;
+			overflow: scroll;
+		}	
+		.Listitem{
+			height: 202rpx;
+			padding: 20rpx;
+			border-bottom: 2rpx solid #F0F2F4;
+			&.activeImg {
+				opacity: 0.5;
+			}
+			.itemImg {
+				width: 180rpx;
+				height: 180rpx;
+				float: left;
+				background: #000;
+				position: relative;
+				.yishou_bg{
+					width: 90rpx;
+					height: 90rpx;
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%)
+				}
+				.bigImg {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.ItemInfo {
+				float: right;
+				width:500rpx;
+				.infotag{
+					font-size: 20rpx;
+					padding: 5rpx 15rpx;
+					background: #f94b4b;
+					color: #fff;
+					position: absolute;
+					border-radius: 6rpx;
+				}
+				.productname{
+					display: inline-block;
+					font-size: 28rpx;
+					color: #333333;
+					vertical-align: top;
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+					width: 500rpx;
+				}
+				.targetprice {
+					font-size: 26rpx;
+					color: #f94b4b;
+					cursor: pointer;
+					margin: 15rpx 0;
+				}
+				.shijian{
+					font-size: 24rpx;
+					color: #999999;
+					margin-top: 10rpx;
+					.icon-shijian{
+						font-size: 30rpx;
+						color: #999999;
+						margin-right: 10rpx;
+					}
+				}
+				.dizhi{
+					font-size: 24rpx;
+					color: #999999;
+					margin-top: 10rpx;
+					.dizhi_left{
+						float: left;
+						.icon-dizhi1{
+							font-size: 30rpx;
+							color: #999999;
+							margin-right: 10rpx;
+						}
+					}
+					.liulan_right{
+						float: right;
+						margin-right: 25rpx;
+						.icon-kejian1{
+							font-size: 30rpx;
+							color: #999999;
+							margin-right: 10rpx;
+						}
+					}
+				}
+				.shijian{
+					font-size: 24rpx;
+					color: #999999;
+					margin-top: 10rpx;
+				}
+			}
+		}
+	}
+	
+</style>

pages/search/search-supplier.vue

@@ -26,7 +26,7 @@
 			<view v-else class="supplier-list">
 					<view class="list clearfix" v-for="(item, index) in supplierList" :key="index">
 						<view class="list-top">
-							<view class="list-top-supplier" @click="goSupplier(item.id)">
+							<view class="list-top-supplier" @click="goSupplier(item.s_id)">
 								<view class="logo"><img :src="item.s_logo" alt=""></view>
 								<view class="main">
 									<view class="name">{{ item.s_name }}</view>
@@ -68,7 +68,7 @@
 					<!--加载loadding-->
 			</view>
 		</view>
-	</view>
+	</view>  
 </template>
 
 <script>

pages/search/search.vue

@@ -182,13 +182,14 @@
 			}
 		},
 		onLoad(option) {
-			this.isFocus = true
 			console.log(option)
 			if(option.keyWord){
 				this.listQuery.keyword = option.keyWord
 				this.setSearchHistoryAdd()
 				this.getListFromServer()
+				this.isFocus = false
 			}else{
+				this.isFocus = true
 				this.initGetSerachRecord()
 			}
 		},

pages/tabBar/cart/cart.vue

@@ -588,7 +588,7 @@
 			},
 			updateShoppogNum(pros){//加减购物车商品更新到后台
 				let params ={userID:this.userID,productID:pros.productId,productCount:pros.number}
-				this.ProductService.shoppingCartUpdate(params).then(response =>{
+				this.ProductService.ShoppingCartUpdate(params).then(response =>{
 					this.isshowDelbtn = false;
 					this.initGetCartGoodsList();
 				}).catch(error =>{
@@ -710,7 +710,7 @@
 					return
 				}else{			
 					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
-						this.ProductService.shoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
+						this.ProductService.ShoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
 							this.$util.msg('删除成功',2000);
 							setTimeout(()=>{
 								this.isshowDelbtn = false;
@@ -725,7 +725,7 @@
 			deletefailureList(){
 				this.failureList.forEach(failure=>{ this.delGoodsList += failure.productId+',' })
 				this.$util.modal('','确定清空全部失效商品吗？','确定','取消',true,() =>{
-					this.ProductService.shoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
+					this.ProductService.ShoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
 						this.$util.msg('删除成功',2000);
 						setTimeout(()=>{
 							this.isshowDelbtn = false;

pages/tabBar/home/home.vue

@@ -141,7 +141,7 @@
 				</view>
 				<view class="f-text tui-skeleton-fillet">
 					<view class="">
-						<image class="logo" src="../../../static/logo-c@2x.png" mode=""></image>
+						<image class="logo" src="http://static-b.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
 						<text class="">采美365网</text>
 					</view>
 				</view>

pages/tabBar/home/index.vue

@@ -10,14 +10,28 @@
 			<navbars :list="navBarsList" v-if="isRequest"></navbars>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<!-- 推荐专区 -->
-			<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
-			<!-- 楼层 -->
-			<pages-product :list="pagesList" v-if="isRequest"></pages-product>
-			<!-- 商品专题 -->
-			<special-product :list="specialList" :listB="specialProList" v-if="isRequest"></special-product>
-			<!-- 供应商专题 -->
-			<supplier-list :list="supplierList" v-if="isRequest"></supplier-list>
+			<view v-for="(item,index) in flootData" :key="index">
+				<template v-if="item.type === 1">
+					<!-- 推荐专区 -->
+					<hot-product :list="RecommendList" :userIdentity="userIdentity" v-if="isRequest"></hot-product>
+				</template>
+				<template v-if="item.type === 3">
+					<!-- 供应商专题 -->
+					<supplier-list :list="item.floorData" v-if="isRequest"></supplier-list>
+				</template>
+				<template v-if="item.type === 4">
+					<!-- 商品专题 -->
+					<special-product :list="item.floorData" v-if="isRequest"></special-product>
+				</template>
+				<template v-if="item.type === 5">
+					<!-- 小专题 -->
+					<small-product :list="item.floorData" v-if="isRequest"></small-product>
+				</template>
+				<template v-if="item.type === 6">
+					<!-- 楼层 -->
+					<pages-product :list="item.subFloors" v-if="isRequest"></pages-product>
+				</template>
+			</view>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top v-if="isScrollTop"></scroll-top>
@@ -33,6 +47,7 @@
 	import hotProduct from '@/components/cm-module/homeIndex/hotProduct.vue'
 	import pagesProduct from '@/components/cm-module/homeIndex/pagesProduct.vue'
 	import specialProduct from '@/components/cm-module/homeIndex/specialProduct.vue'
+	import smallProduct from '@/components/cm-module/homeIndex/smallProduct.vue'
 	import supplierList from '@/components/cm-module/homeIndex/supplierList.vue'
 	import { userInfoLogin } from "@/api/use.js"
 	import { mapState,mapMutations} from 'vuex';
@@ -45,6 +60,7 @@
 			navbars,
 			pagesProduct,
 			specialProduct,
+			smallProduct,
 			supplierList
 		},
 		data() {
@@ -71,6 +87,7 @@
 				isLogin:false,
 				skeletonShow: true,
 				userIdentity:'',
+				flootData:[],//楼层
 				bannerImageList:[],//轮播
 				navBarsList:[],//导航分类
 				pagesList:[],//楼层
@@ -154,6 +171,7 @@
 			GetHomeFloorInfo(){//初始化首页楼层数据
 				this.CommonService.GetHomeFloorInfo({}).then(response =>{
 					let data = response.data
+					this.flootData = data
 					data.forEach((item,index) => {
 						switch(item.type){
 							case 3:

pages/tabBar/user/user.vue

@@ -4,7 +4,7 @@
 		<view class="user-section">
 			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
 				<view class="header-main" v-if="hasLogin">
-					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-club@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic == null? 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png' : headpic" mode=""></image></view>
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1">{{name}}</text>
@@ -16,7 +16,7 @@
 				</view>
 				<view class="header-main-none" v-else>
 					<view class="header-icon" @click="navigator('/pages/login/login')">
-						<image src="../../../static/temp/icon-club@3x.png" mode=""></image>
+						<image src="http://static-b.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image>
 					</view>
 					<view class="header-text">
 						<view class="user-item">

pages/user/address/address.vue

@@ -265,8 +265,8 @@
 	}
 	.add-btn{
 		position: fixed;
-		left: 24rpx;
-		right: 24rpx;
+		left: 75rpx;
+		right: 75rpx;
 		bottom: 34rpx;
 		z-index: 95;
 		display: flex;

pages/user/operator/list.vue

@@ -2,7 +2,7 @@
 	<view class="container operator clearfix">
 		<view class="operator-top clearfix">
 			<view class="operator-title">
-				<view class="head"><image :src="clubImage == null ? '../../../static/temp/icon-club@3x.png' : clubImage" mode=""></image></view>
+				<view class="head"><image :src="clubImage == null ? 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png' : clubImage" mode=""></image></view>
 				<view class="title">{{clubName}}</view>
 			</view>
 			<view class="operator-search">
@@ -27,7 +27,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : '../../../static/temp/icon-seller@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : 'http://static-b.caimei365.com/app/img/icon/icon-seller@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.linkName}}</text>
 								<text class="txt">{{item.mobile}}</text>

pages/user/order/order-details.vue

@@ -64,7 +64,6 @@
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
 	import activiPopup from "@/components/cm-module/orderDetails/activipopu"		//促销活动弹窗
 	
-	import { queryOrderDetails,cancelOrder,deleteOrder,confirmReceipt,affirmOrder } from "@/api/order.js" 
 	export default {
 		components:{
 			headerBack,
@@ -170,7 +169,7 @@
 				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				queryOrderDetails({ orderID : this.orderID }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.orderInfo = resData.order
@@ -288,7 +287,7 @@
 			},
 			handOrderConfirm(){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					confirmReceipt({orderID:this.orderID}).then(response =>{
+					this.OrderService.ConfirmReceipt({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.initOrderDetaileData()
 					}).catch(error =>{
@@ -298,7 +297,7 @@
 			},
 			handOrderConfirmation (){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.initOrderDetaileData()
 					}).catch(error =>{
@@ -308,7 +307,7 @@
 			},
 			handOrderDetele(){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
@@ -324,7 +323,7 @@
 			},
 			handCenceConfirm(){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.CancelOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.initOrderDetaileData()
 					}).catch(error =>{

pages/user/order/order-list.vue

@@ -25,7 +25,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
-										<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
@@ -118,7 +118,6 @@
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
-	import { queryOrderList,cancelOrder,deleteOrder,confirmReceipt, affirmOrder } from "@/api/order.js" 
 	
 	export default {
 		components: {
@@ -259,7 +258,7 @@
 					this.$api.getStorage().then((resolve) =>{
 						this.userID = resolve.userID
 						let params = {orderState:index,userId:this.userID,pageNum:1,pageSize:this.pageSize};
-						queryOrderList(params).then(response =>{
+						this.OrderService.QueryOrderList(params).then(response =>{
 							let orderList = response.data.results.filter(item=>{
 								//添加不同状态下订单的表现形式
 								item = Object.assign(item, this.StateExpFormat(item.state));
@@ -292,7 +291,7 @@
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
 				let params = {orderState:index,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize};
-				queryOrderList(params).then(response =>{
+				this.OrderService.QueryOrderList(params).then(response =>{
 					let orderItem = this.orderTabBar[index];
 					let resData = response.data.results
 					this.hasNextPage = response.data.hasNextPage;
@@ -418,7 +417,7 @@
 			},
 			handOrderConfirm (id){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					confirmReceipt({orderID:id}).then(response =>{
+					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -430,7 +429,7 @@
 			},
 			handOrderConfirmation (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -442,7 +441,7 @@
 			},
 			handOrderDetele(id){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -454,7 +453,7 @@
 			},
 			handCenceConfirm(id){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)

pages/user/order/order-logistics.vue

@@ -60,7 +60,6 @@
 </template>
 
 <script>
-	import { queryLogistics } from '@/api/order.js'
 	const thorui = require("@/components/clipboard/clipboard.thorui.js")
 	export default {
 		components:{
@@ -95,7 +94,7 @@
 				})
 			},
 			getData() {
-				queryLogistics({orderID: this.orderID}).then(response =>{
+				this.OrderService.QueryLogistics({orderID: this.orderID}).then(response =>{
 					const resData = response.data;
 					// 添加订单列表信息
 					let orderListArr = [];

pages/user/order/order-sharedetails.vue

@@ -33,8 +33,6 @@
 	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
 	import activiPopup from "@/components/cm-module/orderDetails/activipopu"		//促销活动弹窗
 	
-	import { queryOrderDetails } from "@/api/order.js"
-	
 	export default {
 		components:{
 			orderInformation,
@@ -80,7 +78,7 @@
 		},
 		methods: {
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				queryOrderDetails({ orderID : this.orderID }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.userID = resData.order.userID

pages/user/order/order-sharelogin.vue

@@ -32,7 +32,6 @@
 </template>
 <script>
 	import authorize from '@/common/config/authorize.js' 
-	import { orderShareCode } from "@/api/order.js" 
 	export default{
 		data() {
 			return{
@@ -66,7 +65,7 @@
 							shareCode:this.shareCode,
 							serviceProviderId:this.serviceProviderId
 						}
-					orderShareCode(params).then(response =>{
+					this.OrderService.OrderShareCode(params).then(response =>{
 						console.log(response.code)
 						if(response.code === 2){
 							this.$api.navigateTo(`/seller/pages/order/order-details?type=share&orderID=${this.orderID}`)

pages/user/order/orderShareLogin.vue

@@ -16,7 +16,6 @@
 </template>
 <script>
 	import authorize from '@/common/config/authorize.js' 
-	import { orderShareCode } from "@/api/order.js" 
 	export default{
 		data() {
 			return{
@@ -52,7 +51,7 @@
 							userID:this.userID,
 							shareCode:this.shareCode
 						}
-					orderShareCode(params).then(response =>{
+					this.OrderService.OrderShareCode(params).then(response =>{
 						if (response.code === 0) {//游客第一次查看订单详情
 							this.$api.redirectTo('/pages/user/order/order-sharedetails?orderID='+this.orderID)
 						}else{

second/pages/product/product-list.vue

@@ -1,17 +1,9 @@
 <template name="secondList">
 	<view class="container">
 		<view class="good-search-top">
-			<view class="search-from name">
+			<view class="search-from name" @click="this.$api.navigateTo(clickPath)">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input class="input"  
-						   type="text" 
-						   :focus="isFocus"
-						   confirm-type="search" 
-						   v-model="name" 
-						   placeholder="请输入商品关键词" 
-						   @input="onShowClose" 
-						   @confirm="searchOpertor"
-						   maxlength="20"/>
+				<view class="input">请输入商品关键词</view>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText"></text>
 			</view>
 		</view>
@@ -104,6 +96,7 @@
 		},
 		data(){
 			return{
+				clickPath:'/pages/search/search-second',
 				 isShowClose:false,
 				 isModallayer:false,
 				 currentId:1,
@@ -320,7 +313,7 @@
 		height: 66rpx;
 		float: left;
 		line-height: 66rpx;
-		color: $text-color;
+		color: #b2b2b2;
 		font-size: 28rpx;
 	}
 	.icon-iconfonticonfontsousuo1{

seller/pages/address/address.vue

@@ -284,7 +284,7 @@
 		color: #FFFFFF;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 	}
 	.adds-btn{
 		width: 702rpx;

seller/pages/address/addressManage.vue

@@ -198,7 +198,7 @@
 	page{
 		height: auto;
 		background: $bg-color;
-		border-top: 1px solid #EBEBEB;
+		// border-top: 1px solid #EBEBEB;
 	}
 	.add-content{
 		width: 702rpx;
@@ -211,30 +211,35 @@
 			height: 88rpx;
 			padding:0 24rpx;
 			margin: 0 auto;
-			background: #F7F7F7;
-			border-radius: 14rpx;
+			// background: #F7F7F7;
+			// border-radius: 14rpx;
 			.input{
 				width: 100%;
 				height: 100%;
-				background: #F7F7F7;
+				// background: #F7F7F7;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #333333;
+				border-bottom: 2rpx solid #e1e1e1;
+
 			}
 			&.b-b{
-				margin: 32rpx 0;
+				margin: 20rpx 0;
 			}
 		}
 	}
 	.icon-xiayibu{
 		font-size: 36rpx;
-		color: $text-color;
+		color: #b2b2b2;
+		position: absolute;
+		right: 0;
 	}
 	.text-textarea{
 		width: 654rpx;
-		height: 216rpx;
-		padding: 24rpx;
-		background: #F7F7F7;
+		height: 146rpx;
+		padding: 0 24rpx;
+		// background: #F7F7F7;
+		border-bottom: 2rpx solid #e1e1e1;
 		.textarea{
 			width: 100%;
 			height: 100%;
@@ -263,20 +268,20 @@
 		}
 	}
 	.add-btn{
-		width: 702rpx;
-		height: 88rpx;
+		width: 600rpx;
+		height: 90rpx;
 		font-size: $font-size-28;
-		line-height: 88rpx;
+		line-height: 90rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{
 		background: #F8F8F8;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 	}
 </style>
 

seller/pages/club/allClub-list.vue

@@ -25,7 +25,7 @@
 			<view v-else class="club-list">
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.name == null ? item.username : item.name}}</text>
 								<text class="txt sm">
@@ -54,7 +54,6 @@
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import { getFindAllClubList } from "@/api/seller.js"
 	export default {
 		components:{
 			tuiLoadmore,
@@ -110,7 +109,7 @@
 			},
 			initclubList(){	
 				let params = { searchWord:this.searchInputVal,pageNum:1,pageSize:this.pageSize }
-				getFindAllClubList(params).then(response =>{
+				this.SellerService.GetFindAllClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.isEmpty = false
@@ -136,7 +135,7 @@
 			getOnReachBottomData(){
 				this.pageNum+=1
 				let params = {searchWord:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize }
-				getFindAllClubList(params).then(response =>{
+				this.SellerService.GetFindAllClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage

seller/pages/club/club-list.vue

@@ -26,7 +26,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 						</view>
 						<view class="list-item">
 							<view class="list-title">
@@ -60,7 +60,6 @@
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import { getSellerClubList } from "@/api/seller.js"
 	export default {
 		components:{
 			tuiLoadmore,
@@ -110,7 +109,7 @@
 			},
 			initclubList(){
 				let params = {userIdentity:'',name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.status}
-				getSellerClubList(params).then(response =>{
+				this.SellerService.GetSellerClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.isEmpty = false
@@ -136,7 +135,7 @@
 			getOnReachBottomData(){
 				this.pageNum+=1
 				let params = {userIdentity:'',name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.status}
-				getSellerClubList(params).then(response =>{
+				this.SellerService.GetSellerClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage

seller/pages/club/list.vue

@@ -33,7 +33,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan1}}</text>
 								<text class="txt sm">
@@ -86,7 +86,6 @@
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import { getSellerClubList } from "@/api/seller.js"
 	export default {
 		components:{
 			tuiLoadmore,
@@ -146,7 +145,7 @@
 			},
 			initclubList(){	
 				let params = {userIdentity:this.userIdentity,name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.listStatus}
-				getSellerClubList(params).then(response =>{
+				this.SellerService.GetSellerClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.isEmpty = false
@@ -172,7 +171,7 @@
 			getOnReachBottomData(){
 				this.pageNum+=1
 				let params = {userIdentity:this.userIdentity,name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.listStatus}
-				getSellerClubList(params).then(response =>{
+				this.SellerService.GetSellerClubList(params).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage

seller/pages/index/index.vue

@@ -83,7 +83,7 @@
 			},
 			onPullDownRefresh(){
 				if(this.show_index == 0){
-					this.$refs.home.getSellerHomeInfo()
+					this.$refs.home.getHomeInformation()
 				}else if(this.show_index == 2){
 					this.$refs.user.initData()
 				}

seller/pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}" v-if="isSeller">
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
-			<image class="logo" src="../../../static/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-form">
@@ -25,7 +25,6 @@
 	import { mapState,mapMutations } from 'vuex';
 	import errorAlert from '@/components/cm-module/modelAlert/errorAlert.vue'
 	import authorize from '@/common/config/authorize.js' 
-	import { sellerLogin } from '@/api/seller.js' 
 	import { userInfoLogin } from "@/api/use.js"
 	var self;
 	export default{
@@ -117,7 +116,7 @@
 				})	
 			},
 			SellerLogin(){
-				sellerLogin({mobile:this.accountNumber,password:this.password}).then(response =>{
+				this.SellerService.SellerLogin({mobile:this.accountNumber,password:this.password}).then(response =>{
 					if(response.code == '0' ){
 						this.$store.commit('updateStatus',response.data)
 						this.login(response.data);

seller/pages/login/register.vue

@@ -240,7 +240,6 @@
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import authorize from '@/common/config/authorize.js' 
 	import { uploadFileImage } from "@/api/utils.js"
-	import { sellerClubRegister,sellerClubCheck} from "@/api/seller.js"
 	var self;
 	export default{
 		components:{
@@ -318,7 +317,7 @@
 					this.$util.msg('请输入正确的手机号',2000);
 					return
 				}
-				sellerClubCheck({mobileOrEmail:this.registerMobile}).then(response =>{
+				this.SellerService.SellerClubCheck({mobileOrEmail:this.registerMobile}).then(response =>{
 					this.$util.msg(response.data,2000);
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -418,7 +417,7 @@
 						userID:this.userID
 					}
 				}
-				sellerClubRegister(params).then(response =>{
+				this.SellerService.SellerClubRegister(params).then(response =>{
 					this.$util.msg('注册成功,已短息通知联系人',2000);
 					setTimeout(()=>{
 						uni.navigateBack({

seller/pages/order/order-details.vue

@@ -35,6 +35,7 @@
 						  :rechargeGoods = "rechargeGoods"
 						  :ableUserMoney = "ableUserMoney"
 						  :shareCode= "shareCode"
+						  :serviceProviderId = "serviceProviderId"
 						   @buttonConfirm="handButtonConfirm">
 			</order-button>
 		</view>
@@ -67,7 +68,6 @@
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
 	import activiPopup from "@/components/cm-module/orderDetails/activipopu"		//促销活动弹窗
 	
-	import { queryOrderDetails,cancelOrder,deleteOrder,affirmOrder } from "@/api/order.js" 
 	export default {
 		components:{
 			headerBack,
@@ -177,7 +177,7 @@
 				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				queryOrderDetails({ orderID : this.orderID }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.rechargeGoods = resData.rechargeGoods
@@ -219,13 +219,13 @@
 						this.getOrderPaymentValidation(data)
 						break;
 					case 'again':
-						this.handOrderAgain(data.orderId);
+						this.handOrderAgain(data.orderId,data.serviceProviderId);
 						break		
 				}
 			},
-			handOrderAgain(id){
+			handOrderAgain(id,serviceid){
 				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,serviceProviderId:serviceid,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
 						this.$api.navigateTo('/seller/pages/cart/cart');
@@ -244,7 +244,7 @@
 			},
 			handOrderConfirm(data){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.initOrderDetaileData()
 					}).catch(error =>{
@@ -281,7 +281,7 @@
 			
 			handOrderDetele(){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
@@ -297,7 +297,7 @@
 			},
 			handCenceConfirm(){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:this.orderID}).then(response =>{
+					this.OrderService.CancelOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						this.initOrderDetaileData()
 					}).catch(error =>{

seller/pages/order/order-history.vue

@@ -34,7 +34,6 @@
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import { getSellerClubOrderList } from "@/api/seller.js" 
 	export default {
 		components:{
 			tuiLoadmore,
@@ -69,7 +68,7 @@
 			inithistoryList(){	
 				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 					let params = {clubID:resolve.clubID,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize};
-					getSellerClubOrderList(params).then(response =>{
+					this.SellerService.GetSellerClubOrderList(params).then(response =>{
 						let responseData = response.data
 						if(responseData.results&&responseData.results.length > 0){
 							this.isEmpty = false
@@ -97,7 +96,7 @@
 				this.pageNum+=1
 				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 					let params = {clubID:resolve.clubID,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize};
-					getSellerClubOrderList(params).then(response =>{
+					this.SellerService.GetSellerClubOrderList(params).then(response =>{
 						let responseData = response.data
 						if(responseData.results&&responseData.results.length > 0){
 							this.hasNextPage = response.data.hasNextPage

seller/pages/order/order-historylist.vue

@@ -28,7 +28,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
@@ -117,8 +117,6 @@
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
-	import { cancelOrder,deleteOrder, affirmOrder } from "@/api/order.js"
-	import { getSellerClubOrderList } from "@/api/seller.js" 
 	
 	export default {
 		components: {
@@ -250,7 +248,7 @@
 				setTimeout(()=>{
 					this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 						let params = {listType:index,clubID:resolve.clubID,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize};
-						getSellerClubOrderList(params).then(response =>{
+						this.SellerService.GetSellerClubOrderList(params).then(response =>{
 							let orderList = response.data.results.filter(item=>{
 								//添加不同状态下订单的表现形式
 								item = Object.assign(item, this.StateExpFormat(item.listType));
@@ -282,7 +280,7 @@
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				let params = {listType:index,orderSubmitType:this.screenTab,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum+=1,pageSize:this.pageSize};
-				getSellerOrderList(params).then(response =>{
+				this.SellerService.GetSellerOrderList(params).then(response =>{
 					let orderItem = this.orderTabBar[index];
 					let resData = response.data.results
 					this.hasNextPage = response.data.hasNextPage;
@@ -331,7 +329,7 @@
 			},
 			handOrderConfirm (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -343,7 +341,7 @@
 			},
 			handOrderDetele(id){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -355,7 +353,7 @@
 			},
 			handCenceConfirm(id){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)

seller/pages/order/order-list.vue

@@ -37,7 +37,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
@@ -93,6 +93,7 @@
 											  :status="order.status" 
 											  :orderID="order.orderID" 
 											  :userID = "order.userID"
+											  :serviceProviderId = "serviceProviderId"
 											  @buttonConfirm="handButtonConfirm">
 								</order-button>
 							</view>
@@ -141,8 +142,7 @@
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'			 //分享弹窗
-	import { cancelOrder,deleteOrder, affirmOrder } from "@/api/order.js"
-	import { getSellerOrderList } from "@/api/seller.js" 
+
 	
 	export default {
 		components: {
@@ -304,7 +304,7 @@
 								pageNum:1,
 								pageSize:this.pageSize,
 							};
-						getSellerOrderList(params).then(response =>{
+						this.SellerService.GetSellerOrderList(params).then(response =>{
 							let orderList = response.data.results.filter(item=>{
 								//添加不同状态下订单的表现形式
 								item = Object.assign(item, this.StateExpFormat(item.listType));
@@ -342,7 +342,7 @@
 						pageNum:this.pageNum+=1,
 						pageSize:this.pageSize,
 					};
-				getSellerOrderList(params).then(response =>{
+				this.SellerService.GetSellerOrderList(params).then(response =>{
 					let orderItem = this.orderTabBar[index];
 					let resData = response.data.results
 					this.hasNextPage = response.data.hasNextPage;
@@ -388,13 +388,13 @@
 						this.handOrderConfirm(data.orderId);
 						break
 					case 'again':
-						this.handOrderAgain(data.orderId);
+						this.handOrderAgain(data.orderId,data.serviceProviderId);
 						break	
 				}
 			},
-			handOrderAgain(id){
+			handOrderAgain(id,serviceid){
 				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,serviceProviderId:serviceid,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
 						this.$api.navigateTo('/seller/pages/cart/cart');
@@ -413,7 +413,7 @@
 			},
 			handOrderConfirm (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -425,7 +425,7 @@
 			},
 			handOrderDetele(id){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
@@ -437,7 +437,7 @@
 			},
 			handCenceConfirm(id){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)

seller/pages/order/order-sharedetails.vue

@@ -29,7 +29,6 @@
 	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
 	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
 	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	import { queryOrderDetails } from "@/api/order.js"
 	
 	export default {
 		components:{
@@ -73,7 +72,7 @@
 		},
 		methods: {
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				queryOrderDetails({ orderID : this.orderID }).then(response =>{
+				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
 					this.isRequest = true
 					this.userID = resData.order.userID

seller/pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
-									<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
@@ -121,8 +121,6 @@
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert' //分享弹窗
 	import authorize from '@/common/config/authorize.js'
-	import { searchOrderInfo, searchOrderHistory,clearOrderHistory,cancelOrder,deleteOrder,affirmOrder,} from "@/api/order.js"
-	import { getSellerOrderList, } from "@/api/seller.js" 
 	export default {
 		components: {
 			orSearch,
@@ -187,7 +185,7 @@
 			initGetSerachRecord(){
 				this.$api.getComStorage('userInfo').then((resolve) =>{
 					this.userID = resolve.userID
-					searchOrderHistory({userId:this.userID}).then(response =>{
+					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
 						this.serachRecordList = response.data
 						if(this.serachRecordList.length>0){
 							this.isSearchHistory = true
@@ -220,7 +218,7 @@
 			},
 			confirmDetele () {//清空历史记录
 				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					clearOrderHistory({userId:this.userID}).then(response =>{
+					this.OrderService.ClearOrderHistory({userId:this.userID}).then(response =>{
 						this.$util.msg('删除记录成功',2000,true,'success')
 						this.serachRecordList=[]
 					}).catch(error =>{
@@ -332,7 +330,7 @@
 			},
 			handOrderConfirm (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					affirmOrder({orderID:id}).then(response =>{
+					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -344,7 +342,7 @@
 			},
 			handOrderDetele(id){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					deleteOrder({orderID:id}).then(response =>{
+					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()
@@ -356,7 +354,7 @@
 			},
 			handCenceConfirm(id){//取消订单
 				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					cancelOrder({orderID:id}).then(response =>{
+					this.OrderService.CancelOrder({orderID:id}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							this.getOrderDatainit()

services/order.service.js

@@ -6,6 +6,72 @@ export default class OrderService {
 		Object.assign(this, { AjaxService })
 		this.name = 'OrderService'
 	}
+	/* 查询订单列表 */
+	QueryOrderList (data = {}) {
+		return this.AjaxService.get({ url:'/order/list', data, isLoading: true })
+	}
+	/* 查询订单详情 */
+	QueryOrderDetails (data = {}) {
+		return this.AjaxService.get({ url:'/order/list', data, isLoading: true })
+	}
+	/* 操作取消订单 */
+	CancelOrder (data = {}) {
+		return this.AjaxService.get({ url:'/order/cancel', data, isLoading: true })
+	}
+	/* 操作删除订单 */
+	DeleteOrder (data = {}) {
+		return this.AjaxService.get({ url:'/order/delete', data, isLoading: true })
+	}
+	/* 确认订单操作 */
+	AffirmOrder (data = {}) {
+		return this.AjaxService.post({ url:'/order/affirmOrder', data, isLoading: true })
+	}
+	/* 确认收货操作 */
+	ConfirmReceipt (data = {}) {
+		return this.AjaxService.get({ url:'/order/affirm', data, isLoading: true })
+	}
+	/* 确认收货操作 */
+	QueryLogistics (data = {}) {
+		return this.AjaxService.get({ url:'/order/logistics', data, isLoading: true })
+	}
+	/**
+	 *获取订单分享码
+	 * @param orderID
+	 */
+	QueryOrderShareCode (data = {}) {
+		return this.AjaxService.get({ url:'/order/share', data, isLoading: true })
+	}
+	/**
+	 *获取订单分享码
+	 * @param orderID
+	 */
+	OrderShareCode (data = {}) {
+		return this.AjaxService.get({ url:'/order/shareCode', data, isLoading: true })
+	}
+	/**
+	 *机构搜索订单
+	 *@param searchWord 关键词
+	 *@param userId		用户ID
+	 *@param pageNum	页码
+	 *@param pageSize	条数
+	 */
+	SearchOrderInfo (data = {}) {
+		return this.AjaxService.get({ url:'/order/search', data, isLoading: true })
+	}
+	/**
+	 *搜索订单历史记录
+	 * @param orderID
+	 */
+	SearchOrderHistory (data = {}) {
+		return this.AjaxService.get({ url:'/order/searchHistory', data, isLoading: false })
+	}
+	/**
+	 *清楚订单历史记录
+	 * @param orderID
+	 */
+	ClearOrderHistory (data = {}) {
+		return this.AjaxService.get({ url:'/order/searchHistory/delete', data, isLoading: true })
+	}
 	/**
 	 *@机构-确认订单初始化数据
 	 *@param userId 用户ID

services/product.service.js

@@ -83,7 +83,7 @@ export default class ProductService {
 	 * @param:productID 商品ID(必填)
 	 * @param:productCount 商品数量ID(必填)
 	 */
-	shoppingCartUpdate (data = {}) {
+	ShoppingCartUpdate (data = {}) {
 		return this.AjaxService.post({ url:'/shoppingCart/update', data, isLoading: true })
 	}
 	/**
@@ -91,7 +91,7 @@ export default class ProductService {
 	 * @param:userId 用户ID(必填)
 	 * @param:productIDs 商品ID(用','号拼接)
 	 */
-	shoppingCartDelete (data = {}) {
+	ShoppingCartDelete (data = {}) {
 		return this.AjaxService.post({ url:'/shoppingCart/delete', data, isLoading: true })
 	}
 	/* 二级列表 */

services/sellse.service.js

@@ -8,6 +8,85 @@ export default class SellerService {
 		Object.assign(this, { AjaxService })
 		this.name = 'SellerService'
 	}
+	/**
+	 *@协销登录
+	 *@param mobile 手机号
+	 *@param password 密码
+	 */
+	SellerLogin (data={}){
+		return this.AjaxService.post({ url:'/seller/login', data, isLoading: true })
+	}
+	/**
+	 *@协销账户中心
+	 *@param userID 协销ID
+	 */
+	GetSellerHome (data = {}) {
+		return this.AjaxService.get({ url:'/seller/home', data, isLoading: true })
+	}
+	/**
+	 *@协销拉机构上线
+	 *@param userID 协销ID
+	 */
+	SellerClubRegister (data={}){
+		return this.AjaxService.post({ url:'/seller/club/register', data, isLoading: true })
+	}
+	/**
+	 *@协销拉机构上线检测手机号和邮箱
+	 *@param mobileOrEmail 手机号和邮箱
+	 */
+	SellerClubCheck (data={}){
+		return this.AjaxService.post({ url:'/seller/club/check', data, isLoading: true })
+	}
+	/**
+	 *@协销机构列表
+	 *@param name 	  机构名字关键字（搜索用）
+	 *@param pageNum  页码
+	 *@param pageSize 条数
+	 *@param spId 	  协销ID
+	 *@param status   机构状态
+	 */
+	GetSellerClubList (data = {}) {
+		return this.AjaxService.get({ url:'/seller/club/list', data, isLoading: true })
+	}
+	/**
+	 *@协销机构列表
+	 *@param name 	  机构名字关键字（搜索用）
+	 *@param pageNum  页码
+	 *@param pageSize 条数
+	 */
+	GetFindAllClubList (data = {}) {
+		return this.AjaxService.get({ url:'/seller/findAllClub', data, isLoading: true })
+	}
+	/**
+	 *@协销订单列表（搜索订单）
+	 *@param listType 订单类型
+	 *@param orderNo  订单号
+	 *@param pageNum  页码
+	 *@param pageSize 条数
+	 *@param serviceProviderId 协销ID
+	 */
+	GetSellerOrderList (data = {}) {
+		return this.AjaxService.get({ url:'/seller/order/list', data, isLoading: true })
+	}
+	/**
+	 *@协销下机构订单列表
+	 *@param clubID   机构ID
+	 *@param pageNum  页码
+	 *@param pageSize 条数
+	 */
+	GetSellerClubOrderList (data = {}) {
+		return this.AjaxService.get({ url:'/seller/clubOrder', data, isLoading: true })
+	}
+	/**
+	 *@协销帮机构下单组合商品搜索
+	 *@param clubUserId 机构的userID
+	 *@param pageNum 	页码
+	 *@param pageSize 	条数
+	 *@param searchWord 搜索关键词
+	 */
+	GetCombinationProduct (data = {}) {
+		return this.AjaxService.get({ url:'/seller/combinationProduct/search', data, isLoading: true })
+	}
 	/**
 	 *@协销-二手下单商品列表
 	 *@param 二手商品分类 secondHandType	1二手仪器，2临期产品，3其他  【必传】
@@ -130,4 +209,11 @@ export default class SellerService {
 	SellerCartdelete (data = {}) {
 		return this.AjaxService.post({ url:'/seller/deleteSellerCart', data, isLoading: true })
 	}
+	/**
+	 *@协销邀请运营人员
+	 *@param userID  机构userID
+	 */
+	SellerBindingOperation (data = {}) {
+		return this.AjaxService.post({ url:'/seller/bindingOperation', data, isLoading: true })
+	}
 }

supplier/pages/index/index.vue

@@ -83,7 +83,7 @@
 			},
 			onPullDownRefresh(){
 				if(this.show_index == 0){
-					this.$refs.home.getSellerHomeInfo()
+					this.$refs.home.getHomeInformation()
 				}else if(this.show_index == 2){
 					this.$refs.user.initData()
 				}

supplier/pages/login/share-info.vue

@@ -8,7 +8,6 @@
 </template>
 <script>
 	import authorize from '@/common/config/authorize.js' 
-	import { orderShareCode } from "@/api/order.js" 
 	export default{
 		data() {
 			return{

supplier/pages/login/share-login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" src="@/static/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-input">
@@ -17,7 +17,6 @@
 </template>
 <script>
 	import authorize from '@/common/config/authorize.js' 
-	import { orderShareCode } from "@/api/order.js" 
 	export default{
 		data() {
 			return{

supplier/pages/order/order-details.vue

@@ -79,7 +79,6 @@
 	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
 	import orderButton from '@/components/cm-module/orderDetails/supplierDetaileButton'	//底部按钮
 	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
-	import { queryOrderDetails,cancelOrder,deleteOrder,confirmReceipt,affirmOrder } from "@/api/order.js" 
 	export default {
 		components:{
 			headerBack,

supplier/pages/user/my-product.vue

@@ -193,8 +193,23 @@
 				
 			}
 		},
-		onLoad(){
-		
+		onLoad(option){
+			switch(option.listType){
+				case '0':
+					this.listQuery.validFlag =''
+					break;
+				case '1':
+					this.listQuery.validFlag = 2
+					break;
+				case '2':
+					this.listQuery.validFlag = 3
+					break;
+			}
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.listQuery.shopID = resolve.shopID
+				this.GetProductListInfo()
+				this.GetPrimaryClassification()
+			})
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
@@ -606,11 +621,7 @@
 			}, 200)
 		},
 		onShow(){
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = resolve.shopID
-				this.GetProductListInfo()
-				this.GetPrimaryClassification()
-			})
+			
 		}	
 	}
 </script>

supplier/pages/user/my-shop.vue

@@ -6,13 +6,14 @@
 			<view class="shop-search-main">
 				<view class="shop-search">
 					<text class="iconfont icon-sousuo"></text>
-					<input class="input" maxlength="20" type="text" value="" v-model.trim="listQuery.keyword" confirm-type="search" @confirm="SubMitSearch()" placeholder="搜索本店铺商品" />
+					<input class="input" maxlength="20" type="text" value=""  @focus="onFocus" @input="onShowClose" v-model.trim="listQuery.keyword" confirm-type="search" @confirm="SubMitSearch()" placeholder="搜索本店铺商品" />
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
 				</view>
 			</view>
 			<view class="container-shop tui-skeleton">
 				<!-- 轮播 -->
 				<view class="product-supplier" @click="goSupplier">
-					<view class="logo"><img :src="shopLogo" alt=""></view>
+					<view class="logo"><img :src="shopLogo ? shopLogo : 'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 					<view class="main">
 						<view class="name">{{ shopName }}</view>
 						<view class="massgs">
@@ -252,7 +253,9 @@
 				shopName:'',
 				shopLogo:'',
 				normalNum:0,
+				isFocus:false,
 				isEmpty:false,
+				isShowClose:false,	//是否显示清空输入框图标
 				skeletonShow: true,
 				bannerImageList:[],
 				recommendList:[],
@@ -271,8 +274,8 @@
 		onLoad(option) {
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{
-				this.shopId = resolve.shopID
-				this.userID = resolve.userID
+				this.shopId = resolve.shopID ? resolve.shopID : 0
+				this.userID = resolve.userID ? resolve.shopID : 0
 				this.userIdentity = resolve.userIdentity
 				this.InitShopDataInfo()
 			}).catch( error =>{
@@ -423,6 +426,28 @@
 				}
 				return false
 			},
+			onShowClose () {//输入框输入时触发
+				this.inputEmpty(this.listQuery.keyword)
+			},
+			onFocus () { //输入框获取焦点时触发
+				this.inputEmpty(this.listQuery.keyword)
+			},
+			delInputText () { //清除输入框内容
+				this.listQuery.keyword = ''
+				this.isShowClose = false
+				this.isShowWrapper = false
+				this.inputEmpty(this.listQuery.keyword)
+				this.initGetSerachRecord()
+			},
+			inputEmpty(val){
+				if(val != ''){
+					this.isShowClose = true
+					this.isFocus = true
+				}else{					
+					this.isShowClose = false
+					this.isFocus = true
+				}
+			},
 			goSupplier(){//跳供应商资料页
 				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+this.supplierId)
 			},
@@ -480,6 +505,7 @@
 			border-radius: 33rpx;
 			background-color: #F7F7F7;
 			box-sizing: border-box;
+			position: relative;
 			.icon-sousuo{
 				width: 80rpx;
 				height: 66rpx;
@@ -490,6 +516,19 @@
 				text-align: center;
 				font-size: 36rpx;
 			}
+			.icon-shanchu1{
+				width: 80rpx;
+				height: 66rpx;
+				display: block;
+				color: #8A8A8A;
+				line-height: 66rpx;
+				text-align: center;
+				font-size: 36rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				z-index: 100;
+			}
 			.input{
 				width: 580rpx;
 				height: 66rpx;

supplier/pages/user/operator/list.vue

@@ -80,7 +80,6 @@
 </template>
 
 <script>
-	import defalutLogo from '@/static/temp/logo@3x.png'
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
@@ -94,7 +93,7 @@
 				shopId:'',
 				shopName:'',
 				shopLogo:'',
-				defalutLogo:defalutLogo,
+				defalutLogo:'http://static-b.caimei365.com/app/img/icon/logo@3x.png',
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
 				hasNextPage:false,