root 3 лет назад
Родитель
Сommit
e180034fc2
100 измененных файлов с 15 добавлено и 15 удалено
  1. 0 0
      .gitignore
  2. 0 0
      LICENSE.md
  3. 0 0
      README.md
  4. 0 0
      REGION_insert.sql
  5. 0 0
      Vagrantfile
  6. 0 0
      ak-upload-server/ar.upload.ming.conf
  7. 0 0
      ak-upload-server/auth.dev.lua
  8. 0 0
      ak-upload-server/auth.prod.lua
  9. 0 0
      ak-upload-server/server.dev.py
  10. 0 0
      ak-upload-server/server.prod.py
  11. 0 0
      ak-upload-server/token.php
  12. 0 0
      ak-upload-server/upload.py
  13. 0 0
      ak-upload-server/upload_img_filter.conf
  14. 0 0
      ak-upload-server/upload_img_filter.dev.conf
  15. 0 0
      ak-upload-server/upload_img_filter.prod.conf
  16. 0 0
      ak-upload-server/venv/bin/activate
  17. 0 0
      ak-upload-server/venv/bin/activate.csh
  18. 0 0
      ak-upload-server/venv/bin/activate.fish
  19. 0 0
      ak-upload-server/venv/bin/easy_install
  20. 0 0
      ak-upload-server/venv/bin/easy_install-3.6
  21. 0 0
      ak-upload-server/venv/bin/pip
  22. 0 0
      ak-upload-server/venv/bin/pip3
  23. 0 0
      ak-upload-server/venv/bin/pip3.6
  24. 0 0
      ak-upload-server/venv/bin/python
  25. 0 0
      ak-upload-server/venv/bin/python3
  26. 0 0
      ak-upload-server/venv/bin/python3.6
  27. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth
  28. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg
  29. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth
  30. 0 0
      ak-upload-server/venv/pyvenv.cfg
  31. 0 0
      backendEle/src/views/config/exchange-rate.vue
  32. 0 0
      codeception.yml
  33. 0 0
      common/helpers/PayStack.php
  34. 0 0
      common/models/ShopGoods.php
  35. 0 0
      composer.json
  36. 0 0
      composer.lock
  37. 1 1
      frontendApi/config/menu.php
  38. 3 3
      frontendEle/src/router/index.js
  39. 0 0
      frontendEle/src/views/shop/dec-order-list.vue
  40. 0 0
      frontendEle/src/views/shop/index.vue
  41. 0 0
      frontendEle/src/views/shop/order-list.vue
  42. 0 0
      frontendEle/src/views/shop/order.vue
  43. 0 0
      frontendEle/src/views/shop/reconsume-order.vue
  44. 0 0
      frontendEle/src/views/shop/reconsume.vue
  45. 0 0
      frontendEle/src/views/user/dec.vue
  46. 0 0
      frontendEle/src/views/user/id-card.vue_bak
  47. 11 11
      frontendEle/src/views/user/index.vue
  48. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141152188888.csv
  49. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141155049572.csv
  50. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141155536642.csv
  51. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141156356017.csv
  52. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141300385990.csv
  53. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141301538113.csv
  54. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141303118543.csv
  55. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141304424939.csv
  56. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141305068319.csv
  57. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141305247339.csv
  58. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141306595670.csv
  59. 0 0
      home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141313402026.csv
  60. 0 0
      init
  61. 0 0
      init.bat
  62. 0 0
      log_db.sql
  63. 0 0
      loopNetworkParentDo_error.txt
  64. 0 0
      mysql_db_yyj.sql
  65. 0 0
      requirements.php
  66. 0 0
      shop_db.sql
  67. 0 0
      sql/2020_07/AR_CONFIG.sql
  68. 0 0
      sql/2020_07/AR_DEC_ROLE.sql
  69. 0 0
      sql/2020_07/AR_EMPLOY_LEVEL.sql
  70. 0 0
      sql/2020_07/AR_ORDER_GOODS_SHOP.sql
  71. 0 0
      sql/2020_07/AR_ORDER_SHOP.sql
  72. 0 0
      sql/2020_07/change_net.sql
  73. 0 0
      sql/2020_07/excelImport/AR_EXCEL_ORDER_SHOP.sql
  74. 0 0
      sql/2020_07/excelImport/add.sql
  75. 0 0
      sql/2020_08/AR_CALC_BONUS_XF.sql
  76. 0 0
      sql/2020_08/AR_CONFIG.sql
  77. 0 0
      sql/2020_08/AR_USER.sql
  78. 0 0
      sql/2020_08/moveNet/update.sql
  79. 0 0
      sql/2020_08/partBdFx.sql
  80. 0 0
      sql/2020_10/AR_SCORE_MONTH.sql
  81. 0 0
      sql/2020_10/scoreUpdate.sql
  82. 0 0
      sql/2020_11/AR_CALC_BONUS_FW.sql
  83. 0 0
      sql/2020_11/AR_DEC_ROLE.sql
  84. 0 0
      sql/2020_11/AR_DEC_ROLE_LOG.sql
  85. 0 0
      sql/2020_11/decRole.sql
  86. 0 0
      sql/2020_12/AR_CALC_BONUS_VIP.sql
  87. 0 0
      sql/2020_12/AR_ORDER_DEC.sql
  88. 0 0
      sql/2020_12/AR_ORDER_GOODS_DEC.sql
  89. 0 0
      sql/2020_12/AR_USER_PERF_MONTH_UPDATE.sql
  90. 0 0
      sql/2020_12/bonusVip.sql
  91. 0 0
      sql/2020_12/update.sql
  92. 0 0
      sql/2021-10/gongzuoshi.sql
  93. 0 0
      sql/2021_01/jxStandard/AR_CALC_BONUS_STANDARD.sql
  94. 0 0
      sql/2021_01/jxStandard/AR_ORDER_STANDARD.sql
  95. 0 0
      sql/2021_01/jxStandard/AR_ORDER_STANDARD_GOODS.sql
  96. 0 0
      sql/2021_01/jxStandard/AR_PERF_STANDARD.sql
  97. 0 0
      sql/2021_01/jxStandard/config.sql
  98. 0 0
      sql/2021_01/jxStandard/update.sql
  99. 0 0
      sql/2021_03/modifyPasword/adminUpdate.sql
  100. 0 0
      sql/2021_03/modifyPasword/update.sql

