Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppMyGrid/AppMyGrid.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import {mapState, mapActions} from "vuex"
+import {mapActions, mapState} from "vuex"
 import qs from "query-string"
 
 export default {
@@ -43,7 +43,8 @@ export default {
     return {
       linkList: [
         {title: '我的积分', img: require('./assets/wdjf.png'), linkUrl: '../AppCreditPoints/AppGridIntegral'},
-        {title: '积分兑换', img: require('./assets/jfdh.png'), linkUrl: '../AppCreditPoints/AppGridIntegral'},
+        {title: '积分兑换', img: require('./assets/jfdh.png'), linkUrl: '../AppPointsChange/AppPointsChange'},
+        // {title: '积分申请', img: require('./assets/jfdh.png'), linkUrl: '../AppPointsApply/AppPointsApply'},
         {title: '我收到的评价', img: require('./assets/wsddpj.png'), linkUrl: '../AppCreditPoints/AppGridIntegral'},
       ],
     }
@@ -73,14 +74,13 @@ export default {
                 })
               },
               withoutToken: true
-            })
-            .then(({data: {result: {address}}}) => this.$http.post("/app/appwxsigninfo/sign", {lat, lng, address}))
-            .then(res => {
-              uni.hideLoading()
+            }).then(({data: {result: {address}}}) => this.$http.post("/app/appwxsigninfo/sign",
+                {lat, lng, address}
+            )).then(res => {
               if (res?.code == 0) {
                 this.linkTo("./signResult?id=" + res?.data.id)
               }
-            }).catch(err => uni.hideLoading(),this.$u.toast(err))
+            }).catch(err => this.$u.toast(err)).finally(() => uni.hideLoading())
           } else this.$u.toast("无法获取到定位!")
         },
         fail: () => this.$u.toast("获取定位失败,请重新尝试!")