优惠券

pages/coupons/coupons.vue

@@ -23,7 +23,7 @@
 					<view class="coupons-right">
 						<view class="coupons-dayrules" v-if="currentIndex===0">{{item.description}}</view>
 						<view class="coupons-getbtn" v-if="currentIndex===0" @click="get_coupons(item)">立即领取</view>
-						<view class="coupons-getbtn" v-if="currentIndex===2">查看订单</view>
+						<view class="coupons-getbtn" v-if="currentIndex===2" @click="goto_orderDetail(item)">查看订单</view>
 					</view>
 				</view>
 				<view class="ribbon"
@@ -85,6 +85,7 @@
 			handleTabClick(e) {
 				this.currentIndex = e.id;
 				this.form_submit.status=e.id
+				this.toBeclaimedCoupons=[]
 				this.get_TobeclaimedCoupons()
 			},
 			get_TobeclaimedCoupons() {
@@ -119,7 +120,11 @@
 					});
 				})
 			},
-			
+			goto_orderDetail(e){
+				uni.navigateTo({
+					url:`/pages/order-detail/order-detail?orderId=${e.useOrderId}`
+				})
+			},
 			get_coupons(e){
 				this.$api.base("post", "/couponApi/receive", {templateId:e.id}, {}).then(res => {
 					if(res.code==0){

pages/order-detail/order-detail.vue

@@ -1,7 +1,9 @@
 <template>
 	<ax-body>
-		<view class="page-background"><image src="@/static/img/my-bg.svg" mode="widthFix"></image></view>
-		
+		<view class="page-background">
+			<image src="@/static/img/my-bg.svg" mode="widthFix"></image>
+		</view>
+
 		<view class="body">
 			<!-- 基础信息 -->
 			<view class="base-info">
@@ -10,42 +12,100 @@
 						<image src="@/static/img/order-detail-icon.png" class="icon" mode="widthFix"></image>
 						<text>充电度数</text>
 					</view>
-					<view class="val"><text class="value">{{orderInfo.totalCharge || 0}}</text><text class="unit">度电</text></view>
+					<view class="val"><text class="value">{{orderInfo.totalCharge || 0}}</text><text
+							class="unit">度电</text></view>
 				</view>
 				<image src="@/static/img/order-detail-bg.png" class="bg" mode="widthFix"></image>
 			</view>
 			<!-- 单元格 -->
 			<view class="cell-group multi-line">
-				<view class="cell"><view class="lable">起始时间</view><view class="contet">{{orderInfo.startTime || '未知'}}</view></view>
-				<view class="cell"><view class="lable">终止时间</view><view class="contet">{{orderInfo.endTime || '未知'}}</view></view>
-				<view class="cell"><view class="lable">终止方式</view><view class="contet">{{getStopType()}}</view></view>
+				<view class="cell">
+					<view class="lable">起始时间</view>
+					<view class="contet">{{orderInfo.startTime || '未知'}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">终止时间</view>
+					<view class="contet">{{orderInfo.endTime || '未知'}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">终止方式</view>
+					<view class="contet">{{getStopType()}}</view>
+				</view>
 			</view>
 			<view class="cell-group" v-if="orderInfo.maspStatus!=0">
 				<template v-if="orderInfo.maspStatus===1">
-					<view class="cell"><view class="load-payment">待补缴</view><view class="load-payment-btn" @click="$app.url.goto('/pages/coupon-buy/coupon-buy')">去补缴</view></view>
-					<view class="cell"><view class="lable">超充金额</view><view class="flow-money">{{(orderInfo.maspAmount+orderInfo.maspRealAmount).toFixed(2)||'0'}}元</view></view>
+					<view class="cell">
+						<view class="load-payment">待补缴</view>
+						<view class="load-payment-btn" @click="$app.url.goto('/pages/coupon-buy/coupon-buy')">去补缴</view>
+					</view>
+					<view class="cell">
+						<view class="lable">超充金额</view>
+						<view class="flow-money">{{(orderInfo.maspAmount+orderInfo.maspRealAmount).toFixed(2)||'0'}}元
+						</view>
+					</view>
 				</template>
 				<template v-else-if="orderInfo.maspStatus===2">
 					<view class="finish-payment">已补缴</view>
-					<view class="cell"><view class="lable">超充金额</view><view class="contet">{{(orderInfo.maspAmount+orderInfo.maspRealAmount).toFixed(2)}}</view></view>
-					<view class="cell"><view class="lable">补缴时间</view><view class="contet">{{orderInfo.maspTime}}</view></view>
+					<view class="cell">
+						<view class="lable">超充金额</view>
+						<view class="contet">{{(orderInfo.maspAmount+orderInfo.maspRealAmount).toFixed(2)}}</view>
+					</view>
+					<view class="cell">
+						<view class="lable">补缴时间</view>
+						<view class="contet">{{orderInfo.maspTime}}</view>
+					</view>
 				</template>
 			</view>
 			<!-- 单元格 -->
 			<view class="cell-group">
-				<view class="cell"><view class="lable">订单状态</view><view class="contet">{{getOrderStatus(orderInfo.status)}}</view></view>
-				<view class="cell"><view class="lable">订单编号</view><view class="contet">{{orderInfo.id}}</view></view>
-				<view class="cell"><view class="lable">订单时间</view><view class="contet">{{orderInfo.createTime}}</view></view>
-				<view class="cell"><view class="lable">充电电站</view><view class="contet">{{deviceInfo.thirdPartyStationName}}</view></view>
-				<view class="cell"><view class="lable">终端名称</view><view class="contet">{{deviceInfo.deviceName}}</view></view>
-				<view class="cell"><view class="lable">终端编号</view><view class="contet">{{deviceInfo.deviceNo}}</view></view>
-				<view class="cell"><view class="lable">车位编号</view><view class="contet">{{deviceInfo.parkNo ? deviceInfo.parkNo : "无"}}</view></view>
+				<view class="cell">
+					<view class="lable">订单状态</view>
+					<view class="contet">{{getOrderStatus(orderInfo.status)}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">订单编号</view>
+					<view class="contet">{{orderInfo.id}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">订单时间</view>
+					<view class="contet">{{orderInfo.createTime}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">充电电站</view>
+					<view class="contet">{{deviceInfo.thirdPartyStationName}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">终端名称</view>
+					<view class="contet">{{deviceInfo.deviceName}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">终端编号</view>
+					<view class="contet">{{deviceInfo.deviceNo}}</view>
+				</view>
+				<view class="cell">
+					<view class="lable">车位编号</view>
+					<view class="contet">{{deviceInfo.parkNo ? deviceInfo.parkNo : "无"}}</view>
+				</view>
 				<!-- <view class="cell"><view class="lable">电费</view><view class="contet">{{orderInfo.thirdPartyElecfee?orderInfo.thirdPartyElecfee.toFixed(4):"0.0000"}}元</view></view>
 				<view class="cell"><view class="lable">服务费</view><view class="contet">{{clcaServicePrice(orderInfo)}}元</view></view> -->
 				<view class="hr"></view>
-				<view class="cell" v-if="orderInfo.discountMoney"><view class="lable">{{orderInfo.discountDes}}</view><view class="contet sum">-{{orderInfo.discountMoney?orderInfo.discountMoney.toFixed(4):"0.0000"}}元</view></view>
-				<view class="cell" v-if="orderInfo.firmPrice"><view class="lable">企业专享价减</view><view class="contet sum">-{{orderInfo.firmPrice?orderInfo.firmPrice.toFixed(4):"0.0000"}}元</view></view>
-				<view class="cell"><view class="lable">实际结算费用</view><view class="contet sum">{{orderInfo.realCost?orderInfo.realCost.toFixed(4):"0.0000"}}元</view></view>
+				<view class="cell" v-if="orderInfo.discountMoney">
+					<view class="lable">{{orderInfo.discountDes}}</view>
+					<view class="contet sum">-{{orderInfo.discountMoney?orderInfo.discountMoney.toFixed(4):"0.0000"}}元
+					</view>
+				</view>
+				<view class="cell" v-if="orderInfo.firmPrice">
+					<view class="lable">企业专享价减</view>
+					<view class="contet sum">-{{orderInfo.firmPrice?orderInfo.firmPrice.toFixed(4):"0.0000"}}元</view>
+				</view>
+				<view class="cell" v-if="orderInfo.couponPrice">
+					<view class="lable">优惠券减</view>
+					<view class="contet sum">-{{orderInfo.couponPrice?orderInfo.couponPrice.toFixed(4):"0.0000"}}元</view>
+				</view>
+				<view class="cell">
+					<view class="lable">实际结算费用</view>
+					<view class="contet sum">{{orderInfo.realCost?orderInfo.realCost.toFixed(4):"0.0000"}}元</view>
+				</view>
 			</view>
 			<view class="tips">
 				<image src="@/static/img/warn.svg" class="icon"></image>
@@ -63,49 +123,53 @@
 		},
 		data() {
 			return {
-				orderInfo : {id:1},//订单信息
-				deviceInfo : {},//充电桩详情
+				orderInfo: {
+					id: 1
+				}, //订单信息
+				deviceInfo: {}, //充电桩详情
 			}
 		},
 		methods: {
-			getStopType(){
+			getStopType() {
 				var str = "用户主动终止";
-				if(this.orderInfo.stopType){
-					if(this.orderInfo.stopType == 1){
+				if (this.orderInfo.stopType) {
+					if (this.orderInfo.stopType == 1) {
 						str = "用户主动终止";
-					}else if(this.orderInfo.stopType == 2){
+					} else if (this.orderInfo.stopType == 2) {
 						str = "充电桩主动终止";
 					}
 				}
 				return str;
 			},
-			clcaServicePrice(){
+			clcaServicePrice() {
 				var serivp = this.orderInfo.realCost - this.orderInfo.thirdPartyElecfee;
-				if(this.orderInfo.discountMoney){
+				if (this.orderInfo.discountMoney) {
 					//有优惠价，服务费显示把优惠价加回去
 					serivp = serivp + this.orderInfo.discountMoney;
 				}
-				return serivp?serivp.toFixed(4):"0.0000"
+				return serivp ? serivp.toFixed(4) : "0.0000"
 			},
 			//查询订单详情
-			getOrderInfo(orderId){
-				this.$api.base("post","/chargeApi/queryIsSuccessStop",{"id":orderId},{}).then(res=>{
+			getOrderInfo(orderId) {
+				this.$api.base("post", "/chargeApi/queryIsSuccessStop", {
+					"id": orderId
+				}, {}).then(res => {
 					console.log("订单详情：", res)
 					this.orderInfo = res.obj.orderInfo;
 					this.deviceInfo = res.obj.deviceInfo;
 				})
 			},
 			//拆解时间
-			splitTime(time,index){
-				if(!time){
+			splitTime(time, index) {
+				if (!time) {
 					return;
 				}
 				return time.split(" ")[index];
 			},
-			getOrderStatus(status){
+			getOrderStatus(status) {
 				var str = "";
 				//状态0待启动 1 充电中 2 结算中 3 已完成, 5未成功充电
-				switch(status){
+				switch (status) {
 					case 0:
 						str = "待启动";
 						break;
@@ -120,7 +184,7 @@
 						break;
 					case 5:
 						str = "未成功充电";
-						break;				
+						break;
 				}
 				return str;
 			}
@@ -129,5 +193,5 @@
 </script>
 
 <style scoped>
-@import url("order-detail.css");
-</style>
+	@import url("order-detail.css");
+</style>

pages/order/order.vue

@@ -23,7 +23,7 @@
 					<view class="bottom" @click="toOrderDeile(item)">
 						<view class="money-txt">充电费用：</view>
 						<view class="money">
-							<text style="color:red;" v-if="item.discountMoney||item.firmPrice">共减 ￥{{(item.discountMoney+item.firmPrice).toFixed(4)}}</text>
+							<text style="color:red;" v-if="item.discountMoney||item.firmPrice">共减 ￥{{(item.discountMoney+item.firmPrice+item.couponPrice).toFixed(4)}}</text>
 							<text style="width: 20rpx;display: inline-block;"></text>
 							<text :style="{color:`${item.discountMoney||item.firmPrice?'':'red'}`}"><text v-if="item.discountMoney||item.firmPrice">实付</text> ￥{{item.realCost.toFixed(4) || ''}}</text>
 						</view>

unpackage/dist/dev/mp-weixin/pages/coupons/coupons.js

@@ -144,7 +144,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -238,6 +238,7 @@ var _default = {
     handleTabClick: function handleTabClick(e) {
       this.currentIndex = e.id;
       this.form_submit.status = e.id;
+      this.toBeclaimedCoupons = [];
       this.get_TobeclaimedCoupons();
     },
     get_TobeclaimedCoupons: function get_TobeclaimedCoupons() {
@@ -273,6 +274,11 @@ var _default = {
         });
       });
     },
+    goto_orderDetail: function goto_orderDetail(e) {
+      uni.navigateTo({
+        url: "/pages/order-detail/order-detail?orderId=".concat(e.useOrderId)
+      });
+    },
     get_coupons: function get_coupons(e) {
       var _this3 = this;
       this.$api.base("post", "/couponApi/receive", {
@@ -288,6 +294,7 @@ var _default = {
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/order-detail/order-detail.js

@@ -146,7 +146,11 @@ var render = function () {
     _vm.orderInfo.firmPrice && _vm.orderInfo.firmPrice
       ? _vm.orderInfo.firmPrice.toFixed(4)
       : null
-  var g4 = _vm.orderInfo.realCost ? _vm.orderInfo.realCost.toFixed(4) : null
+  var g4 =
+    _vm.orderInfo.couponPrice && _vm.orderInfo.couponPrice
+      ? _vm.orderInfo.couponPrice.toFixed(4)
+      : null
+  var g5 = _vm.orderInfo.realCost ? _vm.orderInfo.realCost.toFixed(4) : null
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       return _vm.$app.url.goto("/pages/coupon-buy/coupon-buy")
@@ -163,6 +167,7 @@ var render = function () {
         g2: g2,
         g3: g3,
         g4: g4,
+        g5: g5,
       },
     }
   )
@@ -262,6 +267,66 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   onLoad: function onLoad(opts) {
     console.log("启动充值页面的参数：", opts);

unpackage/dist/dev/mp-weixin/pages/order/order.js

@@ -134,7 +134,7 @@ var render = function () {
     var m1 = _vm.getSates(item)
     var g0 =
       item.discountMoney || item.firmPrice
-        ? (item.discountMoney + item.firmPrice).toFixed(4)
+        ? (item.discountMoney + item.firmPrice + item.couponPrice).toFixed(4)
         : null
     var g1 = item.realCost.toFixed(4) || ""
     var g2 =