1.优化2.0删除多余的代码

Utils/Api.js

@@ -172,7 +172,7 @@ export const getDiscountByCode = params => {
 
 //站内信列表
 export const getMsgByList = params => {
-	return POST('GET', `${base}//bsMsg/getMsgByList`, params).then(res => res.data);
+	return POST('GET', `${base}/bsMsg/getMsgByList`, params).then(res => res.data);
 }
 // 根据优惠券查卡券
 export const getCouponByDiscount = params => {

pages.json

@@ -874,14 +874,7 @@
 				"navigationBarTextStyle": "white"
 			}
 
-		}, {
+		},{
-			"path": "kfc-details/kfc-details",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
 			"path": "kfc-menu-list/kfc-menu-list",
 			"style": {
 				"navigationBarTitleText": "菜单",

pages/goods/refuel-confirm/refuel-confirm.vue

@@ -275,9 +275,7 @@
 		wechatPay,
 		getHuiLianTongCardBalance,
 		cardPay,
-		orderToGoldPay,
 		findUser,
-		oilCardPay,
 		getUserOrderPreList,
 		canUseDiscount,
 		create,
@@ -311,8 +309,6 @@
 				user: '',
 				paytype: 'weixin',
 				PaymentPassword: '',
-				// timedeductionPrice: '0', //本次优惠金额
-
 				orderPrice: '', //原价
 				deductionPrice: '0.00', //优惠金额
 				OrderPreList: [], //优惠券数据
@@ -348,7 +344,6 @@
 		},
 		onShow() {
 			let that = this;
-			// that.paytype = '';
 			that.findUser();
 			this.priceValue[1] = 0;
 			this.reload();
@@ -488,14 +483,6 @@
 					if (res.return_code == '000000') {
 						this.orderList = res.return_data;
 						this.payPrice = res.return_data.payPrice;
-						// let payprice = parseFloat(this.payPrice * 100).toFixed(
-						// 	0);
-						// if (payprice > this.user.gold) {
-						// 	this.availIntegal = this.user.gold;
-						// } else {
-						// 	this.availIntegal = payprice;
-						// }
-
 						this.getRebateIntegral();
 						this.getThirdPartyByDetail();
 					}
@@ -831,7 +818,7 @@
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
 					"payPwd": this.PaymentPassword,
-					memDiscountId: this.memDiscountId
+					"memDiscountId": this.memDiscountId
 				}
 
 				create(goods).then(res => {

pages/order/confirmation.vue

@@ -69,6 +69,22 @@
 			</view>
 		</view>
 
+		<!-- //实物配置 -->
+		<view class="width94 backcorfff mart10" v-if="couponList.wherePost">
+			<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系人</view>
+				<input class="width60 fotrt font15" v-model="contactPepole" placeholder="请输入联系人" />
+			</view>
+			<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系电话</view>
+				<input class="width60 fotrt font15" v-model="contactPhone" placeholder="请输入联系电话" />
+			</view>
+			<view class="width94 alijusstart height50 font14 fcor666">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系地址</view>
+				<input class="width60 fotrt font15" v-model="contactAddress" placeholder="请输入联系地址" />
+			</view>
+		</view>
+
 		<view class="width94 comorder mart10">
 
 			<view class="width92 alijusstart paddtop20">

qianzhu-KFC/confirmOrder/confirmOrder.vue

@@ -340,7 +340,7 @@
 				orderPrice: 0, //订单价格
 				rechargeDes: '', // 支付详情
 				rebateIntegral: '', //返回积分
-				Integrastu: 1 ,//返积分状态 
+				Integrastu: 1, //返积分状态 
 				identificationCode: '', //渠道商
 			}
 		},
@@ -598,7 +598,7 @@
 						"childOrderList": [{
 							"goodsId": 9999,
 							"customerMobile": this.customerMobile,
-							"storeCode":this.storeCode,
+							"storeCode": this.storeCode,
 							"platformId": this.showType,
 							"productType": this.productType,
 							"orderItems": data2,
@@ -617,7 +617,7 @@
 						"childOrderList": [{
 							"goodsId": 9999,
 							"customerMobile": this.customerMobile,
-							"storeCode":this.storeCode,
+							"storeCode": this.storeCode,
 							"platformId": this.showType,
 							"productType": this.productType,
 							"orderItems": this.orderList,
@@ -809,6 +809,22 @@
 						}
 					})
 				} else if (that.paytype == '3') {
+					if (!that.user.isSetHltCard) {
+						uni.showToast({
+							icon: 'none',
+							title: '当前账号还未绑定,前往绑定',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../pages/user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
+						});
+						that.thirdCancelOrder();
+						return;
+					}
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../pages/login/updatePas/updatePas'
@@ -826,22 +842,7 @@
 						return;
 					}
 
-					if (!that.user.isSetHltCard) {
+
-						uni.showToast({
-							icon: 'none',
-							title: '当前账号还未绑定,前往绑定',
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateTo({
-										url: '../../pages/user/bindingCard/bindingCard'
-									})
-								}, 1000)
-							}
-						});
-						that.thirdCancelOrder();
-						return;
-					}
 					that.$refs.paymentPassword.modalFun('show');
 				} else {
 					uni.showToast({
@@ -879,7 +880,7 @@
 							"childOrderList": [{
 								"goodsId": 9999,
 								"customerMobile": this.customerMobile,
-								"storeCode":this.storeCode,
+								"storeCode": this.storeCode,
 								"platformId": this.showType,
 								"productType": this.productType,
 								"orderItems": data2,
@@ -899,10 +900,10 @@
 							"childOrderList": [{
 								"goodsId": 9999,
 								"customerMobile": this.customerMobile,
-								"storeCode":this.storeCode,
+								"storeCode": this.storeCode,
 								"platformId": this.showType,
 								"productType": this.productType,
-								"orderItems":  this.orderList,
+								"orderItems": this.orderList,
 								"goodsType": 9,
 								"saleCount": 1,
 							}],

qianzhu-KFC/kfc-details/kfc-details.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue

@@ -68,11 +68,13 @@
 							</view>
 
 							<view class="mart10 icon-click fotrt alijusend" v-else>
-								<view class="num fcorfff font14" style="background: #d90209;" @click="showPopups(titem)">
+								<view class="num fcorfff font14" style="background: #d90209;"
+									@click="showPopups(titem)">
 									选规格
 								</view>
 								<view class="unibadge" v-if="titem.count > 0">
-									{{titem.count}}</view>
+									{{titem.count}}
+								</view>
 							</view>
 
 						</view>
@@ -82,8 +84,7 @@
 			</view>
 		</scroll-view>
 
-		<shopcart v-if="flist !='' " :goods="shoppingcart" @add="addCart" @dec="decreaseCart"
+		<shopcart v-if="flist !='' " :goods="shoppingcart" @add="addCart" @dec="decreaseCart" @delAll="delAll">
-			@delAll="delAll">
 		</shopcart>
 
 
@@ -499,12 +500,6 @@
 
 				return true;
 
-			},
-			//跳转详情
-			navToList() {
-				uni.navigateTo({
-					url: '../kfc-details/kfc-details'
-				})
 			}
 		}
 	}

qianzhu-KFC/order-details/order-details.vue

@@ -113,8 +113,8 @@
 		</view>
 		<view class="width94 backcorfff marb20">
 			<view class="width100" style="height: 10px;">
-				<view class=".cro_left_top flleft"></view>
+				<view class="cro_left_top flleft"></view>
-				<view class=".cro_right_top flright"></view>
+				<view class="cro_right_top flright"></view>
 			</view>
 			<view class="width94 alijusstart paddtop10 ">
 				<view class="font15 fcor333 fontwig6 width50">商品小计</view>

subPages/unionComfirmation/unionComfirmation.vue

@@ -353,9 +353,6 @@
 			//查询工会卡余额
 			//查询详情
 			getHuiLianTongCardBalance() {
-				if (!this.user.hltCardNo) {
-					return;
-				}
 				let params = {
 					cardNo: this.user.hltCardNo.cardNo
 				}