From 5c5a0ab6bb5a26f1a97ad6a495ff42b2c25f016d Mon Sep 17 00:00:00 2001
From: longjieli <11918793+longjieli@user.noreply.gitee.com>
Date: Mon, 30 Dec 2024 19:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                  |  14 +-
 api/http.js                                 |  14 +-
 components/couponPopup/couponPopup.vue      |   7 +-
 components/product/productItem.vue          | 142 ++++++----
 components/user/couponList.vue              | 195 -------------
 pages.json                                  |   3 +
 pages/index/category.vue                    |  19 +-
 pages/index/center.vue                      |  16 +-
 pages/index/index.vue                       |   9 +-
 pages/index/order.vue                       | 126 ++++-----
 pages_order/auth/wxLogin.vue                |   4 +-
 pages_order/auth/wxUserInfo.vue             |   2 +-
 pages_order/mine/memberCenter.vue           |   2 +-
 pages_order/mine/moreCommodity.vue          |   2 +-
 pages_order/mine/partner.vue                |  12 +-
 pages_order/mine/recruit.vue                |   4 +-
 pages_order/mine/withdraw.vue               | 416 ++++++++++++++++------------
 pages_order/order/createOrder.vue           |   4 +-
 static/image/cart/1.png                     | Bin 1933 -> 0 bytes
 static/image/cart/2.png                     | Bin 5540 -> 0 bytes
 static/image/center/head-img.png            | Bin 2994 -> 2425 bytes
 uni_modules/uv-ui-tools/libs/css/color.scss |   2 +-
 22 files changed, 445 insertions(+), 548 deletions(-)
 delete mode 100644 components/user/couponList.vue
 delete mode 100644 static/image/cart/1.png
 delete mode 100644 static/image/cart/2.png

diff --git a/api/api.js b/api/api.js
index 349142f..caa54c6 100644
--- a/api/api.js
+++ b/api/api.js
@@ -46,13 +46,13 @@ export function api(key, data, callback, loadingTitle) {
 	}
 
 	//必须登录
-	if (req.auth) {
-		if (!uni.getStorageSync('token')) {
-			utils.toLogin()
-			console.error('需要登录')
-			return
-		}
-	}
+	// if (req.auth) {
+	// 	if (!uni.getStorageSync('token')) {
+	// 		utils.toLogin()
+	// 		console.error('需要登录')
+	// 		return
+	// 	}
+	// }
 	
 	// 接口防抖
 	if(req.debounce){
diff --git a/api/http.js b/api/http.js
index 8f2e8b8..1d37fa6 100644
--- a/api/http.js
+++ b/api/http.js
@@ -25,13 +25,13 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 				uni.hideLoading();
 			}
 			
