Browse Source

perf:优化代码

lizhaocai 1 month ago
parent
commit
824d66f4fa
26 changed files with 52 additions and 45 deletions
  1. 1 1
      circlePages/addShare.vue
  2. 1 1
      circlePages/circle.vue
  3. 5 16
      config.js
  4. 4 0
      pages/comm/comm.vue
  5. 8 3
      pages/home/home.vue
  6. 10 5
      pages/login/login.vue
  7. 4 0
      pages/mine/coll.vue
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/addShare.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/circle.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/comm/comm.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/discovery/discovery.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/coll.js.map
  17. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/addShare.wxml
  18. 1 1
      unpackage/dist/dev/mp-weixin/circlePages/circle.wxml
  19. 1 1
      unpackage/dist/dev/mp-weixin/common/vendor.js
  20. 1 1
      unpackage/dist/dev/mp-weixin/pages/comm/comm.js
  21. 1 1
      unpackage/dist/dev/mp-weixin/pages/discovery/discovery.wxml
  22. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/home.js
  23. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  24. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  25. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  26. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/coll.js

+ 1 - 1
circlePages/addShare.vue

@@ -23,7 +23,7 @@
 					<image style="width: 48px;height: 48px;margin-right: 8px;" src="../static/tu/step1.png"></image>
 					<view style="position: absolute;width: max-content;margin-left: -25%;" :style="{color:stepIndex==1?'#333':'#777'}">{{selectValue=='个人'?'填写个人信息':'填写公司信息'}}</view>
 				</view>
-				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;"></view>
+				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;" :style="{borderColor:stepIndex>1?'#005DA6':'#333'}"></view>
 				<view style="position: relative;">
 				<image v-if="stepIndex==1" style="width: 48px;height: 48px;margin-left: 8px;margin-right: 8px;" src="../static/tu/step2.png"></image>
 				<image v-if="stepIndex!=1" style="width: 48px;height: 48px;margin-left: 8px;margin-right: 8px;" src="../static/tu/step22.png"></image>

+ 1 - 1
circlePages/circle.vue

@@ -24,7 +24,7 @@
 					<image style="width: 48px;height: 48px;margin-right: 8px;" src="../static/tu/step1.png"></image>
 					<view style="position: absolute;width: max-content;margin-left: -8px;" :style="{color:stepIndex==1?'#333':'#777'}">填写需求</view>
 				</view>
-				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;"></view>
+				<view style="flex:1;height: 0px;border: 1px dashed #005DA6;align-self: center;" :style="{borderColor:stepIndex>1?'#005DA6':'#333'}"></view>
 				<view style="position: relative;">
 				<image v-if="stepIndex==1" style="width: 48px;height: 48px;margin-left: 8px;" src="../static/tu/step2.png"></image>
 				<image v-if="stepIndex==2" style="width: 48px;height: 48px;margin-left: 8px;" src="../static/tu/step22.png"></image>

+ 5 - 16
config.js

@@ -1,24 +1,13 @@
 // api请求地址
-// export const VUE_APP_URL = 'https://devmp.lx-device.com/back'; //生产体验版本 连接开发前管控制器
-// export const REACT_URL = 'https://devmp.lx-device.com';//生产体验版
-
-// export const VUE_APP_URL = 'https://api.lx-device.com'; //生产版本 连接生产前管控制器
-// export const REACT_URL = 'https://xuncai.lx-device.com';//生产版
-
-
-// export const VUE_APP_URL = 'http://local.lx-device.com:8032';
-export const VUE_APP_URL = 'http://slb-m.dev.ml1993.com/lx-api'; //开发版体验 连接开发前管控制器
-export const REACT_URL = 'http://slb-m.dev.ml1993.com/lx-api'; //开发版体验 
+let ApiURL = 'https://api.lx-device.com';
+if(wx.getAccountInfoSync()&&wx.getAccountInfoSync().miniProgram.envVersion=='develop'){
+	 ApiURL = 'http://slb-m.dev.ml1993.com/lx-api';
+}
 
+export const VUE_APP_URL = ApiURL; //开发版体验 连接开发前管控制器
 
 // export const VUE_APP_URL = 'http://192.168.11.67:8032'; //开发版体验 连接开发前管控制器
