From 567277dc4cb672fd781ddcd273e60360eba7ec2e Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 29 Sep 2021 19:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/business/payment/money.vue          |  2 +-
 pages/discover/discoverdetails.vue        | 16 ++++++++--------
 pages/index/index/index.vue               |  8 ++++++--
 pages/order/newdetail/newdetail.vue       | 22 ++++++++++++++++++++++
 pages/user/my/center.vue                  |  9 +++++----
 pages/user/my/myEventRegistrationList.vue |  2 +-
 pages/user/my/myregister.vue              |  2 +-
 7 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/pages/business/payment/money.vue b/pages/business/payment/money.vue
index d11f221..ae25a7e 100644
--- a/pages/business/payment/money.vue
+++ b/pages/business/payment/money.vue
@@ -7,7 +7,7 @@
 				<view class="list money-list">
 					<view class="lf-flex">
 						<view class="symbol">￥</view>
-						<input class="input" type="number" v-model="money" />
+						<input class="input" v-model="money" />
 					</view>
 					<view class="clear" v-if="money.length" @click="money = ''">
 						<text class="lf-iconfont icon-cuo1"></text>
diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue
index c6db11b..816c9ad 100644
--- a/pages/discover/discoverdetails.vue
+++ b/pages/discover/discoverdetails.vue
@@ -54,7 +54,7 @@
 							<view class="lf-color-999 lf-font-24" v-if="commentitem.user.nick_name">{{commentitem.user.nick_name}}</view>
 							<view class="lf-color-999 lf-font-24" v-else>{{commentitem.user.mobile_replace}}</view>
 							<view>
-								<view class="lf-color-black lf-line-2" style="max-width:550rpx;">{{commentitem.content}}<text class="lf-color-999 lf-font-24 lf-m-l-10">{{commentitem.created_at}}</text></view>
+								<view class="lf-color-black" style="max-width:550rpx;">{{commentitem.content}}<text class="lf-color-999 lf-font-24 lf-m-l-10">{{commentitem.created_at}}</text></view>
 							</view>
 						</view>
 						<view class="lf-m-l-32" style="position: absolute;right:33rpx;">
@@ -110,17 +110,17 @@
 				<input class="rom-search" type="text" v-else @confirm="sendComment(discover_details.id)" :cursor-spacing="8" v-model="comment" placeholder="说点什么" />
 			</view>
 			<view class="lf-row-center">
-				<view class="lf-row-center lf-m-r-35" @click.stop="addLike(discover_details.id)">
-					<text class="lf-iconfont icon-xihuanlike lf-color-price" v-if="discover_details.is_like"></text>
-					<text class="lf-iconfont icon-xihuan" v-else></text>
+				<view class="lf-row-center lf-m-r-35" style="align-items: center;" @click.stop="addLike(discover_details.id)">
+					<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-36" v-if="discover_details.is_like"></text>
+					<text class="lf-iconfont icon-xihuan lf-font-36" v-else></text>
 					<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.likes_count}}</text>
 				</view>
-				<view class="lf-row-center lf-m-r-35">
-					<text class="lf-iconfont icon-chakan"></text>
+				<view class="lf-row-center lf-m-r-35" style="align-items: center;">
+					<text class="lf-iconfont icon-chakan lf-font-44"></text>
 					<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.view_count}}</text>
 				</view>
-				<view class="lf-row-center lf-m-r-35">
-					<text class="lf-iconfont icon-pinglun-"></text>
+				<view class="lf-row-center lf-m-r-35" style="align-items: center;">
+					<text class="lf-iconfont icon-pinglun- lf-font-36"></text>
 					<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.comments_count}}</text>
 				</view>
 			</view>
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 1107d99..dbc975b 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -317,7 +317,7 @@
 			<view class="fixed-cart" hover-class="lf-opacity" @click="$url('/pages/store/cart/cart')">
 				<text class="lf-iconfont icon-gouwulan icon-text"></text>
 				<text class="tips">购物车</text>
