modif

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -62,7 +62,7 @@
                     </el-upload>
                 </el-form-item>
                 <el-form-item label="商品标题：" prop="goods_name" style="width: 90%" :rules="[{ required: true, message: '请输入商品标题' }]">
-                    <el-input v-model="commodityForm.goods_name" maxlength="30"></el-input>
+                    <el-input v-model="commodityForm.goods_name" maxlength="50"></el-input>
                 </el-form-item>
                 <el-form-item label="售价：" prop="price" :rules="[{ required: true, message: '请输入售价' }]">
                     <el-input-number

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -135,6 +135,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="discount_fee" label="优惠金额"></el-table-column>
+                        <el-table-column prop="order_channel" label="支付渠道"></el-table-column>
                         <el-table-column prop="refund_apply_time" label="申请退款时间"></el-table-column>
                         <el-table-column fixed="right" label="操作" width="100">
                             <template #default="scope">
@@ -203,6 +204,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="discount_fee" label="优惠金额"></el-table-column>
+                        <el-table-column prop="order_channel" label="支付渠道"></el-table-column>
                         <el-table-column prop="refund_apply_time" label="申请退款时间"></el-table-column>
                         <el-table-column fixed="right" label="操作" width="100">
                             <template #default="scope">
@@ -236,9 +238,15 @@
             <el-dialog title="导出订单" width="45%" top="10%" v-model="exportShow">
                 <el-form-item class="exportForm" label>
                     <div style="margin-bottom: 15px">请选择导出活动{{ exportType }}的表格类型</div>
-                    <a :href="exportURL1" style="margin-right: 10px"><el-button type="primary" @click="exportShow = false">总表</el-button></a>
-                    <a :href="exportURL2" style="margin-right: 10px"><el-button type="primary" @click="exportShow = false">商品表</el-button></a>
-                    <a :href="exportURL3"><el-button type="primary" @click="exportShow = false">配送表</el-button></a>
+                    <a :href="exportURL1" style="margin-right: 10px">
+                        <el-button type="primary" @click="exportShow = false">总表</el-button>
+                    </a>
+                    <a :href="exportURL2" style="margin-right: 10px">
+                        <el-button type="primary" @click="exportShow = false">商品表</el-button>
+                    </a>
+                    <a :href="exportURL3">
+                        <el-button type="primary" @click="exportShow = false">配送表</el-button>
+                    </a>
                 </el-form-item>
             </el-dialog>
             <!-- 退款弹窗 -->
@@ -257,7 +265,7 @@
               v-model="item.restoreInventory"
               label="恢复库存"
               name="type"
-            ></el-checkbox> -->
+                        ></el-checkbox>-->
                     </el-row>
                 </div>
                 <template #footer>