debug

application/service/GoodsService.php

@@ -145,7 +145,7 @@ class GoodsService
             foreach($goods_category as &$v)
             {
                 $category_ids = self::GoodsCategoryItemsIds([$v['id']], 1);
-                $v['goods'] = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'is_home_recommended'=>1], 'm'=>0, 'n'=>6, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.inventory,g.buy_min_number,g.buy_max_number']);
+                $v['goods'] = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'is_home_recommended'=>1], 'm'=>0, 'n'=>6, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.min_price,g.max_price,g.inventory,g.buy_min_number,g.buy_max_number']);
             }
         }
         return $goods_category;

application/service/OrderService.php

@@ -720,7 +720,7 @@ class OrderService
         ];
         if(Db::name('Order')->where($where)->update($upd_data))
         {
-            // 库存扣除
+            // 库存回滚
             $ret = BuyService::OrderInventoryRollback(['order_id'=>$order['id'], 'order_data'=>$upd_data]);
             if($ret['code'] != 0)
             {

public/appmini/old/alipay/app.js

@@ -50,8 +50,8 @@ App({
 
     // 请求地址
     //request_url: "{{request_url}}",
-    request_url: "http://test.shopxo.net/",
-    //request_url: 'http://tp5-dev.com/',
+    //request_url: "http://test.shopxo.net/",
+    request_url: 'http://tp5-dev.com/',
 
     // 基础信息
     application_title: "{{application_title}}",

public/appmini/old/alipay/pages/goods-search/goods-search.axml

@@ -20,8 +20,7 @@
           <view class="base">
             <view class="single-text">{{item.title}}</view>
             <view class="price">
-              <text class="sales-price">￥{{item.price}}</text>
-              <text a:if="{{item.original_price > 0}}" class="original-price">￥{{item.original_price}}</text>
+              <text class="sales-price">￥{{item.min_price}}</text>
             </view>
           </view>
         </navigator>

public/appmini/old/alipay/pages/index/index.axml

@@ -41,7 +41,7 @@
             <image src="{{goods.home_recommended_images}}" mode="aspectFit" />
             <view class="goods-base">
               <view class="goods-title single-text">{{goods.title}}</view>
-              <view class="sales-price">￥{{goods.price}}</view>
+              <view class="sales-price">￥{{goods.min_price}}</view>
             </view>
           </navigator>
         </view>

public/appmini/old/alipay/pages/user-order/user-order.acss

@@ -38,6 +38,7 @@
 }
 .goods-price {
     position: relative;
+    margin-top: 10rpx;
 }
 .buy-number {
     position: absolute;