commit

manager/src/views/distribution/distributionCash.vue

@@ -4,12 +4,12 @@
         <Form ref="searchForm" :model="searchForm"  class="search-form">
           <Form-item label="会员名称"  class="flex" prop="memberName">
             <Input
-              type="text" v-model="searchForm.memberName"
+              type="text" v-model="searchForm.memberName" clearable
               style="width: 200px"></Input>
           </Form-item>
           <Form-item label="编号" class="flex">
             <Input
-              type="text" v-model="searchForm.sn"
+              type="text" v-model="searchForm.sn" clearable
               style="width: 200px"></Input>
           </Form-item>
           <Form-item label="状态"

manager/src/views/lili-dialog/goods-dialog.vue

@@ -62,9 +62,11 @@ export default {
     };
   },
   props: {
-    selectedWay: {
+    selectedWay: { 
       type: Array,
-      default: new Array()
+      default: function(){
+        return new Array()
+      }
     }
   },
   watch: {

manager/src/views/lili-dialog/template/marketing.vue

@@ -22,7 +22,7 @@
 
           <Table height="350" border tooltip :loading="loading" :columns="activeColumns" :data="showPromotionList"></Table>
 
-          <Page @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" class="mt_10" :total="totals" size="small" show-elevator />
+          <Page @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" class="mt_10" :total="Number(totals)" size="small" show-elevator />
 
         </div>
 
@@ -187,6 +187,7 @@ export default {
                   on: {
                     click: () => {
                       this.selectedPromotion(params);
+                      console.log(this.index)
                     },
                   },
                 },

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

@@ -1,15 +1,36 @@
 <template>
   <div class="layout">
     <div class="goods-cell-title">
-      <div class="goods-item-title" :class="{ selected: selected.index == index }" @click="handleClickTitle(title, index)" v-for="(title, index) in res.list[0].titleWay" :key="index">
+      <div
+        class="goods-item-title"
+        :class="{ selected: selected.index == index }"
+        @click="handleClickTitle(title, index)"
+        v-for="(title, index) in res.list[0].titleWay"
+        :key="index"
+      >
         <h4>{{ title.title }}</h4>
         <div>{{ title.desc }}</div>
       </div>
     </div>
     <div class="goods-list">
-      <div v-if="item.___index != undefined  ?   (selected.index == item.___index) : ( selected.val == item.type)" class="goods-item" v-for="(item, item_index) in res.list[0].listWay" :key="item_index">
+      <div
+        v-if="
+          item.___index != undefined
+            ? selected.index == item.___index
+            : selected.val == item.type
+        "
+        class="goods-item"
+        v-for="(item, item_index) in res.list[0].listWay"
+        :key="item_index"
+      >
         <div class="goods-img">
-          <Icon size="20" color="#e1251b" @click="closeGoods(item, item_index)" class="goods-icon" type="ios-close-circle" />
+          <Icon
+            size="20"
+            color="#e1251b"
+            @click="closeGoods(item, item_index)"
+            class="goods-icon"
+            type="ios-close-circle"
+          />
           <img :src="item.img" alt />
         </div>
         <div class="goods-desc">
@@ -70,7 +91,7 @@ export default {
   }
   > div {
     font-weight: bold;
-    color: #e4393c !important;
+    color: $theme_color !important;
   }
 }
 .goods-cell-title {
@@ -137,7 +158,7 @@ export default {
     display: flex;
     > .goods-price {
       line-height: 2;
-      color: #e4393c;
+      color: $theme_color;
     }
   }
 }

manager/src/views/lili-floor-renovation/wap/wapList.vue

@@ -32,7 +32,7 @@
         </div>
         <div class="no-more" v-if="list.length ==0">暂无更多模板</div>
       </div>
-      <Page :total="total" size="small" @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" />
+      <Page :total="total" size="small" @on-change="(val) => {params.pageNumber = val; } " :current="params.pageNumber" :page-size="params.pageSize" show-sizer  :page-size-opts="[10, 20, 50]" @on-page-size-change="changePageSize"/>
 
     </Card>
 
@@ -74,8 +74,8 @@ export default {
       params: { // 请求参数
         pageNumber: 1,
         pageSize: 10,
-        sort: "",
-        order: "asc",
+        sort: "createTime",
+        order: "desc",
         pageType: "INDEX",
         pageClientType: "H5",
       },
@@ -147,6 +147,12 @@ export default {
       this.$router.push({
         path: "/floorList/main",
       });
+    },
+     // 分页 改变页数
+     changePageSize(v) {
+      this.params.pageNumber = 1;
+      this.params.pageSize = v;
+      this.init();
     },
     // 删除模板
     handleDel(val) {