Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

README.md

@@ -2,19 +2,14 @@
 
 #### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，其他问题先看文档后提问）
 
+#### 不用削尖脑袋往老群里加，老群活跃度较低，很多潜水党，新群相对而言活跃一些 :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: :tw-1f606: 
+
+#### PS： **演示站点所有环境均部署master分支。如果有演示站点问题，可以反馈，如果演示站点没问题本地运行有问题，需自行处理** 
 
 ##### 交流 qq 1群 961316482（已满）
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=BAhURE3DG2YWhQk6kRxVapbLykqMoPS8&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群" title="Lilishop交流群">点击快捷加群</a>
-
 ##### 交流 qq 2群 875294241（已满）
-
+##### 交流 qq 3群 263785057（已满）
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=_lrekOvr5k2p5uTn5GRidI-chKEmpCX3&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群2群" title="Lilishop交流群2群">点击快捷加群</a>
+##### 交流 qq 4群 674617534
-
-
-##### 交流 qq 3群 263785057
-
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=VUogkDvaso4zLTFH8nxFPDRKq0EthUn1&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群3群" title="Lilishop交流群3群">点击快捷加群</a>
-
 
 ##### 体验 公众号/小程序/APP 体验，扫描二维码
 
@@ -166,6 +161,7 @@ PS：手机验证码为 ‘111111’
 
 ### 交流群
 
-##### 官方qq 1群 961316482（已满）
+##### 交流 qq 1群 961316482（已满）
-##### 官方qq 2群 875294241（已满）
+##### 交流 qq 2群 875294241（已满）
-##### 官网qq 3群 263785057
+##### 交流 qq 3群 263785057（已满）
+##### 交流 qq 4群 674617534

buyer/src/assets/styles/global.scss

@@ -170,6 +170,19 @@ $dark_content_color: #d5d5d5;
     margin-right: 20px;
 }
 
+.mb_24 {
+    margin-bottom: 24px;
+}
+.mt_24 {
+    margin-top: 24px;
+}
+.ml_24 {
+    margin-left: 24px;
+}
+.mr_24 {
+    margin-right: 24px;
+}
+
 .mb_10 {
     margin-bottom: 10px;
 }

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -4,7 +4,7 @@
     <card _Title="我的订单" :_Size="16" :_Tabs="changeWay" @_Change="change" v-if="!homePage"></card>
     <card _Title="我的订单" :_Size="16" :_Tabs="changeWay" @_Change="change" _More="全部订单" _Src="/home/MyOrder" v-else></card>
     <!-- 搜索 筛选 -->
-    <div class="mb_20 box" v-if="!homePage">
+    <div class="mb_24 box" v-if="!homePage">
       <div class="global_float_right" >
         <Input
           class="width_300"

im/.env

@@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
 VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
 VUE_APP_COMMON=https://common-api.pickmall.cn
 VUE_APP_BUYER=https://buyer-api.pickmall.cn
-VUE_APP_SELLER=https://seller-api.pickmall.cn
+VUE_APP_SELLER=https://store-api.pickmall.cn
 VUE_APP_WEBSITE_NAME="LiLi IM"
 VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
 VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/

im/.env.development

@@ -4,7 +4,7 @@ VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
 VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
 VUE_APP_COMMON=https://common-api.pickmall.cn
 VUE_APP_BUYER=https://buyer-api.pickmall.cn
-VUE_APP_SELLER=https://seller-api.pickmall.cn
+VUE_APP_SELLER=https://store-api.pickmall.cn
 VUE_APP_WEBSITE_NAME="LiLi IM"
 VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
 VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/

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

@@ -84,7 +84,7 @@
                           </el-tooltip>
                         </div>
                         <div class="price">
-                          <span>￥{{ item.text.price }}</span>
+                          <span>{{ item.text.price | unitPrice('￥') }}</span>
                         </div>
                       </div>
                     </div>
@@ -92,7 +92,7 @@
                   <div v-if="item.messageType == 'ORDER' && item.text != null" class="oderStyle" :class="{
                     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>
@@ -100,10 +100,10 @@
                     </div>
                     <div class="baseTwo">
                       <img :src="item.text.groupImages" style="height: 100px;width: 100px;margin-top: 10px;" />
-                      <span class="orderGoodsName" @click="linkToOrders(item.text.sn)">{{ item.text.groupName }}</span>
+                      <span class="orderGoodsName">{{ item.text.groupName }}</span>
                       <span class="orderGoodsTime">{{ item.text.paymentTime }}</span>
                       <span class="orderFlowPrice">
