优化代码

app/common/repositories/user/UserAssetsRepository.php

@@ -77,6 +77,7 @@ class UserAssetsRepository extends BaseRepository
             $this->dao->create($ret);
         }
         $ret['deposit_total'] = app(DepositRecordRepository::class)->getSum($uid,'price');
+        $ret['deposit_total'] += $ret['deposit'];
         return $ret;
     }
 

app/controller/api/user/User.php

@@ -136,9 +136,9 @@ class User extends BaseController
         $type = $this->request->param('type', 'intention');
         $uid = $this->user->uid;
         Log::info("code: {$smsCode}, type: {$type}");
-//        $checkSms = app()->make(SmsService::class)->checkSmsCode($this->user->phone, $smsCode, $type);
-//        if (!$smsCode || !$checkSms)
-//            return app('json')->fail('验证码不正确');
+        $checkSms = app()->make(SmsService::class)->checkSmsCode($this->user->phone, $smsCode, $type);
+        if (!$smsCode || !$checkSms)
+            return app('json')->fail('验证码不正确');
 
         try {
             app(UserAssetsRepository::class)->sendDiamond($uid, $phone, $count);
@@ -164,9 +164,9 @@ class User extends BaseController
         $type = $this->request->param('type', 'intention');
         $uid = $this->user->uid;
         Log::info("code: {$smsCode}, type: {$type}");
-//        $checkSms = app()->make(SmsService::class)->checkSmsCode($this->user->phone, $smsCode, $type);
-//        if (!$smsCode || !$checkSms)
-//            return app('json')->fail('验证码不正确');
+        $checkSms = app()->make(SmsService::class)->checkSmsCode($this->user->phone, $smsCode, $type);
+        if (!$smsCode || !$checkSms)
+            return app('json')->fail('验证码不正确');
 
         try {
             app(UserAssetsRepository::class)->sendIntegral($uid, $phone, $count);

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

@@ -23,25 +23,34 @@
       >
         <el-row v-if="currentTab == '1'" :gutter="24">
           <!-- 商品信息-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="商品类型：" required>-->
+<!--              <div-->
+<!--                v-for="(item, index) in virtual"-->
+<!--                :key="index"-->
+<!--                class="virtual"-->
+<!--                :class="-->
+<!--                  formValidate.type == item.id-->
+<!--                    ? 'virtual_boder'-->
+<!--                    : 'virtual_boder2'-->
+<!--                "-->
+<!--                @click="virtualbtn(item.id, 2)"-->
+<!--              >-->
+<!--                <div class="virtual_top">{{ item.tit }}</div>-->
+<!--                <div class="virtual_bottom">({{ item.tit2 }})</div>-->
+<!--                <div v-if="formValidate.type == item.id" class="virtual_san" />-->
+<!--                <div v-if="formValidate.type == item.id" class="virtual_dui">-->
+<!--                  ✓-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="24">
             <el-form-item label="商品类型：" required>
-              <div
-                v-for="(item, index) in virtual"
-                :key="index"
-                class="virtual"
-                :class="
-                  formValidate.is_hot == item.id
-                    ? 'virtual_boder'
-                    : 'virtual_boder2'
-                "
-                @click="virtualbtn(item.id, 2)"
-              >
-                <div class="virtual_top">{{ item.tit }}</div>
-                <div v-if="formValidate.is_hot == item.id" class="virtual_san" />
-                <div v-if="formValidate.is_hot == item.id" class="virtual_dui">
-                  ✓
-                </div>
-              </div>
+              <el-radio-group v-model="formValidate.is_hot">
+                <el-radio :label="0" class="radio">普通商品</el-radio>
+                <el-radio :label="1">爆单商品</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -209,42 +218,10 @@
             </el-form-item>
           </el-col>
 
-
         </el-row>
         <!-- 规格设置 -->
         <el-row v-if="currentTab == '2'">
-          <el-col :span="24">
-            <el-form-item
-              v-if="extensionStatus > 0"
-              label="佣金设置："
-              props="extension_type"
-            >
-              <el-radio-group
-                v-model="formValidate.extension_type"
-                @change="onChangetype(formValidate.extension_type)"
-              >
-                <el-radio :label="1" class="radio">单独设置</el-radio>
-                <el-radio :label="0">默认设置</el-radio>
-              </el-radio-group>
-              <span style="color: #F56464;">（平台设置，一级佣金{{extension_one_rate}}%，二级佣金{{extension_two_rate}}%）</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item
-              v-if="open_svip"
-              label="付费会员价设置："
-              props="svip_price_type"
-            >
-              <el-radio-group
-                v-model="formValidate.svip_price_type"
-                @change="onChangeSpecs(formValidate.svip_price_type)"
-              >
-                <el-radio :label="0" class="radio">不设置会员价</el-radio>
-                <el-radio :label="1" class="radio">默认设置会员价</el-radio>
-                <el-radio :label="2">自定义设置会员价</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="24">
             <el-form-item label="商品规格：" props="spec_type">
               <el-radio-group
@@ -904,7 +881,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- 营销设置-->
+
         <!-- 其它设置 -->
         <el-row v-if="currentTab == '4'">
           <el-col>
@@ -1398,7 +1375,7 @@ const defaultObj = {
   is_gift_bag: 0,
   couponData: [],
   extend: [], // 自定义留言
-  is_hot: 0,
+  type: 0,
   product_type: 0
 }
 const objTitle = {
@@ -1580,8 +1557,9 @@ export default {
       previewKey: '',
       deliveryType: [],
       virtual: [
-        { tit: '普通商品', id: 0, },
-        { tit: '爆单商品', id: 1, },
+        { tit: '普通商品', id: 0, tit2: '物流发货' },
+        { tit: '虚拟商品', id: 1, tit2: '虚拟发货' },
+        { tit: '卡密/网盘', id: 2, tit2: '自动发货' }
       ],
       customBtn: 0, // 自定义留言开关
       // 自定义留言下拉选择
@@ -1626,7 +1604,8 @@ export default {
         { title: '商品信息', name: '1' },
         { title: '规格设置', name: '2' },
         { title: '商品详情', name: '3' },
-        { title: '其他设置', name: '4' }
+        { title: '营销设置', name: '4' },
+        { title: '其他设置', name: '5' }
       ],
       type: 0,
       modals: false,

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

@@ -3,11 +3,11 @@
     <div class="selCard">
       <el-form :model="tableFrom" ref="searchForm" size="small" label-width="95px" :inline="true">
 
-        <el-form-item label="商品分类：" prop="mer_cate_id">
-          <el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
-            <el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="商品分类：" prop="mer_cate_id">-->
+<!--          <el-select v-model="tableFrom.mer_cate_id" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">-->
+<!--            <el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
 
         <el-form-item label="商品状态：" prop="us_status">
           <el-select v-model="tableFrom.us_status" placeholder="请选择" class="filter-item selWidth" clearable @change="getList">