-			if(res.statusCode == 401 || 
-			res.data.message == '操作失败，token非法无效!' || 
-			res.data.message == '操作失败，用户不存在!'){
-				uni.removeStorageSync('token')
-				console.error('登录过期');
-				utils.toLogin()
-			}
+			// if(res.statusCode == 401 || 
+			// res.data.message == '操作失败，token非法无效!' || 
+			// res.data.message == '操作失败，用户不存在!'){
+			// 	uni.removeStorageSync('token')
+			// 	console.error('登录过期');
+			// 	utils.toLogin()
+			// }
 			
 			if(res.statusCode == 200 && res.data.code != 200
 			&& res.data.code != 902){
diff --git a/components/couponPopup/couponPopup.vue b/components/couponPopup/couponPopup.vue
index 24f3913..ea0a3c2 100644
--- a/components/couponPopup/couponPopup.vue
+++ b/components/couponPopup/couponPopup.vue
@@ -19,7 +19,7 @@
 							class="register-success"></image>
 						<view class="shopping">（购物即可抵扣！）</view>
 					</view>
-					<image src="@/pages_order/static/coupon/examine.png" mode="widthFix" class="examine"></image>
+					<image @click="examineCoupon" src="@/pages_order/static/coupon/examine.png" mode="widthFix" class="examine"></image>
 				</view>
 			</view>
 		</uv-overlay>
@@ -36,6 +36,11 @@
 			//关闭新人优惠券活动
 			closeCouponPopup() {
 				this.show = false;
+			},
+			
+			//查看优惠券
+			examineCoupon() {
+				this.$emit("examine")
 			}
 		},
 		computed: {
diff --git a/components/product/productItem.vue b/components/product/productItem.vue
index 9d0f64e..0008a76 100644
--- a/components/product/productItem.vue
+++ b/components/product/productItem.vue
@@ -1,39 +1,49 @@
 <template>
-	<view class="item" @click="$emit('click')"
-	:style="{width}">
+	<view class="item" @click="$emit('click')">
+		<!-- 商品图片 -->
 		<view class="item-image">
 			<image :src="item.image &&
 			item.image.split(',')[0]" mode="aspectFill">
 			</image>
 		</view>
 
+		<!-- 商品信息 -->
 		<view class="info">
-			<view class="title"
-			:style="{width : titleWidth}">
+			<!-- 商品标题 -->
+			<view class="title">
 				{{ item.title }}
 			</view>
-			<view class="desc">
-				{{ item.sku }}
-			</view>
-			<view class="price"
-			v-if="[2].includes(item.type)">
-				<view class="">
-					会员价￥<text>{{ item.vipPrice }}</text>
+
+			<!-- 价格 -->
+			<view class="price">
+				<view class="money">
+					￥<text>{{ item.vipPrice }}/元每件</text>
 				</view>
-				<view class="">
-					零售价￥<text>{{ item.price }}</text>
+				<view class="price-imgs">
+					<image src="@/static/image/category/gold-card-price.png" mode="widthFix" class="price-img"></image>
+					<image v-if="false" src="@/static/image/category/silver-card-price.png" mode="widthFix"
+						class="price-img"></image>
+					<image v-if="false" src="@/static/image/category/diamond-price.png" mode="widthFix"
+						class="price-img"></image>
 				</view>
 			</view>
-			
-			<view class="price"
-			v-else>
-				<view class="">
-					价格￥<text>{{ item.price }}</text>
+
+			<!-- 销量 -->
+			<view class="sales-volume">
+				<view class="sales-volume-imgbox">
+					<image src="@/static/image/category/sales-volume-icon.png" mode="widthFix" class="sales-volume-img">
+					</image>
 				</view>
-				<view class="">
-					原价￥<text>{{ item.oldPrice }}</text>
+
+				<view class="sales-volume-number">
+					已售出32490+单
 				</view>
 			</view>
+
+			<!-- 购买按钮 -->
+			<view class="buy-btn">
+				购买
+			</view>
 		</view>
 	</view>
 </template>
@@ -43,13 +53,7 @@
 		props: {
 			item: {
 				default: {}
-			},
-			width : {
-				default : '100%',
-			},
-			titleWidth : {
-				default : '100px'
-			},
+			}
 		},
 		data() {
 			return {
@@ -64,6 +68,7 @@
 
 <style scoped lang="scss">
 	.item {
+		width: 100%;
 		padding: 10rpx 20rpx;
 		align-items: center;
 		margin-bottom: 20rpx;
@@ -71,11 +76,12 @@
 		box-sizing: border-box;
 		border-bottom: 1rpx solid #00000012;
 		background: white;
+		border-radius: 20rpx;
 
+		// 商品图片
 		.item-image {
-			width: 140rpx;
-			height: 140rpx;
-			flex-shrink: 0;
+			width: 180rpx;
+			height: 180rpx;
 
 			image {
 				height: 100%;
@@ -84,42 +90,74 @@
 			}
 		}
 
+		// 商品信息
 		.info {
 			padding: 20rpx;
 			color: #555;
-			flex: 1;
-			
+			width: calc(100% - 180rpx);
+			box-sizing: border-box;
+			overflow: hidden;
+
+			// 商品标题
 			.title {
-				width: 300rpx;
+				width: 100%;
 				font-size: 28rpx;
-				font-weight: 900;
-				overflow:hidden; //超出的文本隐藏
-				text-overflow:ellipsis; //溢出用省略号显示
-				white-space:nowrap; //溢出不换行
-			}
-
-			.desc {
-				font-size: 22rpx;
-				color: #777;
-				margin-top: 10rpx;
+				font-weight: bold;
+				overflow: hidden; //超出的文本隐藏
+				text-overflow: ellipsis; //溢出用省略号显示
+				// white-space: nowrap; //溢出不换行
 			}
 
+			// 价格
 			.price {
-				text-align: right;
+				display: flex;
+				align-items: center;
 				color: #f40;
 				font-size: 26rpx;
-				text{
+
+				.money {
 					font-size: 30rpx;
-					font-weight: 900;
 				}
-				&>view:nth-child(2){
-					font-size: 22rpx;
-					color: #777;
-					text{
-						font-size: 26rpx;
-						font-weight: 900;
+
+				.price-imgs {
+					display: flex;
+					flex-wrap: wrap;
+
+					.price-img {
+						width: 80rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+
+			// 销量
+			.sales-volume {
+				display: flex;
+				align-items: center;
+				flex-wrap: wrap;
+
+				.sales-volume-imgbox {
+					width: 20rpx;
+
+					.sales-volume-img {
+						width: 100%;
 					}
 				}
+
+				.sales-volume-number {
+					color: #B8B8B8;
+					font-size: 26rpx;
+					padding-left: 10rpx;
+				}
+			}
+
+			// 购买按钮
+			.buy-btn {
+				background: $uni-color;
+				color: white;
+				display: inline-block;
+				padding: 10rpx 20rpx;
+				border-radius: 10rpx;
 			}
 		}
 	}
diff --git a/components/user/couponList.vue b/components/user/couponList.vue
deleted file mode 100644
index 653e542..0000000
--- a/components/user/couponList.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-	<scroll-view 
-	scroll-y="true" 
-	:style="{height: height}"
-	@scrolltolower="loadMoreData">
-		<view class="list">
-			<view class="item"
-			v-for="(item,index) in list"
-			@click="select(item)"
-			:key="index">
-				
-				<view class="price">
-					<view class="num">
-						<view class="icon">
-							￥
-						</view>
-						{{ item.price }}
-					</view>
-					<view class="tiao">
-						{{ item.useType_dictText }}满{{ item.conditionPrice }}可用
-					</view>
-				</view>
-				<view class="date">
-					<view>
-						有效期{{ item.endTime || '不限' }}
-					</view>
-					<view>
-						{{ item.type_dictText }}使用
-					</view>
-				</view>
-				
-				<view class="status">
-					<!-- 已 使 用 -->
-					<!-- 立 即 使 用 -->
-					{{ item.status_dictText }}
-				</view>
-				
-				<view class="del"
-				v-if="isSelect(item)">
-					
-				</view>
-			</view>
-		</view>
-		
-		<uv-empty
-		v-if="list.length == 0"
-		text="空空如也"
-		textSize="30rpx"
-		iconSize="200rpx"
-		icon="list"></uv-empty>
-	</scroll-view>
-</template>
-
-<script>
-	import mixinList from '@/mixins/list.js'
-	export default {
-		name:"couponList",
-		mixins : [mixinList],
-		props : {
-			height : {
-				default : 'auto'
-				// default : 'calc(90vh - 180rpx)'
-			},
-			// 押金
-			depositPrice : {
-			},
-			washPrice: {//水洗费
-			},
-			rentPrice: {//租金
-			},
-		},
-		data() {
-			return {
-				mixinsListApi : 'couponPage'
-			};
-		},
-		methods : {
-			select(item){
-				if(this.isSelect(item)){
-					return
-				}
-				this.$emit('select', item)
-			},
-			isSelect(item){
-				
-				if(!this.depositPrice && !this.rentPrice && !this.washPrice){
-					return  false
-				}
-				
-				// 押金
-				if(this.depositPrice && 
-				item.useType == 0 && 
-				this.depositPrice >= item.conditionPrice){
-					return false
-				}
-				
-				// 租金
-				if(this.rentPrice && 
-				item.useType == 1 && 
-				this.rentPrice >= item.conditionPrice){
-					return false
-				}
-				
-				// 水洗
-				if(this.washPrice && 
-				item.useType == 2 && 
-				this.washPrice >= item.conditionPrice){
-					return false
-				}
-				
-				return  true
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-.list{
-	.item{
-		color: #4FD3BC;
-		position: relative;
-		width: calc(100% - 40rpx);
-		height: 220rpx;
-		background: url(../../static/image/coupon/c.png);
-		background-size: 100% 100%;
-		margin: 20rpx;
-		box-sizing: border-box;
-		padding: 30rpx;
-		.status{
-			position: absolute;
-			right: 20rpx;
-			top: 20rpx;
-			height: calc(100% - 40rpx);
-			width: 60rpx;
-			writing-mode:vertical-rl;
-			box-sizing: border-box;
-			padding: 20rpx;
-			background-color: #fff;
-			border-radius: 60rpx;
-			font-size: 26rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-		.price{
-			display: flex;
-			align-items: center;
-			.num{
-				color: #4FD3BC;
-				font-weight: 900;
-				font-size: 70rpx;
-				display: flex;
-				align-items: flex-end;
-				.icon{
-					color: #fff;
-					background-color: #4FD3BC;
-					width: 30rpx;
-					height: 30rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					font-size: 20rpx;
-					border-radius: 14rpx;
-					margin-bottom: 14rpx;
-					margin-right: 10rpx;
-				}
-			}
-			.tiao{
-				padding: 10rpx 20rpx;
-				background-color: #9ee3d1;
-				color: #25a28c;
-				font-size: 22rpx;
-				margin-left: 20rpx;
-				border-radius: 10rpx;
-			}
-		}
-		.date{
-			display: flex;
-			font-size: 24rpx;
-			view{
-				margin-right: 20rpx;
-			}
-		}
-	}
-	.del{
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background-color: #ffffff99;
-		z-index: 99;
-	}
-}
-</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index dc17df4..ce99883 100644
--- a/pages.json
+++ b/pages.json
@@ -128,6 +128,9 @@
 			},
 			{
 				"path": "mine/moreCommodity"
+			},
+			{
+				"path": "mine/coupon"
 			}
 		]
 	}],
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 34b543a..6be8330 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar title="商品列表" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="商品列表" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
 
 		<!-- 搜索栏 -->
 		<view class="search">
@@ -11,18 +11,13 @@
 
 		<!-- 分类商品列表 -->
 		<view class="category">
-			<uv-vtabs :list="category" keyName="title" :barItemBadgeStyle="{right:'20px',top:'12px'}" @change="change">
-				<uv-vtabs-item>
-					<!-- <view class="list">
+			<uv-vtabs :list="category" keyName="title" @change="change">
+				<view class="list">
+					<uv-vtabs-item>
 						<productItem v-for="(item, index) in list" :key="index" :item="item"
-							titleWidth="350rpx"
-							@click="$utils.navigateTo('/pages_order/product/productDetail?id=' + item.id)" />
-					</view> -->
-					<view class="list">
-						<productItem v-for="(item, index) in list" :key="index" :item="item" titleWidth="350rpx"
 							@click="$utils.navigateTo('/pages_order/mine/moreCommodity')" />
-					</view>
-				</uv-vtabs-item>
+					</uv-vtabs-item>
+				</view>
 			</uv-vtabs>
 		</view>
 
@@ -114,7 +109,7 @@
 		color: #333;
 
 		.list {
-			margin: 0 auto;
+			width: 100%;
 			padding: 0rpx 20rpx;
 			box-sizing: border-box;
 		}
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 4334858..007d31d 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-
-		<navbar title="个人中心" />
+		<!-- 导航栏 -->
+		<navbar title="个人中心" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
 
 		<!-- 头部 -->
 		<view class="head">
@@ -41,7 +41,7 @@
 		</view>
 
 		<!-- 会员卡片 -->
-		<view class="earnings">
+		<view @click="$utils.navigateTo({url : '/pages_order/mine/memberCenter' })" class="earnings">
 			<view v-if="index==1" v-for="(item,index) in memberList" :key="item.id" class="member-item">
 				<image :src="item.memberBg" mode="widthFix" class="member-image"></image>
 
@@ -129,7 +129,7 @@
 		<div v-if="showAdvertising" class="ad">
 			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="true" :interval="2000"
 				:duration="duration">
-				<swiper-item v-for="item in 10">
+				<swiper-item v-for="item in 10" :key="item">
 					<view class="swiper-main">
 						<view @click="closeAdvertising" class="close">
 							<image src="@/static/image/center/close.png" mode="widthFix" class="close-img"></image>
@@ -209,18 +209,20 @@
 		.head {
 			display: flex;
 			align-items: center;
-			padding: 110rpx 20rpx;
+			padding: 60rpx 20rpx 120rpx 20rpx;
 			background: $uni-color;
 
 			.headImage {
 				width: 130rpx;
 				height: 130rpx;
 				background-image: url(/static/image/center/head-img.png);
+				background-repeat: no-repeat;
+				background-position: 50%, 50%;
 				background-size: 100%;
 				overflow: hidden;
 				border-radius: 50%;
 				margin-right: 40rpx;
-				
+
 				image {
 					width: 100%;
 					height: 100%;
@@ -299,7 +301,7 @@
 		.earnings {
 			padding: 20rpx;
 			box-sizing: border-box;
-			margin-top: -20%;
+			margin-top: -22%;
 
 			.member-item {
 				position: relative;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9fb15c5..1661725 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -91,7 +91,7 @@
 		<tabber select="home" />
 		
 		<!-- 优惠券弹窗 -->
-		<couponPopup v-model="showCouponPopup"></couponPopup>
+		<couponPopup v-model="showCouponPopup" @examine="toCoupon"></couponPopup>
 	</view>
 </template>
 
@@ -240,6 +240,13 @@
 			scroll: function(e) {
 
 			},
+			
+			//跳转优惠券页面
+			toCoupon() {
+				uni.navigateTo({
+					url: "/pages_order/mine/withdraw"
+				})
+			}
 		},
 	}
 </script>
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 286c116..773e1b2 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -1,27 +1,18 @@
 <template>
 	<view class="page">
-		
-		<navbar
-		title="订单中心"
-		leftClick 
-		@leftClick="$utils.navigateBack"
-		/>
-		
-		<uv-tabs :list="tabs" 
-		:activeStyle="{color : '#E3441A', fontWeight : 600}"
-		lineColor="#E3441A"
-		lineHeight="8rpx"
-		lineWidth="50rpx"
-		:current="current"
-		:scrollable="false"
-		@click="clickTabs"></uv-tabs>
-		
+		<!-- 导航栏 -->
+		<navbar title="订单中心" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
+
+		<!-- 订单筛选 -->
+		<view class="tabs">
+			<uv-tabs :list="tabs" :activeStyle="{color : '#fff', fontWeight : 600}" lineColor="#fff"
+				:inactiveStyle="{color: 'rgba(255,255,255,.8)'}" lineHeight="8rpx" lineWidth="50rpx" :current="current"
+				:scrollable="false" @click="clickTabs"></uv-tabs>
+		</view>
+
 		<view class="list">
-			<view class="item" 
-			v-for="(item, index) in list"
-			@click="toOrderDetail(item.id)"
-			:key="index">
-	
+			<view class="item" v-for="(item, index) in list" @click="toOrderDetail(item.id)" :key="index">
+
 				<view class="top">
 					<view class="service">
 						<!-- <text>{{item.projectId_dictText}}</text>
@@ -31,16 +22,13 @@
 						<text> {{ tabs[Number(item.state) + 1].name }}</text>
 					</view>
 				</view>
-	
-				<view class="content"
-				:key="index"
-				v-for="(good, index) in item.commonOrderSkuList">
-	
+
+				<view class="content" :key="index" v-for="(good, index) in item.commonOrderSkuList">
+
 					<view class="left">
-						<image mode="aspectFill" 
-						:src="good.image && good.image.split(',')[0]"></image>
+						<image mode="aspectFill" :src="good.image && good.image.split(',')[0]"></image>
 					</view>
-	
+
 					<view class="right">
 						<view class="text-hidden-1">
 							商品：{{good.title}}
@@ -54,51 +42,49 @@
 						<!-- <view class="text-hidden-1">
 							总计时间：{{item.useTime}}分钟
 						</view> -->
-						
+
 					</view>
-	
+
 				</view>
-	
+
 				<view class="bottom">
 					<view class="price">
 						实付款：<text class="num">{{item.price}}元</text>
 					</view>
-					
+
 					<!-- <view class="b1">
 						查看物流
 					</view> -->
-					
-					<view @click.stop="toPayOrder(item)" class="b2" 
-					v-if="item.state == 0">
+
+					<view @click.stop="toPayOrder(item)" class="b2" v-if="item.state == 0">
 						立即付款
 					</view>
-					
-					<view class="b2"
-					@click.stop="confirmOrder(item)"
-					v-if="item.state == 2">
+
+					<view class="b2" @click.stop="confirmOrder(item)" v-if="item.state == 2">
 						确认收货
 					</view>
 				</view>
-	
+
 			</view>
 		</view>
-		
+
 		<tabber select="order" />
 	</view>
 </template>
 
 <script>
-	import { mapGetters } from 'vuex'
+	import {
+		mapGetters
+	} from 'vuex'
 	import mixinsList from '@/mixins/list.js'
 	import mixinsOrder from '@/mixins/order.js'
 	import tabber from '@/components/base/tabbar.vue'
 	export default {
-		mixins : [mixinsList, mixinsOrder],
-		components : {
+		mixins: [mixinsList, mixinsOrder],
+		components: {
 			tabber,
 		},
-		computed : {
-		},
+		computed: {},
 		data() {
 			return {
 				tabs: [{
@@ -117,19 +103,22 @@
 						name: '已完成'
 					}
 				],
-				current : 0,
-				mixinsListApi : 'getOrderPageList',
+				current: 0,
+				mixinsListApi: 'getOrderPageList',
 			}
 		},
 		onLoad(args) {
 			this.current = args.type || 0
-			this.clickTabs({index : this.current})
-		},
-		onShow() {
+			this.clickTabs({
+				index: this.current
+			})
 		},
+		onShow() {},
 		methods: {
 			//点击tab栏
-			clickTabs({index}) {
+			clickTabs({
+				index
+			}) {
 				console.log(index);
 				if (index == 0) {
 					delete this.queryParams.state
@@ -149,8 +138,12 @@
 </script>
 
 <style scoped lang="scss">
-	.page{
+	.page {}
+
+	.tabs {
+		background: $uni-color;
 	}
+
 	.list {
 		.item {
 			width: calc(100% - 40rpx);
@@ -159,37 +152,37 @@
 			box-sizing: border-box;
 			border-radius: 16rpx;
 			padding: 30rpx;
-	
+
 			.top {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
 				font-size: 30rpx;
-	
+
 				.service {}
-	
+
 				.status {
 					font-size: 26rpx;
 					font-weight: 600;
 				}
 			}
-	
+
 			.content {
 				display: flex;
 				margin: 10rpx 0;
-	
+
 				.left {
 					width: 150rpx;
 					height: 150rpx;
 					border-radius: 10rpx;
-	
+
 					image {
 						width: 150rpx;
 						height: 150rpx;
 						border-radius: 10rpx;
 					}
 				}
-	
+
 				.right {
 					width: calc(100% - 160rpx);
 					color: #777;
@@ -199,24 +192,27 @@
 					background-color: #F8F8F8;
 				}
 			}
-	
+
 			.bottom {
 				display: flex;
 				justify-content: space-between;
 				font-size: 25rpx;
+
 				.price {
 					font-weight: 900;
+
 					text {
 						color: #ff780099;
 						font-size: 30rpx;
 					}
 				}
+
 				.b1 {
 					border: 1px solid #777;
 					color: #777;
 					box-sizing: border-box;
 				}
-	
+
 				.b2 {
 					background: $uni-color;
 					color: #fff;
@@ -224,7 +220,7 @@
 					align-items: center;
 					justify-content: center;
 				}
-	
+
 				view {
 					margin: 12rpx;
 					border-radius: 28rpx;
@@ -234,4 +230,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index b647d19..ff2412a 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -3,6 +3,7 @@
 		<view class="logo">
 			<image :src="configList.logo_image" mode=""></image>
 		</view>
+		
 		<view class="title">
 			欢迎使用{{ configList.logo_name }}
 		</view>
@@ -22,8 +23,6 @@
 			取消登录
 		</view>
 		
-		
-		
 		<view class="config">
 			<uv-checkbox-group
 				v-model="checkboxValue"
@@ -31,7 +30,6 @@
 				<view class="content">
 					<view
 					style="display: flex;">
-						
 						<uv-checkbox
 							size="40rpx"
 							icon-size="30rpx"
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index 127369e..9e96057 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -4,7 +4,7 @@
 			<image :src="configList.logo_image" mode=""></image>
 		</view> -->
 		<view class="title">
-			特易招
+			陌美人
 		</view>
 		<view class="title">
 			申请获取你的头像、昵称
diff --git a/pages_order/mine/memberCenter.vue b/pages_order/mine/memberCenter.vue
index ccac3c3..66562eb 100644
--- a/pages_order/mine/memberCenter.vue
+++ b/pages_order/mine/memberCenter.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="member-center">
 		<!-- 导航栏 -->
-		<navbar title="会员中心" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="会员中心" leftClick @leftClick="$utils.navigateBack" bgColor="#fff" color="#000" />
 
 		<!-- 会员卡片 -->
 		<swiper :slides-per-view="3" :space-between="50" @swiper="onSwiper" @slideChange="onSlideChange">
diff --git a/pages_order/mine/moreCommodity.vue b/pages_order/mine/moreCommodity.vue
index 6098430..88b0dd9 100644
--- a/pages_order/mine/moreCommodity.vue
+++ b/pages_order/mine/moreCommodity.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="more-commodity">
 		<!-- 导航栏 -->
-		<navbar title="商品" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="商品" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
 
 		<view class="more-commodity-header">
 			<!-- 搜索栏 -->
diff --git a/pages_order/mine/partner.vue b/pages_order/mine/partner.vue
index 028cce8..4e4d7a0 100644
--- a/pages_order/mine/partner.vue
+++ b/pages_order/mine/partner.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="partner">
 		<!-- 导航栏 -->
-		<navbar title="合伙人" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="合伙人" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
 
 		<!-- 合伙人信息 -->
 		<view class="partner-info-bg">
@@ -37,7 +37,7 @@
 		</view>
 
 		<view class="tabs">
-			<uv-tabs :list="tabList" @click="click"></uv-tabs>
+			<uv-tabs :activeStyle="{ color : '#DC2828' }" lineColor="#DC2828" :list="tabList" @click="click"></uv-tabs>
 		</view>
 
 		<!-- 佣金列表 -->
@@ -102,7 +102,7 @@
 				border-radius: 20rpx;
 				box-sizing: border-box;
 				padding: 20rpx;
-				width: 90%;
+				width: calc(100% - 40rpx);
 				margin: 0rpx auto;
 
 				.profile-photo {
@@ -165,7 +165,7 @@
 								font-size: 45rpx;
 								color: $uni-color;
 								font-weight: bold;
-								
+
 								.unit {
 									font-size: 32rpx;
 								}
@@ -230,14 +230,14 @@
 						width: calc(100% - 100rpx);
 						padding: 0rpx 20rpx;
 						box-sizing: border-box;
-						
+
 						.name {
 							font-size: 32rpx;
 							white-space: nowrap;
 							overflow: hidden;
 							text-overflow: ellipsis;
 						}
-						
+
 						.time {
 							color: #999999;
 							font-size: 26rpx;
diff --git a/pages_order/mine/recruit.vue b/pages_order/mine/recruit.vue
index fc334dd..70f913b 100644
--- a/pages_order/mine/recruit.vue
+++ b/pages_order/mine/recruit.vue
@@ -1,8 +1,8 @@
-<!-- 合伙人招募令页面 -->
+<!-- 合伙人页面 -->
 <template>
 	<view class="recruit">
 		<!-- 导航栏 -->
-		<navbar title="合伙人" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="合伙人" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
 
 		<view class="b-relative" style="width: 710rpx;margin: 20rpx;">
 			<image src="@/pages_order/static/recruit/bg.png" style="width: 710rpx;height: 310rpx;"></image>
diff --git a/pages_order/mine/withdraw.vue b/pages_order/mine/withdraw.vue
index d8f8133..7c4d575 100644
--- a/pages_order/mine/withdraw.vue
+++ b/pages_order/mine/withdraw.vue
@@ -1,236 +1,284 @@
 <template>
 	<view class="page">
-		<navbar title="提现" 
-		bgColor="#A3D250"
-		color="#fff"
-		leftClick 
-		@leftClick="$utils.navigateBack" />
-		
-		<view class="bg"/>
-		
-		<view class="price">
-			<!-- <view class="title">
-				请输入提现金额（元）
-			</view> -->
-			<view class="input-box">
-				<view class="input">
-					<input type="number" v-model="form.money"
-					placeholder="请输入提现金额"/>
-				</view>
-				<view class=""
-				@click="selectAll">
-					全部提现
-				</view>
+		<!-- 导航栏 -->
+		<navbar title="提现" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
+
+		<!-- 佣金信息 -->
+		<view class="b-relative center font-m">
+			<image src="@/pages_order/static/withdraw/cz.png" />
+
+			<view class="user-money">
+				<view class="title">总佣金</view>
+				<view class="money">999999元</view>
 			</view>
-			<view class="input-box">
-				<view class="input">
-					<input type="text" v-model="form.bankName"
-					placeholder="请输入开户行"/>
+
+			<view class="operation">
+				<view class="operation-item">
+					余额记录
 				</view>
-			</view>
-			<view class="input-box">
-				<view class="input">
-					<input type="text" v-model="form.bankNo"
-					placeholder="请输入银行卡号"/>
+				|
+				<view class="operation-item">
+					提现记录
+				</view>
+				|
+				<view class="operation-item">
+					佣金记录
 				</view>
-			</view>
-			<view class="num">
-				可提现金额：{{ riceInfo.canWithdraw || 0 }}
 			</view>
 		</view>
-		
-		<view class="cell">
-			<view class="cell-top">提现说明</view>
-			<view style="padding: 0 20rpx;">
-				<uv-parse :content="configList.withdrawal_instructions"></uv-parse>
+
+		<!-- 我要提现 -->
+		<view class="from-body">
+			<view>我要提现</view>
+
+			<view class="money">
+				<van-cell-group inset>
+					<van-field type="number" v-model="form.price" placeholder="请输入提现金额"
+						style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" />
+					<van-field v-model="form.bank" placeholder="请输入开户行"
+						style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" />
+					<van-field v-model="form.card" placeholder="请输入卡号"
+						style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" />
+				</van-cell-group>
 			</view>
+
+			<view v-html="withdrawalStatement" class="withdrawal-statement"></view>
 		</view>
-		
-		<view class="uni-color-btn"
-		@click="submit">
-			提现
-		</view>
-		
-		<view class="cell">
-			<view class="cell-top">提现记录</view>
-			<view class="cell-box" 
-			:key="index"
-			v-for="(item,index) in list">
-				<uv-cell-group>
-					<uv-cell 
-					:title="item.title" 
-					:label="item.createTime" 
-					:center="true">
-						<template #value>
-							<view class="cell-text">
-								
-								<view class="price-text"
-								v-if="item.type">{{ type[item.type] }}{{ item.money }}</view>
-								
-								<view class="price-text add"
-								v-else>{{ type[item.type] }}{{ item.money }}</view>
-								
-								<view class="tips">{{ state[item.state] }}</view>
-							</view>
-						</template>
-					</uv-cell>
-				</uv-cell-group>
+
+		<view class="recharge">
+			<view @click="withdraw" class="btn">
+				立即提现
 			</view>
 		</view>
-		
 	</view>
 </template>
 
 <script>
 	import mixinsList from '@/mixins/list.js'
-	import { mapState } from 'vuex'
+	import {
+		mapState
+	} from 'vuex'
 	export default {
-		mixins : [mixinsList],
+		mixins: [mixinsList],
 		data() {
 			return {
-				mixinsListApi : 'getWaterPageList',
-				list : [],
-				type : ['+', '-'],
-				state : ['未到账', '已到账'],
-				form : {
-					money : '',
-					bankNo : '',
-					bankName : '',
+				mixinsListApi: 'getWaterPageList',
+				list: [],
+				type: ['+', '-'],
+				state: ['未到账', '已到账'],
+				form: {
+					money: '',
+					bankNo: '',
+					bankName: '',
 				},
 			}
 		},
 		computed: {
 			...mapState(['userInfo', 'riceInfo']),
 		},
+		data() {
+			return {
+				withdrawalStatement: '', //充值说明
+				form: {
+					type: 1,
+					price: undefined,
+					bank: '',
+					card: ''
+				},
+			}
+		},
 		onShow() {
-			this.$store.commit('getUserInfo')
-			this.$store.commit('getRiceInfo')
+			this.getConfig()
+			this.getUserInfo()
+			this.getTenRealName()
 		},
 		methods: {
-			selectAll(){
-				this.form.money = this.riceInfo.canWithdraw
+
+			getConfig() { //获取配置信息
+				this.$api('getConfig', {}, res => {
+					if (res.code == 200) {
+						res.result.forEach(item => {
+							if (item.keyValue === 'withdraw') {
+								this.withdrawalStatement = item.content
+							}
+						})
+					}
+				})
 			},
-			submit(){
-					
-				if(this.$utils.verificationAll(this.form, {
-					money : '请输入金额',
-					bankName : '请输入开户行',
-					bankNo : 'bankNo',
-				})){
-					return
-				}
-				
-				if(this.form.money <= 0){
-					uni.showToast({
-						title: '输入金额必须大于0',
+
+			withdraw() { //立即提现
+				let isOk = this.parameterVerification();
+				if (isOk && !isOk.auth) {
+					return uni.showToast({
+						title: isOk.title,
 						icon: 'none'
 					})
-					return
 				}
-				
-				this.$api('withdraw', this.form, res => {
-					if(res.code == 200){
+				this.$api('recharge', this.form, res => {
+					if (res.code == 200) {
 						uni.showToast({
 							title: '提现成功',
-							icon : 'none'
+							icon: 'none'
 						})
-						this.form.money = ''
-						this.$store.commit('getUserInfo')
-						this.$store.commit('getRiceInfo')
-						this.getData()
+						this.getUserInfo()
 					}
 				})
 			},
-		},
+
+			getTenRealName() { //获取技师实名认证
+				this.$api('getTenRealName', {}, res => {
+					if (res.code == 200) {
+						let result = res.result;
+						if (result && result.bank && result.card) {
+							this.form.bank = result.bank
+							this.form.card = result.card
+						}
+					}
+				})
+			},
+
+			parameterVerification() { //验证用户参数合法性
+				let {
+					price,
+					bank,
+					card
+				} = this.form
+				if (!price) {
+					return {
+						title: '请填写提现金额',
+						auth: false
+					}
+				} else if (price <= 0) {
+					return {
+						title: '提现金额必须大于0',
+						auth: false
+					}
+				} else if (price > this.userInfo.price) {
+					return {
+						title: '提现金额大于余额',
+						auth: false
+					}
+				} else if (bank.trim() == '') {
+					return {
+						title: '请填写开户行',
+						auth: false
+					}
+				} else if (card.trim() == '') {
+					return {
+						title: '请填写卡号',
+						auth: false
+					}
+				}
+				return {
+					title: '验证通过',
+					auth: true
+				}
+			}
+		}
 	}
 </script>
 
 <style scoped lang="scss">
-.page{
-	.bg{
-		background-color: $uni-color;
-		height: 640rpx;
-		position: absolute;
-		left: 0;
-		width: 100%;
-		z-index: -1;
-		border-bottom-left-radius: 30rpx;
-		border-bottom-right-radius: 30rpx;
-	}
-	
-	.price{
-		color: #FFFFFF;
-		padding: 40rpx;
-		.title{
-			color: #eee;
-			font-size: 28rpx;
+	.page {
+
+		// 佣金信息
+		.center {
+			position: relative;
+			width: 710rpx;
+			height: 316rpx;
+			margin: 20rpx auto;
 		}
-		.input-box{
-			background-color: #FFFFFF;
-			color: $uni-color;
+
+		.center image {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 710rpx;
+			height: 316rpx;
+			border-radius: 12rpx;
+		}
+
+		.center .user-money {
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			z-index: 9;
+			color: white;
+			padding-left: 50rpx;
+			box-sizing: border-box;
+
+			.title {
+				font-size: 36rpx;
+			}
+
+			.money {
+				font-size: 40rpx;
+			}
+		}
+
+		.operation {
+			position: absolute;
+			bottom: 20rpx;
+			left: 0rpx;
+			width: 100%;
 			display: flex;
 			justify-content: center;
-			border-radius: 30rpx;
-			align-items: center;
-			padding: 10rpx;
-			margin: 20rpx 0;
-			.input{
-				color: #000;
-				// font-size: 40rpx;
-				// font-weight: 900;
-				display: flex;
-				flex: 1;
-				input{
-					flex: 1;
-					padding: 14rpx 20rpx;
-				}
+			color: white;
+			
+			.operation-item {
+				margin: 0rpx 20rpx;
 			}
 		}
-		.num{
-			font-size: 30rpx;
-			font-weight: 900;
-			margin-top: 10rpx;
+
+		// 我要提现
+		.from-body {
+			padding: 40rpx 20rpx;
+			font-size: 28rpx;
+			text-align: left;
+			color: #333333;
 		}
-	}
-	
-	.cell {
-		margin: 20rpx;
-		background-color: #FFFFFF;
-		border-radius: 16rpx;
-	
-	
-		.cell-top {
-			padding: 40rpx 34rpx;
-			color: #474747;
-			font-size: 34rpx;
-			font-weight: 600;
-			position: relative;
-			&::after{
-				content: '';
-				display: block;
-				position: absolute;
-				left: 55rpx;
-				bottom: 38rpx;
-				height: 10rpx;
-				width: 120rpx;
-				background: linear-gradient(to right, #fff, $uni-color);
-			}
+
+		.money {
+			margin: 20rpx 0rpx;
 		}
-		.cell-text{
-			text-align: right;
-			.price-text{
-				font-size: 32rpx;
-				font-weight: 900;
-			}
-			.add{
-				color: #f40;
-			}
-			.tips{
-				font-size: 22rpx;
-				color: #aaa;
-				margin-top: 10rpx;
+
+		.money .van-cell-group--inset {
+			margin: 0;
+		}
+
+		.money .van-field {
+			padding: auto 0rpx;
+			margin-bottom: 30rpx !important;
+		}
+
+		.recharge {
+			position: fixed;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			left: 0;
+			bottom: 0;
+			width: 750rpx;
+			height: 100rpx;
+			background: white;
+		}
+
+		.recharge .btn {
+			width: 85%;
+			height: 80rpx;
+			border-radius: 40rpx;
+			color: white;
+			text-align: center;
+			line-height: 80rpx;
+			font-size: 28rpx;
+			background: $uni-color;
+		}
+
+		@media all and (min-width: 961px) {
+			.recharge {
+				left: 50% !important;
+				transform: translateX(-50%);
 			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 66525ce..dc11270 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar title="确认订单" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="确认订单" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
 
 		<view class="bac"></view>
 
@@ -30,7 +30,7 @@
 			</view>
 
 			<!-- 地址 -->
-			<view class="cell-item">
+			<view @click="openAddress" class="cell-item">
 				<view class="cell-item-left">
 					<image src="@/pages_order/static/createOrder/address.png" mode="widthFix" class="cell-icon"></image>
 					<view class="user-name">李满和</view>
diff --git a/static/image/cart/1.png b/static/image/cart/1.png
deleted file mode 100644
index 9807f3469590d15ab9d9e6e97189899446c10988..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1933
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
TDoWti00000NkvXXu0mjf!F8`Q

diff --git a/static/image/cart/2.png b/static/image/cart/2.png
deleted file mode 100644
index 64b1c45f7b04ddc6b508641919612f8de7fcc03e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5540
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

diff --git a/static/image/center/head-img.png b/static/image/center/head-img.png
index fc0ad418081098fc4a2c899d824f973a858ce2f3..efbe0af28aacc9f98f0e66c451ae979992770b27 100644
GIT binary patch
delta 2402
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
Upa6AykN^Mx07*qoM6N<$f@UL`*#H0l

delta 2976
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
WVnFPWNN0-x0000<MNUMnLSTXvgUn$7

diff --git a/uni_modules/uv-ui-tools/libs/css/color.scss b/uni_modules/uv-ui-tools/libs/css/color.scss
index ce65743..e7d58aa 100644
--- a/uni_modules/uv-ui-tools/libs/css/color.scss
+++ b/uni_modules/uv-ui-tools/libs/css/color.scss
@@ -6,7 +6,7 @@ $uv-border-color: #dadbde !default;
 $uv-bg-color: #f3f4f6 !default;
 $uv-disabled-color: #c8c9cc !default;
 
-$uv-primary: #3c9cff !default;
+$uv-primary: #E3441A !default;
 $uv-primary-dark: #398ade !default;
 $uv-primary-disabled: #9acafc !default;
 $uv-primary-light: #ecf5ff !default;