Merge branch 'master' into feature/v4.9.93

src/jfw/modules/publicapply/src/detail/dao/ahead.go

@@ -92,6 +92,7 @@ func (a *AheadStruct) Ahead() (eri *entity.AheadRecommend) {
 		if total > 0 {
 			if repl != nil && *repl != nil && len(*repl) > 0 {
 				list = a.Format(*repl)
+				total = int64(len(list))
 			}
 		}
 	}
@@ -142,7 +143,7 @@ func (a *AheadStruct) Ahead() (eri *entity.AheadRecommend) {
 	if eri.More {
 		ri := 0
 		if len(eri.List)-int(count) > 1 {
-			rand.New(rand.NewSource(time.Now().UnixNano())).Intn(len(eri.List) - int(count) - 1)
+			ri = rand.New(rand.NewSource(time.Now().UnixNano())).Intn(len(eri.List) - int(count) - 1)
 		}
 		eri.List = eri.List[ri : ri+int(count)]
 	}

src/web/staticres/common-module/big-member/js/page_client_list.js

@@ -371,7 +371,8 @@ var vueComponent = new Vue({
                 url:'/entnicheNew/customer/list',
                 data:{
                     searchCode: _this.inputVal,
-                    isCliam: 999
+                    isCliam: 999,
+                  	pagesize: 999
                 },
                 success:function(res) {
                     if (res.error_code == 0){