协销模块

api/seller.js

@@ -14,6 +14,14 @@ import $reg from '@/common/config/common.js'
  */
 export function SellerLogin(params) {
 	return new Promise(function(resolve,reject) {
+		if( params.mobile == ''){
+			uni.showToast({title: '请输入账户名',duration: 2000,mask:true, icon:'none'})
+			return
+		}
+		if( params.password == ''){
+			uni.showToast({title: '请输入密码',duration: 2000,mask:true,icon:'none'})
+			return
+		}
 		request.post('/SellerLogin/login',params, true,res => {
 			if(res.code == 0){
 				resolve(res)
@@ -22,4 +30,152 @@ export function SellerLogin(params) {
 			}
 		})
 	})
+}
+/**
+ *@协销微信授权登录
+ *@param code 微信Code
+ */
+export function SellerWxLogin(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/SellerLogin/wxLogin',params, true,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销订单列表
+ *@param listType 订单类型
+ *@param orderNo 密码
+ *@param pageNum 页码
+ *@param pageSize 条数
+ *@param serviceProviderId 密码
+ */
+export function getSellerOrderList(params) {
+	return new Promise(function(resolve,reject) {
+		request.lodingGet('/seller/order/list',params,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销加入购物车
+ *@param mobile 手机号
+ *@param Password 密码
+ */
+export function SellerAddCart(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/seller/addCart',params, true,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销商品搜索
+ *@param clubUserId 协销ID
+ *@param pageNum 页码
+ *@param pageSize 条数
+ *@param searchWord 搜索关键词
+ */
+export function getSellerProduct(params) {
+	return new Promise(function(resolve,reject) {
+		request.get('/seller/product/search',params,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销商品搜索
+ *@param clubId 会所ID
+ *@param serviceProviderId 页码
+ */
+export function getSellerShoppingInfo(params) {
+	return new Promise(function(resolve,reject) {
+		request.get('/seller/shoppingInfo',params,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销购物车
+ *@param clubId 会所ID
+ *@param serviceProviderId 页码
+ */
+export function shoppingCartAddCart(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/shoppingCart/addCart',params, true,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销购物车删除商品
+ *@param clubId 会所ID
+ *@param serviceProviderId 页码
+ */
+export function shoppingCartDelete(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/shoppingCart/delete',params, true,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销购物车删除商品
+ *@param clubId 会所ID
+ *@param serviceProviderId 页码
+ */
+export function getshoppingCartInfo(params) {
+	return new Promise(function(resolve,reject) {
+		request.lodingGet('/shoppingCart/shoppingInfo',params,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
+}
+/**
+ *@协销购物车商品增减
+ *@param clubId 会所ID
+ *@param serviceProviderId 页码
+ */
+export function shoppingCartUpdate(params) {
+	return new Promise(function(resolve,reject) {
+		request.post('/shoppingCart/update',params,true,res => {
+			if(res.code == 0){
+				resolve(res)
+			}else{
+				reject(res)
+			}
+		})
+	})
 }

common/config/config.js

@@ -3,7 +3,7 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

components/module/listTemplate/buyagainList.vue

@@ -1,7 +1,17 @@
 <template>
 	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<list-skeleton v-if="showSkeleton" :listType='0'></list-skeleton>
-		<view class="product-container" v-if="!isShowEmpty">
+		<list-skeleton v-if="showSkeleton"></list-skeleton>
+		<view class="good-search clearfix" v-if="searchStatus">
+			<view class="search-from name">
+				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				<input class="input" type="text" v-model="searchInputVal" placeholder="请输入商品名称" @input="onShowClose" maxlength="20"/>
+				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+			</view>
+			<view class="search-btn">
+				<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
+			</view>
+		</view>
+		<view class="product-container" v-if="!isShowEmpty" :style="{paddingTop:searchStatus?'112rpx':''}">
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="productList.length > 0">
 				<view v-for="(item,index) in productList" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productID)">
 					<image mode='widthFix' :src="item.mainImage"  class="list-img" alt="list-img"></image>
@@ -68,12 +78,15 @@
 			uniStars
 		},
 		props: {
-			emptyText: {
-				type: String
-			},
+			searchStatus:{
+				type:Boolean,
+				default:false
+			}
 		},
 		data(){
 			return{
+				isShowClose:false,
+				searchInputVal:'',
 				isModallayer:false,
 				windowHeight: '',
 				showSkeleton: true,
@@ -148,7 +161,6 @@
 							newProductList.push(Object.assign({},item,{isShowActFlg:isActFlg}))
 						})
 						this.productList = newProductList
-						console.log(this.productList)
 						// 防上拉暴滑
 						this.pullFlag = false;
 						setTimeout(()=>{
@@ -190,6 +202,17 @@
 			},
 			repurchModel(){
 				this.$util.modal('','此商品成本有变化原来的购买价已不适用','知道了','',false,() =>{})
+			},
+			onShowClose () {//输入框失去焦点时触发
+				if(this.searchInputVal != ''){
+					this.isShowClose = true
+				}else{					
+					this.isShowClose = false
+				}
+			},
+			delInputText(){//清除输入框内容
+				this.searchInputVal = ''
+				this.isShowClose = false
 			}
 		}
 	}
@@ -199,7 +222,6 @@
 	.commodity-list-wrapper {
 		scroll-view {
 			height: 100%;
-			border-top: 2rpx solid rgba(0,0,0,0.07);
 		}
 		.empty-container-image {
 			margin-top: -300rpx;
@@ -220,6 +242,66 @@
 			margin-left: -138rpx;
 		}
 	}
+	.good-search{
+		height: 64rpx;
+		width: 702rpx;
+		padding: 24rpx;
+		background: #FFFFFF;
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		.search-from{
+			width: 582rpx;
+			height: 64rpx;
+			background: #F7F7F7;
+			border-radius: 14rpx;
+			float: left;
+			position: relative;
+			.input{
+				width: 500rpx;
+				height: 64rpx;
+				float: left;
+				line-height: 64rpx;
+				color: $text-color;
+				font-size: $font-size-24;
+			}
+			.icon-iconfonticonfontsousuo1{
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				display: block;
+				font-size: $font-size-38;
+				float: left;
+				color: #999999;
+			}
+			.icon-shanchu1{
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				top: 0;
+				right: 0;
+				text-align: center;
+				z-index: 10;
+			}
+		}
+		.search-btn{
+			width: 120rpx;
+			line-height: 64rpx;
+			text-align: center;
+			font-size: $font-size-28;
+			color: $color-system;
+			float: left;
+			background: #FFFFFF;
+		}
+	}
 	.all-type-list-content {
 		height: 240rpx;
 		padding: 24rpx;

market/pages/order/order-immediately.vue → market/pages/cart/immediately.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container all-type-list-wrapper">
-		<buyagain-list ref="productList" @operationConfim="hanldOperationConfim"></buyagain-list>
+		<buyagain-list ref="productList" :search-status="true" @operationConfim="hanldOperationConfim"></buyagain-list>
 		<!--底部选择模态层弹窗组件 -->
 		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
 			<!-- 遮罩层 -->

market/pages/club/list.vue

@@ -3,7 +3,8 @@
 		<view class="club-search clearfix">
 			<view class="search-from name">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" type="text" v-model="linkman" placeholder="请输入机构名称搜索" maxlength="12"/>
+				<input class="input" type="text" v-model="searchInputVal" @input="onShowClose" placeholder="请输入机构名称" maxlength="16"/>
+				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
 			<view class="search-btn">
 				<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
@@ -83,6 +84,8 @@
 				clubImage:'',
 				linkman:'',
 				clubMobile:'',
+				isShowClose:false,
+				searchInputVal:'',
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
 				userID:'',
@@ -213,6 +216,17 @@
 			},
 			orderHistory(id){
 				this.$api.navigateTo(`/market/pages/order/order-history?id=${id}`)
+			},
+			onShowClose () {//输入框失去焦点时触发
+				if(this.searchInputVal != ''){
+					this.isShowClose = true
+				}else{					
+					this.isShowClose = false
+				}
+			},
+			delInputText(){//清除输入框内容
+				this.searchInputVal = ''
+				this.isShowClose = false
 			}
 		},
 		onReachBottom() {
@@ -261,7 +275,16 @@
 			background: #F7F7F7;
 			border-radius: 14rpx;
 			float: left;
-			.iconfont{
+			position: relative;
+			.input{
+				width: 500rpx;
+				height: 64rpx;
+				float: left;
+				line-height: 64rpx;
+				color: $text-color;
+				font-size: $font-size-24;
+			}
+			.icon-iconfonticonfontsousuo1{
 				width: 64rpx;
 				height: 64rpx;
 				line-height: 64rpx;
@@ -271,13 +294,17 @@
 				float: left;
 				color: #999999;
 			}
-			.input{
-				width: 500rpx;
+			.icon-shanchu1{
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
 				height: 64rpx;
-				float: left;
 				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
+				text-align: center;
+				top: 0;
+				right: 0;
+				z-index: 10;
 			}
 		}
 		.search-btn{

market/pages/login/apply.vue

@@ -680,7 +680,7 @@ import { mapMutations } from 'vuex';
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 0){
+				if(this.isOrganizationType == 1){
 					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
 					this.mentuzCampList.push(item)
 				}else{
@@ -962,6 +962,9 @@ import { mapMutations } from 'vuex';
 						height: auto;
 						background: #FFFFFF;
 						margin-top: 30rpx;
+						.label{
+							line-height: 70rpx;
+						}
 						.row-input{
 							width: 100%;
 							height: 88rpx;
@@ -981,7 +984,6 @@ import { mapMutations } from 'vuex';
 						margin-top: 0;
 					}
 					.content-class {
-						width: 520rpx;
 						margin: 20rpx auto;
 						display: flex;
 						flex-flow: row wrap;

market/pages/login/information.vue

@@ -407,6 +407,7 @@
 						if(organizationClub.mainpro!=""){
 							if(this.firstClubType == '1'){
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
+								console.log(this.mentuzCampList)
 							}else{
 								this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
 							}
@@ -648,17 +649,21 @@
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
+				console.log(e)
+				// console.log(this.mentuzCampList)
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				console.log(this.mainpro)
+				// console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
+				// console.log(this.medicaCampList)
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				console.log(this.mainpro)
+				// 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]
@@ -696,7 +701,7 @@
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 0){
+				if(this.isOrganizationType == 1){
 					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
 					this.mentuzCampList.push(item)
 				}else{
@@ -892,6 +897,9 @@
 						height: auto;
 						background: #FFFFFF;
 						margin-top: 30rpx;
+						.label{
+							line-height: 70rpx;
+						}
 						.row-input{
 							width: 100%;
 							height: 88rpx;
@@ -911,7 +919,6 @@
 						margin-top: 0;
 					}
 					.content-class {
-						width: 520rpx;
 						margin: 20rpx auto;
 						display: flex;
 						flex-flow: row wrap;

market/pages/login/login.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container login">
+	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
+		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
 			<image class="logo" src="../../../static/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
@@ -30,25 +31,23 @@
 <script>
 	import { mapMutations } from 'vuex';
 	import authorize from '@/common/config/authorize.js' 
-	import { organizationLogin } from '@/api/use.js' 
+	import { SellerLogin,SellerWxLogin } from '@/api/seller.js' 
 	var self;
 	export default{
 		data() {
 			return{
+				nvabarData: {		//顶部自定义导航
+					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '登录',  // 导航栏 中间的标题
+				},
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isShowEye:false,
 				iconEyes:'icon-yanjing_yincang_o',
 				iconEyen:'icon-yanjing_xianshi_o',
-				accountNumber:'',  //用户登录账号
-				password:'',	   //用户登录密码	
-				toestText:'',
-				telPhone:'',
-				loginType:'',		//跳转类型
-				alertText:'',
-				listType: '',
-				listVal: '',
-				detilType:'',
-				id:'',			//商品ID
-				getOption:''	//页面传递参数
+				accountNumber:'',  //协销用户登录账号
+				password:'',	   //协销登录密码	
 			}
 		},
 		onLoad(option) {
@@ -57,14 +56,33 @@
 			
 		},
 		methods:{
-			...mapMutations(['login']),
+			...mapMutations(['login','logout']),
+			getCheekeyCode(){
+				authorize.getCode('weixin').then(wechatcode =>{
+					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+					SellerWxLogin({code:wechatcode}).then(response =>{
+						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')
+					}).catch(response =>{
+						this.logout()
+						uni.removeStorageSync('sessionid')
+						uni.setStorageSync('sessionid','JSESSIONID='+response.data)
+						this.$store.commit('updateStatus',response.data)
+					})
+				})
+			},	
 			confirmLogin(){
 				let params ={
-						mobileOrEmail:this.accountNumber,
-						password:this.password,
-						source:'www',
+						mobile:this.accountNumber,
+						password:this.password
 				}
-				organizationLogin(params).then(response =>{
+				SellerLogin(params).then(response =>{
+					console.log(response)
+					debugger
 					if(response.code == '0' ){
 						this.storeUpdataeStatus(response.data)
 						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
@@ -97,7 +115,14 @@
 			},
 		},
 		onShow() {
-		
+			//查看此微信用户是否已经授权过
+			authorize.getSetting().then(res =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+				if(res == 1){
+					this.getCheekeyCode()
+				}else{
+					this.$api.navigateTo('/pages/authorization/authorization?type=seller')
+				}
+			})		
 		}
 	}
 </script>

market/pages/user/user.vue

@@ -309,14 +309,15 @@
 		.cell-more{
 			float: right;
 			line-height: 80rpx;
-			font-size: $font-size-28;
+			font-size: $font-size-24;
 			color: $text-color;
-			padding-right: 40rpx;
+			padding-right: 30rpx;
 		}
 		.iconfont{
 			width: 30rpx;
 			height: 80rpx;
 			line-height: 80rpx;
+			font-size: $font-size-28;
 			text-align: center;
 			position: absolute;
 			right: 0;

pages.json

@@ -243,7 +243,8 @@
 				{
 					"path": "pages/login/login",
 					"style": {
-						"navigationBarTitleText": "登录"
+						"navigationBarTitleText": "登录",
+						"navigationStyle":"custom"
 					}
 				},
 				{
@@ -284,7 +285,7 @@
 					}
 				},
 				{
-					"path": "pages/order/order-immediately",
+					"path": "pages/cart/immediately",
 					"style": {
 						"navigationBarTitleText": "立即下单"
 					}

pages/authorization/authorization.vue

@@ -14,11 +14,12 @@
 	export default{
 		data() {
 			return{
-				
+				authorizeType:''
 			}
 		},
-		onLoad() {
-
+		onLoad(option) {
+			this.authorizeType = option.type
+			console.log(this.authorizeType)
 		},
 		methods:{
 			...mapMutations(['wxLogin']),
@@ -34,9 +35,13 @@
 				authorize.getCode('weixin').then(wechatcode =>{
 					wx.getUserInfo({
 						success: res => {
-							uni.switchTab({
-								url:'/pages/tabBar/home/home'
-							})						
+							if(this.authorizeType == 'seller'){
+								this.$api.navigateTo('/market/pages/login/login')
+							}else{
+								uni.switchTab({
+									url:'/pages/tabBar/home/home'
+								})						
+							}
 						}
 					});	
 				})

pages/login/apply.vue

@@ -687,7 +687,7 @@ import { mapMutations } from 'vuex';
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 0){
+				if(this.isOrganizationType == 1){
 					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
 					this.mentuzCampList.push(item)
 				}else{

pages/login/information.vue

@@ -703,7 +703,7 @@
 				return _ARRAY
 			},
 			addCustomItem(){
-				if(this.isOrganizationType == 0){
+				if(this.isOrganizationType == 1){
 					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
 					this.mentuzCampList.push(item)
 				}else{

pages/tabBar/home/home.vue

@@ -260,8 +260,7 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				this.$api.navigateTo('/market/pages/home/home')
-				// this.$util.msg("正在开发中，敬请期待~",2000);
+				this.$util.msg("正在开发中，敬请期待~",2000);
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',

pages/tabBar/user/user.vue

@@ -19,9 +19,13 @@
 			</view>
 			<!-- 订单 -->
 			<view class="user-order">
-				<view class="tab-title">我的订单</view>
+				<view class="tab-title" @click="navigator('/pages/user/order/order-list?state=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('/pages/user/order/order-list?state=1')" hover-class="common-hover"  :hover-stay-time="50">
+					<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/order1@3x.png" mode=""></image>
 							<text 	v-if="paymentCount >0" 
@@ -30,9 +34,9 @@
 									{{paymentCount == 99? '99+' : paymentCount}}
 							</text>
 						</view>
-						<text class="order-t">待付款</text>
+						<text class="order-t">待确认</text>
 					</view>
-					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=2')"  hover-class="common-hover" :hover-stay-time="50">
+					<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/order2@3x.png" mode=""></image>
 							<text  v-if="waitShipmentsCount >0" 
@@ -41,9 +45,9 @@
 								   {{waitShipmentsCount == 99? '99+' : waitShipmentsCount}}
 							</text>
 						</view>
-						<text class="order-t">待发货</text>
+						<text class="order-t">代付款</text>
 					</view>
-					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=3')" hover-class="common-hover"  :hover-stay-time="50">
+					<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/order3@3x.png" mode=""></image>
 							<text   v-if="shipmentsCount >0" 
@@ -52,9 +56,9 @@
 									{{shipmentsCount == 99? '99+' : shipmentsCount}}
 							</text>
 						</view>
-						<text class="order-t">已发货</text>
+						<text class="order-t">待发货</text>
 					</view>
-					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=4')" hover-class="common-hover"  :hover-stay-time="50">
+					<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/order4@3x.png" mode=""></image>
 							<text 	v-if="salesReturnCount >0" 
@@ -63,13 +67,13 @@
 									{{salesReturnCount == 99? '99+' : salesReturnCount}}
 							</text>
 						</view>
-						<text class="order-t">退货/款</text>
+						<text class="order-t">已发货</text>
 					</view>
-					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=0')" hover-class="common-hover"  :hover-stay-time="50">
+					<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/order5@3x.png" mode=""></image>
 						</view>
-						<text class="order-t">全部订单</text>
+						<text class="order-t">退货/款</text>
 					</view>
 				</view>
 			</view>
@@ -305,6 +309,29 @@
 		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;
+			text-align: center;
+			position: absolute;
+			right: 0;
+			top: 0;
+			display: block;
+			font-size: $font-size-28;
+		}
 	}
 	.order-section{
 		display: flex;

pages/user/order/order-list.vue

@@ -112,12 +112,12 @@
 		data() {
 			return {
 				orderTabBar: [{state: 0,text: '全部订单',orderList: []},
-							  {state: 1,text: '待付款',orderList: []},
-							  {state: 2,text: '待发货',orderList: []},
-							  {state: 3,text: '已发货',orderList: []},
-							  {state: 4,text: '退货/款',orderList: []},
+							  {state: 1,text: '待确认',orderList: []},
+							  {state: 2,text: '待付款',orderList: []},
+							  {state: 3,text: '待发货',orderList: []},
+							  {state: 4,text: '已发货',orderList: []},
+							  {state: 5,text: '退货/款',orderList: []},
 							 ],
-				tabbar: ["全部订单", "待付款", "待发货", "已发货", "退货/款"],
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo:  this.setSysteminfo(),		 //获取设备信息
 				nvabarData: {							 //顶部自定义导航

pages/user/setting/setting.vue

@@ -2,7 +2,7 @@
 	<view class="container clearfix">
 		<view class="foot-list">
 			<view class="list-cell-item">
-				<view class="list-cell" @click="navigator('/pages/user-module/password')" hover-class="cell-hover" :hover-stay-time="50">
+				<view class="list-cell" @click="navigator('/pages/login/password')" hover-class="cell-hover" :hover-stay-time="50">
 					<text class="cell-tit">修改密码</text>
 					<text class="cell-more iconfont icon-xiayibu"></text>
 				</view>