商品编辑

750da27a · wangwei · c6ee5490 · 750da27a · c6ee5490 · 750da27a
Commit 750da27a authored Nov 07, 2018 by wangwei
10 changed files
--- a/dev/index.html
+++ b/dev/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>唱唱启蒙-后台</title><link href=/static/css/app.1295c42d8334d473da7d78ac3f2c8c0a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6e44eb960497b221be62.js></script><script type=text/javascript src=/static/js/vendor.f22e520bedd9a356fde1.js></script><script type=text/javascript src=/static/js/app.5fb068802bc65ab9f90c.js></script></body><script>let el = document.getElementsByTagName("script");
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>唱唱启蒙-后台</title><link href=/static/css/app.1295c42d8334d473da7d78ac3f2c8c0a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.56964d8cdaee25c7ec8d.js></script><script type=text/javascript src=/static/js/vendor.f22e520bedd9a356fde1.js></script><script type=text/javascript src=/static/js/app.5fb068802bc65ab9f90c.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dev/static/js/25.25f350d1db80f4144dcc.js
+++ b/dev/static/js/25.25f350d1db80f4144dcc.js
--- a/dev/static/js/25.c3a1153a32862731b7ad.js
+++ b/dev/static/js/25.c3a1153a32862731b7ad.js
--- a/dev/static/js/manifest.6e44eb960497b221be62.js
+++ b/dev/static/js/manifest.6e44eb960497b221be62.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={40:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"896f018eeb6f2bc9cd04",1:"979f3833b7a412b57090",2:"2438645b9ab656184a01",3:"4fe7897f079a76213ef4",4:"36a6708cee7705a68a54",5:"37fad1ead3d87d10357d",6:"1741e48fb08b0a2de138",7:"dc0aa36cb34fafead268",8:"c1008941b028777c89fb",9:"d525de4720d8ad026d0c",10:"5506bbcb9cdc785a2971",11:"5d13fca0ebc77542e33e",12:"2c5fa647a4d3073143f1",13:"a10703bb6caca0a6afe1",14:"02c9be397f8d46658ee1",15:"dce17b250c7ca8afc09e",16:"cc01484fb5a496b07ec1",17:"666c6af85a399754ce3e",18:"5f4e74027788f763421d",19:"cc7c590e51e7a43e97d1",20:"8e7adad9dcbbccdd7dc9",21:"f990b10a2511140a47f3",22:"1cc1181301f1a733ccca",23:"ad855f1f66c4c6783ccf",24:"fb02b925466fbfa8f555",25:"25f350d1db80f4144dcc",26:"98df45b838b1bf7e1f56",27:"fb0a8a5f98462e10136b",28:"4c0a520b3dba918b6958",29:"24648dd97c40fd6380f2",30:"8647d0ed9a5eba628c2d",31:"4378a5c1cf66d0457483",32:"8ddd2e9bb6abef31a361",33:"3dc8c2fce74697c3dd67",34:"9c4ff6f4855135140a88",35:"77e3a0260566be7ec247",36:"19cb58637b595150ae86",37:"b4bd6b264ed5c334b9f1"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={40:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"896f018eeb6f2bc9cd04",1:"979f3833b7a412b57090",2:"2438645b9ab656184a01",3:"4fe7897f079a76213ef4",4:"36a6708cee7705a68a54",5:"37fad1ead3d87d10357d",6:"1741e48fb08b0a2de138",7:"dc0aa36cb34fafead268",8:"c1008941b028777c89fb",9:"d525de4720d8ad026d0c",10:"5506bbcb9cdc785a2971",11:"5d13fca0ebc77542e33e",12:"2c5fa647a4d3073143f1",13:"a10703bb6caca0a6afe1",14:"02c9be397f8d46658ee1",15:"dce17b250c7ca8afc09e",16:"cc01484fb5a496b07ec1",17:"666c6af85a399754ce3e",18:"5f4e74027788f763421d",19:"cc7c590e51e7a43e97d1",20:"8e7adad9dcbbccdd7dc9",21:"f990b10a2511140a47f3",22:"1cc1181301f1a733ccca",23:"ad855f1f66c4c6783ccf",24:"fb02b925466fbfa8f555",25:"c3a1153a32862731b7ad",26:"98df45b838b1bf7e1f56",27:"fb0a8a5f98462e10136b",28:"4c0a520b3dba918b6958",29:"24648dd97c40fd6380f2",30:"8647d0ed9a5eba628c2d",31:"4378a5c1cf66d0457483",32:"8ddd2e9bb6abef31a361",33:"3dc8c2fce74697c3dd67",34:"9c4ff6f4855135140a88",35:"77e3a0260566be7ec247",36:"19cb58637b595150ae86",37:"b4bd6b264ed5c334b9f1"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>唱唱启蒙-后台</title><link href=/static/css/app.7b9bf9a27a50916058f1b1fa715b1803.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b0203a4ff83a92827c4f.js></script><script type=text/javascript src=/static/js/vendor.b29422b95643910e8a47.js></script><script type=text/javascript src=/static/js/app.02069bc9d4271a8a1e05.js></script></body><script>let el = document.getElementsByTagName("script");
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>唱唱启蒙-后台</title><link href=/static/css/app.839e4e1bb820b6ba4eaaf46288f2aa0b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5aa09880e7056414c838.js></script><script type=text/javascript src=/static/js/vendor.b29422b95643910e8a47.js></script><script type=text/javascript src=/static/js/app.02069bc9d4271a8a1e05.js></script></body><script>let el = document.getElementsByTagName("script");
    el.onerror = function(a,b,c){
      console.log('error:',a,b,c);
    };

--- a/dist/static/css/app.7b9bf9a27a50916058f1b1fa715b1803.css
+++ b/dist/static/css/app.7b9bf9a27a50916058f1b1fa715b1803.css
--- a/dist/static/js/22.530b6d052b58ceeec3d7.js
+++ b/dist/static/js/22.530b6d052b58ceeec3d7.js
--- a/dist/static/js/22.cb375ba2e327f0effe2e.js
+++ b/dist/static/js/22.cb375ba2e327f0effe2e.js
--- a/dist/static/js/manifest.b0203a4ff83a92827c4f.js
+++ b/dist/static/js/manifest.b0203a4ff83a92827c4f.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],d[b]&&u.push(d[b][0]),d[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=f(f.s=r[i]);return o};var a={},d={40:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+e+"."+{0:"d7d4dfb09c929cbd76ce",1:"daad48d3daee378b0397",2:"f25ec8e2ce1c35d86a18",3:"3a1e975038238c291181",4:"f7de107bf23fce922b15",5:"d5dc9cf2b30ef0d66dc1",6:"0d9154636d9cc51cf1a2",7:"014585df7cd638bc81f1",8:"3c53ba088b50a09431b0",9:"50b457e0c5054d462a2f",10:"e1fa2f401f03585fe84d",11:"f169bf48bfce65359945",12:"0cd36c63efd295f29a0e",13:"530070a2a8009e20e09e",14:"c7e2ade1c66cb6a64324",15:"e1124a5ab4d825408ac9",16:"8fd1ddf07c4582cbb40d",17:"7b67f00483de0a89b55e",18:"ae4a9eda2890aef24f9c",19:"1902b250d8e790e1c634",20:"f8ab67880c88779684bb",21:"546c4128492d4a77a7b0",22:"530b6d052b58ceeec3d7",23:"9fb2b32595b6b068d0f5",24:"7f4b9892260ae25b3c30",25:"004ccd3bd1ab4aa193c2",26:"a4d0bb7c4b78f34cd0a1",27:"4fcca7b3ae77074e1c39",28:"71fffb1cc171d60a67f7",29:"069db024deb6b6ba0cb6",30:"33c8979c8c80500891de",31:"56f8ad78767a7e4e08f5",32:"5fbb4fb5cb24601fa8dc",33:"0968771fb6a2d3b94208",34:"8e82e17774dbd94c6b74",35:"389afd12e9343345dc93",36:"cb7bcc703da860d76d2e",37:"038800fd79e40f469635"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="/",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,d){for(var t,b,o,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(c&&c(a,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)o=n(n.s=d[i]);return o};var a={},f={40:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,n.nc&&d.setAttribute("nonce",n.nc),d.src=n.p+"static/js/"+e+"."+{0:"d7d4dfb09c929cbd76ce",1:"daad48d3daee378b0397",2:"f25ec8e2ce1c35d86a18",3:"3a1e975038238c291181",4:"f7de107bf23fce922b15",5:"d5dc9cf2b30ef0d66dc1",6:"0d9154636d9cc51cf1a2",7:"014585df7cd638bc81f1",8:"3c53ba088b50a09431b0",9:"50b457e0c5054d462a2f",10:"e1fa2f401f03585fe84d",11:"f169bf48bfce65359945",12:"0cd36c63efd295f29a0e",13:"530070a2a8009e20e09e",14:"c7e2ade1c66cb6a64324",15:"e1124a5ab4d825408ac9",16:"8fd1ddf07c4582cbb40d",17:"7b67f00483de0a89b55e",18:"ae4a9eda2890aef24f9c",19:"1902b250d8e790e1c634",20:"f8ab67880c88779684bb",21:"546c4128492d4a77a7b0",22:"cb375ba2e327f0effe2e",23:"9fb2b32595b6b068d0f5",24:"7f4b9892260ae25b3c30",25:"004ccd3bd1ab4aa193c2",26:"a4d0bb7c4b78f34cd0a1",27:"4fcca7b3ae77074e1c39",28:"71fffb1cc171d60a67f7",29:"069db024deb6b6ba0cb6",30:"33c8979c8c80500891de",31:"56f8ad78767a7e4e08f5",32:"5fbb4fb5cb24601fa8dc",33:"0968771fb6a2d3b94208",34:"8e82e17774dbd94c6b74",35:"389afd12e9343345dc93",36:"cb7bcc703da860d76d2e",37:"038800fd79e40f469635"}[e]+".js";var t=setTimeout(b,12e4);function b(){d.onerror=d.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=b,r.appendChild(d),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/shop/dialog.vue
+++ b/src/components/shop/dialog.vue
@@ -42,6 +42,17 @@
              </el-select>
            </el-form-item>
          </el-col>
+          <el-col :span="12" v-if="form.goods_type === 4">
+            <el-form-item label="可用商品">
+              <el-select multiple v-model="goodsYou" placeholder="全部">
+                <el-option v-for="data in goodsList"
+                           :key="data.id"
+                           :label="data.name"
+                           :value="data.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
        </el-row>
        <el-row v-if="form.goods_type === 3">
          <el-col :span="12">
@@ -267,6 +278,7 @@
    data(){
      return{
        loading:true,
+        goodsYou:[],
        goodsList:[],
        form:{
          name:'',
@@ -309,6 +321,11 @@
      sub(){
        let _json = JSON.parse(JSON.stringify(this.form)+'');
        _json.desc.before_goods_id = this.goOn_goods_Id.before_goods_id;
+        if(this.goodsYou.length < 1){
+          _json.desc.use_goods_ids = ''
+        }else{
+          _json.desc.use_goods_ids = this.goodsYou.toString()
+        }
        _json.desc.after_goods_id = this.goOn_goods_Id.after_goods_id;
        _json.original_price = (_json.original_price*100).toFixed(0);
        _json.current_price = (_json.current_price*100).toFixed(0);
@@ -449,6 +466,7 @@
          case 0:
            this.loading = false;
            this.goOn_goods_Id.after_goods_id = '';
+            this.goodsYou = [];
            this.goOn_goods_Id.before_goods_id = '';
            this.form={
              name:'',
@@ -484,6 +502,7 @@
          case 1: case 2:
          this.goOn_goods_Id.after_goods_id = '';
          this.goOn_goods_Id.before_goods_id = '';
+          this.goodsYou = [];
          this.form={
            name:'',
            goods_type:1,
@@ -542,6 +561,12 @@
            if(this.form.desc.after_goods_id){
              this.goOn_goods_Id.after_goods_id = this.form.desc.after_goods_id;
            }
+            if(this.form.desc.use_goods_ids){
+              this.goodsYou = this.form.desc.use_goods_ids.split(',');
+              this.goodsYou=this.goodsYou.map(function(item) {
+                return +item;
+              });
+            }
            this.getLessonList()
          });
          break;