Merge branch 'debug' of http://47.101.143.145:8090/77975466/pco into debug

# Conflicts:
#	sp-server/app.pid

app/manifest.json

@@ -85,7 +85,7 @@
     "vueVersion" : "2",
     "h5" : {
         "router" : {
-            "base" : "/test/",
+            "base" : "/h5/",
             "mode" : "history"
         },
         "devServer" : {

app/pages/business-entering/business-edit.vue

@@ -107,7 +107,7 @@
 				<view class="l"><text style="color: red;">*</text>载重：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入载重" v-model="form.netWeight">
-						<text slot="suffix">吨</text>
+						<text slot="suffix">kg</text>
 					</u-input>
 				</view>
 			</view>

app/pages/business-entering/business-entering.vue

@@ -99,7 +99,7 @@
 				<view class="l"><text style="color: red;">*</text>载重：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入载重" @input="handler()" v-model="form.netWeight">
-						<text slot="suffix">吨</text>
+						<text slot="suffix">kg</text>
 					</u-input>
 				</view>
 			</view>

app/pages/index/index.vue

@@ -115,6 +115,13 @@
 						url: '/pages/business-order/business-order',
 					},
 					{
+						auth: false,
+						icon: '../../static/home-icon-06.jpg',
+						text: '灵活业务',
+						url: '/pages/onely-disinfect/Index',
+						customer:true
+					},
+					{
 						id: 'tb-business-car',
 						auth: true,
 						icon: '../../static/home-icon-05.png',

app/pages/onely-disinfect/Index.vue

@@ -31,7 +31,7 @@
 					</view>
 					<view class="item">
 						<text class="p1">载重:</text>
-						<text class="p2">{{businessItem.netWeight}}(吨)</text>
+						<text class="p2">{{businessItem.netWeight}}(kg)</text>
 					</view>
 					<view class="item">
 						<text class="p1">账单确认:</text>

app/pages/onely-disinfect/type-business.vue

@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l"><text style="color: red;">*</text>车辆规格：</view>
+				<view class="l"><text style="color: red;">*</text>车辆规格(米)：</view>
 				<view class="r">
 					<u-input placeholder="请填写车辆规格" v-model="form.carSize" />
 				</view>
@@ -197,7 +197,7 @@
 				let itemList = this.itemType.items;
 				let checkList = this.checkList;
 				let list = itemList.filter(obj => checkList.indexOf(obj.id) !== -1);
-				if(this.customerId=='1'){
+				if(this.customerId=='1'||!this.customerId){
 					this.form.customerId = this.customer.list[this.customer.index].id;
 				}else{
 					this.form.customerId=this.customerId

sp-admin/sa-view/tb-business/tb-car-disincle-add.html

@@ -53,7 +53,7 @@
 									</div>
 									<sa-item name="车牌号" placeholder="请输入车牌号" v-model="m.carNo" br>
 									</sa-item>
-									<sa-item type="num" name="车辆规格" placeholder="请输入车辆规格" v-model="m.carSize" br>
+									<sa-item type="num" name="车辆规格(米)" placeholder="请输入车辆规格" v-model="m.carSize" br>
 									</sa-item>
 								</el-col>
 								<el-col :span='12'>

sp-admin/sa-view/tb-business/tb-car-disincle-edit.html

@@ -53,7 +53,7 @@
 								<el-col :span='12'>
 									<sa-item name="车牌号" placeholder="请输入车牌号" v-model="m.carNo" br>
 									</sa-item>
-									<sa-item type="num" name="车辆规格" placeholder="请输入车辆规格" v-model="m.carSize" br>
+									<sa-item type="num" name="车辆规格(米)" placeholder="请输入车辆规格" v-model="m.carSize" br>
 									</sa-item>
 								</el-col>
 								<el-col :span='12'>

sp-admin/sa-view/tb-business/tb-car-disincle-list.html

@@ -52,7 +52,7 @@
 					<sa-td name="车牌号" prop="carNo"></sa-td>
 					<sa-td name="确认" prop="adminConfirmInput" type="enum" :jv="{1: '已确认', 0: '未确认'}"></sa-td>
 					<sa-td name="已支付(元)" prop="payMoney" width="140"></sa-td>
-					<sa-td name="用费(元)" prop="totalMoney"></sa-td>
+					<sa-td name="业务用费(元)" prop="totalMoney" width="120"></sa-td>
 					<sa-td name="入场时间" prop="realInTime" width="140"></sa-td>
 					<sa-td name="离场时间" prop="realOutTime" width="140"></sa-td>
 					<sa-td width="160" name="创建时间" prop="createTime"></sa-td>

sp-server/app.pid

@@ -1 +1 @@
-7416
+23504

sp-server/src/main/java/com/pj/api/jh/api/JhController.java

@@ -53,7 +53,6 @@ public class JhController {
 
     @RequestMapping(value = "refund")
     public AjaxJson refund(@RequestParam String outTradeNo) {
-        jhService.refund(outTradeNo);
         return AjaxJson.getSuccess();
     }
 

sp-server/src/main/java/com/pj/project/tb_business/CarDisincle.java

@@ -12,7 +12,10 @@ public class CarDisincle implements Serializable {
     private String no;
     private String itemPrice;
     private String carNo;
+    private String cardSize;
+    private String netWeight;
     private String goodsName;
+    private String payStatus;
     private Integer adminConfirmInput;
     private String basePartMoney;
     private String totalMoney;

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessMapper.xml

@@ -74,7 +74,7 @@
             a.`no`,
             a.item_price,a.goods_name,a.admin_confirm_input,b.car_no,
             b.base_part_money,a.total_money,a.pay_money,a.create_time,
-            b.real_in_time,b.real_out_time
+            b.real_in_time,b.real_out_time,b.car_no ,a.net_weight,a.card_size,a.pay_status
         from tb_business a,tb_business_car b
         WHERE a.id=b.business_id and (a.declare_no='' or a.declare_no is null)
             <if test="cardNo !='' and cardNo !=null">
@@ -83,6 +83,9 @@
         <if test="adminConfirmInput !='-1'">
             and a.admin_confirm_input=#{adminConfirmInput}
         </if>
+        <if test="customerId !=null and customerId !=''">
+            and a.customer_id=#{customerId}
+        </if>
         ORDER BY a.create_time desc
 	</select>