diff --git a/member-Recharge/choicepage/choicepage.vue b/member-Recharge/choicepage/choicepage.vue
index 0ebdbdd..866037f 100644
--- a/member-Recharge/choicepage/choicepage.vue
+++ b/member-Recharge/choicepage/choicepage.vue
@@ -1,9 +1,13 @@
-
-
-
+
+
+
+
+
+
+
@@ -19,7 +23,9 @@
pageNum: 1,
pageSize: 10,
isNoMoreData: false,
- imageUrl: app.globalData.imgUrl
+ imageUrl: app.globalData.imgUrl,
+ imageWxImg:app.globalData.imageWxImg,
+ noData:'noorder.png'
}
},
onLoad() {
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index e4d6b96..caebf80 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -195,6 +195,58 @@
// this.latitude = app.globalData.latitude;
// this.longitude = app.globalData.longitude;
/* this.onControltap(); */
+ // #ifdef MP-WEIXIN
+ let that = this;
+ uni.getSetting({
+ success: (res) => {
+ //如果没有定位权限
+ if (!res.authSetting["scope.userLocation"]) {
+ //向用户发起授权请求
+ uni.authorize({
+ scope: "scope.userLocation",
+ success: () => {
+ //获取到定位授权
+ that.onControltap();
+ },
+ //授权失败
+ fail: () => {
+ uni.hideLoading();
+ uni.showModal({
+ title: "您已拒绝获取定位权限",
+ content: "是否进入权限管理,调整授权?",
+ success: (res) => {
+ if (res.confirm) {
+ //调起客户端小程序设置界面,返回用户设置的操作结果。(重新让用户授权)
+ uni.openSetting({
+ success: (res) => {
+ console.log(res
+ .authSetting
+ );
+ },
+ });
+ } else if (res.cancel) {
+ return uni.showToast({
+ title: "已取消",
+ icon:'none'
+ });
+ }
+ },
+ });
+ },
+ });
+ } else {
+ //已经开启定位授权
+ if(this.goodsFirstClassList.length == 1){
+ that.onControltap();
+ }
+
+ }
+ },
+ fail: (res) => {
+
+ },
+ });
+ // #endif
},
components:{
touchbox,
@@ -359,7 +411,7 @@
}
},
- postionIng() {
+ /* postionIng() {
let that = this;
uni.getLocation({
type: 'wgs84',
@@ -381,7 +433,7 @@
// })
}
})
- },
+ }, */
//金纬度转
findByLatAndLng(item, item1) {
let datas = {
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index da2b136..2414338 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -229,11 +229,11 @@
this.list = this.orderList[this.typeId];
this.tabbarIndex = tbIndex;
// this.getUserOrderList();
- // this.getDictionaryByCodeType();
+ this.getDictionaryByCodeType();
},
onShow(){
this.getUserOrderList();
- this.getDictionaryByCodeType();
+ // this.getDictionaryByCodeType();
},
onReachBottom() {
this.getUserOrderList();
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 0b96898..bac8290 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -10,7 +10,7 @@
电信话费充值
移动话费充值
联通话费充值
- 规格: 默认
+
¥{{orderPrice}}