商户后台优化

app/controller/api/Auth.php

@@ -84,7 +84,7 @@ class Auth extends BaseController
 //        }
 
 //        app(UserAssetsLogRepository::class)->shareAward(1);
-//        app(DepositRecordDailyRepository::class)->runDaily();
+        app(DepositRecordDailyRepository::class)->runDaily();
 //        event('pay_success_user_recharge', array('order_sn' => 'wxu2024041817195114'));
         return app('json')->success();
     }

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

@@ -51,7 +51,7 @@ class Product extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $type = $this->request->param('type', 1);
-        $where = $this->request->params(['temp_id', 'cate_id', 'keyword', 'mer_cate_id', 'is_gift_bag', 'status', 'us_status', 'product_id', 'mer_labels', ['order', 'sort'], 'is_ficti', 'svip_price_type', 'filters_type', 'is_action', 'is_good', 'not_product_id', 'form_id']);
+        $where = $this->request->params(['temp_id', 'cate_id', 'keyword', 'mer_cate_id', 'is_gift_bag', 'status', 'us_status', 'product_id', 'mer_labels', ['order', 'sort'], 'is_ficti', 'is_hot', 'svip_price_type', 'filters_type', 'is_action', 'is_good', 'not_product_id', 'form_id']);
         $where = array_merge($where, $this->repository->switchType($type, $this->request->merId(), 0));
         return app('json')->success($this->repository->getList($this->request->merId(), $where, $page, $limit));
     }

view/mer/src/views/order/index.vue

@@ -219,15 +219,15 @@
         <el-form-item v-if="isResend && noLogistics != 3 && tableFrom.order_type != 2" :label="shipment.delivery_type == 1 || shipment.delivery_type == 4 ? '原快递单号：' : '送货人手机号：'">
           <span>{{ original.delivery_id }}</span>
         </el-form-item>
-        <el-form-item label="选择类型：" prop="delivery_type">
-          <el-radio-group v-model="shipment.delivery_type" @change="changeSend">
-            <el-radio v-if="!isBatch && tableFrom.order_type != 2 && orderType != 1" :label="1">手动发货</el-radio>
-            <el-radio :label="3" class="radio"> {{orderType == 1 ? '虚拟发货' : '无需物流'}}</el-radio>
-            <el-radio v-if="isDump==1 && tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="4" class="radio">电子面单打印</el-radio>
-            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1" :label="2">自己配送</el-radio>
-            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="5">同城配送</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="选择类型：" prop="delivery_type">-->
+<!--          <el-radio-group v-model="shipment.delivery_type" @change="changeSend">-->
+<!--            <el-radio v-if="!isBatch && tableFrom.order_type != 2 && orderType != 1" :label="1">手动发货</el-radio>-->
+<!--            <el-radio :label="3" class="radio"> {{orderType == 1 ? '虚拟发货' : '无需物流'}}</el-radio>-->
+<!--            <el-radio v-if="isDump==1 && tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="4" class="radio">电子面单打印</el-radio>-->
+<!--            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1" :label="2">自己配送</el-radio>-->
+<!--            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="5">同城配送</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item v-if="shipment.delivery_type == 5 && tableFrom.order_type != 2 && orderType !=1" label="选择发货点：" prop="station_id">
           <el-select
             v-model="shipment.station_id"

view/mer/src/views/order/orderDetails.vue

@@ -218,7 +218,6 @@
                 <li class="item">
                   <div>快递单号：</div>
                   <div class="value">{{ orderDetailList.delivery_id ? orderDetailList.delivery_id : '-' }}</div>
-                  <el-button type="text" size="mini" style="margin-left: 5px" @click="openLogistics">物流查询</el-button>
                 </li>
               </ul>
             </div>

view/mer/src/views/product/productList/index.vue

@@ -19,7 +19,7 @@
           <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称，关键字" class="selWidth" clearable @keyup.enter.native="getList(1)" />
         </el-form-item>
         <el-form-item label="商品类型：" prop="is_ficti">
-          <el-select v-model="tableFrom.is_ficti" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
+          <el-select v-model="tableFrom.is_hot" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
             <el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
@@ -500,6 +500,7 @@ export default {
         form_id: '',
         type: this.$route.query.type ? this.$route.query.type : '1',
         is_ficti: "",
+        is_hot: "",
         is_gift_bag: '',
         us_status: '',
         mer_labels: '',
@@ -518,8 +519,7 @@ export default {
       ],
       productTypeList: [
         { label: '普通商品', value: 0 },
-        { label: '虚拟商品', value: 1 },
-        { label: '卡密商品', value: 2 }
+        { label: '爆单商品', value: 1 },
       ],
       tempRule: {
         temp_id: [{required: true,message: '请选择运费模板',trigger: 'change'}]