退单联调

src/pages.json

@@ -6,12 +6,6 @@
 		}
 	},
 	"pages": [
-		{
-			"path": "pages/settings/fare",
-			"style": {
-				"navigationBarTitleText": "广誉源"
-			}
-		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -354,6 +348,13 @@
 				}  
 			}
 		},
+    // 免车费规则设置
+    {
+			"path": "pages/settings/fare",
+			"style": {
+				"navigationBarTitleText": "免车费设置"
+			}
+		},
 		//商户订单
 		{
 			"path": "pages/my/js_order",

src/pages/order/order.vue

@@ -216,14 +216,10 @@ export default {
       }
       let params = {
 				cId: this.cancelOrderPopup.cId,
-        cNote: this.cancelOrderPopup.reason
+        cancelReason: this.cancelOrderPopup.reason
 			}
 			cancleOrder(params).then(res => {
 				if (res.data.code == 200) {
-					uni.showToast({
-						title: '已取消',
-						icon: 'none'
-					})
           this.cancelOrderPopup.isOk = true
 					this.$refs.paging.reload();
 				} else {

src/pages/settings/fare.vue

@@ -71,6 +71,14 @@
 		<u-gap height="100"></u-gap>
 
 		<view class="footer-bar">
+      <u-button 
+				text="返回" 
+				color="#666" 
+				shape="circle" 
+				plain
+				customStyle="height: 48px; font-size: 16px; margin-right: 20px;"
+				@click="onBack"
+			></u-button>
 			<u-button 
 				text="保存" 
 				color="#1ecbc3" 
@@ -309,6 +317,11 @@ export default {
                         });
                     }
                 })
+        },
+        onBack() {
+          uni.navigateBack({
+            delta: 1
+          });
         }
     }
 }