1.优化2.0 测试问题 填入公司id

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

@@ -817,7 +817,8 @@
 					}],
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
-					"payPwd": this.PaymentPassword,
+					"payPwd": this.PaymentPassword,
+					"companyId": app.globalData.companyId,
 					"memDiscountId": this.memDiscountId
 				}
 

pages/order/confirmation.vue

@@ -110,6 +110,27 @@
 				</view>
 			</view>
 
+			<view class="width94 line1 mart5 marb5"></view>
+
+			<view class="height40 width100 backcorfff">
+				<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
+					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
+					<text>下单返积分</text>
+				</view>
+				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
+					style="align-items: center;">
+					返{{rebateIntegral}}积分
+				</view>
+				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
+					style="align-items: center;">
+					{{rebateIntegral}}
+				</view>
+			</view>
+			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
+				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
+				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
+			</view>
+
 			<view class="height40 width100 backcorfff">
 				<view class="height50 width100 backcorfff">
 					<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@@ -567,7 +588,8 @@
 					}],
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
-					memDiscountId: this.memDiscountId,
+					memDiscountId: this.memDiscountId,
+					"companyId": app.globalData.companyId,
 					"storeId": this.storeId,
 					"postData": {
 						"address": this.contactAddress,
@@ -736,7 +758,8 @@
 						}],
 						"payGold": this.priceValue[1],
 						"promoteCode": this.identificationCode,
-						"payPwd": this.PaymentPassword,
+						"payPwd": this.PaymentPassword,
+						"companyId": app.globalData.companyId,
 						memDiscountId: this.memDiscountId
 					}
 					create(goods).then(res => {

pages/tabBar/category/category.vue

@@ -280,7 +280,7 @@
 			},
 			//拨打客服电话
 			playPhone() {
-				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let cont = "本服务由惠兑礼品提供\n400-678-0738";
 				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',

pages/tabBar/home/home.vue

@@ -204,7 +204,6 @@
 				// 分类菜单
 				homeCateList: [],
 				//切换状态
-				cpStuats: 1,
 				jumpType: '',
 				locationRef: null, // 用于接收定位对象
 				isdisplay: true //是否展示
@@ -305,7 +304,7 @@
 					})
 					that.city = '重庆市';
 					app.globalData.cityName = '重庆市';
-					app.globalData.cityId = '500000';
+					app.globalData.cityId = '500000';
 					that.getCmsContentcmsContent();
 					that.getCmsAactibity();
 				}
@@ -616,7 +615,7 @@
 				})
 			},
 			//商品跳转
-			toGoods(e, id) {
+			toGoods(e, id) {
 				uni.navigateTo({
 					url: e + id
 				});

pages/tabBar/user/user.vue

@@ -451,7 +451,7 @@
 					lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
 						(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
 						24), //计算小时数
-					leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ?  + Math.floor(lefttime / (1000 * 60) % 60) :
+					leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? +Math.floor(lefttime / (1000 * 60) % 60) :
 					Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
 					lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
 						lefttime / 1000 % 60); //计算秒数
@@ -498,7 +498,7 @@
 					})
 				}
 				// #ifdef H5
