Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

package-lock.json

@@ -3978,7 +3978,6 @@
           "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
           "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
           "dev": true,
-          "optional": true,
           "requires": {
             "inherits": "~2.0.0"
           }
@@ -3988,7 +3987,6 @@
           "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
           "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "hoek": "2.x.x"
           }
@@ -4007,8 +4005,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
           "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "caseless": {
           "version": "0.12.0",
@@ -4028,8 +4025,7 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "combined-stream": {
           "version": "1.0.5",
@@ -4051,15 +4047,13 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "cryptiles": {
           "version": "2.0.5",
@@ -4142,8 +4136,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
           "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "forever-agent": {
           "version": "0.6.1",
@@ -4334,7 +4327,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "1.0.1"
           }
@@ -4350,8 +4342,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isstream": {
           "version": "0.1.2",
@@ -4592,8 +4583,7 @@
           "version": "1.0.7",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
           "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "punycode": {
           "version": "1.4.1",
@@ -4636,7 +4626,6 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
           "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
           "dev": true,
-          "optional": true,
           "requires": {
             "buffer-shims": "~1.0.0",
             "core-util-is": "~1.0.0",
@@ -4691,8 +4680,7 @@
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
           "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "semver": {
           "version": "5.3.0",
@@ -4757,7 +4745,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4769,7 +4756,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
           "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.0.1"
           }
@@ -4802,7 +4788,6 @@
           "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
           "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
           "dev": true,
-          "optional": true,
           "requires": {
             "block-stream": "*",
             "fstream": "^1.0.2",
@@ -4864,8 +4849,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "uuid": {
           "version": "3.0.1",

src/api/order/rentVehicle.js

@@ -8,6 +8,32 @@ export function page(query) {
   });
 }
 
+/**
+ * 获取所有分公司
+ */
+export function getAllBranchCompany() {
+  return fetch({
+    url: '/vehicle/branchCompany',
+    method: 'get'
+  });
+}
+//根据大区Id获取分公司列表
+export function getAllBranchCompanyByZoneId(query) {
+  return fetch({
+    url: '/vehicle/branchCompany/app/unauth/getByZone',
+    method: 'get',
+		params:query
+  });
+}
+
+export function getOrderVehicleCrosstown(query) {
+  return fetch({
+    url: '/api/order/orderVehicle/getByOrderId',
+    method: 'get',
+		params:query
+  });
+}
+
 /**
  * 根据id获取一条违章查询记录
  * @param query
@@ -34,4 +60,3 @@ export function saveOrderViolation(params) {
     data: params
   });
 }
-

src/views/order/memberOrderInfo/index.vue

@@ -13,7 +13,7 @@
 					    <el-input v-model="listQuery.phone" placeholder="请输入手机号"></el-input>
 					  </el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="5">
 					  <el-form-item label="状态">
 					    <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择状态">
 								<el-option :key="null" label="无" :value="null" ></el-option>
@@ -24,14 +24,14 @@
 					    </el-select>
 					  </el-form-item>
 					</el-col>
-					<el-col>
+				<!-- 	<el-col>
 						<el-form-item label="时间">
 							<el-date-picker v-model="listQuery.startTime" type = "date" placeholder = "请输入开始时间"></el-date-picker>
 							<span>——</span>
 							<el-date-picker v-model="listQuery.endTime" type = "date" placeholder = "请输入结束时间"></el-date-picker>
 						</el-form-item>
-					</el-col>
-					<el-col :span="8">
+					</el-col> -->
+					<el-col :span="5">
 					  <el-form-item label="会员类型">
 					    <el-select class="filter-item" v-model="listQuery.name" placeholder="请选择会员类型">
 								<el-option :key="null" label="无" :value="null" ></el-option>
@@ -67,7 +67,7 @@
       </el-table-column>
 			 <el-table-column width="150" align="center" label="用户名">
 			  <template scope="scope">
-			   <span>{{scope.row.username}}</span>
+			   <span>{{scope.row.telephone}}</span>
 			  </template>
 			</el-table-column>
       <el-table-column width="110" align="center" label="商品价格">