Zory пре 6 дана
родитељ
комит
43d3ac389e
4 измењених фајлова са 944 додато и 172 уклоњено
  1. 2 2
      .env.production
  2. 904 117
      src/components/imFloat/im.vue
  3. 31 53
      src/components/imFloat/imFloat.vue
  4. 7 0
      src/components/imFloat/quickTxt.vue

+ 2 - 2
.env.production

@@ -2,7 +2,7 @@
 NODE_ENV = production
 
 # 标题
-VUE_APP_TITLE = 印美打印
+VUE_APP_TITLE = 交易小程序
 
 # 接口地址
-VUE_APP_API_BASEURL = https://hx-mini-api.jsshuita.com.cn/api
+VUE_APP_API_BASEURL = /api

Разлика између датотеке није приказан због своје велике величине
+ 904 - 117
src/components/imFloat/im.vue


+ 31 - 53
src/components/imFloat/imFloat.vue

@@ -106,12 +106,17 @@
                                             </el-popover>
                                         </div>
                                         <div class="emoji-item" @click="showQuick">
-                                            <div class="item-btn">
-                                                <el-image style="width:25px;height:25px;" src="https://jymini.oss-cn-guangzhou.aliyuncs.com/pc/quick.svg"></el-image>
-                                                <div class="name">快捷回复</div>
-                                            </div>
+                                            <el-popover placement="top" :width="400" trigger="click">
+                                                <template #reference>
+                                                    <div class="item-btn">
+                                                        <el-image style="width:25px;height:25px;" src="https://jymini.oss-cn-guangzhou.aliyuncs.com/pc/quick.svg"></el-image>
+                                                        <div class="name">快捷回复</div>
+                                                    </div>
+                                                </template>
+
+                                            </el-popover>
                                         </div>
-                                        <div class="emoji-item">
+                                        <!-- <div class="emoji-item">
                                             <el-popover placement="top" :width="300" trigger="click">
                                                 <template #reference>
                                                     <div class="item-btn">
@@ -135,7 +140,7 @@
                                                     </el-form-item>
                                                 </el-form>
                                             </el-popover>
-                                        </div>
+                                        </div> -->
                                     </div>
                                     <el-input
                                         type="textarea"
@@ -161,52 +166,18 @@
                     </el-container>
                     <el-aside width="400px" v-if="chatItem">
                         <el-container>
-                            <el-header>
-                                <div class="msg-title">用户信息</div>
-                            </el-header>
-                            <el-main class="nopadding">
-                                <el-card shadow="never" class="border-none">
-                                    <el-descriptions :column="1" border>
-                                        <el-descriptions-item label="昵称">{{ chatItem.user.nickname }}</el-descriptions-item>
-                                        <el-descriptions-item label="OpenId">
-                                            <el-tooltip effect="dark" placement="top-start" :content="chatItem.user.openid">
-                                                查看
-                                            </el-tooltip>
-                                        </el-descriptions-item>
-                                        <el-descriptions-item label="手机号码">{{chatItem.user.mobile}}</el-descriptions-item>
-                                        <el-descriptions-item label="注册时间">{{chatItem.user.create_at}}</el-descriptions-item>
-                                    </el-descriptions>
-                                </el-card>
-                                <el-card shadow="never" class="border-none" v-loading="orderLoad">
-                                    <template #header>
-                                        <div class="msg-title">订单列表</div>
-                                    </template>
-                                    <div class="order-list-chat" v-if="orderList.length > 0">
-                                        <div class="m-order-s" v-for="(item,index) in orderList" :key="index">
-                                            <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="title">{{item.product.product_name}}</div>
-                                                <div class="desc">{{item.order_sn}}</div>
-                                                <div class="price">{{this.$TOOL.money(item.price)}}</div>
-                                            </div>
-                                            <div class="order-status-btn">
-                                                <div class="status primary cus" @click="sendAddress(item)">收集地址</div>
-                                                <div class="status info cus" @click="sendOrder(item)">发送</div>
-                                                <div class="status info" v-if="item.status=='0'">未支付</div>
-                                                <div class="status primary" v-if="item.status=='1'">待使用</div>
-                                                <div class="status success" v-if="item.status=='2'">已完成</div>
-                                                <div class="status danger" v-if="item.status=='3'">已退款</div>
-                                                <div class="status warn" v-if="item.status=='4'">退款中</div>
-                                            </div>
-                                        </div>
-                                        <div class="order-page">
-                                            <el-pagination :default-page-size="orderSize" small layout="prev, pager, next" @size-change="orderPageChange" @current-change="orderPageChange" :total="orderTotal" :hide-on-single-page="true" />
-                                        </div>
-                                    </div>
-                                    <div class="order-list-chat" v-else>
-                                        <el-empty description="没有订单" />
-                                    </div>
-                                </el-card>
+                            <el-main>
+                                <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
+                                    <el-tab-pane label="用户信息" name="user">
+                                        
+                                    </el-tab-pane>
+                                    <el-tab-pane label="团购订单" name="order">
+                                        
+                                    </el-tab-pane>
+                                    <el-tab-pane label="差价订单" name="price">
+                                        
+                                    </el-tab-pane>
+                                </el-tabs>
                             </el-main>
                         </el-container>
                     </el-aside>
@@ -244,6 +215,7 @@ export default {
     },
     data() {
         return {
+            activeName:"user",
             rules:{
                 name: [
                     {required: true, message: '请输入'}
@@ -273,7 +245,9 @@ export default {
             inputMessage: '',        // 输入的消息
             timer: null,             // 定时器
             messages: [],
-            wsAuth:"http://127.0.0.1:9881/plugin/webman/push/auth",
+            // wsAuth:"https://tran.jsshuita.cn/plugin/webman/push/auth",
+            // wsUrl: 'wss://tran.jsshuita.cn/ws',
+            wsAuth:"http://127.0.0.1:9981/plugin/webman/push/auth",
             wsUrl: 'ws://127.0.0.1:3131',
             page:1,
             size:10,
@@ -332,6 +306,10 @@ export default {
         this.$refs.messageListRef.removeEventListener('scroll', this.handleScroll)
     },
     methods: {
+        handleClick(event){
+            this.activeName = event;
+            // this.getConfig();
+        },
         orderSuccess(type,data){
             console.log(data)
             switch(type) {

+ 7 - 0
src/components/imFloat/quickTxt.vue

@@ -0,0 +1,7 @@
+<template>
+
+</template>
+
+<script>
+
+</script>

Неке датотеке нису приказане због велике количине промена