-				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let cont = "本服务由惠兑礼品提供\n400-678-0738";
 				let content = cont.replace(/<br>/g, "\n");
 				if (item == '客服') {
 					uni.showModal({

pages/user/deposit/deposit.vue

@@ -146,7 +146,8 @@
 						"goodsType": 2,
 						"saleCount": 1,
 					}],
-					"promoteCode": app.globalData.identificationCode
+					"promoteCode": app.globalData.identificationCode,
+					"companyId": app.globalData.companyId
 				}
 
 				create(goods).then(res => {

pages/user/order_details/order_details.vue

@@ -109,7 +109,7 @@
 			<view class="mart15 alijusstart font14 width94" v-if="materialData">
 				<view class="width50 fcor777">联系地址</view>
 				<view class="width50 fotrt fcor333">¥{{materialData.address}}</view>
-			</view>		
+			</view>
 		</view>
 
 		<!-- 支付信息 -->
@@ -138,16 +138,18 @@
 		</view>
 		<view class="width90 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="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="!recinfo.payRealPrice">
 			</view>
-			<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="recinfo.productType == 6 && recinfo.payRealPrice">
+			<view class="width90 height50 fotrt fcor777 font16 paddbotm10"
+				v-if="recinfo.productType == 6 && recinfo.payRealPrice">
 				加油实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
-			</view>
+			</view>
-			<view class="width90 height50 fotrt fcor777 font16 paddbotm10" v-if="recinfo.productType != 6 && recinfo.payRealPrice">
+			<view class="width90 height50 fotrt fcor777 font16 paddbotm10"
-				实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
+				v-if="recinfo.productType != 6 && recinfo.payRealPrice">
+				实付 <text class="font24 fcor333 margle">￥{{recinfo.payRealPrice}}</text>
 			</view>
 		</view>
 
@@ -526,7 +528,6 @@
 					6: '退款中',
 					7: '退款失败'
 				},
-				preByOrderInfo: '',
 				materialData: '' //实物参数
 
 			};

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

@@ -187,9 +187,9 @@
 
 		<!-- 再来一单 -->
 		<view class="height50 width100"></view>
-		<view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3">
+		<view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3 || orderList.orderStatus == 1">
-			<button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
+			<button open-type="contact" class="cusservice font12 fcor666" v-if="orderList.orderStatus == 3">联系客服</button>
-			<!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
+			<view class="buybtn font12 fcorfff" v-if="orderList.orderStatus == 1" @click="thirdCancelOrder">取消订单</view>
 		</view>
 
 	</view>
@@ -533,7 +533,7 @@
 		line-height: 30px;
 		text-align: center;
 		margin-right: 20px;
-		background-color: #009dff;
+		background-color: #999999;
 		border-radius: 25px;
 	}
 

subPages/coupon-comfirmation/coupon-comfirmation.vue

@@ -74,11 +74,7 @@
 		<view class="width100 height60"></view>
 		<view class="footer">
 			<view class="settlement">
-				<view class="sum">实付:<view class="money" v-if="paytype != 'jinbi'">￥{{paytheprice}}</view>
+				<view class="sum">实付:<view class="money">￥{{paytheprice}}</view>
-					<view class="money aliitem" v-else>
-						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../static/img/jfx.png">
-						</image>{{paytheprice*100}}
-					</view>
 				</view>
 				<!-- #ifdef MP -->
 				<button class="btn" open-type="getPhoneNumber" v-if="user == null"
@@ -101,7 +97,6 @@
 		getDiscountPackageDetail,
 		loginByPhone,
 		wechatPay,
-		orderToGoldPay,
 		findUser,
 		cardPay,
 		getHuiLianTongCardBalance,
@@ -133,7 +128,6 @@
 				orderId: '',
 				tongCardPrice: 0,
 				storeId: '',
-				isDiscont: false,
 				identificationCode: '', //渠道商
 				paytypeList: [] //支付方式
 
@@ -320,7 +314,8 @@
 						"goodsType": 7,
 						"saleCount": 1,
 					}],
-					"promoteCode": this.identificationCode
+					"promoteCode": this.identificationCode,
+					"companyId": app.globalData.companyId
 				}
 				create(goods).then(res => {
 					if (res.return_code == '000000') {

subPages/trade-union-recharge/trade-union-recharge.vue

@@ -170,7 +170,8 @@
 						"goodsId": app.globalData.userInfo.id,
 						"goodsPrice": this.inputAmount,
 						"goodsType": 8,
-						"saleCount": 1,
+						"saleCount": 1,
+						"companyId": app.globalData.companyId,
 						goodsSpecName: this.cardId
 					}]
 				}