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

build.sh

@@ -1,7 +1,6 @@
 #代码目录
 code_path=$PWD
 
-git checkout master
 git pull
 
 cd ${code_path}/manager

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

@@ -9,7 +9,7 @@
           class="width_300"
           search
           enter-button
-          v-model="params.sn"
+          v-model="params.keywords"
           @on-search="getList"
           placeholder="请输入订单号搜索"
         />

manager/src/components/affix-time.vue

@@ -204,7 +204,6 @@ export default {
 .breadcrumb {
   display: flex;
   align-items: center;
-
   >span {
     margin-right: 15px;
     cursor: pointer;

manager/src/views/goods/goods-manage/category.vue

@@ -114,14 +114,14 @@
             <InputNumber v-model="formAdd.sortOrder"></InputNumber>
           </FormItem>
           <FormItem label="佣金比例(%)" prop="commissionRate" style="width: 345px">
-            <InputNumber v-model="formAdd.commissionRate"></InputNumber>
+            <InputNumber :max="100" :min="0" v-model="formAdd.commissionRate"></InputNumber>
           </FormItem>
           <FormItem label="是否启用" prop="deleteFlag">
             <i-switch
               size="large"
               v-model="formAdd.deleteFlag"
-              :true-value="0"
+              :true-value="false"
-              :false-value="1"
+              :false-value="true"
             >
               <span slot="open">启用</span>
               <span slot="close">禁用</span>

manager/src/views/page-decoration/wap/advertising.vue

@@ -66,6 +66,13 @@
                   >
                 </div>
               </div>
+
+              <div class="decorate-view">
+                <div class="decorate-view-title">当前页面状态</div>
+                <div>
+                  <Tag :type="result.pageShow === 'OPEN'  ? 'green' : 'red'">{{result.pageShow === 'OPEN' ? '开启' : '关闭'}}</Tag>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -87,6 +94,7 @@ export default {
   },
   data() {
     return {
+      result:"",
       picModelFlag: false, //图片选择器
       type: "full", // 是否全屏
 
@@ -131,6 +139,7 @@ export default {
         res.result.pageData
           ? this.$set(this, "advertising", [JSON.parse(res.result.pageData)])
           : "";
+        this.result = res.result
       });
     },
     // 点击链接

manager/src/views/page-decoration/wap/alertAdvertising.vue

@@ -66,6 +66,13 @@
                   >
                 </div>
               </div>
+
+              <div class="decorate-view">
+                <div class="decorate-view-title">当前页面状态</div>
+                <div>
+                  <Tag :type="result.pageShow === 'OPEN'  ? 'green' : 'red'">{{result.pageShow === 'OPEN' ? '开启' : '关闭'}}</Tag>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -90,6 +97,7 @@ export default {
   },
   data() {
     return {
+      result:"",
       picModelFlag: false, //图片选择器
       type: "full", // 展示方式
       //全屏广告
@@ -140,6 +148,7 @@ export default {
         res.result.pageData
           ? this.$set(this, "advertising", [JSON.parse(res.result.pageData)])
           : "";
+        this.result = res.result
       });
     },
     // 图片选择器回显

manager/src/views/statistics/member.vue

@@ -64,12 +64,12 @@ export default {
           value: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           value: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           value: "LAST_THIRTY",
         },

manager/src/views/statistics/order.vue

@@ -172,18 +172,20 @@
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
         </div>
+        <!-- (index) => {
+              refundParams.pageNumber = index;
+            } -->
+        <!-- (size) => {
+              (refundParams.pageSize = size), (refundParams.pageNumber = 1);
+            } -->
         <Page
           v-if="showRecords"
           size="small"
           @on-change="
-            (index) => {
+            pageNumberChange
-              refundParams.pageNumber = index;
-            }
           "
           @on-page-size-change="
-            (size) => {
+            pageSizeChange
-              (refundParams.pageSize = size), (refundParams.pageNumber = 1);
-            }
           "
           class="mt_10"
           show-total
@@ -452,12 +454,12 @@ export default {
           value: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           value: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           value: "LAST_THIRTY",
         },
@@ -523,6 +525,14 @@ export default {
     },
   },
   methods: {
+    pageNumberChange(val){
+      this.refundParams.pageNumber = val
+      this.getOrderList();
+    },
+    pageSizeChange(val){
+      this.refundParams.pageSize = val
+      this.getOrderList();
+    },
     // 订单图
     initOrderChart() {
       // 默认已经加载 legend-filter 交互
@@ -563,11 +573,13 @@ export default {
 
     clickBreadcrumb(item, index) {
       let callback = JSON.parse(JSON.stringify(item));
-
+      console.log("callback",callback)
       this.orderParams = callback;
 
       this.overViewParams = callback;
       this.refundParams = callback;
+      this.refundParams.pageNumber = 1
+      this.refundParams.pageSize = 10
     },
 
     // 实例化订单概览

manager/src/views/statistics/traffic.vue

@@ -76,12 +76,12 @@ export default {
           value: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           value: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           value: "LAST_THIRTY",
         },

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

@@ -156,12 +156,12 @@
                       <div v-for="(item, $index) in skuInfo" :key="$index" class="sku-item-content">
                         <Card :bordered="true" class="ivu-card-body">
                           <Button slot="extra" type="primary" @click="handleCloseSkuItem($index, item)">
-                            删除规格
+                            删除规格项
                           </Button>
                           <div>
-                            <FormItem class="sku-item-content-val flex" label="规格名">
+                            <FormItem class="sku-item-content-val flex" label="规格项名">
                               <AutoComplete v-model="item.name" :data="skuData" :filter-method="filterMethod"
-                                :maxlength="30" placeholder="请输入规格名称" style="width: 150px"
+                                :maxlength="30" placeholder="请输入规格项名称" style="width: 150px"
                                 @on-focus="changeSkuItem(item.name)" @on-change="
                                   editSkuItem(item.name, $index, item)
                                   ">
@@ -1568,6 +1568,13 @@ export default {
             this.submitLoading = false;
             return;
           }
+
+          if (this.goodsUnitList && !this.goodsUnitList.find(i => i === this.baseInfoForm.goodsUnit)) {
+            submit.goodsUnit = ""
+            this.$Message.error("商品单位不存在");
+            this.submitLoading = false;
+            return;
+          }
           let skuInfoNames = this.skuInfo.map((n) => n.name);
           submit.skuList = [];
           this.skuTableData.map((sku) => {

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

@@ -4,18 +4,10 @@
       <span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
         :key="index"> {{ item.title }}</span>
       <div class="date-picker">
-        <Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询" clearable
+        <Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询"
           style="width:200px;margin-left:10px;">
-          <Option v-for="(item, i) in dates" :value="item.year + '-' + item.month" :key="i" clearable>
+          <Option v-for="(item, index) in dates" :value="item.year + '-' + item.month" :key="index">{{
-            {{ item.year + '年' + item.month + '月' }}</Option>
+            item.year + '年' + item.month + '月' }}</Option>
-        </Select>
-      </div>
-      <div class="shop-list" v-if="!closeShop">
-        <Select clearable @on-change="changeshop(selectedWay)" v-model="storeId" placeholder="店铺查询"
-          style="width:200px;margin-left:10px;">
-          <Scroll :on-reach-bottom="handleReachBottom">
-            <Option v-for="(item, index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
-          </Scroll>
         </Select>
       </div>
     </div>

seller/src/views/promotion/pintuan/pintuan-goods.vue

@@ -277,6 +277,7 @@ export default {
     delGoods(index) {
       // 删除商品
       this.goodsData.splice(index, 1);
+      this.selectCount = 0;
     },
     delAll() {
       // 批量删除商品
@@ -295,6 +296,7 @@ export default {
           this.goodsData = this.goodsData.filter((item) => {
             return !ids.includes(item.skuId);
           });
+          this.selectCount = 0;
         },
       });
     },

seller/src/views/statistics/order.vue

@@ -152,7 +152,7 @@
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
         </div>
-        <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="mt_10" show-total show-elevator :total="total" />
+        <Page @on-change="pageNumberChange" @on-page-size-change="pageSizeChange" class="mt_10" show-total show-elevator :total="total" />
       </div>
     </Card>
 
@@ -377,12 +377,12 @@ export default {
           value: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           value: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           value: "LAST_THIRTY",
         },
@@ -459,6 +459,14 @@ export default {
     },
   },
   methods: {
+    pageNumberChange(val){
+      this.refundParams.pageNumber = val
+      this.getOrderList();
+    },
+    pageSizeChange(val){
+      this.refundParams.pageSize = val
+      this.getOrderList();
+    },
     // 订单图
     initOrderChart() {
       // 默认已经加载 legend-filter 交互

seller/src/views/statistics/traffic.vue

@@ -74,12 +74,12 @@ export default {
           value: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           value: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           value: "LAST_THIRTY",
         },