1

src/components/UserMan/tinyMerchant/wdWithdrawal.vue

@@ -266,9 +266,9 @@
         this.msg.ExcelEnumIds=this.checkedCities;
         let msg = JSON.parse(JSON.stringify(this.msg));
         this.GetLocalFile(
-          "/api/user/GetDistributorRemitListToExcel",
+          "/api/SmallShops/GetSmallShopsRemitListToExcel",
           msg,
-          "分销提现.xls"
+          "微店提现.xls"
         );
       },
       ChangeOpenidState(index,row){

src/components/sallCenter/addAutoreleaseCoupon.vue

@@ -100,6 +100,7 @@
                      background
                      @current-change="handleCurrentChange"
                      :page-size="msg_t.pageSize"
+                     :current-page.sync="msg_t.pageIndex"
                      layout="prev, pager, next"
                      :total="count">
       </el-pagination>
@@ -140,7 +141,8 @@
             msg_t:{
               pageIndex:1,
               pageSize:10,
-              Name:''
+              Name:'',
+              SmallShopId:0,
             },
             count:0,
             loading:false,
@@ -152,7 +154,6 @@
       created(){
         this.getrigger()
         this.getrigger2()
-        this.getList()
         setTimeout(()=>{
           if(this.$route.query.ID){
             this.gettRepositoryList(this.$route.query.ID)
@@ -201,7 +202,13 @@
           })
         },
         choice(){
+          this.options2.forEach(x=>{
+            if(x.ID == this.msg.DiscountCouponId){
+              this.msg_t.SmallShopId = x.SmallShopId
+            }
+          })
           this.category = true;
+          this.msg_t.pageIndex =1
           this.getList()
         },
         getList(){
@@ -236,6 +243,7 @@
 
         },
         search(){
+          this.msg_t.pageIndex =1
           this.getList();
         },
         preserve(formName){

src/components/sallCenter/grantCouPon.vue

@@ -48,6 +48,7 @@
 
             </el-checkbox-group>
           </div>
+          <div style="width: 30%;display: flex;flex-direction: row;margin-top: 5px;justify-content: center;color: #666666" v-if="ByPhone.length==0">暂无数据~</div>
         </el-form-item>
       </el-form>
     </div>
@@ -87,8 +88,9 @@
           this.$router.go(-1)
         },
         lookup(){
+          this.msg.UserIds = [];//重新选择的时候清楚之前的
           this.loading = true;
-          this.apipost("/api/User/GetListByPhoneOrAliasName",{'AliasName':this.AliasName}, res => {
+          this.apipost("/api/User/GetListByPhoneOrAliasName",{'AliasName':this.AliasName,SmallShopId:this.record.SmallShopId}, res => {
             this.loading = false;
 
             if (res.data.resultCode == 1) {