-                        订单金额：￥{{ item.text.flowPrice }}
+                        订单金额：{{ item.text.flowPrice | unitPrice('￥') }}
                       </span>
                       <span class="order_status"
                         :style="{ 'color': item.text.orderStatus == 'CANCELLED' || item.text.orderStatus == 'UNPAID' || item.text.orderStatus == ' TAKE' ? '#5a606b' : '#f23030' }">{{
@@ -186,6 +186,7 @@ import PanelToolbar from "./PanelToolbar";
 import SocketInstance from "@/im-server/socket-instance";
 import { SvgMentionDown } from "@/core/icons";
 import { formatTime, parseTime, copyTextToClipboard } from "@/utils/functions";
+import { unitPrice } from '@/plugins/filters';
 
 import {
   ServeTalkRecords,

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

@@ -17,7 +17,7 @@
 
                   <div style="display: flex;">
                     <div style="margin-top: 20px;">
-                      <span style="color: red;">￥{{ item.price }}</span>
+                      <span style="color: red;">{{ item.price | unitPrice("￥") }}</span>
                       <div class="goods_store_button">
                         <el-button type="danger" v-if="item.btnHide == 1 && toUser.storeFlag" size="mini"
                           @click="submitSendGoodsMessage(item)" plain>发送</el-button>
@@ -37,7 +37,7 @@
             <dd v-for="(item, index) in orderList" v-infinite-scroll="loadMore" :key="index">
               <div class="orderlist">
                 <div class="order_top order_padding">
-                  <span class="order_sn">订单号:{{ item.sn }}</span>
+                  <span class="order_sn" @click="linkToOrders(item.sn)">订单号:{{ item.sn }}</span>
                 </div>
                 <div class="order_section order_padding">
                   <img :src="item.groupImages" alt="">
@@ -50,16 +50,17 @@
                   </div>
                 </div>
                 <div class="order_footer order_padding">
-                  <span> 订单金额： <span style="color: red;">￥{{ item.orderItems[0].goodsPrice }}</span></span>
+                  <span> 订单金额： <span style="color: red;">{{
-                  <!-- <span class="order_status" v-if="item.orderStatus"
+                    item.orderItems[0].goodsPrice | unitPrice("￥")
-                    :style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == 'TAKE' ? '#5a606b' : '#f23030' }">{{
+                  }}</span></span>
-  item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
+                  <el-tag :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' ? '待校验' :
-                    }}</span> -->
+                            ''
-                    <el-tag :type="col[item.orderStatus]">{{ item.orderStatus == 'STAY_PICKED_UP' ? '待自提' :item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
+                  }}</el-tag>
-    'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
-      ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待校验' : ''}}</el-tag>
                 </div>
 
               </div>
@@ -75,6 +76,8 @@
 <script>
 import { Tag, button, Tabs, TabPane, InfiniteScroll } from 'element-ui'
 import { mapState, mapGetters } from "vuex";
