guhongwei 2 years ago
parent
commit
1c0aac6405
2 changed files with 45 additions and 4 deletions
  1. 38 0
      config.js
  2. 7 4
      pagesMy/account/upBasic.vue

+ 38 - 0
config.js

@@ -8,6 +8,42 @@ const wx_projectkey = 'tehqApp';
 const wx_dev = '';
 // 测试环境:/dev
 // 生产环境:''
+// 开发环境,生产环境新方法--start
+// pointApp,tehqApp
+// '',/dev
+// wx8cdd28824dfcdf19,wx928648edf0df1882
+let test_env = {
+	wx_projectkey: '',
+	wx_dev: ''
+}
+if (system.uniPlatform == 'app') { //app
+	let app_env = process.env.NODE_ENV;
+	if (app_env == 'development') {
+		test_env = {
+			wx_projectkey: 'pointApp',
+			wx_dev: '/dev'
+		}
+	} else if (app_env == 'production') {
+		test_env = {
+			wx_projectkey: 'tehqApp',
+			wx_dev: ''
+		}
+	}
+} else if (system.uniPlatform == 'mp-weixin') { //weixin
+	let wx_env = uni.getAccountInfoSync();
+	if (wx_env.miniProgram.envVersion == 'release') {
+		test_env = {
+			wx_projectkey: 'tehqApp',
+			wx_dev: ''
+		}
+	} else if (wx_env.miniProgram.envVersion == 'develop' || wx_env.miniProgram.envVersion == 'trial') {
+		test_env = {
+			wx_projectkey: 'pointApp',
+			wx_dev: '/dev'
+		}
+	}
+}
+// 开发环境,生产环境新方法--end
 export default {
 	serverUrl: 'https://broadcast.waityou24.cn',
 	// serverUrl: 'http://192.168.223.1:12211',
@@ -16,6 +52,8 @@ export default {
 	system: system,
 	wx_projectkey: wx_projectkey,
 	wx_dev: wx_dev,
+	// 新变量
+	test_env: test_env,
 	share: {},
 	my_menu: [ //
 		{

+ 7 - 4
pagesMy/account/upBasic.vue

@@ -7,7 +7,8 @@
 						<view class="icon">
 							<view class="icon_1" v-if="form.icon&&form.icon.length>0">
 								<image class="image" v-for="i in form.icon" :key="i" :src="i.url" mode=""></image>
-								<uni-icons class="del" type="close" size="30" color="#ff0000" @click="iconDel()"></uni-icons>
+								<uni-icons class="del" type="close" size="30" color="#ff0000" @click="iconDel()">
+								</uni-icons>
 							</view>
 							<view class="icon_2" v-else>
 								<button open-type="chooseAvatar" @chooseavatar="chooseavatar">上传头像</button>
@@ -19,7 +20,8 @@
 						<!-- <uni-easyinput type="nick" v-model="form.name" placeholder="请输入用户名" /> -->
 					</uni-forms-item>
 					<uni-forms-item label="性别" name="gender">
-						<picker @change="genderChange" name="gender" :value="form.gender" :range="genderList" range-key="label">
+						<picker @change="genderChange" name="gender" :value="form.gender" :range="genderList"
+							range-key="label">
 							<view class="uni-input">{{form.zhGender||'请选择性别'}}</view>
 						</picker>
 					</uni-forms-item>
@@ -35,7 +37,7 @@
 			</view>
 		</view>
 		<view class="two">
-			{{pro_env}}
+			{{test_env.wx_projectkey}}--{{test_env.wx_dev}}
 		</view>
 
 	</mobile-frame>
@@ -67,7 +69,7 @@
 					},
 				},
 				genderList: [],
-						pro_env: this.$config.pro_env
+				test_env: this.$config.test_env
 
 			};
 		},
@@ -262,6 +264,7 @@
 		display: flex;
 		flex-direction: row;
 	}
+
 	.two {
 		position: absolute;
 		bottom: 0;