更新获取用户信息的接口

https/request.js

@@ -24,6 +24,8 @@ export default(url, method, params) => { // 传参： 接口url，  method类型
             header: header
         })
         .then((response) => {
+			console.log('成功的请求')
+			console.log(url)
             // 请求成功后的处理
 			if(response[1].data.code==401){
 				uni.removeStorageSync('token');
@@ -37,6 +39,8 @@ export default(url, method, params) => { // 传参： 接口url，  method类型
 			// if(response[1].)
         }).catch((reject) => {
             // 请求失败后的处理
+			console.log('失败的请求')
+			console.log(url)
             console.log('请求失败')
 			reject(reject)
         })

pageA/order/order.vue

@@ -90,7 +90,7 @@
                 </view>
               </view>
               <view class="orderTit">套餐说明</view>
-              <text lines="1" class="infoBox1">{{
+              <text lines="1" class="infoBox1">{{ showData.month_fee_limit != '0' ? '低消:' + showData.month_fee_limit+'元，':'' }}{{ showData.month_limit != '0' ? '合约:' + showData.month_limit + '月，':'' }}{{
                 showData.info.describe
               }}</text>
             </view>
@@ -382,6 +382,8 @@
 <script>
 import wPicker from "@/components/w-picker/w-picker.vue";
 // import mixin1 from "@/util/mixin1.js";
+import http from "@/https/request.js"
+import { isString } from "util"
 var unpackTimeId = null;
 var total_micro_second = 0; // 总毫秒数
 export default {
@@ -446,6 +448,9 @@ export default {
         stock_num: 0,
         batch_no: "",
         is_offer: 0,
+		month_limit:"0",
+		month_fee_limit:"0",
+		amount_charge:"0",
         info: {
           id: 305466,
           mobile_id: 305467,
@@ -1090,34 +1095,71 @@ export default {
     },
     // 根据经纬度查询城市
     loAcquire(longitude, latitude) {
-      let this_ = this;
-      this.myAmapFun.reverseGeocoder({
-        location: {
-          latitude: latitude,
-          longitude: longitude,
-        },
-        success: function (res) {
-          console.log("解析地址成功");
-          console.log(res);
-          // 根据名称筛选id
-          this_.cityId(
-            res.result.address_component.province,
-            res.result.address_component.city,
-            res.result.address_component.district
-          );
-        },
-        fail: function (res) {
-          uni.showToast({
-            title: "定位失败",
-            duration: 2000,
-            icon: "none",
-          });
-          console.log(res);
-        },
-        complete: function (res) {
-          console.log(res);
-        },
-      });
+		let this_ = this;
+		
+		http('https://restapi.amap.com/v3/geocode/regeo',"GET",{
+							key: "08dceab59cbce678d07e89924e376f53",
+							location: longitude + ',' + latitude,
+							output: "JSON"  
+						})
+						.then(res=>{
+							console.log('amap')
+							console.log(res)
+							if(res.statusCode == 200){
+								if(res.data.status == 1){
+									console.log({
+													province:res.data.regeocode.addressComponent.province,
+													city:res.data.regeocode.addressComponent.city,
+													district:res.data.regeocode.addressComponent.district,
+												});
+									let province = res.data.regeocode.addressComponent.province;
+									let city = res.data.regeocode.addressComponent.city;
+									let district = res.data.regeocode.addressComponent.district;
+									if(!isString(city)){
+										city = province;
+									}
+									uni.setStorage({
+												key: 'address',
+												data: JSON.stringify({
+													district:district,
+													city:city,
+													province:province,
+												})
+											});
+									this_.cityId(province,city,district);
+								}
+							}
+							
+						})
+		
+      // let this_ = this;
+      // this.myAmapFun.reverseGeocoder({
+      //   location: {
+      //     latitude: latitude,
+      //     longitude: longitude,
+      //   },
+      //   success: function (res) {
+      //     console.log("解析地址成功");
+      //     console.log(res);
+      //     // 根据名称筛选id
+      //     this_.cityId(
+      //       res.result.address_component.province,
+      //       res.result.address_component.city,
+      //       res.result.address_component.district
+      //     );
+      //   },
+      //   fail: function (res) {
+      //     uni.showToast({
+      //       title: "定位失败",
+      //       duration: 2000,
+      //       icon: "none",
+      //     });
+      //     console.log(res);
+      //   },
+      //   complete: function (res) {
+      //     console.log(res);
+      //   },
+      // });
     },
     // 根据名称筛选id
     cityId(province, city, district) {

util/mixin.js

@@ -222,39 +222,81 @@ export default {
       //   },
       // });
 
-      uni.getUserInfo({
-        withCredentials: true,
-        success(res) {
-          console.log(res);
-          Vue.prototype.$http
-            .dy_login({
-              code: this_.mixin_code,
-              encryptedData: res.encryptedData,
-              iv: res.iv,
-            })
-            .then((res) => {
-              if (res.data.code == 1) {
-                this_.login_show = false;
-                uni.setStorageSync("token", res.data.data.userinfo.token);
-
-                const pages = getCurrentPages();
-                // 声明一个pages使用getCurrentPages方法
-                const curPage = pages[pages.length - 1];
-                // 声明一个当前页面
-                curPage.onLoad(curPage.options); // 传入参数
-                curPage.onShow();
-              } else {
-                this_.login_show = false;
-                uni.showToast({
-                  title: res.data.msg,
-                  duration: 2000,
-                  icon: "none",
-                });
-                uni.removeStorageSync("token");
-              }
-            });
-        },
-      });
+	  if (uni.getUserProfile) {
+	  	console.log("getUserProfile")
+	  	uni.getUserProfile({
+	  	withCredentials:true,
+	  	success(res) {
+	  		console.log("login")
+	  		console.log(res)
+	  		Vue.prototype.$http.dy_login({code:this_.mixin_code,encryptedData:res.encryptedData,iv:res.iv,})
+	  		.then(res=>{
+	  			if(res.data.code==1){
+	  				this_.login_show=false
+	  				uni.setStorageSync('token', res.data.data.userinfo.token);
+	  				
+	  				const pages = getCurrentPages()
+	  				// 声明一个pages使用getCurrentPages方法
+	  				const curPage = pages[pages.length - 1]
+	  				// 声明一个当前页面
+	  				curPage.onLoad(curPage.options) // 传入参数
+	  				curPage.onShow()
+	  			}else{
+	  				this_.login_show=false
+	  				uni.showToast({
+	  					title: res.data.msg,
+	  					duration: 2000,
+	  					icon: 'none'
+	  				});
+	  				uni.removeStorageSync('token');
+	  			}
+	  		})
+	  	},
+	  	fail(res){
+	  		console.log(res)
+	  	}
+	  })
+	  } else{
+	  	console.log('getUserInfo')
+	  	uni.getUserInfo({
+	  		withCredentials:true,
+	  		success(res) {
+	  			console.log("login")
+	  			console.log(res)
+	  			Vue.prototype.$http.dy_login({code:this_.mixin_code,encryptedData:res.encryptedData,iv:res.iv,})
+	  			.then(res=>{
+	  				if(res.data.code==1){
+	  					this_.login_show=false
+	  					uni.setStorageSync('token', res.data.data.userinfo.token);
+	  					
+	  					const pages = getCurrentPages()
+	  					// 声明一个pages使用getCurrentPages方法
+	  					const curPage = pages[pages.length - 1]
+	  					// 声明一个当前页面
+	  					curPage.onLoad(curPage.options) // 传入参数
+	  					curPage.onShow()
+	  				}else{
+	  					this_.login_show=false
+	  					uni.showToast({
+	  						title: res.data.msg,
+	  						duration: 2000,
+	  						icon: 'none'
+	  					});
+	  					uni.removeStorageSync('token');
+	  				}
+	  			})
+	  		},
+	  		fail(res){
+	  			console.log(res)
+	  			uni.showToast({
+	  				title: "请点击右上角更多中选择设置授权头像和昵称",
+	  				duration: 2000,
+	  				icon: 'none'
+	  			});
+	  			uni.removeStorageSync('token');
+	  		}
+	  	})
+	  }
     },
     // 用于处理请求腾讯api 跨域问题
     jsonp(url, data) {