no message

pages-my/my-appraise.vue

@@ -57,7 +57,7 @@
 							{{itemTwo.content}}
 						</view>
 						<view class="item-img-box mb-20 align-items-center flex-wrap-wrap">
-							<image class="b-rad-12" v-for="imgUrl in itemTwo.images" :src="imgUrl" mode="aspectFill"
+							<image class="b-rad-12" v-for="(imgUrl, imgIndex) in itemTwo.images" :src="imgUrl" mode="aspectFill" @click="lookImg(imgIndex,itemTwo.images)"
 								:class="itemTwo.images.length==1?'item-img-one':itemTwo.images.length==2?'item-img-two':'item-img-three'">
 							</image>
 						</view>
@@ -125,6 +125,9 @@
 		onLoad(data) {},
 		mounted() {},
 		methods: {
+			lookImg(i, item) {
+				tools.lookBigImg(i, item)
+			},
 			del(id) {
 				commentDel({id: id}).then((res) => {
 					if(res.code == 1) {

pages-order/express-info.vue

@@ -308,7 +308,7 @@
 			cancelOrder() {
 				// 代取取消订单
 				expressOrderCancel({
-					order_id: infoData.id
+					order_id: this.infoData.id
 				}).then((res) => {
 					if (res.code == 1) {
 						tools.success(res.msg)

pages-order/laundry-info.vue

@@ -216,7 +216,7 @@
 			cancelOrder() {
 				// 干洗取消订单
 				laundryOrderCancel({
-					order_id: infoData.id
+					order_id: this.infoData.id
 				}).then((res) => {
 					if (res.code == 1) {
 						tools.success(res.msg)

pages-order/takeout-info.vue

@@ -238,7 +238,7 @@
 		},
 		onLoad(data) {
 			if (data) {
-				console.log(data);
+				// console.log(data);
 				this.orderInfo(data.orderId)
 			}
 		},
@@ -246,8 +246,11 @@
 		methods: {
 			goToUrl() {
 				// 再来一单
-				uni.navigateTo({
-					url: '/pages-takeout/takeout'
+				// uni.navigateTo({
+				// 	url: '/pages-takeout/takeout'
+				// })
+				uni.redirectTo({
+					url: '/pages-takeout/shop?shop_id=' + this.infoData.shop_id
 				})
 			},
 			setAddress() {
@@ -303,9 +306,9 @@
 				})
 			},
 			cancelOrder() {
-				// 代取取消订单
+				// 外卖取消订单
 				orderCancel({
-					order_id: infoData.id
+					order_id: this.infoData.id
 				}).then((res) => {
 					if (res.code == 1) {
 						tools.success(res.msg)

pages-takeout/goods-order.vue

@@ -25,10 +25,10 @@
 						<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
 					</view>
 				</view>
-				<view class="box-input flex-justify-space box-border-box p-b-20 mb-20">
+<!-- 				<view class="box-input flex-justify-space box-border-box p-b-20 mb-20">
 					<view class="fs-28 fw-600">配送方式</view>
 					<view class="fs-24 fw-400 sd-box fc-FB3D03">送达宿舍</view>
-				</view>
+				</view> -->
 			</view>
 
 

pages-takeout/shop-mod/evaluate.vue

@@ -47,7 +47,7 @@
 						{{item.content}}
 					</view>
 					<view class="flex-wrap-wrap">
-						<image v-for="(itemImages,iImages) in item.images" :key="i" @click="lookImg(i,item)" class="list-img"
+						<image v-for="(itemImages,iImages) in item.images" :key="i" @click="lookImg(iImages,item.images)" class="list-img"
 							:src="itemImages" mode="scaleToFill"></image>
 					</view>
 

pages/order/index.vue

@@ -129,27 +129,27 @@
 							v-if="type == 5 && item.order_status == 2 || type == 5 && item.order_status == 3 || type == 5 && item.order_status == 4">
 							二维码
 						</view>
-						<view @click.stop="goToUrl('takeOut')" class="item-but but-class-one fs-28 mr-18"
+						<view @click.stop="goToUrl('takeOut', item)" class="item-but but-class-one fs-28 mr-18"
 							v-if="type == 1 && item.order_status == 3 || type == 1 && item.order_status == 7 || type == 1 && item.order_status == 8 || type == 1 && item.order_status == 9 || type == 1 && item.order_status == 10">
 							<!-- 外卖 -->
 							再来一单
 						</view>
-						<view @click.stop="goToUrl('express')" class="item-but but-class-one fs-28 mr-18"
+						<view @click.stop="goToUrl('express', item)" class="item-but but-class-one fs-28 mr-18"
 							v-if="type == 2 && item.order_status == 4 || type == 2 && item.order_status == 5 || type == 2 && item.order_status == 6">
 							<!-- 代取 -->
 							再来一单
 						</view>
-						<view @click.stop="goToUrl('group')" class="item-but but-class-one fs-28 mr-18"
+						<view @click.stop="goToUrl('group', item)" class="item-but but-class-one fs-28 mr-18"
 							v-if="type == 3 && item.order_status == 2 || type == 3 && item.order_status == 4">
 							<!-- 团购 -->
 							再来一单
 						</view>
-						<view @click.stop="goToUrl('ticket')" class="item-but but-class-one fs-28 mr-18"
+						<view @click.stop="goToUrl('ticket', item)" class="item-but but-class-one fs-28 mr-18"
 							v-if="type == 4 && item.order_status == 2 || type == 4 && item.order_status == 4">
 							<!-- 票务 -->
 							再来一单
 						</view>
-						<view @click.stop="goToUrl('laundry')" class="item-but but-class-one fs-28 mr-18"
+						<view @click.stop="goToUrl('laundry', item)" class="item-but but-class-one fs-28 mr-18"
 							v-if="type == 5 && item.order_status == 5 || type == 5 && item.order_status == 6 || type == 5 && item.order_status == 7">
 							<!-- 干洗 -->
 							再来一单
@@ -268,10 +268,14 @@
 					url: '/pages-takeout/shop?shop_id=' + item.shop_id
 				})
 			},
-			goToUrl(type) {
+			goToUrl(type, item) {
+				// 再来一单
 				if (type == 'takeOut') {
+					// uni.navigateTo({
+					// 	url: '/pages-takeout/takeout'
+					// })
 					uni.navigateTo({
-						url: '/pages-takeout/takeout'
+						url: '/pages-takeout/shop?shop_id=' + item.shop_id
 					})
 				} else if (type == 'express') {
 					uni.navigateTo({