Merge branch 'dev' into 'test'

feat(custom): 增加活动商品豆子过期时间

See merge request xinling/jdt-admin!2

.env.development

@@ -8,7 +8,7 @@ VITE_USE_MOCK = false
 VITE_USE_PROXY = true
 
 # base api
-VITE_BASE_API = 'https://www.wanzhuanyongcheng.cn/admin'
+VITE_BASE_API = 'https://test.wanzhuanyongcheng.cn/admin'
 
 
 VITE_WS1_URL = 'game.wanzhuanyongcheng.cn/dice/home'

src/views/commodity/hot_list/index.vue

@@ -37,7 +37,7 @@
       >
         <n-form ref="formRef" :model="nowRow" :rules="rules" label-placement="left">
           <n-grid :cols="24">
-            <n-form-item-gi :span="20" label="赠送豆子" path="pulse_number">
+            <n-form-item-gi :span="20" label="商品赠送豆子" path="pulse_number">
               <n-input-number
                 v-model:value="nowRow.pulse_number"
                 clearable
@@ -45,7 +45,7 @@
                 placeholder="请输入赠送豆子数量...."
               />
             </n-form-item-gi>
-            <n-form-item-gi :span="20" label="赠送积分" path="integral">
+            <n-form-item-gi :span="20" label="商品赠送积分" path="integral">
               <n-input-number
                 v-model:value="nowRow.integral"
                 clearable
@@ -53,7 +53,7 @@
                 placeholder="请输入赠送积分数量...."
               />
             </n-form-item-gi>
-            <n-form-item-gi :span="18" label="分佣类型" path="commission_type">
+            <n-form-item-gi :span="18" label="商品分佣类型" path="commission_type">
               <n-select
                 v-model:value="nowRow.commission_type"
                 placeholder="请选择分佣类型"
@@ -70,13 +70,20 @@
                 ]"
               />
             </n-form-item-gi>
-            <n-form-item-gi :span="20" label="分佣比例" path="commission">
+            <n-form-item-gi :span="20" label="商品分佣比例" path="commission">
               <n-input-number
                 v-model:value="nowRow.commission"
                 clearable
                 placeholder="请输入分佣比例...."
               />
             </n-form-item-gi>
+            <n-form-item-gi :span="20" label="豆子过期时间" path="expiration">
+              <n-input-number
+                v-model:value="nowRow.expiration"
+                clearable
+                placeholder="请输入豆子过期时间...."
+              />
+            </n-form-item-gi>
             <n-form-item-gi :span="12">
               <div m-auto p-10>
                 <n-button type="primary" @click="veeify">确定</n-button>
@@ -186,6 +193,12 @@ const rules = {
     message: '请输入分佣比例',
     trigger: 'blur',
   },
+  expiration: {
+    required: true,
+    type: 'number',
+    message: '请输入豆子过期时间',
+    trigger: 'blur',
+  },
 }
 
 const nowRow = ref({})