Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

# Conflicts:
#	pos-uni/config.js

fuintAdmin/src/views/oilConfig/oilPrice/index.vue

@@ -322,7 +322,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="450px" :close-on-click-modal="false">
+    <el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
       <el-form ref="priForm" :model="oilPresetPrices" label-width="100px" :rules="oilPresetPricesRules">
         <el-form-item label="预设油号" prop="numberId"  label-width="120px">
           <el-select v-model="oilPresetPrices.numberId" placeholder="请选择油号" @change="oilTypeClickByPrice()">

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -142,6 +142,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     @Lazy
     private CardFuelRecordService cardFuelRecordService;
 
+    @Resource
+    private TagCodeService tagCodeService;
     @Override
     public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -1476,6 +1478,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         oilOrder.setInvoicing("未开票");
         oilOrder.setUserId(nowAccountInfo.getId());
         oilOrder.setOilTagSn(oilOrder.getOilTagSn());
+        TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn());
+        String collection = tagCode.getCollection();
+        if (collection.contains("staffId")){
+            String[] split = collection.split("staffId=");
+            oilOrder.setStaffId(Integer.parseInt(split[1]));
+        }
         //        判断当前店铺是否存在此用户的会员信息，没有的话进行添加
         LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId());
         UserBalance balance = userBalanceService.selectUserBalance(oilOrder.getUserId(), store.getChainStoreId());
@@ -1729,8 +1737,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     @Resource
     private PrinterService printerService;
 
-    @Resource
-    private TagCodeService tagCodeService;
     @Override
     public int updateOrderStatus(String orderNo, String status) throws Exception {
         int row = 0;

pos-uni/config.js

@@ -1,5 +1,6 @@
 // 应用全局配置
 module.exports = {
+<<<<<<< HEAD
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'http://192.168.0.196:8081/',
 	// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
@@ -7,6 +8,9 @@ module.exports = {
 	// baseUrl: 'http://192.168.31.96:8080/',
 	baseUrl: 'http://192.168.31.178:8081/',
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
+=======
+	baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
+>>>>>>> 0e220d95754e6cea5279608575dd9f869dbb1219
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息
 	appInfo: {
@@ -29,4 +33,4 @@ module.exports = {
 			}
 		]
 	}
-}
+}

pos-uni/manifest.json

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

pos-uni/pagesHome/BusinessData/BusinessData.vue

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

pos-uni/pagesHome/Collection/Collection.vue

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