Merge branch 'master' into Bulbasaur

buyer/src/components/mixes/talkIm.vue

@@ -0,0 +1,44 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+import { getIMDetail } from "@/api/common";
+import Storage from "@/plugins/storage";
+import { getMemberMsg } from "@/api/login";
+export default {
+  data() {
+    return {
+      Storage,
+      IMLink: "",
+    };
+  },
+  methods: {
+    // 跳转im客服
+    async IMService(id) {
+
+      // 获取访问Token
+      let accessToken = Storage.getItem("accessToken");
+      await this.getIMDetailMethods();
+      const userInfo = await getMemberMsg();
+      if (userInfo.success) {
+        window.open(
+          this.IMLink + "?token=" + accessToken + "&id=" + id || this.storeMsg.storeId
+        );
+      } else {
+        this.$Message.error("请登录后再联系客服");
+        return;
+      }
+    },
+    // 获取im信息
+    async getIMDetailMethods() {
+      let res = await getIMDetail();
+      if (res.success) {
+        this.IMLink = res.result;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

buyer/src/pages/GoodsDetail.vue

@@ -22,7 +22,7 @@
             <Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />
             {{ storeCollected? "已收藏店铺": "收藏店铺" }}
           </span>
-          <span class="ml_10" @click="IMService()">联系客服</span>
+          <span class="ml_10" @click="IMService(goodsMsg.data.storeId)">联系客服</span>
         </div>
       </div>
     </div>
@@ -50,8 +50,7 @@ import {
   getGoodsDistribution,
 } from "@/api/member";
 import { getDetailById } from "@/api/shopentry";
-import { getIMDetail } from "@/api/common";
+import imTalk from '@/components/mixes/talkIm'
-import Storage from "../plugins/storage";
 export default {
   name: "GoodsDetail",
   beforeRouteEnter (to, from, next) {
@@ -61,6 +60,7 @@ export default {
   created () {
     this.getGoodsDetail();
   },
+  mixins: [imTalk],
   data () {
     return {
       goodsMsg: {}, // 商品信息
@@ -68,49 +68,11 @@ export default {
       categoryBar: [], // 分类
       storeCollected: false, // 商品收藏
       storeMsg: {}, // 店铺信息
-      IMLink: "",
+
     };
   },
   methods: {
-    // 跳转im客服
+
-    async IMService () {
-      // 获取访问Token
-      let accessToken = Storage.getItem("accessToken");
-      await this.getIMDetailMethods();
-      if (!accessToken) {
-        this.$Message.error("请登录后再联系客服");
-        return;
-      }
-      window.open(
-        this.IMLink +
-        "?token=" +
-        accessToken +
-        "&id=" +
-        this.goodsMsg.data.storeId +
-        "&goodsId=" +
-        this.goodsMsg.data.goodsId +
-        "&skuId=" +
-        this.goodsMsg.data.id
-      );
-      // window.open(
-      //   'http://192.168.0.139:8000/' +
-      //   "?token=" +
-      //   accessToken +
-      //   "&id=" +
-      //   this.goodsMsg.data.storeId +
-      //   "&goodsId=" +
-      //   this.goodsMsg.data.goodsId +
-      //   "&skuId=" +
-      //   this.goodsMsg.data.id
-      // );
-    },
-    // 获取im信息
-    async getIMDetailMethods () {
-      let res = await getIMDetail();
-      if (res.success) {
-        this.IMLink = res.result;
-      }
-    },
     // 点击规格
     targetClickSku (val) {
       this.getGoodsDetail(val);
@@ -165,11 +127,13 @@ export default {
                 }
               });
             }
+
             if (!this.storeMsg) {
               // 获取店铺信息
               getDetailById(this.goodsMsg.data.storeId).then((res) => {
                 if (res.success) {
                   this.storeMsg = res.result;
+
                 }
               });
             }

buyer/src/pages/Merchant.vue

@@ -14,7 +14,7 @@
                                                            :color="storeCollected ? '#ed3f14' : '#fff'"/>{{
             storeCollected ? '已收藏店铺' : '收藏店铺'
           }}</span>
-        <span style="width:80px" class="hover-pointer ml_10" @click="IMService()"><Icon
+        <span style="width:80px" class="hover-pointer ml_10" @click="IMService(storeMsg.storeId)"><Icon
           custom="icomoon icon-customer-service"/>联系客服</span>
       </div>
     </div>
@@ -106,8 +106,7 @@
 </template>
 
 <script>
-import {getIMDetail} from "@/api/common";
+
-import Storage from "../plugins/storage";
 import {getDetailById, getCateById} from "@/api/shopentry";
 import {cancelCollect, collectGoods, isCollection} from "@/api/member";
 import {goodsList} from "@/api/goods";
@@ -117,6 +116,7 @@ import HoverSearch from "@/components/header/hoverSearch";
 import storage from "@/plugins/storage";
 import {getFloorStoreData} from "@/api/index.js";
 import {seckillByDay} from "@/api/promotion";
+import imTalk from '@/components/mixes/talkIm'
 
 export default {
   name: "Merchant",
@@ -125,6 +125,7 @@ export default {
     ModelForm,
     HoverSearch,
   },
+  mixins: [imTalk],
   data() {
     return {
       // 店铺装修的内容
@@ -140,7 +141,6 @@ export default {
       cateList: [], // 店铺分裂
       goodsList: [], // 商品列表
       total: 0, // 商品数量
-      IMLink: "",
       params: {
         // 请求参数
         pageNumber: 1,
@@ -187,30 +187,8 @@ export default {
         }
       );
     },
-    // 跳转im客服
+
-    async IMService() {
+
-      // 获取访问Token
-      let accessToken = Storage.getItem("accessToken");
-      await this.getIMDetailMethods();
-      if (!accessToken) {
-        this.$Message.error("请登录后再联系客服");
-        return;
-      }
-      window.open(
-        this.IMLink +
-        "?token=" +
-        accessToken +
-        "&id=" +
-        this.storeMsg.storeId
-      );
-    },
-    // 获取im信息
-    async getIMDetailMethods() {
-      let res = await getIMDetail();
-      if (res.success) {
-        this.IMLink = res.result;
-      }
-    },
     // getStoreMsg () { // 店铺信息
     //   getDetailById(this.$route.query.id).then(res => {
     //     if (res.success) {
@@ -242,6 +220,7 @@ export default {
         if (res.success) {
 
           this.storeMsg = res.result;
+          console.log(this.storeMsg)
 
           //判定如果开启楼层展示，则获取页面信息 否则读取商品信息
           if (this.storeMsg.pageShow && this.storeMsg.pageShow === '1') {

buyer/src/pages/home/memberCenter/Distribution.vue

@@ -527,7 +527,7 @@ export default {
   top: -200px;
   left: 200px;
 }
-/depp/ .ivu-alert-message {
+/deep/ .ivu-alert-message {
   p {
     margin: 4px 0;
   }

im/src/components/chat/panel/TalkPanel.vue

@@ -58,6 +58,8 @@
                     {{ item.float == "right" ? name : toUser.name }} |
                     {{ unixToDate(item.createTime, "MM月dd日 hh:mm") }}
                   </span>
+                  <div class="flex flex-a-c">
+                    <i @click="againSendMessage(item)" v-if="item.webSocketStatus" class="el-icon-refresh-left again main-color"></i>
                     <!-- 文本消息 -->
                     <div v-if="item.messageType == 'MESSAGE'" style="background-color: #d0e9ff;color: black;"
                       class="text-message" :class="{
@@ -69,6 +71,9 @@
                       <pre v-if="emojistwo.includes(item.text)" v-html="textReplaceEmoji(item.text)" />
                     </div>
                    
+                  </div>
+                   <div v-if="item.webSocketStatus" class="tips">网络异常发送失败，请重新发送。</div>
+
                   <div v-if="item.messageType == 'GOODS' && item.text != null" class="goodsStyle " :class="{
                     left: item.float == 'left',
                     right: item.float == 'right',
@@ -93,17 +98,24 @@
                     left: item.float == 'left',
                     right: item.float == 'right',
                   }" @click="linkToOrders(item.text.sn)">
+                  
                     <div class="oedersn">
                       <el-tooltip class="item" effect="dark" :content="item.text.sn" placement="top-start">
                         <a> 订单号:{{ item.text.sn }} </a>
                       </el-tooltip>
                     </div>
                     <div class="goods-shared-box">
+                     
+                      <div class="goods-item" v-for="(order,orderIndex) in item.text.orderItems" :key="orderIndex">
+                        <img :src="order.image" style="height: 100px;width: 100px;" />
                         <div>
-                        <img :src="item.text.groupImages" style="height: 100px;width: 100px;" />
+                          <span class="orderGoodsName">{{ order.name }}</span>
+                          <div class="goods-item-price">
+                           <span>{{ order.goodsPrice | unitPrice('￥') }}</span>
+                          </div> 
+                        </div>
                       </div>
                       <div class="shared-goods">
-                      <span class="orderGoodsName">{{ item.text.groupName }}</span>
                       <div class="orderGoodsTime">{{ item.text.paymentTime }}</div>
                       <span class="orderFlowPrice">
                         订单金额：<span>{{ item.text.flowPrice | unitPrice('￥') }}</span>
@@ -395,6 +407,12 @@ export default {
     },
     // #冗余代码结束
 
+    // 重新发送消息
+    againSendMessage(val){
+     
+      this.submitSendMessage(val.text)
+    },
+
     // 回车键发送消息回调事件
     submitSendMessage (content) {
       const record = {
@@ -848,7 +866,21 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-
+.flex-a-c{
+  align-items: center;
+  >div{
+    margin-left: 10px;
+  }
+}
+.tips{
+  margin-top:10px;
+  color: #999;
+  font-size: 12px;
+}
+.again{
+  margin-top: 5px;
+  cursor: pointer;
+}
 
 .oderStyle {
   border: 1px solid #f2f2f2;
@@ -933,6 +965,11 @@ export default {
     font-size: 18px;
   }
 }
+.goods-item-price{
+  margin-top: 10px;
+  font-size: 13px;
+   color: red;
+}
 
 .main-box {
   position: relative;
@@ -1247,7 +1284,14 @@ export default {
   }
 }
 .goods-shared-box{
+   cursor: pointer;
+  >.goods-item{
+   
+    margin: 10px 0;
     display: flex;
+    border-bottom: 1px solid #ededed;
+    align-items: center;
+  }
   >.shared-goods{
     padding-left: 10px;
     display: flex;

im/src/components/chat/panel/template/footPrint.vue

@@ -3,7 +3,7 @@
     <div class="tab">
       <el-tabs v-model="activeName" @tab-click="handleClick" :stretch=true>
         <el-tab-pane label="最近浏览" name="goods">
-          <dl>
+          <dl v-if='list.length' class='base-list'>
             <dd :key="index"  @click="linkToGoods(item.goodsId, item.id)" v-for="(item,index) in list" v-infinite-scroll="loadMore">
               <div class="base">
                 <div>
@@ -27,32 +27,38 @@
             </dd>
 
           </dl>
+          <div v-else class='no-more'>
+              {{noMoreList.goods.title}}
+          </div>
         </el-tab-pane>
         <el-tab-pane label="订单列表" name="orders">
-          <dl>
+          <dl class='base-order-list' v-if='orderList.length'>
             <dd  v-for="(item, index) in orderList" v-infinite-scroll="loadMore" :key="index">
               <div class="order-list">
                 <div class="order-top order-padding">
                   <span class="order-sn" @click="linkToOrders(item.sn)">订单号:{{ item.sn }}</span>
                 </div>
                 <div class="order-section order-padding">
-                  <img :src="item.groupImages" alt="">
+                  <div class="order-items" v-for="(order,orderIndex) in item.orderItems" :key="orderIndex">
-                  <span class="order-goods-name" @click="linkToOrders(item.sn)"> {{ item.groupName }}</span>
+                      <img :src="order.image" alt="">
+                      <span class="order-goods-name" @click="linkToOrders(item.sn)"> {{ order.name }}</span>
+                      <span class="price">{{order.goodsPrice | unitPrice("￥")}}</span>
+                  </div>
+                  <!-- <img  :src="item.groupImages" alt=""> -->
+                 
                   <div class="order-btn ">
                     <el-button class="store-button" v-if="item.btnHide == 1 && toUser.storeFlag"
                       size="mini" @click="submitSendOrderMessage(item, index)" plain>发送</el-button>
                   </div>
                 </div>
                 <div class="order-footer order-padding">
-                  <span> 订单金额： <span style="color: red;">{{
+                  <span></span>
-                    item.orderItems[0].goodsPrice | unitPrice("￥")
-                  }}</span></span>
                   <el-tag  size='mini' :type="col[item.orderStatus]">{{
                     item.orderStatus == 'STAY_PICKED_UP' ? '待自提'
                       : item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus
                         ==
                         'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
-                          ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待校验' :
+                          ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待核销' :
                             ''
                   }}</el-tag>
                 </div>
@@ -61,6 +67,9 @@
             
             </dd>
           </dl>
+          <div v-else class='no-more'>
+              {{noMoreList.orders.title}}
+          </div>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -78,12 +87,16 @@ export default {
   },
   data () {
     return {
+      noMoreList:{
+        'goods':{title:'暂无最近浏览',value:false},
+        'orders':{title:'暂无订单信息',value:false},
+      },
       activeName: 'goods',
       btnHide: undefined,
       hide: true,
       col: {
-        CANCELLED: 'error',
+        CANCELLED: 'danger',
-        PAID: 'error',
+        PAID: 'danger',
         TAKE: '',
         COMPLETED: 'success',
         DELIVERED: 'danger',
@@ -142,12 +155,14 @@ export default {
     // 发送订单列表
     submitSendOrderMessage (item, index) {
       console.log(item, 'item');
+    
       const context = {
         sn: item.sn,
         groupImages: item.groupImages,
         paymentTime: item.paymentTime,
         groupName: item.groupName,
         flowPrice: item.flowPrice,
+        orderItems:item.orderItems,
         orderStatus: item.orderStatus
       }
       const record = {
@@ -163,7 +178,7 @@ export default {
       item.btnHide = 0
     },
     handleClick (tab, event) {
-      console.log(tab, event);
+      
     }
   },
   props: {
@@ -178,7 +193,7 @@ export default {
   },
   mounted () {
     //  state.user.toUser
-    console.log(this.orderList, '  this.$store.state.user.toUser  this.$store.state.user.toUser  this.$store.state.user.toUser');
+    // console.log(this.orderList, '  this.$store.state.user.toUser  this.$store.state.user.toUser  this.$store.state.user.toUser');
     this.btnHide = localStorage.getItem('btnHide')
   }
 }
@@ -193,7 +208,12 @@ export default {
   white-space: nowrap;
   width: 200px;
 }
-
+.no-more{
+  font-size: 12px;
+  color: #999;
+  text-align: center;
+  margin-top: 20px;
+}
 
 .box {
   max-width: 362px;
@@ -374,4 +394,18 @@ export default {
 //   height: calc(100vh - 110px);
 //   overflow-y: auto;
 // }
+.base-list{
+  padding-bottom: 120px;
+}
+.base-order-list{
+  padding-bottom: 100px;
+}
+.price{
+  color: red;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.order-items{
+  margin-bottom: 10px;
+}
 </style>

im/src/components/editor/MeEditor.vue

@@ -173,7 +173,6 @@ export default {
   methods: {
     // 读取对话编辑草稿信息 并赋值给当前富文本
     getDraftText (index_name) {
-      console.log("findTalk(index_name)", findTalk(index_name));
       return findTalk(index_name)?.draft_text || "";
     },
 

im/src/components/face.vue

@@ -1,5 +1,5 @@
 <template>
-    <img :src="text" alt=""/>
+    <img :src="text || 'https://avatars.dicebear.com/api/initials/'+name+'.svg?fontSize=38'" alt=""/>
 </template>
 
 <script>
@@ -8,7 +8,11 @@
             text:{
                 type:null,
                 default:''
-            }
+            },
+            name:{
+                type:null,
+                default:''
+            },
         }
     }
 </script>

im/src/core/lazy-use.js

@@ -85,5 +85,4 @@ Vue.prototype.$alert = MessageBox.alert
 import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 
-process.env.NODE_ENV !== 'production' &&
+
-  console.warn('[Lumen-IM] NOTICE: element-ui use lazy-load.')

im/src/plugins/ws-socket.js

@@ -1,3 +1,6 @@
+import { Notification, MessageBox  } from "element-ui";
+let wsSignIn; // ws 是否是掉线状态
+import store from "@/store";
 class WsSocket {
   /**
    * Websocket 连接
@@ -25,7 +28,7 @@ class WsSocket {
     reconnect: {
       lockReconnect: false,
       setTimeout: null, // 计时器对象
-      time: 5000, // 重连间隔时间
+      time: 1000, // 重连间隔时间
       number: 1000, // 重连次数
     },
   };
@@ -49,9 +52,9 @@ class WsSocket {
     // 定义 WebSocket 原生方法
     this.events = Object.assign(
       {
-        onError: (evt) => { },
+        onError: (evt) => {},
-        onOpen: (evt) => { },
+        onOpen: (evt) => {},
-        onClose: (evt) => { },
+        onClose: (evt) => {},
       },
       events
     );
@@ -63,7 +66,7 @@ class WsSocket {
    * @param {String} event 事件名
    * @param {Function} callBack 回调方法
    */
-  on (event, callBack) {
+  on(event, callBack) {
     // 对应 socket-instance.js
     this.onCallBacks[event] = callBack;
     return this;
@@ -72,7 +75,23 @@ class WsSocket {
   /**
    * 加载 WebSocket
    */
-  loadSocket () {
+  loadSocket() {
+    /**
+     * 判断当前如果是掉线提示
+     * 重连成功后关闭掉线提示，新增重连提示
+     */
+    if (wsSignIn) {
+      store.commit('SET_WS_STATUS',true);
+      wsSignIn.close();
+
+      Notification({
+        title: "成功",
+        message: "重连成功",
+        type: "success",
+        position: "top-right",
+        duration: 1000,
+      });
+    }
     // 判断当前是否已经连接
     if (this.connect != null) {
       this.connect.close();
@@ -85,41 +104,74 @@ class WsSocket {
     connect.onopen = this.onOpen.bind(this);
     connect.onmessage = this.onMessage.bind(this);
     connect.onclose = this.onClose.bind(this);
-
     this.connect = connect;
+    
+    store.commit('SET_WS_STATUS',false);
   }
 
   /**
    * 连接 Websocket
    */
-  connection () {
+  connection() {
     this.loadSocket();
   }
 
   /**
    * 掉线重连 Websocket
    */
-  reconnect () {
+  reconnect() {
-    console.log("掉线重连接");
+    
+    /**
+     * 长时间挂载页面中并且重连次数为空的时候进行提示
+     */
+    if (this.config.reconnect.number == 0) {
+      MessageBox("当前对话链接已失效，请从关闭重新进入。", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnPressEscape: false,
+        closeOnClickModal: false,
+        type: "warning",
+      })
+        .then(() => {
+          window.close();
+          Notification({
+            title: "对话链接已失效提示",
+            message: "请手动关闭当前页面",
+            type: "error",
+            position: "top-right",
+          });
+        })
+        .catch(() => {
+          Notification({
+            title: "对话链接已失效提示",
+            message: "请手动关闭当前页面",
+            type: "error",
+            position: "top-right",
+          });
+        });
+      return false;
+    }
+    // 掉线重连提示
+    wsSignIn = Notification({
+      title: "掉线重连接提示",
+      message: `网络连接已断开，正在尝试重新连接......`,
+      type: "error",
+      position: "top-right",
+      duration: 0,
+    });
+    // 掉线更改消息状态
+    store.commit('SET_WS_STATUS',true);
     let reconnect = this.config.reconnect;
     if (reconnect.lockReconnect || reconnect.number == 0) {
       return;
     }
-
     this.config.reconnect.lockReconnect = true;
-
     // 没连接上会一直重连，设置延迟避免请求过多
     reconnect.setTimeout && clearTimeout(reconnect.setTimeout);
-
     this.config.reconnect.setTimeout = setTimeout(() => {
       this.connection();
-
       this.config.reconnect.lockReconnect = false;
       this.config.reconnect.number--;
-
-      console.log(
-        `网络连接已断开，正在尝试重新连接(${this.config.reconnect.number})...`
-      );
     }, reconnect.time);
   }
 
@@ -128,8 +180,7 @@ class WsSocket {
    *
    * @param {Object} evt Websocket 消息
    */
-  onParse (evt) {
+  onParse(evt) {
-
     const res = JSON.parse(evt.data).result;
 
     //如果创建时间是时间戳类型则转换为 日期类型，否则新压入栈的消息的创建时间和从数据库读取出来的创建时间格式对不上，处理的时候会出异常。
@@ -145,7 +196,7 @@ class WsSocket {
    * @param format 转换格式
    * @returns {*|string}
    */
-  unixToDate (unix, format) {
+  unixToDate(unix, format) {
     if (!unix) return unix;
     let _format = format || "yyyy-MM-dd hh:mm:ss";
     const d = new Date(unix);
@@ -179,7 +230,7 @@ class WsSocket {
    *
    * @param {Object} evt Websocket 消息
    */
-  onOpen (evt) {
+  onOpen(evt) {
     this.events.onOpen(evt);
 
     if (this.config.heartbeat.enabled) {
@@ -192,7 +243,7 @@ class WsSocket {
    *
    * @param {Object} evt Websocket 消息
    */
-  onClose (evt) {
+  onClose(evt) {
     console.log("关闭连接", evt);
     if (this.config.heartbeat.enabled) {
       clearInterval(this.config.heartbeat.setInterval);
@@ -211,7 +262,7 @@ class WsSocket {
    *
    * @param {Object} evt Websocket 消息
    */
-  onError (evt) {
+  onError(evt) {
     this.events.onError(evt);
   }
 
@@ -220,28 +271,30 @@ class WsSocket {
    *
    * @param {Object} evt Websocket 消息
    */
-  onMessage (evt) {
+  onMessage(evt) {
     let result = this.onParse(evt);
-    if (this.onParse(evt).text.includes('goodsName') || this.onParse(evt).text.includes('groupName')) {
+    if (
+      this.onParse(evt).text.includes("goodsName") ||
+      this.onParse(evt).text.includes("groupName")
+    ) {
       let params = {
         ...this.onParse(evt),
-        text: JSON.parse(this.onParse(evt).text)
+        text: JSON.parse(this.onParse(evt).text),
-      }
+      };
       this.onCallBacks["event_talk"](params);
     } else {
       let params = {
         ...this.onParse(evt),
-        text: this.onParse(evt).text
+        text: this.onParse(evt).text,
-      }
+      };
       this.onCallBacks["event_talk"](params);
     }
     // 指定推送消息
-
   }
   /**
    * WebSocket心跳检测
    */
-  heartbeat () {
+  heartbeat() {
     console.log("WebSocket心跳检测");
     this.config.heartbeat.setInterval = setInterval(() => {
       this.connect.send("PING");
@@ -253,14 +306,14 @@ class WsSocket {
    *
    * @param {Object} message
    */
-  send (message) {
+  send(message) {
     this.connect.send(JSON.stringify(message));
   }
 
   /**
    * 关闭连接
    */
-  close () {
+  close() {
     this.connect.close();
   }
 
@@ -270,7 +323,7 @@ class WsSocket {
    * @param {String} event 事件名
    * @param {Object} data 数据
    */
-  emit (event, data) {
+  emit(event, data) {
     if (this.connect && this.connect.readyState === 1) {
       this.connect.send(JSON.stringify(data));
     } else {

im/src/store/modules/dialogue.js

@@ -21,11 +21,15 @@ export default {
         float: "",
       },
     ],
-
+    webSocketWithOut:false, // ws 是否是掉线 无输出状态
     // 对话索引（聊天对话的唯一索引）
     index_name: null,
   },
   mutations: {
+     // 设置ws状态
+     SET_WS_STATUS: (state,resource) =>{
+      state.webSocketWithOut = resource
+    },
     // 更新对话
     UPDATE_DIALOGUE_MESSAGE (state, resource) {
       state.records = [];
@@ -56,6 +60,8 @@ export default {
 
     // 推送对话记录
     PUSH_DIALOGUE (state, record) {
+      record = {...record,webSocketStatus:state.webSocketWithOut}
+      console.log("推送对话",)
       state.records.push(record);
     },
 

im/src/store/modules/talk.js

@@ -37,6 +37,7 @@ const Talk = {
     talkNum: (state) => state.items.length,
   },
   mutations: {
+   
     // 设置对话列表
     SET_TALK_ITEMS (state, resource) {
       Vue.set(state, 'items', resource.items)

im/src/store/modules/user.js

@@ -19,7 +19,6 @@ let state = {
 // 判断用户是否登录
 if (getToken()) {
   let userInfo = getUserInfo();
-  console.error(userInfo)
   state.name = userInfo.name;
   state.id = userInfo.id;
   state.face = userInfo.face ? userInfo.face : state.avatar;

im/src/store/state.js

@@ -4,8 +4,6 @@ const defaultAvatar = require('@/assets/image/detault-avatar.jpg')
 const state = {
   socketStatus: false,
   website_name: process.env.VUE_APP_WEBSITE_NAME,
-  copyright: `©2020 - 2021 ${process.env.VUE_APP_WEBSITE_NAME} 在线聊天 <a href="https://github.com/gzydong/LumenIM" style="color: #777272;font-weight: 400;" target="_blank">Github源码</a>`,
-
   // 头像加载失败后的默认头像
   defaultAvatar: "this.src='" + defaultAvatar + "'",
 }

im/src/utils/request.js

@@ -14,6 +14,7 @@ const request = axios.create({
   timeout: 20000,
 });
 
+let isRefreshing = false
 /**
  * 异常拦截处理器
  *
@@ -27,10 +28,12 @@ const errorHandler = (error) => {
       removeAll();
       location.reload();
     } else if (error.response.status == 403) {
+      if(!isRefreshing){
+      
       /**
        * 403提示将重新从商家移动端进入当前页面
        */
-      MessageBox("当前登录已失效，请从商家管理后台重新登录。", "提示", {
+      MessageBox("当前登录已失效，请从关闭重新进入。", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnPressEscape: false,
@@ -38,6 +41,7 @@ const errorHandler = (error) => {
         type: "warning",
       })
         .then(() => {
+          isRefreshing = true
           window.close();
           Notification({
             title:"登录失效提示",
@@ -45,9 +49,10 @@ const errorHandler = (error) => {
             type:"error",
             position: "top-right",
           });
+
         })
         .catch(() => {
-         
+          isRefreshing = true
           Notification({
             title:"登录失效提示",
             message: "请手动关闭当前页面",
@@ -55,6 +60,8 @@ const errorHandler = (error) => {
             position: "top-right",
           });
         });
+        isRefreshing = false
+      }
     } else if(error.response.status == 400){
       Notification({
         message: error.response.data.message,

im/src/views/message/index.vue

@@ -9,7 +9,7 @@
             <el-header height="60px" class="header">
               <div class="user-login" v-popover:usercard>
                 <div class="user-box">
-                  <face :text="face" class="user-face"></face>
+                  <face :text="face" :name="name" class="user-face"></face>
                 </div>
               </div>
               <p class="user-status">
@@ -263,7 +263,7 @@ export default {
     },
     unreadNum (value) {
       clearInterval(this.interval);
-      console.log("%c 更新未读消息", "color:#32ccbc");
+      // console.log("%c 更新未读消息", "color:#32ccbc");
       this.$store.commit("SET_UNREAD_NUM", value);
 
       if (value > 0) {

manager/src/views/sys/setting-manage/setting/LOGISTICS_SETTING.vue

@@ -5,21 +5,40 @@
         <RadioGroup v-model="formValidate.type" type="button">
           <Radio label="KDNIAO">快递鸟</Radio>
           <Radio label="KUAIDI100">快递100</Radio>
+          <Radio label="SHUNFENG">顺丰</Radio>
         </RadioGroup>
       </FormItem>
-      <FormItem v-if="formValidate.type==='KDNIAO'" label="快递鸟 商户ID" prop="kdniaoEbusinessID">
+      <FormItem v-if="formValidate.type === 'KDNIAO'" label="快递鸟 商户ID" prop="kdniaoEbusinessID">
         <Input v-model="formValidate.kdniaoEbusinessID" />
       </FormItem>
-      <FormItem v-if="formValidate.type==='KDNIAO'" label="快递鸟 AppKey" prop="kdniaoAppKey">
+      <FormItem v-if="formValidate.type === 'KDNIAO'" label="快递鸟 AppKey" prop="kdniaoAppKey">
         <Input class="label-appkey" v-model="formValidate.kdniaoAppKey" />
       </FormItem>
 
-      <FormItem v-if="formValidate.type==='KUAIDI100'" label="快递100 授权码" prop="kuaidi100Customer">
+      <FormItem v-if="formValidate.type === 'KUAIDI100'" label="快递100 授权码" prop="kuaidi100Customer">
         <Input class="label-appkey" v-model="formValidate.kuaidi100Customer" />
       </FormItem>
-      <FormItem v-if="formValidate.type==='KUAIDI100'" label="快递100 Key" prop="kuaidi100Key">
+      <FormItem v-if="formValidate.type === 'KUAIDI100'" label="快递100 Key" prop="kuaidi100Key">
         <Input class="label-appkey" v-model="formValidate.kuaidi100Key" />
       </FormItem>
+      <div v-if="formValidate.type === 'SHUNFENG'">
+        <FormItem label="顾客编码" prop="clientCode">
+          <Input v-model="formValidate.clientCode" />
+        </FormItem>
+        <FormItem label="校验码" prop="checkWord">
+          <Input v-model="formValidate.checkWord" />
+        </FormItem>
+        <FormItem label="请求地址" prop="callUrl">
+          <Input class="label-appkey" v-model="formValidate.callUrl" />
+        </FormItem>
+
+        <FormItem label="打印模板" prop="templateCode">
+          <Input class="label-appkey" v-model="formValidate.templateCode" />
+        </FormItem>
+        <FormItem label="月结号" prop="monthlyCardNo">
+          <Input class="label-appkey" v-model="formValidate.monthlyCardNo" />
+        </FormItem>
+      </div>
       <div class="label-btns">
         <Button type="primary" @click="submit('formValidate')">保存</Button>
       </div>
@@ -36,12 +55,13 @@ export default {
       formValidate: {   // 表单数据
         type: "",
         kdniaoEbusinessID: "",
-        kdniaoAppKey: "" ,
+        kdniaoAppKey: "",
-        kuaidi100Customer: "" ,
+        kuaidi100Customer: "",
-        kuaidi100Key: "" ,},
+        kuaidi100Key: "",
+      },
     };
   },
-  props: ["res",'type'],
+  props: ["res", 'type'],
   created() {
     this.init();
   },
@@ -49,7 +69,7 @@ export default {
     // 验证
     submit(name) {
       let that = this;
-       if( handleSubmit(that, name )){
+      if (handleSubmit(that, name)) {
         this.setupSetting()
       }
     },
@@ -83,15 +103,17 @@ export default {
 
 <style lang="scss" scoped>
 @import "./style.scss";
+
 .label-item {
   display: flex;
 }
+
 /deep/ .ivu-input {
   width: 300px !important;
   margin: 0 10px;
 }
+
 .ivu-input-wrapper {
   width: 300px;
   margin-right: 10px;
-}
+}</style>
-</style>

seller/src/api/common.js

@@ -1,4 +1,4 @@
-import { commonUrl, getRequest, uploadFileRequest ,uploadFile} from "@/libs/axios";
+import { commonUrl, getRequest, uploadFileRequest, uploadFile, request} from "@/libs/axios";
 
 // 通过id获取子地区
 export const getChildRegion = (id) => {
@@ -25,3 +25,10 @@ export const upLoadFileMethods = (bold) => {
   console.log(bold)
   return uploadFileRequest(uploadFile, bold);
 };
+
+/**
+ * 发送短信验证码
+ */
+export function sendSms (params) {
+  return getRequest(`${commonUrl}/common/common/sms/${params.verificationEnums}/${params.mobile}`,params);
+}

seller/src/api/index.js

@@ -37,6 +37,11 @@ export const login = params => {
   return postRequestWithNoTokenData("/passport/login/userLogin", params);
 };
 
+// 手机登陆
+export const storeSmsLogin = params => {
+  return postRequestWithNoToken("/passport/login/smsLogin", params);
+};
+
 // 登出
 export const logout = () => {
   return postRequest("/passport/login/logout");
@@ -50,7 +55,10 @@ export const userInfo = params => {
 export const userMsg = params => {
   return getRequest('/settings/storeSettings', params)
 }
-
+//验证短信验证码
+export const validateCode = params => {
+  return postRequestWithNoToken("/passport/login/resetByMobile", params);
+};
 // 初始化验证码
 export const initCaptcha = params => {
   return getRequestWithNoToken("/common/captcha/init", params);
@@ -107,6 +115,10 @@ export const sendCodeEmail = (email, params) => {
 export const editEmail = params => {
   return postRequest("/email/editEmail", params);
 };
+// 忘记密码并修改
+export const forgetAndModify = params => {
+  return postRequest("/passport/login/resetPassword", params);
+};
 // 个人中心修改密码
 export const changePass = params => {
   return postRequest("/passport/login/modifyPass", params);

seller/src/api/logistics.js

@@ -4,6 +4,7 @@ import {
   postRequest,
   putRequest,
   deleteRequest,
+  getRequestHasHeader,
   importRequest,
   getRequestWithNoToken
 } from "@/libs/axios";
@@ -35,4 +36,13 @@ export const getCheckedOn = params =>{
   return getRequest(`/other/logistics/getCheckedFaceSheet`,params);
 }
 
+//获取物流设置
+export const getLogisticsSetting = () =>{
+  return getRequest(`/other/logistics/setting`);
+}
+
+export const getShunFengFaceSheet = (url,headers) =>{
+  return getRequestHasHeader(`${url}`,null,headers);
+}
+
 

seller/src/api/order.js

@@ -81,6 +81,11 @@ export const orderDelivery = (sn, params) => {
   return postRequest(`/order/order/${sn}/delivery`, params);
 };
 
+// 订单发货
+export const orderShunFengDelivery = (sn) => {
+  return postRequest(`/order/order/${sn}/shunfeng/delivery`);
+};
+
 // 获取商家选中的物流公司
 export const getLogisticsChecked = () => {
   return getRequest(`/other/logistics/getChecked`);

seller/src/libs/axios.js

@@ -188,6 +188,38 @@ export const getRequest = (url, params, resBlob) => {
   return service(data);
 };
 
+export const getRequestHasHeader = (url, params, headers) => {
+  let accessToken = getStore("accessToken");
+  let data = {
+    method: "get",
+    url: `${url}`,
+    params: params,
+    transformRequest: headers
+      ? undefined
+      : [
+          function(data) {
+            let ret = "";
+            for (let it in data) {
+              ret +=
+                encodeURIComponent(it) +
+                "=" +
+                encodeURIComponent(data[it]) +
+                "&";
+            }
+            ret = ret.substring(0, ret.length - 1);
+            return ret;
+          }
+        ],
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      accessToken: accessToken,
+      ...headers
+    },
+    responseType: "blob"
+  };
+  return service(data);
+};
+
 export const postRequest = (url, params, headers) => {
   let accessToken = getStore("accessToken");
   return service({

seller/src/router/index.js

@@ -3,7 +3,7 @@ import ViewUI from 'view-design';
 import Util from '../libs/util';
 import VueRouter from 'vue-router';
 import Cookies from 'js-cookie';
-import {routers} from './router';
+import { routers } from './router';
 
 Vue.use(VueRouter);
 
@@ -16,10 +16,10 @@ const RouterConfig = {
 /**
  * 解决重复点击菜单会控制台报错bug
  */
- const routerPush = VueRouter.prototype.push
+const routerPush = VueRouter.prototype.push
- VueRouter.prototype.push = function push(location) {
+VueRouter.prototype.push = function push(location) {
-   return routerPush.call(this, location).catch(error=> error)
+  return routerPush.call(this, location).catch(error => error)
- }
+}
 
 export const router = new VueRouter(RouterConfig);
 
@@ -32,10 +32,15 @@ router.beforeEach((to, from, next) => {
   const name = to.name;
 
   if (!Cookies.get('userInfoSeller') && name !== 'login') {
+    if (name === 'forgetPassword') {
+      console.log(name)
+      Util.toDefaultPage([...routers], name, router, next);
+    } else {
       // 判断是否已经登录且前往的页面不是登录页
       next({
         name: 'login'
       });
+    }
   } else if (Cookies.get('userInfoSeller') && name === 'login') {
     // 判断是否已经登录且前往的是登录页
     Util.title();

seller/src/router/router.js

@@ -10,6 +10,11 @@ export const loginRouter = {
   },
   component: () => import("@/views/login.vue")
 };
+export const forgetPasswordRouter = {
+  path: "/forgetPassword",
+  name: "forgetPassword",
+  component: () => import("@/views/ForgetPassword.vue")
+};
 
 // 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里
 export const otherRouter = {
@@ -193,4 +198,4 @@ export const page500 = {
   component: () => import("@/views/error-page/500.vue")
 };
 // 所有上面定义的路由都要写在下面的routers里
-export const routers = [loginRouter, otherRouter, page500, page403];
+export const routers = [loginRouter, forgetPasswordRouter, otherRouter, page500, page403];

seller/src/views/ForgetPassword.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="forget-password" @click='$refs.verify.show = false'>
+    <div style="height:50px;"></div>
+    <!-- 顶部logo -->
+    <div class="logo-box">
+      <img
+        :src="$store.state.logoImg" width='150'
+        @click="$router.push('/')"
+      />
+      <div>修改密码</div>
+    </div>
+    <div class="login-container">
+        <!-- 验证手机号 -->
+        <Form
+          ref="formFirst"
+          :model="formFirst"
+          :rules="ruleInline"
+          style="width:300px;"
+          v-show="step === 0"
+        >
+          <FormItem prop="mobile">
+            <i-input
+              type="text"
+              v-model="formFirst.mobile"
+              clearable
+              placeholder="手机号"
+            >
+              <Icon type="md-phone-portrait" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="code">
+            <i-input
+              type="text"
+              v-model="formFirst.code"
+              clearable
+              placeholder="手机验证码"
+            >
+              <Icon
+                type="ios-text-outline"
+                style="font-weight: bold"
+                slot="prepend"
+              />
+              <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button @click="verifyBtnClick" long :type="verifyStatus?'success':'default'">{{verifyStatus?'验证通过':'点击完成安全验证'}}</Button>
+          </FormItem>
+          <FormItem>
+            <Button type="error" @click="next" :loading="loading" long>下一步</Button>
+          </FormItem>
+        </Form>
+        <Form
+          ref="form"
+          :model="form"
+          :rules="ruleInline"
+          style="width:300px;"
+          v-show="step === 1"
+        >
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="form.password"
+              clearable
+              placeholder="请输入至少六位密码"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem prop="password">
+            <i-input
+              type="password"
+              v-model="form.oncePasd"
+              clearable
+              placeholder="请再次输入密码"
+            >
+              <Icon type="md-lock" slot="prepend"></Icon>
+            </i-input>
+          </FormItem>
+          <FormItem>
+            <Button type="error" size="large" @click="handleSubmit" :loading="loading1" long>提交</Button>
+          </FormItem>
+        </Form>
+        <!-- 拼图验证码 -->
+        <verify
+          ref="verify"
+          class="verify-con"
+          :verifyType="verifyType"
+          @change="verifyChange"
+        ></verify>
+        <div class="login-btn"><a @click="$router.push('login')">前往登录</a></div>
+    </div>
+    <div class="foot">
+      <Row type="flex" justify="space-around" class="help">
+        <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
+        <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
+      </Row>
+      <Row type="flex" justify="center" class="copyright">
+        Copyright © {{year}} - Present
+        <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
+          >{{config.title}}</a
+        >
+        版权所有
+      </Row>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import * as RegExp from '@/utils/regular.js';
+import * as apiLogin from '@/api/index.js';
+import { sendSms } from '@/api/common.js';
+import verify from "@/views/my-components/verify";
+export default {
+  name: 'ForgetPassword',
+  components: { verify },
+  data () {
+    return {
+      config:require('@/config'),
+      loading: false, // 加载状态
+      loading1: false, // 第二步加载状态
+      formFirst: { // 手机验证码表单
+        // 注册表单
+        mobile: '',
+        code: ''
+      },
+      form: { // 密码
+        password: '',
+        oncePasd: ''
+      },
+      year: new Date().getFullYear(), // 当前年份
+      step: 0, // 步骤
+      ruleInline: {
+        // 验证规则
+        mobile: [
+          { required: true, message: '请输入手机号码' },
+          {
+            pattern: RegExp.mobile,
+            trigger: 'blur',
+            message: '请输入正确的手机号'
+          }
+        ],
+        code: [{ required: true, message: '请输入手机验证码' }],
+        password: [{required: true, message: '密码不能为空'}, {pattern: RegExp.password, message: '密码不能少于6位'}]
+      },
+      verifyStatus: false, // 图片验证状态
+      verifyType: 'FIND_USER', // 图片验证类型
+      codeMsg: '发送验证码', // 验证码文字
+      interval: '', // 定时器
+      time: 60 // 倒计时时间
+    };
+  },
+  methods: {
+    // 提交短信验证码，修改密码
+    next () {
+      this.$refs.formFirst.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          let data = JSON.parse(JSON.stringify(this.formFirst));
+          apiLogin.validateCode(data).then((res) => {
+            this.loading = false;
+            if (res.success) {
+            //   this.$Message.success('');
+              this.step = 1;
+            } else {
+              this.$Message.warning(res.message);
+            }
+          }).catch(() => { this.loading = false; });
+        } else {}
+      });
+    },
+    handleSubmit () { // 提交密码
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let params = JSON.parse(JSON.stringify(this.form));
+          if (params.password !== params.oncePasd) {
+            this.$Message.warning('两次输入密码不一致');
+            return;
+          };
+          params.mobile = this.formFirst.mobile;
+          params.password = this.md5(params.password);
+          delete params.oncePasd;
+          this.loading1 = true;
+
+          apiLogin.forgetAndModify(params).then(res => {
+            this.loading1 = false;
+            console.log(res);
+            if (res.success) {
+              this.$Message.success('修改密码成功');
+              this.$router.push('login');
+            }
+          }).catch(() => { this.loading = false; });
+        };
+      });
+    },
+    sendCode () { // 发送验证码
+      if (this.time === 60) {
+        if (this.formFirst.mobile === '') {
+          this.$Message.warning('请先填写手机号');
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning('请先完成安全验证');
+          return;
+        }
+        let params = {
+          mobile: this.formFirst.mobile,
+          verificationEnums: 'FIND_USER'
+        };
+        sendSms(params).then(res => {
+          if (res.success) {
+            this.$Message.success('验证码发送成功');
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = '重新发送';
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
+    verifyChange (con) { // 验证通过
+      if (!con.status) return;
+      this.$refs.verify.show = false;
+      this.verifyStatus = true;
+    },
+    verifyBtnClick () {
+      if (!this.verifyStatus) {
+        this.$refs.verify.init();
+      }
+    }
+  },
+  mounted () {
+    document.querySelector('.forget-password').style.height = window.innerHeight + 'px'
+    this.$refs.formFirst.resetFields();
+  },
+  watch: {
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.forget-password{
+  min-height: 700px;
+}
+.logo-box {
+  width: 600px;
+  height: 80px;
+  margin: 0 auto;
+  display: flex;
+  align-items: center;
+  img {
+    width: 150px;
+    cursor: pointer;
+  }
+  div {
+    font-size: 20px;
+    margin-top: 10px;
+  }
+}
+
+.login-container {
+  border-top: 2px solid $theme_color;
+  position: relative;
+  margin: 0 auto;
+  width: 600px;
+  background-color: #fff;
+  padding: 20px 150px;
+  .login-btn{
+    position: absolute;
+    right: 20px;
+    top: -45px;
+  }
+}
+
+.verify-con{
+  position: absolute;
+  left: 140px;
+  top: -30px;
+  z-index: 10;
+}
+
+.other-login {
+  margin: 0 auto;
+  .ivu-icon {
+    font-size: 24px;
+  }
+}
+.regist {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -10px;
+  span {
+    margin-left: 10px;
+    &:hover {
+      cursor: pointer;
+      color: $theme_color;
+    }
+  }
+}
+.foot {
+  position: fixed;
+  bottom: 4vh;
+  width: 368px;
+  left: calc(50% - 184px);
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  .help {
+    margin: 0 auto;
+    margin-bottom: 1vh;
+    width: 60%;
+    .item {
+      color: rgba(0, 0, 0, 0.45);
+    }
+    :hover {
+      color: rgba(0, 0, 0, 0.65);
+    }
+  }
+}
+</style>

seller/src/views/home/home.vue

@@ -21,7 +21,7 @@
               <div>店铺状态：{{ userData.storeDisable == 'OPEN' ? '开启中' : '关闭' }}</div>
             </div>
             <div class="box-item" @click="im()">
-              <Button type="info">点击登录客服</Button>
+              <Button type="info" :loading='load'>点击登录客服</Button>
             </div>
           </div>
 
@@ -207,7 +207,7 @@ import { getSellerHomeData, getHomeNotice } from "@/api/index";
 import { getIMDetail } from "@/api/common"
 import { seeArticle } from "@/api/pages";
 import Cookies from "js-cookie";
-
+import { userMsg } from "@/api/index";
 export default {
   name: "home",
   data () {
@@ -221,8 +221,10 @@ export default {
         title: "",
       },
       IMLink: "",
+      load:false, //加载Im
     };
   },
+
   methods: {
     // 跳转页面
     navigateTo (name) {
@@ -249,16 +251,24 @@ export default {
         this.noticeFlage = true;
       }
     },
+
+    /**
+     * 点击登录im的时候需要去判断一下当前店铺信息是否失效
+     * 失效的话重新请求刷新token保证最新的token去访问im
+     */
     async im () {
       // 获取访问Token
       let accessToken = this.getStore("accessToken");
+      this.load = true
       await this.getIMDetailMethods();
-      let res = await getIMDetail();
+      const userInfo = await userMsg();
-      if (!accessToken) {
+      this.load = false
-        this.$Message.error("请登录后再联系客服");
+      if (userInfo.success && this.IMLink) {
-        return;
+        window.open(`${this.IMLink}?token=` + accessToken);
+      }
+      else{
+        this.$Message.error("请登录后再联系客服");
       }
-      window.open(`${res.result}?token=` + accessToken);
     },
 
     // 获取im信息

seller/src/views/login.vue

@@ -4,44 +4,48 @@
       <Col style="width: 368px">
       <Header />
       <Row style="flex-direction: column">
-          <Form
+        <Tabs v-model="loginType">
-            ref="usernameLoginForm"
+          <Tab-pane label="账号密码登录" name="passwordLogin">
-            :model="form"
+            <!--账号密码登录-->
-            :rules="rules"
+            <Form ref="usernameLoginForm" :model="form" :rules="rules" class="form">
-            class="form"
-          >
               <FormItem prop="username">
-              <Input
+                <Input v-model="form.username" prefix="ios-contact" size="large" clearable placeholder="请输入用户名"
-                v-model="form.username"
+                  autocomplete="off" />
-                prefix="ios-contact"
-                size="large"
-                clearable
-                placeholder="请输入用户名"
-                autocomplete="off"
-              />
               </FormItem>
               <FormItem prop="password">
-              <Input
+                <Input type="password" v-model="form.password" prefix="ios-lock" size="large" password placeholder="请输入密码"
-                type="password"
+                  autocomplete="off" />
-                v-model="form.password"
-                prefix="ios-lock"
-                size="large"
-                password
-                placeholder="请输入密码"
-                autocomplete="off"
-              />
               </FormItem>
             </Form>
-
+            <div class="register">
+              <a @click="$router.push('forgetPassword')">忘记密码</a>
+            </div>
+          </Tab-pane>
+          <Tab-pane label="验证码登录" name="mobileLogin">
+            <!-- 验证码登录 -->
+            <Form ref="formSms" :model="formSms" :rules="ruleInline" @click.self='$refs.verify.show = false'>
+              <FormItem prop="mobile">
+                <i-input type="text" v-model="formSms.mobile" clearable placeholder="手机号">
+                  <Icon type="md-lock" slot="prepend"></Icon>
+                </i-input>
+              </FormItem>
+              <FormItem prop="code">
+                <i-input type="text" v-model="formSms.code" placeholder="手机验证码">
+                  <Icon type="ios-text-outline" style="font-weight: bold" slot="prepend" />
+                  <Button slot="append" @click="sendCode">{{ codeMsg }}</Button>
+                </i-input>
+              </FormItem>
+              <FormItem>
+                <Button @click.stop="verifyBtnClick" long :type="verifyStatus ? 'success' : 'default'">{{ verifyStatus ?
+                  '验证通过' :
+                  '点击完成安全验证' }}
+                </Button>
+              </FormItem>
+            </Form>
+          </Tab-pane>
+        </Tabs>
         <Row>
-            <div
+          <div class="login-btn" type="primary" size="large" :loading="loading" @click="submitLogin" long>
-              class="login-btn"
-              type="primary"
-              size="large"
-              :loading="loading"
-              @click="submitLogin"
-              long
-            >
             <span v-if="!loading">登录</span>
             <span v-else>登录中</span>
           </div>
@@ -49,12 +53,7 @@
       </Row>
       <Footer />
       <!-- 拼图验证码 -->
-        <verify
+      <verify ref="verify" class="verify-con" verifyType="LOGIN" @change="verifyChange"></verify>
-          ref="verify"
-          class="verify-con"
-          verifyType="LOGIN"
-          @change="verifyChange"
-        ></verify>
       </Col>
     </Row>
   </div>
@@ -62,7 +61,8 @@
 
 <script>
 import { getCurrentPermissionList } from "@/api/index";
-import { login, userMsg } from "@/api/index";
+import { login, userMsg, storeSmsLogin } from "@/api/index";
+import { sendSms } from "@/api/common.js";
 import Cookies from "js-cookie";
 import Header from "@/views/main-components/header";
 import Footer from "@/views/main-components/footer";
@@ -78,6 +78,9 @@ export default {
     return {
       saveLogin: true, // 保存登录状态
       loading: false, // 加载状态
+      verifyStatus: false, // 是否图片验证通过
+      time: 60, // 倒计时
+      loginType: 'passwordLogin', //登陆类型
       form: {
         // 表单数据
         username: "",
@@ -85,6 +88,10 @@ export default {
         mobile: "",
         code: "",
       },
+      formSms: {
+        mobile: '',
+        code: '',
+      },
       rules: {
         // 验证规则
         username: [
@@ -102,6 +109,23 @@ export default {
           },
         ],
       },
+      ruleInline: {
+        // 验证规则
+        username: [{ required: true, message: "请输入用户名" }],
+        password: [
+          { required: true, message: "请输入密码" },
+          { type: "string", min: 6, message: "密码不能少于6位" },
+        ],
+        mobile: [
+          { required: true, message: "请输入手机号码" },
+          {
+            pattern: RegExp.mobile,
+            message: "请输入正确的手机号",
+          },
+        ],
+        code: [{ required: true, message: "请输入手机验证码" }],
+      },
+      codeMsg: "发送验证码", // 验证码文字
     };
   },
   created() {
@@ -142,20 +166,68 @@ export default {
         }
       });
     },
+    // 发送手机验证码
+    sendCode() {
+      if (this.time === 60) {
+        if (this.formSms.mobile === "") {
+          this.$Message.warning("请先填写手机号");
+          return;
+        }
+        if (!this.verifyStatus) {
+          this.$Message.warning("请先完成安全验证");
+          return;
+        }
+        let params = {
+          mobile: this.formSms.mobile,
+          verificationEnums: "LOGIN",
+        };
+        sendSms(params).then((res) => {
+          if (res.success) {
+            this.$Message.success("验证码发送成功");
+            let that = this;
+            this.interval = setInterval(() => {
+              that.time--;
+              if (that.time === 0) {
+                that.time = 60;
+                that.codeMsg = "重新发送";
+                that.verifyStatus = false;
+                clearInterval(that.interval);
+              } else {
+                that.codeMsg = that.time;
+              }
+            }, 1000);
+          } else {
+            this.$Message.warning(res.message);
+          }
+        });
+      }
+    },
     submitLogin() {
       // 登录提交
+      if (this.loginType == 'passwordLogin') {
         this.$refs.usernameLoginForm.validate((valid) => {
           if (valid) {
             this.$refs.verify.init();
           }
         });
+      } else if (this.loginType == 'mobileLogin') {
+        this.$refs['formSms'].validate((valid) => {
+          if (valid) {
+            storeSmsLogin(this.formSms).then(res => {
+              if (res.success) {
+                this.afterLogin(res)
+              }
+            })
+          }
+        })
+      }
     },
     verifyChange(con) {
       // 拼图验证码回显
       if (!con.status) return;
 
+      if (this.loginType == 'passwordLogin') {
         this.loading = true;
-
         let fd = new FormData();
         fd.append("username", this.form.username);
         fd.append("password", this.md5(this.form.password));
@@ -169,8 +241,17 @@ export default {
           .catch(() => {
             this.loading = false;
           });
+      }
+      this.verifyStatus = true;
       this.$refs.verify.show = false;
     },
+
+    // 开启滑块验证
+    verifyBtnClick() {
+      if (!this.verifyStatus) {
+        this.$refs.verify.init();
+      }
+    },
   },
 };
 </script>
@@ -184,12 +265,14 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+
   .verify-con {
     position: absolute;
     top: 126px;
     z-index: 10;
     left: 20px;
   }
+
   .form {
     padding-top: 1vh;
   }
@@ -208,9 +291,11 @@ export default {
     text-align: center;
     transition: 0.35s;
   }
+
   .login-btn:hover {
     opacity: 0.9;
     border-radius: 10px;
   }
+  
 }
 </style>

seller/src/views/order/order/orderDetail.vue

@@ -2,33 +2,18 @@
   <div class="search">
     <Card style="height: 60px">
       <div>
-        <Button
+        <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
-          v-if="allowOperation.editPrice"
+        <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址</Button>
-          @click="modifyPrice"
+        <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
-          type="primary"
-          >调整价格</Button
-        >
-        <Button
-          v-if="allowOperation.editConsignee"
-          @click="editAddress"
-          type="primary"
-          >修改收货地址</Button
-        >
-        <Button
-          v-if="allowOperation.showLogistics"
-          @click="logistics"
-          type="primary"
-          >查看物流</Button
-        >
         <Button @click="orderLogModal = true" type="primary">订单日志</Button>
         <Button @click="printOrder" type="primary" ghost style="float:right;">打印发货单</Button>
-        <Button v-if="allowOperation.take" @click="orderTake" type="primary"
+        <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
-          >订单核销</Button
+        <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
-        >
+
-        <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary"
+        <Button @click="sfPrint" type="primary" ghost
-          >发货</Button
+          v-if="allowOperation.showLogistics && logisticsType == 'SHUNFENG'">下载面单</Button>
-        >
+        <Button @click="Toprint" type="primary" ghost
-        <Button  @click="Toprint" type="primary" ghost v-if="allowOperation.ship">打印电子面单</Button>
+          v-if="allowOperation.ship && logisticsType != 'SHUNFENG'">打印电子面单</Button>
       </div>
     </Card>
 
@@ -99,8 +84,7 @@
           <div class="div-item">
             <div class="div-item-left">发票金额：</div>
             <div class="div-item-right">
-                <span v-if="orderInfo.receipt.receiptPrice">￥</span
+              <span v-if="orderInfo.receipt.receiptPrice">￥</span>{{
-                >{{
                 orderInfo.receipt.receiptPrice
                 ? orderInfo.receipt.receiptPrice
                 : "暂无" | unitPrice
@@ -160,21 +144,12 @@
     </Card>
 
     <Card class="mt_10">
-      <Table
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table">
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      >
         <!-- 商品栏目格式化 -->
         <template slot="goodsSlot" slot-scope="{ row }">
           <div style="margin-top: 5px; height: 80px; display: flex">
             <div style="">
-              <img
+              <img :src="row.image" style="height: 60px; margin-top: 1px; width: 60px" />
-                :src="row.image"
-                style="height: 60px; margin-top: 1px; width: 60px"
-              />
             </div>
 
             <div style="margin-left: 13px">
@@ -184,35 +159,16 @@
                 }}</a>
               </div>
               <span v-for="(item, key) in JSON.parse(row.specs)" :key="key">
-                <span
+                <span v-show="key != 'images'" style="font-size: 12px; color: #999999">
-                  v-show="key != 'images'"
-                  style="font-size: 12px; color: #999999"
-                >
                   {{ key }} : {{ item }}
                 </span>
               </span>
-              <Poptip
+              <Poptip trigger="hover" style="display: block" title="扫码在手机中查看" transfer>
-                trigger="hover"
-                style="display: block"
-                title="扫码在手机中查看"
-                transfer
-              >
                 <div slot="content">
-                  <vue-qr
+                  <vue-qr :text="wapLinkTo(row.goodsId, row.skuId)" :margin="0" colorDark="#000" colorLight="#fff"
-                    :text="wapLinkTo(row.goodsId, row.skuId)"
+                    :size="150"></vue-qr>
-                    :margin="0"
-                    colorDark="#000"
-                    colorLight="#fff"
-                    :size="150"
-                  ></vue-qr>
                 </div>
-                <img
+                <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="" />
-                  src="../../../assets/qrcode.svg"
-                  class="hover-pointer"
-                  width="20"
-                  height="20"
-                  alt=""
-                />
               </Poptip>
             </div>
           </div>
@@ -235,10 +191,12 @@
             <span class="label">优惠券金额：</span>
             <span class="txt"> {{ orderInfo.order.priceDetailDTO.couponPrice | unitPrice('￥') }} </span>
           </li>
-          <li v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">      
+          <li
+            v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">
             <div class="label">
               <Poptip trigger="hover" placement="left" width="200">
-                <Icon v-if="typeList.length > 0"  type="ios-alert-outline" size="17" @click="getOrderPrice" color="#cc0000"/>
+                <Icon v-if="typeList.length > 0" type="ios-alert-outline" size="17" @click="getOrderPrice"
+                  color="#cc0000" />
                 <template #content>
                   <div class="api" style="text-align:left;">
                     <table>
@@ -248,8 +206,8 @@
                         </tr>
                       </thead>
                       <tbody>
-                        <tr  v-for="(item,index) in typeList" :key="index">
+                        <tr v-for="(item, index) in typeList" :key="index">
-                            <td>{{item.promotionName}}：</td>
+                          <td>{{ item.promotionName }}：</td>
                           <td>¥{{ item.discountPrice | unitPrice }}</td>
                         </tr>
                       </tbody>
@@ -287,9 +245,7 @@
           </li>
           <li>
             <span class="label">应付金额：</span>
-            <span class="txt flowPrice"
+            <span class="txt flowPrice">¥{{ orderInfo.order.flowPrice | unitPrice }}</span>
-              >¥{{ orderInfo.order.flowPrice | unitPrice }}</span
-            >
             <!-- <template v-if="orderInfo.order.priceDetailDTO.discountPriceDetail != undefined && orderInfo.order.priceDetailDTO.discountPriceDetail && orderInfo.order.priceDetailDTO.discountPriceDetail != null && orderInfo.order.priceDetailDTO.discountPriceDetail != ''">
                 <Space style="height:20px;float: right;text-align: center;margin-left:30px;margin-right:53px;">
                       <Button type="primary" ghost size="small" @click="getOrderPrice()">优惠详情</Button>
@@ -305,22 +261,12 @@
         <span>修改金额</span>
       </p>
       <div>
-        <Form
+        <Form ref="modifyPriceForm" :model="modifyPriceForm" label-position="left" :label-width="100"
-          ref="modifyPriceForm"
+          :rules="modifyPriceValidate">
-          :model="modifyPriceForm"
-          label-position="left"
-          :label-width="100"
-          :rules="modifyPriceValidate"
-        >
           <FormItem label="订单金额" prop="orderPrice">
-            <InputNumber
+            <InputNumber style="width: 100%" v-model="modifyPriceForm.orderPrice" size="large" :min="0.01" :max="99999">
-              style="width: 100%"
+              <span slot="append">元</span>
-              v-model="modifyPriceForm.orderPrice"
+            </InputNumber>
-              size="large"
-              :min="0.01"
-              :max="99999"
-              ><span slot="append">元</span></InputNumber
-            >
           </FormItem>
         </Form>
       </div>
@@ -336,55 +282,22 @@
         <span>修改收件信息</span>
       </p>
       <div>
-        <Form
+        <Form ref="addressForm" :model="addressForm" label-position="left" :label-width="100" :rules="addressRule">
-          ref="addressForm"
-          :model="addressForm"
-          label-position="left"
-          :label-width="100"
-          :rules="addressRule"
-        >
           <FormItem label="收件人" prop="consigneeName">
-            <Input
+            <Input v-model="addressForm.consigneeName" size="large" maxlength="20"></Input>
-              v-model="addressForm.consigneeName"
-              size="large"
-              maxlength="20"
-            ></Input>
           </FormItem>
           <FormItem label="联系方式" prop="consigneeMobile">
-            <Input
+            <Input v-model="addressForm.consigneeMobile" size="large" maxlength="11"></Input>
-              v-model="addressForm.consigneeMobile"
-              size="large"
-              maxlength="11"
-            ></Input>
           </FormItem>
           <FormItem label="地址信息" prop="consigneeAddressPath">
-            <Input
+            <Input v-model="addressForm.consigneeAddressPath" disabled style="width: 325px" v-if="showRegion == false" />
-              v-model="addressForm.consigneeAddressPath"
+            <Button v-if="showRegion == false" size="small" @click="regionClick" :loading="submitLoading" type="primary"
-              disabled
+              style="margin-left: 8px">修改
-              style="width: 325px"
-              v-if="showRegion == false"
-            />
-            <Button
-              v-if="showRegion == false"
-              size="small"
-              @click="regionClick"
-              :loading="submitLoading"
-              type="primary"
-              style="margin-left: 8px"
-              >修改
             </Button>
-            <region
+            <region style="width: 400px" @selected="selectedRegion" v-if="showRegion == true" />
-              style="width: 400px"
-              @selected="selectedRegion"
-              v-if="showRegion == true"
-            />
           </FormItem>
           <FormItem label="详细地址" prop="consigneeDetail">
-            <Input
+            <Input v-model="addressForm.consigneeDetail" size="large" maxlength="11"></Input>
-              v-model="addressForm.consigneeDetail"
-              size="large"
-              maxlength="11"
-            ></Input>
           </FormItem>
         </Form>
       </div>
@@ -400,19 +313,10 @@
         <span>订单核销</span>
       </p>
       <div>
-        <Form
+        <Form ref="orderTakeForm" :model="orderTakeForm" label-position="left" :label-width="100"
-          ref="orderTakeForm"
+          :rules="orderTakeValidate">
-          :model="orderTakeForm"
-          label-position="left"
-          :label-width="100"
-          :rules="orderTakeValidate"
-        >
           <FormItem label="核销码" prop="qrCode">
-            <Input
+            <Input v-model="orderTakeForm.qrCode" size="large" maxlength="10"></Input>
-              v-model="orderTakeForm.qrCode"
-              size="large"
-              maxlength="10"
-            ></Input>
           </FormItem>
         </Form>
       </div>
@@ -427,13 +331,7 @@
         <span>订单日志</span>
       </p>
       <div class="order-log-div">
-        <Table
+        <Table :loading="loading" border :columns="orderLogColumns" :data="orderLogData" ref="table"></Table>
-          :loading="loading"
-          border
-          :columns="orderLogColumns"
-          :data="orderLogData"
-          ref="table"
-        ></Table>
       </div>
 
       <div slot="footer" style="text-align: right">
@@ -469,8 +367,8 @@
         <div class="div-express-log">
           <ul class="express-log">
             <li v-for="(item, index) in logisticsInfo.traces" :key="index">
-              <span class="time">{{ item.AcceptTime }}</span>
+              <span class="time">{{ item.AcceptTime || item.acceptTime }}</span>
-              <span class="detail">{{ item.AcceptStation }}</span>
+              <span class="detail">{{ item.AcceptStation || item.remark }}</span>
             </li>
           </ul>
         </div>
@@ -488,49 +386,23 @@
       <div>
         <Form :model="faceSheetForm" ref="faceSheetForm" v-if="facesheetFlag" :rules="faceSheetFormValidate">
           <FormItem label="物流公司" prop="logisticsId" style="position: relative" :label-width="90">
-            <Select
+            <Select v-model="faceSheetForm.logisticsId" placeholder="请选择" style="width: 250px">
-              v-model="faceSheetForm.logisticsId"
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.logisticsId">{{ item.name }}
-              placeholder="请选择"
-              style="width: 250px"
-            >
-              <Option
-                v-for="(item, i) in checkedLogistics"
-                :key="i"
-                :value="item.logisticsId"
-              >{{ item.name }}
               </Option>
             </Select>
           </FormItem>
         </Form>
-        <Form
+        <Form v-else ref="orderDeliveryForm" :model="orderDeliveryForm" :label-width="90"
-          v-else
+          :rules="orderDeliverFormValidate" style="position: relative">
-          ref="orderDeliveryForm"
-          :model="orderDeliveryForm"
-          :label-width="90"
-          :rules="orderDeliverFormValidate"
-          style="position: relative"
-        >
-
           <FormItem label="物流公司" prop="logisticsId">
-            <Select
+            <Select v-model="orderDeliveryForm.logisticsId" placeholder="请选择" style="width: 250px">
-              v-model="orderDeliveryForm.logisticsId"
+              <Option v-for="(item, i) in checkedLogistics" :key="i" :value="item.logisticsId">{{ item.name }}
-              placeholder="请选择"
-              style="width: 250px"
-            >
-              <Option
-                v-for="(item, i) in checkedLogistics"
-                :key="i"
-                :value="item.logisticsId"
-              >{{ item.name }}
               </Option>
             </Select>
           </FormItem>
           <!-- v-if="showOrder" -->
-          <FormItem label="物流单号" prop="logisticsNo" >
+          <FormItem label="物流单号" prop="logisticsNo">
-            <Input
+            <Input v-model="orderDeliveryForm.logisticsNo" style="width: 250px" />
-              v-model="orderDeliveryForm.logisticsNo"
-              style="width: 250px"
-            />
           </FormItem>
         </Form>
       </div>
@@ -541,10 +413,12 @@
       </div>
     </Modal>
     <!-- 打印发货单 -->
-    <Modal v-model="printModal" width="530" @on-cancel="printCancel" >
+    <Modal v-model="printModal" width="530" @on-cancel="printCancel">
       <p slot="header" style="line-height:26px;height:26px;">
         <span style="float: left;">打印发货单</span>
-        <Button size="small" style="margin-right:35px;float: right;padding-bottom: 2px;" @click="printHiddenInfo"><template v-if="printHiddenFlag">显示</template><template v-else>隐藏</template>敏感信息</Button>
+        <Button size="small" style="margin-right:35px;float: right;padding-bottom: 2px;"
+          @click="printHiddenInfo"><template v-if="printHiddenFlag">显示</template><template
+            v-else>隐藏</template>敏感信息</Button>
       </p>
       <div style="max-height:500px;overflow-y:auto;overflow-x:hidden;">
         <div id="printInfo">
@@ -558,22 +432,24 @@
             <p class="lineH30 f14">收件人：{{ orderInfo.order.consigneeName }}</p>
             </Col>
             <Col span="12" v-if="orderInfo.order.consigneeMobile">
-                <p class="lineH30 f14" v-if="printHiddenFlag">手机号：{{ orderInfo.order.consigneeMobile.replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")  }}</p>
+            <p class="lineH30 f14" v-if="printHiddenFlag">手机号：{{
+              orderInfo.order.consigneeMobile.replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2") }}</p>
             <p class="lineH30 f14" v-else>手机号：{{ orderInfo.order.consigneeMobile }}</p>
             </Col>
           </Row>
           <Row>
             <Col span="24">
-                <p class="lineH30 f14">收货地址：{{ orderInfo.order.consigneeAddressPath }}{{ orderInfo.order.consigneeDetail }}</p>
+            <p class="lineH30 f14">收货地址：{{ orderInfo.order.consigneeAddressPath }}{{ orderInfo.order.consigneeDetail }}
+            </p>
             </Col>
           </Row>
           <Row>
             <Col span="24">
             <p class="printgoodtitle">商品信息</p>
             <div class="printgoodinfo">
-                  <div v-for="(item,index) in orderInfo.orderItems" :key="index" class="printgooditem">
+              <div v-for="(item, index) in orderInfo.orderItems" :key="index" class="printgooditem">
                 <div class="printgoodname">
-                      <p>{{item.goodsName}}</p>
+                  <p>{{ item.goodsName }}</p>
                   <div class="printgoodguid">
                     <span v-for="(itemchild, keychild) in JSON.parse(item.specs)" :key="keychild">
                       <span class="printgoodguiditem" v-if="keychild != 'images'">
@@ -582,7 +458,7 @@
                     </span>
                   </div>
                 </div>
-                    <span class="printgoodnumber">数量：{{item.num}}</span>
+                <span class="printgoodnumber">数量：{{ item.num }}</span>
               </div>
             </div>
             </Col>
@@ -613,17 +489,18 @@ export default {
   },
   data() {
     return {
-      typeList:[],
+      typeList: [],
-      showPrices:false,
+      showPrices: false,
-      printHiddenFlag:false,//隐藏信息
+      printHiddenFlag: false,//隐藏信息
-      printInfoObj:{
+      printInfoObj: {
         id: "printInfo",//要打印的id名 无#号
-        popTitle:'&nbsp;',//页眉标题 默认浏览器标题 空字符串时显示undefined 使用html语言
+        popTitle: '&nbsp;',//页眉标题 默认浏览器标题 空字符串时显示undefined 使用html语言
-        extraHead:'',//头部文字 默认空
+        extraHead: '',//头部文字 默认空
       },
       submitLoading: false, // 添加或编辑提交状态
       region: [], //地区
       regionId: [], //地区id
+      logisticsType: 'KUAIDINIAO', //物流类型
       showRegion: false,
       someJSONdata: '',
       faceSheetForm: {
@@ -631,7 +508,7 @@ export default {
       },
       faceSheetFormValidate: {
         logisticsId: [
-          { required: true, message: "请选择物流公司"},
+          { required: true, message: "请选择物流公司" },
         ],
       },
       facesheetFlag: false, //电子面单标识
@@ -652,7 +529,7 @@ export default {
         },
       },
       modal: false, //弹出调整价格框
-      printModal:false,//弹出打印发货单
+      printModal: false,//弹出打印发货单
       //调整价格表单
       modifyPriceForm: {
         orderPrice: 0,
@@ -826,13 +703,13 @@ export default {
       this.orderTakeModal = true;
     },
     //打印发货单
-    printOrder(){
+    printOrder() {
       this.printModal = true;
     },
-    printHiddenInfo(){
+    printHiddenInfo() {
       this.printHiddenFlag = !this.printHiddenFlag;
     },
-    printCancel(){
+    printCancel() {
       // this.printHiddenFlag = false;
     },
     //订单核销提交
@@ -851,14 +728,14 @@ export default {
         }
       });
     },
-    getOrderPrice(){
+    getOrderPrice() {
-      if(this.showPrices){
+      if (this.showPrices) {
         this.showPrices = false
-      }else if(!this.showPrices){
+      } else if (!this.showPrices) {
         this.showPrices = true
       }
     },
-    getContentPrice(){
+    getContentPrice() {
       for (let i = 0; i < this.typeList.length; i++) {
         for (let j = i + 1; j < this.typeList.length; j++) {
           if (this.typeList[i].promotionId === this.typeList[j].promotionId) {
@@ -868,7 +745,7 @@ export default {
         }
       }
       console.log(this.typeList)
-        if(this.typeList.length >= 3){
+      if (this.typeList.length >= 3) {
         console.log(123123)
         this.getContentPrice()
       }
@@ -889,7 +766,7 @@ export default {
         }
       });
     },
-    Toprint(){
+    Toprint() {
       this.facesheetFlag = true;
       API_Logistics.getCheckedOn().then(res => {
         if (res.success) {
@@ -937,35 +814,83 @@ export default {
     //订单发货
     orderDeliver() {
       this.facesheetFlag = false
+      if (this.logisticsType == 'SHUNFENG') {
+        this.$Modal.confirm({
+          title: "确认发货",
+          content: "您确认使用顺丰发货 " + this.sn + " 订单?",
+          loading: true,
+          onOk: () => {
+            API_Order.orderShunFengDelivery(this.sn).then((res) => {
+              if (res.success) {
+                this.$Modal.remove();
+                this.$Message.success("订单发货成功");
+                this.getDataDetail()
+              }
+            })
+          }
+        })
+      } else {
         API_Order.getLogisticsChecked().then((res) => {
           if (res.success) {
             this.checkedLogistics = res.result;
             this.orderDeliverModal = true;
           }
         });
+      }
     },
-    Toprints(){
+    //顺丰打印面单
-      if(this.form.logisticsId != null && this.form.logisticsId != ''){
+    sfPrint() {
+      API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
+        if (res.success) {
+          let headers = {
+            'X-Auth-token': res.result.token
+          }
+          API_Logistics.getShunFengFaceSheet(res.result.url, headers).then(res => {
+            const blob = new Blob([res], {
+              type: "application/pdf;charset=utf-8",
+            });
+            console.log("出发blob");
+            //对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+            //IE10以上支持blob但是依然不支持download
+            if ("download" in document.createElement("a")) {
+              //支持a标签download的浏览器
+              const link = document.createElement("a"); //创建a标签
+              link.download = this.orderInfo.order.sn + ".pdf"; //a标签添加属性
+              link.style.display = "none";
+              link.href = URL.createObjectURL(blob);
+              document.body.appendChild(link);
+              link.click(); //执行下载
+              URL.revokeObjectURL(link.href); //释放url
+              document.body.removeChild(link); //释放标签
+            } else {
+              navigator.msSaveBlob(blob, fileName);
+            }
+          })
+        }
+      })
+    },
+    Toprints() {
+      if (this.form.logisticsId != null && this.form.logisticsId != '') {
         this.orderDeliverModal = false;
       }
     },
     //订单发货提交
     orderDeliverySubmit() {
-      if(this.facesheetFlag){
+      if (this.facesheetFlag) {
         this.$refs['faceSheetForm'].validate((valid) => {
           if (valid) {
             API_Order.getOrderFaceSheet(this.sn, this.faceSheetForm).then(res => {
               if (res.success) {
-                this.someJSONdata = res.result;
+                this.someJSONdata = res.result.printTemplate;
                 this.Toprints();
               }
             })
           }
         })
-      }else{
+      } else {
         this.$refs['orderDeliveryForm'].validate((valid) => {
           if (valid) {
-            API_Order.orderDelivery(this.sn,this.orderDeliveryForm).then(
+            API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then(
               (res) => {
                 if (res.success) {
                   this.$Message.success("订单发货成功");
@@ -1014,14 +939,24 @@ export default {
         }
       });
     },
+
+    getLogisticsSetting() {
+      API_Logistics.getLogisticsSetting().then(res => {
+        if (res.success) {
+          this.logisticsType = res.result;
+        }
+      })
+    },
+
   },
   mounted() {
     this.sn = this.$route.query.sn;
     this.getDataDetail();
+    this.getLogisticsSetting();
   },
   // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
-  beforeRouteLeave(to, from, next){
+  beforeRouteLeave(to, from, next) {
-    if(to.name === 'orderList' || to.name === 'virtualOrderList') {
+    if (to.name === 'orderList' || to.name === 'virtualOrderList') {
       to.meta.keepAlive = true
     }
     next()
@@ -1031,9 +966,10 @@ export default {
 <style lang="scss" scoped>
 // 建议引入通用样式 可删除下面样式代码
 // @import "@/styles/table-common.scss";
-.lineH30{
+.lineH30 {
   line-height: 30px;
 }
+
 .order-log-div {
   line-height: 30px;
   height: 500px;
@@ -1044,6 +980,7 @@ dl dt {
   width: 100px;
   text-align: right;
 }
+
 .div-express-log {
   max-height: 300px;
   border: solid 1px #e7e7e7;
@@ -1057,16 +994,19 @@ dl dt {
   margin: 5px;
   padding: 10px;
   list-style-type: none;
+
   .time {
     width: 30%;
     display: inline-block;
     float: left;
   }
+
   .detail {
     width: 60%;
     margin-left: 30px;
     display: inline-block;
   }
+
   li {
     line-height: 30px;
   }
@@ -1110,11 +1050,11 @@ dl dt {
     line-height: 35px;
     display: flex;
 
-    > .div-item-left {
+    >.div-item-left {
       width: 80px;
     }
 
-    > .div-item-right {
+    >.div-item-right {
       flex: 1;
       word-break: break-all;
     }
@@ -1159,27 +1099,32 @@ dl dt {
     }
   }
 }
-.theme_color{
+
+.theme_color {
   color: $theme_color;
 }
-.f14{
+
+.f14 {
   font-size: 14px;
   color: #333;
 }
-.printgoodtitle{
+
+.printgoodtitle {
   font-size: 14px;
   line-height: 1.5;
   margin-top: 15px;
   color: #333;
 }
-.printgoodinfo{
+
+.printgoodinfo {
   // font-size: 14px;
   // background: #f2f2f2;
   // border-bottom:2px solid #333 ;
   padding: 10px;
   overflow: hidden;
   color: #333;
-  .printgooditem{
+
+  .printgooditem {
     border-bottom: 1px solid #e8eaec;
     display: flex;
     align-items: flex-start;
@@ -1187,35 +1132,43 @@ dl dt {
     line-height: 30px;
     margin-bottom: 10px;
     padding-bottom: 10px;
-    .printgoodname{
+
+    .printgoodname {
       flex: 1;
       overflow: hidden;
-      .printgoodguid{
+
+      .printgoodguid {
         font-size: 12px;
-        color:#999999;
+        color: #999999;
-        line-height:1.5;
+        line-height: 1.5;
-        .printgoodguiditem{
+
+        .printgoodguiditem {
           margin-right: 10px;
         }
       }
     }
-    .printgoodprice{
+
+    .printgoodprice {
       width: 135px;
       margin-left: 15px;
     }
-    .printgoodnumber{
+
+    .printgoodnumber {
       width: 85px;
       margin-left: 15px;
     }
   }
 }
+
 @media print {
-  @page{
+  @page {
     size: auto;
     margin: 3mm;
   }
-  html,body{
+
-    height:inherit;
+  html,
+  body {
+    height: inherit;
   }
 }
 </style>

seller/src/views/shop/ship/logistics.vue

@@ -329,7 +329,7 @@ export default {
         content: "您确认关闭此物流公司?",
         loading: true,
         onOk: () => {
-          API_Shop.logisticsUnChecked(v.selected).then((res) => {
+          API_Shop.logisticsUnChecked(v.logisticsId).then((res) => {
             this.$Modal.remove();
             if (res.success) {
               this.$Message.success("物流公司关闭成功");