dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-06-11 14:32:29 +08:00
commit 0e220d9575
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -1928,8 +1928,8 @@
this_.isQuery = false; this_.isQuery = false;
clearInterval(timer); clearInterval(timer);
} }
await this_.getMemberAfter();
} }
await this_.getMemberAfter();
}) })
}, 1000); }, 1000);
@ -3782,7 +3782,7 @@
// 订单金额 // 订单金额
realyPayBills:this.realyPayBills, realyPayBills:this.realyPayBills,
// 锁价金额 // 锁价金额
lockupPrice:cardFuelDieselForm.lockupPrice, lockupPrice:this.cardFuelDieselForm.lockupPrice,
// 支付方式 // 支付方式
payType:payTypeText, payType:payTypeText,
// 实付款 // 实付款

9
pos-uni/config.js
View File

@ -1,11 +1,6 @@
// 应用全局配置 // 应用全局配置
module.exports = { module.exports = {
// baseUrl: 'https://vue.ruoyi.vip/prod-api', baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
// baseUrl: 'http://192.168.0.196:8081/',
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
// baseUrl: 'https://8q4f124343.yicp.fun/',
baseUrl: 'http://192.168.31.96:8080/',
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
imagesUrl: 'http://www.nuoyunr.com/lananRsc', imagesUrl: 'http://www.nuoyunr.com/lananRsc',
// 应用信息 // 应用信息
appInfo: { appInfo: {
@ -28,4 +23,4 @@ module.exports = {
} }
] ]
} }
} }

10
pos-uni/manifest.json
View File

@ -1,5 +1,5 @@
{ {
"name" : "WX-lift", "name" : "pos",
"appid" : "__UNI__7A6878C", "appid" : "__UNI__7A6878C",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
@ -41,9 +41,13 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : {}, "ios" : {
"dSYMs" : false
},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : {} "sdkConfigs" : {
"ad" : {}
}
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */

17
pos-uni/pagesHome/BusinessData/BusinessData.vue
View File

@ -37,7 +37,7 @@
<view class="b-bs"> <view class="b-bs">
<view class=""> <view class="">
<view class="hui-">退款金额/笔数</view> <view class="hui-">退款金额/笔数</view>
<view class="lan-">￥{{dataForm.refBalance}}/{{dataForm.refBalanceCount}}</view> <view class="lan-">￥{{dataForm.refBalance || 0}}/{{dataForm.refBalanceCount}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -52,11 +52,11 @@
<view class="h-b-box"> <view class="h-b-box">
<view class=""> <view class="">
<view class="hui-">营业额/笔数</view> <view class="hui-">营业额/笔数</view>
<view class="lan-">￥{{dataForm.wechat}}/{{dataForm.wechatcount}}</view> <view class="lan-">￥{{dataForm.wechat || 0}}/{{dataForm.wechatcount}}</view>
</view> </view>
<view class=""> <view class="">
<view class="hui-">会员充值/笔数</view> <view class="hui-">会员充值/笔数</view>
<view class="lan-">￥{{dataForm.userBalanceByWechat }}/{{dataForm.userBalanceCountByWechat}} <view class="lan-">￥{{dataForm.userBalanceByWechat|| 0 }}/{{dataForm.userBalanceCountByWechat}}
</view> </view>
</view> </view>
</view> </view>
@ -69,11 +69,11 @@
<view class="h-b-box"> <view class="h-b-box">
<view class=""> <view class="">
<view class="hui-">营业额/笔数</view> <view class="hui-">营业额/笔数</view>
<view class="lan-">￥{{dataForm.alipay}}/{{dataForm.alipaycount}}</view> <view class="lan-">￥{{dataForm.alipay || 0}}/{{dataForm.alipaycount}}</view>
</view> </view>
<view class=""> <view class="">
<view class="hui-">会员充值/笔数</view> <view class="hui-">会员充值/笔数</view>
<view class="lan-">￥{{dataForm.userBalanceByAli}}/{{dataForm.userBalanceCountByali}}</view> <view class="lan-">￥{{dataForm.userBalanceByAli || 0}}/{{dataForm.userBalanceCountByali}}</view>
</view> </view>
</view> </view>
<!-- <view class="d-s" style="margin-bottom: 10px;"> <!-- <view class="d-s" style="margin-bottom: 10px;">
@ -284,14 +284,15 @@
padding: 10px 15px; padding: 10px 15px;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 16px;
font-weight: bold;
margin: 15px auto; margin: 15px auto;
} }
.lan-time { .lan-time {
font-weight: 500; font-weight: 600;
font-size: 14px; font-size: 16px;
color: #0864E9; color: #0864E9;
} }

3
pos-uni/pagesHome/Collection/Collection.vue
View File

@ -636,6 +636,7 @@
} }
.bai-kuang { .bai-kuang {
width: 100%;
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
@ -645,7 +646,7 @@
} }
.num-box { .num-box {
width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;