Merge remote-tracking branch 'origin/master'

addons/shopro/controller/goods/Liveroom.php

@@ -108,7 +108,11 @@ class Liveroom extends Common
             $goods[$key] = $good;
         }
 
-        $this->success('获取成功', $goods);
+        $rs = [
+            'number' => count($goods_ids),
+            'list'   => $goods,
+        ];
+        $this->success('获取成功', $rs);
     }
 
     //添加

application/admin/view/shopro/dashboard/index.html

@@ -156,7 +156,7 @@
                 {if $auth->check('shopro/dashboard/total')}
                 <el-row :gutter="20">
                     <!-- -- commission code start -- -->
-                    <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+                    <!--<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
                         <div class="scale-card card ">
                             <div class="card-title sa-flex sa-row-between">
                                 <div class="left">{{state.total.user.title}} <span
@@ -206,7 +206,7 @@
                                 <span>{{ state.total.share.data.week }}</span>
                             </div>
                         </div>
-                    </el-col>
+                    </el-col>-->
                     <!-- -- commission code end -- -->
                     <!-- <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
                         <div class="scale-card card ">

application/admin/view/shopro/goods/goods/add.html

@@ -321,16 +321,16 @@
                         <div class="sa-flex mb-4">
                             <img v-if="!(state.type=='edit' && form.model.type=='virtual')" class="goods-type" :class="form.model.type=='normal'?'is-active':''"
                                 src="/assets/addons/shopro/img/goods/normal.png" @click="onChangeGoodsType('normal')" />
-                            <img v-if="!(state.type=='edit' && form.model.type=='normal')" class="goods-type" :class="form.model.type=='virtual'?'is-active':''"
+                            <!--<img v-if="!(state.type=='edit' && form.model.type=='normal')" class="goods-type" :class="form.model.type=='virtual'?'is-active':''"
                                 src="/assets/addons/shopro/img/goods/virtual.png"
-                                @click="onChangeGoodsType('virtual')" />
+                                @click="onChangeGoodsType('virtual')" />-->
                         </div>
                         <el-form-item label="商品标题" prop="title">
                             <el-input class="sa-w-360" v-model="form.model.title" placeholder="请输入商品标题"></el-input>
                         </el-form-item>
-                        <el-form-item label="副标题">
+                        <!--<el-form-item label="副标题">
                             <el-input class="sa-w-360" v-model="form.model.subtitle" placeholder="请输入副标题"></el-input>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="商品主图" prop="image">
                             <sa-uploader v-model="form.model.image" type="size" @success="onSuccess"></sa-uploader>
                             <div class="warning"> 作用于商城列表、分享图片；建议尺寸：750*750 px </div>
@@ -417,7 +417,7 @@
                                     <el-radio :label="1">多规格</el-radio>
                                 </el-radio-group>
                                 <div class="warning">
-                                    如商品参与了拼团、秒杀、积分等活动，切换规格，可能导致活动规格不可用
+                                    如商品参与了拼团、秒杀、砍价等活动，切换规格，可能导致活动规格不可用
                                 </div>
                             </div>
                         </el-form-item>
@@ -785,12 +785,10 @@
                                     {/if}
                                 </div>
                             </el-form-item>
-                            <el-form-item label="货到付款">
+                            <!--<el-form-item label="货到付款">
                                 <el-switch v-model="form.model.is_offline" :active-value="1" :inactive-value="0"></el-switch>
-                            </el-form-item>
-                            <el-form-item label="预售">
-                                <el-input class="sa-w-360" v-model="form.model.yushou" placeholder="例如：承诺12天内发货"></el-input>
-                            </el-form-item>
+                            </el-form-item>-->
+
                         </template>
                         <template v-if="form.model.type=='virtual'">
                             <el-form-item label="配送方式">
@@ -826,7 +824,10 @@
                 </el-form>
                 <el-form :model="form.model" :rules="form.rules" ref="formRef3" label-width="100px">
                     <div v-show="state.activeStep==3">
-                        <el-form-item label="服务保障" prop="service_ids">
+                        <el-form-item label="预售">
+                            <el-input class="sa-w-360" v-model="form.model.yushou" placeholder="例如：承诺12天内发货"></el-input>
+                        </el-form-item>
+                        <!--<el-form-item label="服务保障" prop="service_ids">
                             <div class="sa-w-360">
                                 <el-select v-model="form.model.service_ids" placeholder="请选择服务保障" multiple>
                                     <el-option v-for="item in service.select" :key="item.id" :label="item.name"
