0807-0114-h01

src/components/chat/m-image.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="flex_r m-image" :style="{ height: getImageHeight(value.payload) + 'px' }">
 		<!-- <image class="img" :src="value.payload.thumbnail || value.payload.url" mode="widthFix"></image> -->
-		<el-image class="img" :src="value.payload.url" fit="fit" @load="imgLoad"></el-image>
+		<el-image class="img" :src="value.payload.url" fit="fit" @load="imgLoad" :preview-src-list="[value.payload.url]" :preview-teleported="true"></el-image>
 		<!-- {{value.payload.thumbnail}} -->
 	</div>
 </template>

src/components/imFloat/express.vue

@@ -4,6 +4,7 @@
             <el-descriptions :column="1" border direction="vertical">
                 <el-descriptions-item label="快递单号">
                     {{ formData.express_sn }}
+                    <template v-if="formData.express_name">【{{formData.express_name}}】</template>
                     <a class="green" :href="'https://www.baidu.com/s?wd='+formData.express_sn" target="_blank">查看实时信息</a>
                 </el-descriptions-item>
             </el-descriptions>

src/components/imFloat/imFloat.vue

@@ -235,8 +235,10 @@
                                         </div>
                                     </div>
                                     <div class="order-info-user" v-if="msgOrder">
-                                        <div class="title">咨询订单</div>
-                                        <div class="m-order-s" style="margin-top: 15px;">
+                                        <div class="title flex-title">咨询订单
+                                            <el-button @click="getMsgOrder" icon="el-icon-refresh" circle />
+                                        </div>
+                                        <div class="m-order-s" style="margin-top: 15px;" v-loading="msgOrderLoad">
                                             <div class="m-order-item" @click="viewOrder(msgOrder)">
                                                 <div class="order-img"><el-image style="width: 80px;height: 80px;" :src="msgOrder.img" fit="fit"></el-image></div>
                                                 <div class="order-info">
@@ -443,6 +445,7 @@ export default {
                 total:0
             },
             msgOrder:null, // 咨询订单
+            msgOrderLoad:false,
             orderData:{
                 page:1,
                 size:10,
@@ -763,7 +766,9 @@ export default {
             this.getOrderList();
         },
         async getMsgOrder(){
+            this.msgOrderLoad = true;
             var resp = await this.$API.chat.msgOrder.get({"msgId":this.chatItem.id})
+            this.msgOrderLoad = false;
             if (resp.code == 0) return ;
             this.msgOrder = resp.data.order;
         },
@@ -1333,4 +1338,5 @@ export default {
     border-top: 1px solid #eee;
   }
 }
+.flex-title{display: flex;align-items: center;justify-content: space-between;}
 </style>

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

@@ -25,8 +25,7 @@
                 </el-tooltip>
             </template>
             <template #default="scope">
-                <span v-if="scope.row.done_money">{{ scope.row.done_money }}</span>
-                <span v-else>-</span>
+                {{ scope.row.done_money?$TOOL.money(scope.row.done_money):'-' }}
             </template>
         </el-table-column>
         <el-table-column label="成交金额(元)" prop="category_id">
@@ -37,20 +36,7 @@
                 </el-tooltip>
             </template>
             <template #default="scope">
-                <span v-if="scope.row.order_money">{{ scope.row.order_money }}</span>
-                <span v-else>-</span>
-            </template>
-        </el-table-column>
-        <el-table-column label="达人佣金(元)" prop="star_money">
-            <template #default="scope">
-                <span v-if="scope.row.star_money">{{ scope.row.star_money }}</span>
-                <span v-else>-</span>
-            </template>
-        </el-table-column>
-        <el-table-column label="订单量" prop="category_id">
-            <template #default="scope">
-                <span v-if="scope.row.order_num">{{ scope.row.order_num }}</span>
-                <span v-else>-</span>
+                {{ scope.row.order_money?$TOOL.money(scope.row.order_money):'-' }}
             </template>
         </el-table-column>
         <el-table-column label="状态" prop="enable" width="120" align="center">

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

@@ -151,7 +151,7 @@
             <template #default="scope">
                 <el-button-group>
                     <el-button size="small" text @click="table_view(scope.row)">详情</el-button>
-                    <el-button type="danger" size="small" text @click="table_error(scope.row)" v-if="trade==2 && scope.row.status==2 && scope.row.is_error==0 && scope.row.exspress_status==2">标记异常</el-button>
+                    <el-button type="danger" size="small" text @click="table_error(scope.row)" v-if="trade==2 && scope.row.status==2 && scope.row.is_error==0 && scope.row.express_status==2">标记异常</el-button>
                 </el-button-group>
                 <template v-if="scope.row.is_error==0">
                     <el-button-group>