-// export const REACT_URL = 'http://192.168.1.52'; //开发版体验 
-
-
-// export const VUE_APP_URL =                                                                                                                                                                                                                     ://stg-xuncai.lx-device.com';//测试环境
-
 
-   // export const REACT_URL = 'http://localhost:3034';
 // 公众号中是否使用公众号授权登录 true公众号授权->auth界面下一步操作  false直接跳转login登录界面
 export const WECHAT_LOGIN = true;
 // 授权之后返回原有地址

+ 4 - 0
pages/comm/comm.vue

@@ -579,9 +579,13 @@
 				if(!this.curItem.id){
 					this.curItem = item;
 				}else{
+					if(this.curItem.id!=item.id){
+						this.curItem = item;
+					}else{
 					this.curItem = {}
 					this.showSheet = false;
 					return false;
+					}
 				}
 				this.collStatus = false;
 				this.showSheet = true;

+ 8 - 3
pages/home/home.vue

@@ -385,9 +385,14 @@
 				if(!this.curItem.id){
 					this.curItem = item;
 				}else{
-					this.curItem = {}
-					this.showSheet = false;
-					return false;
+					if(this.curItem.id!=item.id){
+						this.curItem = item;
+					}else{
+						this.curItem = {}
+						this.showSheet = false;
+						return false;
+					}
+					
 				}
 				
 				this.curItem.isNeed = 1;

+ 10 - 5
pages/login/login.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding: 16px;font-size: 14px;">
+	<view style="padding: 16px;font-size: 14px;background-color: #f7f7f7;min-height: 100vh;">
 		<tn-nav-bar fixed alpha customBack>
 			<view slot="back" class='tn-custom-nav-bar__back' @click="goBack">
 				<text class='icon tn-icon-left'></text>
@@ -59,7 +59,6 @@
 					"text": ""
 				}],
 				lxSessionKey: '',
-				openId: '',
 				unionid: '',
 				canSave:true,
 				phoneNum:'',
@@ -70,6 +69,7 @@
 		onLoad() {
 			const appBaseInfo = wx.getAppBaseInfo();
 			this.wxFontSize = uni.getStorageSync('fontSize')||appBaseInfo.fontSizeSetting||17;
+			console.error(wx.getAccountInfoSync().miniProgram.envVersion);
 		},
 		onShow(){
 			if(uni.getStorageSync('agreeInfo')){
@@ -87,7 +87,7 @@
 					uni.navigateBack()
 					return;
 				}else{
-					uni.navigateTo({
+					uni.reLaunch({
 						url: '/pages/index/index'
 					})
 				}
@@ -189,8 +189,13 @@
 					wx.getUserInfo({
 						success: function(res) {
 							console.error(res);
-							res.encryptedData = encodeURIComponent(encodeURIComponent(e.detail.encryptedData));
-							res.iv = encodeURIComponent(encodeURIComponent(e.detail.iv));
+							if(wx.getAccountInfoSync()&&wx.getAccountInfoSync().miniProgram.envVersion=='develop'){
+								res.encryptedData = encodeURIComponent(encodeURIComponent(e.detail.encryptedData));
+								res.iv = encodeURIComponent(encodeURIComponent(e.detail.iv));
+							}else{
+								res.encryptedData = (encodeURIComponent(e.detail.encryptedData));
+								res.iv = (encodeURIComponent(e.detail.iv));
+							}
 							res.lxSessionKey = that.lxSessionKey;
 							that.getPhone(res)
 						}

+ 4 - 0
pages/mine/coll.vue

@@ -447,9 +447,13 @@ import {
 				if(!this.curItem.id){
 					this.curItem = item;
 				}else{
+					if(this.curItem.id!=item.id){
+						this.curItem = item;
+					}else{
 					this.curItem = {}
 					this.showSheet = false;
 					return false;
+					}
 				}
 				
 				this.showSheet = true;

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/addShare.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/circlePages/circle.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/comm/comm.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/discovery/discovery.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/coll.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/addShare.wxml


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/circlePages/circle.wxml


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/comm/comm.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/discovery/discovery.wxml


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/login/login.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/coll.js