Commit f930fdf0 by 刘泽奇

123

parent 7083c362
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -534,6 +534,7 @@ ...@@ -534,6 +534,7 @@
} }
.jdindentdetail-drawer{ .jdindentdetail-drawer{
overflow-y: auto; overflow-y: auto;
padding-bottom: 100px;
} }
.jdindentdetail-drawer .selftmreg_main .el-form-item { .jdindentdetail-drawer .selftmreg_main .el-form-item {
margin-bottom: 20px !important; margin-bottom: 20px !important;
...@@ -561,9 +562,8 @@ ...@@ -561,9 +562,8 @@
.btnBottom>span { .btnBottom>span {
position: absolute; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px;
padding: 10px 20px 20px; padding: 10px 20px 20px;
background: #fff; background: #fff;
margin-top: 5px; margin-top: 5px;
......
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
editNcl: {}, editNcl: {},
editDeliveryInfo: {}, editDeliveryInfo: {},
editApply: { editApply: {
customerType:'ent', customerType: 'ent',
}, },
message: { message: {
info: "", info: "",
...@@ -331,8 +331,8 @@ ...@@ -331,8 +331,8 @@
popupValue: "", popupValue: "",
/**订单付款信息 */ /**订单付款信息 */
receiptVoucher: {}, receiptVoucher: {},
user_Name:"", user_Name: "",
channelFrom:"", channelFrom: "",
} }
}, },
mounted: function() { mounted: function() {
...@@ -380,8 +380,8 @@ ...@@ -380,8 +380,8 @@
default: default:
break; break;
} }
};
}
}, },
created: function() { created: function() {
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
console.log(this.$route.query.channelUserId, "11111111111"); console.log(this.$route.query.channelUserId, "11111111111");
} }
document.cookie.split('; ').map((item, index) => { document.cookie.split('; ').map((item, index) => {
if(item.includes('pin=')){ if (item.includes('pin=')) {
this.user_Name = item.substring(4); this.user_Name = item.substring(4);
} }
}); });
...@@ -436,6 +436,7 @@ ...@@ -436,6 +436,7 @@
}, },
methods: { methods: {
loginOut(){ loginOut(){
/* /*
var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ; var url = encodeURIComponent("http://tm.plus.jdcloud.com/#/jd/jdtrademark") ;
...@@ -552,7 +553,7 @@ ...@@ -552,7 +553,7 @@
showDialog(from, index){ showDialog(from, index){
this.nclIndex = index; this.nclIndex = index;
console.log(this.nclInfo); console.log(this.nclInfo);
this.nclOne = this.nclInfo.slice(index,index+1); this.nclOne = this.nclInfo.slice(index, index + 1);
console.log(this.nclOne); console.log(this.nclOne);
console.log(this.nclIndex); console.log(this.nclIndex);
this.dialogTableVisible = true; this.dialogTableVisible = true;
...@@ -581,8 +582,8 @@ ...@@ -581,8 +582,8 @@
break; break;
default: default:
break; break;
} };
}, },
pointsRuleColor(i) { pointsRuleColor(i) {
if (i < parseInt(this.step)) { if (i < parseInt(this.step)) {
......
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper" :page-size="20" layout="prev, pager, next,jumper"
:total="countPage"> :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
...@@ -504,10 +504,10 @@ ...@@ -504,10 +504,10 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper" :page-size="20" layout="prev, pager, next,jumper"
:total="countPage"> :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
"startTime": "", "startTime": "",
"entTime": "", "entTime": "",
"pageIndex": 1, "pageIndex": 1,
"pageSize": 30 "pageSize": 20
}, },
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment