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

pagesOrder/order_detail/index.vue

@@ -18,8 +18,12 @@
 				<text>会员享低价</text>
 				<text>长按保存，微信内扫一扫加好友</text>
 			</view>
+			<!-- #ifdef MP-WEIXIN -->
+			<u-image width="152" height="152" radius="16" :src="listinfo.shopQrcode" ></u-image>
+			<!-- #endif -->
+			<!-- #ifdef MP-ALIPAY -->
 			<image style="height: 150rpx;width: 150rpx;" :src="listinfo.shopQrcode" @longpress="saveImage(listinfo.shopQrcode)" mode="aspectFill"></image>
-			<!-- <u-image width="152" height="152" radius="16" :src="listinfo.shopQrcode" ></u-image> -->
+			<!-- #endif -->
 		</view>
 		
 		<orderInfoAfter ref="orderInfoAfter" :listinfo="listinfo" v-if="listinfo.useType == 'dine-in-after'"></orderInfoAfter>
@@ -107,7 +111,7 @@
 		},
 		methods: {
 			saveImage (url) {
-				my.saveImage({
+				uni.saveImage({
 					url: url,
 				    success: () => {
 				       uni.showToast({