-				<view class="angle-mark">{{car_num}}</view>
+				<view class="angle-mark">{{car_num || 0}}</view>
 			</view>
 		</view>
 		<!-- ad广告弹出组件 TODO 暂时先注释 -->
@@ -556,7 +556,11 @@
 				    })
 				    .then(res => {
 				        if (res.data.code == 200) {
-				           this.car_num = res.data.data;
+				           if(res.data.data == null) {
+							   this.car_num = 0;
+						   }else {
+							   this.car_num = res.data.data;
+						   }
 				        } else {
 				            wx.showModal({
 				                content: '请下拉页面刷新重试',
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index f4a6278..974d7a6 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -146,6 +146,18 @@
 				<view style="width: 220rpx;"></view>
 				<view style="width: 220rpx;"></view>
 			</view>
+		</view>
+		<!-- 代付款 -->
+		<view class="order-btn" v-if="order_details.status == 1">
+			<view class="lf-font-28 lf-row-center lf-color-777">
+				待付款
+			</view>
+			<view class="lf-flex">
+				<view class="btn-gray lf-m-r-20">取消订单</view>
+				<view class="btn-red" @click="$url('/pages/order/cashier/cashier?amount='+ order_details.total_yuan+'&order_no='+order_details.order_no)">立即付款</view>
+			</view>
+			
+			
 		</view>
 		<!-- 待收货 -->
 		<view class="order-btn" v-if="order_details.status == 3">
@@ -286,6 +298,16 @@
 	}
 </style>
 <style lang="scss" scoped="scoped">
+	.btn-gray {
+		width: 220rpx;background: white;height: 90rpx;border-radius: 45rpx;border: 2rpx solid #999999;display: flex;align-items: center;justify-content: center;
+		color: #777777;
+		font-size: 28rpx;
+	}
+	.btn-red {
+		width: 220rpx;background: #F63434;height: 90rpx;border-radius: 45rpx;display: flex;align-items: center;justify-content: center;
+		color: white;
+		font-size: 28rpx;
+	}
 	.tips-waitconfirm {
 		width: 100%;
 		height: 113rpx;
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 44883cb..d24c042 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -107,6 +107,11 @@
 		},
 		data(){
 			return {
+				// {
+				// 	name: '在线客服',
+				// 	icon: 'icon-pinglun',
+				// 	path: '/pages/user/my/chatonline'
+				// },
 				nav_bg_color: 'transparent' ,// 导航背景颜色
 				order_tablist: [{
 					name: '待付款',
@@ -125,10 +130,6 @@
 					name: '会员服务',
 					icon: 'icon-huiyuan1',
 					path: '/pages/user/member/service'
-				},{
-					name: '在线客服',
-					icon: 'icon-pinglun',
-					path: '/pages/user/my/chatonline'
 				},{
 					name: '我的收藏',
 					icon: 'icon-shoucang',
diff --git a/pages/user/my/myEventRegistrationList.vue b/pages/user/my/myEventRegistrationList.vue
index c494354..c85de85 100644
--- a/pages/user/my/myEventRegistrationList.vue
+++ b/pages/user/my/myEventRegistrationList.vue
@@ -17,7 +17,7 @@
 								<view class="label" :class="'theme-'+ (index+1)" v-if="item.activity.is_expired==false">{{item.state}}</view>
 							</view>
 							<view class="info">
-								<view class="title">{{item.name}}</view>
+								<view class="title">{{item.activity.name}}</view>
 								<view class="date">{{item.created_at}}</view>
 							</view>
 						</view>
diff --git a/pages/user/my/myregister.vue b/pages/user/my/myregister.vue
index 78cb218..e5078e6 100644
--- a/pages/user/my/myregister.vue
+++ b/pages/user/my/myregister.vue
@@ -164,7 +164,7 @@
 		align-items: flex-end;
 		box-sizing: border-box;
 		padding: 60rpx 32rpx 110rpx;
-		color: #FFFFFF;
+		color: #222222 !important;
 		display: flex;
 		align-items: center;
 		justify-content: center;