+ 0 - 0
.gitignore


+ 0 - 0
LICENSE.md



+ 0 - 0
REGION_insert.sql


+ 0 - 0
Vagrantfile


+ 0 - 0
ak-upload-server/ar.upload.ming.conf


+ 0 - 0
ak-upload-server/auth.dev.lua


+ 0 - 0
ak-upload-server/auth.prod.lua


+ 0 - 0
ak-upload-server/server.dev.py


+ 0 - 0
ak-upload-server/server.prod.py


+ 0 - 0
ak-upload-server/token.php


+ 0 - 0
ak-upload-server/upload.py


+ 0 - 0
ak-upload-server/upload_img_filter.conf


+ 0 - 0
ak-upload-server/upload_img_filter.dev.conf


+ 0 - 0
ak-upload-server/upload_img_filter.prod.conf


+ 0 - 0
ak-upload-server/venv/bin/activate


+ 0 - 0
ak-upload-server/venv/bin/activate.csh


+ 0 - 0
ak-upload-server/venv/bin/activate.fish


+ 0 - 0
ak-upload-server/venv/bin/easy_install


+ 0 - 0
ak-upload-server/venv/bin/easy_install-3.6


+ 0 - 0
ak-upload-server/venv/bin/pip


+ 0 - 0
ak-upload-server/venv/bin/pip3


+ 0 - 0
ak-upload-server/venv/bin/pip3.6


+ 0 - 0
ak-upload-server/venv/bin/python


+ 0 - 0
ak-upload-server/venv/bin/python3


+ 0 - 0
ak-upload-server/venv/bin/python3.6


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth


+ 0 - 0
ak-upload-server/venv/pyvenv.cfg


+ 0 - 0
backendEle/src/views/config/exchange-rate.vue


+ 0 - 0
codeception.yml


+ 0 - 0
common/helpers/PayStack.php


+ 0 - 0
common/models/ShopGoods.php


+ 0 - 0
composer.json


+ 0 - 0
composer.lock


+ 1 - 1
frontendApi/config/menu.php

