'0824-c01'

src/api/model/merOrder.js

@@ -65,4 +65,11 @@ export default {
             return await http.post(this.url, params);
         },
     },
+    doneMini: {
+        url: `${config.API_URL}/merchant/order/doneMini`,
+        name: "-",
+        post: async function (params) {
+            return await http.post(this.url, params);
+        },
+    },
 }

src/components/imFloat/order.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="visible" title="在线客服" size="500px" destroy-on-close :with-header="false">
+    <el-drawer v-model="visible" size="500px" destroy-on-close :with-header="false">
         <el-container class="flex-column">
             <div class="drawer-detail-main">
                 <div class="drawer-detail-header">
@@ -38,12 +38,14 @@
                         <div class="status-desc" v-if="orderData.status == 5">订单已取消或已关闭</div>
                         <div class="status-desc" v-if="orderData.status == 6">部分退款中</div>
                         <div class="status-desc" v-if="orderData.status == 7">货物运输中</div>
+                        <div class="status-desc" v-if="orderData.status == 8">退款审核中</div>
                         
                     </div>
                     <div class="order-goods">
                         <div class="goods-img"><img :src="orderData.img" /></div>
                         <div class="goods-info">
-                            <div class="name">{{ orderData.product.product_name }}</div>
+                            <div class="name" v-if="orderData.product.is_new == 1">{{orderData.product.price}}元代{{orderData.product.line_price}}元商场权益券{{ orderData.product.product_name }}</div>
+                            <div class="name" v-else>{{ orderData.product.product_name }}</div>
                             <div class="desc">
                                 <div class="time" v-if="orderData.end_at">有效期至：{{ orderData.end_at }} </div>
                                 <div class="num">x {{ orderData.number }}</div>

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

@@ -41,8 +41,11 @@
                         fit="cover"></el-image>
                     </div>
                     <div class="name">
-                        <span>{{ scope.row.product?scope.row.product.product_name:'-' }}</span>
-                        <span class="dec">商品编码：{{ scope.row.product?scope.row.product.product_id:'-' }}</span>
+                        <template v-if="scope.row.product">
+                            <span v-if="scope.row.product.is_new == 1">{{scope.row.product.price}}元代{{scope.row.product.line_price}}元商场权益券{{ scope.row.product.product_name }}</span>
+                            <span v-else>{{ scope.row.product?scope.row.product.product_name:'-' }}</span>
+                            <span class="dec">商品编码：{{ scope.row.product?scope.row.product.product_id:'-' }}</span>
+                        </template>
                     </div>
                 </div>
             </template>

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

@@ -95,6 +95,12 @@
                         <div class="el-form-item-msg"></div>
                     </el-form-item>
                 </el-col>
+                <el-col :span="24">
+                    <el-form-item label="营业执照" prop="license">
+                        <sc-upload v-model="formData.license" title="营业执照"></sc-upload>
+                        <div class="el-form-item-msg">小程序前端展示</div>
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
 		<template #footer>
@@ -121,6 +127,9 @@ export default {
             formData:{},
             cateData:[],
             rules:{
+                license: [
+                    {required: true, message: '请上传'}
+                ],
                 poi_logo: [
                     {required: true, message: '请上传'}
                 ],

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

@@ -30,8 +30,11 @@
                         fit="cover"></el-image>
                     </div>
                     <div class="name">
-                        <span>{{ scope.row.product.product_name }}</span>
-                        <span class="dec">商品编码：{{ scope.row.product.product_id }}</span>
+                        <template v-if="scope.row.product">
+                            <span v-if="scope.row.product.is_new == 1">{{scope.row.product.price}}元代{{scope.row.product.line_price}}元商场权益券{{ scope.row.product.product_name }}</span>
+                            <span v-else>{{ scope.row.product?scope.row.product.product_name:'-' }}</span>
+                            <span class="dec">商品编码：{{ scope.row.product?scope.row.product.product_id:'-' }}</span>
+                        </template>
                     </div>
                 </div>
             </template>

src/views/service/chat/components/chatBody.vue

@@ -195,8 +195,8 @@ export default {
             uploadImg:"",
 			pushData: {
 				obj:null,
-				auth:"http://127.0.0.1:9881/plugin/webman/push/auth",
-				url: 'ws://127.0.0.1:3131',
+				auth:"https://tran.jsshuita.cn/plugin/webman/push/auth",
+				url: 'wss://tran.jsshuita.cn/ws',
 			},
             isLineState:0
         }

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

@@ -30,9 +30,11 @@
                         fit="cover"></el-image>
                     </div>
                     <div class="name">
-                        <span v-if="scope.row.product.is_new == 1">{{ scope.row.product?scope.row.product.product_name:'-' }}</span>
-                        <span v-else>{{ scope.row.product?scope.row.product.product_name:'-' }}</span>
-                        <span class="dec">商品编码：{{ scope.row.product?scope.row.product.product_id:'-' }}</span>
+                        <template v-if="scope.row.product">
+                            <span v-if="scope.row.product.is_new == 1">{{scope.row.product.price}}元代{{scope.row.product.line_price}}元商场权益券{{ scope.row.product.product_name }}</span>
+                            <span v-else>{{ scope.row.product?scope.row.product.product_name:'-' }}</span>
+                            <span class="dec">商品编码：{{ scope.row.product?scope.row.product.product_id:'-' }}</span>
+                        </template>
                     </div>
                 </div>
             </template>
@@ -161,6 +163,7 @@
                 <el-button-group>
                     <el-button size="small" text @click="table_view(scope.row)">详情</el-button>
                     <el-button type="danger" size="small" text @click="table_refund(scope.row)" v-if="scope.row.status==1">退款</el-button>
+                    <el-button type="danger" size="small" text @click="table_done(scope.row)" v-if="scope.row.status==7 && scope.row.is_new==1">核销</el-button>
                 </el-button-group>
                 <el-button-group>
                     <el-button type="danger" size="small" text @click="table_black(scope.row)">拉黑</el-button>
@@ -241,6 +244,20 @@ export default {
         },
         table_del(data){
             
+        },
+        table_done(data){
+            this.$confirm(`核销后，订单不再支持退款，确定要执行吗`, '提示', {
+                type: 'warning'
+            }).then(async () => {
+                var resp = await this.$API.merOrder.doneMini.post({"order":data.out_order_no});
+                if (resp.code == 0) {
+                    return this.$message.error(resp.msg);
+                }
+                this.$message.success(resp.msg);
+                this.$refs.table.refresh()
+            }).catch(() => {
+
+            })
         },
         table_cancel(data){
             this.$confirm(`取消该笔订单的核销，并非是直接退款，订单状态将恢复到【待使用】状态`, '提示', {