merge master

seller/src/views/Main.vue

@@ -24,7 +24,7 @@
                   <Avatar :src="userInfo.storeLogo" style="background: #fff;margin-left: 10px;"></Avatar>
                 </div>
                 <DropdownMenu slot="list">
-                  <DropdownItem name="changePass">切换</DropdownItem>
+                  <DropdownItem name="changePass">修改密码</DropdownItem>
                   <DropdownItem name="loginOut" divided>退出</DropdownItem>
                 </DropdownMenu>
               </Dropdown>

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -509,6 +509,7 @@ export default {
           isIndex: "",
           required: "",
           paramId: "",
+          sort: ""
         };
       }
       this.baseInfoForm.goodsParamsDTOList[groupIndex].goodsParamsItemDTOList[
@@ -519,6 +520,7 @@ export default {
         isIndex: params.isIndex,
         required: params.required,
         paramId: params.id,
+        sort: params.sort
       };
     },
     // 编辑sku图片

seller/src/views/lili-components/affix-time.vue

@@ -112,8 +112,16 @@ export default {
       item.storeId = this.storeId;
       this.month = "";
 
-      if (item.searchType == "") {
-        item.searchType = "LAST_SEVEN";
+       if (item.searchType == "") {
+        if (
+          dateList.some((date) => {
+            return date.title == item.title;
+          })
+        ) {
+          item.searchType = date.searchType;
+        } else {
+          item.searchType = "LAST_SEVEN";
+        }
       }
 
       this.selectedWay = item;

seller/src/views/statistics/order.vue

@@ -97,7 +97,7 @@
               <div class="block">
                 <div class="box">
                   <span>付款笔数</span>
-                  <span>{{overViewList.paymentsNum  || 0 }}</span>
+                  <span>{{overViewList.paymentOrderNum  || 0 }}</span>
                 </div>
               </div>