no message

pages.json

@@ -762,6 +762,9 @@
 				},
 				{
 					"path": "visa_MyOrder" //签证-我的订单
+				},
+				{
+					"path": "visa_SureOrder" //签证-订单详情
 				}
 			]
 		}

pages/visa/visaDetail.vue

@@ -133,7 +133,7 @@
 					<text style="font-size: 22rpx">¥</text>
 					<!-- 原b2b -->
 					<text style="font-size: 40rpx;font-family: nav-font;">{{discountPrice}}</text>
-					<text style="font-size: 22rpx">/起</text>
+					<text style="font-size: 22rpx">/人</text>
 				</view>
 				<view style="display: flex; align-items: center">
 					<!-- #ifdef MP-WEIXIN -->

pages/visa/visaList.vue

@@ -82,7 +82,7 @@
             </view>
             <view class="col column">
                 <view style="padding: 0 30rpx 0 30rpx;">
-                    <view class="uDropdownBox" v-if="scrollTop <=20">
+                    <view class="uDropdownBox">
                         <u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444">
                             <u-dropdown-item class="col" v-model="msg.ManagementName" 
                             :title="optionsTitle[0]" :options="VisaTypeList"
@@ -131,7 +131,7 @@
                                                     </view>
                                                     <view class="visaListNumR">
                                                         <text style="font-size: 20rpx;">CNY</text>
-                                                        <text class="price-Num">{{ item.visaB2CPrice }}</text>
+                                                        <text class="price-Num">{{ $utils.getretailer()?item.visaPrice:item.visaB2CPrice }}</text>
                                                         <text class="price-stuff" style="font-size: 20rpx;color: rgba(164, 164, 164, 1)">元</text>
                                                     </view>
                                                 </view>
@@ -314,7 +314,6 @@ export default {
                                 value: Countrys[i].Id,
                             })
                         }
-
                         let VisaTypeList = res.data.VisaTypeList
                         let VisaType = {
                             Id: 0,

pages/visa/visa_MyOrder.vue

@@ -101,7 +101,7 @@
 					<view class="jz_OrderList" v-for="(item, index) in dataList" :key="index" @click="goOrderDetail(item)">
 						<view class="jz_OrderTop">
 							<view class="jz_Oleft" :class="{ isShowAll: !item.isShowHalf }">
-								{{ item.title }}
+								{{ item.name }}
 							</view>
 							<view style="margin-left: 10px">
 								<u-icon name="arrow-down" @click.native.stop="getShow(item)" v-if="item.isShowHalf" color="#2979ff" size="28"></u-icon>
@@ -113,13 +113,13 @@
 						</view>
 						<view style="display: flex">
 							<view class="jz_MyOrder_img">
-								<img mode="aspectFill" v-if="item.imgCover && item.imgCover.length>0" :src="item.imgCover[0].url" alt="" />
+								<img mode="aspectFill" v-if="item.coverImageList && item.coverImageList.length>0" :src="item.coverImageList[0].url" alt="" />
 							</view>
 							<view class="jz_XiaDan">
-								<view>下单时间：{{ item.createDate }}</view>
-								<view style="margin-top: 22rpx">订单总额：¥{{ item.preferPrice }},
+								<view>下单时间：{{ item.createTime }}</view>
+								<view style="margin-top: 22rpx">订单总额：¥{{ item.dueInMoney }},
 									<text v-if="item.discountMoney&&item.discountMoney>0" style="margin-left: 15px;">优惠金额：￥<text style="color:indianred">{{item.discountMoney}}</text></text>
-									<text style="margin-left: 15px;">已付款金额：￥<text style="color:indianred">{{item.customerPayMoney?item.customerPayMoney:0}}</text></text>
+									<text v-if="item.customerPayMoney>0" style="margin-left: 15px;">已付款金额：￥<text style="color:indianred">{{item.customerPayMoney?item.customerPayMoney:0}}</text></text>
 								</view>
 							</view>
 						</view>
@@ -129,7 +129,7 @@
 								<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" text="待发放优惠券" size="mini" v-if="item.autoCouponId==0"></u-tag>
 								<u-tag mode="plain" border-color="#1d1d1d" color="#1d1d1d" text="已发放优惠券" size="mini" v-else-if="item.autoCouponId==1"></u-tag>
 							</view>
-							<view class="jz_Zailai" style="margin-right: 10rpx" @click.stop="gojz_List">再来一单</view>
+							<view class="jz_Zailai" style="margin-right: 10rpx" @click.stop="govisa_List">再来一单</view>
 							<!-- #ifdef MP-WEIXIN -->
 
 							<!-- <button v-if="item.orderState == 2" class="jz_Zailai" @click.stop="goZhifu(item)" style="width: 110rpx; margin-right: 10rpx; margin-left: 0rpx">
@@ -139,7 +139,7 @@
 							<!-- #ifdef MP-ALIPAY -->
 							<view v-if="item.orderState == 2" class="jz_Zailai" style="width: 110rpx; margin-right: 10rpx" @click.stop="goZhifuAli(item)">付款</view>
 							<!-- #endif -->
-							<view v-if="item.isApplyForCancel != 1 && item.orderState != 4 && item.customerPayMoney==0" class="jz_Zailai"
+							<view v-if="item.isApplyForCancel != 1 && item.visaOrderStatus != 3 && item.customerPayMoney==0" class="jz_Zailai"
 							 style="width: 110rpx" @click.stop="goCancel(item)">取消</view>
 						</view>
 					</view>
@@ -267,7 +267,7 @@
 			},
 			goOrderDetail(item) {
 				uni.navigateTo({
-					url: "/pages/jiuzhai/jz_SureOrder?orderId=" + item.orderId,
+					url: "/pages/visa/visa_SureOrder?orderId=" + item.id,
 				});
 			},
 			change(i) {
@@ -287,9 +287,9 @@
 				this.$forceUpdate();
 			},
 			//跳转
-			gojz_List() {
+			govisa_List() {
 				uni.navigateTo({
-					url: "/pages/jiuzhai/jz_Line",
+					url: "/pages/visa/visaList",
 				});
 			},
 			lower(e) {
@@ -313,9 +313,6 @@
 				if (type == 1) {
 					this.dataList = [];
 				}
-				// this.msg.MiniAppUserId = this.userInfo.UserId;
-				// this.msg.CustomerId = this.b2b_user_info.customerId;
-				// this.msg.DirectCustomerId = this.b2b_user_info.directCustomerId
 				this.apipost(
 					"b2c_get_GetB2BOrderVisaOrderList",
 					this.msg,