修改接口地址

common/js/api.js

@@ -58,7 +58,7 @@ export default {
 	},
 	// 支付
 	payOrderPay(data){
-		return uni.api.post("/pay/orderPay", data);
+		return uni.api.post("/pay/groupOrderPay", data);
 	},
 	paymodfiyOrderInfo(data) { //查询订单支付状态
 		return uni.api.post("/pay/modfiyOrderInfo", data);

pages/group_order/components/groupStore.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="rightStyle" v-for="(ele,index) in item.goods" :key="index">
 				<view>
-					{{ele.name}} <text>({{ele.unitName}})</text>
+					{{ele.name}} <text>({{ele.groupNum}}{{ele.unitName}})</text>
 				</view>
 				<text>￥{{ele.lowPrice}}</text>
 			</view>

pages/index/components/advertisement.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="onecontent flex-between">
 		<view class="onecontentleft">
-			现有{{bannervo.coupons}}人以免单
+			现有{{bannervo.coupons==null?116:bannervo.coupons}}人已免单
 		</view>
 
 		<view class="onecontentright flex-start">

pages/index/components/diamond.vue

@@ -38,7 +38,7 @@
 						});
 						break;
 					case 'relative':
-						uni.pro.navigateTo(item.absUrl, item);
+						uni.pro.navigateTo(item.absUrl, JSON.stringify(item));
 						break;
 					case 'scan':
 						if (!uni.utils.pluschooseImage()) {

pages/index/freedaily.vue

@@ -14,7 +14,8 @@
 						src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/mrmd2.png" mode="aspectFill">
 					</image>
 					<view class="towcontentoneboxswiper">
-						<swiper class="swiper" circular :autoplay='true' :vertical='true' display-multiple-items="4" :interval="'3000'">
+						<swiper class="swiper" circular :autoplay='true' :vertical='true' display-multiple-items="4"
+							:interval="'3000'">
 							<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
 								:key="index">
 								<view class="swiper-item">{{item.userName}}* 免单{{item.orderAmount}}元订单号：{{item.orderNo}}
@@ -42,8 +43,25 @@
 								免单状态
 							</view>
 						</view>
-						<swiper class="swiper" circular :autoplay='true' :vertical='true' interval="3000"  display-multiple-items="4">
+						<view class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
-							<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist" :key="index">
+							:key="index">
+							<view class="swiper-item" style="margin-top: 32rpx;">
+								<view class="swiper_itemone">
+									{{item.orderAmount}}元
+								</view>
+								<view class="swiper_itemtow">
+									{{item.orderNo}}
+								</view>
+								<view class="swiper_itemthere">
+									{{item.isRefund == true ? '已免单':'待免单'}}
+								</view>
+							</view>
+						</view
+						>
+					<!-- 	<swiper class="swiper" circular :autoplay='true' :vertical='true' interval="3000"
+							display-multiple-items="4">
+							<swiper-item class="swiperitem" v-for="(item,index) in orderfindWiningUserlist"
+								:key="index">
 								<view class="swiper-item">
 									<view class="swiper_itemone">
 										{{item.orderAmount}}元
@@ -57,7 +75,7 @@
 								</view>
 							</swiper-item>
 
-						</swiper>
+						</swiper> -->
 					</view>
 				</view>
 			</view>
@@ -91,9 +109,9 @@
 			};
 		},
 		onLoad(e) {
-			console.log(e)
 			this.orderfindWiningUser()
-			this.titlename = e.name
+			let data = JSON.parse(e)
+			this.titlename = data.name
 		},
 		onPageScroll(e) {
 			if (e.scrollTop <= 44) { //搜索导航栏
@@ -268,7 +286,7 @@
 
 					.towcontentoneboxswiper {
 						width: 100%;
-						height: 242rpx;
+						// height: 242rpx;
 						padding-top: 24rpx;
 						overflow: hidden;
 

pages/index/index.vue

@@ -60,7 +60,8 @@
 					</view>
 				</view>
 
-				<view class="fivecontent" :style="{'height':seighT + 'px'}">
+				<view class="fivecontent" >
+				<!-- <view class="fivecontent" :style="{'height':seighT + 'px'}"> -->
 					<!-- <scroll-view :style="{'height':seighT + 'px'}" scroll-y @scrolltolower="loadMore"
 						scroll-with-animation> -->
 					<view class="fivecontent_item" v-for="(item,index) in homelist" :key="index"

pages/index/tothestore.vue

@@ -20,11 +20,11 @@
 								{{item.shopName}}
 							</view>
 						</view>
-						<view class="fivecontent_itemoneboxtow flex-start">
+						<view class="fivecontent_itemoneboxtow flex-start" @click="goMap">
 							<image class="fivecontent_itemoneboxtowimage"
 								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/dw.png" mode="widthFix"></image>
 							<view class="fivecontent_itemoneboxtow_o">
-								{{item.address}}
+								{{item.address.length>7?item.address.substring(0,7)+'...':item.address}}
 							</view>
 							<view class="fivecontent_itemoneboxtow_t">
 								{{item.distances}}km
@@ -81,6 +81,12 @@
 			this.distiricttopCommon()
 		},
 		methods: {
+			goMap() {
+				uni.openLocation({
+					longitude: uni.cache.get('getLocationstorage').lng,
+					latitude: uni.cache.get('getLocationstorage').lat
+				})
+			},
 			init_fn(e) {
 				this.list = []
 				this.form.page = 1 //页数
@@ -98,13 +104,13 @@
 					type: 'subShop', //团购卷品类Id/subShop-预约到店
 					orderBy: ''
 				})
-					if (res.code == 0) {
+				if (res.code == 0) {
 					this.toplist = res.data.carousel[0]
 				}
 			},
 			async distirictsubShopList() {
 				let res = await this.api.distirictsubShopList({
-					address:uni.cache.get('getLocationstorage').address, //地址
+					address: uni.cache.get('getLocationstorage').address, //地址
 					lng: uni.cache.get('getLocationstorage').lng,
 					lat: uni.cache.get('getLocationstorage').lat,
 					distanceInKm: '10', //默认10 以经纬度为中心 多大范围以内 单位km
@@ -119,7 +125,7 @@
 					this.form.status = 'loading';
 					this.form.page = ++this.form.page;
 					setTimeout(() => {
-						this.list = [...this.list,...res.data.list]
+						this.list = [...this.list, ...res.data.list]
 						this.form.status = 'loading';
 						if (res.data.pageNum == res.data.pages) {
 							this.form.status = 'nomore';

pages/product/index.vue

@@ -64,7 +64,7 @@
 				<view class="theretherecontent">
 					营业时间：{{listdata.businessTime}}
 				</view>
-				<view class="fourtherecontent flex-start">
+				<view class="fourtherecontent flex-start" @click="goMap">
 					<image class="fourtherecontentimage"
 						src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/product/d.png" mode="aspectFill"></image>
 					<view class="fourtherecontent_o">
@@ -95,7 +95,7 @@
 						</view>
 						<view class="fourcontent_th_tow flex-start">
 							<view class="fourcontent_th_towo">
-								（{{item1.unitName}}）
+								（{{item1.groupNum}}{{item1.unitName}}）
 							</view>
 							<view class="fourcontent_th_towt">
 								￥{{item1.lowPrice}}
@@ -403,6 +403,13 @@
 					name
 				})
 			},
+			goMap(){
+				uni.openLocation({
+					longitude: uni.cache.get('getLocationstorage').lng,
+					latitude: uni.cache.get('getLocationstorage').lat
+				})
+			},
+			// 跳转
 			async onLoadInfo() { //详情接口
 				let res = await this.api.productproductInfo({
 					productId: this.indexform,