Commit ac21c9c7 authored by 786817560's avatar 786817560

Merge branch 'ren' into develop

parents 16ace966 d25969af
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2019-09-29 10:02:11 * @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-22 15:02:02 * @LastEditTime: 2019-11-22 15:39:10
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
--> -->
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<scroll <scroll
v-if="num === 1" v-show="num === 1"
ref="scroll" ref="scroll"
:updateData="[submitLists]" :updateData="[submitLists]"
:pullUp="true" :pullUp="true"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</scroll> </scroll>
<scroll <scroll
v-if="num === 2" v-show="num === 2"
ref="scrolls" ref="scrolls"
:updateData="[approvedLists]" :updateData="[approvedLists]"
:pullUp="true" :pullUp="true"
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
vm.searchInput = '' vm.searchInput = ''
vm.user_bp_type = vm.$route.params.user_bp_type vm.user_bp_type = vm.$route.params.user_bp_type
} }
vm.contractList() // vm.contractList()
}) })
// next() // next()
}, },
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
let param = { let param = {
user_phone: window.localStorage.user_phone, user_phone: window.localStorage.user_phone,
pagesize: 10, pagesize: 10,
pagenum: vm.pagenum, pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT', confirm_status: 'SUBMIT',
searchInput: vm.searchInput, searchInput: vm.searchInput,
} }
...@@ -168,7 +168,7 @@ export default { ...@@ -168,7 +168,7 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.showLists = res.lists vm.submitLists = res.lists
vm.submitFlag = true vm.submitFlag = true
if (res.lists.length > 0 && res.lists.length < 10) { if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true) vm.$refs.scroll.update(true)
...@@ -288,9 +288,9 @@ export default { ...@@ -288,9 +288,9 @@ export default {
confirm_status: 'SUBMIT', confirm_status: 'SUBMIT',
searchInput: vm.searchInput, searchInput: vm.searchInput,
} }
vm.hlsPopup.showLoading('数据加载中') // vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
// console.log(res.lists) // console.log(res.lists)
vm.submitLists = res.lists vm.submitLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) { if (res.lists.length >= 0 && res.lists.length < 10) {
...@@ -311,8 +311,9 @@ export default { ...@@ -311,8 +311,9 @@ export default {
confirm_status: 'APPROVED', confirm_status: 'APPROVED',
searchInput: vm.searchInput, searchInput: vm.searchInput,
} }
// vm.hlsPopup.showLoading('数据加载中') vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
vm.approvedLists = res.lists vm.approvedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) { if (res.lists.length >= 0 && res.lists.length < 10) {
vm.$refs.scrolls.update(true) vm.$refs.scrolls.update(true)
......
...@@ -259,9 +259,9 @@ export default { ...@@ -259,9 +259,9 @@ export default {
confirm_status: 'SUBMIT', confirm_status: 'SUBMIT',
searchInput: vm.searchInput, searchInput: vm.searchInput,
} }
vm.hlsPopup.showLoading('数据加载中') // vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() // vm.hlsPopup.hideLoading()
// console.log(res.lists) // console.log(res.lists)
vm.submitLists = res.lists vm.submitLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) { if (res.lists.length >= 0 && res.lists.length < 10) {
...@@ -282,9 +282,9 @@ export default { ...@@ -282,9 +282,9 @@ export default {
confirm_status: 'APPROVED', confirm_status: 'APPROVED',
searchInput: vm.searchInput, searchInput: vm.searchInput,
} }
// vm.hlsPopup.showLoading('数据加载中') vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
// console.log(res.lists) // console.log(res.lists)
vm.approvedLists = res.lists vm.approvedLists = res.lists
if (res.lists.length >= 0 && res.lists.length < 10) { if (res.lists.length >= 0 && res.lists.length < 10) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment