Skip to content

W
welfare
Commit 0621ebf4 by shaojiawen
Options

Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

parents d127e73c bd8d987f
Showing with 37 additions and 30 deletions
dist/css/card-package.d43fa175.css → dist/css/card-package.d0bf2b76.css
.ml40[data-v-1baf866e]{margin-left:40px}.filter-block[data-v-1baf866e]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1baf866e]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1baf866e]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-1baf866e]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1baf866e]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3278d8dd]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-3278d8dd]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-273757e6]{margin-left:40px}.filter-block[data-v-273757e6]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-273757e6]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-273757e6]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-273757e6]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-273757e6]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3278d8dd]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-3278d8dd]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-078d7642.e5e8e064.css 0 → 100644
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-1340c320]{width:360px}.w-160[data-v-1340c320]{width:160px}.w140[data-v-1340c320]{width:140px}.w350[data-v-1340c320]{width:350px}.tab-top[data-v-1340c320]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-1340c320],.tab-top[data-v-1340c320]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-1340c320]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-1340c320]{height:60px}.table-content .img-text img[data-v-1340c320]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-1340c320]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-1340c320]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-1340c320]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-1340c320]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-1340c320]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-1340c320]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-1340c320]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-1340c320]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-1340c320]:hover{color:#2f54ed}.undeline-dash[data-v-1340c320]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-1340c320]{display:inline-block;line-height:32px}.hidden-data[data-v-1340c320]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-1faddb40.fc56fcc3.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-296b439a]{width:360px}.w-160[data-v-296b439a]{width:160px}.w140[data-v-296b439a]{width:140px}.w350[data-v-296b439a]{width:350px}.tab-top[data-v-296b439a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-296b439a],.tab-top[data-v-296b439a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-296b439a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-296b439a]{height:60px}.table-content .img-text img[data-v-296b439a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-296b439a]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-296b439a]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-296b439a]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-296b439a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-296b439a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-296b439a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-296b439a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-296b439a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-296b439a]:hover{color:#2f54ed}.undeline-dash[data-v-296b439a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-296b439a]{display:inline-block;line-height:32px}.hidden-data[data-v-296b439a]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-5bfafd3a.bc3c28c9.css deleted 100644 → 0
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-c90abad6]{border-color:#1890ff}.upload-ele .el-button[data-v-c90abad6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c90abad6]{padding:0}.uploadText p[data-v-c90abad6]{line-height:26px}.pickup-upload[data-v-c90abad6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-c90abad6]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-c90abad6]{font-size:14px}.pickup-upload .pickup-list[data-v-c90abad6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c90abad6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c90abad6]{font-size:14px}.w360[data-v-cb967474]{width:360px}.w-160[data-v-cb967474]{width:160px}.w140[data-v-cb967474]{width:140px}.w350[data-v-cb967474]{width:350px}.tab-top[data-v-cb967474]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-cb967474],.tab-top[data-v-cb967474]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-cb967474]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-cb967474]{height:60px}.table-content .img-text img[data-v-cb967474]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-cb967474]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-cb967474]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-cb967474]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-cb967474]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-cb967474]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-cb967474]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-cb967474]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-cb967474]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-cb967474]:hover{color:#2f54ed}.undeline-dash[data-v-cb967474]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-cb967474]{display:inline-block;line-height:32px}.hidden-data[data-v-cb967474]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-be9d6c3c.8e000104.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-c90abad6]{border-color:#1890ff}.upload-ele .el-button[data-v-c90abad6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c90abad6]{padding:0}.uploadText p[data-v-c90abad6]{line-height:26px}.pickup-upload[data-v-c90abad6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-c90abad6]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-c90abad6]{font-size:14px}.pickup-upload .pickup-list[data-v-c90abad6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c90abad6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c90abad6]{font-size:14px}.w360[data-v-7acfb1f4]{width:360px}.w-160[data-v-7acfb1f4]{width:160px}.w140[data-v-7acfb1f4]{width:140px}.w350[data-v-7acfb1f4]{width:350px}.tab-top[data-v-7acfb1f4]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-7acfb1f4],.tab-top[data-v-7acfb1f4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-7acfb1f4]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-7acfb1f4]{height:60px}.table-content .img-text img[data-v-7acfb1f4]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-7acfb1f4]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-7acfb1f4]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-7acfb1f4]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-7acfb1f4]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-7acfb1f4]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-7acfb1f4]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-7acfb1f4]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-7acfb1f4]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-7acfb1f4]:hover{color:#2f54ed}.undeline-dash[data-v-7acfb1f4]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-7acfb1f4]{display:inline-block;line-height:32px}.hidden-data[data-v-7acfb1f4]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/js/chunk-055e7b5b.b2139e43.js → dist/js/chunk-055e7b5b.e8f845d6.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-0d4ebdfa.d8652263.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[i("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),i("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),i("el-table-column",{attrs:{prop:"address",label:"地址"}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?i("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n ")]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("/setting/address-lib-add?id="+e.row.addressId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=i("fab6"),o=i("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,i=t.addressId;this.loading=!0,d({addressId:i}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=i("2877"),u=Object(p["a"])(c,a,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("bd86"),s=i("71f6"),r=i("f121");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function n(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"],r["c"].api,r["f"]},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return o}));var a=i("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-0d4ebdfa.fc3e1ce1.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[i("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),i("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),i("el-table-column",{attrs:{prop:"address",label:"地址"}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?i("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n ")]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("/setting/address-lib-edit?id="+e.row.addressId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=i("fab6"),o=i("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,i=t.addressId;this.loading=!0,d({addressId:i}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=i("2877"),u=Object(p["a"])(c,a,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("ade3"),s=i("71f6"),r=i("f121");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function n(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"],r["c"].api,r["f"]},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return o}));var a=i("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-34bff564.ca3eef49.js → dist/js/chunk-34bff564.5c41d86f.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.f7b52046.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.fc28348f.js → dist/js/gic-card.b4587236.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -32,7 +32,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/base.1.0.0.17.js"></script><!-- 公共方法 -->
<script src="//web-1251519181.file.myqcloud.com/components/layout.1.2.59.js"></script><!-- 布局组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/input.2.0.20.js"></script><!-- input !!3.0组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-select.1.1.84.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-select.1.1.92.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/goods-selector.1.0.51.js"></script><!-- 商品选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/card-select.1.0.34.js"></script><!-- 卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js"></script><!-- 链接小工具 -->
......
src/views/gift-manage/address-lib-form.vue
......@@ -148,7 +148,10 @@ export default {
},
getInfo() {
this.loading = true;
getAddressDetails().then(res => {
let params = {
addressId: this.addressId
};
getAddressDetails(params).then(res => {
const info = res.result || {};
Object.keys(this.ruleForm).map(key => {
if (key in res.result) {
......
src/views/gift-manage/address-lib-list.vue
......@@ -15,7 +15,7 @@
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="$router.push(`/setting/address-lib-add?id=${scope.row.addressId}`)">编辑</el-button>
<el-button type="text" @click="$router.push(`/setting/address-lib-edit?id=${scope.row.addressId}`)">编辑</el-button>
<dm-delete @confirm="del(scope.row)" tips="确认删除？">
<el-button type="text">删除</el-button>
</dm-delete>
......
src/views/gift-manage/module/check-upload-detail.vue
......@@ -8,8 +8,9 @@
<el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getTableList" @clear="getTableList"></el-input>
</div>
<el-table :data="tableData" class="mt20">
<el-table-column label="卡号" prop="paramOne"></el-table-column>
<el-table-column label="卡密/券码" prop="paramTwo"></el-table-column>
<el-table-column v-for="(item, index) in headList" :key="index" :label="item" :prop="index === 0 ? 'paramOne' : (index === 1 ? 'paramTwo' : 'paramThree')"></el-table-column>
<!-- <el-table-column label="卡号" prop="paramOne"></el-table-column>
<el-table-column label="卡密/券码" prop="paramTwo"></el-table-column> -->
<el-table-column label="当前状态" prop="statusFlag">
<template slot-scope="scope">{{ scope.row.statusFlag === 0 ? '未兑换' : '已兑换' }}</template>
</el-table-column>
......@@ -53,7 +54,8 @@ export default {
total: '',
tableData: [],
template: '',
search: ''
search: '',
headList: []
};
},
mounted() {
......@@ -77,6 +79,17 @@ export default {
virtualCardList(params).then(res =>{
console.log(res);
this.tableData = res.result.result || [];
let list = [];
list = this.tableData[0].headList;
this.headList = list.map((item, index) => {
if(item.indexOf('<span style="text-decoration: underline">') != -1){
item = item.replace('<span style="text-decoration: underline">', '');
}
if(item.indexOf('</span>') != -1){
item = item.replace('</span>', '');
}
return item;
});
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
......
src/views/gift-manage/real-gift.vue
......@@ -456,7 +456,6 @@ export default {
// customClass: 'show-title',
// dangerouslyUseHTMLString: true,
// confirmButtonText: '确认',
// showCancelButton: false
// }).then(() =>{
// item.hiddenFlag = 1;
// });
......@@ -469,7 +468,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '隐藏',
showCancelButton: false
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -477,7 +475,7 @@ export default {
};
this.batchRequest(params);
}).catch(() =>{
return;
item.hiddenFlag = 0;
});
}else if(item.statusFlag == 1 && item.hiddenFlag == 0){
this.$confirm('<div>确认取消隐藏?</div>', '提示', {
......@@ -487,7 +485,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
showCancelButton: false
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -495,7 +492,7 @@ export default {
};
this.batchRequest(params);
}).catch(() =>{
return;
item.hiddenFlag = 1;
});
}else if(item.statusFlag == 0 && item.hiddenFlag == 1){
this.$confirm('<div>确认隐藏?</div>', '提示', {
......@@ -513,7 +510,7 @@ export default {
};
this.batchRequest(params);
}).catch(() =>{
return;
item.hiddenFlag = 0;
});
}
},
......
src/views/gift-manage/virtual-gift.vue
......@@ -195,7 +195,7 @@
<!-- 调整库存 -->
<update-virtual-stock :stock-data="stockData" v-if="StockDialog" @getTableList="getTableList" @closeUpdateStock="closeUpdateStock"></update-virtual-stock>
<!-- 查看内容 -->
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId" :is-edit="false"></check-upload-detail>
<check-upload-detail v-if="dialogVisible" @closeUploadDetail="closeUploadDetail" :dialog-id="dialogId" :is-edit="false"></check-upload-detail>
</div>
</template>
<script>
......@@ -365,7 +365,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
showCancelButton: false
}).then(() =>{
this.batchRequest(params);
}).catch(() => {
......@@ -385,7 +384,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '启用',
showCancelButton: false
}).then(() =>{
this.batchRequest(params);
}).catch(() => {
......@@ -530,7 +528,6 @@ export default {
// customClass: 'show-title',
// dangerouslyUseHTMLString: true,
// confirmButtonText: '确认',
// showCancelButton: false
// }).then(() =>{
// item.hiddenFlag = 1;
// });
......@@ -543,7 +540,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '隐藏',
showCancelButton: false
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -551,7 +547,7 @@ export default {
};
this.batchRequest(params);
}).catch(() =>{
return;
item.hiddenFlag = 0;
});
}else if(item.statusFlag == 1 && item.hiddenFlag == 0){
this.$confirm('<div>确认取消隐藏?</div>', '提示', {
......@@ -561,7 +557,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
showCancelButton: false
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -569,7 +564,7 @@ export default {
};
this.batchRequest(params);
}).catch(() =>{
return;
item.hiddenFlag = 1;
});
}else if(item.statusFlag == 0 && item.hiddenFlag == 1){
this.$confirm('<div>确认隐藏?</div>', '提示', {
......@@ -579,7 +574,6 @@ export default {
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '隐藏',
showCancelButton: false
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -587,7 +581,7 @@ export default {
};
this.batchRequest(params);
}).catch(() =>{
return;
item.hiddenFlag = 0;
});
}
},
......
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