浏览代码

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

chenrui 4 年之前
父节点
当前提交
853f3e40ab

+ 8 - 0
api/user.js

@@ -49,4 +49,12 @@ export const sellerFindByPartnerNo = params => {
     url: url,
     url: url,
     method: 'get'
     method: 'get'
   })
   })
+}
+// 手机号登录 校验用户账号状态
+export const checkCustomerState = params => { 
+  let url = `checkCustomerState/${params.phone}`
+  return axios.request({
+    url: url,
+    method: 'get'
+  })
 }
 }

+ 16 - 3
components/uni-cart-fix/uni-cart-fix.vue

@@ -6,6 +6,12 @@
 </template>
 </template>
 	<script>
 	<script>
 		export default {
 		export default {
+			props:{
+				closeCurPage:{
+					type: Boolean,
+					default: false
+				}
+			},
 			computed: {
 			computed: {
 				count() {
 				count() {
 					let arr = this.$store.state.vuex_cartList || []
 					let arr = this.$store.state.vuex_cartList || []
@@ -18,10 +24,17 @@
 			},
 			},
 			methods: {
 			methods: {
 				toCart() {
 				toCart() {
+					let _this = this
 					this.$bindClick(function(){
 					this.$bindClick(function(){
-						uni.navigateTo({
-							url:"/pages/cart/cart"
-						})
+						if(_this.closeCurPage){
+							uni.redirectTo({
+								url:"/pages/cart/cart"
+							})
+						}else{
+							uni.navigateTo({
+								url:"/pages/cart/cart"
+							})
+						}
 					})
 					})
 				}
 				}
 			},
 			},

+ 2 - 2
components/uni-coods/uni-coods.vue

@@ -2,8 +2,8 @@
 	<view class="goods-list">
 	<view class="goods-list">
 		<view class="goods-item" v-for="item in list" :key="item.id">
 		<view class="goods-item" v-for="item in list" :key="item.id">
 			<view class="goods-imgs"  @click="toDetail(item)">
 			<view class="goods-imgs"  @click="toDetail(item)">
-				<view v-if="item.inventoryQty == 0" class="goods-staus">已售罄</view>
-				<view v-if="item.delFlage == 0 || item.state == 0" class="goods-staus">已失效</view>
+				<view v-if="item.inventoryQty == 0&&item.state == 1" class="goods-staus">已售罄</view>
+				<view v-if="item.state == 0" class="goods-staus">已下架</view>
 				<u-lazy-load 
 				<u-lazy-load 
 				img-mode="scaleToFill" 
 				img-mode="scaleToFill" 
 				:height="imgHeight" 
 				:height="imgHeight" 

+ 7 - 5
components/uni-numbers-box/uni-numbers-box.vue

@@ -114,19 +114,19 @@
 	};
 	};
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-	$box-height: 34px;
+	$box-height: 30px;
 	/* #ifdef APP-NVUE */
 	/* #ifdef APP-NVUE */
-	$box-line-height: 34px;
+	$box-line-height: 30px;
 	/* #endif */
 	/* #endif */
 	$box-line-height: 26px;
 	$box-line-height: 26px;
-	$box-width: 35px;
+	$box-width: 30px;
 
 
 	.uni-numbox {
 	.uni-numbox {
 		/* #ifndef APP-NVUE */
 		/* #ifndef APP-NVUE */
 		display: flex;
 		display: flex;
 		/* #endif */
 		/* #endif */
 		flex-direction: row;
 		flex-direction: row;
-		width: 120px;
+		width: 100px;
 	}
 	}
 
 
 	.uni-numbox__value {
 	.uni-numbox__value {
@@ -151,6 +151,7 @@
 		font-size: 20px;
 		font-size: 20px;
 		color: $uni-text-color;
 		color: $uni-text-color;
 		background-color: $uni-bg-color-grey;
 		background-color: $uni-bg-color-grey;
+		border-radius: $box-width;
 	}
 	}
 
 
 	.uni-numbox__plus {
 	.uni-numbox__plus {
@@ -164,10 +165,11 @@
 		height: $box-height;
 		height: $box-height;
 		line-height: $box-height;
 		line-height: $box-height;
 		background-color: $uni-bg-color-grey;
 		background-color: $uni-bg-color-grey;
+		border-radius: $box-width;
 	}
 	}
 
 
 	.uni-numbox--text {
 	.uni-numbox--text {
-		font-size: 40rpx;
+		font-size: 36rpx;
 		color: $uni-text-color;
 		color: $uni-text-color;
 	}
 	}
 
 

+ 0 - 1
pages.json

@@ -127,7 +127,6 @@
                 "navigationBarTitleText": "购物车",
                 "navigationBarTitleText": "购物车",
                 "enablePullDownRefresh": false
                 "enablePullDownRefresh": false
             }
             }