+import { unitPrice } from '@/plugins/filters';
+
 export default {
   directives: {
     "infinite-scroll": InfiniteScroll,
@@ -256,12 +259,14 @@ export default {
   color: #5a606b;
   box-sizing: border-box;
 }
+
 .box::-webkit-scrollbar {
   width: 0px !important;
 }
 
 .order_top {
   border-bottom: 1px solid #f2f2f2;
+
   .order_sn {}
 }
 
@@ -312,6 +317,7 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap
 }
+
 /deep/ .el-tabs__header {
   position: absolute;
   width: 362px;
@@ -320,12 +326,14 @@ export default {
   z-index: 2;
   background: #ffffff;
 }
+
 // /deep/ .el-tabs__item.is-top:last-child {
 //   color: black;
 // }
 /deep/.is-active {
   color: #f23030;
 }
+
 /deep/.el-tabs__active-bar {
   background-color: #f23030;
 }
@@ -339,18 +347,22 @@ export default {
   justify-content: center;
   align-items: center;
 }
+
 /deep/.el-tabs__content {
   margin-top: 50px;
 }
+
 .box {
   height: 700px;
   overflow: auto;
   // margin-top: 50px;
   // width: 350px;
 }
+
 .order_padding {
   padding: 0 10px;
 }
+
 .store-button {
   background-color: white;
   border-color: #F56C6C;
@@ -386,6 +398,7 @@ export default {
 .separate {
   margin-top: 8px;
 }
+
 // .el-tabs--card {
 //   height: calc(100vh - 110px);
 //   overflow-y: auto; 

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

@@ -8,7 +8,7 @@
       <div style="margin-left: 13px">
         <a @click="linkToGoods(goodsDetail.goodsId, goodsDetail.id)"> {{ goodsDetail.goodsName }} </a>
         <div>
-          <span style="color: red;">￥{{ goodsDetail.price }}</span>
+          <span style="color: red;">{{ goodsDetail.price | unitPrice('￥') }}</span>
         </div>
         <div v-if="hide">
           <el-button class="store-button" type="danger" v-if="btnHide == 1 && toUser.storeFlag" size="mini"

im/src/main.js

@@ -15,6 +15,10 @@ import './core/filter'
 import './core/directives'
 import '@/permission'
 import '@/icons'
+import * as filters from "./plugins/filters";
+Object.keys(filters).forEach((key) => {
+  Vue.filter(key, filters[key]);
+});
 
 // 引入自定义全局css
 import '@/assets/css/global.less'
@@ -26,9 +30,9 @@ Vue.component('face-null', faceNull)
 
 Vue.prototype.linkToGoods = function (goodsId, skuId) {  // 跳转买家端商品
   if (localStorage.getItem('storeFlag') == 'false') {
-    window.open(`${config.PC_STORE}goods-operation-edit?id=${goodsId}`, '_blank')
+    window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
   } else {
-    window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+    window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
   }
 };
 Vue.prototype.linkToStore = function (storeId) {  // 跳转商家端商品
@@ -42,7 +46,7 @@ Vue.prototype.linkToOrders = function (sn) {
     window.open(`${config.PC_STORE}order-detail?sn=${sn}`, '_blank')
   } else {
     // 用户
-    window.open(`${config.PC_URL}/OrderDetail?sn=${sn}`, '_blank')
+    window.open(`${config.PC_URL}home/OrderDetail?sn=${sn}`, '_blank')
   }
 };
 

im/src/plugins/Foundation.js

@@ -0,0 +1,200 @@
+/**
+ * 一些常用的基础方法
+ * unixToDate    将unix时间戳转换为指定格式
+ * dateToUnix    将时间转unix时间戳
+ * deepClone     对一个对象进行深拷贝
+ * formatPrice   货币格式化
+ * secrecyMobile 手机号隐私保护
+ * randomString  随机生成指定长度的字符串
+ */
+
+
+
+/**
+ * 验证银行卡号
+ */
+ export function checkBankno(bankno) {
+  var lastNum = bankno.substr(bankno.length - 1, 1); //取出最后一位（与luhm进行比较）
+  var first15Num = bankno.substr(0, bankno.length - 1); //前15或18位
+  var newArr = [];
+
+  for (var i = first15Num.length - 1; i > -1; i--) {
+    //前15或18位倒序存进数组
+    newArr.push(first15Num.substr(i, 1));
+  }
+
+  var arrJiShu = []; //奇数位*2的积 <9
+  var arrJiShu2 = []; //奇数位*2的积 >9
+  var arrOuShu = []; //偶数位数组
+  for (var j = 0; j < newArr.length; j++) {
+    if ((j + 1) % 2 == 1) {
+      //奇数位
+      if (parseInt(newArr[j]) * 2 < 9) arrJiShu.push(parseInt(newArr[j]) * 2);
+      else arrJiShu2.push(parseInt(newArr[j]) * 2);
+    } //偶数位
+    else arrOuShu.push(newArr[j]);
+  }
+
+  var jishu_child1 = []; //奇数位*2 >9 的分割之后的数组个位数
+  var jishu_child2 = []; //奇数位*2 >9 的分割之后的数组十位数
+  for (var h = 0; h < arrJiShu2.length; h++) {
+    jishu_child1.push(parseInt(arrJiShu2[h]) % 10);
+    jishu_child2.push(parseInt(arrJiShu2[h]) / 10);
+  }
+
+  var sumJiShu = 0; //奇数位*2 < 9 的数组之和
+  var sumOuShu = 0; //偶数位数组之和
+  var sumJiShuChild1 = 0; //奇数位*2 >9 的分割之后的数组个位数之和
+  var sumJiShuChild2 = 0; //奇数位*2 >9 的分割之后的数组十位数之和
+  var sumTotal = 0;
+  for (var m = 0; m < arrJiShu.length; m++) {
+    sumJiShu = sumJiShu + parseInt(arrJiShu[m]);
+  }
+  for (var n = 0; n < arrOuShu.length; n++) {
+    sumOuShu = sumOuShu + parseInt(arrOuShu[n]);
+  }
+  for (var p = 0; p < jishu_child1.length; p++) {
+    sumJiShuChild1 = sumJiShuChild1 + parseInt(jishu_child1[p]);
+    sumJiShuChild2 = sumJiShuChild2 + parseInt(jishu_child2[p]);
+  }
+  //计算总和
+  sumTotal =
+    parseInt(sumJiShu) +
+    parseInt(sumOuShu) +
+    parseInt(sumJiShuChild1) +
+    parseInt(sumJiShuChild2);
+  //计算Luhm值
+  var k = parseInt(sumTotal) % 10 == 0 ? 10 : parseInt(sumTotal) % 10;
+  var luhm = 10 - k;
+  if (lastNum == luhm) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+
+
+
+/**
+ * 将unix时间戳转换为指定格式
+ * @param unix   时间戳【秒】
+ * @param format 转换格式
+ * @returns {*|string}
+ */
+function unixToDate (unix, format) {
+  if (!unix) return unix
+  let _format = format || 'yyyy-MM-dd hh:mm:ss'
+  const d = new Date(unix)
+  const o = {
+    'M+': d.getMonth() + 1,
+    'd+': d.getDate(),
+    'h+': d.getHours(),
+    'm+': d.getMinutes(),
+    's+': d.getSeconds(),
+    'q+': Math.floor((d.getMonth() + 3) / 3),
+    S: d.getMilliseconds()
+  }
+  if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (const k in o)
+    if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) :
+      (('00' + o[k]).substr(('' + o[k]).length)))
+  return _format
+}
+
+/**
+ * 将时间转unix时间戳
+ * @param date
+ * @returns {number} 【秒】
+ */
+function dateToUnix (date) {
+  let newStr = date.replace(/:/g, '-')
+  newStr = newStr.replace(/ /g, '-')
+  const arr = newStr.split('-')
+  const datum = new Date(Date.UTC(
+    arr[0],
+    arr[1] - 1,
+    arr[2],
+    arr[3] - 8 || -8,
+    arr[4] || 0,
+    arr[5] || 0
+  ))
+  return parseInt(datum.getTime() / 1000)
+}
+
+/**
+ * 货币格式化
+ * @param price
+ * @returns {string}
+ */
+function formatPrice (price) {
+  if (typeof price !== 'number') return price
+  return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+}
+
+/**
+ * 手机号隐私保护
+ * 隐藏中间四位数字
+ * @param mobile
+ * @returns {*}
+ */
+function secrecyMobile (mobile) {
+  mobile = String(mobile)
+  if (!/\d{11}/.test(mobile)) {
+    return mobile
+  }
+  return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3')
+}
+
+/**
+ * 随机生成指定长度的字符串
+ * @param length
+ * @returns {string}
+ */
+function randomString (length = 32) {
+  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+  const maxPos = chars.length
+  let _string = ''
+  for (let i = 0; i < length; i++) {
+    _string += chars.charAt(Math.floor(Math.random() * maxPos))
+  }
+  return _string
+}
+
+/**
+ * 计算传秒数的倒计时【天、时、分、秒】
+ * @param seconds
+ * @returns {{day : *, hours : *, minutes : *, seconds : *}}
+ */
+
+function countTimeDown (seconds) {
+  const leftTime = (time) => {
+    if (time < 10) time = '0' + time
+    return time + ''
+  }
+  return {
+    day: leftTime(parseInt(seconds / 60 / 60 / 24, 10)),
+    hours: leftTime(parseInt(seconds / 60 / 60 % 24, 10)),
+    minutes: leftTime(parseInt(seconds / 60 % 60, 10)),
+    seconds: leftTime(parseInt(seconds % 60, 10))
+  }
+}
+
+/**
+ * 计算当前时间到第二天0点的倒计时[秒]
+ * @returns {number}
+ */
+function theNextDayTime () {
+  const nowDate = new Date()
+  const time = new Date(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate() + 1, 0, 0, 0).getTime() - nowDate.getTime()
+  return parseInt(time / 1000)
+}
+export {
+  unixToDate,
+  dateToUnix,
+  formatPrice,
+  secrecyMobile,
+  randomString,
+  countTimeDown,
+  theNextDayTime
+}

im/src/plugins/filters.js

@@ -0,0 +1,20 @@
+import * as Foundation from './Foundation.js';
+
+/**
+ * 金钱单位置换  2999 --> 2,999.00
+ * @param val
+ * @param unit
+ * @param location
+ * @returns {*}
+ */
+export function unitPrice (val, unit, location) {
+  if (!val) val = 0;
+  let price = Foundation.formatPrice(val);
+  if (location === 'before') {
+    return price.substr(0, price.length - 3);
+  }
+  if (location === 'after') {
+    return price.substr(-2);
+  }
+  return (unit || '') + price;
+}

im/src/plugins/ws-socket.js

@@ -222,17 +222,22 @@ class WsSocket {
    */
   onMessage (evt) {
     let result = this.onParse(evt);
-    console.log("接收消息", result, "color:red");
+    if (this.onParse(evt).text.includes('goodsName') || this.onParse(evt).text.includes('groupName')) {
-    // 判断消息事件是否被绑定
-    // event_talk;
       let params = {
         ...this.onParse(evt),
         text: JSON.parse(this.onParse(evt).text)
       }
-    // 指定推送消息
+      this.onCallBacks["event_talk"](params);
+    } else {
+      let params = {
+        ...this.onParse(evt),
+        text: this.onParse(evt).text
+      }
       this.onCallBacks["event_talk"](params);
     }
+    // 指定推送消息
 
+  }
   /**
    * WebSocket心跳检测
    */