From 7dd2e7918b00a857ca8a3634e24b2f6dd7446d1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 六月 2025 10:29:33 +0800
Subject: [PATCH] Merge branch 'xgmFlwms' of http://47.97.1.152:5880/r/wms_app into xgmFlwms
---
pages/basics/comb.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pages/basics/comb.vue b/pages/basics/comb.vue
index ceefe66..319f7d1 100644
--- a/pages/basics/comb.vue
+++ b/pages/basics/comb.vue
@@ -23,10 +23,16 @@
</uni-table>
</view>
- <view>
- <button class="cu-btn bg-yellow pda-btn" @click="comb()">缁勬墭</button>
- <button class="cu-btn bg-grey pda-btn" @click="reset">閲嶇疆</button>
+ <view style="height: 200rpx;">
+ <!-- 绌虹櫧灞� -->
</view>
+ <view class="cu-bar foot">
+ <view class="flex solid-bottom padding justify-start">
+ <button class="cu-btn bg-yellow lg margin-xs" style="width: 250rpx;" @click="comb()">缁� 鎵�</button>
+ <button class="cu-btn bg-grey lg margin-xs" @click="reset">閲� 缃�</button>
+ </view>
+ </view>
+
<view>
<!-- 鏅�氬脊绐� -->
<uni-popup ref="popup" background-color="#fff" style="width: 500rpx;">
@@ -118,7 +124,7 @@
return;
}
uni.request({
- url: that.baseUrl + "/matCode/auth",
+ url: that.baseHttp + that.baseIP + that.baseUrl + "/matCode/auth",
header:{
'content-type':'application/x-www-form-urlencoded',
@@ -213,7 +219,7 @@
}
uni.request({
- url: that.baseUrl + "/mobile/comb/auth",
+ url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/comb/auth",
header:{
// #ifdef H5
'token':uni.getStorageSync('token')
--
Gitblit v1.9.1