Ver Fonte

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei há 4 anos atrás
pai
commit
386c91f123
2 ficheiros alterados com 18 adições e 15 exclusões
  1. 13 10
      pages/order/order.vue
  2. 5 5
      pages/order/orderDetail.vue

+ 13 - 10
pages/order/order.vue

@@ -12,7 +12,7 @@
 						 @click="viewRow(item)">
 							<view class="check-row">
 								<view class="createDate">{{item.createDate}}</view>
-								<view>{{item.orderState}}</view>
+								<view>{{item.orderStateDictValue}}</view>
 							</view>
 							<view class="bundle-list" v-for="row in item.orderGoodsList" :key="row.id">
 								<view class="img-cont">
@@ -31,27 +31,27 @@
 									<text class="total-text">
 										共{{item.goodsNum}}件商品
 									</text>
-									<text v-if="item.orderState=='待支付'"><text class="money-total">应付</text><text class="price-num">{{item.originalGold}}</text>
+									<text v-if="item.orderStateDictValue=='待支付'"><text class="money-total">应付</text><text class="price-num">{{item.originalGold}}</text>
 										<text class="price-text">乐豆</text></text>
 									<text v-else><text class="money-total">实付</text><text class="price-num">{{item.payGold}}</text> <text class="price-text">乐豆</text></text>
 								</view>
 							</view>
 							<view class="check-row">
-								<view v-if="item.orderState=='WAIT_PAY'"  class="text-right left-time">
+								<view v-if="item.orderStateDictValue=='待支付'"  class="text-right left-time">
 										<text style="margin-right: 20upx;">
 											支付剩余
 										</text>
 										<u-count-down @end="getRow" style="margin-right: 20upx;" separator ="zh" :timestamp="filterTime(item.orderTime)" :show-days="false" :show-hours="false"></u-count-down>
 									<u-button :custom-style="btnStyle" @click="toPay(item)"  shape="circle" type="error" size="medium">去支付</u-button>
 								</view>
-								<view v-if="item.orderState=='WAIT_SEND'" class="text-right">
+								<view v-if="item.orderStateDictValue=='待发货'" class="text-right">
 									<u-button :custom-style="btnStyle" @click="showTip" shape="circle" size="medium">提醒发货</u-button>
 								</view>
-								<view v-if="item.orderState=='SEND_ALL'" class="text-right">
+								<view v-if="item.orderStateDictValue=='已发货'" class="text-right">
 									<u-button @click="showLog(item)" :custom-style="btnStyle" style="margin-right: 20upx;" shape="circle" size="medium">查看物流</u-button>
 									<u-button :custom-style="btnStyle" shape="circle" type="primary" size="medium">确认收货</u-button>
 								</view>
-								<view v-if="item.orderState=='FINISH'" class="text-right">
+								<view v-if="item.orderStateDictValue=='已完成'" class="text-right">
 									<u-button @click="showLog(item)" :custom-style="btnStyle" shape="circle" size="medium">查看物流</u-button>
 								</view>
 							</view>
@@ -340,10 +340,13 @@
 					this.btnLoading = false
 					if(res.status == 200) {
 						this.showLeavePsw = false
-						// 跳转到支付完成界面
-						uni.navigateTo({
-							url:"/pages/toOrder/payFinish?id=" + this.orderId
-						})
+						setTimeout(()=>{
+							// 跳转到支付完成界面
+							uni.navigateTo({
+								url:"/pages/toOrder/payFinish?id=" + this.orderId
+							})
+						},300)
+						
 					} else{
 						uni.showToast({
 							title: res.message,

+ 5 - 5
pages/order/orderDetail.vue

@@ -3,11 +3,11 @@
 		<view class="order-info">
 			<!-- 订单状态 -->
 			<view class="order-status">
-				<view class="status-title">{{orderInfo.orderState}}</view>
-				<view v-if="orderInfo.orderState=='WAIT_PAY'" class="status-care">
+				<view class="status-title">{{orderInfo.orderStateDictValue}}</view>
+				<view v-if="orderInfo.orderStateDictValue=='待支付'" class="status-care">
 					请在 <text>29</text>分钟内付款,过期系统将自动取消订单
 				</view>
-				<view v-if="orderInfo.orderState=='CANCEL'" class="status-care">
+				<view v-if="orderInfo.orderStateDictValue=='已取消'" class="status-care">
 					超时未支付,系统已自动取消订单
 				</view>
 			</view>
@@ -55,13 +55,13 @@
 				<u-cell-item title="运费" :value-style="{color: '#000',fontSize: '28upx'}" :arrow="false">
 					免运费
 				</u-cell-item>
-				<u-cell-item :title="(orderInfo.orderState=='待支付'||orderInfo.orderState=='已取消') ? '待支付':'实际支付'" :value-style="{color: '#000',fontSize: '28upx'}"
+				<u-cell-item :title="(orderInfo.orderStateDictValue=='待支付'||orderInfo.orderStateDictValue=='已取消') ? '待支付':'实际支付'" :value-style="{color: '#000',fontSize: '28upx'}"
 				 :arrow="false">
 					<text class="price-num">{{orderInfo.originalGold}}</text> <text class="price-text">乐豆</text>
 				</u-cell-item>
 			</u-cell-group>
 		</view>
-		<view v-if="orderInfo.orderState=='WAIT_PAY'" class="footer">
+		<view v-if="orderInfo.orderStateDictValue=='待支付'" class="footer">
 			<u-button @click="toPay" type="error">去支付</u-button>
 		</view>
 		<!-- 提示用户设置支付密码 -->