Skip to content

S
shop-new
提交 8d3843f4 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

Merge branch '云仓3.1.2' into test

上级 853ea889 d952eb45
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 935 行增加 和 456 行删除
.env.development
浏览文件 @ 8d3843f4
...@@ -5,8 +5,8 @@ ENV = 'development' ...@@ -5,8 +5,8 @@ ENV = 'development'
#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1' #VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
# 测试环境 # 测试环境
VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1' #VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
#VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1' VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
# 文档模块 直接调用 sys开放接口 # 文档模块 直接调用 sys开放接口
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com' VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
......
dist/index.html
浏览文件 @ 8d3843f4
差异被折叠。
dist/static/css/chunk-0382b59d.780f52b0.css 0 → 100644
浏览文件 @ 8d3843f4
.freightTemplate-add[data-v-83efcd1a] .el-dialog{height:80%;overflow:hidden}.freightTemplate-add[data-v-83efcd1a] .el-dialog__body{height:calc(100% - 60px);overflow-x:hidden;overflow-y:scroll}.radiomodels .el-radio-button[data-v-83efcd1a]{margin:0 10px}[data-v-83efcd1a] .radiomodels .el-radio-button .el-radio-button__inner{border:1px solid #dcdfe6!important;border-radius:4px!important}[data-v-83efcd1a] .radiomodels .el-radio-button .el-radio-button__orig-radio:checked+.el-radio-button__inner{box-shadow:none}.queryFormInline[data-v-83efcd1a]{padding-bottom:20px}.cton_h3[data-v-83efcd1a]{margin-left:170px;color:#1890ff}.cton_text[data-v-83efcd1a]{width:80%;margin:0 0 30px 170px}.cton_text p[data-v-83efcd1a]{font-size:14px;padding:0;margin:5px 0}[data-v-83efcd1a] .el-card__body{height:calc(100% - 40px);overflow-y:auto}
\ No newline at end of file
dist/static/css/chunk-6edc8597.70c612a3.css deleted 100644 → 0
浏览文件 @ 853ea889
.freightTemplate-add[data-v-d731cf5e] .el-dialog{height:80%;overflow:hidden}.freightTemplate-add[data-v-d731cf5e] .el-dialog__body{height:calc(100% - 60px);overflow-x:hidden;overflow-y:scroll}.radiomodels .el-radio-button[data-v-d731cf5e]{margin:0 10px}[data-v-d731cf5e] .radiomodels .el-radio-button .el-radio-button__inner{border:1px solid #dcdfe6!important;border-radius:4px!important}[data-v-d731cf5e] .radiomodels .el-radio-button .el-radio-button__orig-radio:checked+.el-radio-button__inner{box-shadow:none}.queryFormInline[data-v-d731cf5e]{padding-bottom:20px}.cton_h3[data-v-d731cf5e]{margin-left:170px;color:#1890ff}.cton_text[data-v-d731cf5e]{width:80%;margin:0 0 30px 170px}.cton_text p[data-v-d731cf5e]{font-size:14px;padding:0;margin:5px 0}[data-v-d731cf5e] .el-card__body{height:calc(100% - 40px);overflow-y:auto}
\ No newline at end of file
dist/static/js/app.cd6e57d6.js → dist/static/js/app.2ce3f5f3.js
浏览文件 @ 8d3843f4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-0382b59d.0e37475c.js 0 → 100644
浏览文件 @ 8d3843f4
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0382b59d"],{"280e":function(t,e,n){},"3d17":function(t,e,n){"use strict";n.d(e,"j",(function(){return a})),n.d(e,"b",(function(){return o})),n.d(e,"a",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"g",(function(){return c})),n.d(e,"i",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"e",(function(){return d})),n.d(e,"f",(function(){return f})),n.d(e,"h",(function(){return m}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/goods/uploadVideo",method:"post",data:t})}function o(t){return Object(r["a"])({url:"/local/getCategoryList",method:"post",data:t})}function s(t){return Object(r["a"])({url:"/system/freightNew/getFreight",method:"get",params:t})}function u(t){return Object(r["a"])({url:"/system/goodsNew/addGoods",method:"post",data:t})}function c(t){return Object(r["a"])({url:"/system/goodsNew/info",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/system/goodsNew/goodsEdit",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function d(t){return Object(r["a"])({url:"/system/goodsNew/batchUploadImage",method:"post",data:t})}function f(t){return Object(r["a"])({url:"/local/serviceFee/getByCategory",method:"get",params:t})}function m(t){return Object(r["a"])({url:"/system/goodsNew/synthesisList",method:"post",data:t})}},"5a97":function(t,e,n){"use strict";n.d(e,"e",(function(){return a})),n.d(e,"h",(function(){return o})),n.d(e,"c",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"f",(function(){return c})),n.d(e,"a",(function(){return i})),n.d(e,"b",(function(){return l})),n.d(e,"g",(function(){return d}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/goodsNew/list",method:"get",params:t})}function o(t){return Object(r["a"])({url:"/system/goodsNew/shelvesStatus",method:"post",data:t})}function s(t){return Object(r["a"])({url:"/system/goodsNew/goodsStatus",method:"post",data:t})}function u(t){return Object(r["a"])({url:"/system/goodsNew/info",method:"get",params:t})}function c(t){return Object(r["a"])({url:"/system/goodsNew/collect",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/system/goodsNew/cancelOnsale",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/system/goodsNew/cancelOnsaleAll",method:"post",data:t})}function d(t){return Object(r["a"])({url:"/system/goodsNew/onsaleUpdate",method:"post",data:t})}},"61da":function(t,e,n){"use strict";n("280e")},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return a})),n.d(e,"i",(function(){return o})),n.d(e,"b",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"a",(function(){return c})),n.d(e,"l",(function(){return i})),n.d(e,"j",(function(){return l})),n.d(e,"c",(function(){return d})),n.d(e,"m",(function(){return f})),n.d(e,"e",(function(){return m})),n.d(e,"h",(function(){return h})),n.d(e,"f",(function(){return p})),n.d(e,"k",(function(){return g}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/index/getInfo",method:"get",params:t})}function o(t){return Object(r["a"])({url:"/local/getOrganization",method:"get",params:t})}function s(t){return Object(r["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(r["a"])({url:"/local/shopbrand",method:"get",params:t})}function c(t){return Object(r["a"])({url:"/local/brands",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(r["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(r["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function m(t){return Object(r["a"])({url:"/local/cate",method:"get",params:t})}function h(t){return Object(r["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function p(t){return Object(r["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(r["a"])({url:"/local/qualification/list",method:"get",params:t})}},e3b2:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"app-container"},[n("el-card",{staticClass:"box-card"},[n("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[t._v("导入商品")]),t._v(" "),n("h3",{staticClass:"cton_h3"},[t._v("剩余次数："+t._s(t.collect_num)+" / 1000次")]),t._v(" "),n("div",{staticClass:"cton_text"},[n("p",[t._v("功能介绍：")]),t._v(" "),n("p",[t._v("\n 商品导入是为了商家快速、方便地将其它平台上已有的商品，一键导入到您的云仓平台，不再用手动输入编写商品信息\n ")]),t._v(" "),n("p",[t._v("使用方法：")]),t._v(" "),n("p",[t._v("\n 复制其它电商平台的商品链接，粘贴至商品链接输入框内，为该商品选择对应的商品分类，选择完成后点击立即获取按钮即可\n ")]),t._v(" "),n("p",[t._v("示例：")]),t._v(" "),n("p",[t._v("京东商品链接如：https://item.jd.com/10684560542.html")]),t._v(" "),n("p",[t._v("温馨提示：")]),t._v(" "),n("p",[t._v("商品在获取过程中，请不要进行其它操作")]),t._v(" "),n("p",[t._v("\n 商品抓取后，默认放入到下架商品中，请手动修改商品相关信息，再提交申请上架\n ")]),t._v(" "),n("p",[t._v("请确保不要将多个平台的商品链接混合输入")]),t._v(" "),n("p",[t._v("每个用户默认拥有1000次商品导入的机会，请慎重使用")]),t._v(" "),n("p",[t._v("支持平台：")]),t._v(" "),n("p",[t._v("京东、天猫、淘宝 ")])]),t._v(" "),n("el-form",{ref:"form",attrs:{model:t.form,"label-width":"180px"}},[n("el-form-item",{attrs:{label:"商品链接："}},[n("el-input",{staticStyle:{width:"700px"},attrs:{type:"textarea",autosize:{minRows:4,maxRows:8},placeholder:"请输入其它平台商品的链接，单次最多允许输入10条链接，以英文逗号隔开"},model:{value:t.form.desc,callback:function(e){t.$set(t.form,"desc",e)},expression:"form.desc"}})],1),t._v(" "),n("el-form-item",{attrs:{label:"商品分类："}},[t.el_valuestatus?n("el-cascader",{ref:"cascaderDom",staticStyle:{width:"350px"},attrs:{props:t.props,options:t.options,placeholder:"请选择"},on:{change:t.elvalueclick},model:{value:t.el_value,callback:function(e){t.el_value=e},expression:"el_value"}}):t._e()],1),t._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:t.onSubmit}},[t._v("立即导入")])],1)],1)],1)],1)},a=[],o=(n("1bc7"),n("4057"),n("e680"),n("fc02"),n("2ca7"),n("6b1f")),s=n("5a97"),u=n("3d17"),c=(n("ed08"),{name:"freight",data:function(){return{collect_num:0,form:{desc:""},el_valuestatus:!0,el_value:[],options:[],props:{expandTrigger:"click",lazy:!0,lazyLoad:this.lazyLoad,value:"id",label:"title",leaf:"leaf"}}},components:{},created:function(){this.info()},watch:{},methods:{info:function(){var t=this;Object(o["j"])().then((function(e){1==e.code&&(t.collect_num=e.data.collect_num)}))},onSubmit:function(){var t=this;if(this.collect_num<=0)this.$message({type:"warning",message:"您好，您的导入次数已用完，请您联系我们的工作人员操作充值"});else{var e;if(!this.form.desc)return this.$message.error("请填写需要导入的商品链接！"),!1;if(e=this.form.desc.split(","),!(e.length>0&&e.length<=10))return e.length>10?(this.$message({message:"您单次输入的链接数量超过10条！",type:"warning"}),!1):(this.$message.error("请填写需要导入的商品链接！"),!1);if(Number(e.length)>Number(this.collect_num))this.$message({type:"warning",message:"您好，准备导入的商品条数过多，当前剩余次数不足，请重新输入"});else{if(3!=this.el_value.length)return this.$message.error("请选择商品分类！"),!1;var n={category_id:this.el_value[2],third_url:e};Object(s["f"])(n).then((function(n){var r=0,a=Number(e.length),o="";1===n.code?(1===a?1===Number(n.data)?t.$message({type:"success",message:"您好，商品已导入成功，请在仓库中进行编辑后申请上架"}):t.$message({type:"error",message:"您好，商品导入失败，请您重新导入"}):a>1&&(r=Number(n.data),o="您好，一共导入"+a+"条商品，"+r+"条导入成功，请在仓库中进行编辑后申请上架",t.$message({type:"warning",message:o})),t.el_value=[],t.$refs.cascaderDom.$refs.panel.activePath=[],t.form.desc=""):(o=n.message?n.message:"导入失败",t.$message({type:"error",message:o})),t.info()}))}}},add:function(t,e){var n,r,a,o;try{n=t.toString().split(".")[1].length,r=e.toString().split(".")[1].length}catch(s){n=0,r=0}return a=Math.pow(10,Math.max(n,r)),o=(t*a+e*a)/a,o=o.toFixed(2),o},minus:function(t,e){return this.add(t,-e)},elvalueclick:function(){},lazyLoad:function(t,e){this.SSQList=[],this.SSQStr="",this.getArea(t,e),this.SSQList&&this.SSQList.length>0?this.isNextStep=!1:this.isNextStep=!0},getArea:function(t,e){var n=t.level,r={};0===n&&(r={parent_id:0}),n>0&&(r={parent_id:t.value}),Object(u["b"])(r).then((function(t){var r={};r=t.data,r.forEach((function(t){t.value=t.id,t.label=t.label,t.children=[],t.leaf=n>=2})),e(r)}))}}}),i=c,l=(n("61da"),n("cba8")),d=Object(l["a"])(i,r,a,!1,null,"83efcd1a",null);e["default"]=d.exports}}]);
\ No newline at end of file
dist/static/js/chunk-0ac82bf3.1b2ed928.js 0 → 100644
浏览文件 @ 8d3843f4
差异被折叠。
dist/static/js/chunk-6edc8597.ccc832e9.js deleted 100644 → 0
浏览文件 @ 853ea889
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6edc8597"],{"3d17":function(t,e,n){"use strict";n.d(e,"j",(function(){return a})),n.d(e,"b",(function(){return o})),n.d(e,"a",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"g",(function(){return c})),n.d(e,"i",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"e",(function(){return d})),n.d(e,"f",(function(){return f})),n.d(e,"h",(function(){return m}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/goods/uploadVideo",method:"post",data:t})}function o(t){return Object(r["a"])({url:"/local/getCategoryList",method:"post",data:t})}function s(t){return Object(r["a"])({url:"/system/freightNew/getFreight",method:"get",params:t})}function u(t){return Object(r["a"])({url:"/system/goodsNew/addGoods",method:"post",data:t})}function c(t){return Object(r["a"])({url:"/system/goodsNew/info",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/system/goodsNew/goodsEdit",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function d(t){return Object(r["a"])({url:"/system/goodsNew/batchUploadImage",method:"post",data:t})}function f(t){return Object(r["a"])({url:"/local/serviceFee/getByCategory",method:"get",params:t})}function m(t){return Object(r["a"])({url:"/system/goodsNew/synthesisList",method:"post",data:t})}},5252:function(t,e,n){"use strict";n("60a2")},"5a97":function(t,e,n){"use strict";n.d(e,"e",(function(){return a})),n.d(e,"h",(function(){return o})),n.d(e,"c",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"f",(function(){return c})),n.d(e,"a",(function(){return i})),n.d(e,"b",(function(){return l})),n.d(e,"g",(function(){return d}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/goodsNew/list",method:"get",params:t})}function o(t){return Object(r["a"])({url:"/system/goodsNew/shelvesStatus",method:"post",data:t})}function s(t){return Object(r["a"])({url:"/system/goodsNew/goodsStatus",method:"post",data:t})}function u(t){return Object(r["a"])({url:"/system/goodsNew/info",method:"get",params:t})}function c(t){return Object(r["a"])({url:"/system/goodsNew/collect",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/system/goodsNew/cancelOnsale",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/system/goodsNew/cancelOnsaleAll",method:"post",data:t})}function d(t){return Object(r["a"])({url:"/system/goodsNew/onsaleUpdate",method:"post",data:t})}},"60a2":function(t,e,n){},"6b1f":function(t,e,n){"use strict";n.d(e,"g",(function(){return a})),n.d(e,"i",(function(){return o})),n.d(e,"b",(function(){return s})),n.d(e,"d",(function(){return u})),n.d(e,"a",(function(){return c})),n.d(e,"l",(function(){return i})),n.d(e,"j",(function(){return l})),n.d(e,"c",(function(){return d})),n.d(e,"m",(function(){return f})),n.d(e,"e",(function(){return m})),n.d(e,"h",(function(){return h})),n.d(e,"f",(function(){return p})),n.d(e,"k",(function(){return g}));var r=n("b775");function a(t){return Object(r["a"])({url:"/system/index/getInfo",method:"get",params:t})}function o(t){return Object(r["a"])({url:"/local/getOrganization",method:"get",params:t})}function s(t){return Object(r["a"])({url:"/local/organization",method:"post",data:t})}function u(t){return Object(r["a"])({url:"/local/shopbrand",method:"get",params:t})}function c(t){return Object(r["a"])({url:"/local/brands",method:"post",data:t})}function i(t){return Object(r["a"])({url:"/local/upbrands",method:"post",data:t})}function l(t){return Object(r["a"])({url:"/local/getShopInfo",method:"get",params:t})}function d(t){return Object(r["a"])({url:"/local/addShopInfo",method:"post",data:t})}function f(t){return Object(r["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function m(t){return Object(r["a"])({url:"/local/cate",method:"get",params:t})}function h(t){return Object(r["a"])({url:"/local/check/businessLicense",method:"get",params:t})}function p(t){return Object(r["a"])({url:"/local/check/idCard",method:"get",params:t})}function g(t){return Object(r["a"])({url:"/local/qualification/list",method:"get",params:t})}},e3b2:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"app-container"},[n("el-card",{staticClass:"box-card"},[n("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[t._v("商品导入")]),t._v(" "),n("h3",{staticClass:"cton_h3"},[t._v("剩余次数："+t._s(t.collect_num)+" / 1000次")]),t._v(" "),n("div",{staticClass:"cton_text"},[n("p",[t._v("功能介绍：")]),t._v(" "),n("p",[t._v("\n 商品导入是为了商家快速、方便地将其它平台上已有的商品，一键导入到您的云仓平台，不再用手动输入编写商品信息\n ")]),t._v(" "),n("p",[t._v("使用方法：")]),t._v(" "),n("p",[t._v("\n 复制其它电商平台的商品链接，粘贴至商品链接输入框内，为该商品选择对应的商品分类，选择完成后点击立即获取按钮即可\n ")]),t._v(" "),n("p",[t._v("示例：")]),t._v(" "),n("p",[t._v("京东商品链接如：https://item.jd.com/10684560542.html")]),t._v(" "),n("p",[t._v("温馨提示：")]),t._v(" "),n("p",[t._v("商品在获取过程中，请不要进行其它操作")]),t._v(" "),n("p",[t._v("\n 商品抓取后，默认放入到下架商品中，请手动修改商品相关信息，再提交申请上架\n ")]),t._v(" "),n("p",[t._v("请确保不要将多个平台的商品链接混合输入")]),t._v(" "),n("p",[t._v("每个用户默认拥有1000次商品导入的机会，请慎重使用")])]),t._v(" "),n("el-form",{ref:"form",attrs:{model:t.form,"label-width":"180px"}},[n("el-form-item",{attrs:{label:"商品链接："}},[n("el-input",{staticStyle:{width:"700px"},attrs:{type:"textarea",autosize:{minRows:4,maxRows:8},placeholder:"请输入其它平台商品的链接，单次最多允许输入10条链接，以英文逗号隔开"},model:{value:t.form.desc,callback:function(e){t.$set(t.form,"desc",e)},expression:"form.desc"}})],1),t._v(" "),n("el-form-item",{attrs:{label:"商品分类："}},[t.el_valuestatus?n("el-cascader",{ref:"cascaderDom",staticStyle:{width:"350px"},attrs:{props:t.props,options:t.options,placeholder:"请选择"},on:{change:t.elvalueclick},model:{value:t.el_value,callback:function(e){t.el_value=e},expression:"el_value"}}):t._e()],1),t._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:t.onSubmit}},[t._v("立即导入")])],1)],1)],1)],1)},a=[],o=(n("1bc7"),n("4057"),n("e680"),n("fc02"),n("2ca7"),n("6b1f")),s=n("5a97"),u=n("3d17"),c=(n("ed08"),{name:"freight",data:function(){return{collect_num:0,form:{desc:""},el_valuestatus:!0,el_value:[],options:[],props:{expandTrigger:"click",lazy:!0,lazyLoad:this.lazyLoad,value:"id",label:"title",leaf:"leaf"}}},components:{},created:function(){this.info()},watch:{},methods:{info:function(){var t=this;Object(o["j"])().then((function(e){1==e.code&&(t.collect_num=e.data.collect_num)}))},onSubmit:function(){var t=this;if(this.collect_num<=0)this.$message({type:"warning",message:"您好，您的导入次数已用完，请您联系我们的工作人员操作充值"});else{var e;if(!this.form.desc)return this.$message.error("请填写需要导入的商品链接！"),!1;if(e=this.form.desc.split(","),!(e.length>0&&e.length<=10))return e.length>10?(this.$message({message:"您单次输入的链接数量超过10条！",type:"warning"}),!1):(this.$message.error("请填写需要导入的商品链接！"),!1);if(Number(e.length)>Number(this.collect_num))this.$message({type:"warning",message:"您好，准备导入的商品条数过多，当前剩余次数不足，请重新输入"});else{if(3!=this.el_value.length)return this.$message.error("请选择商品分类！"),!1;var n={category_id:this.el_value[2],third_url:e};Object(s["f"])(n).then((function(n){var r=0,a=Number(e.length),o="";1===n.code?(1===a?1===Number(n.data)?t.$message({type:"success",message:"您好，商品已导入成功，请在仓库中进行编辑后申请上架"}):t.$message({type:"error",message:"您好，商品导入失败，请您重新导入"}):a>1&&(r=Number(n.data),o="您好，一共导入"+a+"条商品，"+r+"条导入成功，请在仓库中进行编辑后申请上架",t.$message({type:"warning",message:o})),t.el_value=[],t.$refs.cascaderDom.$refs.panel.activePath=[],t.form.desc=""):(o=n.message?n.message:"导入失败",t.$message({type:"error",message:o})),t.info()}))}}},add:function(t,e){var n,r,a,o;try{n=t.toString().split(".")[1].length,r=e.toString().split(".")[1].length}catch(s){n=0,r=0}return a=Math.pow(10,Math.max(n,r)),o=(t*a+e*a)/a,o=o.toFixed(2),o},minus:function(t,e){return this.add(t,-e)},elvalueclick:function(){},lazyLoad:function(t,e){this.SSQList=[],this.SSQStr="",this.getArea(t,e),this.SSQList&&this.SSQList.length>0?this.isNextStep=!1:this.isNextStep=!0},getArea:function(t,e){var n=t.level,r={};0===n&&(r={parent_id:0}),n>0&&(r={parent_id:t.value}),Object(u["b"])(r).then((function(t){var r={};r=t.data,r.forEach((function(t){t.value=t.id,t.label=t.label,t.children=[],t.leaf=n>=2})),e(r)}))}}}),i=c,l=(n("5252"),n("cba8")),d=Object(l["a"])(i,r,a,!1,null,"d731cf5e",null);e["default"]=d.exports}}]);
\ No newline at end of file
dist/static/js/chunk-elementUI.ede1d689.js 0 → 100644
浏览文件 @ 8d3843f4
差异被折叠。
src/api/module/retreat/address.js
浏览文件 @ 8d3843f4
...@@ -43,5 +43,11 @@ export function getAreaList(query) { ...@@ -43,5 +43,11 @@ export function getAreaList(query) {
}); });
} }
export function getnewAreaList(query) {
return request({
url: '/local/address/typeList',
method: 'get',
params: query
});
}
// //
src/api/module/settlementbill.js
浏览文件 @ 8d3843f4
...@@ -24,3 +24,12 @@ export function getVerifyrecord(query) { ...@@ -24,3 +24,12 @@ export function getVerifyrecord(query) {
params: query params: query
}) })
} }
export function updaterecord(data) {
return request({
url: '/local/asset/excel',
method: 'post',
data
})
}
\ No newline at end of file
src/utils/request.js
浏览文件 @ 8d3843f4
...@@ -32,7 +32,10 @@ const service = axios.create({ ...@@ -32,7 +32,10 @@ const service = axios.create({
}) })
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
if(config.url!='/local/brands'){
showLoading() showLoading()
}
// 是否需要设置 token // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false const isToken = (config.headers || {}).isToken === false
......
src/views/system/asset/settlementbill/index.vue
浏览文件 @ 8d3843f4
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="mini" type="primary" icon="el-icon-download" @click="handleAllOrderExport">导出</el-button>
<el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
...@@ -128,7 +129,8 @@ ...@@ -128,7 +129,8 @@
<script> <script>
import { import {
listVerifyrecord, listVerifyrecord,
getVerifyrecord getVerifyrecord,
updaterecord
} from '@/api/module/settlementbill' } from '@/api/module/settlementbill'
import {dateFormat} from '@/utils' import {dateFormat} from '@/utils'
...@@ -172,6 +174,36 @@ ...@@ -172,6 +174,36 @@
} }
}, },
methods: { methods: {
handleAllOrderExport() {
let params = {
page: this.currentPage,
limit: this.pageSize,
change_type: 1,
}
if (this.queryParams.order_sn != '') {
params['order_sn'] = this.queryParams.order_sn;
}
if (this.queryParams.cashTime && this.queryParams.cashTime.length == 2) {
params['start_time'] = new Date(this.queryParams.cashTime[0]).getTime() / 1000;
params['end_time'] = new Date(this.queryParams.cashTime[1]).getTime() / 1000;
}
//console.log("导出全部订单,入参：",params);
updaterecord(params).then(res => {
if (res.code === 1) {
debugger
const aLink = document.createElement('a');
aLink.href = res.data.url;
//aLink.download = '订单.xls'; //下载的文件名
aLink.style.display = 'none';
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink);
}else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'});
}
});
},
/** 有搜索条件是，初始化到第一页 */ /** 有搜索条件是，初始化到第一页 */
search() { search() {
this.currentPage = 1; this.currentPage = 1;
......
src/views/system/goods/add/index.vue
浏览文件 @ 8d3843f4
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
{ id: 1, name: '商品信息' }, { id: 1, name: '商品信息' },
{ id: 2, name: '价格库存' }, { id: 2, name: '价格库存' },
{ id: 3, name: '商品详情' }, { id: 3, name: '商品详情' },
{ id: 4, name: '商品参数' }, { id: 4, name: '商品属性' },
{ id: 5, name: '售后及服务' } { id: 5, name: '售后及服务' }
], ],
/* 商品信息 */ /* 商品信息 */
...@@ -185,6 +185,12 @@ ...@@ -185,6 +185,12 @@
'value':'' 'value':''
} }
],//参数 ],//参数
producing_area_id_list: "", // 产地的idlist
producing_area: '', // 产地中文名称
deliver_area_id_list: "", // 发货地的idlist
deliver_area: '', // 发货地中文名称
goods_brand: '', // 品牌
brand_id: '', // 品牌、
stags: [], stags: [],
freight_id: 310, freight_id: 310,
delay_compensate: 24, delay_compensate: 24,
...@@ -218,13 +224,7 @@ ...@@ -218,13 +224,7 @@
metering_unit: res.data.metering_unit !== 0 ? res.data.metering_unit : "",// 计量单位, 三目兼容老数据 metering_unit: res.data.metering_unit !== 0 ? res.data.metering_unit : "",// 计量单位, 三目兼容老数据
packaging_unit: res.data.packaging_unit !== 0 ? res.data.packaging_unit : "",// 包装单位 packaging_unit: res.data.packaging_unit !== 0 ? res.data.packaging_unit : "",// 包装单位
conversion_unit: res.data.conversion_unit, // 换算关系 conversion_unit: res.data.conversion_unit, // 换算关系
producing_area_id_list: "", // 产地的idlist
producing_area: res.data.producing_area, // 产地中文名称
deliver_area_id_list: "", // 发货地的idlist
deliver_area: res.data.deliver_area, // 发货地中文名称
// tax_rate: res.data.tax_rate,// 税率 // tax_rate: res.data.tax_rate,// 税率
goods_brand: res.data.goods_brand, // 品牌
brand_id: res.data.brand_id, // 品牌
web_url: res.data.web_url, // 市场参考价链接 web_url: res.data.web_url, // 市场参考价链接
group: res.data.group !== 0 ? res.data.group : "", // 商品分组 group: res.data.group !== 0 ? res.data.group : "", // 商品分组
supplier: res.data.supplier !== 0 ? res.data.supplier : "", // 供应商 supplier: res.data.supplier !== 0 ? res.data.supplier : "", // 供应商
...@@ -241,21 +241,7 @@ ...@@ -241,21 +241,7 @@
arr[2] = res.data.category_three_id; arr[2] = res.data.category_three_id;
this.goodsinfodata.categoryList = arr; this.goodsinfodata.categoryList = arr;
// 产地
let producing_area_list = res.data.producing_area_list
if (Array.isArray(producing_area_list) && producing_area_list.length > 0) {
this.goodsinfodata.producing_area_id_list = producing_area_list.map((item)=> {
return item.id
});
}
// 发货地
let deliver_area_list = res.data.deliver_area_list
if (Array.isArray(deliver_area_list) && deliver_area_list.length > 0) {
this.goodsinfodata.deliver_area_id_list = deliver_area_list.map((item)=> {
return item.id
});
}
// console.log(260,this.goodsinfodata.producing_area_id_list,this.goodsinfodata.deliver_area_id_list) // console.log(260,this.goodsinfodata.producing_area_id_list,this.goodsinfodata.deliver_area_id_list)
...@@ -342,15 +328,44 @@ ...@@ -342,15 +328,44 @@
this.description = res.data.description; this.description = res.data.description;
// 商品参数 售后服务 // 商品参数 售后服务
this.goodsaftersale={
producing_area_id_list: "", // 产地的idlist
producing_area: res.data.producing_area, // 产地中文名称
deliver_area_id_list: "", // 发货地的idlist
deliver_area: res.data.deliver_area, // 发货地中文名称
goods_brand: res.data.goods_brand, // 品牌
brand_id: Number(res.data.brand_id) , // 品牌、
stags:[]
}
this.goodsaftersale.params = res.data.params?res.data.params:[{'title':'','value':''}]//参数 this.goodsaftersale.params = res.data.params?res.data.params:[{'title':'','value':''}]//参数
this.goodsaftersale.out_goods_id = (res.data.out_goods_id == 0) ? '' : res.data.out_goods_id //商品编码 this.goodsaftersale.out_goods_id = (res.data.out_goods_id == 0) ? '' : res.data.out_goods_id //商品编码
this.goodsaftersale.freight_id = res.data.freight_id; this.goodsaftersale.freight_id = res.data.freight_id;
this.goodsaftersale.delay_compensate = res.data.delay_compensate; this.goodsaftersale.delay_compensate = res.data.delay_compensate;
this.goodsaftersale.aftersale_time = res.data.aftersale_time; this.goodsaftersale.aftersale_time = res.data.aftersale_time;
let stagArr = []; let stagArr = [];
// 产地
let producing_area_list = res.data.producing_area_list?res.data.producing_area_list:[]
if(producing_area_list.length==3){
producing_area_list.pop()
}
if (Array.isArray(producing_area_list) && producing_area_list.length > 0) {
this.goodsaftersale.producing_area_id_list = producing_area_list.map((item)=> {
return item.id
});
}
// 发货地
let deliver_area_list = res.data.deliver_area_list?res.data.deliver_area_list:[]
if(deliver_area_list.length==3){
deliver_area_list.pop()
}
if (Array.isArray(deliver_area_list) && deliver_area_list.length > 0) {
this.goodsaftersale.deliver_area_id_list = deliver_area_list.map((item)=> {
return item.id
});
}
// 后台返回数据格式 ‘2,3’或者‘[]’都是字符串，处理兼容一下 // 后台返回数据格式 ‘2,3’或者‘[]’都是字符串，处理兼容一下
//debugger debugger
if( res.data.stags && !Array.isArray(res.data.stags)) { if( res.data.stags && !Array.isArray(res.data.stags)) {
if( res.data.stags.indexOf(',') > -1 ) { if( res.data.stags.indexOf(',') > -1 ) {
stagArr = res.data.stags.split(','); stagArr = res.data.stags.split(',');
...@@ -373,7 +388,7 @@ ...@@ -373,7 +388,7 @@
} }
} }
}); });
// console.log("售后数据：",this.goodsaftersale) console.log("售后数据：",this.goodsaftersale)
}else { }else {
this.isShowGoodsDetails = false; this.isShowGoodsDetails = false;
} }
...@@ -664,28 +679,7 @@ ...@@ -664,28 +679,7 @@
// 获取 商品信息数据 // 获取 商品信息数据
let spxxData = this.$refs.goodsInfo.goodsInfoForm; let spxxData = this.$refs.goodsInfo.goodsInfoForm;
// 品牌处理 goods_brand
let brandOptions = this.$refs.goodsInfo.brandOptions;
if (Array.isArray(brandOptions) && brandOptions.length > 0) {
for(let bi = 0; bi < brandOptions.length; bi++) {
if( Number(spxxData.brand_id) === Number(brandOptions[bi].id) ) {
spxxData.goods_brand = brandOptions[bi].brand_cn;
break;
}
}
}
// 产地
spxxData["producing_area_id"] = spxxData.producing_area_id_list[spxxData.producing_area_id_list.length - 1]
// 发货地
spxxData["deliver_area_id"] = spxxData.deliver_area_id_list[spxxData.deliver_area_id_list.length - 1]
// 发货地数据处理，预留
// for(let ai = 0; ai < areaOptions.length; ai++) {
// if ( Number(ssffData.deliver_area) === Number(areaOptions[ai].id) ) {
// ssffData.deliver_area = areaOptions[ai].name;
// break;
// }
// }
if( spxxData.imgs.length > 7 ) { if( spxxData.imgs.length > 7 ) {
this.$message({ type: 'warning',message: '商品信息中，商品图片最大数量为7张，请检查' }); this.$message({ type: 'warning',message: '商品信息中，商品图片最大数量为7张，请检查' });
...@@ -720,7 +714,28 @@ ...@@ -720,7 +714,28 @@
// 售后服务 数据 // 售后服务 数据
let ssffData = this.$refs.goodsaftersale.goodsAfterSaleForm; let ssffData = this.$refs.goodsaftersale.goodsAfterSaleForm;
// 品牌处理 goods_brand
let brandOptions = this.$refs.goodsaftersale.brandOptions;
if (Array.isArray(brandOptions) && brandOptions.length > 0) {
for(let bi = 0; bi < brandOptions.length; bi++) {
if( Number(ssffData.brand_id) === Number(brandOptions[bi].id) ) {
ssffData.goods_brand = brandOptions[bi].brand_cn;
break;
}
}
}
// 产地
ssffData["producing_area_id"] = ssffData.producing_area_id_list[ssffData.producing_area_id_list.length - 1]
// 发货地
ssffData["deliver_area_id"] = ssffData.deliver_area_id_list[ssffData.deliver_area_id_list.length - 1]
// 发货地数据处理，预留
// for(let ai = 0; ai < areaOptions.length; ai++) {
// if ( Number(ssffData.deliver_area) === Number(areaOptions[ai].id) ) {
// ssffData.deliver_area = areaOptions[ai].name;
// break;
// }
// }
if (ssffData.delay_compensate == 72) { if (ssffData.delay_compensate == 72) {
this.$message({ type: 'warning',message: '发货时长不能超过48小时，请重新编辑' }); this.$message({ type: 'warning',message: '发货时长不能超过48小时，请重新编辑' });
return return
......
src/views/system/goodsimport/index.vue
浏览文件 @ 8d3843f4
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix">商品导入</div> <div slot="header" class="clearfix">导入商品</div>
<h3 class="cton_h3">剩余次数：{{collect_num}} / 1000次</h3> <h3 class="cton_h3">剩余次数：{{collect_num}} / 1000次</h3>
<div class="cton_text"> <div class="cton_text">
<p>功能介绍：</p> <p>功能介绍：</p>
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
</p> </p>
<p>请确保不要将多个平台的商品链接混合输入</p> <p>请确保不要将多个平台的商品链接混合输入</p>
<p>每个用户默认拥有1000次商品导入的机会，请慎重使用</p> <p>每个用户默认拥有1000次商品导入的机会，请慎重使用</p>
<p>支持平台：</p>
<p>京东、天猫、淘宝 </p>
</div> </div>
<el-form ref="form" :model="form" label-width="180px"> <el-form ref="form" :model="form" label-width="180px">
<el-form-item label="商品链接："> <el-form-item label="商品链接：">
......
src/views/system/order/components/orderDetail.vue
浏览文件 @ 8d3843f4
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div> <div>
<el-button size="mini" type="primary" @click="goShipping(1)">去发货</el-button> <el-button size="mini" type="primary" @click="goShipping(1)">去发货</el-button>
<el-button size="mini" type="primary" @click="goShipping(2)" >补单发货</el-button> <el-button size="mini" type="primary" @click="goShipping(2)" >更新物流单号</el-button>
</div> </div>
</div> </div>
<el-table :data="orderGoodsDetail" style="border: 1px solid #eee;" @selection-change="handleSelectionChange"> <el-table :data="orderGoodsDetail" style="border: 1px solid #eee;" @selection-change="handleSelectionChange">
...@@ -438,7 +438,7 @@ export default { ...@@ -438,7 +438,7 @@ export default {
} }
}else { }else {
isContinue = false; isContinue = false;
this.$message({type:'warning',message:'所选商品中部分未发货，不能进行补单操作，请重新选择'}); this.$message({type:'warning',message:'所选商品中部分未发货，不能进行更新物流单号，请重新选择'});
break break
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论