瀏覽代碼

修正数据

孙旺 8 月之前
父節點
當前提交
a0022ad948
共有 4 個文件被更改,包括 26 次插入14 次删除
  1. 2 2
      src/config.js
  2. 21 10
      src/pages/home.vue
  3. 1 0
      src/pages/login.vue
  4. 2 2
      src/pages/setting.vue

+ 2 - 2
src/config.js

@@ -1,10 +1,10 @@
 // 应用全局配置
 export default {
-	baseUrl: process.env.NODE_ENV == 'production' ? 'https://api.mxrvending.com:9050' : 'http://119.96.194.20:9050',
+	// baseUrl: process.env.NODE_ENV == 'production' ? 'https://api.mxrvending.com:9050' : 'http://119.96.194.20:9050',
 	// 生产环境
 	// baseUrl: 'https://api.mxrvending.com:9050',
 	//测试环境
-	// baseUrl: 'http://119.96.194.20:9050',
+	baseUrl: 'http://119.96.194.20:9050',
 	// 应用信息
 	appInfo: {
 		// 应用名称

+ 21 - 10
src/pages/home.vue

@@ -2,12 +2,12 @@
 	<view class="container">
 		<view class="top">
 			<!-- <view class="name">合作商家:肇庆</view> -->
-			<view class="rest">余额:{{total.balance||'0'}}</view>
+			<view class="rest">余额:{{$xy.delMoney(total.balance)||'0'}}</view>
 			<view class="flex">
 				<view class="total">
-					累计:{{total.sumBalance||'0'}}
+					累计:{{$xy.delMoney(total.sumBalance)||'0'}}
 				</view>
-				<view class="guarantee">保证金:{{total.refundVouchBalance||'0'}}</view>
+				<view class="guarantee">保证金:{{$xy.delMoney(total.refundVouchBalance)||'0'}}</view>
 			</view>
 			<view class="setting" @click="$tab.navigateTo('/pages/setting')">
 				设置
@@ -30,7 +30,7 @@
 						</view>
 					</view>
 
-					<view class="list-item flex justify-between" v-else>
+					<view class="list-item flex justify-between align-center" v-else>
 						<view class="time">
 							<view class="status">
 								{{item.status}}
@@ -90,14 +90,12 @@
 	let scrollview = ref(null)
 	let fullHeight = ref(0)
 
-	console.log(123)
-
 	onBeforeMount(() => {
 		//统计数据
 		getTotal()
 		//获取列表
-		reset()
-		getList()
+		// reset()
+		// getList()
 	})
 
 	onMounted(async () => {
@@ -264,8 +262,10 @@
 				right: 24rpx;
 				top: 50rpx;
 				font-size: 28rpx;
-				box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 9px 0px;
 				padding: 12rpx 20rpx;
+				background-color: #2C6FF3;
+				color:#fff;
+				border-radius: 14rpx;
 			}
 		}
 
@@ -278,8 +278,19 @@
 		}
 
 		.scroll-content {
+			padding-top: 12rpx;
 			.list-item {
-				background-color: red;
+				width:702rpx;
+				padding:24rpx;
+				margin-left: 24rpx;
+				margin-bottom: 20rpx;
+				box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 9px 0px;
+				line-height: 60rpx;
+				.val{
+					font-size:32rpx;
+					font-weight: bold;
+					color:red;
+				}
 			}
 		}
 

+ 1 - 0
src/pages/login.vue

@@ -113,6 +113,7 @@ async function pwdLogin (params) {
   }
 
   await userStore.Login(loginForm.value).then(res=>{
+	  proxy.$modal.msg('登录成功')
 	  proxy.$tab.reLaunch('/pages/home')
   }).catch(err=>{
 	  console.log('登录失败')

+ 2 - 2
src/pages/setting.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="container">
 		<view class="top">
-			<view class="item flex justify-between align-center">
+		<!-- 	<view class="item flex justify-between align-center">
 				<view class="key">
 					合作商家:
 				</view>
 				<view class="value">
 					--
 				</view>
-			</view>
+			</view> -->
 			<view class="item flex justify-between align-center">
 				<view class="key">
 					收款支付宝: