App.vue

@@ -91,16 +91,6 @@
 		weight: 40rpx;
 		height: 40rpx;
 	}
-	//按钮
-	.numberBut {
-		width: 130rpx;
-		height: 48rpx;
-	}
-	
-	.nullBut {
-		width: 159rpx;
-		height: 48rpx;
-	}
 
 	.ls {
 		background-color: #007aff;

components/orderItem/orderItem.vue

@@ -154,4 +154,14 @@
 	.priceBox {
 		margin-top: 85rpx;
 	}
+
+	.numberBut {
+		width: 130rpx;
+		height: 48rpx;
+	}
+
+	.nullBut {
+		width: 159rpx;
+		height: 48rpx;
+	}
 </style>

pages.json

@@ -58,13 +58,13 @@
 			}
 		},
 		{
-			"path" : "pages/order/index",
+			"path" : "pages/main/order",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/order/refund",
+			"path" : "pages/shop/refund",
 			"style" : 
 			{
 				"navigationStyle": "custom"

pages/index/index.vue

@@ -13,7 +13,7 @@
 				</navigator>
 				<u-icon name="arrow-right"></u-icon>
 			</view>
-			<navigator url="/pages/order/index">
+			<navigator url="/pages/main/order">
 				<view class="flex column mc mac m-r-24 w-80rpx h-80rpx">
 					<u-icon size="48rpx" name="order"></u-icon>
 					<view class="fz24">订单</view>
@@ -31,7 +31,7 @@
 			<navigator url="/pages/shop/list">
 				<mainBut bg="#D43030" imgSrc="/static/icons/ordernow.svg" butBt="开始点餐" butSt="Order Now" />
 			</navigator>
-			<navigator url="/pages/order/index">
+			<navigator url="/pages/main/order">
 				<mainBut bg="#FF8D1A" imgSrc="/static/icons/buggoods.svg" butBt="购买商品" butSt="Buy Goods" />
 			</navigator>
 			<!-- <mainBut bg="#FFC300" imgSrc="/static/icons/franchise.svg" butBt="项目介绍" butSt="Introduction" /> -->

pages/shop/confirm.vue

@@ -290,7 +290,7 @@
 			//购物车没有信息 跳转到订单查询页面
 			if (this.$store.state.cartList.length === 0) {
 				uni.redirectTo({
-					url: '/pages/order/index'
+					url: '/pages/main/order'
 				})
 			}
 		}

pages/shop/pay.vue

@@ -136,7 +136,7 @@
 						// 延迟跳转到首页
 						setTimeout(() => {
 							uni.reLaunch({
-								url: '/pages/order/index',
+								url: '/pages/main/order',
 							})
 						}, 1500) // 1.5秒后跳转
 						console.error(res.data.msg)
@@ -160,7 +160,7 @@
 						// 延迟跳转到首页
 						setTimeout(() => {
 							uni.reLaunch({
-								url: '/pages/order/index',
+								url: '/pages/main/order',
 							})
 						}, 1500) // 1.5秒后跳转
 					},
@@ -173,7 +173,7 @@
 						// 延迟跳转到首页
 						setTimeout(() => {
 							uni.reLaunch({
-								url: '/pages/order/index',
+								url: '/pages/main/order',
 							})
 						}, 1500) // 1.5秒后跳转
 					}

pages/shop/refund.vue

@@ -109,16 +109,6 @@
 				<view class="extra-space1"></view>
 			</view>
 		</u-popup>
-		<!-- 按钮 -->
-		<view class="m-l-24 m-r-24 m-t-24 flex mr">
-			<view class="nullBut border fcb rad8 fz28 flex mac mc">
-				联系客服
-			</view>
-			<view class="numberBut fci rad8 fz28 fb flex mac mc m-l-24" @click="handleSubmit"
-				:class="isPressed?'bg-g':'bg-m'">
-				确认
-			</view>
-		</view>
 	</view>
 </template>
 
@@ -140,8 +130,6 @@
 				currentRemark: -1, // 当前选中的退款有缘索引
 				refund_remarkValue: '', // 退款说明 其他输入的内容
 				txtmaxlength: 30, //退款说明 其他文本框最多字数限制
-				
-				isPressed: false, //提交按钮是否锁定
 
 			}
 		},
@@ -176,69 +164,6 @@
 					this.requestRefund_price = Number(this.fullPrice)
 				}
 			},
-			//提交订单
-			handleSubmit() {
-				if (this.isPressed) { //防止提交订单按钮重复点击
-					return
-				}
-				
-				this.isPressed = true
-				
-				//提交前检查
-				if(!this.refund_remarkDescription){
-					uni.showToast({
-						title: '请填写退款说明',
-						icon: 'error'
-					})
-					this.isPressed = false
-					return
-				}
-				if(Number(this.requestRefund_price)===0){
-					uni.showToast({
-						title: '请填写退款额',
-						icon: 'error'
-					})
-					this.isPressed = false
-					return
-				}
-				
-				//提交
-				uni.$u.http.post('/Api/Check/refundOrder', {
-					order_sn:this.order_sn, //订单号
-					shop_id: this.$store.state.shop_id, //商铺id
-					apply_price:Number(this.requestRefund_price), //申请价格
-					refund_remark:this.refund_remarkDescription //退款说明
-				}, {
-					header: {
-						'Token': this.$store.state.userInfo.token,
-						'Content-Type': 'application/x-www-form-urlencoded'
-					}
-				}).then(res => {
-					//成功申请退款
-					if (res.data.status === 1) {
-						//跳转到订单 退款tab页面
-						// uni.navigateTo({
-						// 	url: `/pages/shop/pay?order_sn=${res.data.order_sn}&fullPrice=${fullPrice}`
-						// })
-					} else if (res.data.status === -1) {
-						uni.removeStorage({ //清除用户信息 跳转首页
-							key: 'userInfo',
-							success: (res) => {
-								this.$store.commit('clearUserInfo')
-								uni.redirectTo({
-									url: '/pages/index/index'
-								})
-							}
-						})
-					} else {
-						uni.showToast({
-							title: res.data.msg,
-							icon: 'error'
-						})
-						this.isPressed = false
-					}
-				})
-			}
 		},
 		filters: {
 			parseTime, //日期 格式化