Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

common/request.js

@@ -4,7 +4,7 @@ const burl2='http://58.56.15.138:20201/' */
  
 //正式地址
 const baseUrl = 'https://apiclt.66km.com/'
-const burl2='https://apiclt.66km.com/' 
+const burl2='https://apiclt.66km.com/'
 
 
 import md5 from './MD5.js'

pages/module/maintain.vue

@@ -496,9 +496,16 @@ export default {
 										console.log(goods.goodsGroupDetail) */
 										
 										if(goods.goodsGroupDetail.length==0){
+											if(!list.referenceDosageQty){
+												goods.goodsList[0].qty=1;
+												return false;
+											}
 											//同组品为空的情况
 											var referenceDosageQty=Number(list.referenceDosageQty)
 											referenceDosageQty=Math.ceil(referenceDosageQty)
+											if(Number.isInteger(referenceDosageQty/goods.goodsList[0].capacity)){
+											  goods.goodsList[0].qty=referenceDosageQty/goods.goodsList[0].capacity
+											}else
 											if(goods.goodsList[0].capacity&&!goods.goodsList[0].del){
 												console.log(list.name+"？？==="+referenceDosageQty/goods.goodsList[0].capacity)
 												if(referenceDosageQty/goods.goodsList[0].capacity>1){
@@ -1149,7 +1156,7 @@ export default {
 		},
         handbook(){
 			uni.navigateTo({
-				url:'handbook?mileage'+this.maintainCarData.milage+'&liyangId='+this.maintainCarData.nLevelID
+				url:'handbook?mileage='+this.maintainCarData.milage+'&liyangId='+this.maintainCarData.nLevelID
 			})
 		},
 		settlement(){

pages/module/replaceGoods.vue

@@ -49,7 +49,7 @@ export default {
 				item.qty=1
 			})
 		const resdata = new Map()
-		 this.list.goodsList= this.list.goodsList.filter((item) => !resdata.has(item.goodsID) && resdata.set(item.goodsID, 1))
+		this.list.goodsList= this.list.goodsList.filter((item) => !resdata.has(item.goodsID) && resdata.set(item.goodsID, 1))
 	},
 	methods: {