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

buyer/src/pages/shopEntry/FirstApply.vue

@@ -234,7 +234,7 @@ export default {
         ],
         companyPhone: [
           { required: true, message: '请填写公司电话' },
-          { pattern: RegExp.TEL, message: '请填写正确的号码' }
+          { pattern: RegExp.mobile, message: '请填写正确的号码' }
         ],
         companyEmail: [
           { required: true, message: '请填写电子邮箱' },

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

@@ -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,7 +100,7 @@
                     </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 | unitPrice('￥') }}

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

@@ -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="">
@@ -53,12 +53,6 @@
                   <span> 订单金额： <span style="color: red;">{{
                     item.orderItems[0].goodsPrice | unitPrice("￥")
                   }}</span></span>
-                  <!-- <span class="order_status" v-if="item.orderStatus"
-                    :style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == 'TAKE' ? '#5a606b' : '#f23030' }">{{
-  item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
-    'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
-      ? '已发货' : 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

im/src/main.js

@@ -30,7 +30,7 @@ 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')
   }