0716-0301-h01

src/components/imFloat/imFloat.vue

@@ -232,8 +232,8 @@
                                             <div class="order-btn-group">
                                                 <div class="status info cus" @click="viewOrder(msgOrder)">查看详情</div>
                                                 <div class="status primary cus" @click="sendAddress(msgOrder)">收集地址</div>
-                                                <div class="status warn cus" v-if="msgOrder.product.product_type==11 && msgOrder.custom_price > 0 && msgOrder.custom_status ==0" @click="submitPrice(msgOrder)">补差价</div>
-                                                <div class="status danger cus" v-if="msgOrder.product.product_type==11 && msgOrder.custom_price > 0 && msgOrder.custom_status ==0" @click="submitPrice(msgOrder)">改差价</div>
+                                                <!-- <div class="status warn cus" v-if="msgOrder.product.product_type==11 && msgOrder.custom_price > 0 && msgOrder.custom_status ==0" @click="submitPrice(msgOrder)">补差价</div> -->
+                                                <!-- <div class="status danger cus" v-if="msgOrder.product.product_type==11 && msgOrder.custom_price > 0 && msgOrder.custom_status ==0" @click="submitPrice(msgOrder)">改差价</div> -->
                                                 <div class="status danger cus" @click="sendOrder(msgOrder)">发送订单</div>
                                             </div>
                                         </div>
@@ -292,8 +292,8 @@
                                                     <div class="order-btn-group">
                                                         <div class="status info cus" @click="viewOrder(item)">查看详情</div>
                                                         <div class="status primary cus" @click="sendAddress(item)">收集地址</div>
-                                                        <div class="status warn cus" v-if="item.product.product_type==11 && item.custom_price > 0 && item.custom_status ==0" @click="submitPrice(item)">补差价</div>
-                                                        <div class="status danger cus" v-if="item.product.product_type==11 && item.custom_price > 0 && item.custom_status ==0" @click="submitPrice(item)">改差价</div>
+                                                        <!-- <div class="status warn cus" v-if="item.product.product_type==11 && item.custom_price > 0 && item.custom_status ==0" @click="submitPrice(item)">补差价</div>
+                                                        <div class="status danger cus" v-if="item.product.product_type==11 && item.custom_price > 0 && item.custom_status ==0" @click="submitPrice(item)">改差价</div> -->
                                                         <div class="status danger cus" @click="sendOrder(item)">发送订单</div>
                                                     </div>
                                                 </div>

src/views/manage/order/index/components/search.vue

@@ -35,7 +35,15 @@
                                 <el-option value="4" label="已退款"></el-option>
                                 <el-option value="5" label="退款中"></el-option>
                                 <el-option value="6" label="已关闭"></el-option>
-                                <template #prefix>状态</template>
+                                <template #prefix>订单状态</template>
+                            </el-select>
+                        </el-col>
+                        <el-col :xs="12" :sm="12" :md="12" :lg="6" :xl="4">
+                            <el-select v-model="searchKey.express_status" clearable placeholder="请选择" @change="searchForm" :style="{width: '100%'}" class="diy-select">
+                                <el-option value="1" label="待发货"></el-option>
+                                <el-option value="2" label="已发货"></el-option>
+                                <el-option value="3" label="已签收"></el-option>
+                                <template #prefix>发货状态</template>
                             </el-select>
                         </el-col>
                         <el-col :xs="12" :sm="6" :md="6" :lg="6" :xl="4">

src/views/manage/shop/index/components/form.vue

@@ -34,6 +34,20 @@
                 </el-row>
                 <div class="el-form-item-msg">营业时间为必选，否则小程序端无法下单</div>
             </el-form-item>
+            <el-form-item label="可核销时段">
+                <el-row :gutter="10">
+                    <el-col :span="11">
+                        <el-time-select v-model="formData.order_start" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
+                    </el-col>
+                    <el-col :span="2" class="text-center">
+                        <span class="text-gray-500">-</span>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-time-select v-model="formData.order_end" start="00:00" step="00:01" end="23:59" placeholder="请选择"  style="width: 100%"/>
+                    </el-col>
+                </el-row>
+                <div class="el-form-item-msg">默认为09:00 - 22:30</div>
+            </el-form-item>
             <el-row :gutter="10">
                 <el-col :span="12">
                     <el-form-item label="团购结算费率" prop="life_rate">

src/views/manage/shop/index/components/search.vue

@@ -13,7 +13,7 @@
                             </el-input>
                         </el-col>
                         <el-col :xs="12" :sm="12" :md="12" :lg="6" :xl="4">
