ui

gsb-marketplat-mag/app/base/service/impl/aggregation/productSve.js

@@ -15,7 +15,14 @@ class ProductService extends ServiceBase {
 
 
   async update(pobj) {
-    return system.getResultSuccess(this.dao.update(pobj));
+    if(!pobj.price){
+      pobj.price=0;
+    }
+    if(!pobj.original_price){
+      pobj.original_price=0;
+    }
+    await this.dao.update(pobj);
+    return system.getResultSuccess();
   }
 
   /**

gsb-marketplat-mag/app/front/entry/public/css/chunk-5a91d059.961557f4.css → gsb-marketplat-mag/app/front/entry/public/css/chunk-0552e04c.3b81c95e.css

-.demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.ivu-message,.ivu-notice{z-index:9999!important}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}.upload-img button[data-v-382f162a]{width:90px;height:32px;background:#1890ff;border-radius:1px;outline:none;border:none;-webkit-box-sizing:border-box;box-sizing:border-box;color:#fff;cursor:pointer}.upload-img .box[data-v-382f162a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-top:20px;min-width:580px}.upload-img .box .image-box[data-v-382f162a]{width:108px;height:90px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:1px;padding:10px 0;margin-bottom:10px;background:#f3f3f3}.upload-img .box .image-box img[data-v-382f162a]{width:100%;height:100%}.upload-img .box .checkedActive[data-v-382f162a]{background:#eff7ff;border:1px solid #1890ff}.upload-img .box .image-box[data-v-382f162a]:not(:nth-child(5n+1)){margin-left:10px}.ivu-modal-wrap[data-v-1f5336d0]{z-index:9999!important}.show_piclist>li[data-v-1f5336d0]{width:200px;height:200px;display:inline-block;margin-left:20px}.show_piclist>li>img[data-v-1f5336d0]{width:100%;height:100%}.pic-icon[data-v-1f5336d0]{display:inline-block;width:35px;height:35px;vertical-align:middle;margin-right:20px}.pic-icon img[data-v-1f5336d0]{width:100%;height:100%}.add-input>li:hover i[data-v-1f5336d0]{display:inline-block!important}
\ No newline at end of file
+.demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.ivu-message,.ivu-notice{z-index:9999!important}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}.upload-img button[data-v-382f162a]{width:90px;height:32px;background:#1890ff;border-radius:1px;outline:none;border:none;-webkit-box-sizing:border-box;box-sizing:border-box;color:#fff;cursor:pointer}.upload-img .box[data-v-382f162a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-top:20px;min-width:580px}.upload-img .box .image-box[data-v-382f162a]{width:108px;height:90px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:1px;padding:10px 0;margin-bottom:10px;background:#f3f3f3}.upload-img .box .image-box img[data-v-382f162a]{width:100%;height:100%}.upload-img .box .checkedActive[data-v-382f162a]{background:#eff7ff;border:1px solid #1890ff}.upload-img .box .image-box[data-v-382f162a]:not(:nth-child(5n+1)){margin-left:10px}.ivu-modal-wrap[data-v-77057800]{z-index:9999!important}.show_piclist>li[data-v-77057800]{width:200px;height:200px;display:inline-block;margin-left:20px}.show_piclist>li>img[data-v-77057800]{width:100%;height:100%}.pic-icon[data-v-77057800]{display:inline-block;width:35px;height:35px;vertical-align:middle;margin-right:20px}.pic-icon img[data-v-77057800]{width:100%;height:100%}.add-input>li:hover i[data-v-77057800]{display:inline-block!important}
\ No newline at end of file

gsb-marketplat-mag/app/front/entry/public/css/chunk-07f86704.515669ca.css → gsb-marketplat-mag/app/front/entry/public/css/chunk-07f86704.08b113c6.css

-.demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.ivu-message,.ivu-notice{z-index:9999!important}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}[data-v-1c8b26af] .ivu-select-selection{height:40px;border-radius:0;background:transparent;border-color:transparent}[data-v-1c8b26af] .ivu-select-selection /deep/ .ivu-select-placeholder,[data-v-1c8b26af] .ivu-select-selection /deep/ .ivu-select-selected-value{height:40px;font-size:14px;line-height:40px}.modal[data-v-1c8b26af]{position:fixed;left:0;top:0;background:rgba(0,0,0,.6);width:100%;height:100%;z-index:9}.modal .warp[data-v-1c8b26af]{background:#fff;position:absolute;bottom:0;left:0;width:100%;overflow:auto;border-radius:14px 14px 0 0;padding:30px 10px;-webkit-box-sizing:border-box;box-sizing:border-box;text-align:center}.inputWrap[data-v-1c8b26af]{position:relative}.inputWrap .close[data-v-1c8b26af]{position:absolute;right:5px;z-index:4;width:25px;height:40px;background:#f7f7f7}.ivu-modal-wrap{z-index:9999!important}
\ No newline at end of file
+.demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.ivu-message,.ivu-notice{z-index:9999!important}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}[data-v-1c8b26af] .ivu-select-selection{height:40px;border-radius:0;background:transparent;border-color:transparent}[data-v-1c8b26af] .ivu-select-selection /deep/ .ivu-select-placeholder,[data-v-1c8b26af] .ivu-select-selection /deep/ .ivu-select-selected-value{height:40px;font-size:14px;line-height:40px}.modal[data-v-1c8b26af]{position:fixed;left:0;top:0;background:rgba(0,0,0,.6);width:100%;height:100%;z-index:9}.modal .warp[data-v-1c8b26af]{background:#fff;position:absolute;bottom:0;left:0;width:100%;overflow:auto;border-radius:14px 14px 0 0;padding:30px 10px;-webkit-box-sizing:border-box;box-sizing:border-box;text-align:center}.inputWrap[data-v-1c8b26af]{position:relative}.inputWrap .close[data-v-1c8b26af]{position:absolute;right:5px;z-index:4;width:25px;height:40px;background:#f7f7f7}.ivu-modal-wrap{z-index:9999!important}.productSelect{width:250px}
\ No newline at end of file

gsb-marketplat-mag/app/front/entry/public/css/chunk-2d3eb0f5.a10dee7d.css

-.ivu-modal-wrap[data-v-2c269fb0]{z-index:9999!important}
\ No newline at end of file

gsb-marketplat-mag/app/front/entry/public/css/chunk-42f44164.bd629bc4.css

+.ivu-modal-wrap[data-v-05be87f2]{z-index:9999!important}
\ No newline at end of file

gsb-marketplat-mag/app/front/entry/public/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta content=yes name=apple-mobile-web-app-capable><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/ccc.png><link rel=stylesheet href=//at.alicdn.com/t/font_1996389_21r6b2e5cqci.css><title></title><link href=/css/chunk-04497344.c9ab9860.css rel=prefetch><link href=/css/chunk-07f86704.515669ca.css rel=prefetch><link href=/css/chunk-0c20b306.305956e2.css rel=prefetch><link href=/css/chunk-0c2187ca.de0e14cf.css rel=prefetch><link href=/css/chunk-0fb760a4.5c30cb40.css rel=prefetch><link href=/css/chunk-1021e4ee.17ba2048.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-29ebb6f1.d1f69246.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-2d3eb0f5.a10dee7d.css rel=prefetch><link href=/css/chunk-3008061c.6014cc43.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3cca9940.6014cc43.css rel=prefetch><link href=/css/chunk-48aa254a.d360cbd2.css rel=prefetch><link href=/css/chunk-5a40d679.305956e2.css rel=prefetch><link href=/css/chunk-5a91d059.961557f4.css rel=prefetch><link href=/css/chunk-5da45f03.c6303bcf.css rel=prefetch><link href=/css/chunk-6cc861f3.6014cc43.css rel=prefetch><link href=/css/chunk-9dc7e768.305956e2.css rel=prefetch><link href=/css/chunk-a142fab8.6014cc43.css rel=prefetch><link href=/css/chunk-a1670dde.70decc8e.css rel=prefetch><link href=/css/chunk-cc77621c.8797b2b5.css rel=prefetch><link href=/js/chunk-04497344.0c8a3138.js rel=prefetch><link href=/js/chunk-07f86704.67d612a5.js rel=prefetch><link href=/js/chunk-0c20b306.728fdf52.js rel=prefetch><link href=/js/chunk-0c2187ca.f9f84370.js rel=prefetch><link href=/js/chunk-0fb760a4.def58650.js rel=prefetch><link href=/js/chunk-1021e4ee.d40517f9.js rel=prefetch><link href=/js/chunk-14b9857b.ae43b7c1.js rel=prefetch><link href=/js/chunk-1f11ec07.b7a911e5.js rel=prefetch><link href=/js/chunk-29ebb6f1.3760df0c.js rel=prefetch><link href=/js/chunk-2c359864.f1f45686.js rel=prefetch><link href=/js/chunk-2d210f61.6e56960a.js rel=prefetch><link href=/js/chunk-2d3eb0f5.878af947.js rel=prefetch><link href=/js/chunk-3008061c.e8c7ed02.js rel=prefetch><link href=/js/chunk-3385141a.16d7705b.js rel=prefetch><link href=/js/chunk-3cca9940.f6b28725.js rel=prefetch><link href=/js/chunk-48aa254a.64498aea.js rel=prefetch><link href=/js/chunk-5a40d679.97098616.js rel=prefetch><link href=/js/chunk-5a4e13d5.6ebd883c.js rel=prefetch><link href=/js/chunk-5a91d059.9c2a1013.js rel=prefetch><link href=/js/chunk-5da45f03.c18ae604.js rel=prefetch><link href=/js/chunk-6cc861f3.38766ea9.js rel=prefetch><link href=/js/chunk-780401d4.2594e2ad.js rel=prefetch><link href=/js/chunk-9dc7e768.5dc43ead.js rel=prefetch><link href=/js/chunk-a142fab8.f67a1531.js rel=prefetch><link href=/js/chunk-a1670dde.7fb32135.js rel=prefetch><link href=/js/chunk-cc77621c.209c3f4a.js rel=prefetch><link href=/js/chunk-d710b6d2.9eff4b27.js rel=prefetch><link href=/css/app.e3db6847.css rel=preload as=style><link href=/css/chunk-vendors.a0428467.css rel=preload as=style><link href=/js/app.b17a6315.js rel=preload as=script><link href=/js/chunk-vendors.d7daa525.js rel=preload as=script><link href=/css/chunk-vendors.a0428467.css rel=stylesheet><link href=/css/app.e3db6847.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d7daa525.js></script><script src=/js/app.b17a6315.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><meta content=yes name=apple-mobile-web-app-capable><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/ccc.png><link rel=stylesheet href=//at.alicdn.com/t/font_1996389_21r6b2e5cqci.css><title></title><link href=/css/chunk-04497344.c9ab9860.css rel=prefetch><link href=/css/chunk-0552e04c.3b81c95e.css rel=prefetch><link href=/css/chunk-07f86704.08b113c6.css rel=prefetch><link href=/css/chunk-0c20b306.305956e2.css rel=prefetch><link href=/css/chunk-0c2187ca.de0e14cf.css rel=prefetch><link href=/css/chunk-0fb760a4.5c30cb40.css rel=prefetch><link href=/css/chunk-1021e4ee.17ba2048.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-29ebb6f1.d1f69246.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3008061c.6014cc43.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-3cca9940.6014cc43.css rel=prefetch><link href=/css/chunk-42f44164.bd629bc4.css rel=prefetch><link href=/css/chunk-48aa254a.d360cbd2.css rel=prefetch><link href=/css/chunk-5a40d679.305956e2.css rel=prefetch><link href=/css/chunk-5da45f03.c6303bcf.css rel=prefetch><link href=/css/chunk-6cc861f3.6014cc43.css rel=prefetch><link href=/css/chunk-9dc7e768.305956e2.css rel=prefetch><link href=/css/chunk-a142fab8.6014cc43.css rel=prefetch><link href=/css/chunk-a1670dde.70decc8e.css rel=prefetch><link href=/css/chunk-cc77621c.8797b2b5.css rel=prefetch><link href=/js/chunk-04497344.0c8a3138.js rel=prefetch><link href=/js/chunk-0552e04c.d6840cc0.js rel=prefetch><link href=/js/chunk-07f86704.fca79809.js rel=prefetch><link href=/js/chunk-0c20b306.728fdf52.js rel=prefetch><link href=/js/chunk-0c2187ca.f9f84370.js rel=prefetch><link href=/js/chunk-0fb760a4.def58650.js rel=prefetch><link href=/js/chunk-1021e4ee.d40517f9.js rel=prefetch><link href=/js/chunk-14b9857b.ae43b7c1.js rel=prefetch><link href=/js/chunk-1f11ec07.b7a911e5.js rel=prefetch><link href=/js/chunk-29ebb6f1.3760df0c.js rel=prefetch><link href=/js/chunk-2c359864.f1f45686.js rel=prefetch><link href=/js/chunk-2d210f61.6e56960a.js rel=prefetch><link href=/js/chunk-3008061c.e8c7ed02.js rel=prefetch><link href=/js/chunk-3385141a.16d7705b.js rel=prefetch><link href=/js/chunk-3cca9940.f6b28725.js rel=prefetch><link href=/js/chunk-42f44164.c4f61527.js rel=prefetch><link href=/js/chunk-48aa254a.64498aea.js rel=prefetch><link href=/js/chunk-5a40d679.97098616.js rel=prefetch><link href=/js/chunk-5a4e13d5.6ebd883c.js rel=prefetch><link href=/js/chunk-5da45f03.c18ae604.js rel=prefetch><link href=/js/chunk-6cc861f3.38766ea9.js rel=prefetch><link href=/js/chunk-780401d4.2594e2ad.js rel=prefetch><link href=/js/chunk-9dc7e768.5dc43ead.js rel=prefetch><link href=/js/chunk-a142fab8.f67a1531.js rel=prefetch><link href=/js/chunk-a1670dde.7fb32135.js rel=prefetch><link href=/js/chunk-cc77621c.209c3f4a.js rel=prefetch><link href=/js/chunk-d710b6d2.9eff4b27.js rel=prefetch><link href=/css/app.e3db6847.css rel=preload as=style><link href=/css/chunk-vendors.a0428467.css rel=preload as=style><link href=/js/app.2bfe05c3.js rel=preload as=script><link href=/js/chunk-vendors.d7daa525.js rel=preload as=script><link href=/css/chunk-vendors.a0428467.css rel=stylesheet><link href=/css/app.e3db6847.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.d7daa525.js></script><script src=/js/app.2bfe05c3.js></script></body></html>
\ No newline at end of file