Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

crmeb/app/services/product/product/StoreProductReplyServices.php

@@ -216,7 +216,7 @@ class StoreProductReplyServices extends BaseServices
         [$page, $limit] = $this->getPageValue();
         $list = $this->dao->replyList($id, $type, $page, $limit);
         foreach ($list as &$item) {
-            $item['suk'] = isset($item['cart_info']['productInfo']['attrInfo']) ? $item['cart_info']['productInfo']['attrInfo']['suk'] : '';
+            $item['suk'] = $item['suk'] != '' ? $item['suk'] : (isset($item['cart_info']['productInfo']['attrInfo']) ? $item['cart_info']['productInfo']['attrInfo']['suk'] : '');
             $item['nickname'] = anonymity($item['nickname']);
             $item['merchant_reply_time'] = date('Y-m-d H:i', $item['merchant_reply_time']);
             $item['add_time'] = time_tran($item['add_time']);

template/admin/src/pages/kefu/pc/index.vue

@@ -51,9 +51,7 @@
                             <div class="name line1">
                               {{ item.productInfo.store_name }}
                             </div>
-                            <div class="sku">
-                              库存：{{ item.productInfo.stock }} 销量：{{ item.productInfo.sales }}
-                            </div>
+                            <div class="sku">库存：{{ item.productInfo.stock }} 销量：{{ item.productInfo.sales }}</div>
                             <div class="price-box">
                               <div class="num">¥ {{ item.productInfo.price }}</div>
                               <a herf="javascript:;" class="more" @click.stop="lookGoods(item)">查看商品 ></a>
@@ -127,6 +125,7 @@
             </div>
             <div class="textarea-box" style="position: relative">
               <Input
+                ref="chatInput"
                 v-paste="handleParse"
                 v-model="chatCon"
                 type="textarea"
@@ -443,6 +442,7 @@ export default {
         }
         this.sendMsg(e.target.value, 1);
         this.chatCon = '';
+        this.$nextTick(() => this.$refs.chatInput.focus());
       }
     },
     // 输入框选择表情
@@ -497,6 +497,7 @@ export default {
     sendText() {
       this.sendMsg(this.chatCon, 1);
       this.chatCon = '';
+      this.$nextTick(() => this.$refs.chatInput.focus());
     },
 
     // 统一发送处理
@@ -941,4 +942,7 @@ export default {
 .emoji-box::-webkit-scrollbar {
   width: 0;
 }
+.textarea-box /deep/ .ivu-input:focus{
+  box-shadow: none;
+}
 </style>

template/admin/src/pages/order/orderList/components/tableList.vue

@@ -73,10 +73,12 @@
             (row.status === 4 || row._status === 2 || row._status === 8) &&
             row.shipping_type === 1 &&
             (row.pinkStatus === null || row.pinkStatus === 2) &&
-            row.is_del !== 1
+            row.is_del !== 1 &&
+            !row.is_stock_up
           "
           >发送货</a
         >
+        <a v-else-if="row.is_stock_up" @click="changeMenu(row, '13')">取消商家寄件</a>
         <a @click="delivery(row)" v-if="row._status === 4 && !row.split.length">配送信息</a>
         <a
           @click="bindWrite(row)"
@@ -201,6 +203,7 @@ import {
   refundIntegral,
   getDistribution,
   writeUpdate,
+  shipmentCancelOrder,
 } from '@/api/order';
 import { mapState, mapMutations } from 'vuex';
 import editFrom from '../../../../components/from/from';
@@ -327,6 +330,7 @@ export default {
     ...mapMutations('order', ['getIsDel', 'getisDelIdListl']),
     // 操作
     changeMenu(row, name) {
+      console.log(row, name);
       this.orderId = row.id;
       switch (name) {
         case '1':
@@ -422,6 +426,22 @@ export default {
         case '12':
           this.printImg(row.kuaidi_label);
           break;
+        case '13':
+          this.delfromData = {
+            title: '取消寄件',
+            info: '您确认取消商家寄件吗?',
+            url: `/order/shipment_cancel_order/${row.id}`,
+            method: 'post',
+          };
+          this.$modalSure(this.delfromData)
+            .then((res) => {
+              this.$Message.success(res.msg);
+              this.getList();
+            })
+            .catch((res) => {
+              this.$Message.error(res.msg);
+            });
+          break;
         default:
           this.delfromData = {
             title: '删除订单',

template/admin/src/pages/order/orderList/handle/orderSend.vue

@@ -77,7 +77,7 @@
             <RadioGroup v-model="formItem.day_type" type="button">
               <Radio :label="0">今天</Radio>
               <Radio :label="1">明天</Radio>
-              <Radio :label="2">后台</Radio>
+              <Radio :label="2">后天</Radio>
             </RadioGroup>
           </FormItem>
           <FormItem label="取件时间：" v-if="formItem.express_record_type == 3">
@@ -525,6 +525,7 @@ export default {
     cancel(name) {
       this.modals = false;
       this.orderStatus = 0;
+      this.sendPrice = 0;
       this.splitSwitch = false;
       this.selectData = [];
       this.formItem.type = '1';

template/uni-app/pages/annex/vip_paid/index.vue

@@ -769,7 +769,7 @@
 				data.from = 'routine';
 				// #endif
 				uni.showLoading({
-					title: this.$t(`active`)
+					title: this.$t(`激活中`)
 				});
 				memberCardDraw(data).then(res => {
 					let that = this;