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

* 'master' of http://47.98.226.240:3000/twt/txCar:
  删除
  套餐

# Conflicts:
#	pages/order/orderDetail.vue
#	pages/refundMoney/refundMoney.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map

pages/changeStore/changeStoreDetail.vue

@@ -143,7 +143,7 @@
 	export default {
 		data() {
 			return {
-				state: -1,// -1 平台拒绝 0撤销 1 提交申请 2 平台审核 3 同意申请
+				state: -1,// -1 拒绝1 提交申请 2 平台审核 3 同意申请
 				tongguoUrl: '../../static/img/icon_tongguo.png',
 				waitUrl: '../../static/img/icon_yuan.png',
 			}

pages/module/maintain.vue

@@ -7,7 +7,7 @@
 				<image src="../../static/img/icon_edit.png" mode="" class="topEdit" @click="carEdit"></image>
 			</view>
 			<view class="topRight">
-				<input type="text" v-model="maintainCarData.milage" @confirm="milageEditconfirm" value="" placeholder="请输入当前里程" class="topInput" placeholder-style="color:#ffffff;"/>
+				<input type="number" v-model="maintainCarData.milage" @confirm="milageEditconfirm" value="" placeholder="请输入当前里程" class="topInput" placeholder-style="color:#ffffff;"/>
 				<image src="../../static/img/icon_edit.png" mode="" class="topEdit" @click="milageEdit"></image>
 			</view>
 		</view>
@@ -225,7 +225,6 @@ export default {
 			for(let k in this.maintainCarData){this.maintainCarData[k] = this.maintainCarData[k]==null?'':this.maintainCarData[k]}
 			this.$http('miniAppMyBMemberCar/updateMemberCar',this.maintainCarData,'POST').then(res => {
 				uni.hideLoading();
-				
 					uni.setStorage({
 						key: 'maintainCarData',
 						data: that.maintainCarData,
@@ -299,12 +298,12 @@ export default {
 							}
 							if(i.listGoodsAll.length>0){
 								i.listGoodsAll.forEach((goods,goodsIndex)=>{
-									/* goods.forEach(sp=>{
+									 goods.forEach(sp=>{
 									    this.goodsTotal=Number(this.goodsTotal)
 										this.goodsTotal+=sp.salePrice*sp.qty
 										this.goodsTotal=this.goodsTotal.toFixed(2) 
-									}) */
-									goods[0].salePrice=1;
+									}) 
+									//goods[0].salePrice=1;
 									this.goodsTotal=Number(this.goodsTotal)
 									this.goodsTotal+=goods[0].salePrice*goods[0].qty
 									this.goodsTotal=this.goodsTotal.toFixed(2)
@@ -323,7 +322,7 @@ export default {
 							
 							i.listItem.forEach(xm=>{
 								xm.qty=1;
-								xm.salePrice=1;
+								//xm.salePrice=1;
 								this.salePriceTotal=Number(this.salePriceTotal)
 								this.salePriceTotal+=xm.salePrice
 								this.salePriceTotal=this.salePriceTotal.toFixed(2)

pages/order/orderDetail.vue

@@ -515,7 +515,11 @@
 			refundMoney(){
 				console.log('退款');
 				uni.navigateTo({
+<<<<<<< HEAD
 					url:'../refundMoney/refundMoney?sheetId='+this.id +'&maxMoney=' + this.orderData.PayMoney
+=======
+					url:'../refundMoney/refundMoney?id='+this.id
+>>>>>>> 22e6aaaee76a8b173ef79e423f41fb1bcfbd9808
 				})
 			},
 			orderPay() {

pages/refundMoney/refundMoney.vue

@@ -1,3 +1,4 @@
+
 <template>
 	<view class="box">
 		<view class="content">
@@ -240,4 +241,5 @@
 		font-size: 30rpx;
 		margin-top: 24rpx;
 	}
+
 </style>