ltlzx
/
wenhuaDate_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整antdv引起的运行错误

master
453530270@qq.com 3 years ago
parent
0eed4d04b4
commit
d371b30bb8
4 changed files with 361 additions and 417 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 546
      package-lock.json
  2. 17
      src/App.vue
  3. 51
      src/components/page/order/index.vue
  4. 2
      src/main.js

546
package-lock.json
View File

File diff suppressed because it is too large

17
src/App.vue
View File

@ -1,22 +1,23 @@
<template> <template>
<a-locale-provider :locale="zh_CN"> <a-config-provider :locale="locale">
<div id="app"> <div id="app">
<router-view/> <router-view/>
</div> </div>
</a-locale-provider> </a-config-provider>
</template> </template>
<script> <script>
import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN'; // import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
import moment from 'moment'; import zhCN from 'ant-design-vue/es/locale/zh_CN';
import 'moment/locale/zh-cn'; // import moment from 'moment';
moment.locale('zh-cn'); // import 'moment/locale/zh-cn';
// moment.locale('zh-cn');
export default { export default {
name: 'App', name: 'App',
data(){ data(){
return { return {
zh_CN locale: zhCN,
} };
}, },
} }
</script> </script>

51
src/components/page/order/index.vue
View File

@ -37,7 +37,8 @@
</a-col> --> </a-col> -->
<a-col :lg="12" :xl="8" :xxl="6" class="query_item"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
<span>收费类型：</span> <span>收费类型：</span>
<a-select default-value="" v-model="query.charges_type" :getPopupContainer="(triggerNode) => triggerNode.parentNode"> <a-select default-value="" v-model="query.charges_type"
:getPopupContainer="(triggerNode) => triggerNode.parentNode">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
<a-select-option value="1">免费</a-select-option> <a-select-option value="1">免费</a-select-option>
<a-select-option value="2">付费</a-select-option> <a-select-option value="2">付费</a-select-option>
@ -45,15 +46,17 @@
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type" :getPopupContainer="(triggerNode) => triggerNode.parentNode"> <a-select default-value="" v-model="query.entrust_type"
:getPopupContainer="(triggerNode) => triggerNode.parentNode">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item" > <a-col :lg="12" :xl="8" :xxl="6" class="query_item" style="display:none">
<span>订单状态：</span> <span>订单状态：</span>
<a-select default-value="" v-model="query.transaction_status" mode="multiple" :maxTagCount="1" :maxTagTextLength="1" :getPopupContainer="(triggerNode) => triggerNode.parentNode"> <a-select default-value="" v-model="query.transaction_status"
:getPopupContainer="(triggerNode) => triggerNode.parentNode">
<a-select-option value="" @click.native='selectAll'>全部</a-select-option> <a-select-option value="" @click.native='selectAll'>全部</a-select-option>
<a-select-option value="1">待付款</a-select-option> <a-select-option value="1">待付款</a-select-option>
<a-select-option value="2">待交付</a-select-option> <a-select-option value="2">待交付</a-select-option>
@ -64,25 +67,25 @@
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
<span>订单创建时间：</span> <span>创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD" /> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD" />
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3"> <!-- <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3" style="display:noen">
<span>标的金额：</span> <span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值" /> <a-input v-model="query.biaodi_start" placeholder="最小值" />
<el-col :span="10" v-html="'\u00a0'" /> <el-col :span="10" v-html="'\u00a0'" />
<el-col style="color:#d9d9d9;">-</el-col> <el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'" /> <el-col :span="10" v-html="'\u00a0'" />
<a-input v-model="query.biaodi_end" placeholder="最大值" /> <a-input v-model="query.biaodi_end" placeholder="最大值" />
</a-col> </a-col> -->
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3"> <!-- <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span> <span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值" /> <a-input v-model="query.dingdan_start" placeholder="最小值" />
<el-col :span="10" v-html="'\u00a0'" /> <el-col :span="10" v-html="'\u00a0'" />
<el-col style="color:#d9d9d9;">-</el-col> <el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'" /> <el-col :span="10" v-html="'\u00a0'" />
<a-input v-model="query.dingdan_end" placeholder="最大值" /> <a-input v-model="query.dingdan_end" placeholder="最大值" />
</a-col> </a-col> -->
<a-col :lg="24" :xl="8" :xxl="24" class="query_item query_item1"> <a-col :lg="24" :xl="8" :xxl="24" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button> <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
@ -97,7 +100,7 @@
<a-button type="primary" class="query_button">导 出</a-button> <a-button type="primary" class="query_button">导 出</a-button>
<!-- <a-button type="primary" class="query_button">获 取</a-button> --> <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
</div> </div>
<a-table :columns="columns" :data-source="data" bordered :pagination="false" > <a-table :columns="columns" :data-source="data" bordered :pagination="false" rowKey="id">
<template slot="type" slot-scope="type"> <template slot="type" slot-scope="type">
<span>{{ type == 1 ? '委托订单' : type == 2 ? '认证订单' : '服务订单' }}</span> <span>{{ type == 1 ? '委托订单' : type == 2 ? '认证订单' : '服务订单' }}</span>
</template> </template>
@ -111,17 +114,9 @@
</a-space> </a-space>
</template> </template>
</a-table> </a-table>
<a-pagination <a-pagination class="pagination" size="small" :total="total" v-model="page" :page-size="limit"
class="pagination" :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`" :page-size-options="pageSizeOptions"
size="small" @showSizeChange="onShowSizeChange" @change="changePage" show-size-changer>
:total="total"
v-model="page"
:page-size="limit"
:show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
:page-size-options="pageSizeOptions"
@showSizeChange="onShowSizeChange"
@change="changePage"
show-size-changer >
<template slot="buildOptionText" slot-scope="props"> <template slot="buildOptionText" slot-scope="props">
<span>{{ props.value }}条/页</span> <span>{{ props.value }}条/页</span>
</template> </template>
@ -145,14 +140,14 @@ export default {
goods_name: '', goods_name: '',
order_type: '', order_type: '',
entrust_type: '', entrust_type: '',
transaction_status:[''], transaction_status: '',
createtime: [], createtime: [],
goods_isli: '', goods_isli: '',
charges_type: '', charges_type: '',
biaodi_start:'', // biaodi_start: '',
biaodi_end:'', // biaodi_end: '',
dingdan_start:'', // dingdan_start: '',
dingdan_end:'', // dingdan_end: '',
}, },
batchcode: '', batchcode: '',
visible: false, visible: false,
@ -308,6 +303,4 @@ export default {
} }
} }
</script> </script>
<style scoped> <style scoped></style>
</style>

2
src/main.js
View File

@ -24,7 +24,7 @@ Vue.prototype.$echarts = echarts;
// Vue.prototype.$host = 'http://10.14.1.197:9090' // Vue.prototype.$host = 'http://10.14.1.197:9090'
// Vue.prototype.$host = 'http://wenhua.xingtongworld.com/' //兴通测试 // Vue.prototype.$host = 'http://wenhua.xingtongworld.com/' //兴通测试
Vue.prototype.$host = 'http://10.24.4.156' //正式服 // Vue.prototype.$host = 'http://10.24.4.156' //正式服
// Vue.prototype.$host = 'http://10.14.1.197:9090' //javatest // Vue.prototype.$host = 'http://10.14.1.197:9090' //javatest

Write Preview
Loading…
Cancel
Save