zhanghui пре 2 година
родитељ
комит
40c89e7082
7 измењених фајлова са 134 додато и 122 уклоњено
  1. 6 1
      App.vue
  2. 0 1
      common/js/env.js
  3. 118 109
      manifest.json
  4. 0 3
      pages/login/login.vue
  5. 2 2
      pages/my/index.rpx.css
  6. 4 3
      pages/my/my.vue
  7. 4 3
      pages/userInfo/userInfo.vue

+ 6 - 1
App.vue

@@ -6,8 +6,8 @@
 <script>
 	export default {
 		onLaunch: function() {
+            // #ifdef H5
             var ua = window.navigator.userAgent.toLowerCase();
-
             console.log('+++++++浏览器++++++',ua)
             // if(ua.match(/windowswechat/i)=="windowswechat") {
             //     console.log('这windos的微信浏览器');
@@ -22,7 +22,12 @@
                 //     content:'请在手机微信客户端打开连接',
                 // })
             }
+            // #endif
+
+
+
 			console.log('App Launch')
+
 		},
 		onShow: function() {
 			console.log('App Show')

+ 0 - 1
common/js/env.js

@@ -3,7 +3,6 @@
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
 let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
 // let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
-// let baseUrl = `http://47.108.114.127:10888`
 // let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 
 

+ 118 - 109
manifest.json

@@ -1,110 +1,119 @@
 {
-    "name" : "娇骄儿拓客",
-    "appid" : "__UNI__0AD3309",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "schemes" : "jjeSpreadUniapp"
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2"
-}
+	"name": "娇骄儿拓客",
+	"appid": "__UNI__0AD3309",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"schemes": "jjeSpreadUniapp"
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"h5": {
+		"router": {
+			"base": "./",
+			"mode": "hash"
+		},
+		"devServer": {
+			"https": false
+		}
+	}
+}

+ 0 - 3
pages/login/login.vue

@@ -170,9 +170,6 @@
 						uni.setStorageSync('accessToken', res.data.data.access_token)
 						this.$api.user.getUserInfo().then(res=>{
 							console.log('获取到的用户信息:',res.data.data,'获取到的用户头像',res.data.data.img)
-							if (res.data.data.img){
-								res.data.data.img = res.data.data.img.replace(/^http:/, "https:")
-							}
 							this.userInfo = res.data.data
 							uni.setStorageSync('spreadUserInfo', this.userInfo)
 							uni.showToast({

+ 2 - 2
pages/my/index.rpx.css

@@ -1,6 +1,6 @@
 .page {
-	/*background-image: url('https://jje.xinyuekj.com.cn/prod-api/tech/static/my/bg1.png');*/
-	background-image: url('/static/my/bg1.png');
+	background-image: url('https://jje.xinyuekj.com.cn/tk/static/my/bg1.png');
+	/*background-image: url('/static/my/bg1.png');*/
 	background-repeat: no-repeat;
 	background-size: 100% 30%;
 	background-color: #F9F9F9;

+ 4 - 3
pages/my/my.vue

@@ -2,7 +2,7 @@
 	<view class="page" :style="{height:height}">
 		<view class="flex-row use">
 			<view class="avatar" @click="goUserInfo">
-				<image :src="userInfo.img || '/static/ud4.png'"></image>
+				<image :src="userInfo.imgUrl || '/static/ud4.png'"></image>
 			</view>
 			<view class="flex-col justify-evenly useMsg">
 				<view class="flex-row">
@@ -92,7 +92,7 @@
 
 		onShow() {
 			this.userInfo = uni.getStorageSync('spreadUserInfo')
-			// this.getImgUrlByOssId(this.userInfo.img)
+			this.getImgUrlByOssId(this.userInfo.img)
 			this.exStatistics()
 			// this.canWithdraw()
 		},
@@ -120,7 +120,8 @@
 			getImgUrlByOssId(Id) {
 				if (Id) {
 					this.$api.service.getImage(Id).then(res => {
-						this.userInfo.selfPhotoUrl = res.data.data[0].url.replace(/^http:/, "https:")
+						this.userInfo.imgUrl = res.data.data[0].url.replace(/^http:/, "https:")
+						uni.setStorageSync('spreadUserInfo', this.userInfo)
 						this.$set(this.userInfo)
 					});
 				}

+ 4 - 3
pages/userInfo/userInfo.vue

@@ -8,7 +8,7 @@
 						<text>头像</text>
 					</view>
 					<view class="photoView" @click="updateAvatar">
-						<image class="photoImage" :src="userInfo.img || '/static/ud4.png'"></image>
+						<image class="photoImage" :src="userInfo.imgUrl || '/static/ud4.png'"></image>
 					</view>
 				</view>
 
@@ -133,10 +133,11 @@
 							success: (uploadFileRes) => {
 								let res = JSON.parse(uploadFileRes.data)
 								console.log('+++++++++++++++++chooseavatar+++++++++++++++++++++++',uploadFileRes.data)
-								that.userInfo.img = res.data.url.replace(/^http:/, "https:")
+								that.userInfo.imgUrl = res.data.url.replace(/^http:/, "https:")
+								that.userInfo.img = res.data.ossId
 
 								that.$api.user.updateUserInfo({
-									img:res.data.url
+									img:res.data.ossId
 								}).then(res1=>{
 									console.log(res1)
 								})