commit - api优化

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-module/cm-seller/user.vue

@@ -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/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,7 +16,7 @@
 			<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>
@@ -46,6 +52,9 @@
 				const index = e.detail.current;
 				this.current = index;
 			},
+			NavToDetailMoreSpecia(){//跳转商品专题列表
+				 this.$api.navigateTo('/h5/pages/activity/activity-list')
+			},
 			NavToDetailPage(floor) {//跳转
 				console.log(floor)
 				/**
@@ -105,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;

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/supplier/user.vue

@@ -95,7 +95,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: {

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;
 			}
 		}
 	}

pages.json

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

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/product.vue

@@ -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/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

@@ -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-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/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

@@ -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{

seller/pages/club/allClub-list.vue

@@ -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

@@ -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

@@ -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/login/login.vue

@@ -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

@@ -68,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,
@@ -178,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
@@ -245,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 =>{
@@ -282,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'){
@@ -298,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

@@ -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

@@ -142,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: {
@@ -305,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));
@@ -343,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;
@@ -414,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)
@@ -426,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)
@@ -438,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

@@ -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/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

@@ -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,