-            
         }
         }
 		,{
 		,{
 		    "path" : "pages/toOrder/index",
 		    "path" : "pages/toOrder/index",

+ 47 - 18
pages/cart/cart.vue

@@ -42,8 +42,9 @@
 						</view>
 						</view>
 						<view class="goods-info">
 						<view class="goods-info">
 							<view class="goods-imgs">
 							<view class="goods-imgs">
-								<view v-if="good.goods.inventoryQty==0||good.goods.state == 0||good.goods.delFlage == 0" class="goods-staus">
-									<text>已失效</text>
+								<view v-if="good.goods.inventoryQty==0||good.goods.state == 0" class="goods-staus">
+									<text v-if="good.goods.state == 0">已下架</text>
+									<text v-if="good.goods.state == 1&&good.goods.inventoryQty==0">已售罄</text>
 								</view>
 								</view>
 								<u-image border-radius="12" width="158rpx" height="140rpx" :src="good.goods.homeImage+'?x-oss-process=image/resize,m_pad,h_140,w_158,color_ffffff'"></u-image>
 								<u-image border-radius="12" width="158rpx" height="140rpx" :src="good.goods.homeImage+'?x-oss-process=image/resize,m_pad,h_140,w_158,color_ffffff'"></u-image>
 							</view>
 							</view>
@@ -64,6 +65,11 @@
 							</view>
 							</view>
 						</view>
 						</view>
 					</view>
 					</view>
+					<!-- 小计 -->
+					<view class="goods-class-heji">
+						<view>合计:<text>{{item.total}}</text></view>
+						<image mode="scaleToFill" style="width: 30rpx;height: 30rpx;"src="/static/ledou.png"></image>
+					</view>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="noData" v-if="!loading&&cartList.length==0">
 			<view class="noData" v-if="!loading&&cartList.length==0">
@@ -86,7 +92,8 @@
 			</view>
 			</view>
 			<view v-if="!isEdit">
 			<view v-if="!isEdit">
 				<view class="heji">
 				<view class="heji">
-					<view>总计:<text>{{totalPrice}}</text></view>
+					<view>总计:</view>
+					<text>{{totalPrice}}</text>
 					<u-image mode="scaleToFill" width="35rpx" height="35rpx" src="/static/ledou.png"></u-image>
 					<u-image mode="scaleToFill" width="35rpx" height="35rpx" src="/static/ledou.png"></u-image>
 				</view>
 				</view>
 				<u-button size="mini" :custom-style="toOrderButton" type="error" @click="toOrder">立即下单</u-button>
 				<u-button size="mini" :custom-style="toOrderButton" type="error" @click="toOrder">立即下单</u-button>
@@ -97,7 +104,6 @@
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
-
 <script>
 <script>
 	export default {
 	export default {
 		data() {
 		data() {
@@ -115,6 +121,9 @@
 			};
 			};
 		},
 		},
 		computed: {
 		computed: {
+			userData(){
+				return this.$store.state.vuex_userData
+			},
 			// 总数
 			// 总数
 			count() {
 			count() {
 				let arr = this.cartList
 				let arr = this.cartList
@@ -137,15 +146,21 @@
 				let arr = this.cartList
 				let arr = this.cartList
 				let total = 0
 				let total = 0
 				arr.map(item=>{
 				arr.map(item=>{
+					let xj = 0
 					item.shoppingCartGoodsList.map(a =>{
 					item.shoppingCartGoodsList.map(a =>{
 						if(a.checked){
 						if(a.checked){
 							total = total + a.buyQty * a.goods.sellGold
 							total = total + a.buyQty * a.goods.sellGold
+							xj = xj + a.buyQty * a.goods.sellGold
 						}
 						}
 					})
 					})
+					item.total = xj
 				})
 				})
 				return total
 				return total
 			},
 			},
 		},
 		},
+		onUnload() {
+			uni.$off('getCarListSuccess')
+		},
 		onLoad() {
 		onLoad() {
 			this.loading = true
 			this.loading = true
 			uni.$emit('getCartList')
 			uni.$emit('getCartList')
@@ -159,8 +174,6 @@
 				}
 				}
 			})
 			})
 		},
 		},
