merge code

manager/src/views/lili-floor-renovation/wap/template/tpl_goods.vue

@@ -98,7 +98,7 @@ export default {
   padding: 10px;
   transition: 0.35s;
   display: flex;
-  cursor: pointer;
+  // cursor: pointer;
   > .goods-item-title {
     flex: 1;
     text-align: center;

manager/src/views/seller/shop/shopOperation.vue

@@ -444,7 +444,7 @@ export default {
       addSettlementBtn: true, // 添加结算日按钮
       day: 1, //结算日
       tabName: "base", // tab栏name值
-      tabNameList: ["base", "entry", "category", "send", "settlement"], // tab栏name值数组
+      tabNameList: ["base", "entry", "category", "settlement"], // tab栏name值数组
       shopValidate: {
         // 表单验证规则
         memberName: [{ required: true, message: "会员不能为空" }],

seller/src/views/order/after-order/reurnGoodsOrderDetail.vue

@@ -505,6 +505,7 @@ export default {
           this.getDetail();
         }
       });
+       this.submitLoading = false;
     },
     // 返回售后状态中文描述
     filterStatus(status) {