一些功能

app/admin/view/setting/system_admin/admin_info.php

@@ -36,7 +36,7 @@
                         <div class="col-sm-10">
                             <div class="row">
                                 <div class="col-md-6">
-                                    <input type="text" class="form-control" name="account" value="{$adminInfo.account}" validate="" disabled/>
+                                    <input type="text" class="form-control" name="account" value="{$adminInfo.account}" validate=""/>
                                 </div>
                             </div>
                         </div>

app/models/store/StoreCart.php

@@ -249,7 +249,7 @@ class StoreCart extends BaseModel
                     else {
                         if ($store_id) {
                             $stock_info = SystemStoreProductStock::where('store_id', $store_id)->where('unique', $cart['product_attr_unique'])->where('product_id', $cart['productInfo']['id'])->find();
-                            if ($stock_info) $attrInfo['price'] = $stock_info['price'];
+                            if ($stock_info && $stock_info['price'] > 0) $attrInfo['price'] = $stock_info['price'];
                         }
                         $cart['productInfo']['attrInfo'] = $attrInfo;
                         if ($cart['combination_id'] || $cart['seckill_id'] || $cart['bargain_id'] || $cart['integral_id']) {

app/models/system/SystemStore.php

@@ -233,7 +233,7 @@ class SystemStore extends BaseModel
             $cartNum = $product['cart_num'] ?? 0;
             if (isset($product['productInfo'])) {
                 $stock = SystemStoreProductStock::where(['product_id' => $product['product_id'], 'unique' => $product['product_attr_unique'], 'store_id' => $orderInfo['store_id']])->find();
-                $res = $res && SystemStoreProductStockLog::expend($orderInfo['store_id'], $product['product_id'], $product['product_attr_unique'], 'sale', $orderInfo['id'], $cartNum, 0, '用户' . $userInfo['nickname'] . '购买订单完成', 1, $stock ? $stock['price'] : StoreProductAttrValue::where(['unique' => $product['product_attr_unique'], 'product_id' => $product['product_id']])->value('price'));
+                $res = $res && SystemStoreProductStockLog::expend($orderInfo['store_id'], $product['product_id'], $product['product_attr_unique'], 'sale', $orderInfo['id'], $cartNum, 0, '用户' . $userInfo['nickname'] . '购买订单完成', 1, $stock ? $stock['price'] : 0);
             }
         }
 //        var_dump($res);