diff --git a/pages/about/about.vue b/pages/about/about.vue index 126e0c02..99c6995e 100644 --- a/pages/about/about.vue +++ b/pages/about/about.vue @@ -45,6 +45,9 @@ componentAppAdmin }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); }, diff --git a/pages/article-category/article-category.vue b/pages/article-category/article-category.vue index c4e49f0b..49bce95a 100644 --- a/pages/article-category/article-category.vue +++ b/pages/article-category/article-category.vue @@ -1,284 +1,287 @@ - - - + + + diff --git a/pages/article-detail/article-detail.vue b/pages/article-detail/article-detail.vue index cc7ab666..4dd0e3da 100644 --- a/pages/article-detail/article-detail.vue +++ b/pages/article-detail/article-detail.vue @@ -1,162 +1,164 @@ - - - + img: this.data.share_images || this.data.cover, + }, + }); + + // 标题 + uni.setNavigationBarTitle({ title: article.title }); + } else { + this.setData({ + data_list_loding_status: 0, + data_list_loding_msg: res.data.msg, + }); + app.globalData.showToast(res.data.msg); + } + + // 分享菜单处理 + app.globalData.page_share_handle(this.share_info); + }, + fail: () => { + uni.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2, + }); + app.globalData.showToast(this.$t('common.internet_error_tips')); + }, + }); + }, + + // url事件 + url_event(e) { + app.globalData.url_event(e); + } + }, + }; + + diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index b18bf76c..b74bb1fe 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -544,6 +544,9 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue index bbe1e515..63109244 100644 --- a/pages/cart-page/cart-page.vue +++ b/pages/cart-page/cart-page.vue @@ -453,6 +453,9 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); }, diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue index b3e23f48..1e1925d7 100644 --- a/pages/cart/cart.vue +++ b/pages/cart/cart.vue @@ -453,6 +453,9 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); }, diff --git a/pages/cashier/cashier.vue b/pages/cashier/cashier.vue index 7c3bfe31..76b898e8 100644 --- a/pages/cashier/cashier.vue +++ b/pages/cashier/cashier.vue @@ -69,11 +69,11 @@ componentNoData }, onLoad(params) { + // 设置参数 + params = app.globalData.launch_params_handle(params); // 调用公共事件方法 app.globalData.page_event_onload_handle(params); - // 设置参数 - params = app.globalData.launch_params_handle(params); var scene = app.globalData.get_scene_data(); this.setData({ params: params, diff --git a/pages/common/open-setting-location/open-setting-location.vue b/pages/common/open-setting-location/open-setting-location.vue index 1dc8caba..2bdea50e 100644 --- a/pages/common/open-setting-location/open-setting-location.vue +++ b/pages/common/open-setting-location/open-setting-location.vue @@ -1,149 +1,152 @@ - - - + + // 取消则自动返回、则显示错误 + // error=11 支付宝取消、msg包含cancel则其他平台 + var msg = res.errorMessage || res.chooseLocation || res.errMsg || this.$t('open-setting-location.open-setting-location.hwn386'); + if(res.error == 11 || msg.indexOf('cancel') != -1) { + // app则不执行返回操作、上面已经返回过了 + // #ifndef APP + uni.navigateBack(); + // #endif + } else { + this.setData({ error_msg: res.errMsg }); + app.globalData.showToast(res.errMsg); + } + } + }); + } + }, +}; + + diff --git a/pages/customview/customview.vue b/pages/customview/customview.vue index 6f1f5719..2b99161e 100644 --- a/pages/customview/customview.vue +++ b/pages/customview/customview.vue @@ -1,146 +1,149 @@ - - - \ No newline at end of file diff --git a/pages/design/design.vue b/pages/design/design.vue index 6d6ce0f2..bb3ae409 100644 --- a/pages/design/design.vue +++ b/pages/design/design.vue @@ -1,88 +1,91 @@ - - - \ No newline at end of file diff --git a/pages/diy/diy.vue b/pages/diy/diy.vue index ae2b86b8..265cacf8 100644 --- a/pages/diy/diy.vue +++ b/pages/diy/diy.vue @@ -49,12 +49,15 @@ }, onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 this.setData({ - params: app.globalData.launch_params_handle(params), + params: params, }); }, diff --git a/pages/error/error.vue b/pages/error/error.vue index 47e0c767..2190f860 100644 --- a/pages/error/error.vue +++ b/pages/error/error.vue @@ -29,6 +29,9 @@ // 页面加载初始化 onLoad(params) { + // 参数处理 + params = app.globalData.launch_params_handle(params); + // 调用公共事件方法 app.globalData.page_event_onload_handle(params); diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue index dcec3029..7a372097 100644 --- a/pages/extraction-address/extraction-address.vue +++ b/pages/extraction-address/extraction-address.vue @@ -1,255 +1,258 @@ - - - - + + + + diff --git a/pages/form-input-data-detail/form-input-data-detail.vue b/pages/form-input-data-detail/form-input-data-detail.vue index ae1f714f..37a58350 100644 --- a/pages/form-input-data-detail/form-input-data-detail.vue +++ b/pages/form-input-data-detail/form-input-data-detail.vue @@ -1,126 +1,129 @@ -