lex-xin il y a 4 ans
Parent
commit
76ef20a341

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/index.html


+ 1 - 5
dist/static/css/chunk-266d284c.5ce51240.css

@@ -1,5 +1 @@
-<<<<<<< HEAD:dist/static/css/chunk-266d284c.5ce51240.css
-/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.shopImage{width:60px;height:60px}.shopDesc{max-height:70px;overflow:hidden}
-=======
-/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.shopImage{width:60px;height:60px}.shopDesc{max-height:70px;overflow:hidden}
->>>>>>> master:dist/static/css/chunk-956b3508.e3a6139a.css
+/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.shopImage{width:60px;height:60px}.shopDesc{max-height:70px;overflow:hidden}

+ 1 - 1
dist/static/css/chunk-0f2f6737.10cc6fab.css → dist/static/css/chunk-49d7fdd0.2d7d9074.css

@@ -1 +1 @@
-.description-title[data-v-435a62fd]{margin-bottom:20px;color:rgba(0,0,0,.85);font-weight:700;font-size:16px;line-height:1.5}.description-view[data-v-435a62fd]{width:100%;border:1px solid #e8e8e8}.description-view .description-table[data-v-435a62fd]{width:100%;border-collapse:collapse;table-layout:fixed}.description-view .description-tr[data-v-435a62fd]{border-bottom:1px solid #e8e8e8;width:100%}.description-view .description-tr[data-v-435a62fd]:last-child{border-bottom:none}.description-view .description-label[data-v-435a62fd]{border-right:1px solid #e8e8e8;background-color:#fafafa;color:rgba(0,0,0,.85);font-weight:400;font-size:14px;line-height:22px;padding:12px 16px;white-space:nowrap;display:table-cell}.description-view .description-label[data-v-435a62fd]:after{content:"";margin:0 8px 0 2px;position:relative;top:-.5px}.description-view .description-content[data-v-435a62fd]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;border-right:1px solid #e8e8e8;font-size:14px;line-height:1.5;padding:12px 16px;color:rgba(0,0,0,.65);display:table-cell}.description-tr .description-content[data-v-435a62fd]:last-child{border-right:none}[data-v-edfb85f0] .description-title{margin-bottom:0}.video[data-v-edfb85f0]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-6e05583d] .el-dialog__body{padding:10px 20px}
+.description-title[data-v-435a62fd]{margin-bottom:20px;color:rgba(0,0,0,.85);font-weight:700;font-size:16px;line-height:1.5}.description-view[data-v-435a62fd]{width:100%;border:1px solid #e8e8e8}.description-view .description-table[data-v-435a62fd]{width:100%;border-collapse:collapse;table-layout:fixed}.description-view .description-tr[data-v-435a62fd]{border-bottom:1px solid #e8e8e8;width:100%}.description-view .description-tr[data-v-435a62fd]:last-child{border-bottom:none}.description-view .description-label[data-v-435a62fd]{border-right:1px solid #e8e8e8;background-color:#fafafa;color:rgba(0,0,0,.85);font-weight:400;font-size:14px;line-height:22px;padding:12px 16px;white-space:nowrap;display:table-cell}.description-view .description-label[data-v-435a62fd]:after{content:"";margin:0 8px 0 2px;position:relative;top:-.5px}.description-view .description-content[data-v-435a62fd]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;border-right:1px solid #e8e8e8;font-size:14px;line-height:1.5;padding:12px 16px;color:rgba(0,0,0,.65);display:table-cell}.description-tr .description-content[data-v-435a62fd]:last-child{border-right:none}[data-v-edfb85f0] .description-title{margin-bottom:0}.video[data-v-edfb85f0]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-1fe60f94] .el-dialog__body{padding:10px 20px}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/chunk-4a3145a3.76eed2db.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/chunk-7a7c979e.59d65116.css


+ 0 - 5
dist/static/css/chunk-956b3508.e3a6139a.css

@@ -1,5 +0,0 @@
-<<<<<<< HEAD:dist/static/css/chunk-266d284c.5ce51240.css
-/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.shopImage{width:60px;height:60px}.shopDesc{max-height:70px;overflow:hidden}
-=======
-/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.shopImage{width:60px;height:60px}.shopDesc{max-height:70px;overflow:hidden}
->>>>>>> master:dist/static/css/chunk-956b3508.e3a6139a.css

+ 0 - 5
dist/static/css/chunk-commons.0c9838f9.css

@@ -1,5 +0,0 @@
-<<<<<<< HEAD:dist/static/css/chunk-commons.9dd16d80.css
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}
-=======
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}
->>>>>>> master:dist/static/css/chunk-commons.0c9838f9.css

+ 1 - 5
dist/static/css/chunk-commons.9dd16d80.css

@@ -1,5 +1 @@
-<<<<<<< HEAD:dist/static/css/chunk-commons.9dd16d80.css
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}
-=======
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}
->>>>>>> master:dist/static/css/chunk-commons.0c9838f9.css
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}

+ 0 - 1
dist/static/css/chunk-d09d58b6.3aaa6d98.css

@@ -1 +0,0 @@
-.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.dialog-footer[data-v-de543970]{width:100%;text-align:right}.reword-list[data-v-de543970]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-de543970]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-de543970]{margin-bottom:22px;width:180px;border-style:dashed}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.1978bc9e.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.3b387856.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-0f2f6737.e5b7c5a5.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-266d284c.24536e40.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-266d284c.dddecd79.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-49d7fdd0.122aa72c.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-4a3145a3.8861ac6d.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-7a7c979e.bba20bad.js


+ 0 - 1
dist/static/js/chunk-commons.be539945.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-commons"],{"333d":function(e,t,a){"use strict";var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"pagination-container",class:{hidden:e.hidden}},[a("el-pagination",e._b({attrs:{"current-page":e.currentPage,"page-size":e.pageSize,layout:e.layout,"page-sizes":e.pageSizes,total:e.total},on:{"update:currentPage":function(t){e.currentPage=t},"update:current-page":function(t){e.currentPage=t},"update:pageSize":function(t){e.pageSize=t},"update:page-size":function(t){e.pageSize=t},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}},"el-pagination",e.$attrs,!1))],1)},i=[],u=(a("c5f6"),a("09f4")),r={name:"Pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:function(){return[10,20,30,50]}},layout:{type:String,default:"total,sizes,prev, pager, next, jumper"},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1}},computed:{currentPage:{get:function(){return this.page},set:function(e){this.$emit("update:page",e)}},pageSize:{get:function(){return this.limit},set:function(e){this.$emit("update:limit",e)}}},methods:{handleSizeChange:function(e){this.$emit("pagination",{page:this.currentPage,limit:e}),this.autoScroll&&Object(u["a"])(0,800)},handleCurrentChange:function(e){this.$emit("pagination",{page:e,limit:this.pageSize}),this.autoScroll&&Object(u["a"])(0,800)}}},o=r,p=(a("3dfc"),a("2877")),c=Object(p["a"])(o,n,i,!1,null,"5985d484",null);t["a"]=c.exports},"3dfc":function(e,t,a){"use strict";a("ab68")},ab68:function(e,t,a){}}]);

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/chunk-d09d58b6.2b8b4c11.js


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff