协销模块

api/seller.js

@@ -387,5 +387,16 @@ export function shoppingCartUpdate(params) {
 		})
 	})
 }
+/**
+ *@协销邀请运营人员
+ *@param userID  机构userID
+ */
+export function sellerBindingOperation(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/seller/bindingOperation',params,true,res => {
+			resolve(res)
+		})
+	})
+}
 
 

api/utils.js

@@ -121,6 +121,20 @@ export function getbindWechatCode(params) {
 		})
 	});
 }
+/**
+ *通过邀请链接绑定运营人员获取手机短信
+ */
+export function getbindOperatorCode(params) {
+	return new Promise(function(resolve,reject) {
+		request.get("/seller/note",params, res => {
+			if(res.code == 0){
+				resolve(res);
+			}else{
+				reject(res)
+			}
+		})
+	});
+}
 /**
  *上传图片
  */
@@ -132,7 +146,6 @@ export function uploadFileImage() {
 			sourceType: ['album'], //从相册选择
 			success: (res) => {
 				const tempFilePaths = res.tempFilePaths;
-				console.log(tempFilePaths)
 				const uploadTask = uni.uploadFile({
 					url : 'https://spi-b.caimei365.com/formData/MultiPictareaddData',
 					filePath: tempFilePaths[0],

common/config/authorize.js

@@ -91,7 +91,6 @@ const getSetting = function() {
     return new Promise((resolve,reject) => {
         uni.getSetting({
             success:function(res) {
-				console.log(res)
                 let authSetting=res.authSetting
                 if(authSetting['scope.userInfo']){resolve(1);return;}//授权成功
                 if(authSetting['scope.userInfo']===false){resolve(0);return;}//拒绝授权

common/config/caimeiApi.js

@@ -116,7 +116,6 @@ const caimeiApi = {
 				key: key,
 				data:data,
 				success: function (res){
-					 // console.log(res);
 				}
 			})
 		});

components/module/bottomMenu/bottomMenu.vue

@@ -56,12 +56,9 @@
 		created() {
 			this.cartCount = this.goodsData.cartCount
 			this.disabled = this.goodsData.disabled
-			console.log(this.cartCount)
-			console.log(this.goodsData)
 		},
 		methods:{
 			handleContact(e){//跳转客服
-				console.log(e.detail.path)
 				console.log(e.detail.query)
 			},
 			//点击事件

components/module/creatOrder/choiceAddress.vue

@@ -46,7 +46,6 @@
 			}
 		},
 		created(){
-			// console.log(this.addressData)
 			this.initData(this.addressData)
 		},
 		computed: {
@@ -61,13 +60,10 @@
 		},
 		methods:{
 			initData(res) {
-				// console.log(res)
 				if(Object.keys(res).length == 0){
-					// console.log('没有地址')
 					this.isEmpty = true
 					this.addressSrc = '/pages/user/address/addressManage'
 				}else{
-					// console.log('有地址或者选择地址')
 					this.isEmpty = false
 					this.addressSrc = '/pages/user/address/address?type=select'
 				}

components/module/creatOrder/freight.vue

@@ -33,7 +33,6 @@
 		},
 		methods:{
 			initData(res) {
-				console.log(res)
 				switch(res.freePostFlag){
 					case 0:
 						this.freightText = '包邮';break

components/module/creatOrder/goodsList.vue

@@ -62,7 +62,6 @@
 		watch: {
 			goodsData: {
 				handler: function (el) {//监听对象的变换使用 function，箭头函数容易出现this指向不正确
-					// console.log(el)
 					this.goodsData = el
 				},
 				deep: true

components/module/creatOrder/invoiceTent.vue

@@ -132,7 +132,6 @@
 			}
 		},
 		created(){
-			console.log(this.invoiceDatas)
 			this.initData(this.invoiceDatas)
 		},
 		computed: {
@@ -149,7 +148,6 @@
 				}
 			},
 			choiceaInvoiceConfim(){
-				console.log(this.invoiceType);
 				switch(this.invoiceType){
 					case '1':
 						this.choiceaInvoiceFirst()
@@ -243,7 +241,6 @@
 			},
 			radioChangeTitle(e) {
 				this.invoiceData.invoiceTitleType = e.target.value;
-				console.log(this.invoiceData.invoiceTitleType)
 				for (let i = 0; i < this.invoiceTitleList.length; i++) {
 					if (this.invoiceTitleList[i].value === this.invoiceData.invoiceTitleType) {
 						this.titleCurrent = i;
@@ -253,7 +250,6 @@
 			},
 			checkboxChange(e){
 				this.invoiceData.invoiceContent = e.detail.value[0]
-				console.log(this.invoiceData.invoiceContent);
 			},
 			inputBankNum(val) {
 				if (/\S{5}/.test(val)) {

components/module/creatOrder/sellerAddress.vue

@@ -46,7 +46,6 @@
 			}
 		},
 		created(){
-			// console.log(this.addressData)
 			this.initData(this.addressData)
 		},
 		computed: {
@@ -61,13 +60,10 @@
 		},
 		methods:{
 			initData(res) {
-				// console.log(res)
 				if(Object.keys(res).length == 0){
-					// console.log('没有地址')
 					this.isEmpty = true
 					this.addressSrc = '/market/pages/address/addressManage'
 				}else{
-					// console.log('有地址或者选择地址')
 					this.isEmpty = false
 					this.addressSrc = '/market/pages/address/address?type=select'
 				}

components/module/creatOrder/sellerInvoice.vue

@@ -132,7 +132,6 @@
 			}
 		},
 		created(){
-			console.log(this.invoiceDatas)
 			this.initData(this.invoiceDatas)
 		},
 		computed: {
@@ -149,7 +148,6 @@
 				}
 			},
 			choiceaInvoiceConfim(){
-				console.log(this.invoiceType);
 				switch(this.invoiceType){
 					case '1':
 						this.choiceaInvoiceFirst()
@@ -246,7 +244,6 @@
 			},
 			radioChangeTitle(e) {
 				this.invoiceData.invoiceTitleType = e.target.value;
-				console.log(this.invoiceData.invoiceTitleType)
 				for (let i = 0; i < this.invoiceTitleList.length; i++) {
 					if (this.invoiceTitleList[i].value === this.invoiceData.invoiceTitleType) {
 						this.titleCurrent = i;
@@ -256,7 +253,6 @@
 			},
 			checkboxChange(e){
 				this.invoiceData.invoiceContent = e.detail.value[0]
-				console.log(this.invoiceData.invoiceContent);
 			},
 			inputBankNum(val) {
 				if (/\S{5}/.test(val)) {

components/module/headerNavbar/header-back.vue

@@ -60,8 +60,6 @@
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
-			// console.log(this.systeminfo.platform)
-			// console.log(this.systeminfo.fontSizeSetting)
 			if(this.systeminfo.platform == 'android'){
 				this.platformClass = 'left'
 			}else{
@@ -95,7 +93,6 @@
 		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
 		    this.statusBarHeight=statusBarHeight,
 		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
-			// console.log(this.navbarHeight);
 		    this.navbarBtn=btnPosi
 		},
 		onLoad(){

components/module/headerNavbar/header-poduct.vue

@@ -58,8 +58,6 @@
 		},
 		created() {
 			this.headerType = this.type
-			console.log(this.headerType);
-			// console.log(this.headerColor)
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息

components/module/headerNavbar/headerNavbar.vue

@@ -49,11 +49,9 @@
 			}
 		},
 		created() {
-			// console.log(this.headerBtnPosi);
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-			console.log(this.fontSizeSetting)
 		    /**
 		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
 		     * 菜单按键宽度： 87
@@ -82,7 +80,6 @@
 		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
 		    this.statusBarHeight=statusBarHeight,
 		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
-			// console.log(this.navbarHeight);
 		    this.navbarBtn=btnPosi
 		},
 		onLoad(){

components/module/home/navInfor.vue

@@ -40,7 +40,6 @@
 			}
 		},
 		created() {
-			// console.log(this.navInforList);
 		},
 		onLoad(){
 			
@@ -56,12 +55,7 @@
 					title: '正在开发中，敬请期待~',
 					duration: 2000
 				})
-			},
-			// navto({type,value}){
-			// 	uni.navigateTo({
-			// 		url:`/pages/goods/goods?type=${type}&from=${value}`
-			// 	})
-			// }
+			}
 		},
 		onShow(){
 	

components/module/home/navServer.vue

@@ -37,7 +37,7 @@
 			}
 		},
 		created() {
-			// console.log(this.telPhone);
+
 		},
 		onLoad(){
 			

components/module/home/navigationTab.vue

@@ -25,7 +25,6 @@
 			}
 		},
 		created() {
-			// console.log(this.navList);
 		},
 		onLoad(){
 			

components/module/listTemplate/buyagainList.vue

@@ -133,9 +133,9 @@
 						//价格显示处理
 						let isActFlg,newProductList=[];
 						this.productList.map((item, index)=> {
-							if(item.actFlag == 1){
+							if(item.actStatus == 1){
 								isActFlg = true
-							}else if(item.actFlag == 1 && item.ladderPriceFlag == 1){
+							}else if(item.actStatus == 1 && item.ladderPriceFlag == 1){
 								isActFlg = true
 							}else{
 								isActFlg = false

components/module/listTemplate/commodityList.vue

@@ -90,10 +90,7 @@
 				showRegularBtn: false
 			}
 		},
-		created() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : '';
-			})
+		created() {		
 			this.setScrollHeight();		
 		},
 		computed: {
@@ -131,44 +128,48 @@
 				if(self.$parent.lastPageType === '再次购买') {
 					self.fromRegularPurchasePage = true;
 				}
-				queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
-					const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
-					const resList = resData.results,
-						  getCartNum = response.data.count;
-					this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
-					if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
-						self.showRegularBtn = true;
-					}
-					if(resList && resList.length > 0){
-						self.hasNextPage = resData.hasNextPage;
-						self.totalPage = resData.totalPage;
-						if(loadMore) {
-							self.commodityList = [...self.commodityList,...resList];
-							self.showRegularBtn = false;
-						} else {
-							self.commodityList = [...resList];
-							self.showSkeleton = false;
+				this.$api.getStorage().then((resolve) =>{
+					this.userID = resolve.userID ? resolve.userID : '';
+					queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
+						const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
+						const resList = resData.results,
+							  getCartNum = response.data.count;
+						this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
+						if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
+							self.showRegularBtn = true;
 						}
-						// 防上拉暴滑
-						self.pullFlag = false;
-						setTimeout(()=>{
-							self.pullFlag = true;
-						},500)
-						// 底部提示文案
-						if(self.hasNextPage) {
-							self.loadingText = '上拉加载更多';
+						if(resList && resList.length > 0){
+							self.hasNextPage = resData.hasNextPage;
+							self.totalPage = resData.totalPage;
+							if(loadMore) {
+								self.commodityList = [...self.commodityList,...resList];
+								self.showRegularBtn = false;
+							} else {
+								self.commodityList = [...resList];
+								self.showSkeleton = false;
+							}
+							// 防上拉暴滑
+							self.pullFlag = false;
+							setTimeout(()=>{
+								self.pullFlag = true;
+							},500)
+							// 底部提示文案
+							if(self.hasNextPage) {
+								self.loadingText = '上拉加载更多';
+							} else {
+								self.showLoading = true;
+								self.loadingNow = false;
+							}
 						} else {
-							self.showLoading = true;
-							self.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) {
-							self.showEmpty = true;
+							if(!loadMore) {
+								self.showEmpty = true;
+							}
 						}
-					}
-				}).catch(response =>{
-					this.$util.msg(response.msg,3000);
+					}).catch(response =>{
+						this.$util.msg(response.msg,3000);
+					})
 				})
+				
 			},
 			operationHanld(prop){
 				this.$emit('operationConfim',prop)

components/module/listTemplate/immediatelyList.vue

@@ -33,7 +33,7 @@
 							<view class="list-shop">
 								<view class="list-price" >
 									<text class="price-view activity" v-if="item.isShowActFlg">活动价</text>
-									<text class="price-view ladder" v-if="item.ladderPriceFlag == 1">阶梯价</text>
+									<text class="price-view ladder" v-if="item.ladderPriceFlag == '1'">阶梯价</text>
 									<text class="price-larger">￥{{item.retailPrice.toFixed(2)}}</text>
 								</view>
 								<view class="list-price-none" v-if="item.repurchasePriceState">
@@ -148,9 +148,9 @@
 						//价格显示处理
 						let isActFlg,newProductList=[];
 						this.productList.map((item, index)=> {
-							if(item.actFlag == 1){
+							if(item.actStatus == 1){
 								isActFlg = true
-							}else if(item.actFlag == 1 && item.ladderPriceFlag == 1){
+							}else if(item.actStatus == 1 && item.ladderPriceFlag == '1'){
 								isActFlg = true
 							}else{
 								isActFlg = false

components/module/listTemplate/memberList.vue

@@ -68,7 +68,7 @@
 			self.windowHeight = windowHeight - 1;
 			let obj=wx.createSelectorQuery();
 			obj.select('page').boundingClientRect(function (rect) {
-			    console.log(rect)
+
 			})
 		},
 	    methods: {

components/module/listTemplate/productList.vue

@@ -19,7 +19,7 @@
 							<view class="list-shop">
 								<view class="list-price" >
 									<text class="price-view activity" v-if="item.isShowActFlg">活动价</text>
-									<text class="price-view ladder" v-if="item.ladderPriceFlag == 1">阶梯价</text>
+									<text class="price-view ladder" v-if="item.ladderPriceFlag == '1'">阶梯价</text>
 									<text class="price-larger">￥{{item.retailPrice.toFixed(2)}}</text>
 								</view>
 								<view class="list-price-none" v-if="item.repurchasePriceState">
@@ -138,9 +138,9 @@
 						//价格显示处理
 						let isActFlg,newProductList=[];
 						this.productList.map((item, index)=> {
-							if(item.actFlag == 1){
+							if(item.actStatus == 1){
 								isActFlg = true
-							}else if(item.actFlag == 1 && item.ladderPriceFlag == 1){
+							}else if(item.actStatus == 1 && item.ladderPriceFlag == '1'){
 								isActFlg = true
 							}else{
 								isActFlg = false
@@ -148,7 +148,6 @@
 							newProductList.push(Object.assign({},item,{isShowActFlg:isActFlg}))
 						})
 						this.productList = newProductList
-						console.log(this.productList)
 						// 防上拉暴滑
 						this.pullFlag = false;
 						setTimeout(()=>{

components/module/orderDetails/invoiceTent.vue

@@ -69,8 +69,7 @@
 		},
 		methods:{
 			initData(res) {
-				console.log(res)
-				if(res.type == '0'){
+				if(res == null || res.type == '0'){
 					this.isEmpty = true
 				}else{
 					this.isEmpty = false
@@ -78,7 +77,6 @@
 				}
 			},
 			onMessage(pros){
-				console.log(pros)
 			},
 			showInvoice(){
 				this.isOpen = !this.isOpen

components/module/orderDetails/orderButton.vue

@@ -29,7 +29,6 @@
 		watch:{
 			status:{
 				handler:function(val){
-					// console.log(val)
 					this.initData(val)
 				},
 				deep:true//对象内部的属性监听，也叫深度监听
@@ -49,7 +48,6 @@
 			}
 		},
 		created(){
-			// console.log(this.status)
 			this.initData(this.status)
 		},
 		computed: {
@@ -57,7 +55,6 @@
 		},
 		methods:{
 			initData(resVal) {
-				console.log(resVal)
 				/**
 				 * @分享按钮统一显示
 				 * @按钮根据状态显示
@@ -72,7 +69,6 @@
 					el.val.forEach(value => {
 						if(resVal === value){
 							this.btnState[el.label] = el.status
-							//console.log(this.btnState[el.label]);
 						}
 					})
 				})

components/module/orderDetails/orderInformation.vue

@@ -79,7 +79,6 @@
 		watch:{
 			information:{
 				handler:function(val){
-					// console.log(val.status)
 					this.initData(val)
 				},
 				deep:true//对象内部的属性监听，也叫深度监听
@@ -94,7 +93,6 @@
 				this.discountFee = this.toFiexdFn(res.discountFee);
 				this.freight = this.toFiexdFn(res.freight);
 				this.expensesOfTaxation = this.toFiexdFn(res.expensesOfTaxation);
-				console.log(this.expensesOfTaxation)
 				Object.keys(this.typeTextObject).forEach(key => {
 					if(key == res.status){
 						this.typeText = this.typeTextObject[key]

components/module/orderDetails/orderListButton.vue

@@ -46,7 +46,6 @@
 		watch:{
 			status:{
 				handler:function(val){
-					// console.log(val)
 					this.initData(val)
 				},
 				deep:true//对象内部的属性监听，也叫深度监听

components/module/orderDetails/paymentRecord.vue

@@ -41,7 +41,6 @@
 			}
 		},
 		created(){
-			// console.log(this.receiptAmount)
 			this.initData(this.discernReceiptList)
 		},
 		computed: {

components/module/orderDetails/sellerDetaileButton.vue

@@ -27,7 +27,6 @@
 		watch:{
 			status:{
 				handler:function(val){
-					// console.log(val)
 					this.initData(val)
 				},
 				deep:true//对象内部的属性监听，也叫深度监听
@@ -45,7 +44,6 @@
 			}
 		},
 		created(){
-			// console.log(this.status)
 			this.initData(this.status)
 		},
 		computed: {
@@ -53,7 +51,6 @@
 		},
 		methods:{
 			initData(resVal) {
-				console.log(resVal)
 				/**
 				 * @分享按钮统一显示
 				 * @按钮根据状态显示

components/module/orderDetails/sellerOrderButton.vue

@@ -45,7 +45,6 @@
 		watch:{
 			status:{
 				handler:function(val){
-					// console.log(val)
 					this.initData(val)
 				},
 				deep:true//对象内部的属性监听，也叫深度监听

components/module/popupGoods/popupGoods.vue

@@ -51,21 +51,16 @@
 			return{
 				specClass: '',//规格弹窗css类，控制开关动画
 				isType:'',
-				// productData:''
 			}
 		},
 		created() {
-			// this.productData = this.$parent.productData;
-			console.log(this.goodsData)
 		},
 		methods:{
 			//数量
 			numberChange(data){
-				console.log(data);
 			},
 			//规格弹窗
 			showSpec(type) {
-				console.log('show');
 				this.isType = type
 				this.specClass = 'show';
 			},
@@ -82,7 +77,6 @@
 				setTimeout(() => {
 					this.specClass = 'none';
 				}, 200);
-				console.log(this.isType);
 				if(this.isType == 'add'){
 					uni.showToast({
 						title: "已加入购物车",

components/module/productDetails/evaluate.vue

@@ -66,7 +66,6 @@
 			}
 		},
 		created() {
-			// console.log(this.queryProductid)
 			this.productID = this.queryProductid
 			this.infoEvaluate()
 			this.setScrollHeight();		
@@ -97,7 +96,6 @@
 				})
 			},
 			getOnReachBottomData(){
-				console.log('11111111111')
 				this.pageNum+=1
 				let params = {productID:this.productID,pageNum:this.pageNum,pageSize:this.pageSize}
 				queryEvaluate(params).then(response =>{

components/module/productDetails/productDetails.vue

@@ -113,13 +113,12 @@
 		},
 		methods:{
 			getOrganizeProducts(){
-				console.log(this.products)
+
 			},
 			//轮播图切换
 			swiperChange(e) {
 				const index = e.detail.current;
 				this.current = index;
-				// console.log(this.product.current)
 			},
 			//预览图片
 			previewImg () {

components/seller/category.vue

@@ -0,0 +1,239 @@
+<template>
+	<view class="category-container clearfix">
+		<view class="category-list">
+			<!--顶部搜索导航栏-->
+<!-- 		<view class="'search-input-fixed">
+				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
+			</view> -->
+			<!-- 左侧分类导航 -->
+			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" style="height:calc(100vh - 202rpx)">
+				<view class="row" v-if="m.smalltypeList.length > 0" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
+					<view class="text">
+						{{m.name}}
+					</view>
+					<view class="block"></view>
+				</view>
+			</scroll-view>
+			<!--右侧子导航-->
+			<scroll-view  scroll-y="true" class="right-aside" style="height:calc(100vh - 202rpx)">
+				<view class="category" v-if="n.smalltypeList.length > 0" v-for="(n,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
+					<view class="category-box" v-for="(o,oIndex) in n.smalltypeList" :key="oIndex">
+						<view class="title">{{o.name}}</view>
+						<view class="list" v-if="o.tinytypeList.length > 0">
+							<view class="box" v-for="(pro,proIndex) in o.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,proIndex)">
+								<image :src="pro.icon"></image>
+								<view class="text">{{pro.name}}</view>
+							</view>
+						</view>
+						<view v-else class="no-data">
+							该栏目暂无分类~
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+<script>
+	import btSearch from '@/components/uni-search/bt-search.vue'
+	import { queryGoodscategory } from "@/api/product.js"
+
+	export default {
+		components: {
+			btSearch,
+		},
+		data() {
+			return {
+				headerShow:true,
+				hotSearchText: '你想要的这里都有',
+				clickPath:'/pages/search/search',
+				showCategoryIndex: 0,
+				categoryList: [],//分类列表
+				search: '',
+				cateTop: {},
+				verticalNavTop: 0,
+			}
+		},
+		created() {
+			this.getProductCate();
+		},
+		methods: {
+			// 跳转至商品列表
+			navToList(id){
+				this.$api.navigateTo(`/pages/product/list?cate_id=${id}`)
+			},
+			// 获取商品分类列表
+			getProductCate () {
+				queryGoodscategory().then(res =>{
+					this.categoryList = res.data
+					// 查询第一个拥有二级菜单的子菜单
+					for (let i = 0; i < this.categoryList.length; i++) {
+						if (this.categoryList[i].smalltypeList.length > 0) {
+							this.showCategoryIndex = i;
+							break;
+						}
+					}
+				}).catch(res =>{
+					this.$util.msg(res.msg,2000);
+				})
+			},
+			showCategory(e,index){//分类切换显示
+				this.showCategoryIndex = index;
+				this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
+			},
+			toSearch () {// 跳转至搜索详情页
+				uni.navigateTo({
+					url: `/pages/search/search?search=${JSON.stringify(this.search)}`
+				})
+			},
+			navToListPage(pro,index){//分类导航跳转
+				let self = this;
+				uni.setStorage({
+					key: 'commodity_id',
+					data: pro.tinyTypeID,
+					success: function () {
+						self.$api.navToListPage({type:'商品分类',value:pro.name,id:pro.tinyTypeID});
+					}
+				})
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	page {
+		background-color: #fff;
+	}
+	.search-input-fixed{
+		width: 100%;
+		height:auto;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1000;
+		background: #FFFFFF;
+		border-bottom: 1px solid #F7F7F7;
+	}	
+	.category-container{
+		height: 100%;
+	}
+	/*模块分类*/
+	.category-list{
+		width: 100%;
+		background-color: #fff;
+		display: flex;
+		
+		.left-aside,.right-aside{
+			position: absolute;
+			/*  #ifdef  APP-PLUS  */
+			top: calc(100rpx + var(--status-bar-height));
+			/*  #endif  */
+			bottom: 0rpx;
+		}
+		.left-aside{
+			width: 200rpx;
+			left: 0rpx;
+			top: 110rpx;
+			background-color: #f2f2f2;
+			.row{
+				width: 100%;
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+				position: relative;
+				.text{
+					width: 100%;
+					position: relative;
+					font-size: $font-size-28;
+					display: flex;
+					justify-content: center;
+					color: $text-color;
+					/* transition: transform 0.3s ease;*/
+					transition-property: transform;
+					transition-duration: 0.2s;
+					transition-timing-function: ease;
+				}
+				.block{
+					position: absolute;
+					width: 0rpx;
+					left: 0;
+					/* transition: transform 0.3s ease;*/
+					transition-property: transform;
+					transition-duration: 0.2s;
+					transition-timing-function: ease;
+				}
+				&.on{
+					height: 100rpx;
+					background-color: #fff;
+					.text{
+						font-size: $font-size-28;
+						color: $color-system;
+					}
+					.block{
+						width: 10rpx;
+						height: 60rpx;
+						top: 20rpx;
+						background-color: $color-system;
+						border-radius: 0 15rpx 15rpx 0;
+					}
+				}
+			}
+		}
+		.right-aside{
+			width: 550rpx;
+			left: 200rpx;
+			top: 120rpx;
+			background: #FFFFFF;
+			.category{
+				width: calc(100%);
+				padding: 0 15rpx 20rpx 0;
+				background: #F7F7F7;
+				.category-box{
+					background: #FFFFFF;
+					margin-bottom: 20rpx;
+					.title{
+						padding: 0 24rpx;
+						line-height: 80rpx;
+						height: 80rpx;
+						text-align: left;
+						color: $text-color;
+						font-size: $font-size-26;
+						border-bottom: 1px solid #F7F7F7;
+						font-weight: 600;
+					}
+					.list{
+						margin-top: 24rpx;
+						width: 100%;
+						display: flex;
+						flex-wrap: wrap;
+						.box{
+							width: calc(71.44vw / 3);
+							margin-bottom: 40rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							flex-wrap: wrap;
+							image{
+								width: 140rpx;
+								height: 140rpx;
+							}
+							.text{
+								margin-top: 8rpx;
+								width: 100%;
+								display: flex;
+								justify-content: center;
+								font-size: $font-size-24;
+							}
+						}
+					}
+					.no-data {
+						text-align: center;
+						margin: 30rpx 0;
+						color: #999999;
+						font-size: 24rpx;
+						line-height: 80rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

components/seller/home.vue

@@ -0,0 +1,622 @@
+<template>
+	<view class="container home clearfix">	
+		<!-- 头部轮播 -->
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<view :class="'container-home-'+ inputActive" class="tui-skeleton">
+			<view :class="'search-input-' + inputActive" :style="{paddingTop:inputActive == 'fixed'?(CustomBar+2)+'px':'10px'} ">
+				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
+			</view>
+			<view class="banner-section">
+				<!-- <uni-swiper-dot :info="bannerList" :current="current" field="content" :mode="mode" > -->
+				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="false">
+					<swiper-item v-for="(item, index) in bannerImageList" :key="index" class="banner-item"> 
+						<image :src="item" />
+					</swiper-item>
+				</swiper>
+				<view class="swiper__dots-box" v-if="bannerImageList.length > 1">
+					<view v-for="(item,idx) in bannerImageList" 
+						  :key="idx" 
+						  :class="[idx===current?'swiper__dots-long':'none']" 
+						  :data-index="current" class="swiper__dots-item" />
+				</view>
+				<!-- </uni-swiper-dot> -->
+			</view>
+			<view class="cate-section clearfix">
+				<!-- 优选分类 -->
+				<view class="tabbar clearfix">
+					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
+						<image class="tui-skeleton-fillet" :src="firstModulesImage"></image>
+						<text class="tui-skeleton-fillet">{{firstModulesName}}</text>
+					</view>
+					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:secondModulesName})">
+						<image class="tui-skeleton-fillet" :src="secondModulesImage"></image>
+						<text class="tui-skeleton-fillet">{{secondModulesName}}</text>
+					</view>
+					<view class="cate-item-info" @click="showTost">
+						<image class="tui-skeleton-fillet" :src="navInforList[0].icon"></image>
+						<text class="tui-skeleton-fillet">{{navInforList[0].text}}</text>
+					</view>
+					<view class="cate-item-info">
+						<!-- #ifdef MP-WEIXIN -->
+						<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
+							<image class="tui-skeleton-fillet" :src="navInforList[1].icon"></image>
+						</button>	
+						<!-- #endif -->
+						<text class="tui-skeleton-fillet">{{navInforList[1].text}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 热销商品 -->
+			<view class="hotgoods-section">
+				<view class="s-header tui-skeleton-fillet" @click="this.$api.navToListPage({type:'3',value:thirdModulesName})">
+					<text class="tip">{{thirdModulesName}}</text>
+					<text class="tit">更多</text>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+				<view class="hotgoods-swiper">
+					<scroll-view class="floor-list" scroll-x>
+						<view class="scoll-wrapper">
+							<view 
+								v-for="(item, index) in organizeProducts" :key="index"
+								class="floor-item"
+								@click.stop="navToDetailPage(item.productID)"
+							>
+								<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
+								<view class="title tui-skeleton-rect">
+									<text class="mclap">{{item.name}}</text>
+								</view>
+								<view class="" v-if="hasLogin">
+									<view class="title-none" v-if="item.price1TextFlag == '1'">
+										<text class="p big">尚未公开价格</text>
+									</view>
+									<view class="price tui-skeleton-rect" v-else>
+										<text class="p sm">￥</text>
+										<text class="p big">{{item.retailPrice.toFixed(2)}}</text>
+									</view>
+								</view>
+								<view v-else class="no-price">
+									<text class="p-no">价格:</text>
+									<uni-stars :stars="parseInt(item.price1Grade)"></uni-stars>
+								</view>	
+							</view>
+						</view>
+					</scroll-view>
+				</view>	
+			</view>
+			<!-- 底部 -->
+			<view class="footer-section ">
+				<view class="s-header tui-skeleton-fillet">
+					<text class="tip">医美机构正品联盟</text>
+				</view>
+				<view class="f-content tui-skeleton-fillet" @click="navto('/pages/service/member')">
+					<image class="tui-banner" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AEwQlAAjGFdpI2LM357.png" mode=""></image>
+				</view>
+				<view class="f-tab-section">
+					<!-- 优选分类 -->
+					<view class="tabbar clearfix">
+						<view class="cate-item" @click="showTost">
+							<image class="tui-skeleton-fillet" :src="navServerList[0].icon"></image>
+							<text class="tui-skeleton-fillet">{{navServerList[0].text}}</text>
+						</view>
+						<view class="cate-item" @click="navto(navServerList[1].path)">
+							<image class="tui-skeleton-fillet" :src="navServerList[1].icon"></image>
+							<text class="tui-skeleton-fillet">{{navServerList[1].text}}</text>
+						</view>
+						<view class="cate-item" @click="navto(navServerList[2].path)">
+							<image class="tui-skeleton-fillet" :src="navServerList[2].icon"></image>
+							<text class="tui-skeleton-fillet">{{navServerList[2].text}}</text>
+						</view>
+						<view class="cate-item" @click="telPhoneTo">
+							<image class="tui-skeleton-fillet" :src="navServerList[3].icon"></image>
+							<text class="tui-skeleton-fillet">{{navServerList[3].text}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="f-text tui-skeleton-fillet">
+					<view class="">
+						<image class="logo" src="../../static/logo-c@2x.png" mode=""></image>
+						<text class="">采美365网</text>
+					</view>
+				</view>
+			</view>	
+		</view>
+		<!-- 透明模态层 -->
+		<modal-layer v-if='modallayer'></modal-layer>
+	</view>
+</template>
+
+<script>
+	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import authorize from '@/common/config/authorize.js'
+	import modalLayer from "@/components/modal-layer"
+	import btSearch from '@/components/uni-search/bt-search.vue'
+	import uniStars from '@/components/uni-stars/uni-stars.vue'
+	import { queryHomeInfo } from "@/api/use.js"
+	import { queryPreferred } from "@/api/product.js"
+	import { mapState,mapMutations } from 'vuex'
+	export default {
+		components:{
+			tuiSkeleton,
+			modalLayer,
+			btSearch,
+			uniStars,
+		},
+		data() {
+			return {
+				nvabarData: {		//顶部自定义导航
+					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '采美采购商城',  // 导航栏 中间的标题
+				},
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				userID:'',
+				inputActive:'float',
+				hotSearchText:'你想要的这里都有',
+				clickPath:'/pages/search/search',
+				current:0,
+				mode:'round',
+				isLogin:false,
+				modallayer:false,
+				bannerImageList:[],
+				skeletonShow: true,
+				organizeProducts:[],//常用商品
+				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/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
+					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.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:''},
+				]
+			}
+		},
+		created() {
+			this.modallayer = false;
+			this.getCheekeyCode()
+		},
+		computed: {
+			...mapState(['hasLogin']),
+		},
+		methods: {
+			getCheekeyCode(){
+				this.getHomeInformation()
+				this.getOrganizeProducts()
+			},		
+			getHomeInformation(){		
+				queryHomeInfo({}).then(res =>{
+					let data = res.data;
+					this.bannerImageList = data.bannerImageList
+					this.mallPageModules = data.mallPageModules
+					this.$store.commit('updateAllNum',data.shoppingCartCount)
+					this.firstModulesName= data.firstModulesName
+					this.secondModulesName= data.secondModulesName
+					this.firstModulesImage= data.firstModulesImage
+					this.secondModulesImage= data.secondModulesImage
+					this.thirdModulesName= data.thirdModulesName
+					this.skeletonShow = false;
+				})
+			},
+			getOrganizeProducts(){//获取模块三商品
+				this.$api.getStorage().then((resolve) =>{
+					this.userID = resolve.userID
+					queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
+						this.organizeProducts = res.data.results
+					})
+				})
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.current = index;
+			},
+			formatMoney(num){
+				return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
+					return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) { // 对整数部分添加分隔符
+						return $1 + ",";
+					});
+				});
+			},
+			//分类导航跳转
+			navToListPage(nav){
+				let self = this;
+				uni.setStorage({
+					key: 'commodity_id',
+					data: nav.id,
+					success: function () {
+						self.$api.navToListPage({type:'商品分类',value:nav.classifyName,id:nav.id});
+					}
+				})
+			},
+			navToDetailPage(id) {//跳转商品详情页
+				this.modallayer = true;
+				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			},
+			handleContact(e){
+				console.log(e.detail.path)
+				console.log(e.detail.query)
+			},
+			showTost(){
+				this.$util.msg("正在开发中，敬请期待~",2000);
+				// uni.navigateToMiniProgram({
+				// 	appId: 'wx5a5cda32926f55ac',
+				// 	path: '/pages/tabBar/home/home',
+				// 	extraData: {
+				// 		'data1': 'test'
+				// 	},
+				// 	envVersion: 'develop',
+				// 	success(res) {
+				// 		console.log(res)
+				// 		// 打开成功
+						
+				// 	}
+				// })
+			},
+			navto(url){
+				this.$api.navigateTo(url)
+			},
+			telPhoneTo(){
+				let self = this;
+				this.$api.get('/home/afterSale',{}, 
+					response => {
+						console.log(response.data.contactNumber)
+						uni.makePhoneCall({
+							phoneNumber:response.data.contactNumber //仅为示例
+						});
+					}
+				)	
+			}
+		},
+		onPageScroll(e){//实时获取到滚动的值
+			if(e.scrollTop>50){
+				this.inputActive = 'fixed'
+			}else{
+				this.inputActive = 'float'
+			}	
+		},
+		onPullDownRefresh() {//下拉刷新
+			this.getHomeInformation()
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style lang="scss">
+	page,.home{
+		width: 100%;
+		height: auto;
+	}			
+	.container-home-float{
+		padding-top: 0;
+	}
+	.container-home-fixed{
+		padding-top: 100rpx;
+	}
+	.search-input-float{
+		width: 100%;
+		height:auto;
+	}
+	.search-input-fixed{
+		width: 100%;
+		height:auto;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1000;
+		background: #FFFFFF;
+	}
+	.banner-section{
+		width: 100%;
+		height: 366rpx;
+		position: relative;
+	}	
+	.banner{
+		width: 100%;
+		height: 366rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.swiper__dots-box{
+		position: absolute;
+		bottom: 10px;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		.swiper__dots-item{
+			width: 8rpx;
+			height: 8rpx;
+			border-radius: 100%;
+			margin-left: 6px;
+			background-color:rgba(255,255,255,.7);
+		}
+		.swiper__dots-long{
+			width: 32rpx;
+			height: 8rpx;
+			border-radius: 4rpx;
+			background-color: #ffff;
+			transition: all 0.4s;
+		}
+	}
+	/* 分类 */
+	.cate-section {
+		width: 702rpx;
+		height: auto;
+		padding:34rpx 24rpx 14rpx 24rpx; 
+		background: #fff;
+		.tabbar{
+			margin-bottom: 26rpx;
+		}
+		.cate-item {
+			width: 118rpx;
+			margin-right:28rpx;
+			margin-bottom:28rpx;
+			display: flex;
+			float: left;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-size-26;
+			color: $text-color;
+			line-height: 36rpx;
+			&:last-child{
+				margin-right: 0;
+			}
+			&:nth-child(5n){
+				margin-right: 0;
+			}
+			image {
+				width: 90rpx;
+				height: 90rpx;
+				margin-bottom: 8rpx;
+			}	
+		}
+		.cate-item-info {
+			width: 160rpx;
+			margin-right:20.666rpx;
+			display: flex;
+			float: left;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-size-26;
+			color: $text-color;
+			line-height: 36rpx;
+			&:last-child{
+				margin-right: 0;
+			}
+			image {
+				width: 160rpx;
+				height: 90rpx;
+				margin-bottom: 16rpx;
+			}	
+			button.contact-btn{
+				width: 160rpx;
+				height: 90rpx;
+				margin: 0;
+				padding: 0;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				box-sizing: border-box;
+				text-align: center;
+				text-decoration: none;
+				border-radius: 0;
+				-webkit-tap-highlight-color: transparent;
+				overflow: hidden;
+				background-color:#FFFFFF;
+				margin-bottom: 16rpx;
+				image{
+					width: 160rpx;
+					height: 90rpx;
+					margin-bottom: 0;
+				}
+			}
+		}
+	}
+	/* 活动 */
+	.hot-section{
+		padding:0 24rpx 48rpx 24rpx; 
+		background: #FFFFFF;
+		.ht-l{
+			width: 339rpx;
+			height: 188rpx;
+			float: left;
+			image{
+				width: 339rpx;
+				height: 188rpx;
+				border-radius:10rpx;
+			}
+		}
+		.ht-r{
+			width: 339rpx;
+			height: 188rpx;
+			float: right;
+			image{
+				width: 339rpx;
+				height: 188rpx;
+				border-radius:10rpx;
+			}
+		}
+	}
+	.hotgoods-section{
+		padding: 4rpx 0 24rpx 24rpx;
+		background: #fff;
+		.s-header{
+			display:flex;
+			align-items:center;
+			height: 40rpx;
+			line-height: 40rpx;
+			.tip{
+				flex: 4;
+				font-size: 30rpx;
+				color: $text-color;
+				font-weight: bolder;
+			}
+			.tit{
+				flex: 4.4;
+				font-size: $font-size-28;
+				color: $text-color;
+				text-align: right;
+			}
+			.icon-xiayibu{
+				flex: 0.6;
+				color: $text-color;
+				text-align: left;
+				font-size: $font-size-24;
+			}
+		}
+	}	
+	.hotgoods-swiper{
+		width: 100%;
+		height: auto;				
+		overflow: hidden;
+		scroll-view{
+			padding: 26rpx 0;
+			width: 100%;
+		}
+		.scoll-wrapper{
+			display:flex;
+			align-items: flex-start;
+		}
+		.floor-item{
+			width: 210rpx;
+			padding-right: 24rpx;
+			font-size: $font-size-24;
+			color: $text-color;
+			line-height: 36rpx;
+			border-radius: 10rpx;			
+			image{
+				width: 210rpx;
+				height: 217rpx;
+				border-radius: 10rpx;
+			}
+			.title-none{
+				font-size: $font-size-26;
+				color: #FF2A2A;
+				line-height: 60rpx;
+			}
+			.title{
+				width: 210rpx;
+				height: 72rpx;
+				display: flex;
+				flex-direction: column;
+				.mclap{
+					width: 100%;
+					line-height: 36rpx;
+					text-overflow:ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					font-size: 26rpx;
+				}
+			}
+			.no-price{
+				height: 36rpx;
+				line-height: 36rpx;
+				display: flex;
+				margin-top: 8rpx;
+				.p-no{
+					font-size: $font-size-24;
+					color: $color-system;
+					margin-right: 5rpx;
+				}
+				image{
+					width:30rpx;
+					height: 36rpx;
+				}
+			}
+			.price{
+				color:#FF2A2A;
+				line-height: 20rpx;
+				margin-top: 18rpx;
+				.sm{
+					font-size: $font-size-24;
+				}
+				.big{
+					font-size: $font-size-28;
+				}
+			}
+		}
+	}
+	.footer-section{
+		width: 702rpx;
+		padding: 0  24rpx 30rpx 24rpx;
+		.s-header{
+			display:flex;
+			align-items:center;
+			height: 40rpx;
+			line-height: 40rpx;
+			margin-bottom: 38rpx;
+			.tip{
+				flex: 1;
+				font-size: 30rpx;
+				color: $text-color;
+				font-weight: bolder;
+			}
+		}
+		.f-content{
+			width: 100%;
+			image{
+				width: 100%;
+				height: 350rpx;
+			}
+		}
+		/*底部服务导航*/
+		.f-tab-section {
+			width: 100%;
+			height: auto;
+			padding: 38rpx 0; 
+			background: #fff;
+			/*底部服务导航*/
+			.cate-item {
+				width: 99rpx;
+				margin-right: 102rpx;
+				float: left;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				font-size: $font-size-24;
+				color: $text-color;
+				&:last-child{
+					margin-right: 0;
+				}
+				image {
+					width: 75rpx;
+					height: 75rpx;
+					margin-bottom: 8rpx;
+					border-radius: 50%;
+				}
+			}
+		}	
+		.f-text{
+			.logo{
+				width: 80rpx;
+				height: 80rpx;
+				float: left;
+				margin: 0 6rpx;
+			}
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-size-24;
+			color: $text-color;
+			line-height: 80rpx;
+			padding-top: 20rpx;
+		}
+	}
+</style>

components/seller/user.vue

@@ -0,0 +1,401 @@
+<template>
+	<view class="container user clearfix">
+		<view class="user-section">
+			<view class="u-header">
+				<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E6%88%91%E7%9A%84%20%E2%80%93%201%403x.png" mode=""></image>
+				<view class="u-header-main">
+					<view class="user-item">
+						<view class="logo-m">
+							<image :src="headpic ? headpic:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E5%8D%8F%E9%94%80%E9%BB%98%E8%AE%A4%E5%A4%B4%E5%83%8F.png'" mode=""></image>
+							<text class="txt">协销员工</text>
+						</view>
+					</view>
+					<view class="user-item">
+						<text class="u-h1">{{name}}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 订单 -->
+			<view class="user-order">
+				<view class="tab-title" @click="navigator('/market/pages/order/order-list?listType=0')">
+					<text class="cell-tit">我的订单</text>
+					<text class="cell-more">查看更多</text>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+				<view class="order-section">
+					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-icon">
+							<image src="../../static/temp/order1@3x.png" mode=""></image>
+							<text 	v-if="beforeConfirmCount >0" 
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
+									:class="[beforeConfirmCount < 10 ? 'goleft':'']">
+									{{beforeConfirmCount == 99? '99+' : beforeConfirmCount}}
+							</text>
+						</view>
+						<text class="order-t">待确认</text>
+					</view>
+					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-icon">
+							<image src="../../static/temp/order2@3x.png" mode=""></image>
+							<text  v-if="beforePayCount >0" 
+								   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
+								   :class="[beforePayCount < 10 ? 'goleft':'']">
+								   {{beforePayCount == 99? '99+' : beforePayCount}}
+							</text>
+						</view>
+						<text class="order-t">待付款</text>
+					</view>
+					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-icon">
+							<image src="../../static/temp/order3@3x.png" mode=""></image>
+							<text   v-if="beforeShipCount >0" 
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
+									:class="[beforeShipCount < 10 ? 'goleft':'']">
+									{{beforeShipCount == 99? '99+' : beforeShipCount}}
+							</text>
+						</view>
+						<text class="order-t">待发货</text>
+					</view>
+					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-icon">
+							<image src="../../static/temp/order4@3x.png" mode=""></image>
+							<text 	v-if="shippedCount >0" 
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
+									:class="[shippedCount < 10 ? 'goleft':'']">
+									{{shippedCount == 99? '99+' : shippedCount}}
+							</text>
+						</view>
+						<text class="order-t">已发货</text>
+					</view>
+					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-icon">
+							<image src="../../static/temp/order5@3x.png" mode=""></image>
+							<text 	v-if="refundsCount >0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
+									:class="[refundsCount < 10 ? 'goleft':'']">
+									{{refundsCount == 99? '99+' : refundsCount}}
+							</text>
+						</view>
+						<text class="order-t">退货/款</text>
+					</view>
+				</view>
+			</view>
+			<!-- 底部跳转 -->
+			<view class="foot-list">
+				<view class="list-cell-item">
+					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-tit">{{item.name}}</text>
+						<text class="cell-more iconfont icon-xiayibu"></text>
+					</view>
+				</view>
+			</view>
+		</view>	
+	</view>
+</template>
+<script>
+	import uniBadge from '@/components/uni-badge/uni-badge.vue'
+	import { mapState,mapMutations } from 'vuex'
+	import { getSellerHome } from "@/api/seller.js"
+	
+	export default{
+		components: {
+			uniBadge,
+		},
+		data() {
+			return{	
+				name:'采美协销',
+				headpic:'',
+				userMoney:0.00,
+				userId:'',
+				aboutHtml:'',
+				telPhone:'',
+				beforeConfirmCount:0,//待确认角标
+				beforePayCount:0, 	//待付款角标
+				beforeShipCount:0, //待发货角标
+				shippedCount:0,   //已发货角标
+				refundsCount:'', //退货/款角标
+				firstList:[
+					{name:'机构列表',path:'/market/pages/club/list'},
+					{name:'帮机构下单',path:'/market/pages/club/club-list'},
+					{name:'拉机构上线',path:'/market/pages/login/register'},
+					{name:'邀请运营人员',path:'/market/pages/club/allClub-list'}
+				],
+			}
+		},
+		created() {
+			this.initData()
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
+		methods:{
+			initData(){
+				this.$api.getStorage().then((resolve) =>{
+					this.userId = resolve.userID
+					getSellerHome({userId:this.userId}).then(response =>{
+						let sellerData = response.data
+						this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
+						this.headpic = sellerData.seller.logo //会所头像
+						this.beforeConfirmCount = this.showBadge(sellerData.beforeConfirmCount)//待付款
+						this.beforePayCount = this.showBadge(sellerData.beforePayCount)//待付款
+						this.beforeShipCount = this.showBadge(sellerData.beforeShipCount)//待发货		
+						this.shippedCount = this.showBadge(sellerData.shippedCount)//已发货	
+						this.refundsCount = this.showBadge(sellerData.refundsCount)//退货/款	
+					}).catch(response =>{
+						this.$util.msg(response.msg,2000)
+					})
+				})	
+			},
+			navigator(url){
+				this.$api.navigateTo(url)
+			},			
+			showBadge(n){
+				let num ='';
+				if(n>100){num = 99}else{num = n;}
+				return num;
+			},
+			onPullDownRefresh() {//下拉刷新
+				this.initData()
+				uni.stopPullDownRefresh()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni.scss";
+	page{
+		background-color: #F7F7F7;
+	}
+	.user{
+		width: 100%;
+		height: auto;
+		position:relative;
+		background: rgba(247, 247, 247, 1);
+	}	
+	.user-section.none{
+		display: none;
+	}
+	.user-section.show{
+		display: block;
+	}
+	.u-header{
+		width: 100%;
+		height: 400rpx;
+		position: relative;
+		image{
+			width: 100%;
+			height: 400rpx;
+		}
+	}	
+	.u-header-main{
+		width: 100%;
+		height: 284rpx;
+		padding: 58rpx 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		.user-item{
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-bottom: 16rpx;
+			.u-h1{
+				width: 410rpx;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				color: #FFFFFF;
+				margin-bottom: 8rpx;
+				-o-text-overflow: ellipsis;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				word-break: break-all;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+				align-items: center;
+			}
+			.u-p{
+				font-size: $font-size-24;
+				line-height: 40rpx;
+				color: #FFFFFF;
+			}
+		}
+		.logo-m{
+			width: 144rpx;
+			height: 144rpx;
+			border: 2rpx solid #FFFFFF;
+			border-radius: 100%;
+			background: $bg-color;
+			position: relative;
+			.txt{
+				width: 144rpx;
+				height: 42rpx;
+				display: inline-block;
+				background: linear-gradient(45deg,rgba(225,86,22,1) 0%,rgba(255,177,0,1) 100%);
+				border-radius: 21rpx;
+				line-height: 42rpx;
+				text-align: center;
+				color: #FFFFFF;
+				font-size: $font-size-22;
+				position: absolute;
+				bottom: -10rpx;
+				left: 0;
+			}
+			image{
+				width: 144rpx;
+				height: 144rpx;
+				border-radius: 100%;
+			}
+		}
+	}
+
+	.user-order{
+		width: 702rpx;
+		height: auto;
+		padding: 0 24rpx;
+		background-color: $bg-color;
+		margin-bottom: 24rpx;
+	}	
+	.tab-title{
+		font-size: $font-size-28;
+		line-height: 80rpx;
+		color: #333333;
+		text-align:left;
+		border-bottom: 1px solid #F8F8F8;
+		position: relative;
+		.cell-tit{
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+		.cell-more{
+			float: right;
+			line-height: 80rpx;
+			font-size: $font-size-24;
+			color: $text-color;
+			padding-right: 30rpx;
+		}
+		.iconfont{
+			width: 30rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size: $font-size-28;
+			text-align: center;
+			position: absolute;
+			right: 0;
+			top: 0;
+			display: block;
+		}
+	}
+	.order-section{
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		flex-wrap:wrap;
+		height: 99rpx;
+		padding: 24rpx 0;
+	}
+	.order-item{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 98rpx;
+		position: relative;
+		margin-right: 53rpx;
+		&:last-child{
+			margin-right: 0;
+		}
+		.order-icon{
+			width: 52rpx;
+			height: 52rpx;
+			position: relative;
+			image{
+				width: 52rpx;
+				height: 52rpx;
+			}
+			.icon-num{
+				position: absolute;
+				right:-24rpx;
+				top: -9rpx;
+			}
+			.icon-num.goleft{
+				right: -12rpx;
+			}
+		}
+		.order-t{
+			line-height: 50rpx;
+			font-size: $font-size-24;
+			color: $text-color;
+		}
+	}
+
+
+	.foot-list{
+		width: 100%;
+		// margin-bottom: 150rpx;
+	}	
+	.list-cell-item{
+		width: 702rpx;
+		height: auto;
+		margin-bottom: 24rpx;
+		padding:0 24rpx;
+		background: $bg-color;
+	}
+	.list-cell{
+		display:flex;
+		width: 100%;
+		align-items:baseline;
+		line-height:100rpx;
+		position:relative;
+		background: $bg-color;
+		justify-content: center;
+		// border-bottom: 1px solid #EBEBEB;
+		&.cell-hover{
+			background:#fafafa;
+		}
+		.cell-more{
+			align-self: baseline;
+			font-size:$font-size-28;
+			color:$text-color;
+			margin-left:10rpx;
+		}
+		.cell-tit{
+			flex: 1;
+			font-size: $font-size-28;
+			color: $text-color;
+			margin-right:10rpx;
+		}
+		.cell-tip{
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+	}	
+	.list-cell.last{
+		border-bottom: none;
+	}
+	.uni-badge--small {
+		-webkit-transform: scale(.8);
+		-ms-transform: scale(.8);
+		transform: scale(.8);
+		-webkit-transform-origin: center center;
+		-ms-transform-origin: center center;
+		transform-origin: center center;
+	}
+	.uni-badge {
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		font-size: 12px;
+		line-height: 1;
+		display: inline-block;
+		padding: 3px 6px;
+		color: #333;
+		border-radius: 100px;
+		background-color: #f1f1f1;
+	}
+	.uni-badge-error {
+		color: #fff;
+		background-color: #dd524d;
+	}
+</style>

components/uni-search/go-search.vue

@@ -61,10 +61,8 @@
 		methods: {
 			initGetSerachRecord(){
 				authorize.getCode('weixin').then(wechatcode =>{
-					// console.log(wechatcode);
 					this.$api.get('/search/record',{organizeID:this.userOrganizeID,code:wechatcode},
 						response =>{
-							// console.log(response);
 							if(response.code == '1'){
 								this.serachRecordList = response.data
 								if(this.serachRecordList.length>0){
@@ -113,10 +111,8 @@
 			confirmDetele() {
 				this.isShowDelModal = false;
 				authorize.getCode('weixin').then(wechatcode =>{
-					// console.log(wechatcode);
 					this.$api.get('/search/delete',{organizeID:this.userOrganizeID,code:wechatcode},
 						response =>{
-							// console.log(response);
 							if(response.code == '1'){
 								this.serachRecordList=[];
 								this.isSearchHistory = false

components/uni-search/or-search.vue

@@ -58,15 +58,12 @@
 			};
 		},
 		created() {
-			// this.initGetSerachRecord()
 		},
 		methods: {
 			initGetSerachRecord(){
 				authorize.getCode('weixin').then(wechatcode =>{
-					// console.log(wechatcode);
 					this.$api.get('/search/history',{organizeID:this.userOrganizeID,code:wechatcode},
 						response =>{
-							// console.log(response);
 							if(response.code == '1'){
 								this.serachRecordList = response.data
 								if(this.serachRecordList.length>0){
@@ -114,10 +111,8 @@
 			confirmDetele() {
 				this.isShowDelModal = false;
 				authorize.getCode('weixin').then(wechatcode =>{
-					// console.log(wechatcode);
 					this.$api.get('/search/deleteOrderRecord',{organizeID:this.userOrganizeID,code:wechatcode},
 						response =>{
-							// console.log(response);
 							if(response.code == '1'){
 								this.serachRecordList=[];
 								this.isSearchHistory = false

market/pages/address/address.vue

@@ -77,7 +77,6 @@
 			this.setScrollHeight();
 		},
 		onReachBottom() {
-			// console.log('滑动到页面底部')
 			if(this.isLoadMore) {
 				this.initAddressList();
 			}
@@ -138,7 +137,6 @@
 			},
 			//删除收货地址
 			deleteAddress(id){
-				console.log('删除地址的ID',id)
 				this.$util.modal('','确定要删除该地址？','确定','取消',true,() =>{
 					deleteNewAddress({addressID:id,userID:this.userID}).then(response =>{
 						this.$util.msg('删除成功',2000)

market/pages/address/addressManage.vue

@@ -71,7 +71,6 @@
 			}
 		},
 		onLoad(option){
-			console.log(option.data)
 			let title = '添加新地址'
 			if(option.type==='edit'){
 				title = '编辑收货地址'
@@ -93,7 +92,6 @@
 		},
 		methods: {			
 			switchChange(e){
-				// console.log('==========',e.detail.value);
 				if(e.detail.value== true){
 					this.addressData.defaultFlag = 1;
 				}else{
@@ -106,7 +104,6 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				// console.log('地址',e);
 				this.addressData.allAddress = e.name;
 				this.addressData.townID = e.cityCode;	
 			},			
@@ -150,7 +147,7 @@
 					this.$util.msg(response.msg,2000);
 					setTimeout(function(){
 						uni.switchTab({
-							url:'/market/pages/home/home'
+							url:'/market/pages/index/index'
 						})
 					},1000)
 				})
@@ -166,17 +163,14 @@
 			},
 			onShouHuoRen(e){
 			   this.addressData.shouHuoRen = e.detail.value;
-			   // console.log(this.addressData.shouHuoRen)
 			   this.initInput();
 			},
 			onMobile(e){
 			   this.addressData.mobile = e.detail.value;
-			   // console.log(this.addressData.mobile)
 			   this.initInput();
 			},
 			onTextareaInput(e){
 			   this.addressData.addressDetail = e.detail.value;
-			   // console.log(this.addressData.addressDetail)
 			   this.initInput();
 			},
 			initInput(){

market/pages/cart/buyagain.vue

@@ -69,12 +69,10 @@
 		methods:{
 			getClubProductNum(){
 				getSellerProductNum({clubId:this.clubID,serviceProviderId:this.serviceProviderId}).then(response =>{
-					console.log(response.data)
 					this.$refs.productList.cartQuantity = response.data
 				})
 			},
 			hanldOperationConfim(data){//显示选择数量确认弹窗
-				console.log(data)
 				this.specClass = 'show';
 				this.handleData = data
 				this.number = data.minBuyNumber
@@ -90,7 +88,7 @@
 			changeCountAdd(){//popup弹窗数量增加按钮
 				this.number++
 				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.productLadderPrices.forEach((item,index)=>{
+					this.handleData.ladderPriceList.forEach((item,index)=>{
 						if(this.number>=item.buyNum){
 							this.buyRetailPrice = item.buyPrice
 						}
@@ -106,7 +104,7 @@
 				}else{
 					this.number--
 					if(this.handleData.ladderPriceFlag == '1'){
-						this.handleData.productLadderPrices.forEach((item,index)=>{
+						this.handleData.ladderPriceList.forEach((item,index)=>{
 							if(this.number>=item.buyNum){
 								this.buyRetailPrice = item.buyPrice
 							}

market/pages/cart/cart.vue

@@ -476,14 +476,12 @@
 						}
 					})
 				})
-				// console.log(this.delGoodsList);
 				if(this.delGoodsList.length == 0){
 					this.$util.msg("请选择要删除的商品~",2000);
 					return
 				}else{				
 					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
 						deleteSellerCart({sellerCartIds:this.delGoodsList}).then(response =>{
-							console.log(response)
 							this.$util.msg('删除成功',2000);
 							setTimeout(()=>{
 								this.isshowDelbtn = false;

market/pages/cart/immediately.vue

@@ -73,7 +73,6 @@
 				})
 			},
 			hanldOperationConfim(data){//显示选择数量确认弹窗
-				console.log(data)
 				this.specClass = 'show';
 				this.handleData = data
 				this.number = data.minBuyNumber
@@ -89,7 +88,7 @@
 			changeCountAdd(){//popup弹窗数量增加按钮
 				this.number++
 				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.productLadderPrices.forEach((item,index)=>{
+					this.handleData.ladderPriceList.forEach((item,index)=>{
 						if(this.number>=item.buyNum){
 							this.buyRetailPrice = item.buyPrice
 						}
@@ -105,7 +104,7 @@
 				}else{
 					this.number--
 					if(this.handleData.ladderPriceFlag == '1'){
-						this.handleData.productLadderPrices.forEach((item,index)=>{
+						this.handleData.ladderPriceList.forEach((item,index)=>{
 							if(this.number>=item.buyNum){
 								this.buyRetailPrice = item.buyPrice
 							}

market/pages/club/addoperator.vue

@@ -84,7 +84,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			this.getVerificationCode()
 		},
 		methods:{
@@ -95,18 +94,18 @@
 			},
 		},
 		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		      console.log(res.target)
+			if (res.from === 'button') { // 来自页面内转发按钮
 		    }
 			return {
 			  title: '快来成为机构运营人员吧~',
-			  path: 'pages/login/bindOperator',
+			  path: `pages/login/bindOperator?userID=${this.userID}`,
 			  imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/04/%E5%BF%AB%E6%9D%A5%E6%88%90%E4%B8%BA%E6%9C%BA%E6%9E%84%E8%BF%90%E8%90%A5%E4%BA%BA%E5%91%98%403x.png'
 			}
 		},
 		onShow() {
-			
+			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.userID = resolve.userID
+			})
 		}
 	}
 </script>

market/pages/club/allClub-list.vue

@@ -19,7 +19,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/logo@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.name}}</text>
 								<text class="txt sm">
@@ -179,7 +179,6 @@
 		},
 		onShow() {
 			this.$api.getStorage().then(response =>{
-				console.log(response)
 				this.serviceProviderId = response.serviceProviderID
 				this.pageNum = 1;
 				this.initclubList();

market/pages/club/club-list.vue

@@ -18,7 +18,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/logo@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
 						</view>
 						<view class="list-item">
 							<view class="list-title">

market/pages/club/list.vue

@@ -19,7 +19,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/logo@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headpic ? item.headpic : '../../../static/temp/icon-club@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.name}}</text>
 								<text class="txt sm">
@@ -228,7 +228,6 @@
 		},
 		onShow() {
 			this.$api.getStorage().then(response =>{
-				console.log(response)
 				this.serviceProviderId = response.serviceProviderID
 				this.pageNum = 1;
 				this.initclubList();

market/pages/home/home.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container home clearfix" :style="{paddingBottom:isIphoneX?'140rpx':'98rpx',paddingTop:CustomBar+'px'}">	
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
 		<!-- 头部轮播 -->
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
 		<view :class="'container-home-'+ inputActive" class="tui-skeleton">
@@ -66,7 +66,7 @@
 								<view class="title tui-skeleton-rect">
 									<text class="mclap">{{item.name}}</text>
 								</view>
-								<view class="" v-if="!hasLogin">
+								<view class="" v-if="hasLogin">
 									<view class="title-none" v-if="item.price1TextFlag == '1'">
 										<text class="p big">尚未公开价格</text>
 									</view>
@@ -137,7 +137,7 @@
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import { queryHomeInfo } from "@/api/use.js"
 	import { queryPreferred } from "@/api/product.js"
-	import { mapMutations} from 'vuex';
+	import { mapState,mapMutations } from 'vuex'
 	export default {
 		components:{
 			tuiSkeleton,
@@ -151,7 +151,7 @@
 				nvabarData: {		//顶部自定义导航
 					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
-					title: '首页',  // 导航栏 中间的标题
+					title: '采美采购商城',  // 导航栏 中间的标题
 				},
 				userID:'',
 				inputActive:'float',
@@ -159,9 +159,9 @@
 				clickPath:'/pages/search/search',
 				current:0,
 				mode:'round',
+				isLogin:false,
 				modallayer:false,
 				bannerImageList:[],
-				hotGoodsList:[],
 				skeletonShow: true,
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
@@ -184,15 +184,12 @@
 			}
 		},
 		onLoad() {
-			this.initData()
+			
+		},
+		computed: {
+			...mapState(['hasLogin']),
 		},
 		methods: {
-			...mapMutations(['hasLogin']),
-			async initData(){
-				this.skeletonShow = true;
-				let hotGoodsList = await this.$util.json('hotGoodsList'); 
-				this.hotGoodsList = hotGoodsList;
-			},	
 			getCheekeyCode(){
 				this.getHomeInformation()
 				this.getOrganizeProducts()
@@ -212,16 +209,17 @@
 				})
 			},
 			getOrganizeProducts(){//获取模块三商品
-				queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
-					this.organizeProducts = res.data.results
+				this.$api.getStorage().then((resolve) =>{
+					this.userID = resolve.userID
+					queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
+						this.organizeProducts = res.data.results
+					})
 				})
 			},
 			//轮播图切换修改背景色
 			swiperChange(e) {
 				const index = e.detail.current;
 				this.current = index;
-				// console.log('current',this.current)
-				// this.titleNViewBackground = this.carouselList[index].background;
 			},
 			formatMoney(num){
 				return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
@@ -280,8 +278,7 @@
 				)	
 			}
 		},
-		onPageScroll(e){
-			// console.log(e.scrollTop);//实时获取到滚动的值
+		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>50){
 				this.inputActive = 'fixed'
 			}else{
@@ -305,10 +302,7 @@
 		},
 		onShow(){
 			this.modallayer = false;
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-				this.getCheekeyCode()
-			})
+			this.getCheekeyCode()
 		}
 	}
 </script>
@@ -531,8 +525,7 @@
 			.title-none{
 				font-size: $font-size-26;
 				color: #FF2A2A;
-				line-height: 20rpx;
-				margin-top: 18rpx;
+				line-height: 60rpx;
 			}
 			.title{
 				width: 210rpx;

market/pages/index/index.vue

@@ -1,35 +1,25 @@
 <template>
-	<view class="content">
-		<!-- 比赛 -->
+	<view class="content"  :style="{paddingBottom:isIphoneX?'140rpx':'98rpx',marginTop:CustomBar+'px'}">
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<!-- 采美采购商城 -->
 		<view :style="{'display':show_index == 0 ?'block':'none'}">
-			<tab-game  ref="game"></tab-game>
+			<seller-home  ref="home"></seller-home>
 		</view>
-		<!-- 发现 -->
-		<view :style="{'display':show_index == 1 ?'flex':'none'}">
-			<tab-discovery  ref="discovery"></tab-discovery>
+		<!-- 商品分类 -->
+		<view :style="{'display':show_index == 1? 'block':'none'}">
+			<seller-category  ref="category" v-if="isCategory"></seller-category>
 		</view>
-		<!-- 数据 -->
-		<view :style="{'display':show_index == 2? 'block':'none'}">
-			<tab-data   ref="data"></tab-data>
+		<!-- 账户中心 -->
+		<view :style="{'display':show_index == 2 ?'flex':'none'}">
+			<seller-user  ref="user" v-if="isUserData"></seller-user>
 		</view>
-		<!-- 资讯 -->
-		<view :style="{'display':show_index == 3 ?'block':'none'}">
-			<tab-information  ref="information"></tab-information>
-		</view>
-		<!-- 个人中心 -->
-		<view :style="{'display':show_index == 4 ? 'flex':'none'}">
-			<tab-mycenter :style="{'display':show_index == 4 ? 'flex':'none'}" ref="mycenter"></tab-mycenter>
-		</view>
-		<!-- is_lhp判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
-		<view class="tabBar" :style="{height:is_lhp?'140rpx':'98rpx'}">
+		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
+		<view class="tabBar" :style="{height:isIphoneX?'140rpx':'98rpx'}">
 			<!-- 导航的中间圆圈 --> 
-			<view class="border_box" :style="{paddingBottom:is_lhp?'40rpx':''}">
-				<view class="tabBar_miden_border"></view>
-			</view>
-			<view class="tabBar_list" :style="{paddingBottom:is_lhp?'40rpx':''}">
-				<view v-for="(item) in tab_nav_list" :key="item.id" :class="{'tabBar_item':item.id!=2,'tabBar_item2':item.id==2}" @tap="cut_index(item.id)">
-					<image v-if="show_index == item.id"  :src="`../../static/tabBar/${item.id+1}${item.id+1}.png`"></image>
-					<image v-else :src="`../../static/tabBar/${item.id+1}.png`"></image>
+			<view class="tabBar_list" :style="{paddingBottom:isIphoneX?'40rpx':''}">
+				<view v-for="(item) in tab_nav_list" :key="item.id" class="tabBar_item" @tap="cut_index(item.id)">
+					<image v-if="show_index == item.id" :src="`../../../static/${item.id+1}${item.id+1}.png`"></image>
+					<image v-else :src="`../../../static/${item.id+1}.png`"></image>
 					<view :class="{'tabBar_name':true,'nav_active':show_index == item.id}">{{item.name}}</view>
 				</view>
 			</view>
@@ -38,102 +28,108 @@
 </template>
 
 <script>
-	import tabGame from '@/components/tabBar/game.vue'
-	import tabDiscovery from '@/components/tabBar/discovery.vue'
-	import tabInformation from '@/components/tabBar/information.vue'
-	import tabData from '@/components/tabBar/Data.vue'
-	import tabMycenter from '@/components/tabBar/mycenter.vue'
+	import sellerHome from '@/components/seller/home.vue'
+	import sellerUser from '@/components/seller/user.vue'
+	import sellerCategory from '@/components/seller/category.vue'
 	export default {
 		components: {
-			tabGame,//比赛    0
-			tabDiscovery,//发现    1
-			tabInformation,//资讯   2
-			tabData,//数据   3
-			tabMycenter//个人中心  4
+			sellerHome,//采美采购商城 0
+			sellerUser,//账户中心     1
+			sellerCategory,//商品分类 2
 		},
 		data() {
 			return {
 				show_index:0,//控制显示那个组件
-				tab_nav_list :[{'id':0,'name':'首页'},{'id':1,'name':'分类'},{'id':2,'name':'推荐'},{'id':3,'name':'购物车'},{'id':4,'name':'我'}],//菜单列表
-				is_lhp:false
+				isUserData: false,
+				isCategory: false,
+				isHomeData: false,
+				tab_nav_list :[//菜单列表
+					{'id':0,'name':'首页'},
+					{'id':1,'name':'分类'},
+					{'id':2,'name':'我的'}
+				],
+				nvabarData: {		//顶部自定义导航
+					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '采美采购商城',  // 导航栏 中间的标题
+				},
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 			}
 		},
 		onLoad() {
-			let _this = this
-			this.is_lhp = this.$is_bang
-			this.$nextTick(function(){
-				// 一定要等视图更新完再调用方法   -----------++++++++++++++++重要
+			this.isIphoneX = this.$is_bang
+			this.$nextTick(function(){// 一定要等视图更新完再调用方法
 				setTimeout(function(){
-					uni.setNavigationBarColor({
-						frontColor: '#ffffff',
-						backgroundColor: '#6739b6'
-					})
-					_this.$refs.game.ontrueGetList()//初次加载第一个页面的请求数据
+					this.isHomeData= true//初次加载第一个页面的请求数据
 				},100)
 			})
-			
-			console.log("是否为刘海屏",this.is_lhp ) 
+			console.log("是否为刘海屏",this.isIphoneX ) 
 		},
 		methods: {
 			// 切换组件
 			cut_index(type){
-				console.log('----------------------------------',type)
-				let _this = this
-				_this.show_index = type
-				if(_this.show_index == 0){
-					uni.setNavigationBarColor({
-						frontColor: '#ffffff',
-						backgroundColor: '#6739b6'
-					})
-					_this.$refs.game.ontrueGetList()
-				}
-				else if(_this.show_index == 1){
-					_this.$refs.discovery.ontrueGetList()
-				}
-				else if(_this.show_index == 2){
-					_this.$refs.data.ontrueGetList()
-				}
-				else if(_this.show_index == 3){
-					uni.setNavigationBarColor({
-						frontColor: '#ffffff',
-						backgroundColor: '#ec008c'
-					})
-					_this.$refs.information.ontrueGetList()
-					
-				}
-				else if(_this.show_index == 4){
-					_this.$refs.mycenter.ontrueGetList()
+				this.show_index = type
+				if(this.show_index == 0){
+					this.isHomeData= true
+					this.nvabarData.title = '采美采购商城'
+				}else if(this.show_index == 1){
+					this.isCategory = true
+					this.nvabarData.title = '商品分类'
+				}else if(this.show_index == 2){
+					this.isUserData = true
+					this.nvabarData.title = '账户中心'
 				}
 			},
 			onPullDownRefresh(){
-				uni.showToast({
-					title:`第${this.show_index+1}个页面的刷新`
-				})
-				setTimeout(function(){
-					uni.stopPullDownRefresh()
-				},2000)
-				console.log('下拉刷新四个组件公用的下拉刷新方法,根据在哪个页面下拉执行哪个页面的刷新方方法即可')
-				console.log('如果想要自定义刷新的话，插件市场就有一个   非常好用也非常容易入手')
+				if(this.show_index == 0){
+					this.$refs.home.getCheekeyCode()
+				}else if(this.show_index == 2){
+					this.$refs.user.initData()
+				}
+				uni.stopPullDownRefresh()
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.tabBar{ width:100%;height: 98rpx;background: #fff;border-top:1px solid #E5E5E5;position: fixed;bottom:0px;left:0px;right:0px;display: flex;align-items: center;justify-content: center;
-		.tabBar_list{ width:86%;display: flex;justify-content: space-between;
-			image{ width:48rpx;height: 48rpx;margin-bottom:2rpx}
-			.tabBar_item{ width:68rpx;display: flex;justify-content: center;align-items: center;flex-direction: column;font-size: 20rpx;color: #969BA3;}
-			.tabBar_item2{
-				width:68rpx;height:100%;display: flex;justify-content: center;align-items: center;flex-direction: column;font-size: 20rpx;color: #969BA3;margin-top:-20rpx;position: relative;z-index: 101;
-				image{ width:68rpx;height: 68rpx;}
+	.content{
+		background: #FFFFFF;
+	}
+	.tabBar{ 
+		width:100%;
+		height: 98rpx;
+		background: #fff;
+		border-top:1px solid #E5E5E5;
+		position: fixed;
+		bottom:0px;
+		left:0px;
+		right:0px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.tabBar_list{ 
+			width:86%;
+			display: flex;
+			justify-content: space-between;
+			image{ 
+				width:48rpx;
+				height: 48rpx;
+				margin-bottom:2rpx
+			}
+			.tabBar_item{ 
+				width:68rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				font-size: 20rpx;
+				color: #999999;
 			}
 		 } 
 	}
-	.border_box{
-		// pointer-events: none; 事件穿透解决z-index层级问题
-		width:100%;height: 100rpx;display: flex;justify-content: center;align-items: center;position: fixed;left:0px;bottom:50rpx;z-index: 100;pointer-events: none;
-		.tabBar_miden_border{   width:100rpx;height:50rpx;border-top:2rpx solid #E5E5E5;border-radius:50rpx 50rpx 0 0; /* 左上、右上、右下、左下 */background: #fff;}
+	.nav_active{
+		color: $color-system;
 	}
-	.nav_active{color: #007AFF;}
 </style>

market/pages/login/apply.vue

@@ -284,7 +284,6 @@ import { mapMutations } from 'vuex';
 			}	
 		},
 		onLoad(option) {
-			console.log(option)
 			this.userID = option.userID
 			this.organizationInfo()
 		},

market/pages/login/information.vue

@@ -293,7 +293,6 @@
 			}	
 		},
 		onLoad(option) {
-			console.log(option)
 			this.userID = option.userID
 			this.organizationInfo()
 		},
@@ -360,7 +359,6 @@
 					if(organizationClub.mainpro!=""){
 						if(this.firstClubType == '1'){
 							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
-							console.log(this.mentuzCampList)
 						}else{
 							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
 						}
@@ -416,7 +414,6 @@
 						contractPhone:this.clubTelePhone,
 						info : this.companyPprofile
 				}
-				console.log(params)
 				sellerClubUpdate(params).then(response =>{
 					this.$util.msg('修改成功',2000);
 					setTimeout(()=>{
@@ -434,7 +431,6 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				console.log('地址',e);
 				this.addressData.address = e.name;
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
@@ -511,7 +507,6 @@
 			
 			},
 			bindPickerChange2(e) {
-				console.log('picker携带值为：' + e.target.value)
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
@@ -531,21 +526,15 @@
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
-				console.log(e)
-				// console.log(this.mentuzCampList)
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				// console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
-				// console.log(this.medicaCampList)
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				// console.log(this.mainpro)
 			},
 			checkLikes(e,list){
 				let items = list
 				let	values = e.detail.value
-				// console.log(values)
 				let arr = []
 				for (let i = 0, lenI = items.length; i < lenI; ++i) {
 					const item = items[i]
@@ -582,7 +571,6 @@
 					let _OBJ = {value:index,name:item,checked:true}
 					_ARRAY.push(_OBJ)
 				})
-				console.log(_ARRAY)
 				return _ARRAY
 			},
 			addCustomItem(){

market/pages/login/login.vue

@@ -50,9 +50,7 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			this.getOption = JSON.stringify(option)
-			
 		},
 		methods:{
 			...mapMutations(['login','logout']),
@@ -71,7 +69,8 @@
 							uni.setStorageSync('token',response.data.token)
 							uni.removeStorageSync('sessionid')
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-							this.$api.navigateTo('/market/pages/user/user')
+							// this.$api.navigateTo('/market/pages/user/user')
+							this.$api.navigateTo('/market/pages/index/index')
 						}
 					}).catch(response =>{
 						this.logout()
@@ -87,14 +86,14 @@
 						password:this.password
 				}
 				sellerLogin(params).then(response =>{
-					console.log(response)
 					if(response.code == '0' ){
 						this.$store.commit('updateStatus',response.data)
 						this.login(response.data);
 						uni.setStorageSync('token',response.data.token)
 						uni.removeStorageSync('sessionid')
 						uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-						this.$api.navigateTo('/market/pages/user/user')
+						// this.$api.navigateTo('/market/pages/user/user')
+						this.$api.navigateTo('/market/pages/index/index')
 					}else{
 						this.$util.msg(response.msg,2000);
 					}

market/pages/login/register.vue

@@ -293,7 +293,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 		},
 		methods:{
 			hanldNavigateBack(){
@@ -448,7 +447,6 @@
 			
 			},
 			bindPickerChange2(e) {
-				console.log('picker携带值为：' + e.target.value)
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
@@ -468,11 +466,9 @@
 			},
 			chooseMaleLike(e){
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				console.log(this.mainpro)
 			},
 			checkLikes(e,list){
 				let items = list

market/pages/order/create-order.vue

@@ -152,7 +152,6 @@
 							townId:this.addressData.townID
 						}
 					getOrderPostage(params).then(response =>{
-						console.log(response)
 						this.isFreight = true
 						this.freightData = response.data
 						if(response.data.freePostFlag== 1){
@@ -192,15 +191,12 @@
 			},
 			handChangeInputGoodsList(data){//对应供应商的留言信息
 				this.goodsData = data;
-				// console.log(this.goodsData)
 			},
 			handleChoiceaInvoiceData(data){//获取发票信息
-				console.log(data)
 				this.invoiceData = data
 				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 					let params =Object.assign(data,'',{userID:resolve.userID})
 					updateInvoice(params).then(response =>{
-						console.log(response)
 					})
 				})
 			},
@@ -300,7 +296,6 @@
 						orderInvoice:this.invoiceData //发票信息
 					}
 				this.modalLayer = true;	
-				// console.log(JSON.stringify(params))
 				sellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
 					if(response.code == 1){
 						this.$util.msg('支付成功',2000,true,'success')

market/pages/order/myOrder.vue

@@ -164,7 +164,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			if(option.type ==='detele'){this.isDelete = true}
 			this.currentTab = option.state
 			this.getHeaderTopHeight()//设置自定义导航高度
@@ -250,7 +249,6 @@
 				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 				this.btnoRderID = data.orderId
 			},
@@ -321,7 +319,6 @@
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false
 				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',

market/pages/order/order-details.vue

@@ -105,7 +105,6 @@
 		methods: {
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
 				queryOrderDetails({ orderID : this.orderID }).then(response =>{
-					// console.log(response)
 					let resData = response.data;
 					this.isRequest = true
 					this.userID = resData.order.userID
@@ -122,12 +121,11 @@
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
 				}).catch(response =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
-						this.$api.switchTabTo('/market/pages/home/home')
+						this.$api.switchTabTo('/market/pages/index/index')
 					})
 				})
 			},
 			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 			},
 			handShowAlert(type){//判断点击的按钮类型并执行...
@@ -183,7 +181,6 @@
 				this.isShareModal = false
 				if (res.from === 'button') {
 					// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',

market/pages/order/order-list.vue

@@ -157,7 +157,6 @@
 		},
 		onLoad(option) {
 			let that = this;
-			console.log(option)
 			if(option.type ==='detele'){that.isDelete = true}
 			that.currentTab = option.listType
 			that.getHeaderTopHeight()//设置自定义导航高度
@@ -282,12 +281,10 @@
 				}	
 			},
 			detail(id) {//订单详情跳转
-				console.log(id)
 				this.isModalLayer = true;	
 				this.$api.navigateTo(`/market/pages/order/order-details?listType=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 				this.btnoRderID = data.orderId
 			},

market/pages/search/search-order.vue

@@ -284,12 +284,10 @@
 				}	
 			},
 			detail(id) {//订单详情跳转
-				// console.log(id)
 				this.isModalLayer = true;	
 				this.$api.navigateTo(`/market/pages/order/order-details?orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				// console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 				this.btnoRderID = data.orderId
 			},
@@ -347,7 +345,6 @@
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false
 				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',

market/pages/user/user.vue

@@ -137,7 +137,7 @@
 			initData(){
 				getSellerHome({userId:this.userId}).then(response =>{
 					let sellerData = response.data
-					this.name = sellerData.seller.name 	//协销名称
+					this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
 					this.headpic = sellerData.seller.logo //会所头像
 					this.beforeConfirmCount = this.showBadge(sellerData.beforeConfirmCount)//待付款
 					this.beforePayCount = this.showBadge(sellerData.beforePayCount)//待付款
@@ -162,7 +162,6 @@
 			},
 			onShow(){
 				this.$api.getStorage().then((resolve) =>{
-					// console.log(resolve)
 					this.userId = resolve.userID
 					this.initData()
 				})

pages.json

@@ -245,6 +245,14 @@
 		{
 			"root": "market",
 			"pages": [
+				{
+					"path": "pages/index/index",
+					"style": {
+						"navigationBarTitleText": "采美采购商城",
+						"enablePullDownRefresh":true,
+						"navigationStyle":"custom"
+					}
+				},
 				{
 					"path": "pages/login/login",
 					"style": {

pages/authorization/authorization.vue

@@ -19,7 +19,6 @@
 		},
 		onLoad(option) {
 			this.authorizeType = option.type
-			console.log(this.authorizeType)
 		},
 		methods:{
 			...mapMutations(['wxLogin']),

pages/goods/goods.vue

@@ -16,16 +16,10 @@
 				serverUrl: '',
 				emptyText: '',
 				lastPageType: '',
-				lastPageVal: ''
+				lastPageVal: '',
+				userID:'',
 			}
-		},
-		onShow() {
-			let pages = getCurrentPages(),
-				thisPage = pages[pages.length - 1];
-			if(thisPage.refresh) {
-				this.setServerUrl(thisPage.listData);
-			}
-		},
+		},		
 		onLoad(option) {
 			let self = this;
 			self.setServerUrl(option);
@@ -33,7 +27,6 @@
 		methods:{
 			setServerUrl(option) {
 				let self = this;
-				console.log(option)
 				const {type, from: value} = option;
 				this.lastPageType = type;
 				this.lastPageVal = value;
@@ -66,6 +59,16 @@
 					this.$refs.childList.getListFromServer();
 				}
 			}
+		},
+		onShow() {
+			let pages = getCurrentPages(),
+				thisPage = pages[pages.length - 1];
+			if(thisPage.refresh) {
+				this.setServerUrl(thisPage.listData);
+			}
+			this.$api.getStorage().then((resolve) =>{
+				this.userID = resolve.userID
+			})
 		}
 	}
 </script>

pages/goods/product.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="product">
+	<view class="product" :style="{paddingBottom: userIdentity==1 ? '0rpx' :'120rpx'}">
 		<header-poduct  v-if="isHeaderPoduct"
 						:systeminfo='systeminfo' 
 						:navbar-data='nvabarData' 
@@ -45,7 +45,7 @@
 									<text>该商品尚未公开价格，请联系客服购买</text>
 								</view>
 								<view class="wrap-main-price" v-else>
-									<view class="p-main" v-if="ladderPriceFlag == '0' || product.actFlag == 1">
+									<view class="p-main" v-if="ladderPriceFlag == '0' || product.actStatus == 1">
 										<view class="p-price tui-skeleton-fillet">
 											<text class="txt sm">￥</text>
 											<text class="txt big">{{retailPrice}}</text>
@@ -279,7 +279,6 @@
 			this.productID = option.id;//获取商品ID
 			this.isShareType = option.type
 			this.isHeaderPoduct = true
-			console.log(this.isShareType)
 			if(option.page == 2){
 				this.backPage = option.page
 			}
@@ -364,7 +363,6 @@
 			tabClick(index) {//商品详情&&供应商信息tab切换
 				this.tabCurrentIndex = index;
 				if(this.tabCurrentIndex == 2){
-					console.log(this.product.productID)
 					this.isRecommend = true
 				}
 				if(this.tabCurrentIndex == 3){
@@ -375,8 +373,7 @@
 				this.tabCurrentIndex = e.target.current;
 			},
 			handleContact(e){//跳转小程序客服
-				console.log(e.detail.path)
-				console.log(e.detail.query)
+
 			},
 			buyProductCart(){//底部购物车按钮点击
 				if(this.hasLogin){
@@ -421,7 +418,7 @@
 				}
 			},
 			processActivityPrice(){//单独处理活动价格和阶梯价格
-				if(this.ladderPriceFlag == '1' && this.product.actFlag == 1){
+				if(this.ladderPriceFlag == '0' && this.product.actStatus == 0){
 					this.buyRetailPrice = this.product.retailPrice
 				}else{
 					this.ladderPriceList.forEach((item,index)=>{
@@ -479,16 +476,12 @@
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
 				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				// console.log(headerBtnPosi)
 				return headerBtnPosi
 			},
 			setSysteminfo(){
 				let systeminfo;
 				uni.getSystemInfo({ // 获取设备信息
 					success: (res) => {
-						// console.log(res);
-						// console.log(res.fontSizeSetting);
-						// console.log(res.system);
 						systeminfo = res
 					},
 				})
@@ -501,8 +494,7 @@
 				//丢弃
 			}
 		},
-		onPageScroll(e){
-			// console.log(e.scrollTop);//实时获取到滚动的值
+		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>50){
 				this.headerColor = true
 				this.nvabarData={							
@@ -525,7 +517,6 @@
 		onShareAppMessage(res){//分享转发
 			if (res.from === 'button') {
 		      // 来自页面内转发按钮
-		      console.log(res.target)
 		    }
 			return {
 			  title: `${this.product.name}`,
@@ -537,7 +528,6 @@
 			this.$api.getStorage().then((resolve) => {
 				this.userID = resolve.userID ? resolve.userID : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
-				console.log(this.userIdentity)
 				if (isPreviewImg) {
 					isPreviewImg = false;
 					return;
@@ -553,9 +543,6 @@
 	page{
 		background-color: #F7F7F7;
 	}
-	.product{
-		padding-bottom: 120rpx;
-	}
 	.banner-section{
 		width: 100%;
 		height: 750rpx;
@@ -748,7 +735,7 @@
 				color: #FFFFFF;
 				text-align: center;
 				border-radius: 20rpx;
-				background:linear-gradient(135deg,rgba(250,100,0,0.7) 0%,rgba(249,80,63,0.7) 100%);
+				background:#FFBB77;
 				margin: 0 22rpx 22rpx 0;
 				display: inline-block;
 			}

pages/login/apply.vue

@@ -329,7 +329,6 @@ import { mapMutations } from 'vuex';
 			}	
 		},
 		onLoad(option) {
-			console.log(option)
 			this.organizationInfo()
 		},
 		methods:{
@@ -458,7 +457,6 @@ import { mapMutations } from 'vuex';
 						contractPhone:this.clubTelePhone,
 						info : this.companyPprofile
 				}
-				console.log(params)
 				organizationModifyUpdate(params).then(response =>{
 					this.$util.msg(response.msg,2000);
 					setTimeout(()=>{
@@ -542,7 +540,6 @@ import { mapMutations } from 'vuex';
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				console.log('地址',e);
 				this.addressData.address = e.name;
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
@@ -619,7 +616,6 @@ import { mapMutations } from 'vuex';
 			
 			},
 			bindPickerChange2(e) {
-				console.log('picker携带值为：' + e.target.value)
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
@@ -640,12 +636,10 @@ import { mapMutations } from 'vuex';
 			chooseMaleLike(e){
 				this.isMainproCheck = true
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				console.log(this.mainpro)
 			},
 			checkLikes(e,list){
 				let items = list
@@ -704,7 +698,6 @@ import { mapMutations } from 'vuex';
 				this.isShowCheckPhone = !this.isShowCheckPhone
 			},
 			steps(index) {//$attrstab切换
-				console.log(index)
 				this.tabCurrentIndex = index;
 			}
 		},

pages/login/bindOperator.vue

@@ -13,7 +13,7 @@
 		<view class="login-form clearfix">
 			<view class="login-input">
 				<input type="number" 
-					   v-model="bindLinkPhone"  
+					   v-model="bindMobile"  
 					   maxlength="11" 
 					   class="input" 
 					   placeholder="请输入手机号"
@@ -69,14 +69,16 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
-	import { userInfoLogin,bindingWechat } from "@/api/use.js"
-	import { getImageCode, getbindWechatCode } from "@/api/utils.js"
+	import wxLogin from "@/common/config/wxLogin.js"
+	import { userInfoLogin } from "@/api/use.js"
+	import { getImageCode, getbindOperatorCode } from "@/api/utils.js"
+	import { sellerBindingOperation } from "@/api/seller.js"
 	export default{
 		data() {
 			return{
-				bindMobile:'',
+				wxUserInfo:'',			//储存用户微信信息
 				bindLinkName:'',  		//用户姓名
-				bindLinkPhone:'',  		//用户手机号
+				bindMobile:'',  		//用户手机号
 				mobildeCode:'',  		//手机验证码
 				imageCode:'',			//图形验证码
 				imageCodeUrl:'',		//图形验证码地址
@@ -89,12 +91,11 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			uni.setStorageSync('bind_id', option.userID);
 			this.getVerificationCode()
 		},
 		methods:{
-			...mapMutations(['login']),
+			...mapMutations(['login','logout']),
 			getCheekeyCode(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				authorize.getCode('weixin').then(wechatcode =>{
 					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
@@ -105,7 +106,7 @@
 						uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 						this.$store.commit('updateStatus',response.data)
 						if(response.data.userIdentity ==1){
-							this.$api.navigateTo('/market/pages/home/home')
+							this.$api.navigateTo('/market/pages/index/index')
 						}else{
 							this.$api.navigateTo('/pages/tabBar/home/home')
 						}
@@ -123,11 +124,11 @@
 					this.$util.msg('请输入姓名',2000)
 					return
 				}
-				if( this.bindLinkPhone == ''){
+				if( this.bindMobile == ''){
 					this.$util.msg('请输入手机号',2000)
 					return
 				}
-				if(!this.$reg.isMobile(this.bindLinkPhone)){
+				if(!this.$reg.isMobile(this.bindMobile)){
 					this.$util.msg('请输入正确的手机号',2000)
 					return
 				}
@@ -148,11 +149,11 @@
 				})
 			},
 			getMobileCodeFn(){//获取手机验证码
-				if( this.bindLinkPhone == ''){
+				if( this.bindMobile == ''){
 					this.$util.msg('请输入手机号',2000);
 					return
 				}
-				if(!this.$reg.isMobile(this.bindLinkPhone)){
+				if(!this.$reg.isMobile(this.bindMobile)){
 					this.$util.msg('请输入正确的手机号',2000);
 					return
 				}
@@ -161,14 +162,14 @@
 					return
 				}
 				let params = {
-						mobile:this.bindLinkPhone,
-						mobileOrEmail:this.bindMobile,
+						userId:uni.getStorageSync('bind_id'),
+						mobile:this.bindMobile,
 						platformType:2,
 						imgCode:this.imageCode,
 						token:this.imageCodetoken,
 				}
 				this.isMobileDisabled = true;
-				getbindWechatCode(params).then(res =>{
+				getbindOperatorCode(params).then(res =>{
 					const TIME_COUNT = 60;
 					this.$util.msg('验证短信已发送',2000)
 			     	if (!this.codeTime) {
@@ -194,24 +195,26 @@
 			bindingWechatLogin(){//获取用户基本信息登录
 				wx.getUserInfo({
 					success: res => {
-						console.log('useInfo:',res.userInfo)
-						this.userInfo = res.userInfo;
+						this.wxUserInfo = res.userInfo;
 						let params ={
 								userID: uni.getStorageSync('bind_id'),
-								mobile: this.bindLinkPhone,
+								mobile: this.bindMobile,
 								linkName: this.bindLinkName,
 								verificationCode: this.mobildeCode,
-								nickName: res.userInfo.nickName,
-								headimgurl: res.userInfo.avatarUrl,
+								nickName: this.wxUserInfo.nickName,
+								headimgurl: this.wxUserInfo.avatarUrl,
 						}
-						bindingWechat(params).then(response =>{
-							this.login(response.data);
-							uni.switchTab({
-								url:'/pages/tabBar/user/user'
-							})
-						}).catch(response =>{
-							this.$util.msg(response.msg,2000)
-						})							
+						sellerBindingOperation(params).then(response =>{
+							if(response.code == 0){
+								this.login(response.data);
+								this.$api.switchTabTo('/pages/tabBar/user/user')
+							}else if(response.code == 4){
+								this.login(response.data)
+								this.$api.navigateTo(`/pages/login/bindemail?pathType=1`)
+							}else{
+								this.$util.msg(response.msg,2000)
+							}
+						})						
 					}
 				})
 			}
@@ -222,7 +225,7 @@
 				if(res != 1){
 					this.$api.navigateTo('/pages/authorization/authorization?type=3')
 				}else{
-					console.log('22222222222222')
+					this.getCheekeyCode()
 				}
 			})		
 		}

pages/login/bindemail.vue

@@ -42,6 +42,7 @@
 	import authorize from '@/common/config/authorize.js' 
 	import { bindingEmail } from '@/api/use.js' 
 	import { getEmailCode } from "@/api/utils.js"
+	import wxLogin from "@/common/config/wxLogin.js"
 	
 	export default{
 		data() {
@@ -69,7 +70,6 @@
 			}
 			this.loginPath = option.pathType
 			this.codeType = option.codeType
-			console.log(this.loginPath)
 		},
 		methods:{
 			bindEmailFrist(){
@@ -80,9 +80,8 @@
 				}
 				bindingEmail(params).then(response =>{
 					if(this.loginPath == 1){
-						uni.switchTab({
-							url:'/pages/tabBar/user/user'
-						})
+						wxLogin.wxLoginAuthorize()
+						this.$api.switchTabTo('/pages/tabBar/user/user')
 					}else{
 						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
 					}
@@ -91,7 +90,12 @@
 				})
 			},
 			bindEmailNone(){
-				this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
+				if(this.loginPath == 1){
+					wxLogin.wxLoginAuthorize()
+					this.$api.switchTabTo('/pages/tabBar/user/user')
+				}else{
+					this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
+				}
 			},
 			getEmailCodeFn(){
 				if( this.bindEmail == ''){

pages/login/bindwechat.vue

@@ -69,6 +69,7 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
+	import wxLogin from "@/common/config/wxLogin.js"
 	import { bindingWechat } from "@/api/use.js"
 	import { getImageCode, getbindWechatCode } from "@/api/utils.js"
 	export default{
@@ -185,7 +186,6 @@
 			bindingWechatLogin(){//获取用户基本信息登录
 				wx.getUserInfo({
 					success: res => {
-						console.log('useInfo:',res.userInfo)
 						this.isUserInfo = false;
 						this.userInfo = res.userInfo;
 						let params ={
@@ -197,35 +197,14 @@
 								headimgurl:res.userInfo.avatarUrl,
 						}
 						bindingWechat(params).then(response =>{
-							// this.login(response.data);
-							uni.switchTab({
-								url:'/pages/tabBar/user/user'
-							})
+							wxLogin.wxLoginAuthorize()
+							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}).catch(response =>{
 							this.$util.msg(response.msg,2000)
 						})							
 					}
 				})
 			},
-			goUserLogininit(){
-				let url;
-				if(this.loginType) {
-					if(this.loginType=='detilType'){
-						this.$api.redirectTo(`/pages/goods/product?id=${this.id}&page=2`);
-					}else if(this.loginType=='search'){
-						this.$api.redirectTo('/pages/search/search');
-					}else if(this.loginType == 1){
-						url ='/pages/tabBar/cart/cart'
-					}else if(this.loginType == 4){
-						url ='/pages/tabBar/user/user'
-					}else {
-						url ='/pages/tabBar/home/home'
-					}
-					
-				} else if(this.listType) {
-					this.$api.navToListPage({type:this.listType,value:this.listVal,lType:'4'});
-				}
-			},
 			//关闭未授权用户授权提示弹窗
 			hideModel(){
 				this.isUserInfo = false;

pages/login/information.vue

@@ -474,7 +474,6 @@
 						contractPhone:this.clubTelePhone,
 						info : this.companyPprofile
 				}
-				console.log(params)
 				organizationUpdate(params).then(response =>{
 					this.$util.msg(response.msg,2000);
 					setTimeout(()=>{
@@ -558,7 +557,6 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				console.log('地址',e);
 				this.addressData.address = e.name;
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
@@ -635,7 +633,6 @@
 			
 			},
 			bindPickerChange2(e) {
-				console.log('picker携带值为：' + e.target.value)
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
@@ -656,12 +653,10 @@
 			chooseMaleLike(e){
 				this.isMainproCheck = true
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				console.log(this.mainpro)
 			},
 			checkLikes(e,list){
 				let items = list
@@ -717,7 +712,6 @@
 				this.isShowCheckPhone = !this.isShowCheckPhone
 			},
 			steps(index) {//$attrstab切换
-				console.log(index)
 				this.tabCurrentIndex = index;
 			}
 		},

pages/login/login-accont.vue

@@ -54,7 +54,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			this.getOption = JSON.stringify(option)
 			
 		},

pages/login/login.vue

@@ -33,7 +33,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			let data = JSON.parse(option.data);
 			this.getOption = data
 			this.loginType = option.type;
@@ -52,7 +51,6 @@
 				}
 				wx.getUserInfo({
 					success: res => {
-						console.log('useInfo:',res.userInfo)
 						this.isUserInfo = false
 						this.userInfo = res.userInfo;
 						let params ={
@@ -63,12 +61,10 @@
 						invitationCodeLogin(params).then(response =>{
 							if(response.code == 0){
 								this.login(response.data)
-								uni.switchTab({
-									url:'/pages/tabBar/home/home'
-								})
+								this.$api.switchTabTo('/pages/tabBar/home/home')
 							}else if(response.code == 4){
 								this.login(response.data)
-								this.$api.navigateTo(`/pages/login/bindemail?data=${JSON.stringify(this.getOption)}&pathType=1`)
+								this.$api.navigateTo(`/pages/login/bindemail?pathType=1`)
 							}else{
 								this.$util.msg(response.msg,2000)
 								this.isUserInfo = false

pages/login/password.vue

@@ -137,7 +137,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			this.getVerificationCode()
 		},
 		methods:{

pages/login/register.vue

@@ -379,7 +379,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 		},
 		methods:{
 			hanldNavigateBack(){
@@ -398,7 +397,6 @@
 						whichStep:1,
 				}
 				organizationVerifyRegisterFirst(params).then(res =>{
-					console.log(res)
 					this.tabCurrentIndex = 2
 					this.getVerificationCode()
 				}).catch(res =>{
@@ -414,7 +412,6 @@
 						whichStep:2,
 				}
 				organizationVerifyRegisterTwo(params).then(res =>{
-					console.log(res)
 					this.tabCurrentIndex = 3
 				}).catch(res =>{
 					this.$util.msg(res.msg,2000);
@@ -545,7 +542,6 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {//获取选择的地址信息
-				console.log('地址',e);
 				this.addressData.address = e.name;
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
@@ -622,7 +618,6 @@
 			
 			},
 			bindPickerChange2(e) {
-				console.log('picker携带值为：' + e.target.value)
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
@@ -642,11 +637,9 @@
 			},
 			chooseMaleLike(e){
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				console.log(this.mainpro)
 			},
 			checkLikes(e,list){
 				let items = list
@@ -691,7 +684,6 @@
 				}
 			},
 			steps(index) {//$attrstab切换
-				console.log(index)
 				this.tabCurrentIndex = index;
 			}
 		},

pages/search/search-order.vue

@@ -96,7 +96,7 @@
 	import orSearch from '@/components/uni-search/or-search.vue'
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/module/orderDetails/orderListButton'		 //按钮
+	import orderButton from '@/components/module/orderDetails/orderListButton'	 //按钮
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
@@ -108,7 +108,8 @@
 		queryOrderList,
 		cancelOrder,
 		deleteOrder,
-		confirmReceipt
+		confirmReceipt,
+		affirmOrder
 	} from "@/api/order.js"
 	export default {
 		components: {
@@ -290,12 +291,10 @@
 				}	
 			},
 			detail(id) {//订单详情跳转
-				// console.log(id)
 				this.isModalLayer = true;	
 				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				// console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 				this.btnoRderID = data.orderId
 			},
@@ -314,6 +313,9 @@
 					case 'confirm':
 						this.handOrderConfirm(data.orderId);
 						break
+					case 'confirmation':
+						this.handOrderConfirmation(data.orderId);
+						break	
 				}
 			},
 			handOrderConfirm (id){//确认收货
@@ -326,6 +328,18 @@
 					})
 				})
 			},
+			handOrderConfirmation (id){//确认订单
+				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
+					affirmOrder({orderID:id}).then(response =>{
+						this.$util.msg(response.msg,2000,true,'success');
+						setTimeout(() => {
+							this.getOrderDatainit(this.currentTab)
+						},2000)
+					}).catch(response =>{
+						this.$util.msg(response.msg,2000)
+					})
+				})
+			},
 			handOrderDetele(){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
 					deleteOrder({orderID:this.orderID}).then(response =>{
@@ -358,7 +372,6 @@
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false
 				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
@@ -370,6 +383,7 @@
 			orderStateExp (state){
 				let stateText = '',
 					stateTextObject={
+						0:'待确认',
 						4:'交易完成',
 						5:'订单完成',
 						6:'已关闭',

pages/tabBar/cart/cart.vue

@@ -527,14 +527,12 @@
 						}
 					})
 				})
-				// console.log(this.delGoodsList);
 				if(this.delGoodsList.length == 0){
 					this.$util.msg("请选择要删除的商品~",2000);
 					return
 				}else{				
 					this.$util.modal('','确定删除选中的商品吗？','确定','取消',true,() =>{
 						shoppingCartDelete({userID:this.userID,productIDs:this.delGoodsList}).then(response =>{
-							console.log(response)
 							this.$util.msg('删除成功',2000);
 							setTimeout(()=>{
 								this.isshowDelbtn = false;

pages/tabBar/home/home.vue

@@ -71,7 +71,7 @@
 									</view>
 									<view class="price tui-skeleton-rect" v-else>
 										<text class="p sm">￥</text>
-										<text class="p big">{{item.retailPrice ? item.retailPrice.toFixed(2):''}}</text>
+										<text class="p big">{{item.retailPrice!=null ? item.retailPrice.toFixed(2):''}}</text>
 									</view>
 								</view>
 								<view v-else class="no-price">
@@ -184,7 +184,6 @@
 			},	
 			getCheekeyCode(){
 				authorize.getCode('weixin').then(wechatcode =>{// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					// console.log(wechatcode);
 					userInfoLogin({code:wechatcode}).then(response =>{
 						this.isLogin = true;
 						this.userID = response.data.userID;						
@@ -232,8 +231,6 @@
 			swiperChange(e) {
 				const index = e.detail.current;
 				this.current = index;
-				// console.log('current',this.current)
-				// this.titleNViewBackground = this.carouselList[index].background;
 			},
 			formatMoney(num){
 				return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
@@ -262,7 +259,8 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				this.$util.msg("正在开发中，敬请期待~",2000);
+				this.$api.navigateTo('/market/pages/login/login')
+				// this.$util.msg("正在开发中，敬请期待~",2000);
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',
@@ -292,8 +290,7 @@
 				)	
 			}
 		},
-		onPageScroll(e){
-			// console.log(e.scrollTop);//实时获取到滚动的值
+		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>50){
 				this.inputActive = 'fixed'
 			}else{
@@ -307,7 +304,6 @@
 		onShareAppMessage(res){//分享转发
 			if (res.from === 'button') {
 		      // 来自页面内转发按钮
-		      console.log(res.target)
 		    }
 			return {
 			  title: '采美采购商城-生美/医美采购服务平台',
@@ -547,8 +543,7 @@
 			.title-none{
 				font-size: $font-size-26;
 				color: #FF2A2A;
-				line-height: 20rpx;
-				margin-top: 18rpx;
+				line-height: 60rpx;
 			}
 			.title{
 				width: 210rpx;

pages/tabBar/user/user.vue

@@ -28,10 +28,10 @@
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=1')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
 							<image src="../../../static/temp/order1@3x.png" mode=""></image>
-							<text 	v-if="paymentCount >0" 
+							<text 	v-if="confirmedCount>0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[paymentCount < 10 ? 'goleft':'']">
-									{{paymentCount == 99? '99+' : paymentCount}}
+									:class="[confirmedCount < 10 ? 'goleft':'']">
+									{{confirmedCount == 99? '99+' : confirmedCount}}
 							</text>
 						</view>
 						<text class="order-t">待确认</text>
@@ -39,10 +39,10 @@
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=2')"  hover-class="common-hover" :hover-stay-time="50">
 						<view class="order-icon">
 							<image src="../../../static/temp/order2@3x.png" mode=""></image>
-							<text  v-if="waitShipmentsCount >0" 
+							<text  v-if="paymentCount >0" 
 								   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
-								   :class="[waitShipmentsCount < 10 ? 'goleft':'']">
-								   {{waitShipmentsCount == 99? '99+' : waitShipmentsCount}}
+								   :class="[paymentCount < 10 ? 'goleft':'']">
+								   {{paymentCount == 99? '99+' : paymentCount}}
 							</text>
 						</view>
 						<text class="order-t">待付款</text>
@@ -50,10 +50,10 @@
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=3')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
 							<image src="../../../static/temp/order3@3x.png" mode=""></image>
-							<text   v-if="shipmentsCount >0" 
+							<text   v-if="waitShipmentsCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[shipmentsCount < 10 ? 'goleft':'']">
-									{{shipmentsCount == 99? '99+' : shipmentsCount}}
+									:class="[waitShipmentsCount < 10 ? 'goleft':'']">
+									{{waitShipmentsCount == 99? '99+' : waitShipmentsCount}}
 							</text>
 						</view>
 						<text class="order-t">待发货</text>
@@ -61,10 +61,10 @@
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=4')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
 							<image src="../../../static/temp/order4@3x.png" mode=""></image>
-							<text 	v-if="salesReturnCount >0" 
+							<text 	v-if="shipmentsCount>0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[salesReturnCount < 10 ? 'goleft':'']">
-									{{salesReturnCount == 99? '99+' : salesReturnCount}}
+									:class="[shipmentsCount < 10 ? 'goleft':'']">
+									{{shipmentsCount == 99? '99+' : shipmentsCount}}
 							</text>
 						</view>
 						<text class="order-t">已发货</text>
@@ -72,6 +72,11 @@
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=5')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
 							<image src="../../../static/temp/order5@3x.png" mode=""></image>
+							<text 	v-if="salesReturnCount >0"
+									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
+									:class="[salesReturnCount < 10 ? 'goleft':'']">
+									{{salesReturnCount == 99? '99+' : salesReturnCount}}
+							</text>
 						</view>
 						<text class="order-t">退货/款</text>
 					</view>
@@ -129,6 +134,7 @@
 				openid:'',
 				aboutHtml:'',
 				telPhone:'',
+				confirmedCount:0,//待确认
 				paymentCount:0, //待付款角标
 				waitShipmentsCount:0, //待收货角标
 				shipmentsCount:0,  //已发货角标
@@ -155,10 +161,10 @@
 			initData(){
 				personalInfo({userID:this.userID}).then(response =>{
 					this.$store.commit('updateAllNum',response.data.count)
-					let user_data =response.data
-					let _userData = user_data.user
-					let _clubData = user_data.club
-					if(_userData.ableUserMoney == 0){
+					let data =response.data
+					let _userData = data.user
+					let _clubData = data.club
+					if(_userData.ableUserMoney == 0 || _userData.ableUserMoney ==null){
 						this.userMoney = '0.00';
 					}else{
 						let i =  _userData.ableUserMoney.toString().lastIndexOf('.');
@@ -173,12 +179,14 @@
 					}
 					this.name = _clubData.name //会所名称
 					this.headpic = _userData.image //会所头像
-					this.contactNumber = user_data.organize.contactNumber //联系电话		
-					this.paymentCount = this.showBadge(user_data.paymentCount)//待付款
-					this.waitShipmentsCount = this.showBadge(user_data.waitShipmentsCount)//待收货		
-					this.shipmentsCount = this.showBadge(user_data.shipmentsCount)//已发货	
-					this.salesReturnCount = this.showBadge(user_data.salesReturnCount)//退货/款	
+					this.contactNumber = data.organize.contactNumber //联系电话		
+					this.confirmedCount = this.showBadge(data.confirmedCount)//待确认
+					this.paymentCount = this.showBadge(data.paymentCount)//待付款
+					this.waitShipmentsCount = this.showBadge(data.waitShipmentsCount)//待收货		
+					this.shipmentsCount = this.showBadge(data.shipmentsCount)//已发货	
+					this.salesReturnCount = this.showBadge(data.salesReturnCount)//退货/款	
 					let clubInfo ={name:this.name,image:this.headpic,clubID:_clubData.clubID}
+					console.log(clubInfo)
 					uni.setStorage({//缓存机构
 						key: 'clubInfo',  
 						data: clubInfo  
@@ -211,7 +219,6 @@
 					this.$store.commit('updateAllNum',0)
 				}else{
 					this.$api.getStorage().then((resolve) =>{
-						// console.log(resolve)
 						this.userID = resolve.userID
 						this.initData()
 						this.isShowNoLogin = false;

pages/user/account/account.vue

@@ -141,7 +141,6 @@
 						this.initAbleUserMoney(infoData.ableUserMoney)
 						let resultsData = infoData.pageDate.results
 						this.hasNextPage =  infoData.pageDate.hasNextPage;
-						console.log(resultsData.length)
 						if(resultsData && resultsData.length > 0){
 							this.isEmpty = false;
 							this.accountList = [...resultsData];
@@ -211,7 +210,6 @@
 				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month);
 			},			
 			bindDateChange: function(e) {
-				// console.log(e);
 				this.date = e.target.value
 			},
 			monthSwitch(e) {

pages/user/address/address.vue

@@ -77,7 +77,6 @@
 			this.setScrollHeight();
 		},
 		onReachBottom() {
-			// console.log('滑动到页面底部')
 			if(this.isLoadMore) {
 				this.initAddressList();
 			}
@@ -134,10 +133,8 @@
 			},
 			//删除收货地址
 			deleteAddress(id){
-				console.log('删除地址的ID',id)
 				this.$util.modal('','确定要删除该地址？','确定','取消',true,() =>{
 					deleteNewAddress({addressID:id,userID:this.userID}).then(response =>{
-						console.log('11111111111')
 						this.$util.msg('删除成功',2000)
 						setTimeout(() =>{
 							this.pageNum = 1;

pages/user/address/addressManage.vue

@@ -71,7 +71,6 @@
 			}
 		},
 		onLoad(option){
-			console.log(option.data)
 			let title = '添加新地址'
 			if(option.type==='edit'){
 				title = '编辑收货地址'
@@ -93,7 +92,6 @@
 		},
 		methods: {			
 			switchChange(e){
-				// console.log('==========',e.detail.value);
 				if(e.detail.value== true){
 					this.addressData.defaultFlag = 1;
 				}else{
@@ -106,7 +104,6 @@
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				// console.log('地址',e);
 				this.addressData.allAddress = e.name;
 				this.addressData.townID = e.cityCode;	
 			},			
@@ -166,17 +163,14 @@
 			},
 			onShouHuoRen(e){
 			   this.addressData.shouHuoRen = e.detail.value;
-			   // console.log(this.addressData.shouHuoRen)
 			   this.initInput();
 			},
 			onMobile(e){
 			   this.addressData.mobile = e.detail.value;
-			   // console.log(this.addressData.mobile)
 			   this.initInput();
 			},
 			onTextareaInput(e){
 			   this.addressData.addressDetail = e.detail.value;
-			   // console.log(this.addressData.addressDetail)
 			   this.initInput();
 			},
 			initInput(){

pages/user/invoice/invoice.vue

@@ -134,7 +134,6 @@
 				this.$api.getStorage().then((resolve) =>{
 					queryInvoice({userId:resolve.userID}).then(response =>{
 						let resData = response.data
-						console.log(resData)
 						this.invoiceData.companyName = resData.invoiceTitle;
 						this.invoiceData.taxId = resData.corporationTaxNum;
 						this.invoiceData.bankName = resData.openBank;

pages/user/operator/addoperator.vue

@@ -78,7 +78,6 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				console.log(resolve)
 				this.userID = resolve.userID
 				this.clubID = resolve.clubID
 			})

pages/user/operator/list.vue

@@ -196,7 +196,6 @@
 				this.isOperatorModel = false
 			},
 			deleteOperator(id){//删除运营人员
-				console.log('删除的ID',id)
 				this.$util.modal('','确定删除运营人员吗？','确定删除','取消',true,() =>{
 					deleteOperator({id:id}).then(response =>{
 						this.$util.msg('删除成功',2000)
@@ -284,7 +283,6 @@
 		},
 		onShow() {
 			this.$api.getComStorage('clubInfo').then(response =>{
-				console.log(response)
 				this.clubID = response.clubID
 				this.clubName = response.name
 				this.clubImage = response.image

pages/user/order/create-order.vue

@@ -114,7 +114,6 @@
 		},
 		onLoad(option){//商品数据
 			let data = JSON.parse(option.data);
-			// console.log(data)
 			this.allPrice = data.data.allPrice;
 			this.allCount = data.data.allCount;
 			this.payAllPrice = this.allPrice;
@@ -153,7 +152,6 @@
 						townId:this.addressData.townID
 					}
 				getOrderPostage(params).then(response =>{
-					console.log(response)
 					this.isFreight = true
 					this.freightData = response.data
 					if(response.data.freePostFlag== 1){
@@ -188,10 +186,8 @@
 			},
 			handChangeInputGoodsList(data){//对应供应商的留言信息
 				this.goodsData = data;
-				// console.log(this.goodsData)
 			},
 			handleChoiceaInvoiceData(data){//获取发票信息
-				console.log(data)
 				this.invoiceData = data
 				let params =Object.assign(data,'',{userID:this.userID})
 				updateInvoice(params).then(response =>{
@@ -280,7 +276,6 @@
 						orderInvoice:this.invoiceData
 					}
 				this.modalLayer = true;	
-				// console.log(JSON.stringify(param))
 				createOrderSubmit({'params':JSON.stringify(param)}).then(response =>{
 					if(response.code === 1){
 						this.submitState ='success'

pages/user/order/myOrder.vue

@@ -164,7 +164,6 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
 			if(option.type ==='detele'){this.isDelete = true}
 			this.currentTab = option.state
 			this.getHeaderTopHeight()//设置自定义导航高度
@@ -250,7 +249,6 @@
 				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 				this.btnoRderID = data.orderId
 			},
@@ -321,7 +319,6 @@
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false
 				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',

pages/user/order/order-cashier.vue

@@ -82,7 +82,6 @@
 		},
 		methods:{
 			initData(e){
-				// console.log(JSON.parse(e.data));
 				let data = JSON.parse(e.data);
 				this.shareOrderID = data.data.orderID
 				if(e.type =='success'){
@@ -149,13 +148,10 @@
 				this.isShareModal = true
 			},
 			onShareAppMessage(res){//分享转发
-				console.log(res)
 				let self = this
 				self.isShareModal = false
 				if (res.from === 'button') {
 					// 来自页面内转发按钮
-					console.log(res.target)
-					// self.$util.msg("分享成功",3000);
 					setTimeout(function(){
 						self.isShareCode = true;
 					},5000)
@@ -196,15 +192,16 @@
 				flex-direction: column;
 				background: $bg-color;
 				&-image {
-					width: 382rpx;
-					height: 310rpx;
+					width: 330rpx;
+					height: 260rpx;
 					margin-bottom: 10rpx;
 					margin-top: -120rpx;
 				}
 				.txt{
 					font-size: $font-size-28;
-					color: $text-color;
+					color: #07c160;
 					line-height: 44rpx;
+					font-weight: bold;
 				}
 			}
 			.cashier-wrapper{
@@ -217,8 +214,8 @@
 				padding-bottom: 100rpx;
 				image{
 					display: flex;
-					width: 382rpx;
-					height: 310rpx;	
+					width: 330rpx;
+					height: 260rpx;
 					margin-bottom: 22rpx;
 				}
 				.wrapper-text{

pages/user/order/order-details.vue

@@ -104,7 +104,6 @@
 		methods: {
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
 				queryOrderDetails({ orderID : this.orderID }).then(response =>{
-					// console.log(response)
 					let resData = response.data;
 					this.isRequest = true
 					this.userID = resData.order.userID
@@ -126,7 +125,6 @@
 				})
 			},
 			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 			},
 			handShowAlert(type){//判断点击的按钮类型并执行...
@@ -143,7 +141,7 @@
 					case 'confirm':
 						this.handOrderConfirm()
 						break
-					case 'confirm':
+					case 'confirmation':
 						this.handOrderConfirmation()
 						break
 				}
@@ -162,9 +160,7 @@
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
 					affirmOrder({orderID:this.orderID}).then(response =>{
 						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
+						this.initOrderDetaileData()
 					}).catch(response =>{
 						this.$util.msg(response.msg,2000)
 					})
@@ -200,7 +196,6 @@
 				this.isShareModal = false
 				if (res.from === 'button') {
 					// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',

pages/user/order/order-list.vue

@@ -116,7 +116,7 @@
 							  {state: 2,text: '待付款',orderList: []},
 							  {state: 3,text: '待发货',orderList: []},
 							  {state: 4,text: '已发货',orderList: []},
-							  {state: 5,text: '退货/款',orderList: []},
+							  {state: 5,text: '退货/款',orderList: []}
 							 ],
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo:  this.setSysteminfo(),		 //获取设备信息
@@ -149,7 +149,6 @@
 		},
 		onLoad(e) {
 			let that = this;
-			console.log(e)
 			if(e.type ==='detele'){that.isDelete = true}
 			that.currentTab = e.state
 			that.getHeaderTopHeight()//设置自定义导航高度
@@ -282,12 +281,10 @@
 				}	
 			},
 			detail(id) {//订单详情跳转
-				console.log(id)
 				this.isModalLayer = true;	
 				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				console.log('点击按钮的类型是',data);
 				this.handShowAlert(data)
 				this.btnoRderID = data.orderId
 			},
@@ -365,7 +362,6 @@
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false
 				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
@@ -377,6 +373,7 @@
 			orderStateExp (state){
 				let stateText = '',
 					stateTextObject={
+						0:'待确认',
 						4:'交易完成',
 						5:'订单完成',
 						6:'已关闭',

pages/user/order/order-logistics.vue

@@ -72,9 +72,7 @@
 				goodsList:[]
 			}
 		},
-		onLoad(option){
-			console.log(option)
-			//商品数据
+		onLoad(option){//商品数据
 			this.orderID = option.orderID;
 			this.getData();
 		},

pages/user/order/orderShareLogin.vue

@@ -31,7 +31,6 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e)
 			this.orderID = e.orderID
 			this.userID = e.userID
 		},
@@ -45,15 +44,12 @@
 							shareCode:this.shareCode
 						}
 					orderShareCode(params).then(response =>{
-						console.log(response)
 						if(response.code === 2){
 							this.$api.navigateTo(`/market/pages/order/order-details?type=share&orderID=${this.orderID}`)
 						}else if(response.code === 0) {
-							if(response.data == true){
-								console.log('同为会所运营人员查看订单详情')
+							if(response.data == true){//同为会所运营人员查看订单详情
 								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.orderID}`)
-							}else{
-								console.log('游客第二次查看订单详情')
+							}else{//游客第二次查看订单详情
 								this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderID=${this.orderID}`)
 							}
 						}else if(response.code === -2){
@@ -81,8 +77,7 @@
 							shareCode:this.shareCode
 						}
 					orderShareCode(params).then(response =>{
-						if (response.code === 0) {
-							console.log('游客第一次查看订单详情')
+						if (response.code === 0) {//游客第一次查看订单详情
 							this.$api.redirectTo('/pages/user/order/order-sharedetails?orderID='+this.orderID)
 						}else{
 							this.$util.msg(response.msg,2000);

pages/user/regularPurchase/regularPurchase.vue

@@ -64,7 +64,6 @@
 		},
 		methods:{
 			hanldOperationConfim(data){//显示选择数量确认弹窗
-				console.log(data)
 				this.specClass = 'show';
 				this.handleData = data
 				this.number = data.minBuyNumber
@@ -80,7 +79,7 @@
 			changeCountAdd(){//popup弹窗数量增加按钮
 				this.number++
 				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.productLadderPrices.forEach((item,index)=>{
+					this.handleData.ladderPriceList.forEach((item,index)=>{
 						if(this.number>=item.buyNum){
 							this.buyRetailPrice = item.buyPrice
 						}
@@ -96,7 +95,7 @@
 				}else{
 					this.number--
 					if(this.handleData.ladderPriceFlag == '1'){
-						this.handleData.productLadderPrices.forEach((item,index)=>{
+						this.handleData.ladderPriceList.forEach((item,index)=>{
 							if(this.number>=item.buyNum){
 								this.buyRetailPrice = item.buyPrice
 							}
@@ -130,7 +129,6 @@
 				}, 200);
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
-				console.log(this.number)
 				shoppingAddCart({productID:this.handleData.productID,userID:this.userID,productCount:this.number}).then(response => {
 					this.specClass = 'hide';
 					this.$util.msg(response.msg,1500,true,'success')

pages/user/setting/password.vue

@@ -79,7 +79,6 @@
 			this.setScrollHeight();
 		},
 		onReachBottom() {
-			// console.log('滑动到页面底部')
 			if(this.isLoadMore) {
 				this.initAddressList();
 			}
@@ -139,7 +138,6 @@
 			},
 			//删除收货地址
 			deleteAddress(id){
-				console.log('删除地址的ID',id)
 				this.isShowDelModal = true;
 				this.deleteAddressId =id;
 			},

pages/user/setting/phone.vue

@@ -79,7 +79,6 @@
 			this.setScrollHeight();
 		},
 		onReachBottom() {
-			// console.log('滑动到页面底部')
 			if(this.isLoadMore) {
 				this.initAddressList();
 			}
@@ -139,7 +138,6 @@
 			},
 			//删除收货地址
 			deleteAddress(id){
-				console.log('删除地址的ID',id)
 				this.isShowDelModal = true;
 				this.deleteAddressId =id;
 			},