Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into devlopment

ad91f397 · chenfenglei · 9a7a0777 · 1aeb18ac · ad91f397 · ad91f397
Commit ad91f397 authored Dec 24, 2018 by chenfenglei
4 changed files
--- 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_x1rivf5f5.css><link rel=stylesheet href=https://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.30a40a564e8f908648d3c5a50571af7f.css rel=stylesheet></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.0ed29464799ac21cf347.js></script><script type=text/javascript src=/static/js/vendor.e60c84a06324e93cae6c.js></script><script type=text/javascript src=/static/js/app.57493a45c7c6a4d5488c.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://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.62d99e2004b5a1579e2a10372f8f960a.css rel=stylesheet></head><body><script src=https://unpkg.com/vue@2.5.17/dist/vue.js></script><script src=https://unpkg.com/vuex@3.0.1/dist/vuex.min.js></script><script src=https://unpkg.com/axios@0.18.0/dist/axios.min.js></script><script src=https://unpkg.com/element-ui@2.4.9/lib/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.1581f061ac4f4d70c8f8.js></script><script type=text/javascript src=/static/js/vendor.e60c84a06324e93cae6c.js></script><script type=text/javascript src=/static/js/app.57493a45c7c6a4d5488c.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.62d99e2004b5a1579e2a10372f8f960a.css
+++ b/dist/static/css/app.62d99e2004b5a1579e2a10372f8f960a.css
--- a/dist/static/js/17.bc1ed230f3a010d8d8aa.js
+++ b/dist/static/js/17.bc1ed230f3a010d8d8aa.js
+webpackJsonp([17],{"69L+":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("kmJW"),i=r("CCn6"),s={props:["dialogObj"],data:function(){return{form:{id:"",teacher_id:""},teacherList:[]}},methods:{initPage:function(){var e=this;Object(i._54)({page:1,limit:200}).then(function(t){e.teacherList=t.list}),this.form={id:this.dialogObj.id,teacher_id:this.dialogObj.teacher_id?this.dialogObj.teacher_id:""}},onSave:function(){var e=this,t=this.form.teacher_id?this.form.teacher_id:0;Object(i.s)(this.form.id,t).then(function(t){e.$message({type:"success",message:"绑定成功!"}),e.dialogObj.show=!1})}},watch:{dialogObj:function(e){this.initPage()}}},o={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-dialog",{attrs:{title:e.dialogObj.title,visible:e.dialogObj.show,width:"800px"},on:{"update:visible":function(t){e.$set(e.dialogObj,"show",t)}}},[r("el-form",{ref:"form",attrs:{model:e.form,"label-width":"120px"}},[r("el-form-item",{attrs:{label:"老师"}},[r("el-select",{attrs:{placeholder:"请选择"},model:{value:e.form.teacher_id,callback:function(t){e.$set(e.form,"teacher_id",t)},expression:"form.teacher_id"}},e._l(e.teacherList,function(e,t){return r("el-option",{key:t,attrs:{label:e.name,value:e.id}})}))],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:function(t){e.dialogObj.show=!1}}},[e._v("取 消")]),e._v(" "),r("el-button",{attrs:{type:"primary"},on:{click:e.onSave}},[e._v("确 定")])],1)],1)},staticRenderFns:[]};var l=r("VU/8")(s,o,!1,function(e){r("Xd4+")},"data-v-105fa848",null).exports,n=r("+TkF"),c={name:"smsRecord",components:{page:a.a,teacherDialog:l},data:function(){return{nowPage:1,total:0,limit:10,useTypeList:[{user_buy:0,value:"未绑定"},{user_buy:1,value:"已绑定"}],searchFrom:{goods_id:"",mobile:"",order_id:"",teacher_id:"",payTime:[],syncTime:[]},list:[],teacherList:[],goodList:[],dialogObj:{show:!1,title:"绑定老师",order_id:0,teacher_id:0}}},filters:{filterStatus:function(e){return 0===e?"未绑定":"已绑定"},filterGoods:function(e){return"["+n.f[e.goods_type]+"]["+e.current_price/100+"元]"+e.name}},mounted:function(){this.getList(),this.getGoodsOption(),this.getTeacherList()},methods:{onPageChange:function(e){this.nowPage=e,this.getList()},getTeacherList:function(){var e=this;Object(i._54)({page:1,limit:200}).then(function(t){e.teacherList=t.list})},onSizeChange:function(e){this.nowPage=1,this.limit=e,this.getList()},getList:function(){var e=this,t={limit:this.limit,page:this.nowPage};this.searchFrom.mobile&&(t.mobile=this.searchFrom.mobile),this.searchFrom.teacher_id&&(t.teacher_id=this.searchFrom.teacher_id),this.searchFrom.goods_name&&(t.goods_name=this.searchFrom.goods_name),(this.searchFrom.user_buy||0==this.searchFrom.user_buy)&&(t.user_buy=this.searchFrom.user_buy),this.searchFrom.order_id&&(t.order_id=this.searchFrom.order_id),this.searchFrom.goods_id&&(t.goods_id=this.searchFrom.goods_id),this.searchFrom.payTime&&this.searchFrom.payTime.length>0&&(t.start_at=this.searchFrom.payTime[0],t.end_at=this.searchFrom.payTime[1]),this.searchFrom.syncTime&&this.searchFrom.syncTime.length>0&&(t.pull_start_at=this.searchFrom.syncTime[0],t.pull_end_at=this.searchFrom.syncTime[1]),Object(i._63)(t).then(function(t){console.log(t.list),e.total=t.total,e.list=t.list?t.list:[]})},getGoodsOption:function(){var e=this;Object(i._29)({page:1,limit:100}).then(function(t){e.goodList=t.list})},bindTeacher:function(e){this.dialogObj={show:!0,title:"绑定老师",id:e.id,teacher_id:e.teacher_id}},exportTable:function(e){if(e.length>0){var t={};this.searchFrom.order_id&&(t.order_id=this.searchFrom.order_id),(this.searchFrom.user_buy||0==this.searchFrom.user_buy)&&(t.user_buy=this.searchFrom.user_buy),this.searchFrom.mobile&&(t.mobile=this.searchFrom.mobile),this.searchFrom.goods_id&&(t.goods_id=this.searchFrom.goods_id),this.searchFrom.payTime&&this.searchFrom.payTime.length>0&&(t.start_at=this.searchFrom.payTime[0],t.end_at=this.searchFrom.payTime[1]),this.searchFrom.syncTime&&this.searchFrom.syncTime.length>0&&(t.pull_start_at=this.searchFrom.syncTime[0],t.pull_end_at=this.searchFrom.syncTime[1]),Object(i._4)("api/admin/yunji/order/export",t)}}}},h={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"sms"},[r("el-form",{ref:"searchFrom",attrs:{inline:"",model:e.searchFrom,"label-width":"100px"}},[r("el-form-item",{attrs:{label:"交易订单号"}},[r("el-input",{on:{change:e.getList},model:{value:e.searchFrom.order_id,callback:function(t){e.$set(e.searchFrom,"order_id",t)},expression:"searchFrom.order_id"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"手机号"}},[r("el-input",{on:{change:e.getList},model:{value:e.searchFrom.mobile,callback:function(t){e.$set(e.searchFrom,"mobile",t)},expression:"searchFrom.mobile"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"绑定状态"}},[r("el-select",{attrs:{placeholder:"请选择",clearable:""},on:{change:e.getList},model:{value:e.searchFrom.user_buy,callback:function(t){e.$set(e.searchFrom,"user_buy",t)},expression:"searchFrom.user_buy"}},e._l(e.useTypeList,function(e){return r("el-option",{key:e.user_buy,attrs:{label:e.value,value:e.user_buy}})}))],1),e._v(" "),r("el-form-item",{attrs:{label:"商品名称"}},[r("el-select",{attrs:{placeholder:"请选择",clearable:""},on:{change:e.getList},model:{value:e.searchFrom.goods_id,callback:function(t){e.$set(e.searchFrom,"goods_id",t)},expression:"searchFrom.goods_id"}},e._l(e.goodList,function(t,a){return r("el-option",{key:a,attrs:{label:e._f("filterGoods")(t),value:t.id}})}))],1),e._v(" "),r("el-form-item",{attrs:{label:"老师"}},[r("el-select",{attrs:{placeholder:"请选择"},on:{change:e.getList},model:{value:e.searchFrom.teacher_id,callback:function(t){e.$set(e.searchFrom,"teacher_id",t)},expression:"searchFrom.teacher_id"}},e._l(e.teacherList,function(e,t){return r("el-option",{key:t,attrs:{label:e.name,value:e.id}})}))],1),e._v(" "),r("el-form-item",{attrs:{label:"购买时间"}},[r("el-date-picker",{attrs:{"unlink-panels":"",type:"daterange","value-format":"yyyy-MM-dd","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.getList},model:{value:e.searchFrom.payTime,callback:function(t){e.$set(e.searchFrom,"payTime",t)},expression:"searchFrom.payTime"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"同步时间"}},[r("el-date-picker",{attrs:{"unlink-panels":"",type:"daterange","value-format":"yyyy-MM-dd","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.getList},model:{value:e.searchFrom.syncTime,callback:function(t){e.$set(e.searchFrom,"syncTime",t)},expression:"searchFrom.syncTime"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:e.getList}},[e._v("搜索")]),e._v(" "),r("el-button",{attrs:{type:"primary",plain:""},on:{click:function(t){e.exportTable(e.list)}}},[e._v("导出")])],1)],1),e._v(" "),r("el-table",{staticStyle:{width:"100%"},attrs:{data:e.list}},[r("el-table-column",{attrs:{prop:"order_id",label:"订单号"}}),e._v(" "),r("el-table-column",{attrs:{prop:"nickname",label:"购买人"},scopedSlots:e._u([{key:"default",fn:function(t){return[0!==t.row.user_id?r("div",{staticStyle:{display:"flex"}},[r("img",{staticClass:"avatar",attrs:{src:t.row.avatar}}),e._v(" "),r("div",[e._v(e._s(t.row.nickname)),r("br"),e._v("(ID:"+e._s(t.row.user_id)+")")])]):e._e(),e._v(" "),0===t.row.user_id?r("div",[e._v("\n          暂未绑定用户\n          ")]):e._e()]}}])}),e._v(" "),r("el-table-column",{attrs:{prop:"goods_name",label:"商品名称"}}),e._v(" "),r("el-table-column",{attrs:{prop:"receiver_name",label:"姓名"}}),e._v(" "),r("el-table-column",{attrs:{prop:"receiver_phone",label:"手机号"}}),e._v(" "),r("el-table-column",{attrs:{label:"收货地址"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n        "+e._s(t.row.receiver_province)+" "+e._s(t.row.receiver_city)+" "+e._s(t.row.receiver_area)+" "+e._s(t.row.receiver_address)+"\n      ")]}}])}),e._v(" "),r("el-table-column",{attrs:{prop:"teacher_name",label:"班级老师"}}),e._v(" "),r("el-table-column",{attrs:{prop:"create_time",label:"购买时间",sortable:""}}),e._v(" "),r("el-table-column",{attrs:{prop:"pay_time",label:"下单时间",sortable:""}}),e._v(" "),r("el-table-column",{attrs:{prop:"buyer_comment",label:"备注"}})],1),e._v(" "),r("page",{attrs:{nowPage:e.nowPage,total:e.total},on:{pageChange:e.onPageChange,sizeChange:e.onSizeChange}}),e._v(" "),r("teacher-dialog",{attrs:{dialogObj:e.dialogObj}})],1)},staticRenderFns:[]};var m=r("VU/8")(c,h,!1,function(e){r("pSiE"),r("wtY5")},"data-v-610e08b2",null);t.default=m.exports},"Xd4+":function(e,t){},pSiE:function(e,t){},wtY5:function(e,t){}});
\ No newline at end of file
--- a/dist/static/js/manifest.1581f061ac4f4d70c8f8.js
+++ b/dist/static/js/manifest.1581f061ac4f4d70c8f8.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,n,r){for(var t,b,o,i=0,u=[];i<f.length;i++)b=f[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(a&&a(f,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=c(c.s=r[i]);return o};var f={},d={46:0};function c(a){if(f[a])return f[a].exports;var d=f[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,c),d.l=!0,d.exports}c.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,c){a=d[e]=[f,c]});a[2]=f;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,c.nc&&r.setAttribute("nonce",c.nc),r.src=c.p+"static/js/"+e+"."+{0:"87b1173ede31fe8690a4",1:"5abb4a2fa705d98c107a",2:"7b2eb9b12043c23f0a94",3:"d4a62c4fe890bf6ee497",4:"e3e8b6a3dce7fe5b3610",5:"ee4147f97d6bed986ae8",6:"dac7488781ecf090bcda",7:"6d035da2745fcb6658ba",8:"45eaa26a662969fee1fd",9:"f0728b306ed776b56990",10:"4b43308d5d1e447a1034",11:"330657222a4ba1831aff",12:"98c94ea52f081fed6f9f",13:"1a8f87795ff6cad5c7ab",14:"198b3d9abc039d95485d",15:"fdc0f0ac82dcb5d9d015",16:"a04e2f4f5c39b359e289",17:"bc1ed230f3a010d8d8aa",18:"604d433da1586063bd53",19:"a48edf78cfde13c4505e",20:"070617f4cf9378d3401f",21:"39f6c6abf9d5022bd023",22:"25e0926d1e4098a3cdfc",23:"a7e26d726cdfc8064ebd",24:"1288f123a8cbbd018af8",25:"0dbb86c8fcf967863371",26:"2b7d3edd93027fdf524a",27:"4a0ba15005ea6ff3cccf",28:"56f0fc2e8c34fdab0320",29:"00cfaf28c9c91ee58dc9",30:"5db7b1d80fd370d7d696",31:"432ffbeadd435185d054",32:"4eaa44d11b44992029da",33:"b01dcd9acb18f4f01415",34:"976bcfc510470cbaeab9",35:"f17537594933efbae66b",36:"63f0f1fb359d4aa4001f",37:"6a57d419d80d0b52cdd7",38:"dfdd67afc4ef38ed98ee",39:"b010616de2ece6aad049",40:"5f77c224e8b939a1e34e",41:"2bec6e0b0a10e643aaab",42:"2c9681c27e857324bd4d",43:"5c0d372270e64c62a9a1"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),f},c.m=e,c.c=f,c.d=function(e,a,f){c.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},c.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(a,"a",a),a},c.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},c.p="/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file