1

App.vue

@@ -1,6 +1,7 @@
 <template>
 </template>
 <script>
+	import Api from '@/common/js/api.js'
 	export default {
 		onLaunch: function() {
 			// #ifdef MP-WEIXIN
@@ -8,7 +9,8 @@
 			// #endif
 			uni.cache.set('NAME', '零点八零');
 		},
-		onLoad() {},
+		onLoad() {
+		},
 		onShow: function() {
 			this.$store.dispatch("HeightActions"); //获取随时获取页面的高度
 			// #ifdef MP-WEIXIN
@@ -48,6 +50,36 @@
 		onHide: function() {
 			// console.log('App Hide');
 		},
+		methods: {
+			userlogin() {
+				if (!uni.cache.get('token')) {
+					// this.$store.dispatch("loginEvent"); //获取shapid
+					uni.login({
+						provider: 'weixin',
+						success: (data) => {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: async (infoRes) => {
+									uni.cache.set('weixincode', data.code);
+									let res = await Api.userwxlogin({
+										code: uni.cache.get('weixincode'), //临时登录凭证
+										rawData: infoRes.rawData,
+									})
+									if (res.code == 0) {
+										uni.cache.set('token', res.data.token);
+										uni.cache.set('miniAppOpenId', res.data.userInfo
+											.miniAppOpenId)
+										uni.cache.set('userInfo', res.data.userInfo);
+										this.$isResolve()
+									}
+								},
+								fail: (err) => {}
+							});
+						},
+					})
+				}
+			}
+		}
 	};
 </script>
 

framework/11-api.js

@@ -104,13 +104,16 @@ async function request(options) {
 		if (res.code != 0) {
 			console.log(options)
 			if (res.code == -4) {
-				uni.showToast({
+				// uni.showToast({
-					title: res.message || res.msg,
+				// 	title: res.message || res.msg,
-					icon: "none",
+				// 	icon: "none",
-					success: () => {
+				// 	success: () => {
-						
+				// 		// setTimeout(res => {
-					}
+				// 		// store.dispatch("loginEvent"); //获取shapid
-				})
+				// 		// }, 1000)
+				// 	}
+				// })
+				uni.$u.throttle(store.dispatch("loginEvent"), 1000); //获取shapid
 				
 			} else if (res.code == 482) {
 				let nowTime = new Date() / 1000 | 0

main.js

@@ -23,6 +23,10 @@ uni.$u.config.unit = 'rpx'
 Vue.prototype.useStorage = useStorage
 Vue.prototype.api = Api;
 Vue.prototype.shop = Shop;
+Vue.prototype.$onLaunched = new Promise(resolve => {
+    Vue.prototype.$isResolve = resolve
+})
+
 // #ifdef VUE3
 import {
 	createSSRApp

pages/member/index.vue

@@ -64,44 +64,23 @@
 				usershopUserinfo: null,
 			}
 		},
-		onLoad(e) {
+		async onLoad(e) {
 			console.log(e)
-			if ( e.type == 'list' || e.type == 'index') {
+			// if ( e.type == 'list' || e.type == 'index') {
-				this.shopId = e.shopId;
+			// 	this.shopId = e.shopId;
-				this.init();
+			// 	this.init();
-			}
+			// }
 			if (e.q) {
 				this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
+				this.tokenShow = false;
+				 // 等待登录结果返回
 				if (!uni.cache.get('token')) {
-					uni.login({
+					await this.$onLaunched;
-						provider: 'weixin',
-						success: async (data) => {
-							try {
-								uni.getUserInfo({
-									provider: 'weixin',
-									success: async (infoRes) => {
-										uni.cache.set('weixincode', data.code);
-										let res = await this.api.userwxlogin({
-											code: uni.cache.get('weixincode'), //临时登录凭证
-											rawData: infoRes.rawData
-										})
-										if (res.code == 0) {
-											uni.cache.set('token', res.data.token);
-											uni.cache.set('miniAppOpenId', res.data.userInfo
-												.miniAppOpenId)
-											uni.cache.set('userInfo', res.data.userInfo);
-											this.tokenShow = false;
-											this.init();
-										}
-									},
-									fail: (err) => {}
-								});
-							} catch (e) {}
-						}
-					});
-				} else {
-					this.init();
 				}
+				this.init();
+			} else{
+				this.shopId = e.shopId;
+				this.init();
 			}
 			console.log(this.shopId)
 		},
@@ -240,14 +219,11 @@
 									uni.navigateBack()
 								}, 500)
 							} else {
-								uni.exitMiniProgram({
+								setTimeout(res => {
-								    success: function () {
+									uni.switchTab({
-								      console.log('退出成功');
+										url: '/pages/index/index'
-								    },
+									})
-								    fail: function () {
+								}, 500)
-								      console.log('退出失败');
-								    }
-								});
 							}
 						
 						},

