Merge branch '1210-v3.0.2' into test

# Conflicts: # application/index/controller/Finance.php # application/index/controller/ImageDepot.php # public/app/dist/index.html # public/app/dist/static/css/app.18f66e05aeedf4028dbf86453eab6b23.css # public/app/dist/static/css/app.370df8a02c6ffd39798798a503aab7d5.css # public/app/dist/static/css/app.a73181a8689d77665f3ecd7635761082.css # public/appnew/src/components/shop/redPackMask.vue # public/appnew/src/components/shop/shopList.vue

Merge branch '1210-v3.0.2' into test
48351b68 · zw · f69e0d32 · 48351b68
Commit 48351b68 authored Dec 20, 2018 by zw
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Index.php application/api/controller/Index.php +1 -1

No files found.
--- a/application/api/controller/Index.php
+++ b/application/api/controller/Index.php
@@ -37,7 +37,7 @@ class Index extends Basic
        $journalAccounts        = new OrderModel();
        $turnover               = $journalAccounts->getTurnover();
        $result['averagePrice'] = $user_count;
-        $result['turnover']     = $turnover * 9;//不要问为什么乘以9，产品说怎么搞就怎么搞
+        $result['turnover']     = $turnover * 4;//不要问为什么乘以9，产品说怎么搞就怎么搞 181220改为4
        return $this->response("request success", "200", $result);

    }