87

d534a245 · chenyishuai@singsingenglish.com · 060b7b31 · d534a245 · d534a245 · d534a245
Commit d534a245 authored Aug 07, 2019 by chenyishuai@singsingenglish.com
8 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_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.b655fb0c7a85afc953a6.js></script><script type=text/javascript src=/static/js/vendor.6a18832950b1e06cbd55.js></script><script type=text/javascript src=/static/js/app.607bd306fb9aee58c3c4.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.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.8083cb5f1be14e9bb64b.js></script><script type=text/javascript src=/static/js/vendor.6a18832950b1e06cbd55.js></script><script type=text/javascript src=/static/js/app.607bd306fb9aee58c3c4.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/18.3e560fbd379260dfd8ff.js
+++ b/dev/static/js/18.3e560fbd379260dfd8ff.js
--- a/dev/static/js/manifest.8083cb5f1be14e9bb64b.js
+++ b/dev/static/js/manifest.8083cb5f1be14e9bb64b.js
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(f&&f(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},a={72:0};function b(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,b){f=a[e]=[c,b]});f[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"5e21353f9e7f6b913588",1:"74eb00e6fb303e2d2759",2:"1f6a00a1c98fbf2db665",3:"c6779c9b3aa0c8780991",4:"71fc328e214e30832054",5:"6d1a9f7a2e30dd44d02d",6:"f1925ca55ec5c7d41887",7:"f0e8b03080b3b4ebf31c",8:"9f80bdcf1310ef1f4d40",9:"523f6b2142e0b1a59de8",10:"4af583c4dd796e3360f9",11:"aec2a9fb6041eb630d55",12:"2c72155b2154e8815c00",13:"af9f03f63888b915fd7f",14:"8cd0f3a8b31d5e64931e",15:"4bd927c46272193f9e72",16:"51a8748901c539c9d7f6",17:"c6ca0315d005d11917f2",18:"3e560fbd379260dfd8ff",19:"2b43d74d0aa30e036698",20:"f42b11252eb62efb59cd",21:"574b6484dc28d94bef1f",22:"aeadcb935f4215bd1bd5",23:"080a8966b3305c3ae15b",24:"92cbc050ed71b534294b",25:"586027709dea49f5116f",26:"d77cdbd1bc2f9789ae81",27:"62a380e3075bb9f61234",28:"24b6f10c46ca1efeb87a",29:"aba6b471e6c95a1907f4",30:"0bc70212b94eb5665fff",31:"135568f2f6466e39320c",32:"24c59027060f0ebec47f",33:"489760d45a9fef30bb4a",34:"6c63eb8d60c5be1dc2f3",35:"974841988630e681632c",36:"512280620f6044f06ebd",37:"40a0dd48806323a37f8b",38:"508b9a742a79cdae432c",39:"50ccfca6c1306cff512a",40:"7cde0e1c3d8e909777cc",41:"23e1be9d61c60e87d43b",42:"0e33d8489572470ad249",43:"a8d1fc3389fd795b2bce",44:"a5af5802ec28b6068e5b",45:"fe6e1551696349b29668",46:"12a517ba912b03aab935",47:"f0665b8c5b8f3af0c10f",48:"fb608a4f603e4a31cade",49:"f97d79f4daec8f87df42",50:"7dd0676cbb72e6f2fd1a",51:"939577234b61aded2624",52:"b2ed992be8294772a938",53:"c3b179b20a856816890a",54:"212816b171eafd1488bc",55:"f9539545129dd1bad64b",56:"501b516cd393780837db",57:"aa460a73c9c018520800",58:"a08c9ad93f421380be9d",59:"4b383cfca408a639edd1",60:"9469909bde10400ad51e",61:"e058805f6e7edf48bd52",62:"95820125712b6f2ace7f",63:"b469807b5322df1168f0",64:"83207fa7cfec7327665c",65:"c1554131ce716a3b677c",66:"3b61402de44f86c4ef2a",67:"09ced7442ae82f25505e",68:"0456ffd7b429ae2463ac",69:"1478ab9bf52f6eef71d3"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,f,c){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="/",b.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_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.9c113ec52bc120bdaffb0be6fbe1bdb8.css rel=stylesheet></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.c5d1e3b88ff373546b9e.js></script><script type=text/javascript src=/static/js/vendor.adb38bc212a981bb369e.js></script><script type=text/javascript src=/static/js/app.100b7f4500d2b66f597d.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.7.2/theme-chalk/index.css><title>唱唱启蒙-后台</title><link href=/static/css/app.9d25f58c1169f95f0d22fb38d5247bc7.css rel=stylesheet></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.2e6863f41cfa05a90e2f.js></script><script type=text/javascript src=/static/js/vendor.adb38bc212a981bb369e.js></script><script type=text/javascript src=/static/js/app.100b7f4500d2b66f597d.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.9d25f58c1169f95f0d22fb38d5247bc7.css
+++ b/dist/static/css/app.9d25f58c1169f95f0d22fb38d5247bc7.css
--- a/dist/static/js/15.907589cf28fcf315db91.js
+++ b/dist/static/js/15.907589cf28fcf315db91.js
--- a/dist/static/js/manifest.2e6863f41cfa05a90e2f.js
+++ b/dist/static/js/manifest.2e6863f41cfa05a90e2f.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],b[t]&&u.push(b[t][0]),b[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},b={72:0};function f(a){if(c[a])return c[a].exports;var b=c[a]={i:a,l:!1,exports:{}};return e[a].call(b.exports,b,b.exports,f),b.l=!0,b.exports}f.e=function(e){var a=b[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=b[e]=[c,f]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"9ad51ff0cc7bfde211a5",1:"4bf7ef6b10fb2f1fce01",2:"5055d90e5ebe9b7660d1",3:"21445077358e688e5e80",4:"c277c2a23df4047bd82a",5:"e4d7fdc8c4d082d99d89",6:"fa0953c14df5c864f0cf",7:"a76a91b1844dc6a8b5b7",8:"6e7f9bbaf8cbe880b0a5",9:"e7a072f7fb8ffb733984",10:"c8b3a6ae5ca19cd5a260",11:"ea7abbe9f5942dda2d52",12:"80a37e4567474a5bd5bf",13:"ca9d51bd45337b4c4c53",14:"91acc339ae6fd719abda",15:"907589cf28fcf315db91",16:"736d2f864e6573d2cfbb",17:"0e97c65823cfd0bfb76b",18:"97df2e4b68eb98b9d504",19:"98e603e366de6a159c34",20:"eeecee4d5c7589604314",21:"b5fb1dfc5f79622f60b0",22:"60e06f92607467f49683",23:"c698f4bcb71ffb97b545",24:"375634aacd4ac263d151",25:"a483d23e509412a4b37e",26:"8fe9b70a2863c66bc66e",27:"ad5a98c1bab10ad278d8",28:"890cf5085953838432b9",29:"c8c4cbda4445a6a01057",30:"058b1f4b377ba425ef32",31:"25e56a0ada198f72237c",32:"1b5ebf0b612ebe8d3339",33:"b92c2edf2d2aebac8213",34:"8a5c4a4ba35b38dd4ac5",35:"5bc09a539e8fce85eb2c",36:"d98d9d0af5091b483195",37:"cc416795d72f875e5ba5",38:"9cfcc6e0f1b8e902f7b3",39:"4148b009e141f51cecf2",40:"3b77650b22332a131a9a",41:"7417760c77f3764c15db",42:"542389c794df8e0aead8",43:"f40658a1ab4e833b510a",44:"7422b4ebbf130c3e1352",45:"88eda52b7a25e1d1a61d",46:"5bcc341c38bc2a2c47da",47:"ce31b632e663ade45f3e",48:"e1f3c9946260e27d8734",49:"db59f36fad00bbf92818",50:"00702af26b43085c54fe",51:"ab8716054a1178e52dd7",52:"c04cb60444a0b98ab60a",53:"c2f1743fb6ae55ef6350",54:"30c1e88bfefca7df4527",55:"5f236873b953be1fb862",56:"920cde30f31e03a0481b",57:"cb8e05b524029baf443d",58:"700e9988d7308e6d37f9",59:"f3ee362cbcbb912b4b29",60:"5834f87d6eed92d62b07",61:"470e6491cf25a8614300",62:"ef9e9acbba948972940b",63:"af9b177f00ac08a19fad",64:"7c71db60cdd87be3077f",65:"29b1f7f9cea0581443f1",66:"0383a1e41683a5b3d58e",67:"40b1d7ff975a6b37372c",68:"a182aa7c3e4a2fe20880",69:"c2d37a87d2c907ecb17c"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=b[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="/",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/yunji/index.vue
+++ b/src/components/yunji/index.vue
@@ -95,28 +95,7 @@
      <el-form-item >
        <el-button type="primary" @click="getList">搜索</el-button>
        <el-button type="primary" plain @click="exportTable(list)" v-if="$store.state.export">导出</el-button>
-      </el-form-item>
-      <el-form-item>
-        <el-upload
-          :show-file-list="false"
-          :onSuccess="fileSuccess"
-          :headers="uploadHeader"
-          :data="{param_token:param_token}"
-          action="/api/admin/order/import/1"
-        >
-          <el-button type="primary" plain>导入(500条以下)</el-button>
-        </el-upload>
-      </el-form-item>
-      <el-form-item>
-        <el-upload
-          :show-file-list="false"
-          :onSuccess="fileSuccess"
-          :headers="uploadHeader"
-          :data="{param_token:param_token}"
-          action="/api/admin/order/import/2"
-        >
-          <el-button type="warn" plain>导入(500条或以上)</el-button>
-        </el-upload>
+        <el-button type="primary" plain @click="importDialog=true" v-if="$store.state.export">导入</el-button>
      </el-form-item>
      <el-form-item v-if="!$store.state.readonly">
        <el-button type="primary" plain @click="downLoad()">excel模板下载</el-button>
@@ -241,6 +220,34 @@
      <span slot="footer" class="dialog-footer">
      </span>
    </el-dialog>
+    <el-dialog title="导入" class="import" :visible.sync="importDialog" center width="600px">
+      <!-- <el-form-item> -->
+        <div class='item'>
+          <el-upload
+            :show-file-list="false"
+            :onSuccess="fileSuccess"
+            :headers="uploadHeader"
+            :data="{param_token:param_token}"
+            action="/api/admin/order/import/1"
+          >
+            <el-button type="primary" plain>500条以下</el-button>
+          </el-upload>
+        </div>
+      <!-- </el-form-item> -->
+      <!-- <el-form-item> -->
+        <div class='item'>
+          <el-upload
+            :show-file-list="false"
+            :onSuccess="fileSuccess"
+            :headers="uploadHeader"
+            :data="{param_token:param_token}"
+            action="/api/admin/order/import/2"
+          >
+            <el-button type="warn" plain>500条或以上</el-button>
+          </el-upload>
+        </div>
+      <!-- </el-form-item> -->
+    </el-dialog>
    <el-dialog title="手动创建外部订单" :visible.sync="postOtherOrderDialog" center width="800px">
      <el-form ref="searchFrom" size="small"  :model="postOtherOrderData"  label-width="125px">
        <el-form-item label="订单ID" required=""  style="width: 400px" >
@@ -361,6 +368,7 @@ export default {
      sing: "singsingenglish21000"
    };
    return {
+      importDialog:false,
      adressDialog:false,
      postOtherOrderDialog:false,
      postOtherOrderData:{},
@@ -883,6 +891,8 @@ export default {
  border-radius: 50%;
 }
 .el-form-item__content{height:32px;}
+.import{top: 20vh;}
+.import .item{display:inline-block;margin-left: 110px}
 </style>
 <style>
 .userInfo > div {