-		onShow() {
-		},
 		methods: {
 		methods: {
 			toBuy(){
 			toBuy(){
 				uni.switchTab({
 				uni.switchTab({
@@ -277,15 +290,21 @@
 			// 立即下单
 			// 立即下单
 			toOrder(){
 			toOrder(){
 				let goods = this.getCheckGoods(1)
 				let goods = this.getCheckGoods(1)
-				console.log(goods)
-				if(goods.length){
-					this.$u.vuex("vuex_toOrderList",goods)
-					uni.redirectTo({
-						url:"/pages/toOrder/index"
-					})
+				if(this.userData.currentGold >= this.totalPrice){
+					if(goods.length){
+						this.$u.vuex("vuex_toOrderList",goods)
+						uni.redirectTo({
+							url:"/pages/toOrder/index"
+						})
+					}else{
+						uni.showToast({
+							title:"请选择商品",
+							icon:"none"
+						})
+					}
 				}else{
 				}else{
 					uni.showToast({
 					uni.showToast({
-						title:"请选择商品",
+						title:"你的乐豆余额不足",
 						icon:"none"
 						icon:"none"
 					})
 					})
 				}
 				}
@@ -461,6 +480,16 @@ page{
 				}
 				}
 			}
 			}
 		}
 		}
+		.goods-class-heji{
+			padding: 20upx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			font-size: 24rpx;
+			text{
+				color: red;
+			}
+		}
 	}
 	}
 	.cart-submit{
 	.cart-submit{
 		padding: 20upx;
 		padding: 20upx;
@@ -478,17 +507,17 @@ page{
 			}
 			}
 			&:last-child{
 			&:last-child{
 				font-size: 26upx;
 				font-size: 26upx;
-				text{
-					color: red;
-					font-size: 40upx;
-				}
 				> view{
 				> view{
-					padding-right: 50upx;
+					padding-right: 30upx;
 				}
 				}
 				.heji{
 				.heji{
 					display: flex;
 					display: flex;
 					align-items: center;
 					align-items: center;
 					font-weight: bold;
 					font-weight: bold;
+					text{
+						color: red;
+						font-size: 40upx;
+					}
 				}
 				}
 			}
 			}
 		}
 		}

+ 1 - 1
pages/goods/goods.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<view class="content">
 	<view class="content">
-		<view class="info">该类商品需购满{{goldLimit}}乐豆才能下单哦!</view>
+		<view v-if="goldLimit>0" class="info">该类商品需购满{{goldLimit}}乐豆才能下单哦!</view>
 		<view v-if="goodsList.length">
 		<view v-if="goodsList.length">
 			<uni-coods :list="goodsList"></uni-coods>
 			<uni-coods :list="goodsList"></uni-coods>
 			<view class="loadmore"><u-loadmore @loadmore="loadmore" :status="status" /></view>
 			<view class="loadmore"><u-loadmore @loadmore="loadmore" :status="status" /></view>

+ 2 - 2
pages/goods/goodsDetail.vue

@@ -22,7 +22,7 @@
 						<u-number-box :max="goodContent.inventoryQty" v-model="nums"></u-number-box>
 						<u-number-box :max="goodContent.inventoryQty" v-model="nums"></u-number-box>
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="goods-goldLimit">
+				<view v-if="goldLimit>0" class="goods-goldLimit">
 					此商品需要满<text>{{goldLimit}}</text>乐豆才可购买
 					此商品需要满<text>{{goldLimit}}</text>乐豆才可购买
 				</view>
 				</view>
 			</view>
 			</view>
@@ -52,7 +52,7 @@
 			<view><u-button :custom-style="toOrderButton" type="error" @click="toOrder()">立即下单</u-button></view>
 			<view><u-button :custom-style="toOrderButton" type="error" @click="toOrder()">立即下单</u-button></view>
 		</view>
 		</view>
 		<!-- 购物车 -->
 		<!-- 购物车 -->
-		<uni-cart-fix></uni-cart-fix>
+		<uni-cart-fix :closeCurPage="true"></uni-cart-fix>
 	</view>
 	</view>
 </template>
 </template>
 
 

+ 1 - 0
pages/index/index.vue

@@ -87,6 +87,7 @@
 			this.getCartList()
 			this.getCartList()
 			// 刷新购物车列表
 			// 刷新购物车列表
 			uni.$on("getCartList",item =>{
 			uni.$on("getCartList",item =>{
+				console.log('getCartList11112221')
 				this.getCartList()
 				this.getCartList()
 			})
 			})
 			// 加入购物车
 			// 加入购物车

+ 14 - 4
pages/login/phoneLogin.vue

@@ -26,7 +26,7 @@
 	import { isvalidPhone } from '@/libs/validate.js'
 	import { isvalidPhone } from '@/libs/validate.js'
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import popupCon from '@/components/uni-popup/popup-con.vue'
 	import popupCon from '@/components/uni-popup/popup-con.vue'
-	import { loginPhone, sendVerifyCode } from '@/api/user.js'
+	import { loginPhone, sendVerifyCode, checkCustomerState } from '@/api/user.js'
 	export default{
 	export default{
 		components: {
 		components: {
 			uniPopup,
 			uniPopup,
@@ -107,9 +107,19 @@
 						uni.showToast({icon: 'none',title: '请输入正确的手机号码'})
 						uni.showToast({icon: 'none',title: '请输入正确的手机号码'})
 						return
 						return
 					}else{
 					}else{
-						this.retsetCode()
-						//  图文验证码
-						this.$refs.imageTxtPopup.open()
+						// 先校验手机号用户是否禁用
+						checkCustomerState({phone:this.form.phone}).then(res=>{
+							if(res.status == 200) {
+								this.retsetCode()
+								//  图文验证码
+								this.$refs.imageTxtPopup.open()
+							} else {
+								uni.showToast({
+									title: res.message,
+									icon: 'none'
+								})
+							}
+						})
 					}
 					}
 				}else{
 				}else{
 					uni.showToast({icon: 'none',title: '请先输入手机号'})
 					uni.showToast({icon: 'none',title: '请先输入手机号'})

+ 29 - 7
pages/order/order.vue

@@ -21,7 +21,10 @@
 								<view>
 								<view>
 									<view class="ellipsis-two">{{row.goodsName}}</view>
 									<view class="ellipsis-two">{{row.goodsName}}</view>
 									<view class="bundle-num">
 									<view class="bundle-num">
-										<view><text class="price-num">{{row.payGold}}</text> <text class="price-text">乐豆</text></view>
+										<view class="num-cont">
+											<text class="price-num">{{row.payGold}}</text> 
+											<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
+										</view>
 										<view>X {{row.buyQty}}</view>
 										<view>X {{row.buyQty}}</view>
 									</view>
 									</view>
 								</view>
 								</view>
@@ -31,9 +34,16 @@
 									<text class="total-text">
 									<text class="total-text">
 										共{{item.goodsNum}}件商品
 										共{{item.goodsNum}}件商品
 									</text>
 									</text>
-									<text v-if="item.orderState=='WAIT_PAY'"><text class="money-total">应付</text><text class="price-num">{{item.originalGold}}</text>
-										<text class="price-text">乐豆</text></text>
-									<text v-else><text class="money-total">实付</text><text class="price-num">{{item.payGold}}</text> <text class="price-text">乐豆</text></text>
+									<view class="num-cont" v-if="item.orderState=='WAIT_PAY'">
+										<text class="money-total">应付</text>
+										<text class="price-num">{{item.originalGold}}</text>
+										<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
+									</view>
+									<view class="num-cont" v-else>
+										<text class="money-total">实付</text>
+										<text class="price-num">{{item.payGold}}</text> 
+										<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
+									</view>
 								</view>
 								</view>
 							</view>
 							</view>
 							<view class="check-row">
 							<view class="check-row">
@@ -92,7 +102,8 @@
 			<view class="slot-content">
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view>确认支付</view>
 				<view class="text-cont">
 				<view class="text-cont">
-					<text class="num-big">{{totalPrice}}</text>乐豆
+					<text class="num-big">{{totalPrice}}</text>
+					<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
 				</view>
 				</view>
 				<view class="footer">
 				<view class="footer">
 					<input v-model="password" maxlength="30" 
 					<input v-model="password" maxlength="30" 
@@ -529,7 +540,9 @@
 
 
 				.price-num {
 				.price-num {
 					font-size: 32upx;
 					font-size: 32upx;
+					font-weight: 600;
 					color: red;
 					color: red;
+					margin-right: 6rpx;
 				}
 				}
 
 
 				.total-text {
 				.total-text {
@@ -541,7 +554,12 @@
 				}
 				}
 			}
 			}
 		}
 		}