@@ -838,8 +839,8 @@
                                 </el-button>
                                 {/if}
                             </div>
-                        </el-form-item>
-                        <el-form-item label="参数详情">
+                        </el-form-item>-->
+                        <!--<el-form-item label="参数详情">
                             <div class="sa-template-wrap">
                                 <div class="header">
                                     <div class="key">参数名称</div>
@@ -869,7 +870,7 @@
                                 <el-button class="add-params" icon="Plus" @click="onAddParams">添加
                                 </el-button>
                             </div>
-                        </el-form-item>
+                        </el-form-item>-->
                     </div>
                 </el-form>
                 <el-form :model="form.model" :rules="form.rules" ref="formRef4" label-width="100px">

application/admin/view/shopro/order/aftersale/detail.html

@@ -333,6 +333,10 @@
                                 <div class="left">建议退款：</div>
                                 <div class="right">¥{{ state.data.suggest_refund_fee }}</div>
                             </div>
+                            <div class="item">
+                                <div class="left">用户申请退款：</div>
+                                <div class="right">¥{{ state.data.apply_refund_price }}</div>
+                            </div>
                         </el-col>
                         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                             <div class="subtitle">售后信息</div>

application/admin/view/shopro/order/aftersale/refund.html

@@ -18,6 +18,9 @@
                             :placeholder="`建议退款金额${state.suggest_refund_fee}元`" />
                         <div class="tip"> 退款时请与买家协商好，退款之后不可撤回 </div>
                     </el-form-item>
+                    <div>
+                        用户申请的退款金额:￥{{state.apply_refund_price}}
+                    </div>
                 </el-form>
             </el-scrollbar>
         </el-main>

application/common/controller/Api.php

@@ -403,7 +403,7 @@ class Api
         }
 
         defined('API_REQUEST_LOG_TYPE') or define('API_REQUEST_LOG_TYPE', $this->logType);
-        $params = $this->request->request();
+        $params = $this->request->param();
         if ($this->logType === 1){
             //日志统一写入
             register_shutdown_function([new LogUtil, 'close']);
@@ -432,13 +432,13 @@ class Api
 
         if ($this->logType === 1){
             if (strlen(json_encode($log_result['data'])) > 1000) {
-                $log_result['data'] = '数据太多，不记录';
+//                $log_result['data'] = '数据太多，不记录';
             }
             LogUtil::info('result', 'Api-Middleware-Log', 'request_log', $log_result);
         }else{
             if(defined('API_REQUEST_ID')) { //记录app正常返回结果
                 if(strlen(json_encode($log_result['data'])) > 1000) {
-                    $log_result['data'] = '数据太多，不记录';
+//                    $log_result['data'] = '数据太多，不记录';
                 }
                 db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($log_result,JSON_UNESCAPED_UNICODE)]);
             }

application/extra/site.php

@@ -12,7 +12,7 @@ return array (
     'backend' => 'zh-cn',
     'frontend' => 'zh-cn',
   ),
-  'fixedpage' => 'dashboard',
+  'fixedpage' => 'shopro/dashboard',
   'categorytype' => 
   array (
     'default' => '默认',

public/assets/js/backend/shopro/order/aftersale.js

@@ -257,7 +257,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     }
 
                     function onRefund() {
-                        Fast.api.open(`shopro/order/aftersale/refund/id/${state.id}?id=${state.id}&suggest_refund_fee=${state.data.suggest_refund_fee}`, "售后退款", {
+                        Fast.api.open(`shopro/order/aftersale/refund/id/${state.id}?id=${state.id}&suggest_refund_fee=${state.data.suggest_refund_fee}&apply_refund_price=${state.data.apply_refund_price}`, "售后退款", {
                             callback() {
                                 getDetail()
                             }
@@ -321,6 +321,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     const state = reactive({
                         id: new URLSearchParams(location.search).get('id'),
                         suggest_refund_fee: new URLSearchParams(location.search).get('suggest_refund_fee'),
+                        apply_refund_price: new URLSearchParams(location.search).get('apply_refund_price'),
                     })
 
                     const form = reactive({