0811-1455-h01

src/views/merchant/goods/add.vue

@@ -22,7 +22,7 @@
                             <el-card shadow="never" header="商品信息">
                                 <el-form-item label="商品名称" prop="product_name">
                                     <el-input v-model="formData.product_name" maxlength="40" show-word-limit clearable placeholder="请输入"></el-input>
-                                    <div class="el-form-item-msg"></div>
+                                    <div class="el-form-item-msg">限制40个字符，一个汉字等于两个字符</div>
                                 </el-form-item>
                                 <el-row :gutter="15">
                                     <el-col :span="formData.product_type==11?8:12">
@@ -564,7 +564,7 @@ export default {
             showNext:false,
             formData:{
                 settle_type:2,
-                show_channel:1,
+                show_channel:2,
                 limit_use_rule:2,
                 customer_reserved_info:2,
                 auto_renew:1,

src/views/merchant/goods/edit.vue

@@ -25,7 +25,7 @@
                             <el-card shadow="never" header="商品信息">
                                 <el-form-item label="商品名称" prop="product_name">
                                     <el-input v-model="formData.product_name" maxlength="40" show-word-limit clearable placeholder="请输入"></el-input>
-                                    <div class="el-form-item-msg"></div>
+                                    <div class="el-form-item-msg">限制40个字符，一个汉字等于两个字符</div>
                                 </el-form-item>
                                 <el-row :gutter="15">
                                     <el-col :span="formData.product_type==11?8:12">
@@ -550,7 +550,7 @@ export default {
             showNext:true,
             formData:{
                 settle_type:1,
-                show_channel:1,
+                show_channel:2,
                 limit_use_rule:1,
                 auto_renew:true,
                 use_date_type:1,

src/views/merchant/goods/index/components/search.vue

@@ -12,6 +12,11 @@
                                 <template #prepend>商品标题</template>
                             </el-input>
                         </el-col>
+                        <el-col :xs="12" :sm="12" :md="12" :lg="6" :xl="4">
+                            <el-input v-model="searchKey.goods_id" placeholder="商品ID" clearable :style="{ width: '100%' }" @keyup.enter="searchForm()">
+                                <template #prepend>商品ID</template>
+                            </el-input>
+                        </el-col>
                         <el-col :xs="12" :sm="12" :md="12" :lg="6" :xl="4">
                             <el-select v-model="searchKey.exstatus" clearable placeholder="请选择状态" @change="searchForm" :style="{width: '100%'}" class="diy-select">
                                 <el-option value="1" label="审核中"></el-option>

src/views/service/order/express/components/table.vue

@@ -9,6 +9,12 @@
                 <div class="status-danger" v-if="scope.row.status==2"><sc-status-indicator type="danger"></sc-status-indicator> 执行失败</div>
                 <div class="status-info" v-if="scope.row.status==0"><sc-status-indicator type="info"></sc-status-indicator> 执行中</div>
             </template>
+        </el-table-column>
+        <el-table-column label="成功(条)" prop="success_num">
+            
+        </el-table-column>
+        <el-table-column label="失败(条)" prop="error_num">
+
         </el-table-column>
         <el-table-column label="创建时间" prop="create_at"></el-table-column>
         <el-table-column label="执行时间" prop="last_at">