Merge branch 'dev' into preview

app/common/repositories/store/product/ProductRepository.php

@@ -751,8 +751,10 @@ class ProductRepository extends BaseRepository
         $data['attrValue'] = $arr;
 
         $content = $data['content']['content'] ?? '';
+        $data['content_arr'] = [];
         if (isset($data['content']) &&$data['content']['type']==1){
             $arr = json_decode($content);
+            $data['content_arr'] = $arr;
             if($arr){
                 $content='';
                 foreach($arr->image as $k=>$v){

app/controller/admin/user/UserBill.php

@@ -19,6 +19,7 @@ use crmeb\basic\BaseController;
 use app\common\repositories\user\UserBillRepository;
 use crmeb\services\ExcelService;
 use think\App;
+use think\facade\Db;
 
 class UserBill extends BaseController
 {
@@ -50,4 +51,35 @@ class UserBill extends BaseController
         $data = app()->make(ExcelService::class)->bill($where,$page,$limit);
         return app('json')->success($data);
     }
+
+    public function deposit(){
+        $where = $this->request->params(['keyword', 'date','mer_id']);
+        [$page, $limit] = $this->getPage();
+        $query= Db::name('margin_order')->where('paid',1);
+        if(isset($where['date'])&& $where['date']!=''){
+            $a=explode(' ',$where['date']);
+           $query->whereTime('create_time', 'between', [$a[0],$a[1]]);
+        }
+        if(isset($where['keyword'])&& $where['keyword']!=''){
+            $a=Db::name('merchant')->whereLike('mer_name','%'.$where['keyword'].'%')->column('mer_id');
+            if($a){
+                $query->where('mer_id', 'in', $a);
+            }
+        }
+
+        if(isset($where['mer_id'])&& $where['mer_id']!=''){
+           $query->where('mer_id', $where['mer_id']);
+        }
+
+        $count=$query->count();
+
+        $list=$query->withAttr('mer_name',function($value,$data){
+           return Db::name('merchant')->where('mer_id',$data['mer_id'])->value('mer_name');
+        })
+        ->withAttr('nickname',function($value,$data){
+            return Db::name('user')->where('uid',$data['uid'])->value('nickname');
+         })
+        ->page($page, $limit)->order('order_id', 'desc')->select()->toArray();
+        return app('json')->success(['count'=>$count,'list'=>$list]);
+    }
 }

app/controller/api/Auth.php

@@ -285,11 +285,11 @@ class Auth extends BaseController
         if($merchant['margin'] == 0){
             $margin = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin');
             $margin = bcsub($margin,$merchant['paid_margin'],2);
-            if($margin==0){
-                return app('json')->fail('当前金额为0,不能进行充值');
-            }
         }else{
-            $margin=0;
+            $margin=$merchant['margin'];
+        }
+        if($margin==0){
+            return app('json')->fail('当前金额为0,不能进行充值');
         }
         $orderSn = "bzj" . date('YmdHis') . uniqid();
         Db::name('margin_order')->insert([

app/controller/merchant/store/product/Product.php

@@ -98,7 +98,7 @@ class Product extends BaseController
             $product_type=0;//普通商品
         }
         $data['update_time'] = date('Y-m-d H:i:s');
-        $this->repository->create($data,$product_type);
+        $this->repository->create($data,$product_type,1);
         return app('json')->success('添加成功');
     }
 
@@ -126,7 +126,7 @@ class Product extends BaseController
         $data['update_time'] = date('Y-m-d H:i:s');
         $typeSupplyChainId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypeSupplyChain'])->value('mer_type_id');
         $productType = $this->request->merchant()->type_id == $typeSupplyChainId ? 98 : 0;
-        $this->repository->edit($id, $data, $this->request->merId(), $productType);
+        $this->repository->edit($id, $data, $this->request->merId(), $productType,1);
         return app('json')->success('编辑成功');
     }
 
@@ -280,8 +280,8 @@ class Product extends BaseController
             'spec_type'
         ];
         $data = $this->request->params($params);
-        $count = app()->make(StoreCategoryRepository::class)->getWhereCount(['store_category_id' => $data['mer_cate_id'],'is_show' => 1,'mer_id' => $this->request->merId()]);
-        if (!$count) throw new ValidateException('商户分类不存在或不可用');
+        // $count = app()->make(StoreCategoryRepository::class)->getWhereCount(['store_category_id' => $data['mer_cate_id'],'is_show' => 1,'mer_id' => $this->request->merId()]);
+        // if (!$count) throw new ValidateException('商户分类不存在或不可用');
         $data['status'] = 1;
         $this->repository->freeTrial($id, $data,$this->request->merId());
         return app('json')->success('编辑成功');

public/index.html

