cmy 10 months ago
parent
commit
919b1549c7
4 changed files with 22 additions and 21 deletions
  1. 1 1
      api/user.js
  2. 5 10
      manifest.json
  3. 8 8
      pages/users/user_info/index.vue
  4. 8 2
      utils/util.js

+ 1 - 1
api/user.js

@@ -214,7 +214,7 @@ export function getIntegralListActionOut(q) {
  * 佣金转能量
  * */
 export function energyImport(q) {
-	return request.post(`energy/import`);
+	return request.post(`energy/import`,q);
 }
 
 /**

+ 5 - 10
manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "神英优选",
-    "appid" : "__UNI__70BC0AE",
+    "appid" : "__UNI__3F43051",
     "description" : "神英优选商城",
-    "versionName" : "2.9.2",
-    "versionCode" : 292,
+    "versionName" : "2.9.6",
+    "versionCode" : 296,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -25,7 +25,8 @@
             "VideoPlayer" : {},
             "Payment" : {},
             "Barcode" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Geolocation" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -121,12 +122,6 @@
                 },
                 "ad" : {},
                 "geolocation" : {
-                    "amap" : {
-                        "name" : "amapAhV2u8Ft",
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "54fe38c4b02ae5c70968a79b81bcf379",
-                        "appkey_android" : "6075b730d6ffa53222744ecd47b68aff"
-                    },
                     "system" : {
                         "__platform__" : [ "ios", "android" ]
                     }

+ 8 - 8
pages/users/user_info/index.vue

@@ -451,15 +451,15 @@
 			uploadpic: function() {
 				let that = this;
 				// #ifdef APP
-				uni.showModal({
-					title: "权限申请",
-					content: "是否允许访问相机及存储空间用于上传头像?",
-					success(res) {
-						if (res.confirm) {
+				// uni.showModal({
+				// 	title: "权限申请",
+				// 	content: "是否允许访问相机及存储空间用于上传头像?",
+				// 	success(res) {
+				// 		if (res.confirm) {
 							that.commitImg();
-						}
-					}
-				})
+				// 		}
+				// 	}
+				// })
 				// #endif
 				// #ifndef APP
 				that.commitImg();

+ 8 - 2
utils/util.js

@@ -633,7 +633,9 @@ export default {
 	uploadImageOne: function(opt, successCallback, errorCallback) {
 		let that = this;
 		// #ifdef APP
-		if (permision.isIOS) {
+		let boolad = uni.getStorageSync("boolLoad")||false
+		// if (permision.isIOS) {
+		if (boolad) {
 			upimg()
 		} else {
 			let title = '申请相册权限';
@@ -645,6 +647,7 @@ export default {
 				confirmText: '允许',
 				success: res => {
 					if (res.confirm) {
+						uni.setStorageSync("boolLoad",true)
 						upimg()
 					}
 				},
@@ -733,7 +736,9 @@ export default {
 	uploadImageChange: function(opt, successCallback, errorCallback, sizeCallback) {
 		let that = this;
 		// #ifdef APP
-		if (permision.isIOS) {
+		let boolad = uni.getStorageSync("boolLoad")||false
+		// if (permision.isIOS) {
+		if (boolad||plus.os.name == "iOS") {
 			upimg()
 		} else {
 			let title = '申请相册权限';
@@ -745,6 +750,7 @@ export default {
 				confirmText: '允许',
 				success: res => {
 					if (res.confirm) {
+						uni.setStorageSync("boolLoad",true)
 						upimg()
 					}
 				},