-                            <el-select v-model="searchKey.status" clearable placeholder="请选择状态" @change="searchForm" :style="{width: '100%'}" class="diy-select">
+                            <el-select v-model="searchKey.status" clearable placeholder="请选择" @change="searchForm" :style="{width: '100%'}" class="diy-select">
                                 <el-option value="1" label="正常"></el-option>
                                 <el-option value="2" label="禁用"></el-option>
                                 <template #prefix>状态</template>

src/views/manage/shop/index/components/table.vue

@@ -15,6 +15,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
+        <el-table-column label="可核销时间" prop="agent" width="150">
+            <template #default="scope">
+                <span v-if="scope.row.order_start">{{ scope.row.order_start }}-{{ scope.row.order_end }}</span>
+                <span class="status-danger" v-else>09:00-22:30</span>
+            </template>
+        </el-table-column>
         <el-table-column label="所属地区" prop="agent" width="200">
             <template #default="scope">
                 <span v-if="scope.row.poi_city">{{ scope.row.poi_city }}</span>

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

@@ -25,7 +25,15 @@
                                 <el-option value="4" label="已退款"></el-option>
                                 <el-option value="5" label="退款中"></el-option>
                                 <el-option value="6" label="已关闭"></el-option>
-                                <template #prefix>状态</template>
+                                <template #prefix>订单状态</template>
+                            </el-select>
+                        </el-col>
+                        <el-col :xs="12" :sm="12" :md="12" :lg="6" :xl="4">
+                            <el-select v-model="searchKey.express_status" clearable placeholder="请选择" @change="searchForm" :style="{width: '100%'}" class="diy-select">
+                                <el-option value="1" label="待发货"></el-option>
+                                <el-option value="2" label="已发货"></el-option>
+                                <el-option value="3" label="已签收"></el-option>
+                                <template #prefix>发货状态</template>
                             </el-select>
                         </el-col>
                         <el-col :xs="12" :sm="6" :md="6" :lg="6" :xl="4">

src/views/merchant/order/index/components/table.vue

@@ -76,6 +76,22 @@
                 </div>
             </template>
         </el-table-column>
+        <el-table-column label="发货状态" prop="types" width="160" align="left">
+            <template #default="scope">
+                <div v-if="scope.row.status == 2">
+                    <div class="order-name" v-if="scope.row.express_status == 1">
+                        <span>待发货</span>
+                    </div>
+                    <div class="order-name" v-if="scope.row.express_status == 2">
+                        <span>已发货</span>
+                    </div>
+                    <div class="order-name" v-if="scope.row.express_status == 3">
+                        <span>已签收</span>
+                    </div>
+                </div>
+                <div v-else>待订单完成</div>
+            </template>
+        </el-table-column>
         <el-table-column label="下单时间" prop="create_at" width="160"></el-table-column>
         <el-table-column label="支付时间" prop="pay_at" width="160">
             <template #default="scope">

src/views/service/order/index/components/search.vue

@@ -25,7 +25,15 @@
                                 <el-option value="4" label="已退款"></el-option>
                                 <el-option value="5" label="退款中"></el-option>
                                 <el-option value="6" label="已关闭"></el-option>
-                                <template #prefix>状态</template>
+                                <template #prefix>订单状态</template>
+                            </el-select>
+                        </el-col>
+                        <el-col :xs="12" :sm="12" :md="12" :lg="6" :xl="4">
+                            <el-select v-model="searchKey.express_status" clearable placeholder="请选择" @change="searchForm" :style="{width: '100%'}" class="diy-select">
+                                <el-option value="1" label="待发货"></el-option>
+                                <el-option value="2" label="已发货"></el-option>
+                                <el-option value="3" label="已签收"></el-option>
+                                <template #prefix>发货状态</template>
                             </el-select>
                         </el-col>
                         <el-col :xs="12" :sm="6" :md="6" :lg="6" :xl="4">

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

@@ -103,6 +103,22 @@
                 </div>
             </template>
         </el-table-column>
+        <el-table-column label="发货状态" prop="types" width="160" align="left">
+            <template #default="scope">
+                <div v-if="scope.row.status == 2">
+                    <div class="order-name" v-if="scope.row.express_status == 1">
+                        <span>待发货</span>
+                    </div>
+                    <div class="order-name" v-if="scope.row.express_status == 2">
+                        <span>已发货</span>
+                    </div>
+                    <div class="order-name" v-if="scope.row.express_status == 3">
+                        <span>已签收</span>
+                    </div>
+                </div>
+                <div v-else>待订单完成</div>
+            </template>
+        </el-table-column>
         <el-table-column label="下单时间" prop="create_at" width="160"></el-table-column>
         <el-table-column label="支付时间" prop="pay_at" width="160">
             <template #default="scope">