@@ -42,7 +42,7 @@ return [
         'routePath'=>'user',
         'show'=>1,
         'child'=>[
-            ['name'=>'个人资料', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],
+            ['name'=>'Personal info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],//个人资料
             //['name'=>'上传身份证', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'id-card', 'routePath'=>'user/id-card', 'show'=>0,],
             //['name'=>'开拓会员列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'rec-user', 'routePath'=>'user/rec-user', 'show'=>1,],
 //            ['name'=>'点位绑定列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind', 'routePath'=>'user/bind', 'show'=>1,],

+ 3 - 3
frontendEle/src/router/index.js

@@ -138,10 +138,10 @@ export const constantRouterMap = [
         component: _import('user/index'),
         name: 'user_index',
         meta: {
-          title: '个人资料',
+          title: 'Personal info',//个人资料
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },

+ 0 - 0
frontendEle/src/views/shop/dec-order-list.vue


+ 0 - 0
frontendEle/src/views/shop/index.vue


+ 0 - 0
frontendEle/src/views/shop/order-list.vue


+ 0 - 0
frontendEle/src/views/shop/order.vue


+ 0 - 0
frontendEle/src/views/shop/reconsume-order.vue


+ 0 - 0
frontendEle/src/views/shop/reconsume.vue


+ 0 - 0
frontendEle/src/views/user/dec.vue


+ 0 - 0
frontendEle/src/views/user/id-card.vue_bak


+ 11 - 11
frontendEle/src/views/user/index.vue

@@ -2,30 +2,30 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActive" style="overflow: auto">
-        <el-tab-pane label="基本信息" name="baseInfo" style="overflow: auto">
+        <el-tab-pane label="Essential Information" name="baseInfo" style="overflow: auto"><!-- 基本信息 -->
           <el-form ref="form" :model="infoData" label-width="250px" class="form-page">
-            <el-form-item label="会员编号">
+            <el-form-item label="Member code"><!-- 会员编号 -->
               <el-input v-model="infoData.USER_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="民族">
+<!--            <el-form-item label="民族">
               <el-select v-model="infoData.NATION" placeholder="请选择民族">
                 <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"
                            :value="item.id"></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="会员姓名">
+            </el-form-item> -->
+            <el-form-item label="Member name"><!-- 会员姓名 -->
               <el-input v-model="infoData.REAL_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="身份证号">
+            <el-form-item label="ID"><!-- 身份证号 -->
               <el-input v-model="infoData.ID_CARD" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="手机号">
+            <el-form-item label="Phone number"><!-- 手机号 -->
               <el-input v-model="infoData.MOBILE" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="Email">
+            <el-form-item label="Email"><!-- Email -->
               <el-input v-model="infoData.EMAIL"></el-input>
             </el-form-item>
-            <el-form-item label="银行名称">
+<!--            <el-form-item label="银行名称">
               <el-select v-model="infoData.OPEN_BANK" placeholder="请选择银行名称">
                 <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                            :value="item.BANK_CODE"></el-option>
@@ -37,9 +37,9 @@
             </el-form-item>
             <el-form-item label="银行帐号">
               <el-input v-model="infoData.BANK_NO"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
-              <el-button type="primary" @click="handleSubmit" :loading="submitButtonStat">保存</el-button>
+              <el-button type="primary" @click="handleSubmit" :loading="submitButtonStat">SAVE<!-- 保存 --></el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>

+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141152188888.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141155049572.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141155536642.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141156356017.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141300385990.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141301538113.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141303118543.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141304424939.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141305068319.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141305247339.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141306595670.csv


+ 0 - 0
home/david/wwwroot/gitproject/eklast/ekdscode/backendApi/web/upload/excel_export/227/83/202112141313402026.csv




+ 0 - 0
log_db.sql


+ 0 - 0
loopNetworkParentDo_error.txt


+ 0 - 0
mysql_db_yyj.sql


+ 0 - 0
requirements.php


+ 0 - 0
shop_db.sql


+ 0 - 0
sql/2020_07/AR_CONFIG.sql


+ 0 - 0
sql/2020_07/AR_DEC_ROLE.sql


+ 0 - 0
sql/2020_07/AR_EMPLOY_LEVEL.sql


+ 0 - 0
sql/2020_07/AR_ORDER_GOODS_SHOP.sql


+ 0 - 0
sql/2020_07/AR_ORDER_SHOP.sql


+ 0 - 0
sql/2020_07/change_net.sql


+ 0 - 0
sql/2020_07/excelImport/AR_EXCEL_ORDER_SHOP.sql


+ 0 - 0
sql/2020_07/excelImport/add.sql


+ 0 - 0
sql/2020_08/AR_CALC_BONUS_XF.sql


+ 0 - 0
sql/2020_08/AR_CONFIG.sql


+ 0 - 0
sql/2020_08/AR_USER.sql


+ 0 - 0
sql/2020_08/moveNet/update.sql


+ 0 - 0
sql/2020_08/partBdFx.sql


+ 0 - 0
sql/2020_10/AR_SCORE_MONTH.sql


+ 0 - 0
sql/2020_10/scoreUpdate.sql


+ 0 - 0
sql/2020_11/AR_CALC_BONUS_FW.sql


+ 0 - 0
sql/2020_11/AR_DEC_ROLE.sql


+ 0 - 0
sql/2020_11/AR_DEC_ROLE_LOG.sql


+ 0 - 0
sql/2020_11/decRole.sql


+ 0 - 0
sql/2020_12/AR_CALC_BONUS_VIP.sql


+ 0 - 0
sql/2020_12/AR_ORDER_DEC.sql


+ 0 - 0
sql/2020_12/AR_ORDER_GOODS_DEC.sql


+ 0 - 0
sql/2020_12/AR_USER_PERF_MONTH_UPDATE.sql


+ 0 - 0
sql/2020_12/bonusVip.sql


+ 0 - 0
sql/2020_12/update.sql


+ 0 - 0
sql/2021-10/gongzuoshi.sql


+ 0 - 0
sql/2021_01/jxStandard/AR_CALC_BONUS_STANDARD.sql


+ 0 - 0
sql/2021_01/jxStandard/AR_ORDER_STANDARD.sql


+ 0 - 0
sql/2021_01/jxStandard/AR_ORDER_STANDARD_GOODS.sql


+ 0 - 0
sql/2021_01/jxStandard/AR_PERF_STANDARD.sql


+ 0 - 0
sql/2021_01/jxStandard/config.sql


+ 0 - 0
sql/2021_01/jxStandard/update.sql


+ 0 - 0
sql/2021_03/modifyPasword/adminUpdate.sql


+ 0 - 0
sql/2021_03/modifyPasword/update.sql


Некоторые файлы не были показаны из-за большого количества измененных файлов