@@ -2,4 +2,4 @@
             document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
 						if(window.location.protocol == 'https:'){
 							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.d5d290f7.js></script></body></html>
+						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.8b75b47b.js></script></body></html>

public/static/iconfont/demo.css

@@ -0,0 +1,26 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-dianzan2:before {
+  content: "\e61f";
+}
+
+.icon-dianzan3:before {
+  content: "\e601";
+}
+

public/static/js/pages-users-supply_procurement-index.d3d734aa.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-users-supply_procurement-index"],{"19a5":function(t,n,i){t.exports=i.p+"static/img/bg3.9dc6c2ee.png"},2009:function(t,n,i){"use strict";var e=i("ebd1"),c=i.n(e);c.a},"6cd3":function(t,n,i){"use strict";i.r(n);var e=i("cce6"),c=i.n(e);for(var a in e)["default"].indexOf(a)<0&&function(t){i.d(n,t,(function(){return e[t]}))}(a);n["default"]=c.a},"7d4b":function(t,n,i){var e=i("24fb");n=e(!1),n.push([t.i,'@charset "UTF-8";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */*[data-v-351fd8de]{padding:0;margin:0}.conent[data-v-351fd8de]{width:100%;display:flex;justify-content:space-around;margin-top:20px}.conent .con_kuo[data-v-351fd8de]{position:relative}.conent .con_kuo .con_img[data-v-351fd8de]{width:192px;height:92px}.conent .con_kuo .con_ico[data-v-351fd8de]{position:absolute;left:25px;top:32px;width:31px;height:32px}.conent .con_kuo .con_text[data-v-351fd8de]{position:absolute;left:66px;top:20px;color:#fff}',""]),t.exports=n},8348:function(t,n,i){"use strict";i.r(n);var e=i("864c"),c=i("6cd3");for(var a in c)["default"].indexOf(a)<0&&function(t){i.d(n,t,(function(){return c[t]}))}(a);i("2009");var o=i("f0c5"),s=Object(o["a"])(c["default"],e["b"],e["c"],!1,null,"351fd8de",null,!1,e["a"],void 0);n["default"]=s.exports},"864c":function(t,n,i){"use strict";i.d(n,"b",(function(){return e})),i.d(n,"c",(function(){return c})),i.d(n,"a",(function(){}));var e=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"conent"},[e("v-uni-view",{staticClass:"con_kuo",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.navigator("/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&credit_buy=0&product_type=98&cate_id="+t.id)}}},[e("v-uni-image",{staticClass:"con_img",attrs:{src:i("edd3"),mode:""}}),e("v-uni-image",{staticClass:"con_ico",attrs:{src:i("cb28"),mode:""}}),e("v-uni-view",{staticClass:"con_text"},[e("h3",[t._v("先款后货")]),e("span",[t._v("先付款后发货")])])],1),e("v-uni-view",{staticClass:"con_kuo",on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.navigator("/pages/nongKe/supply_chain/supplierA?tit=2&type_id=12&isDetail=1&credit_buy=1&product_type=98&cate_id="+t.id)}}},[e("v-uni-image",{staticClass:"con_img",attrs:{src:i("19a5"),mode:""}}),e("v-uni-image",{staticClass:"con_ico",attrs:{src:i("cd33"),mode:""}}),e("v-uni-view",{staticClass:"con_text"},[e("h3",[t._v("先货后款")]),e("span",[t._v("先发货后付款")])])],1)],1)},c=[]},cb28:function(t,n,i){t.exports=i.p+"static/img/bgic1.202cda7e.png"},cce6:function(t,n,i){"use strict";i("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{id:""}},onLoad:function(t){this.id=t.cate_id},methods:{navigator:function(t,n){uni.navigateTo({url:t})}}};n.default=e},cd33:function(t,n,i){t.exports=i.p+"static/img/bgic2.c41a50de.png"},ebd1:function(t,n,i){var e=i("7d4b");e.__esModule&&(e=e.default),"string"===typeof e&&(e=[[t.i,e,""]]),e.locals&&(t.exports=e.locals);var c=i("4f06").default;c("53e5649d",e,!0,{sourceMap:!1,shadowMode:!1})},edd3:function(t,n,i){t.exports=i.p+"static/img/bg1.a0707cb4.png"}}]);

route/admin/accounts.php

@@ -148,6 +148,9 @@ Route::group(function () {
 
     //余额变动记录
     Route::group('bill', function () {
+        Route::get('deposit', 'UserBill/deposit')->name('systemUserBillDeposit')->option([
+            '_alias' => '押金列表',
+        ]);
         Route::get('list', 'UserBill/getList')->name('systemUserBillList')->option([
             '_alias' => '列表',
         ]);

route/api.php

@@ -22,6 +22,7 @@ use think\facade\Route;
 Route::group('api/', function () {
     Route::any('test', 'api.Auth/test');
     Route::any('dotest', 'api.Auth/dotest');
+    Route::any('app/version', 'api.Auth/appVersion');
     Route::post('merchant/syncStatus/:id', 'api.Auth/merchantStatus');
     Route::get('business/agree', 'api.Auth/businessAgree');
     Route::post('goods/take/:id', 'api.Auth/deliveryGoods');