sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug

feat/task1-c-wallet
devil_gong 2018-12-28 11:09:46 +08:00
parent 6ec9e36b2c
commit c41dce2dfb
7 changed files with 32 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/service/GoodsService.php
View File

@ -145,7 +145,7 @@ class GoodsService
foreach($goods_category as &$v) foreach($goods_category as &$v)
{ {
$category_ids = self::GoodsCategoryItemsIds([$v['id']], 1); $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; return $goods_category;

2
application/service/OrderService.php
View File

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

4
public/appmini/old/alipay/app.js
View File

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

3
public/appmini/old/alipay/pages/goods-search/goods-search.axml
View File

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

2
public/appmini/old/alipay/pages/index/index.axml
View File

@ -41,7 +41,7 @@
<image src="{{goods.home_recommended_images}}" mode="aspectFit" /> <image src="{{goods.home_recommended_images}}" mode="aspectFit" />
<view class="goods-base"> <view class="goods-base">
<view class="goods-title single-text">{{goods.title}}</view> <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> </view>
</navigator> </navigator>
</view> </view>

1
public/appmini/old/alipay/pages/user-order/user-order.acss
View File

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

118
public/install/shopxo_tp5.sql
View File

File diff suppressed because one or more lines are too long