代码优化

vedio/common/mixins/system-info-mixin.js

@@ -17,7 +17,7 @@ var systemInfoMixin = {
 		}
 	},
 	mounted() {
-		const systemInfo = com.mingce.wxhelibookgetSystemInfoSync();
+		const systemInfo = wx.getSystemInfoSync();
 		this.sdkVersion = systemInfo.hostSDKVersion;
 		this.windowWidth = this.dataCheck(systemInfo.windowWidth);
 		this.windowHeight = this.dataCheck(systemInfo.windowHeight);

vedio/common/services/userServices.js

@@ -147,7 +147,7 @@ function postPhone(data, callback) {
 
 // 请求token
 function requestToken(data, callback) {
-	let url = `${config["BASE_URL"]}/user/ttLogin`;
+	let url = `${config["BASE_URL"]}/user/wechatlogin`;
 	let header = {
 		pkgName: PAKEAGE_NAME,
 		version: VERSION_CODE,

vedio/components/c-login/c-login.vue

@@ -139,15 +139,10 @@
 						login({
 							vedioId: bookId,
 							code: res.code,
-							anonymousCode: res.anonymousCode,
 							thirdParam: thirdParam
 						})
 					},
 					fail(res) {
-						// 登录授权失败
-						uni.navigateTo({
-							url: `/pages/warehouse/warehousetemp`,
-						})
 					},
 				});
 			

vedio/components/coin-popup/coin-popup.vue

@@ -198,7 +198,7 @@
 					signType: wxParams.signType,
 					paySign: wxParams.paySign,
 					success(res) {
-						that.queryOrderStatus(largeType,wxParams.sigData.outTradeNo);
+						that.queryOrderStatus(largeType,wxData.tidStr);
 					},
 					fail(res) {}
 				})

vedio/components/kefu-popup/kefu-popup.vue

@@ -6,7 +6,7 @@
 				margin-bottom: 30rpx;" src="https://mints-web.oss-cn-beijing.aliyuncs.com/images/ic_close_white.png"></image>
 				<view class="content">
 					<button class="button1" type="default" size="default" @click="tapMakePhoneCall">客服电话</button>
-					<button class="button2" open-type="im" data-im-id="93264117800">客服在线</button>
+					<!-- <button class="button2" open-type="im" data-im-id="93264117800">客服在线</button> -->
 				</view>
 			</view>
 		</uni-popup>

vedio/components/warehouse/warehousetemp.vue

@@ -54,14 +54,7 @@
 			};
 		},
 		onLoad() {
-
-			this.getCategoryData();
-			watchUserInfoChange((info) => {
-				this.userInfo = info.userInfo
-			}, this);
-		},
-		onShow() {
-			this.refreshUserData();
+			
 		},
 		computed: {
 			showEmpty: function() {
@@ -96,7 +89,18 @@
 				deep: true
 			}
 		},
-		methods: {
+		methods: {
+			show(){
+				console.log("123123123")
+				this.getCategoryData();
+				watchUserInfoChange((info) => {
+					this.userInfo = info.userInfo
+				}, this);
+				this.refreshUserData();
+			},
+			hide() {
+			
+			},
 			readyCategory() {
 				setTimeout(() => {
 					this.initHeight()

vedio/pages/home.vue

 <template>
-	<view class="body">
+	<view v-if="localActiviteFlag==1"  class="body">
 		<view style="height: 92%;">
 			<bookshelf v-show="currentPage==0" ref="index" />
 			<warehouse v-show="currentPage==1" ref="recommend" />
@@ -35,6 +35,12 @@
 				我的
 			</view>
 		</view>
+	</view>
+	
+	<view v-else class="body">
+		<view style="height: 95%;">
+			<warehouse v-show="currentPage==1" ref="recommend" />
+		</view>
 	</view>
 </template>
 
@@ -60,11 +66,14 @@
 		},
 		data() {
 			return {
-				currentPage: 1
+				currentPage: 1,
+				localActiviteFlag: 0
 			}
 		},
 		onLoad(options) {
 			let index = options.index ?? ''
+			this.localActiviteFlag = options.activiteFlag;
+			console.log("activiteFlag====", options.activiteFlag)
 			if (index != '' && index != undefined) {
 				this.currentPage = index
 			}
@@ -86,11 +95,14 @@
 		mounted() {
 			// 渲染完成 初始化首页数据
 			this.loadComponentData();
-
-			let that = this
-			uni.$on('goWareHouse', function(data) {
-				that.tabChange(1)
-			})
+
+			if (this.localActiviteFlag == 1) {
+				let that = this
+				uni.$on('goWareHouse', function(data) {
+					that.tabChange(1)
+				})
+			}
+
 		},
 		methods: {
 			tabChange(index) {
@@ -99,12 +111,18 @@
 				this.loadComponentData();
 			},
 			loadComponentData() {
-				if (this.currentPage == 0) {
-					this.$refs.index.show();
-				} else if (this.currentPage == 1) {
-					this.$refs.recommend.show();
-				} else if (this.currentPage == 2) {
-					this.$refs.user.show();
+				if (this.localActiviteFlag == 1) {
+					if (this.currentPage == 0) {
+						this.$refs.index.show();
+					} else if (this.currentPage == 1) {
+						this.$refs.recommend.show();
+					} else if (this.currentPage == 2) {
+						this.$refs.user.show();
+					}
+				} else {
+					if (this.currentPage == 1) {
+						this.$refs.recommend.show();
+					}
 				}
 			}
 		}

vedio/pages/loading.vue

@@ -71,36 +71,33 @@
 						key: 'firstBookId',
 						data: bookId
 					});
-				}
-				
-				uni.login({
-					provider: 'weixin',
-					success: function(loginRes) {
-						that.post({
-							url: '/user/wechatlogin',
-							data: {
-								vedioId: bookId,
-								code: loginRes.code,
-								thirdParam: thirdParam
-							},
-							showLoading: false,
-							success: ({
-								data
-							}) => {
-								app.globalData.userId = data.idcode;
-								saveToken(data.token)
-								setTimeout(() => {
-									redirectTo('home');
-								}, 1000);
-							}
-						});
-					},
-					fail: function(err) {
-						// 登录授权失败  
-						uni.navigateTo({
-							url: `/pages/warehouse/warehousetemp`,
-						})
-					}
+				}
+
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						that.post({
+							url: '/user/wechatlogin',
+							data: {
+								vedioId: bookId,
+								code: loginRes.code,
+								thirdParam: thirdParam
+							},
+							showLoading: false,
+							success: ({
+								data
+							}) => {
+								app.globalData.userId = data.idcode;
+								saveToken(data.token)
+								setTimeout(() => {
+									// redirectTo('home?activiteFlag='+data.activiteFlag);
+									redirectTo('home?activiteFlag='+0);
+								}, 1000);
+							}
+						});
+					},
+					fail: function(err) {
+					}
 				});
 			}
 		}