Skip to content

W
welfare
Commit d7c3e8a1 by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/css/app.5d2b2e5a.css
#	dist/css/app.65f5fb46.css
#	dist/css/app.92c856b3.css
#	dist/css/chunk-062ed6dd.821ab53e.css
#	dist/css/chunk-0e48fd14.2ff973ee.css
#	dist/css/chunk-2dfc3876.821ab53e.css
#	dist/css/chunk-36f40ade.2ff973ee.css
#	dist/css/chunk-67d88149.2ff973ee.css
#	dist/css/chunk-7eb10ad4.821ab53e.css
#	dist/index.html
#	dist/js/app.00e94d4f.js
#	dist/js/card-package.6d761f72.js
#	dist/js/card-package.a8314994.js
#	dist/js/card-package.aace7e1c.js
#	dist/js/card-package~gic-card.0b78a17a.js
#	dist/js/chunk-0d4ebdfa.14b3849f.js
#	dist/js/chunk-0d4ebdfa.a5b97e85.js
#	dist/js/chunk-0d4ebdfa.d53246c1.js
#	dist/js/chunk-2116ff36.8484cfb3.js
#	dist/js/chunk-28cb370c.f64da662.js
#	dist/js/chunk-331988dc.dce5d678.js
#	dist/js/chunk-34bff564.4431ebc7.js
#	dist/js/chunk-3634aeb6.4d05f6f7.js
#	dist/js/chunk-40634738.c0f01e19.js
#	dist/js/chunk-53f4695c.00b1ac67.js
#	dist/js/chunk-53f4695c.8b87bbe4.js
#	dist/js/chunk-6287d3af.6e0ff885.js
#	dist/js/chunk-62c969ce.0602749a.js
#	dist/js/chunk-7690a1e6.477157ae.js
#	dist/js/chunk-7c59afb3.1cf663c5.js
#	dist/js/chunk-7eb10ad4.5cb38e77.js
#	dist/js/chunk-9490a5cc.f606ed6e.js
#	dist/js/chunk-b82cb698.1d9b83a1.js
#	dist/js/chunk-d079a54c.63c344ba.js
#	dist/js/chunk-vendors.74bafd00.js
parents 69632a31 9d67789e
Showing with 79 additions and 31 deletions
dist/css/chunk-cf8672ec.9b80f808.css deleted 100644 → 0
.transfer-trigger[data-v-7d6a41ba]{margin-left:10px;width:160px}.transfer-trigger[data-v-7d6a41ba]:before{content:"";position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;width:100%;height:100%;background:transparent;cursor:pointer}.transfer-trigger[data-v-7d6a41ba]:focus{outline:none}.transfer-trigger.is-focus[data-v-7d6a41ba] .el-input__inner{border-color:#2f54eb;-webkit-box-shadow:0 0 0 2px rgba(47,84,237,.2);box-shadow:0 0 0 2px rgba(47,84,237,.2)}.transfer-trigger.is-focus .el-input__icon[data-v-7d6a41ba]{-webkit-transform:rotate(-180deg);transform:rotate(-180deg)}.transfer[data-v-7d6a41ba] .el-transfer-panel__item{padding-top:8px;padding-bottom:8px;width:100%;height:auto;line-height:normal}.transfer[data-v-7d6a41ba] .el-transfer-panel__item .el-checkbox__input{top:10px}.transfer[data-v-7d6a41ba] .el-transfer-panel__empty:before{content:"";display:block;margin:0 auto;width:30px;height:30px;background:url([object Module]) 50% no-repeat;background-size:contain}.transfer[data-v-7d6a41ba] .el-transfer-panel__header{pointer-events:none}.transfer[data-v-7d6a41ba] .el-transfer-panel__header .el-checkbox__input{display:none}.transfer .transfer-item[data-v-7d6a41ba]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.transfer .transfer-item .store-name[data-v-7d6a41ba]{width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:14px;font-weight:400;color:#303133;line-height:22px}.transfer .transfer-item .store-code[data-v-7d6a41ba]{font-size:12px;font-weight:400;color:#303133;line-height:16px}.transfer[data-v-7d6a41ba] .el-transfer__buttons .el-button{padding:0;width:24px;min-width:24px}.transfer[data-v-7d6a41ba] .el-transfer__buttons .el-button:first-child{margin-bottom:0;-webkit-transform:translateY(calc(100% + 4px));transform:translateY(calc(100% + 4px))}.transfer[data-v-7d6a41ba] .el-transfer__buttons .el-button:last-child{-webkit-transform:translateY(-100%);transform:translateY(-100%)}.pickup-upload[data-v-7d6a41ba]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7d6a41ba]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7d6a41ba]{font-size:14px}.pickup-upload .upload-tip[data-v-7d6a41ba]{display:inline-block}.pickup-upload .pickup-list[data-v-7d6a41ba]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7d6a41ba]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7d6a41ba]{font-size:14px}.pickup-upload .pickup-list .download-pickup[data-v-7d6a41ba]{margin-left:8px}.pickup-upload .pickup-list .pickup-list-total[data-v-7d6a41ba]{margin-top:8px;font-size:12px;font-weight:400;color:#909399;line-height:17px}.pickup-upload .pickup-list .pickup-list-total .pickup-list-error[data-v-7d6a41ba],.pickup-upload .pickup-list .pickup-list-total .pickup-list-number[data-v-7d6a41ba],.pickup-upload .pickup-list .pickup-list-total .pickup-list-success[data-v-7d6a41ba]{padding:0 5px}.pickup-upload .pickup-list .pickup-list-total .pickup-list-number[data-v-7d6a41ba]{color:#303133}.pickup-upload .pickup-list .pickup-list-total .pickup-list-success[data-v-7d6a41ba]{color:#33af4a}.pickup-upload .pickup-list .pickup-list-total .pickup-list-error[data-v-7d6a41ba]{color:#f5222d}.upload-tip-text[data-v-7d6a41ba]{width:308px}.upload-tip-text p[data-v-7d6a41ba]{font-size:12px;font-weight:400;color:#303133;line-height:16px}.upload-tip-text p+p[data-v-7d6a41ba]{margin-top:9px}.error-item[data-v-7d6a41ba]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.error-item+.error-item[data-v-7d6a41ba]{margin-top:10px}.error-list[data-v-7d6a41ba] .el-dialog__body{max-height:400px;overflow-y:auto}.upload-popper{padding:10px 12px!important}.transfer-tip{width:auto!important}.dash-style[data-v-1cd77b1a]{border-bottom:1px dashed #2f54eb}.w-630[data-v-1cd77b1a]{width:630px}.w-480[data-v-1cd77b1a]{width:480px}.w-350[data-v-1cd77b1a]{width:350px}.w-900[data-v-1cd77b1a]{width:900px}.mb56[data-v-1cd77b1a]{margin-bottom:56px}.add-sku-content[data-v-1cd77b1a]{border:1px solid #e4e7ed}.add-sku-content .add-sku[data-v-1cd77b1a]{margin:10px 13px;padding-top:12px;padding-left:12px;padding-bottom:12px;background:#f7f8fa}.add-sku-content .add-sku .add-sku-button[data-v-1cd77b1a]{width:110px;height:32px;background:#fff;border-radius:2px;border:1px dashed #c4c6cf;text-align:center}.from-content[data-v-1cd77b1a]{position:relative}.from-content .demo-ruleForm .form-section[data-v-1cd77b1a]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-1cd77b1a]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-1cd77b1a]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-1cd77b1a]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-1cd77b1a]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list[data-v-1cd77b1a]{width:900px;margin-bottom:20px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item[data-v-1cd77b1a]{width:100%}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name[data-v-1cd77b1a]{padding:8px;background:#f3f6f9;position:relative}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-title[data-v-1cd77b1a]{color:#909399;margin-right:7px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-value-title[data-v-1cd77b1a]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-1cd77b1a]{color:#909399;font-size:14px;position:absolute;right:20px;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-1cd77b1a]:hover{color:#2f54ed}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content[data-v-1cd77b1a]{padding:15px 8px 5px 8px;display:-webkit-box;display:-ms-flexbox;display:flex}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .sku-value-title[data-v-1cd77b1a]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list[data-v-1cd77b1a]{display:inline-block;-webkit-box-flex:1;-ms-flex:1;flex:1}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item[data-v-1cd77b1a]{display:inline-block;margin-right:10px;position:relative}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item .el-icon-error[data-v-1cd77b1a]{font-size:16px;position:absolute;right:-7px;top:-7px;color:#c0c4cc;display:none;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item:hover .el-icon-error[data-v-1cd77b1a]{display:inline-block;color:#909399}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content[data-v-1cd77b1a]{padding:10px;width:900px;border:1px solid #dcdfe6;border-radius:2px}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content .batch-box[data-v-1cd77b1a]{padding-left:130px;font-size:0;height:40px}.from-content .demo-ruleForm .fixed-btn[data-v-1cd77b1a]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-1cd77b1a]{margin-top:12px}.from-content .anchor-link[data-v-1cd77b1a]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-1cd77b1a]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-1cd77b1a]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-1cd77b1a]:hover{color:#2f54ed}.ml20[data-v-1cd77b1a]{margin-left:20px}.mr10[data-v-1cd77b1a]{margin-right:10px}.mr16[data-v-1cd77b1a]{margin-right:16px}.table-img[data-v-1cd77b1a]{cursor:pointer;position:absolute;top:44px;left:0;width:90px;height:90px;background:#fff;border-radius:4px;border:1px solid #ff5152}.table-img .avatar-uploader[data-v-1cd77b1a]{text-align:center}.table-img .avatar-uploader .avatar-uploader-icon[data-v-1cd77b1a]{margin-top:30px}.table-img img[data-v-1cd77b1a]{width:88px;height:88px;border-radius:4px}.table-img[data-v-1cd77b1a]:hover{border:1px dashed #2f54ed}.img-modal[data-v-1cd77b1a]{width:32px;height:32px;position:absolute;left:-1px;top:-1px;background:rgba(0,0,0,.5);display:none;cursor:pointer;border-radius:4px;text-align:center}.img-modal .el-icon-delete[data-v-1cd77b1a]{color:#fff;margin-top:42px}.table-img:hover .img-modal[data-v-1cd77b1a]{display:inline-block}.tips-content[data-v-1cd77b1a]{position:absolute;left:-4px;top:8px}.store-tips[data-v-1cd77b1a]{width:200px;position:absolute;left:-10px}.sku-table th.star div:before{content:"*";color:red}.right-border{border-right:1px solid #ebeef5}.sku-table-content .sku-table th{line-height:17px!important}
\ No newline at end of file
dist/js/chunk-34bff564.9e368703.js → dist/js/chunk-34bff564.e4b32eb2.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-d079a54c.63c344ba.js → dist/js/chunk-53f4695c.00b1ac67.js
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-d079a54c"],{"1e4b":function(t,e,s){"use strict";s.r(e);var n=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[s("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,n){return s("div",{key:n,class:"b"+(n+1)},[s("span",{staticClass:"title"},[t._v(t._s(e.title))]),s("p",{staticClass:"desc"},[t._v(t._s(e.desc))]),s("router-link",{staticClass:"target",attrs:{to:e.target}},[s("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},a=[],c=s("f9e4"),i={name:"Index",data:function(){return{wfTypes:c["b"]}}},r=i,l=(s("d457"),s("5d22")),u=Object(l["a"])(r,n,a,!1,null,"2fe4d5e4",null);e["default"]=u.exports},2643:function(t,e,s){},d457:function(t,e,s){"use strict";s("2643")}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-53f4695c"],{"1e4b":function(t,e,s){"use strict";s.r(e);var n=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[s("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,n){return s("div",{key:n,class:"b"+(n+1)},[s("span",{staticClass:"title"},[t._v(t._s(e.title))]),s("p",{staticClass:"desc"},[t._v(t._s(e.desc))]),s("router-link",{staticClass:"target",attrs:{to:e.target}},[s("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},c=[],i=s("f9e4"),a={name:"Index",data:function(){return{wfTypes:i["b"]}}},r=a,l=(s("d457"),s("2877")),u=Object(l["a"])(r,n,c,!1,null,"2fe4d5e4",null);e["default"]=u.exports},b46e:function(t,e,s){},d457:function(t,e,s){"use strict";s("b46e")}}]);
\ No newline at end of file \ No newline at end of file
dist/js/chunk-9490a5cc.f606ed6e.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-9490a5cc"],{"0d60":function(e,t,r){"use strict";r("4185")},2072:function(e,t,r){"use strict";r("8e6e"),r("ac6a"),r("456d");var i=r("ade3"),s=r("71f6"),l=r("f121");function a(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);t&&(i=i.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,i)}return r}function o(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?a(Object(r),!0).forEach((function(t){Object(i["a"])(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):a(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}var n={getDelivery:{url:"/delivery-order/get-page-list",method:"post"},getPerformanceList:{url:"/order/get-page-list",method:"post"},getApplicationList:"/stock/application-list",getRefund:{url:"/refund-order/get-page-list",method:"post"},exportRefundData:{url:"/refund-order/order-export",method:"post"},exportDeliveryData:{url:"/delivery-order/order-export",method:"post"},exportPerformanceData:{url:"/order/order-export",method:"post"},getLogisticsInfo:{url:"/logistics/get-logistics-info",method:"post"},handleRefundOrder:{url:"/refund-order/process-refund-order",method:"post"},getDeliveryDetail:{url:"/delivery-order/get-delivery-detail",method:"post",useFormData:!0},delivering:{url:"/delivery-order/delivering",method:"post"},closeOrder:{url:"/delivery-order/close",method:"post",useFormData:!0}};n=Object(s["a"])(n,l["f"]),t["a"]=o({},n)},4185:function(e,t,r){},de2d:function(e,t,r){"use strict";r.r(t);var i=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticClass:"p20"},[2===e.deliveryInfo.deliveryType&&0===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-todo"},[r("div",{staticClass:"status"},[r("i",[e._v("1")]),r("span",[e._v("创建发货单")]),r("div",{staticClass:"line"}),r("i",[e._v("2")]),r("span",[e._v("门店核销")]),r("div",{staticClass:"time"},[e._v(e._s(e._f("formatDate")(e.deliveryInfo.deliveryTime)))])]),r("div",{staticClass:"status-text"},[e._v("等待核销")]),r("div",{staticClass:"status-description"},[e._v("发货单创建成功")]),r("div",[r("el-button",{staticClass:"specter",attrs:{type:"primary"}},[e._v("发货核销")]),r("el-button",[e._v("关闭发货单")])],1)]):e._e(),1===e.deliveryInfo.deliveryType&&0===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-todo"},[r("div",{staticClass:"status"},[r("i",[e._v("1")]),r("span",[e._v("创建发货单")]),r("div",{staticClass:"line"}),r("i",[e._v("2")]),r("span",[e._v("仓库发货")]),r("div",{staticClass:"time"},[e._v(e._s(e._f("formatDate")(e.deliveryInfo.deliveryTime)))])]),r("div",{staticClass:"status-text"},[e._v("等待仓库发货")]),r("div",{staticClass:"status-description"},[e._v("发货单创建成功")]),r("div",[r("el-button",{staticClass:"specter",attrs:{type:"primary"}},[e._v("发货核销")]),r("el-button",[e._v("关闭发货单")])],1)]):2===e.deliveryInfo.deliveryType&&1===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-success"}),r("p",[e._v("核销成功")]),r("p",[e._v("仓库已核销，发货单完成")])]):1===e.deliveryInfo.deliveryType&&1===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-success"}),r("p",[e._v("已发货")]),r("p",[e._v("仓库已发货，发货单完成")])]):2===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-error"}),r("p",[e._v("发货单关闭")]),r("p",[e._v("仓库关闭发货单")]),r("p",[e._v(e._s(e.deliveryInfo.cancelReason))])]):e._e(),r("el-divider"),r("p",[e._v("\n 发货单信息\n ")]),1==e.deliveryInfo.deliveryFlag?r("ul",{staticClass:"order-info"},[r("li",[e._v("发货单号："+e._s(e.deliveryInfo.deliveryId))]),r("li",[e._v("履约单号："+e._s(e.deliveryInfo.orderId))]),r("li",[e._v("会员姓名："+e._s(e.deliveryInfo.memberName))]),r("li",[e._v("会员卡号："+e._s(e.deliveryInfo.memberCardNo))]),r("li",[e._v("配货方式：物流发货")]),r("li",[e._v("收货信息："+e._s(e.deliveryInfo.consignee)+" "+e._s(e.deliveryInfo.consigneePhone)+" "+e._s(e.deliveryInfo.consigneeAddress))])]):r("ul",{staticClass:"order-info"},[r("li",[e._v("发货单号："+e._s(e.deliveryInfo.deliveryId))]),r("li",[e._v("履约单号："+e._s(e.deliveryInfo.orderId))]),r("li",[e._v("会员姓名："+e._s(e.deliveryInfo.memberName))]),r("li",[e._v("会员卡号："+e._s(e.deliveryInfo.memberCardNo))]),r("li",[e._v("配货方式：上门自提")]),r("li",[e._v("提货信息："+e._s(e.deliveryInfo.consignee)+" "+e._s(e.deliveryInfo.consigneePhone))]),r("li",[e._v("自提点："+e._s(e.deliveryInfo.pickUpPointAddress))]),r("li",[e._v("提货地址："+e._s(e.deliveryInfo.pickUpPointName))]),r("li",[e._v("提货时间："+e._s(e._f("formatDate")(e.deliveryInfo.pickUpStartTime))+" - "+e._s(e._f("formatDate")(e.deliveryInfo.pickUpStopTime)))])]),r("el-table",{attrs:{data:e.giftList}},[r("el-table-column",{attrs:{label:"礼品",width:"300"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[r("div",{staticClass:"goods-info"},[r("img",{staticClass:"imgs-style",attrs:{src:i.giftImgUrl,alt:""}}),r("div",{staticClass:"goods-text"},[r("div",{staticClass:"goods-text-name"},[e._v("\n "+e._s(i.giftName)+"\n ")]),r("div",{staticClass:"goods-text-info"},[r("div",e._l(JSON.parse(i.giftSkuStrand),(function(t,i){return r("span",{key:i},[e._v(e._s(t.specStandardName)+"："+e._s(t.specStandardValueName)+"   ")])})),0),r("div",[e._v("SKU编码："+e._s(i.giftSkuCode))])])])])]}}])}),r("el-table-column",{attrs:{label:"礼品编码",prop:"giftId"}}),r("el-table-column",{attrs:{label:"成本（元）",prop:"costPrice"}}),r("el-table-column",{attrs:{label:"数量",prop:"exchangeQuantity"}}),r("el-table-column",{attrs:{label:"物流公司 | 运单号"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[r("p",[e._v(e._s(i.logisticsCompanyName||"--"))]),r("p",[e._v(e._s(i.logisticsNo||"--"))])]}}])})],1)],1)},s=[],l=(r("96cf"),r("1da1")),a=r("2072"),o=a["a"].getDeliveryDetail,n={name:"DeliveryDetail",data:function(){return{giftList:[],deliveryInfo:{},loading:!1}},created:function(){this.$emit("updateBread",[{breadName:"发货单处理",breadPath:"/performance/delivery"},{breadName:"发货单详情"}]),this.getDeliveryDetail()},methods:{getDeliveryDetail:function(){var e=Object(l["a"])(regeneratorRuntime.mark((function e(){var t,r,i=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return this.loading=!0,e.next=3,o({deliveryId:this.$route.query.deliveryId}).finally((function(){return i.loading=!1}));case 3:t=e.sent,r=t.result,this.deliveryInfo=r.orderDelivery,this.giftList=[r.orderDelivery];case 6:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}()}},d=n,v=(r("0d60"),r("2877")),c=Object(v["a"])(d,i,s,!1,null,"9c6691d2",null);t["default"]=c.exports}}]);
\ No newline at end of file
dist/js/chunk-a1cfa4d6.15d6fa23.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-a1cfa4d6"],{"0d60":function(e,t,r){"use strict";r("f481")},2072:function(e,t,r){"use strict";r("ac67"),r("1bc7"),r("32ea");var i=r("a07a"),s=r("71f6"),l=r("f121");function a(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);t&&(i=i.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,i)}return r}function o(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?a(Object(r),!0).forEach((function(t){Object(i["a"])(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):a(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}var n={getDelivery:{url:"/delivery-order/get-page-list",method:"post"},getPerformanceList:{url:"/order/get-page-list",method:"post"},getApplicationList:"/stock/application-list",getRefund:{url:"/refund-order/get-page-list",method:"post"},exportRefundData:{url:"/refund-order/order-export",method:"post"},exportDeliveryData:{url:"/delivery-order/order-export",method:"post"},exportPerformanceData:{url:"/order/order-export",method:"post"},getLogisticsInfo:{url:"/logistics/get-logistics-info",method:"post"},handleRefundOrder:{url:"/refund-order/process-refund-order",method:"post"},getDeliveryDetail:{url:"/delivery-order/get-delivery-detail",method:"post",useFormData:!0},delivering:{url:"/delivery-order/delivering",method:"post"},closeOrder:{url:"/delivery-order/close",method:"post",useFormData:!0}};n=Object(s["a"])(n,l["f"]),t["a"]=o({},n)},de2d:function(e,t,r){"use strict";r.r(t);var i=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticClass:"p20"},[2===e.deliveryInfo.deliveryType&&0===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-todo"},[r("div",{staticClass:"status"},[r("i",[e._v("1")]),r("span",[e._v("创建发货单")]),r("div",{staticClass:"line"}),r("i",[e._v("2")]),r("span",[e._v("门店核销")]),r("div",{staticClass:"time"},[e._v(e._s(e._f("formatDate")(e.deliveryInfo.deliveryTime)))])]),r("div",{staticClass:"status-text"},[e._v("等待核销")]),r("div",{staticClass:"status-description"},[e._v("发货单创建成功")]),r("div",[r("el-button",{staticClass:"specter",attrs:{type:"primary"}},[e._v("发货核销")]),r("el-button",[e._v("关闭发货单")])],1)]):e._e(),1===e.deliveryInfo.deliveryType&&0===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-todo"},[r("div",{staticClass:"status"},[r("i",[e._v("1")]),r("span",[e._v("创建发货单")]),r("div",{staticClass:"line"}),r("i",[e._v("2")]),r("span",[e._v("仓库发货")]),r("div",{staticClass:"time"},[e._v(e._s(e._f("formatDate")(e.deliveryInfo.deliveryTime)))])]),r("div",{staticClass:"status-text"},[e._v("等待仓库发货")]),r("div",{staticClass:"status-description"},[e._v("发货单创建成功")]),r("div",[r("el-button",{staticClass:"specter",attrs:{type:"primary"}},[e._v("发货核销")]),r("el-button",[e._v("关闭发货单")])],1)]):2===e.deliveryInfo.deliveryType&&1===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-success"}),r("p",[e._v("核销成功")]),r("p",[e._v("仓库已核销，发货单完成")])]):1===e.deliveryInfo.deliveryType&&1===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-success"}),r("p",[e._v("已发货")]),r("p",[e._v("仓库已发货，发货单完成")])]):2===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-error"}),r("p",[e._v("发货单关闭")]),r("p",[e._v("仓库关闭发货单")]),r("p",[e._v(e._s(e.deliveryInfo.cancelReason))])]):e._e(),r("el-divider"),r("p",[e._v("\n 发货单信息\n ")]),1==e.deliveryInfo.deliveryFlag?r("ul",{staticClass:"order-info"},[r("li",[e._v("发货单号："+e._s(e.deliveryInfo.deliveryId))]),r("li",[e._v("履约单号："+e._s(e.deliveryInfo.orderId))]),r("li",[e._v("会员姓名："+e._s(e.deliveryInfo.memberName))]),r("li",[e._v("会员卡号："+e._s(e.deliveryInfo.memberCardNo))]),r("li",[e._v("配货方式：物流发货")]),r("li",[e._v("收货信息："+e._s(e.deliveryInfo.consignee)+" "+e._s(e.deliveryInfo.consigneePhone)+" "+e._s(e.deliveryInfo.consigneeAddress))])]):r("ul",{staticClass:"order-info"},[r("li",[e._v("发货单号："+e._s(e.deliveryInfo.deliveryId))]),r("li",[e._v("履约单号："+e._s(e.deliveryInfo.orderId))]),r("li",[e._v("会员姓名："+e._s(e.deliveryInfo.memberName))]),r("li",[e._v("会员卡号："+e._s(e.deliveryInfo.memberCardNo))]),r("li",[e._v("配货方式：上门自提")]),r("li",[e._v("提货信息："+e._s(e.deliveryInfo.consignee)+" "+e._s(e.deliveryInfo.consigneePhone))]),r("li",[e._v("自提点："+e._s(e.deliveryInfo.pickUpPointAddress))]),r("li",[e._v("提货地址："+e._s(e.deliveryInfo.pickUpPointName))]),r("li",[e._v("提货时间："+e._s(e._f("formatDate")(e.deliveryInfo.pickUpStartTime))+" - "+e._s(e._f("formatDate")(e.deliveryInfo.pickUpStopTime)))])]),r("el-table",{attrs:{data:e.giftList}},[r("el-table-column",{attrs:{label:"礼品",width:"300"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[r("div",{staticClass:"goods-info"},[r("img",{staticClass:"imgs-style",attrs:{src:i.giftImgUrl,alt:""}}),r("div",{staticClass:"goods-text"},[r("div",{staticClass:"goods-text-name"},[e._v("\n "+e._s(i.giftName)+"\n ")]),r("div",{staticClass:"goods-text-info"},[r("div",e._l(JSON.parse(i.giftSkuStrand),(function(t,i){return r("span",{key:i},[e._v(e._s(t.specStandardName)+"："+e._s(t.specStandardValueName)+"   ")])})),0),r("div",[e._v("SKU编码："+e._s(i.giftSkuCode))])])])])]}}])}),r("el-table-column",{attrs:{label:"礼品编码",prop:"giftId"}}),r("el-table-column",{attrs:{label:"成本（元）",prop:"costPrice"}}),r("el-table-column",{attrs:{label:"数量",prop:"exchangeQuantity"}}),r("el-table-column",{attrs:{label:"物流公司 | 运单号"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[r("p",[e._v(e._s(i.logisticsCompanyName||"--"))]),r("p",[e._v(e._s(i.logisticsNo||"--"))])]}}])})],1)],1)},s=[],l=(r("6a61"),r("d16d")),a=r("2072"),o=a["a"].getDeliveryDetail,n={name:"DeliveryDetail",data:function(){return{giftList:[],deliveryInfo:{},loading:!1}},created:function(){this.$emit("updateBread",[{breadName:"发货单处理",breadPath:"/performance/delivery"},{breadName:"发货单详情"}]),this.getDeliveryDetail()},methods:{getDeliveryDetail:function(){var e=Object(l["a"])(regeneratorRuntime.mark((function e(){var t,r,i=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return this.loading=!0,e.next=3,o({deliveryId:this.$route.query.deliveryId}).finally((function(){return i.loading=!1}));case 3:t=e.sent,r=t.result,this.deliveryInfo=r.orderDelivery,this.giftList=[r.orderDelivery];case 6:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}()}},d=n,v=(r("0d60"),r("5d22")),c=Object(v["a"])(d,i,s,!1,null,"9c6691d2",null);t["default"]=c.exports},f481:function(e,t,r){}}]);
\ No newline at end of file
dist/js/chunk-vendors.4a0b36ab.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.74bafd00.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.13ce86e7.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.c971fc1e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/module/update-real-stock.vue
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-popover> </el-popover>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px"> <el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px" @change="changeType">
<el-option label="增加" :value="1"></el-option> <el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option> <el-option label="减少" :value="0"></el-option>
</el-select> </el-select>
...@@ -89,8 +89,8 @@ export default { ...@@ -89,8 +89,8 @@ export default {
spanArr: [], // 用于存放每一行记录的合并数 spanArr: [], // 用于存放每一行记录的合并数
// costChangeObj: [], // 用于存放批量修改后的数据 // costChangeObj: [], // 用于存放批量修改后的数据
banthStock: '', banthStock: '',
stockType: 0, stockType: 1,
banthStockType: 0, banthStockType: 1,
updateList: [], updateList: [],
textarea: '', textarea: '',
giftId: '', giftId: '',
...@@ -169,8 +169,18 @@ export default { ...@@ -169,8 +169,18 @@ export default {
}); });
console.log('获取成本数据'); console.log('获取成本数据');
}, },
changeType(value){
console.log(value);
},
submitProNanme() { submitProNanme() {
if(this.loading) return; if(this.loading) return;
let totalStock = 0;
this.updateList.forEach((item) =>{
totalStock = Number(totalStock) + Number(item.stock);
});
if(!totalStock){
this.$message.error('库存更改不可为0');
}else{
let params = { let params = {
giftId: this.stockData.id, giftId: this.stockData.id,
updateList: this.updateList, updateList: this.updateList,
...@@ -188,6 +198,7 @@ export default { ...@@ -188,6 +198,7 @@ export default {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).finally(() => this.loading = false); }).finally(() => this.loading = false);
}
}, },
// 取消修改 // 取消修改
cancelSubmit() { cancelSubmit() {
...@@ -259,7 +270,7 @@ export default { ...@@ -259,7 +270,7 @@ export default {
remainedStock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].remainedStock : '', remainedStock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].remainedStock : '',
stockStatus: true, stockStatus: true,
giftSkuCostPriceStatus: true, giftSkuCostPriceStatus: true,
stockType: 0, stockType: 1,
stageStock: '' stageStock: ''
}; };
this.stockObj[item.mapId] = Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : ''; this.stockObj[item.mapId] = Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '';
...@@ -273,7 +284,7 @@ export default { ...@@ -273,7 +284,7 @@ export default {
giftSkuCostPriceStatus: true, giftSkuCostPriceStatus: true,
giftSkuId: '', giftSkuId: '',
remainedStock: '', remainedStock: '',
stockType: 0, stockType: 1,
stageStock: '' stageStock: ''
}; };
} }
......
src/views/gift-manage/real-gift-detail.vue
...@@ -24,10 +24,12 @@ ...@@ -24,10 +24,12 @@
<h3>规格/库存信息</h3> <h3>规格/库存信息</h3>
<el-form-item label="礼品规格"> <el-form-item label="礼品规格">
<div class="standard-info"> <div class="standard-info">
<div style="margin-bottom:20px">
<div class="add-sku-content">
<div class="add-sku-list" v-if="goodsStandardInfo.length"> <div class="add-sku-list" v-if="goodsStandardInfo.length">
<div class="add-sku-item" v-for="(item, index) in goodsStandardInfo" :key="index"> <div class="add-sku-item" v-for="(item, index) in goodsStandardInfo" :key="index">
<div class="sku-name"> <div class="sku-name">
<span class="sku-title">规格名</span> <span class="sku-title">规格名:</span>
<span style="display:none">{{ refash }}</span> <span style="display:none">{{ refash }}</span>
<el-dropdown trigger="click" placement="bottom-start" @command="i => getSelected(i, item)"> <el-dropdown trigger="click" placement="bottom-start" @command="i => getSelected(i, item)">
<el-input v-model="item.specName" style="width:100px" size="smalll" placeholder="请选择" @input="value => spliceStandard(value, item)" @focus="getStdList(item)" @blur="addStandard(item)"></el-input> <el-input v-model="item.specName" style="width:100px" size="smalll" placeholder="请选择" @input="value => spliceStandard(value, item)" @focus="getStdList(item)" @blur="addStandard(item)"></el-input>
...@@ -40,7 +42,7 @@ ...@@ -40,7 +42,7 @@
<span class="delete-btn" @click="deleteSku(index)"><i class="el-icon-error inline-block" style="width:14px;height:14px;"></i></span> <span class="delete-btn" @click="deleteSku(index)"><i class="el-icon-error inline-block" style="width:14px;height:14px;"></i></span>
</div> </div>
<div class="value-content" v-if="item.specName"> <div class="value-content" v-if="item.specName">
<span class="sku-value-title">规格值</span> <span class="sku-value-title">规格值:</span>
<span style="display:none">{{ refash }}</span> <span style="display:none">{{ refash }}</span>
<div class="value-list"> <div class="value-list">
<div class="value-item" v-for="(v, n) in item.valueList" :key="n"> <div class="value-item" v-for="(v, n) in item.valueList" :key="n">
...@@ -51,6 +53,7 @@ ...@@ -51,6 +53,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<div class="table-img" v-if="!index && isStdImg"> <div class="table-img" v-if="!index && isStdImg">
<div class="triangle"></div>
<el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false" with-credentials :on-success="(response, file, fileList) => tableUploadSuccess(response, file, fileList, v)" :before-upload="tableBeforeUpload"> <el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false" with-credentials :on-success="(response, file, fileList) => tableUploadSuccess(response, file, fileList, v)" :before-upload="tableBeforeUpload">
<img v-if="v.propImg" :src="v.propImg" class="avatar" /> <img v-if="v.propImg" :src="v.propImg" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon" style="font-size:28px"></i> <i v-else class="el-icon-plus avatar-uploader-icon" style="font-size:28px"></i>
...@@ -68,15 +71,13 @@ ...@@ -68,15 +71,13 @@
</div> </div>
</div> </div>
</div> </div>
<div style="margin-bottom:20px">
<div class="add-sku-content">
<div class="add-sku"> <div class="add-sku">
<div class="add-sku-button"> <div class="add-sku-button">
<el-button v-show="goodsStandardInfo.length < 3" @click="addSku" type="text">添加规格项目</el-button> <el-button v-show="goodsStandardInfo.length < 3" @click="addSku" type="text">添加规格项目</el-button>
</div> </div>
</div> </div>
</div> </div>
<p class="tip-warm w-900">如有颜色、尺码等多种规格，请添加规格</p> <p class="tip-warm w-900">如有颜色、尺码等多种规格参数，请添加商品规格</p>
</div> </div>
<div class="sku-table-content" v-if="goodsSkuList.length > 0 && goodsStandardInfo.length > 0"> <div class="sku-table-content" v-if="goodsSkuList.length > 0 && goodsStandardInfo.length > 0">
<div class="batch-box"> <div class="batch-box">
...@@ -666,12 +667,12 @@ export default { ...@@ -666,12 +667,12 @@ export default {
// }, // },
// 上传前 // 上传前
beforeUpload(file) { beforeUpload(file) {
if (file.size > 2 * 1024 * 1024) { if (file.size > 1 * 1024 * 1024) {
this.$message.error('请上传小于2MB的图片'); this.$message.error('请上传小于1MB的图片');
return false; return false;
} }
if (file.width < 700 || file.width / file.width != 1 / 1) { if (file.width < 800 || file.width / file.width != 1 / 1) {
this.$message.error('请上传宽度≥700px，宽高比1：1的图片'); this.$message.error('请上传宽度≥800px，宽高比1：1的图片');
return false; return false;
} }
return true; return true;
...@@ -987,13 +988,17 @@ export default { ...@@ -987,13 +988,17 @@ export default {
}; };
if(this.isEdit){ if(this.isEdit){
if(Number(this.stockObj[item]) > Number(this.skuSellObj[item].stock)){ if(Number(this.stockObj[item]) > Number(this.skuSellObj[item].stock)){
this.skuSellObj[item].stockType = 1; this.skuSellObj[item].stockType = 0;
this.skuSellObj[item].stockAlter = Number(this.stockObj[item]) - Number(this.skuSellObj[item].stock); this.skuSellObj[item].stockAlter = Number(this.stockObj[item]) - Number(this.skuSellObj[item].stock);
}else{ }else{
this.skuSellObj[item].stockType = 0; this.skuSellObj[item].stockType = 1;
this.skuSellObj[item].stockAlter = Number(this.skuSellObj[item].stock) - Number(this.stockObj[item]); this.skuSellObj[item].stockAlter = Number(this.skuSellObj[item].stock) - Number(this.stockObj[item]);
} }
console.log(this.skuSellObj); console.log(this.skuSellObj);
if(!this.stockObj[item]){
this.skuSellObj[item].stockType = 1;
this.skuSellObj[item].stockAlter = this.skuSellObj[item].stock;
}
} }
} }
this.handleData.giftSkuCostPrice = ''; this.handleData.giftSkuCostPrice = '';
...@@ -1193,6 +1198,10 @@ export default { ...@@ -1193,6 +1198,10 @@ export default {
this.skuSellObj[key].stockType = 1; this.skuSellObj[key].stockType = 1;
this.skuSellObj[key].stockAlter = Number(this.skuSellObj[key].stock) - Number(this.stockObj[key]); this.skuSellObj[key].stockAlter = Number(this.skuSellObj[key].stock) - Number(this.stockObj[key]);
} }
if(!this.stockObj[key]){
this.skuSellObj[key].stockType = 1;
this.skuSellObj[key].stockAlter = this.skuSellObj[key].stock;
}
console.log(this.skuSellObj); console.log(this.skuSellObj);
} }
let arr1 = Object.keys(this.skuSellObj); let arr1 = Object.keys(this.skuSellObj);
...@@ -1205,6 +1214,7 @@ export default { ...@@ -1205,6 +1214,7 @@ export default {
}else if(arr1.length === 1){ }else if(arr1.length === 1){
this.goodsForm.stock = this.skuSellObj[key].stock; this.goodsForm.stock = this.skuSellObj[key].stock;
} }
this.handleValidIntegral(value, key, num);
}, },
// 保存 // 保存
submitForm(goodsForm) { submitForm(goodsForm) {
...@@ -1310,7 +1320,8 @@ export default { ...@@ -1310,7 +1320,8 @@ export default {
// shopId: '', // 门店id // shopId: '', // 门店id
giftName: this.goodsForm.giftName, // 礼品名称 giftName: this.goodsForm.giftName, // 礼品名称
marketPrice: this.goodsForm.marketPrice, // 市场价 marketPrice: this.goodsForm.marketPrice, // 市场价
costPrice: this.goodsForm.costPrice, // 成本价 // costPrice: this.goodsForm.costPrice, // 成本价
costPrice: 0, // 成本价
stock: this.goodsForm.stock, // 库存 stock: this.goodsForm.stock, // 库存
giftNo: this.goodsForm.giftNo, // 礼品编码 giftNo: this.goodsForm.giftNo, // 礼品编码
giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码 giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码
...@@ -1445,8 +1456,10 @@ export default { ...@@ -1445,8 +1456,10 @@ export default {
.standard-info { .standard-info {
//规格信息 //规格信息
.add-sku-list { .add-sku-list {
width: 900px; // width: 900px;
margin-bottom: 20px; margin: 10px 13px 10px 13px;
// margin-top: 10px;
// margin-bottom: 20px;
.add-sku-item { .add-sku-item {
width: 100%; width: 100%;
.sku-name { .sku-name {
...@@ -1454,11 +1467,11 @@ export default { ...@@ -1454,11 +1467,11 @@ export default {
background: #f3f6f9; background: #f3f6f9;
position: relative; position: relative;
.sku-title { .sku-title {
color: #909399; color: #303133;
margin-right: 7px; margin-right: 7px;
} }
.sku-value-title { .sku-value-title {
color: #909399; color: #303133;
width: 55px; width: 55px;
} }
.delete-btn { .delete-btn {
...@@ -1473,10 +1486,10 @@ export default { ...@@ -1473,10 +1486,10 @@ export default {
} }
} }
.value-content { .value-content {
padding: 15px 8px 5px 8px; padding: 15px 8px 15px 8px;
display: flex; display: flex;
.sku-value-title { .sku-value-title {
color: #909399; color: #303133;
width: 55px; width: 55px;
} }
.value-list { .value-list {
...@@ -1583,11 +1596,31 @@ export default { ...@@ -1583,11 +1596,31 @@ export default {
border: 1px solid #FF5152; border: 1px solid #FF5152;
.avatar-uploader{ .avatar-uploader{
// margin-top: 35px; // margin-top: 35px;
z-index: 2;
text-align: center; text-align: center;
.avatar-uploader-icon{ .avatar-uploader-icon{
margin-top: 30px; margin-top: 30px;
} }
} }
.triangle{
position:absolute;
top: -6px;
left: 36px;
width: 0;
height: 0;
border-width: 0 6.5px 6px;
border-style: solid;
border-color: transparent transparent #FF5152;
}
.triangle:after{
content: "";
position: absolute;
top: 2px;
left: -4.5px;
border-width: 0 4.5px 4px;
border-style: solid;
border-color: transparent transparent #fff;
}
} }
.table-img img { .table-img img {
width: 88px; width: 88px;
...@@ -1596,10 +1629,13 @@ export default { ...@@ -1596,10 +1629,13 @@ export default {
} }
.table-img:hover { .table-img:hover {
border: 1px dashed #2f54ed; border: 1px dashed #2f54ed;
.triangle{
border-color: transparent transparent #2f54ed;
}
} }
.img-modal { .img-modal {
width: 32px; width: 89px;
height: 32px; height: 89px;
position: absolute; position: absolute;
left: -1px; left: -1px;
top: -1px; top: -1px;
...@@ -1629,6 +1665,9 @@ export default { ...@@ -1629,6 +1665,9 @@ export default {
/* 规格值 */ /* 规格值 */
</style> </style>
<style> <style>
.add-sku-button .el-button--text{
color: #303133;
}
/* .table-error .el-form-item__error { /* .table-error .el-form-item__error {
display: none !important; display: none !important;
} */ } */
......
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