pages/order_food/confirm_order.vue

@@ -10,7 +10,7 @@
 		<view class="head">
 			<view class="head_bg"></view>
 			<view class="tips">
-				<image class="informIcon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png" mode="widthFix"/>
+				<image class="informIcon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png" mode="aspectFill"/>
 				<text class="informText">温馨提示：请适量点餐，避免浪费</text>
 			</view>
 			<!-- <view class="tabBox"> -->
@@ -93,7 +93,7 @@
 							<view class="method_list" @click="groupChange(index+1)">
 								<view class="method_list_top">
 									<view class="method_list_top_left">
-										<image class="icon" :src="item.url" mode="widthFix"/>
+										<image class="icon" :src="item.url" mode="aspectFill"/>
 										<text class="name"> {{ item.name }} </text>
 									</view>
 									<u-radio activeColor="#E8AD7B" icon-size="36" size="36" :name="index+1">
@@ -210,8 +210,8 @@
 			this.listinfo.name = JSON.parse(e.storeInfo).shopName;
 		},
 		onShow() {
-			uni.$on('message', this.getMessage)
 			if (this.listinfoid) {
+				uni.$on('message', this.getMessage)
 				this.orderorderInfo()
 			} else {
 				this.handlemessage()
@@ -310,6 +310,7 @@
 					userId: uni.cache.get('userInfo').id,
 					"type": "connect",
 				})
+				uni.$on('message', this.getMessage)
 			},
 			
 			/**
@@ -590,7 +591,8 @@
 			display: flex;
 			align-items: center;
 			.informIcon{
-				width: 26.7rpx;
+				width: 26.79rpx;
+				height: 24.06rpx;
 				margin-right: 8rpx;
 			}
 			.informText{
@@ -923,7 +925,8 @@
 					.method_list_top_left{
 						display: flex;
 						.icon{
-							width: 54rpx!important;
+							width: 54.67rpx!important;
+							height: 48rpx!important;
 							margin-right: 22rpx;
 						}
 						.name{

pages/order_food/order_food.vue

@@ -382,7 +382,6 @@
 				return `left-${this.leftIndex? this.leftIndex:0}`;
 			},
 			HeighT() { //手机类型的尺寸    导航栏高度
-				console.log(this.$store.getters.is_BarHeight)
 				return this.$store.getters.is_BarHeight.heightBar + this.$store.getters.is_BarHeight.customBar
 			},
 			scrollHeight() {
@@ -407,38 +406,18 @@
 			uni.$off('message')
 			this.fixedtrue = true
 		},
-		onShow() {
+		async onShow() {
 			let _this = this;
 			this.orderdetailFlag = true;
 			uni.pageScrollTo({
 				scrollTop: 0,
 				duration: 0
 			});
-			uni.login({
+			if (!uni.cache.get('token')) {
-				provider: 'weixin',
+				await this.$onLaunched;
-				success: async (data) => {
+			}
-					uni.getUserInfo({
+			uni.$on('message', this.getMessage)
-						provider: 'weixin',
+			_this.getLocation()
-						success: async (infoRes) => {
-							uni.cache.set('weixincode', data.code);
-							let res = await this.api.userwxlogin({
-								code: uni.cache.get('weixincode'), //临时登录凭证
-								rawData: infoRes.rawData
-							})
-							if (res.code == 0) {
-								uni.cache.set('token', res.data.token);
-								uni.cache.set('miniAppOpenId', res.data.userInfo
-									.miniAppOpenId)
-								uni.cache.set('userInfo', res.data.userInfo);
-								uni.$on('message', this.getMessage)
-
-								_this.getLocation()
-							}
-						},
-						fail: (err) => {}
-					});
-				}
-			});
 		},
 		methods: {
 			navigateBacknav() {
@@ -496,6 +475,7 @@
 					});
 				} catch (e) {
 					this.productqueryShop();
+					//TODO handle the exception
 				}
 			},
 
@@ -505,8 +485,10 @@
 			async productqueryShop() {
 				let res = await this.api.productqueryShop({
 					code: uni.cache.get('tableCode'),
-					lng: uni.cache.get('getLocationstorage').lng ? uni.cache.get('getLocationstorage').lng : '',
+					lng: uni.cache.get('getLocationstorage').lng ? uni.cache.get('getLocationstorage').lng :
-					lat: uni.cache.get('getLocationstorage').lat ? uni.cache.get('getLocationstorage').lat : '',
+						'',
+					lat: uni.cache.get('getLocationstorage').lat ? uni.cache.get('getLocationstorage').lat :
+						'',
 				})
 				if (res.code == 0) {
 					uni.cache.set('shopUser', res.data.storeInfo.id)
@@ -525,9 +507,6 @@
 			 * 图片加载
 			 */
 			imageLoaded(item, index, index1) {
-				console.log(index)
-				console.log(index1)
-				console.log(this.shopProductList.productInfo[index])
 				this.shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
 				// e.currentTarget.src
 			},
