状态

application/admin/view/product/lists/edit.html

@@ -39,7 +39,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">{:__('发行量')}:</label>
         <div class="col-xs-12 col-sm-2">
-            <input id="c-issue_num" data-rule="required" class="form-control" name="row[issue_num]" type="text"  value="">
+            <input id="c-issue_num" data-rule="required" class="form-control" name="row[issue_num]" type="text"  value="{$row.issue_num|htmlentities}">
         </div>
         <label class="control-label col-xs-12 col-sm-1">{:__('Freight')}:</label>
         <div class="col-xs-12 col-sm-2">

application/api/controller/Teac.php

@@ -87,7 +87,7 @@ class Teac extends Api
             $teacLogin::setCreateTrade($this->auth->id, $params['price'],  $params['stock'], ProductTeac::Sell, $params['stock']);
 
             //冻结Teac
-            $ledgerWalletModel->changeWalletAccount($this->auth->id,  Asset::TEAC, -$params['stock'], LedgerTokenChangeModel::BuySellg, $this->auth->id);
+            $ledgerWalletModel->changeWalletAccount($this->auth->id,  Asset::TEAC, -$params['stock'], LedgerTeacChangeModel::Sell, $this->auth->id);
             Db::commit();
          
         }catch(Exception $e){
@@ -108,6 +108,7 @@ class Teac extends Api
         if(!$validate->scene('sell_order')->check($params)) $this->error($validate->getError());
         $row = $productTeac::where(['type_id'=> ProductTeac::Sell, 'id' => $params['teac_id']])->find();
         if(empty($row) || $row['status'] != ProductTeac::Normal) $this->error('订单不存在');
+        if($this->auth->id == $row['user_id']) $this->error('不能购买自己的订单');
         if($params['num'] > $row['stock'] - $row['num']) $this->error('库存不足');
         $chabao = $ledgerWalletModel->getWalletChaBao($this->auth->id);
         $tatal = bcmul($row['price'], $params['num'], 2);
@@ -151,6 +152,7 @@ class Teac extends Api
         if(!$validate->scene('sell_order')->check($params)) $this->error($validate->getError());
         $row = $productTeac::where(['type_id'=> ProductTeac::Buying, 'id' => $params['teac_id']])->find();
         if(empty($row) || $row['status'] != ProductTeac::Normal) $this->error('订单不存在');
+        if($this->auth->id == $row['user_id']) $this->error('不能购买自己的订单');
         if($params['num'] > $row['stock'] - $row['num']) $this->error('库存不足');
         $chabao = $ledgerWalletModel->getWalletChaBao($this->auth->id);
         $tatal = bcmul($row['price'], $params['num'], 2);

application/api/logic/TeacLogin.php

@@ -52,7 +52,7 @@ class TeacLogin
         $ledgerWalletModel->changeWalletAccount($uid, Asset::TOKEN, -$total_price, LedgerTokenChangeModel::BuySellg, $fromUid);
 
         //添加用户Teac
-        $ledgerWalletModel->changeWalletAccount($uid, Asset::TEAC, $num, LedgerTokenChangeModel::BuySellg, $fromUid);
+        $ledgerWalletModel->changeWalletAccount($uid, Asset::TEAC, $num, LedgerTeacChangeModel::SellBuy, $fromUid);
 
 
         //添加来源茶宝
@@ -78,7 +78,7 @@ class TeacLogin
         $ledgerWalletModel->changeWalletAccount($uid, Asset::TOKEN, $total_price, LedgerTokenChangeModel::BuySellg, $fromUid);
 
         //扣除用户Teac
-        $ledgerWalletModel->changeWalletAccount($uid, Asset::TEAC, $num, LedgerTokenChangeModel::BuySellg, $fromUid);
+        $ledgerWalletModel->changeWalletAccount($uid, Asset::TEAC, $num, LedgerTeacChangeModel::BuySell, $fromUid);
 
         //扣除来源茶宝
         $ledgerWalletModel->changeWalletAccount($fromUid, Asset::TOKEN, bcsub($total_price, $fee, 2), LedgerTokenChangeModel::BuySellg, $uid);

public/assets/js/backend/product/lists.js

@@ -108,84 +108,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'area', 'vue', 'ELEME
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));
-                Vue.component('treeselect', VueTreeselect.Treeselect)
-                let areaData = [];
-                if ((Config.areaData).length > 0) areaData = JSON.parse(Config.areaData);
-                let areas = markDisabled(area, areaData)
-                new Vue({
-                    el: '#app',
-                    data() {
-                        return {
-                            data: areaData,
-                            options: areas,
-                            sortValueBy: "ORDER_SELECTED",
-                            selectedNodes: [],
-                        }
-                    },
-                    methods: {
-                        handleChange(selectedValues) {
-                            let ids = []
-                            let labels = []
-                            this.selectedNodes = this.data.map((item) => {
-                                let obj = this.getNode1(this.$refs.treeselect.getNode(item))
-                                ids.push(obj.result)
-                                labels.push(obj.labels)
-                                return { label: obj.labels, result: obj.result };
-                            });
-                            //console.log(JSON.stringify(ids),JSON.stringify(labels));
-                            $('#c-product_area').val(JSON.stringify(ids))
-                            $('#c-product_area_txt').val(JSON.stringify(labels))
-
-                        },
-                        getNode(e1) {
-                            let labels = [];
-                            // 递归获取 label
-                            function recurse(node) {
-                                if (node && node.label) {
-                                    labels.push(node.label);
-                                    if (node.parentNode) {
-                                        recurse(node.parentNode); // 继续向上递归
-                                    }
-                                }
-                            }
-
-                            recurse(e1);
-                            // console.log(labels.reverse().join("/"));
-                            // 返回拼接的 label 路径
-                            return labels.reverse().join("-");
-                        },
-
-                        getNode1(e1) {
-                            let labels = [];
-                            let result = [];
-                            // 递归获取 label
-                            function recurse(node) {
-                                if (node && node.label) {
-                                    labels.push(node.label);
-                                    result.push(node.id);
-                                    if (node.parentNode) {
-                                        recurse(node.parentNode); // 继续向上递归
-                                    }
-                                }
-                            }
-                            recurse(e1);
-                            // 返回拼接的 label 路径
-                            return { labels: [labels.reverse().join("-")], result: result.reverse() };
-                        },
-                    }
-                })
-                //禁用已选择
-                function markDisabled(area, data) {
-                    area.forEach((item) => {
-                        if (data.includes(item.id)) {
-                            item.isDisabled = true;
-                        }
-                        if (item.children && item.children.length > 0) {
-                            markDisabled(item.children, data);
-                        }
-                    });
-                    return area
-                }
             },
         }
     };