miniprogram / volunteer · 提交

转到一个项目

作者 niufei
提交 cc91c9173a85b68d521ab254e0dec9140618cf22 1 个父辈 de4dd7d8

测试修改问题

内嵌 并排对比
正在显示 8 个修改的文件 包含 41 行增加 和 29 行删除
@@ -35,6 +35,7 @@ App({ @@ -35,6 +35,7 @@ App({
35 wx.showNavigationBarLoading() 35 wx.showNavigationBarLoading()
36 wx.showLoading({ 36 wx.showLoading({
37 title: '加载中', 37 title: '加载中',
  38 + mask: true
38 }) 39 })
39 var promise = new Promise((resolve, reject) => { 40 var promise = new Promise((resolve, reject) => {
40 let that = this; 41 let that = this;
@@ -54,19 +55,7 @@ App({ @@ -54,19 +55,7 @@ App({
54 if (res.data.code == '20000') { 55 if (res.data.code == '20000') {
55 resolve(res.data.data); 56 resolve(res.data.data);
56 } else if (res.data.code == '10001') { //用户未 57 } else if (res.data.code == '10001') { //用户未
57 - // wx.showModal({  
58 - // title: '提示',  
59 - // content: res.data.msg,  
60 - // showCancel: false,  
61 - // success: function (res) {  
62 - // if (res.confirm) {  
63 - // wx.removeStorageSync('token');  
64 - // wx.navigateTo({  
65 - // url: '/pages/start/start',  
66 - // })  
67 - // }  
68 - // }  
69 - // }) 58 +
70 } else if (res.data.code == '40000') { 59 } else if (res.data.code == '40000') {
71 wx.showModal({ 60 wx.showModal({
72 title: '提示', 61 title: '提示',
@@ -46,6 +46,7 @@ Page({ @@ -46,6 +46,7 @@ Page({
46 getdatalist() { 46 getdatalist() {
47 wx.showLoading({ 47 wx.showLoading({
48 title: '加载中', 48 title: '加载中',
  49 + mask: true
49 }) 50 })
50 let that = this 51 let that = this
51 let head = { 52 let head = {
@@ -88,6 +89,7 @@ Page({ @@ -88,6 +89,7 @@ Page({
88 wx.showToast({ 89 wx.showToast({
89 title: '请输入工时', 90 title: '请输入工时',
90 icon: 'none', 91 icon: 'none',
  92 + mask: true,
91 duration: 1000 93 duration: 1000
92 }) 94 })
93 return 95 return
@@ -103,6 +105,7 @@ Page({ @@ -103,6 +105,7 @@ Page({
103 app.post(url, params, head).then((res) => { 105 app.post(url, params, head).then((res) => {
104 wx.showToast({ 106 wx.showToast({
105 title: '操作成功', 107 title: '操作成功',
  108 + mask: true,
106 icon: 'success', 109 icon: 'success',
107 duration: 1000, 110 duration: 1000,
108 success: () => { 111 success: () => {
@@ -148,6 +151,7 @@ Page({ @@ -148,6 +151,7 @@ Page({
148 app.post(url, params, head).then((res) => { 151 app.post(url, params, head).then((res) => {
149 wx.showToast({ 152 wx.showToast({
150 title: '操作成功', 153 title: '操作成功',
  154 + mask: true,
151 icon: 'success', 155 icon: 'success',
152 duration: 1000, 156 duration: 1000,
153 success: () => { 157 success: () => {
@@ -613,6 +613,7 @@ Page({ @@ -613,6 +613,7 @@ Page({
613 app.post(url, params, head).then((res) => { 613 app.post(url, params, head).then((res) => {
614 wx.showToast({ 614 wx.showToast({
615 title: '提交成功,等待审核', 615 title: '提交成功,等待审核',
  616 + mask: true,
616 icon: 'none', 617 icon: 'none',
617 duration: 2000 618 duration: 2000
618 }) 619 })
@@ -627,6 +628,7 @@ Page({ @@ -627,6 +628,7 @@ Page({
627 wx.showToast({ 628 wx.showToast({
628 title: err, 629 title: err,
629 icon: 'none', 630 icon: 'none',
  631 + mask: true,
630 duration: 2000 632 duration: 2000
631 }) 633 })
632 } 634 }
@@ -74,6 +74,7 @@ Page({ @@ -74,6 +74,7 @@ Page({
74 wx.showToast({ 74 wx.showToast({
75 title: '操作成功', 75 title: '操作成功',
76 icon: 'success', 76 icon: 'success',
  77 + mask: true,
77 duration: 1000, 78 duration: 1000,
78 success: () => { 79 success: () => {
79 that.setData({ 80 that.setData({
@@ -140,6 +141,7 @@ Page({ @@ -140,6 +141,7 @@ Page({
140 wx.showToast({ 141 wx.showToast({
141 title: '操作成功', 142 title: '操作成功',
142 icon: 'success', 143 icon: 'success',
  144 + mask: true,
143 duration: 1000, 145 duration: 1000,
144 success: () => { 146 success: () => {
145 that.setData({ 147 that.setData({
@@ -390,6 +392,7 @@ Page({ @@ -390,6 +392,7 @@ Page({
390 push(form_id) { 392 push(form_id) {
391 wx.showLoading({ 393 wx.showLoading({
392 title: '提交中', 394 title: '提交中',
  395 + mask: true
393 }) 396 })
394 let that = this 397 let that = this
395 let url = that.data.page_type ?'index/index/editApply':'index/index/applyJoin' 398 let url = that.data.page_type ?'index/index/editApply':'index/index/applyJoin'
@@ -409,6 +412,7 @@ Page({ @@ -409,6 +412,7 @@ Page({
409 wx.hideLoading() 412 wx.hideLoading()
410 wx.showToast({ 413 wx.showToast({
411 title: '报名成功', 414 title: '报名成功',
  415 + mask: true,
412 duration: 1000, 416 duration: 1000,
413 success: ()=>{ 417 success: ()=>{
414 wx.setStorageSync('page_type', true) 418 wx.setStorageSync('page_type', true)
@@ -47,6 +47,7 @@ Page({ @@ -47,6 +47,7 @@ Page({
47 success: (r) => { 47 success: (r) => {
48 wx.showToast({ 48 wx.showToast({
49 title: '保存成功', 49 title: '保存成功',
  50 + mask: true,
50 duration: 1000 51 duration: 1000
51 }) 52 })
52 } 53 }
@@ -76,6 +77,7 @@ Page({ @@ -76,6 +77,7 @@ Page({
76 app.post(url, params, header).then((res) => { 77 app.post(url, params, header).then((res) => {
77 wx.showToast({ 78 wx.showToast({
78 title: '退出成功', 79 title: '退出成功',
  80 + mask: true,
79 duration: 1000, 81 duration: 1000,
80 success: () => { 82 success: () => {
81 setTimeout(() => { 83 setTimeout(() => {
@@ -136,19 +136,19 @@ Page({ @@ -136,19 +136,19 @@ Page({
136 * 页面上拉触底事件的处理函数 136 * 页面上拉触底事件的处理函数
137 */ 137 */
138 onReachBottom: function() { 138 onReachBottom: function() {
139 - let that = this  
140 - if (that.data.page_type == false) {  
141 - wx.showToast({  
142 - title: '暂无更多数据',  
143 - icon: 'none',  
144 - duration: 1000  
145 - })  
146 - return false  
147 - }  
148 - that.setData({  
149 - activity_page: that.data.activity_page + 1  
150 - })  
151 - that.getdatalist() 139 + // let that = this
  140 + // if (that.data.page_type == false) {
  141 + // wx.showToast({
  142 + // title: '暂无更多数据',
  143 + // icon: 'none',
  144 + // duration: 1000
  145 + // })
  146 + // return false
  147 + // }
  148 + // that.setData({
  149 + // activity_page: that.data.activity_page + 1
  150 + // })
  151 + // that.getdatalist()
152 }, 152 },
153 153
154 /** 154 /**
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 getdatalist() { 14 getdatalist() {
15 wx.showLoading({ 15 wx.showLoading({
16 title: '加载中', 16 title: '加载中',
  17 + mask: true
17 }) 18 })
18 let that = this 19 let that = this
19 let head = { 20 let head = {
@@ -31,16 +31,16 @@ Page({ @@ -31,16 +31,16 @@ Page({
31 upimg: function() { 31 upimg: function() {
32 let that = this 32 let that = this
33 let imgarr = that.data.imgarr 33 let imgarr = that.data.imgarr
34 - let allow_image = 6 - that.data.imgarr.length 34 + let allow_image = 9 - that.data.imgarr.length
35 if (allow_image == 0) { 35 if (allow_image == 0) {
36 wx.showToast({ 36 wx.showToast({
37 - title: '最多添加6张图片', 37 + title: '最多添加9张图片',
38 icon: 'none', 38 icon: 'none',
39 duration: 1000 39 duration: 1000
40 }) 40 })
41 return 41 return
42 } 42 }
43 - wx.chooseImage({ 43 + wx. ({
44 count: allow_image, 44 count: allow_image,
45 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 45 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
46 sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 46 sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
@@ -53,6 +53,10 @@ Page({ @@ -53,6 +53,10 @@ Page({
53 }, 53 },
54 // 图片上传 54 // 图片上传
55 upload_img(imgarr) { 55 upload_img(imgarr) {
  56 + wx.showLoading({
  57 + title: '提交中',
  58 + mask: true
  59 + })
56 let that = this 60 let that = this
57 let myimgurl = that.data.myimgurl 61 let myimgurl = that.data.myimgurl
58 let header = { 62 let header = {
@@ -76,6 +80,7 @@ Page({ @@ -76,6 +80,7 @@ Page({
76 myimgurl: myimgurl 80 myimgurl: myimgurl
77 }) 81 })
78 if (that.data.myimgurl.length == imgarr.length){ 82 if (that.data.myimgurl.length == imgarr.length){
  83 + wx.hideLoading()
79 that.push() 84 that.push()
80 } 85 }
81 } 86 }
@@ -133,6 +138,10 @@ Page({ @@ -133,6 +138,10 @@ Page({
133 }, 138 },
134 push(){ 139 push(){
135 let that = this 140 let that = this
  141 + wx.showLoading({
  142 + title: '提交中',
  143 + mask: true
  144 + })
136 let url = 'index/index/sginIn' 145 let url = 'index/index/sginIn'
137 let params = { 146 let params = {
138 id: that.data.id, 147 id: that.data.id,
@@ -145,6 +154,7 @@ Page({ @@ -145,6 +154,7 @@ Page({
145 'XX-Token': wx.getStorageSync('token') 154 'XX-Token': wx.getStorageSync('token')
146 } 155 }
147 app.post(url, params, header).then((res) => { 156 app.post(url, params, header).then((res) => {
  157 + wx.hideLoading()
148 wx.showToast({ 158 wx.showToast({
149 title: '提交成功', 159 title: '提交成功',
150 duration: 1000, 160 duration: 1000,