Commit 230fd530 authored by 赵茹林's avatar 赵茹林

Merge branch 'master' into dev

# Conflicts:
#	index.html
#	src/components/logistics/index.vue
#	src/components/notBuyClass/index.vue
#	src/components/order/index.vue
#	src/components/system/tag.vue
parents 7b28e250 9eb0f525
<!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_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.7.2/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.711af98bcb2544b7a7d7.js></script><script type=text/javascript src=/static/js/vendor.6a18832950b1e06cbd55.js></script><script type=text/javascript src=/static/js/app.0b4623e7a1fcdcf8f57a.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_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://cdn.bootcss.com/vue/2.5.17/vue.js></script><script src=https://unpkg.com/vuex@3.0.1></script><script src=https://cdn.bootcss.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.cdf56b45a8e5181ef9d6.js></script><script type=text/javascript src=/static/js/vendor.e17f712b043f8cffc82a.js></script><script type=text/javascript src=/static/js/app.48d3b40842e2ec606eff.js></script></body><script>let el = document.getElementsByTagName("script");
el.onerror = function(a,b,c){
console.log('error:',a,b,c);
};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
webpackJsonp([27],{L5jB:function(n,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var e=t("CCn6"),r=t("+TkF"),i={name:"index",components:{page:t("kmJW").a},data:function(){var n=[];for(var a in r.i)n.push({id:a,value:r.i[a]});var t=[];for(var e in r.h)t.push({id:e,value:r.h[e]});return{width:0,searchFrom:{user_id:"",sub_user_id:""},userList:[],total:0,nowPage:1,limit:10,showDetail:!1}},mounted:function(){this.getUser(),this.width=window.innerWidth-200},filters:{INTEGRALTYPE:function(n){return r.i[n]},INTEGRALFUN:function(n){return r.h[n]}},methods:{onPageChange:function(n){this.nowPage=n,this.getUser()},onSizeChange:function(n){this.limit=n,this.nowPage=1,this.getUser()},getUser:function(){var n=this,a={page:this.nowPage,limit:this.limit};this.searchFrom.user_id&&(a.user_id=this.searchFrom.user_id),this.searchFrom.sub_user_id&&(a.sub_user_id=this.searchFrom.sub_user_id),Object(e._104)(a).then(function(a){n.userList=a.list,n.total=a.total})}}},o=function(){var n=this,a=n.$createElement,t=n._self._c||a;return t("div",{staticClass:"integral-page"},[t("el-form",{ref:"searchFrom",staticStyle:{"padding-top":"20px"},attrs:{model:n.searchFrom,"label-width":"80px",inline:""}},[t("el-form-item",{attrs:{label:"主账户ID"}},[t("el-input",{model:{value:n.searchFrom.user_id,callback:function(a){n.$set(n.searchFrom,"user_id",a)},expression:"searchFrom.user_id"}})],1),n._v(" "),t("el-form-item",{attrs:{label:"子账户ID"}},[t("el-input",{model:{value:n.searchFrom.sub_user_id,callback:function(a){n.$set(n.searchFrom,"sub_user_id",a)},expression:"searchFrom.sub_user_id"}})],1),n._v(" "),t("el-form-item",[t("el-button",{attrs:{type:"primary",plain:""},on:{click:n.getUser}},[n._v("搜索")])],1)],1),n._v(" "),t("el-table",{style:{width:n.width+"px"},attrs:{data:n.userList}},[t("el-table-column",{attrs:{className:"f-c",label:"主账户"},scopedSlots:n._u([{key:"default",fn:function(a){return[t("img",{staticClass:"avatar",attrs:{src:a.row.user_avatar}}),n._v("\n "+n._s(a.row.user_nickname)+"(ID:"+n._s(a.row.user_id)+")\n ")]}}])}),n._v(" "),t("el-table-column",{attrs:{className:"f-c",label:"子账户"},scopedSlots:n._u([{key:"default",fn:function(a){return[t("img",{staticClass:"avatar",attrs:{src:a.row.sub_user_avatar}}),n._v("\n "+n._s(a.row.sub_user_nickname)+"(ID:"+n._s(a.row.sub_user_id)+")\n ")]}}])}),n._v(" "),t("el-table-column",{attrs:{prop:"created_at",label:"绑定时间"}}),n._v(" "),t("el-table-column",{attrs:{prop:"unbind_at",label:"解绑时间"},scopedSlots:n._u([{key:"default",fn:function(a){return[n._v(n._s("0000-00-00 00:00:00"==a.row.unbind_at?"未解绑":a.row.unbind_at))]}}])})],1),n._v(" "),t("page",{attrs:{total:n.total,limit:n.limit},on:{pageChange:n.onPageChange,sizeChange:n.onSizeChange}})],1)};o._withStripped=!0;var s={render:o,staticRenderFns:[]},l=s;var A=!1;var c=t("VU/8")(i,l,!1,function(n){A||(t("x4fB"),t("aJSp"))},"data-v-af173a98",null);c.options.__file="src\\components\\subList\\index.vue";a.default=c.exports},aJSp:function(n,a,t){var e=t("quIk");"string"==typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);t("rjj0")("6bf88f46",e,!1,{})},quIk:function(n,a,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n.f-c > .cell {\r\n display: -webkit-box !important;\r\n display: -ms-flexbox !important;\r\n display: flex !important;\r\n -webkit-box-orient: horizontal;\r\n -webkit-box-direction: normal;\r\n -ms-flex-flow: row;\r\n flex-flow: row;\r\n -webkit-box-pack: start;\r\n -ms-flex-pack: start;\r\n justify-content: flex-start;\r\n -webkit-box-align: center;\r\n -ms-flex-align: center;\r\n align-items: center;\n}\r\n","",{version:3,sources:["C:/Users/Administrator/Desktop/后台/admin/src/components/subList/index.vue"],names:[],mappings:";AACA;EACE,gCAAgC;EAChC,gCAAgC;EAChC,yBAAyB;EACzB,+BAA+B;EAC/B,8BAA8B;MAC1B,mBAAmB;UACf,eAAe;EACvB,wBAAwB;MACpB,qBAAqB;UACjB,4BAA4B;EACpC,0BAA0B;MACtB,uBAAuB;UACnB,oBAAoB;CAC7B",file:"index.vue",sourcesContent:["\n.f-c > .cell {\r\n display: -webkit-box !important;\r\n display: -ms-flexbox !important;\r\n display: flex !important;\r\n -webkit-box-orient: horizontal;\r\n -webkit-box-direction: normal;\r\n -ms-flex-flow: row;\r\n flex-flow: row;\r\n -webkit-box-pack: start;\r\n -ms-flex-pack: start;\r\n justify-content: flex-start;\r\n -webkit-box-align: center;\r\n -ms-flex-align: center;\r\n align-items: center;\n}\r\n"],sourceRoot:""}])},tPa2:function(n,a,t){(n.exports=t("FZ+f")(!0)).push([n.i,'\n.search-btn-block[data-v-af173a98] {\n margin-left: 20px;\n}\n.search-form[data-v-af173a98] {\n background: white;\n padding: 10px;\n margin: 10px 0;\n}\n.new-block[data-v-af173a98] {\n margin: 10px;\n text-align: right;\n}\n.fl-r[data-v-af173a98] {\n float: right;\n}\n.text-c[data-v-af173a98] {\n text-align: center;\n}\n.text-b[data-v-af173a98] {\n font-weight: bold;\n}\n.color-b[data-v-af173a98] {\n color: #6ba8e6;\n}\n.text-r[data-v-af173a98] {\n text-align: right;\n}\n.main-block[data-v-af173a98] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\nhtml[data-v-af173a98] {\n font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "\\5FAE\\8F6F\\96C5\\9ED1", Arial, sans-serif;\n}\n.clear-both[data-v-af173a98]:after {\n content: \'\';\n display: block;\n clear: both;\n}\n/*::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色,还可以设置边框属性\n border-radius: 10px;\n}\n::-webkit-scrollbar {//滚动条的宽度\n width:5px;\n height:5px;\n}\n::-webkit-scrollbar-thumb {//滚动条的设置\n background-color:@secondary-font-color;\n border-radius: 10px;\n height: 10px;\n min-height:10px;\n}*/\n.avatar[data-v-af173a98] {\n width: 50px;\n min-width: 50px;\n height: 50px;\n margin-right: 5px;\n border-radius: 50%;\n}\n',"",{version:3,sources:["C:/Users/Administrator/Desktop/后台/admin/src/components/subList/index.vue"],names:[],mappings:";AACA;EACE,kBAAkB;CACnB;AACD;EACE,kBAAkB;EAClB,cAAc;EACd,eAAe;CAChB;AACD;EACE,aAAa;EACb,kBAAkB;CACnB;AACD;EACE,aAAa;CACd;AACD;EACE,mBAAmB;CACpB;AACD;EACE,kBAAkB;CACnB;AACD;EACE,eAAe;CAChB;AACD;EACE,kBAAkB;CACnB;AACD;EACE,YAAY;EACZ,kBAAkB;EAClB,aAAa;CACd;AACD;EACE,0IAA0H;CAC3H;AACD;EACE,YAAY;EACZ,eAAe;EACf,YAAY;CACb;AACD;;;;;;;;;;;;GAYG;AACH;EACE,YAAY;EACZ,gBAAgB;EAChB,aAAa;EACb,kBAAkB;EAClB,mBAAmB;CACpB",file:"index.vue",sourcesContent:['\n.search-btn-block[data-v-af173a98] {\n margin-left: 20px;\n}\n.search-form[data-v-af173a98] {\n background: white;\n padding: 10px;\n margin: 10px 0;\n}\n.new-block[data-v-af173a98] {\n margin: 10px;\n text-align: right;\n}\n.fl-r[data-v-af173a98] {\n float: right;\n}\n.text-c[data-v-af173a98] {\n text-align: center;\n}\n.text-b[data-v-af173a98] {\n font-weight: bold;\n}\n.color-b[data-v-af173a98] {\n color: #6ba8e6;\n}\n.text-r[data-v-af173a98] {\n text-align: right;\n}\n.main-block[data-v-af173a98] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\nhtml[data-v-af173a98] {\n font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;\n}\n.clear-both[data-v-af173a98]:after {\n content: \'\';\n display: block;\n clear: both;\n}\n/*::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色,还可以设置边框属性\n border-radius: 10px;\n}\n::-webkit-scrollbar {//滚动条的宽度\n width:5px;\n height:5px;\n}\n::-webkit-scrollbar-thumb {//滚动条的设置\n background-color:@secondary-font-color;\n border-radius: 10px;\n height: 10px;\n min-height:10px;\n}*/\n.avatar[data-v-af173a98] {\n width: 50px;\n min-width: 50px;\n height: 50px;\n margin-right: 5px;\n border-radius: 50%;\n}\n'],sourceRoot:""}])},x4fB:function(n,a,t){var e=t("tPa2");"string"==typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);t("rjj0")("c7b14384",e,!1,{})}});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
webpackJsonp([59],{"OIp/":function(n,e,t){var i=t("ieLF");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("66671e80",i,!1,{})},iPJD:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=t("CCn6"),r={name:"upload",data:function(){return{fileList:[]}},methods:{uploadFileVideo1Banner:function(n){var e=this;Object(i._192)({file:n.file,type:"local"}).then(function(n){n.url="https://cdn.singsingenglish.com/"+n.url,e.fileList.push(n)})}}},l=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[t("el-upload",{staticClass:"upload-demo",attrs:{action:"/api/public/upload","http-request":n.uploadFileVideo1Banner,"list-type":"picture-card",multiple:""}}),n._v(" "),t("pre",[n._v(" <p>\n ")]),n._v(" "),n._l(n.fileList,function(e){return t("pre",[n._v(' <img src="'+n._s(e.url)+'" style="display:block">\n ')])}),n._v(" "),t("pre",[n._v(" </p>\n ")])],2)};l._withStripped=!0;var o={render:l,staticRenderFns:[]},s=o;var a=!1;var p=t("VU/8")(r,s,!1,function(n){a||t("OIp/")},"data-v-46451c0f",null);p.options.__file="src\\components\\framework\\upload.vue";e.default=p.exports},ieLF:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n","",{version:3,sources:[],names:[],mappings:"",file:"upload.vue",sourceRoot:""}])}});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
webpackJsonp([61],{S0XV:function(n,e,t){var s=t("vHjS");"string"==typeof s&&(s=[[n.i,s,""]]),s.locals&&(n.exports=s.locals);t("rjj0")("66799158",s,!1,{})},usUK:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=function(){var n=this.$createElement;return(this._self._c||n)("div",[this._v("\n 发货列表\n")])};s._withStripped=!0;var i={render:s,staticRenderFns:[]},r=i;var o=!1;var c=t("VU/8")({name:"index"},r,!1,function(n){o||t("S0XV")},"data-v-3ce2c5da",null);c.options.__file="src\\components\\consignment\\index.vue";e.default=c.exports},vHjS:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n","",{version:3,sources:[],names:[],mappings:"",file:"index.vue",sourceRoot:""}])}});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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