Mike 7 年之前
父節點
當前提交
9ef485f931

+ 2 - 2
miaomiao/www/templates/my/my-recharge.html

xqd
@@ -32,10 +32,10 @@
                     <img ng-src="img/icon_ WeChat Pay.svg" />
                     <span>微信支付</span>
                 </ion-radio>
-                <ion-radio ng-model="vm.payType" ng-value="1">
+                <!-- <ion-radio ng-model="vm.payType" ng-value="1">
                     <img ng-src="img/icon_ Alipay.svg" />
                     <span>支付宝支付</span>
-                </ion-radio>
+                </ion-radio> -->
             </ion-list>
         </div>
         <div class="padding">

+ 2 - 0
server/app/Models/OrderInfoModel.php

xqd
@@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 class OrderInfoModel extends Model
 {
     //
+    protected $table = 'order_info';
+    protected $primaryKey = 'id';
 
     //用户类型定义
     const USER_TYPE_USER    = 1;

+ 2 - 2
server/database/migrations/2017_05_30_113210_create_orders_table.php

xqd xqd
@@ -17,7 +17,7 @@ class CreateOrdersTable extends Migration
      */
     public function up()
     {
-        Schema::create('orders', function (Blueprint $table) {
+        Schema::create('order_info', function (Blueprint $table) {
             $table->increments('id');
             $table->string('code', 50)->comment('订单流水号');
             $table->string('transaction_id', 255)->nullable()->comment('交易流水号');
@@ -33,7 +33,7 @@ class CreateOrdersTable extends Migration
 
             $table->index('code', 'idx_code');
             $table->index('transaction_id', 'idx_tid');
-            $table->index(['user_type', 'user_id'], 'idx_user');
+            $table->index('user_id', 'idx_user');