Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d

App.vue

@@ -10,8 +10,7 @@
 			uni.cache.set('NAME', '零点八零');
 			this.userlogin()
 		},
-		onLoad(){
-		},
+		onLoad() {},
 		onShow: function() {
 			this.$store.dispatch("HeightActions"); //获取随时获取页面的高度
 
@@ -19,40 +18,32 @@
 		onHide: function() {
 			// console.log('App Hide');
 		},
-		methods:{
-			async userlogin(reslange) {
-				var resdataa = reslange
+		methods: {
+			userlogin() {
 				uni.login({
 					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,
-										// signature: infoRes.signature,
-										// iv: infoRes.detail.iv,
-										// encryptedData: infoRes.detail
-										// 	.encryptedData
-									})
-									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);
-									}
-								},
-								fail: (err) => {}
-							});
-						} catch (e) {}
+					success: (data) => {
+						uni.getUserInfo({
+							provider: 'weixin',
+							success: (infoRes) => {
+								uni.cache.set('weixincode', data.code);
+								let res = 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);
+								}
+							},
+							fail: (err) => {}
+						});
 					}
 				});
-			
 			},
-			
+
 		}
 	};
 </script>

pages/chooseasong/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="content">
 		<!-- 占位符导航栏 -->
-		<navseat :opacity='false' :title='"歌曲列表"' :titleshow='true' :heightshow='true' :namecolor='"#fff"' :iconshow='false'></navseat>
+		<navseat :opacity='false' :title='"歌曲列表"' :titleshow='true' :heightshow='true' :namecolor='"#fff"'
+			:iconshow='false'></navseat>
 		<view class="search flex-between">
 			<view class="searchinput flex-between">
 				<input type="text" class="searchinput_input" placeholder-style="color:#FFFFFF" @input="onInput"
@@ -25,8 +26,10 @@
 						</view>
 					</view>
 				</view>
-				<image style="margin:32rpx auto;" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/nomore.png"
-					v-if="is_end" mode="aspectFill"></image>
+				<image style="margin:100rpx auto 32rpx auto;"
+					src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/nomore.png" v-if="is_end"
+					mode="aspectFill"></image>
+
 				<u-loadmore :status="form.status" loadmore-text="上滑加载更多" @loadmore="loadmorelang" fontSize="28"
 					color="#999" iconSize="28" />
 			</view>

pages/chooseasong/record.vue

@@ -4,7 +4,7 @@
 		<navseat :opacity='false' :title='"点单记录"' :titleshow='true' :heightshow='true' :namecolor='"#fff"'
 			iconcolor="#fff" @Topdistance='Topdistance'>
 		</navseat>
-		<view class="content">
+		<view class="content" :style="{'height':Height}">
 			<scroll-view scroll-y="true" style="width:100%;" :style="{'height':Height}" show-scrollbar="false"
 				@scrolltolower="lower">
 				<view class="scrollview" :style="{'height':Height}">
@@ -28,11 +28,9 @@
 						</view>
 						<image class="contentboxafter" src="" mode=""></image>
 					</view>
-					<view class="flex-colum" v-if="is_end" :style="{'height':Height}">
-						<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/background.png"
-							mode="aspectFill"></image>
-						<u-loadmore :status="form.status" fontSize="28" color="#999" iconSize="28" />
-					</view>
+					<image style="margin:100rpx auto 32rpx auto;"
+						src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/nomore.png" v-if="is_end"
+						mode="aspectFill"></image>
 					<view style="padding: 32rpx 0;">
 						<u-loadmore :status="form.status" fontSize="28" color="#999" iconSize="28" />
 					</view>
@@ -69,8 +67,8 @@
 		},
 		mounted() {
 			setTimeout(() => {
-				this.Topdistance()
-			}, 200)
+				// this.Topdistance()
+			}, 500)
 		},
 		onShow() {
 			this.cashierService()
@@ -149,7 +147,6 @@
 		height: 100%;
 		background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/background.png);
 		background-size: 100% 100%;
-		overflow: auto;
 	}
 
 	.content {
@@ -157,8 +154,10 @@
 		z-index: 99;
 		padding: 32rpx 28rpx 0rpx 28rpx;
 		overflow: auto;
+
 		.scrollview {
 			overflow: auto;
+
 			.contentbox:nth-child(1) {
 				margin-top: 0;
 			}

pages/index/indexs.vue

@@ -8,8 +8,8 @@
 					<text class="contentboxitemlefttextone">点餐</text>
 					<text class="contentboxitemlefttexttow">在线点不排队</text>
 				</view>
-				<view class="contentboxitemright" @click="scanCodehandle(1)">
-					<view class="contentboxitemright_item flex-between">
+				<view class="contentboxitemright" >
+					<view class="contentboxitemright_item flex-between" @click="scanCodehandle(1)">
 						<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xvip.png" mode="aspectFill">
 						</image>
 						<view class="contentboxitemright_itembox flex-colum">

pages/order/order.vue

@@ -294,15 +294,16 @@
 					return false;
 				} else {
 					this.form.status = 'loading';
-					this.form.page = ++this.form.page;
 					setTimeout(() => {
 						if (this.form.page == 1) {
+							console.log(111)
 							this.list = res.data.list
 						} else {
+							console.log(222)
 							this.list = [...this.list, ...res.data.list];
 						}
-						this.form.status = 'loading';
-						if (res.data.pageNum == res.data.pages) {
+						this.form.page = ++this.form.page;
+						if (this.form.page > res.data.pages) {
 							this.form.status = 'nomore';
 						} else {
 							this.form.status = 'loading';

pages/order_food/order_food.vue

@@ -78,9 +78,9 @@
 								<view class="name">
 									{{ item1.name }}
 								</view>
-								<view class="namess" v-if="item1.suit>1">
+								<!-- <view class="namess" v-if="item1.suit>1">
 									{{ item1.suit }}
-								</view>
+								</view> -->
 								<view class="price-wrap">
 									<view class="price">
 										<text class="i">￥</text>
@@ -110,7 +110,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="cart-wrap" v-if="cartListsdatashow">
+		<view class="cart-wrap">
 			<view class="cart-content">
 				<view class="left">
 					<image class="icon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/icon_cart.png"
@@ -366,7 +366,7 @@
 							return false;
 						}
 					} else {
-						this.cartListsdatashow = msg.data.length == 0 ? false : true
+						// this.cartListsdatashow = msg.data.length == 0 ? false : true
 						switch (msg.type) {
 							case 'sku': // sku  数量 查询这个商品的价格和数量
 								this.$set(this, 'amountcartNumber', msg.amount)