Zory 1 settimana fa
parent
commit
8fb2645cb5

+ 3 - 1
src/components/chat/index.vue

@@ -218,7 +218,9 @@ export default {
 	.item-name {
 	.item-name {
 		position: relative;
 		position: relative;
 		top: 0px;
 		top: 0px;
-		display: none;
+		right: 0;
+		text-align: right;
+		// display: none;
 	}
 	}
 }
 }
 .flex_r {
 .flex_r {

+ 5 - 2
src/components/imFloat/imFloat.vue

@@ -185,10 +185,11 @@
                                             <div class="order-img"><el-image style="width: 60px;height: 60px;" :src="item.img" fit="fit"></el-image></div>
                                             <div class="order-img"><el-image style="width: 60px;height: 60px;" :src="item.img" fit="fit"></el-image></div>
                                             <div class="order-info">
                                             <div class="order-info">
                                                 <div class="title">{{item.product.product_name}}</div>
                                                 <div class="title">{{item.product.product_name}}</div>
-                                                <div class="title">{{item.order_sn}}</div>
+                                                <div class="desc">{{item.order_sn}}</div>
                                                 <div class="price">{{this.$TOOL.money(item.price)}}</div>
                                                 <div class="price">{{this.$TOOL.money(item.price)}}</div>
                                             </div>
                                             </div>
                                             <div class="order-status-btn">
                                             <div class="order-status-btn">
+                                                <div class="status primary cus" @click="sendOrder(item)">收集地址</div>
                                                 <div class="status info cus" @click="sendOrder(item)">发送</div>
                                                 <div class="status info cus" @click="sendOrder(item)">发送</div>
                                                 <div class="status info" v-if="item.status=='0'">未支付</div>
                                                 <div class="status info" v-if="item.status=='0'">未支付</div>
                                                 <div class="status primary" v-if="item.status=='1'">待使用</div>
                                                 <div class="status primary" v-if="item.status=='1'">待使用</div>
@@ -539,7 +540,8 @@ export default {
 			const message = {
 			const message = {
 				groupId: item.poi_id,
 				groupId: item.poi_id,
 				senderData: {
 				senderData: {
-					avatar:item.avatar
+					avatar:item.avatar,
+					name:item.source==2?item.nick.truename:item.user.nickname
 				},
 				},
 				senderId: (item.source==1?item.openid:item.service_id),
 				senderId: (item.source==1?item.openid:item.service_id),
 				messageId: item.msgId,
 				messageId: item.msgId,
@@ -716,6 +718,7 @@ export default {
 .m-order-s .order-img image{width: 60px;height: 60px;}
 .m-order-s .order-img image{width: 60px;height: 60px;}
 .m-order-s .order-info {padding: 10px;}
 .m-order-s .order-info {padding: 10px;}
 .m-order-s .order-info .title{font-size: 14px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .m-order-s .order-info .title{font-size: 14px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.m-order-s .order-info .desc{font-size: 12px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;color: #999;}
 .m-order-s .order-info .price{font-size: 14px;color: #f00;}
 .m-order-s .order-info .price{font-size: 14px;color: #f00;}
 .m-order-s .order-status-btn{position: absolute;right: 0;bottom: 0;display: flex;align-items: center;gap: 5px;}
 .m-order-s .order-status-btn{position: absolute;right: 0;bottom: 0;display: flex;align-items: center;gap: 5px;}
 .m-order-s .status{border-radius: 5px 0 5px 0;background-color: #909399;font-size: 12px;color: #fff;padding: 5px;}
 .m-order-s .status{border-radius: 5px 0 5px 0;background-color: #909399;font-size: 12px;color: #fff;padding: 5px;}

+ 25 - 1
src/views/service/dashboard/index.vue

@@ -1,3 +1,27 @@
 <template>
 <template>
+    <div v-if="pageLoading">
+        <el-main>
+            <el-card shadow="never">
+                <el-skeleton :rows="5"></el-skeleton>
+            </el-card>
+            <el-card shadow="never" style="margin-top: 15px;">
+                <el-skeleton></el-skeleton>
+            </el-card>
+        </el-main>
+    </div>
+    <el-main v-else>
+        <el-card shadow="never" header="实时概况">
 
 
-</template>
+        </el-card>
+    </el-main>
+</template>
+
+<script>
+export default {
+    data(){
+        return {
+            pageLoading:false
+        }
+    }
+}
+</script>