1

datas/enum.ts

@@ -11,8 +11,9 @@ export enum OrderStatus {
 	'完成填写基本信息' = 1,
 	'完成个人/单位信息上传' = 2,
 	'完成车辆信息上传' = 3,
-	// '待支付' = 4,
-	'待支付' = 26,
+	'待支付1' = 4,
+	'待支付2' = 26,
+	'待支付3' = 27,
 	'已支付' = 5,
 	'待审核' = 6,
 	'审核不通过' = 7,

pages/order/components/order-list-item-new.vue

@@ -48,7 +48,15 @@
 			</view>
 
 			<!-- 待支付 -->
-			<view class="btns" v-if="item.orderStep == OrderStatus.待支付">
+			<view class="btns" v-if="item.orderStep == OrderStatus.待支付1">
+				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
+				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
+			</view>
+			<view class="btns" v-if="item.orderStep == OrderStatus.待支付2">
+				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
+				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
+			</view>
+			<view class="btns" v-if="item.orderStep == OrderStatus.待支付3">
 				<view class="btn btn-normal" @click.stop="gotoCancelOrder(item)">取消订单</view>
 				<view class="btn btn-primary" @click.stop="gotoOrderDetails(item)">支付</view>
 			</view>

subpackage/applyCard/choice-product.vue

@@ -19,15 +19,15 @@
             {{ item.promoteName }}
           </view>
 		  <!-- 1记账卡2储值卡3记存卡 -->
-          <view style="margin-top: 15rpx" class="tip" v-if="item.cardType=='1'">
+          <!-- <view style="margin-top: 15rpx" class="tip" v-if="item.cardType=='1'">
             记账卡
-          </view>
-		  <view style="margin-top: 15rpx" class="tip" v-else>
-		    储值卡
+          </view> -->
+		  <view style="margin-top: 15rpx" class="tip">
+		    {{ item.cardTypeArr }}
 		  </view>
         </view>
 		<view class="money">
-		  ￥：{{ item.fee * 0.01 }}
+		  ￥：{{ item.oncePrice * 0.01 }}
 		</view>
       </view>
     </view>
@@ -132,19 +132,19 @@ onLoad((option: any) => {
     console.log(data);
     // console.log(typeof(data));
     state.dataArray = data.csmsnPromoteDistPro ?? [];
-	// for(var i=0;i<state.dataArray.length;i++){
-	// 	for(var j=0;j<state.dataArray[i].cardType.length;j++){
-	// 		const cardTypeArr=[]
-	// 		if(state.dataArray[i].cardType[j]=='1'){
-	// 			cardTypeArr.push('记账卡')
-	// 		}else if(state.dataArray[i].cardType[j]=='2'){
-	// 			cardTypeArr.push('储值卡')
-	// 		}else if(state.dataArray[i].cardType[j]=='3'){
-	// 			cardTypeArr.push('记存卡')
-	// 		}
-	// 	}
-	// 	state.dataArray[i].cardTypeArr=cardTypeArr.toString()
-	// }
+	for(var i=0;i<state.dataArray.length;i++){
+		const cardTypeArr=[]
+		for(var j=0;j<state.dataArray[i].cardType.length;j++){
+			if(state.dataArray[i].cardType[j]=='1'){
+				cardTypeArr.push('记账卡')
+			}else if(state.dataArray[i].cardType[j]=='2'){
+				cardTypeArr.push('储值卡')
+			}else if(state.dataArray[i].cardType[j]=='3'){
+				cardTypeArr.push('记存卡')
+			}
+		}
+		state.dataArray[i].cardTypeArr=cardTypeArr.toString()
+	}
 	console.log("state.dataArray",state.dataArray)
   });
 });

subpackage/applyCard/essential-information.vue

@@ -319,7 +319,7 @@ const orderStepGoActon = (val: any) => {
     uni.redirectTo({
       url: `/subpackage/applyCard/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
     });
-  } else if (val.orderStep === 26) {
+  } else if (val.orderStep === 26 || val.orderStep === 27) {
     uni.redirectTo({
       url: `/subpackage/applyCard/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
     });

subpackage/applyCard/product-detail.vue

@@ -8,8 +8,11 @@
 			<view class="item-value">
 				<image class="icon-tip" :src="`${$imgUrl}applyCard/wechat.png`"></image>
 				<view class="content">
-					<view class="title"> 微信车主服务 </view>
-					<view style="margin-top: 15rpx" class="tip"> 先通行后付费！ </view>
+					<view class="title"> {{state.detailsObj.productName}} </view>
+					<view style="margin-top: 15rpx" class="tip"> {{state.detailsObj.releaseProduct.remarks}} </view>
+				</view>
+				<view class="price">
+					￥：{{state.detailsObj.product.oncePrice * 0.01}}
 				</view>
 			</view>
 		</view>
@@ -113,6 +116,7 @@
 		wechatAppID,
 		wechatPayConfigId,
 		wechatSecret,
+		queryDetails
 	} from "@/utils/network/api";
 	import {
 		confirm,
@@ -233,6 +237,7 @@
 		
 		console.log("data",option)
 		console.log("数组",JSON.parse(decodeURIComponent(option.data)))
+		queryDetailsData(); 
 		
 	});
 
@@ -257,7 +262,8 @@
 		type: 'center',
 		msgType: 'success',
 		messageText: '这是一条成功提示',
-		value: ''
+		value: '',
+		detailsObj:'',
 	});
 	const bindClick=(i)=>{
 		console.log(i);
@@ -317,6 +323,20 @@
 			state.list[index]['isShow']=!state.list[index]['isShow']
 			console.log("state.list",state.list)
 		}
+		const queryDetailsData=()=>{
+			const options = {
+				type: 2,
+				data: {
+					orderId: state.orderId,  //订单编号	
+				},
+				method: "POST",
+				showLoading: true,
+			};
+			request(queryDetails, options).then((res) => {
+				state.detailsObj=stringToJson(res.bizContent);
+				console.log("sdd",stringToJson(res.bizContent))
+			});
+		}
 </script>
 
 <style lang="scss" scoped>
@@ -388,9 +408,11 @@
 				position: absolute;
 				display: flex;
 				align-items: center;
-				justify-content: space-around;
+				// justify-content: space-around;
+				width: 80%;
 
 				.content {
+					width: 48%;
 					.title {
 						font-size: 32rpx;
 						font-family: Microsoft YaHei;
@@ -459,4 +481,7 @@
 		  margin-right: 12rpx;
 		  color: white;
 	}
+	.price{
+		color: white;
+	}
 </style>

utils/network/api.js

@@ -198,3 +198,5 @@ export const gongWuSupplementObu = "97"; //公务车增补obu接口
 export const querySwiper = "59b1aab2864a467fb55f028aa54b224a"; //MTS-轮播图查询所有启用信息
 
 export const addProduct="10414819633f46db98158fc7b4e8475e"  //加购权益产品
+
+export const queryDetails="8"  //查详情