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

7eca7a63 · 王 · f7ad327c · 02ae646c · 7eca7a63 · 7eca7a63
Commit 7eca7a63 authored Sep 10, 2018 by 王
16 changed files
--- a/config/index.js
+++ b/config/index.js
@@ -12,8 +12,8 @@ module.exports = {
    //本地代理设置
    proxyTable: {
      '/api': {
-        target: 'http://local.base-api.sing.com', // 接口的域名
-        // target: 'https://admin_test.changchangenglish.com/',
+        // target: 'http://local.base-api.sing.com', // 接口的域名
+        target: 'http://wechat.test.singsingenglish.com/',
        changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
      }
    },

--- 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"><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>singsing-new-admin</title><link href=/static/css/app.5c6bb5ad5b1c5ffc4c9a9c9a7b9d75dd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.7b0c00ae9aa9f10c274f.js></script><script type=text/javascript src=/static/js/app.c9ea0aa5c164d39e26e4.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css><title>singsing-new-admin</title><link href=/static/css/app.cb4ed962bfb554c8172f74d18c64eb5e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.0856e2556bbad7b42ae6.js></script><script type=text/javascript src=/static/js/app.c509c1f15d89ea15e21f.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.5c6bb5ad5b1c5ffc4c9a9c9a7b9d75dd.css
+++ b/dist/static/css/app.5c6bb5ad5b1c5ffc4c9a9c9a7b9d75dd.css
--- a/dist/static/css/app.5c6bb5ad5b1c5ffc4c9a9c9a7b9d75dd.css.map
+++ b/dist/static/css/app.5c6bb5ad5b1c5ffc4c9a9c9a7b9d75dd.css.map
--- a/dist/static/css/app.cb4ed962bfb554c8172f74d18c64eb5e.css
+++ b/dist/static/css/app.cb4ed962bfb554c8172f74d18c64eb5e.css
--- a/dist/static/css/app.cb4ed962bfb554c8172f74d18c64eb5e.css.map
+++ b/dist/static/css/app.cb4ed962bfb554c8172f74d18c64eb5e.css.map
--- a/dist/static/js/app.c509c1f15d89ea15e21f.js
+++ b/dist/static/js/app.c509c1f15d89ea15e21f.js
--- a/dist/static/js/app.c509c1f15d89ea15e21f.js.map
+++ b/dist/static/js/app.c509c1f15d89ea15e21f.js.map
--- a/dist/static/js/app.c9ea0aa5c164d39e26e4.js
+++ b/dist/static/js/app.c9ea0aa5c164d39e26e4.js
--- a/dist/static/js/app.c9ea0aa5c164d39e26e4.js.map
+++ b/dist/static/js/app.c9ea0aa5c164d39e26e4.js.map
--- a/dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
+++ b/dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
-{"version":3,"sources":["webpack:///webpack/bootstrap 4819e104516ad9c3e251"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.2ae2e69a05c33dfc65f8.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 4819e104516ad9c3e251"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///webpack/bootstrap d04949ba744a9a2d2c48"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,IAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.2ae2e69a05c33dfc65f8.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap d04949ba744a9a2d2c48"],"sourceRoot":""}
\ No newline at end of file
--- a/dist/static/js/vendor.7b0c00ae9aa9f10c274f.js
+++ b/dist/static/js/vendor.7b0c00ae9aa9f10c274f.js
--- a/dist/static/js/vendor.7b0c00ae9aa9f10c274f.js.map
+++ b/dist/static/js/vendor.7b0c00ae9aa9f10c274f.js.map
--- a/src/components/main/index.vue
+++ b/src/components/main/index.vue
@@ -30,7 +30,7 @@
 <style scoped lang="less">
  .index{
    height: 100%;
-    background: #eee;
+    background: #eee  ;
    overflow: hidden;
    .indexImg{
      width: 90%;

--- a/src/components/order/index.vue
+++ b/src/components/order/index.vue
@@ -10,17 +10,12 @@
            <el-row>
              <el-col :span="10">
                <el-form-item label="客户信息:">
-                  <span>ID:{{props.row.user_id}} {{props.row.username}} {{props.row.mobile}}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="班主任:">
-                  <span>{{ props.row.teacher_name }}</span>
+                  <span>ID:{{props.row.user_id}} {{props.row.user_nickname}} {{props.row.user_mobile}}</span>
                </el-form-item>
              </el-col>
              <el-col :span="6">
                <el-form-item label="来源:">
-                  <span> {{props.row.invite_username}}<br>{{props.row.invite_mobile}}</span>
+                  <span> {{props.row.invite_type}}<br>{{props.row.invite_id}}</span>
                </el-form-item>
              </el-col>
            </el-row>
@@ -43,7 +38,7 @@
      >
      </el-table-column>
      <el-table-column
-        prop="product_title"
+        prop="goods_name"
        label="商品名称">
      </el-table-column>
      <el-table-column
@@ -59,17 +54,12 @@
        </template>
      </el-table-column>
      <el-table-column
-        label="价格（元）"
+        label="实付金额"
      >
        <template slot-scope="scope">
          {{scope.row.money|moneytFilter}}
        </template>
      </el-table-column>
-      <el-table-column label="推荐收益(元)">
-        <template slot-scope="scope">
-          {{parseInt(scope.row.revenue_fixed, 10) / 100}}
-        </template>
-      </el-table-column>
      <el-table-column
        prop="created_at"
        label="订单创建时间"
@@ -83,7 +73,7 @@
      <el-table-column
        label="付款状态">
        <template slot-scope="scope">
-          {{scope.row.is_pay|payMentFilter}}
+          {{scope.row.status|status}}
        </template>
      </el-table-column>
      <el-table-column
@@ -135,82 +125,15 @@
  import addressDialog from './dialog'
  import refundDialog from './refundDialog'
  import AddressArray from '../framework/address-picker/addr'
+  import {INVITETYPE,ORDERSTATUS,BUYTYPE} from "../../util/wordbook";
+
  export default {
    name: 'index',
    data(){
        return {
          nowPage: 1,
          total: 0,
-            tableData: [
-              {
-                "pay_id": 269,
-                "out_trade_no": "sing_pay_6333_1535597840440458",
-                "user_id": 6333,
-                "user_address_id": 185,
-                "product_id": 1,
-                "invite_type": 0,
-                "invite_user_id": 0,
-                "money": 1,
-                "desc": "系统备注：付款成功，但未找到ID为0的课程或它的课程类型不匹配（下单类型：1）",
-                "revenue_fixed": 0,
-                "is_pay": 0,
-                "pay_at": "2018-08-30 10:57:25",
-                "teacher_id": 0,
-                "created_at": "2018-08-30 10:57:21",
-                "username": "青山",
-                "mobile": "18616964357",
-                "course_title": null,
-                "instructor": null,
-                "courses_id": null,
-                "type": 1,
-                "duration": 12,
-                "product_title": "1499元一年课 ",
-                "teacher_name": null,
-                "receive_name": "江姐",
-                "receive_mobile": "13424673456",
-                "province_name": "广东",
-                "province_id": null,
-                "city": "深圳",
-                "city_id": null,
-                "area": "福田区",
-                "area_id": null,
-                "address": "  我"
-              },
-              {
-                "pay_id": 267,
-                "out_trade_no": "sing_pay_6281_1533889878982223",
-                "user_id": 6295,
-                "user_address_id": 168,
-                "product_id": 4,
-                "invite_type": 0,
-                "invite_user_id": 6300,
-                "money": 1,
-                "desc": "",
-                "revenue_fixed": 6000,
-                "is_pay": 1,
-                "pay_at": null,
-                "teacher_id": 0,
-                "created_at": "2018-08-10 16:31:18",
-                "username": null,
-                "mobile": null,
-                "course_title": "30天高效英语启蒙主题训练营",
-                "instructor": "8月20日开课",
-                "courses_id": 65,
-                "type": 1,
-                "duration": 1,
-                "product_title": "30天高效英语启蒙主题训练营（买课赠实物教具礼盒）",
-                "teacher_name": null,
-                "receive_name": "www",
-                "receive_mobile": "16766467976",
-                "province_name": "广东",
-                "province_id": null,
-                "city": "深圳",
-                "city_id": null,
-                "area": "福田区",
-                "area_id": null,
-                "address": "6164466"
-              }
-            ],
+            tableData: [],
          dialogObj: {
            show: false
          },
@@ -247,6 +170,7 @@
      },
      getOrderList(){
        getOrderListApi().then((res)=>{
+          this.tableData = res.list
        })
      },
      changeShow(data){
@@ -325,8 +249,17 @@
      courseTypeFilter(val){
        return val.type=='1'?`正式课(${val.duration}个月)`:`试听课(${val.duration}天)`
      },
+      inviteType(value){
+        return INVITETYPE[value]
+      },
+      status(value){
+        return ORDERSTATUS[value]
+      },
+      buyType(value){
+        return BUYTYPE[value]
+      },
      moneytFilter(val){
-        return val = val / 100
+        return val = val / 100 + '元'
      }
    }
  }

--- a/src/util/wordbook.js
+++ b/src/util/wordbook.js
@@ -33,3 +33,18 @@ export const WEEKDAY = {
  5: '周五',
  6: '周六'
 };
+export const INVITETYPE = {
+  0:'用户',
+  1:'老师',
+  2:'推广渠道'
+};
+export const ORDERSTATUS = {
+  0:'待付款',
+  1:'付款成功',
+  2:'付款失败',
+  3:'退款成功'
+};
+export const BUYTYPE = {
+  1:'单买',
+  2:'团购'
+}