del order

backendEle/src/views/shop/order-list.vue

@@ -18,24 +18,24 @@
             </template>
           </template>
         </el-table-column>
-<!--        <el-table-column fixed="right" label="operation" width="180">&lt;!&ndash; 操作 &ndash;&gt;-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-dropdown size="small" trigger="click">-->
-<!--              <el-button type="primary" size="small" @click.stop="">-->
-<!--                Operate on this data&lt;!&ndash; 操作该数据 &ndash;&gt;<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-<!--              </el-button>-->
-<!--              <el-dropdown-menu slot="dropdown">-->
-<!--                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`shop/edit`)">Edit order&lt;!&ndash; 编辑订单 &ndash;&gt;</el-dropdown-item>-->
-<!--                <el-dropdown-item command="delivery" @click.native="handleShowDeliveryDialog(scope.row)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">deliver goods&lt;!&ndash; 发货 &ndash;&gt;</el-dropdown-item>-->
-<!--                <el-dropdown-item command="refund" @click.native="handleRefund(scope.row.SN)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['PAY_TYPE'] === 'pay_stack' && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">Refund&lt;!&ndash; 退款 &ndash;&gt;</el-dropdown-item>-->
-<!--              </el-dropdown-menu>-->
-<!--            </el-dropdown>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <el-table-column fixed="right" label="operation" width="180">&lt;!&ndash; 操作 &ndash;&gt;
+         <template slot-scope="scope">
+            <el-dropdown size="small" trigger="click">
+              <el-button type="primary" size="small" @click.stop="">
+                Operate on this data<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="edit" @click.native="handleDel(scope.row)" v-if="permission.hasPermission(`shop/edit`)">删除订单</el-dropdown-item>
+                <!-- <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`shop/edit`)">Edit order&lt;!&ndash; 编辑订单 &ndash;&gt;</el-dropdown-item>
+                <el-dropdown-item command="delivery" @click.native="handleShowDeliveryDialog(scope.row)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">deliver goods&lt;!&ndash; 发货 &ndash;&gt;</el-dropdown-item>
+                <el-dropdown-item command="refund" @click.native="handleRefund(scope.row.SN)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['PAY_TYPE'] === 'pay_stack' && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">Refund&lt;!&ndash; 退款 &ndash;&gt;</el-dropdown-item> -->
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="white-box-footer">
         <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/order-list-export`)">Export Excel</el-button>
-        <el-dropdown-item command="edit" @click.native="handleDel(scope.row)" v-if="permission.hasPermission(`shop/edit`)">Delete Order</el-dropdown-item>
         <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/order-list-export`)">Export PDF</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
@@ -195,7 +195,7 @@
                   type: 'success'
               })
               this.submitButtonStat = false
-              this.$router.go(-1)
+              this.$router.go(0)
           }).catch(() => {
               this.submitButtonStat = false
           })

common/config/config-product.php

@@ -0,0 +1,117 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: leo
+ * Date: 2018/2/23
+ * Time: 下午3:53
+ */
+return [
+    'preparePerfLimit' => true, // 预计算月业绩,测试环境周一到周日都能看,正式环境只能周一看true为周一到周日都能看
+    // 奖金结算系统主库
+    'db' => [
+        // 数据库连接
+        'dsn' => 'mysql:host=127.0.0.1;dbname=ngds_test',
+        // 数据库用户名
+        'username' => 'root',
+        // 数据库密码
+        'password' => 'mypass',
+        // 数据库字符集
+        'charset' => 'utf8',
+        // 数据表前缀
+        'tablePrefix' => 'AR_',
+    ],
+    // 日志库
+    'dbLog' => [
+        'dsn' => 'mongodb://localhost:27017/aikang_log_db',
+        'options' => [
+            "username" => "aikang_bonus_log_user",
+            "password" => "mongo@db.useron2020"
+        ],
+    ],
+    // 奖金结算专属库(为不占用主库资源，不影响会员正常业务，该库专门用于奖金结算，可单独架设，需与主库做主从同步)
+    'dbCalc' => [
+        'dsn' => 'mysql:host=127.0.0.1;dbname=ngds_test',
+        'username' => 'root',
+        'password' => 'mypass',
+        'charset' => 'utf8',
+        'tablePrefix' => 'AR_',
+    ],
+    // 移动点位时专用的点位备份库(可用来查看各个时期的会员点位情况)
+    'dbNetPoint' => [
+        'dsn' => 'mysql:host=127.0.0.1;dbname=ngds_test',
+        'username' => 'root',
+        'password' => 'mypass',
+        'charset' => 'utf8',
+        'tablePrefix' => 'AR_',
+    ],
+    // 系统从库
+    'slavesDb' => [
+        'slaveConfig' => [
+            'username' => 'root',
+            'password' => 'mypass',
+            'charset' => 'utf8',
+            'tablePrefix' => 'AR_',
+            'attributes' => [
+                PDO::ATTR_TIMEOUT => 10,  // 从库超时切换间隔时间
+            ],
+        ],
+        'slaves' => [
+            ['dsn' => 'mysql:host=127.0.0.1;dbname=ngds_test'],
+            // 其他奖金结算系统的从库从下面继续添加配置
+        ],
+    ],
+    // Token专用 Redis 库
+    'tokenRedis' => [
+        // 服务器
+        'hostname' => '127.0.0.1',
+        //'username' => '',
+        // 端口
+        'port' => 6379,
+        // 密码
+        //'password' => '',
+        // 库索引
+        'database' => 0,
+    ],
+    // 缓存专用 Redis 库
+    'cacheRedis' => [
+        'hostname' => '127.0.0.1',
+        //'username' => '',
+        'port' => 6379,
+        //'password' => '',
+        'database' => 0,
+    ],
+    // 其他数据 Redis 库
+    'otherRedis' => [
+        'hostname' => '127.0.0.1',
+        //'username' => '',
+        'port' => 6379,
+        //'password' => '',
+        'database' => 0,
+    ],
+    // 远程静态上传服务器地址 @todo 明哥提供
+    //'remoteUploadHost' => 'http://ar.upload.ming',
+    'remoteUploadHost' => 'http://localhost:9017',
+    // 远程静态上传服务器地址
+    // 'idCardVerify' => [
+    //     'host' => 'http://121.40.238.29:20000',
+    //     'clientId' => '122371433052508160',
+    // ],
+    'idCardVerify' => [
+        'host' => 'https://pay.lingyonggong.cn',
+        'clientId' => '482924578939613184',
+    ],
+    // swoole异步服务器及端口
+    'swooleTimerConfig' => [
+        'host' => '127.0.0.1',
+        'port' => '9513',
+    ],
+    'swooleClientConfig' => [
+        'host' => '127.0.0.1',
+        'port' => '9513',
+    ],
+    // swoole奖金服务器及端口
+    'swooleBonusClientConfig' => [
+        'host' => '127.0.0.1',
+        'port' => '9513',
+    ],
+];