Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/jwhx into dev

modules/Order/database/seeders/OrderDatabaseSeeder.php

@@ -27,7 +27,7 @@ class OrderDatabaseSeeder extends Seeder
 			['title' => '订单', 'name' => 'order', 'path' => '/order', 'component' => '', 'type' => 'menu', 'sort' => 5, 'children' => [
 					['title' => '订单列表', 'name' => 'order.list', 'path' => '/order/list', 'component' => 'order/list', 'type' => 'menu'],
 					['title' => '售后订单', 'name' => 'order.refund', 'path' => '/order/refund', 'component' => 'order/refund', 'type' => 'menu'],
-					['title' => '置换订单联系记录', 'name' => 'exchange.list', 'path' => '/exchange/list', 'component' => 'exchange/list', 'type' => 'menu'],
+					['title' => '置换订单联系记录', 'name' => 'order.exchange', 'path' => '/order/exchange', 'component' => 'order/exchange', 'type' => 'menu'],
 				]
 			]
 		];

modules/Order/routes/admin.php

@@ -24,6 +24,6 @@ Route::name('order.')->prefix('order')->middleware(['auth.check:admin'])->group(
 		Route::put('/audit', 'audit')->name('audit');
 	});
 	Route::controller(Modules\Order\Controllers\Admin\Exchange::class)->prefix('exchange')->name('exchange.')->group(function () {
-		Route::post('/index', 'index')->name('index');
+		Route::get('/index', 'index')->name('index');
 	});
 });

resources/admin/public/config.js

@@ -7,5 +7,5 @@ const APP_CONFIG = {
 	APP_NAME: "后台管理系统",
 
 	//接口地址，如遇跨域需使用nginx代理
-	API_URL: "http://os.dxpd.cn/admin/"
+	API_URL: "https://juwu.xicheda.cn/admin/"
 }

resources/admin/src/api/module/order.js

@@ -68,5 +68,15 @@ export default{
 				return await http.put(this.url, params);
 			}
 		}
+	},
+	exchange: {
+		list: {
+			url: `${config.API_URL}order/exchange/index`,
+			name: "获得置换列表",
+			get: async function(params){
+				return await http.get(this.url, params);
+			}
+		},
+
 	}
 }

resources/admin/src/config/index.js

@@ -12,7 +12,7 @@ const DEFAULT_CONFIG = {
 	CORE_VER: "1.6.6",
 
 	//接口地址
-	API_URL: 'http://api.phpec.cn/admin/',
+	API_URL: "https://juwu.xicheda.cn/admin/",
 
 	//请求超时
 	TIMEOUT: 50000,

resources/admin/src/pages/order/exchange/index.vue

+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-input v-model="search.keyword" placeholder="关键词" style="width:150px; margin-right: 10px;" clearable></el-input>
+				<el-input v-model="search.name" placeholder="申请人" style="width:150px; margin-right: 10px;" clearable />
+				<el-input v-model="search.mobile" placeholder="手机号码" style="width:150px; margin-right: 10px;" clearable />
+				<el-button-group style="margin-left: 10px;">
+					<el-button type="primary" icon="el-icon-search" @click="upsearch">搜索</el-button>
+				</el-button-group>
+			</div>
+
+		</el-header>
+		<el-main class="nopadding">
+			<scTable tableName="member" ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" @selection-change="selectionChange" border stripe>
+				<el-table-column type="selection" width="50"></el-table-column>
+				
+				<el-table-column label="操作" fixed="right" align="center" width="140">
+					
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+
+export default{
+	name: 'order.exchange',
+	components:{
+
+	},
+	data(){
+		return {
+			dialog: {search: false, import: false, print: false},
+			list: {
+				apiObj: this.$API.order.exchange.list,
+				column: [
+					{prop: 'id', label: 'ID', width: 80},
+					{prop: 'name', label: '置换申请人', width: 120},
+					{prop: 'mobile', label: '手机号', width: 120},
+					{prop: 'address', label: '地址'},
+					{prop: 'remark', label: '行业备注'},
+					{prop: 'status', label: '状态', width: 120},
+					{prop: 'created_at', label: '添加时间', width: 140},
+				],
+			},
+			selection: [],
+			search: {},
+		}
+	},
+	methods:{
+		upsearch(){
+			this.$refs.table.reload(this.search);
+		},
+		moreUpsearch(search){
+			this.search = search;
+			this.upsearch();
+		},
+		moreSearch(){
+			this.dialog.search = true
+			this.$nextTick(() => {
+				this.$refs.searchBox.open().setData(this.search)
+			})
+		},
+		//表格选择后回调事件
+		selectionChange(selection){
+			this.selection = selection;
+		}
+	}
+}
+</script>