Merge branch 'dev' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into gaohao

App.vue

@@ -54,6 +54,7 @@
 		methods: {
 			userlogin() {
 				if (!uni.cache.get('token')) {
+					// this.$store.dispatch("loginEvent"); //获取shapid
 					uni.login({
 						provider: 'weixin',
 						success: (data) => {
@@ -76,7 +77,7 @@
 								fail: (err) => {}
 							});
 						},
-						})
+					})
 				}
 			}
 		}

framework/11-api.js

@@ -104,18 +104,17 @@ 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 => {
+				// 		// setTimeout(res => {
-						// store.dispatch("loginEvent"); //获取shapid
+				// 		// store.dispatch("loginEvent"); //获取shapid
-						// }, 1000)
+				// 		// }, 1000)
-					}
+				// 	}
-				})
+				// })
-				// setTimeout(res => {
+				uni.$u.throttle(store.dispatch("loginEvent"), 1000); //获取shapid
-				// store.dispatch("loginEvent"); //获取shapid
+				
-				// }, 1000)
 			} else if (res.code == 482) {
 				let nowTime = new Date() / 1000 | 0
 				let offset = parseInt(res.data.message) - parseInt(nowTime);

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() {
@@ -510,9 +509,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
 			},
@@ -552,7 +548,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 {
@@ -697,6 +692,7 @@
 						this.isSpec = true;
 						// 但但单个规格弹框的处理
 						this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量
+						this.skuBtnText = `添加到购物车`
 					} else {
 						// 多规格数据处理
 						this.isSpec = false;
@@ -727,11 +723,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; // 终止循环
@@ -746,7 +739,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查找价格和数量
 					}
 
@@ -806,11 +798,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; // 终止循环
@@ -824,7 +813,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)
@@ -839,7 +827,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'),
@@ -1035,14 +1023,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,11 @@ 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()
 							}
 						},