-
+		// 乐豆数量
+		.num-cont{
+			display: flex;
+			align-items: center;
+			float: right;
+		}
 		// 支付密码弹窗
 		// 支付密码弹窗
 		.slot-content{
 		.slot-content{
 			padding: 30upx 0;
 			padding: 30upx 0;
@@ -552,10 +570,14 @@
 			.text-cont{
 			.text-cont{
 				width: 100%;
 				width: 100%;
 				padding: 60upx 0;
 				padding: 60upx 0;
-				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				.num-big{
 				.num-big{
 					font-size: 40upx;
 					font-size: 40upx;
 					color: red;
 					color: red;
+					font-weight: 600;
+					margin-right: 6rpx;
 				}
 				}
 			}
 			}
 			.footer{
 			.footer{

+ 33 - 12
pages/order/orderDetail.vue

@@ -31,7 +31,10 @@
 				<view>
 				<view>
 					<view class="ellipsis-two">{{item.goodsName}}</view>
 					<view class="ellipsis-two">{{item.goodsName}}</view>
 					<view class="bundle-num">
 					<view class="bundle-num">
-						<view><text class="price-num">{{item.payGold}}</text> <text class="price-text">乐豆</text></view>
+						<view class="num-cont">
+							<text class="price-num">{{item.payGold}}</text> 
+							<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
+						</view>
 						<view>X {{item.buyQty}}</view>
 						<view>X {{item.buyQty}}</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -39,25 +42,31 @@
 			<u-gap height="10" bg-color="#f8f8f8"></u-gap>
 			<u-gap height="10" bg-color="#f8f8f8"></u-gap>
 			<!-- 订单信息 -->
 			<!-- 订单信息 -->
 			<u-cell-group>
 			<u-cell-group>
-				<u-cell-item title="订单编号" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
+				<u-cell-item title="订单编号" :value-style="{color: '#000'}" :arrow="false">
 					{{orderInfo.orderSn}}
 					{{orderInfo.orderSn}}
 				</u-cell-item>
 				</u-cell-item>
-				<u-cell-item title="下单时间" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
+				<u-cell-item title="下单时间" :value-style="{color: '#000'}" :arrow="false">
 					{{orderInfo.orderTime}}
 					{{orderInfo.orderTime}}
 				</u-cell-item>
 				</u-cell-item>
-				<u-cell-item v-if="orderInfo.payTime" title="支付时间" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
+				<u-cell-item v-if="orderInfo.payTime" title="支付时间" :value-style="{color: '#000'}" :arrow="false">
 					{{orderInfo.payTime}}
 					{{orderInfo.payTime}}
 				</u-cell-item>
 				</u-cell-item>
 				<u-gap height="10" bg-color="#f8f8f8"></u-gap>
 				<u-gap height="10" bg-color="#f8f8f8"></u-gap>
-				<u-cell-item title="商品合计" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
-					<text class="price-num">{{orderInfo.originalGold}}</text> <text class="price-text">乐豆</text>
+				<u-cell-item title="商品合计" :value-style="{color: '#000'}" :arrow="false">
+					<view class="num-cont">
+						<text class="price-num">{{orderInfo.originalGold}}</text>
+						<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
+					</view>
 				</u-cell-item>
 				</u-cell-item>
-				<u-cell-item title="运费" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
+				<u-cell-item title="运费" :value-style="{color: '#000'}" :arrow="false">
 					免运费
 					免运费
 				</u-cell-item>
 				</u-cell-item>
-				<u-cell-item :title="(orderInfo.orderState=='WAIT_PAY'||orderInfo.orderState=='CANCEL') ? '待支付':'实际支付'" :value-style="{color: '#000',fontSize: '28upx'}"
+				<u-cell-item :title="(orderInfo.orderState=='WAIT_PAY'||orderInfo.orderState=='CANCEL') ? '待支付':'实际支付'" :value-style="{color: '#000'}"
 				 :arrow="false">
 				 :arrow="false">
-					<text class="price-num">{{orderInfo.originalGold}}</text> <text class="price-text">乐豆</text>
+				 <view class="num-cont">
+					 <text class="price-num">{{orderInfo.originalGold}}</text>
+					 <u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
+				 </view>
 				</u-cell-item>
 				</u-cell-item>
 			</u-cell-group>
 			</u-cell-group>
 		</view>
 		</view>
@@ -88,7 +97,8 @@
 			<view class="slot-content">
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view>确认支付</view>
 				<view class="text-cont">
 				<view class="text-cont">
-					<text class="num-big">{{totalPrice}}</text>乐豆
+					<text class="num-big">{{totalPrice}}</text>
+					<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
 				</view>
 				</view>
 				<view class="footer">
 				<view class="footer">
 					<input v-model="password" 
 					<input v-model="password" 
@@ -349,13 +359,20 @@
 			.price-num {
 			.price-num {
 				font-size: 32upx;
 				font-size: 32upx;
 				color: red;
 				color: red;
+				font-weight: 600;
+				margin-right: 6rpx;
 			}
 			}
 
 
 			.u-cell {
 			.u-cell {
 				padding: 10rpx 32rpx;
 				padding: 10rpx 32rpx;
 			}
 			}
 		}
 		}
-
+		// 乐豆数量
+		.num-cont{
+			display: flex;
+			align-items: center;
+			float: right;
+		}
 		.footer {
 		.footer {
 			padding: 20rpx;
 			padding: 20rpx;
 		}
 		}
@@ -369,10 +386,14 @@
 			.text-cont{
 			.text-cont{
 				width: 100%;
 				width: 100%;
 				padding: 60upx 0;
 				padding: 60upx 0;
-				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				.num-big{
 				.num-big{
 					font-size: 40upx;
 					font-size: 40upx;
 					color: red;
 					color: red;
+					font-weight: 600;
+					margin-right: 6rpx;
 				}
 				}
 			}
 			}
 			.footer{
 			.footer{

+ 8 - 3
pages/toOrder/index.vue

@@ -81,7 +81,8 @@
 			<view class="slot-content">
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view>确认支付</view>
 				<view class="text-cont">
 				<view class="text-cont">
-					<text class="num-big">{{totalPrice}}</text>乐豆
+					<text class="num-big">{{totalPrice}}</text>
+					<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
 				</view>
 				</view>
 				<view class="footer">
 				<view class="footer">
 					<input v-model="password" 
 					<input v-model="password" 
@@ -192,7 +193,7 @@
 				this.showInputPsw = false
 				this.showInputPsw = false
 				this.password = ''
 				this.password = ''
 				// 跳转到订单列表
 				// 跳转到订单列表
-				uni.navigateTo({
+				uni.redirectTo({
 					url:"/pages/order/order"
 					url:"/pages/order/order"
 				})
 				})
 			},
 			},
@@ -445,10 +446,14 @@ page{
 		.text-cont{
 		.text-cont{
 			width: 100%;
 			width: 100%;
 			padding: 60upx 0;
 			padding: 60upx 0;
-			text-align: center;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 			.num-big{
 			.num-big{
 				font-size: 40upx;
 				font-size: 40upx;
 				color: red;
 				color: red;
+				font-weight: 600;
+				margin-right: 6rpx;
 			}
 			}
 		}
 		}
 		.footer{
 		.footer{

+ 1 - 1
pages/toOrder/payFinish.vue

@@ -25,7 +25,7 @@ export default {
 	methods: {
 	methods: {
 		// 查看订单详情
 		// 查看订单详情
 		toOrderDetail() {
 		toOrderDetail() {
-			uni.navigateTo({
+			uni.redirectTo({
 			    url: '/pages/order/orderDetail?id=' + this.orderId
 			    url: '/pages/order/orderDetail?id=' + this.orderId
 			})
 			})
 		},
 		},