@@ -567,7 +546,6 @@
 				} else {
 
 					if (this.amountcartNumber > 0) {
-						console.log(item)
 						if (this.skuNumber < this.skuSuit && this.amountcartNumber <= this.skuSuit) {
 							this.amountcartNumber = this.amountcartNumber - (this.skuSuit == 0 ? 1 : this.skuSuit);
 						} else {
@@ -712,6 +690,7 @@
 						this.isSpec = true;
 						// 但但单个规格弹框的处理
 						this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量
+						this.skuBtnText = `添加到购物车`
 					} else {
 						// 多规格数据处理
 						this.isSpec = false;
@@ -742,11 +721,8 @@
 							isSkuidname = JSON.parse(JSON.stringify(this.skuidname));
 							isSkuidname.push(this.specifications.tagSnap[0].children[o].name)
 							//筛选符合条件的规格列表
-							console.log(isSkuidname);
 							filteredJson = this.querySpecList.filter(obj => obj.specSnap.indexOf(isSkuidname) == 0);
-							console.log(filteredJson);
 							for (let i = 0; i < filteredJson.length; i++) {
-								console.log(filteredJson[i].isGrounding)
 								if (filteredJson[i].isGrounding) {
 									this.specifications.tagSnap[0].children[o].isGrounding = true
 									break; // 终止循环
@@ -761,7 +737,6 @@
 						// 	console.log(val)
 						// 	this.skuidname.push(val.children[0].info)
 						// })
-						console.log(this.specifications.tagSnap)
 						this.hodgepodge(this.specifications.tagSnap[0], 2) //获取skuid /2查找价格和数量
 					}
 
@@ -821,11 +796,8 @@
 						isSkuidname = JSON.parse(JSON.stringify(this.skuidname));
 						isSkuidname.push(this.specifications.tagSnap[index + 1].children[o].name)
 						//筛选符合条件的规格列表
-						console.log(isSkuidname);
 						filteredJson = this.querySpecList.filter(obj => obj.specSnap.indexOf(isSkuidname) == 0);
-						console.log(filteredJson);
 						for (let i = 0; i < filteredJson.length; i++) {
-							console.log(filteredJson[i].isGrounding)
 							if (filteredJson[i].isGrounding) {
 								this.specifications.tagSnap[index + 1].children[o].isGrounding = true
 								break; // 终止循环
@@ -839,7 +811,6 @@
 				// res.data.forEach((v,e)=>{
 				// 	// this.$set(this.specifications.tagSnap[e], 'children', v.value)
 				// })
-				console.log(this.specifications.tagSnap)
 
 				this.$forceUpdate();
 				this.hodgepodge(item, 2)
@@ -854,7 +825,7 @@
 			 */
 			async hodgepodge(item, a, c, num) { //此接口去获取商品id ！！！赋值库存  数量  价格等
 				try {
-					console.log(this.skuidname.join(","))
+					// console.log(this.skuidname.join(","))
 					let res = await this.api.productqueryProductSku({
 						code: uni.cache.get('tableCode'),
 						shopId: uni.cache.get('shopUser'),
@@ -1049,14 +1020,11 @@
 							break;
 						}
 					}
-					console.log(index)
 					/* 查找当前滚动距离 */
 					if (index >= this.lastbottom) { //
-						console.log(index, this.leftIndex)
 						this.leftIndex = index > this.leftIndex ? index : this.leftIndex
 						// this.leftIndex = this.leftIndex
 					} else {
-						console.log(22918)
 						this.leftIndex = (index < 0 ? 0 : index);
 					}
 				}

store/index.js

@@ -78,6 +78,12 @@ const store = new Vuex.Store({
 								uni.cache.set('miniAppOpenId', res.data.userInfo
 									.miniAppOpenId)
 								uni.cache.set('userInfo', res.data.userInfo);
+								let pages = getCurrentPages()
+								let curPage = pages[pages.length -1 ]
+								curPage.onLoad(curPage.options)
+								curPage.onShow()
+								curPage.onReady()
+								this.$isResolve()
 							}
 						},
 						fail: (err) => {}