修改

pages/groupbuying_details/index.vue

@@ -70,11 +70,15 @@
 								</view>
 								<view class="countdown-r"  v-if="isShowBottom">
 									<image class="timeImg" :style="{'width':'26rpx','height':'26rpx'}" src="http://www.gzzzyd.com/groupon/home_slices/倒计时@2x.png" mode="scaleToFill" />
-									<text class="yellow" :style="{'font-size':'26rpx'}">截止倒计时</text>
+                  <text class="yellow" v-if="storeInfo.isStart">截止倒计时</text>
+                  <text class="yellow" v-else>开团倒计时</text>
 									<!-- <text class="red2">02时25分19秒</text> -->
-									<u-count-down :style="{'height':'96rpx'}" :time="storeInfo.seconds * 1000" format="HH:mm:ss" @change="timechange">
+									<u-count-down v-if="storeInfo.isStart"  :style="{'height':'96rpx'}" :time="storeInfo.seconds * 1000" format="HH:mm:ss" @change="timechange">
 										<text  :style="{'color':'#B42A3E','font-size':'28rpx'}">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}时{{ timeData.minutes }}分{{ timeData.seconds }}秒</text>
 									</u-count-down>
+                  <u-count-down v-else  :style="{'height':'96rpx'}" :time="storeInfo.secondsStart * 1000" format="HH:mm:ss" @change="timechange">
+                    <text  :style="{'color':'#B42A3E','font-size':'28rpx'}">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}时{{ timeData.minutes }}分{{ timeData.seconds }}秒</text>
+                  </u-count-down>
 								</view>
 							</view>
 
@@ -1039,6 +1043,13 @@ export default {
 		},
 
 		goBuyNew(){
+		  if (!this.storeInfo.isStart) {
+        uni.showToast({
+          title: '拼团未开始哦~',
+          icon: 'none'
+        });
+        return;
+      }
       let goodsArr = []
       this.storeInfo.goodsList.forEach(e => {
         if(e.num > 0) {

pages/groupbuying_details/order_details_confirm/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="background-color: white">
+	<view style="background-color: white" v-if="grouponOrderData.goodsInfos">
 		<view class="all-products-body" v-for="(item, index) in grouponOrderData.goodsInfos" :key="index">
 			<view class="all-products-item">
 				<image
@@ -218,21 +218,15 @@
 <script>
 import {getGrouponSelfTakeList } from "@/api/groupon.js";
 import {
-	getGoodsDetail, postOrderSubmit, postBeforeCheck, getUserAddressByIdAndFreight
+	 postOrderSubmit, getUserAddressByIdAndFreight
 } from "@/api/home.js";
 import {
-	orderConfirm,
 	getCouponsOrderPrice,
-	orderCreate,
-	postOrderComputed,
-	checkShipping,
 	getGroupOrderData
 } from '@/api/order.js';
 import {
 	getAddressDefault,
-	getAddressDetail,
 	invoiceList,
-	invoiceOrder
 } from '@/api/user.js';
 import {
 	openPaySubscribe
@@ -240,13 +234,8 @@ import {
 import {
 	storeListApi
 } from '@/api/store.js';
-import {
-	CACHE_LONGITUDE,
-	CACHE_LATITUDE
-} from '@/config/cache.js';
 import couponListWindow from '@/components/couponListWindow';
 import addressWindow from '@/components/addressWindow';
-// import orderGoods from '@/pages/goods/orderGoods/index_mall';
 import home from '@/components/home';
 import {
 	toLogin
@@ -498,10 +487,12 @@ export default {
 			this.selectSelfTakePopupShow = true;
 			let longitude = uni.getStorageSync("user_longitude"); //经度
 			let latitude = uni.getStorageSync("user_latitude"); //纬度
+			let address = uni.getStorageSync("user_address"); //纬度
 			getGrouponSelfTakeList({
 				grouponId: this.grouponId,
 				longitude: longitude,
-				latitude: latitude
+				latitude: latitude,
+        address: address
 			}).then(res => {
 				this.selfTakeShow = true;
 				this.selfTakeList = res.data;
@@ -521,6 +512,7 @@ export default {
 			});
 		},
 		getOrderData() {
+      uni.showLoading({ title: '加载中' });
 			let longitude = uni.getStorageSync("user_longitude"); //经度
 			let latitude = uni.getStorageSync("user_latitude"); //纬度
 			let param = {
@@ -531,17 +523,17 @@ export default {
 				latitude: latitude,
 				grouponId: this.grouponId
 			};
-			console.log(param)
 			getGroupOrderData(param).then(res => {
+        uni.hideLoading();
 				this.grouponOrderData = res.data;
 				let total = 0.0;
 				this.grouponOrderData.goodsInfos.forEach(e => {
-					console.log(e.goodsName + "-" + e.num)
 					total+=(e.discountPrice*e.num)
 				});
 				this.selfTake = this.grouponOrderData.selfTake;
 				this.totalPrice = total;
 			}).catch(err => {
+        uni.hideLoading();
 				uni.showToast({
 					title: err,
 					icon: 'none'

pages/index/diy/components/latestGroupBuying.vue

@@ -59,12 +59,14 @@
 					</view>
 					<view class="countdown-r " v-if="currentId == 0">
 						<image :style="{'width':'26rpx','height':'26rpx'}" src="http://www.gzzzyd.com/groupon/home_slices/倒计时@2x.png" mode="scaleToFill" />
-						<text class="yellow">截止倒计时</text>
-						<!-- <text class="red2">02时25分19秒</text> -->
-						<!-- <uni-countdown :show-day="false" :hour="e.h" :minute="e.m" :second="e.s"></uni-countdown> -->
-						<u-count-down :time="e.seconds * 1000" format="HH:mm:ss" @change="timechange">
+						<text class="yellow" v-if="e.isStart">截止倒计时</text>
+						<text class="yellow" v-else>开团倒计时</text>
+						<u-count-down v-if="e.isStart" :time="e.seconds * 1000" format="HH:mm:ss" @change="timechange">
 							<text  :style="{'color':'#B42A3E','font-size':'26rpx'}">{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}时{{ timeData.minutes }}分{{ timeData.seconds }}秒</text>
 						</u-count-down>
+            <u-count-down v-if="!e.isStart" :time="e.secondsStart * 1000" format="HH:mm:ss" @change="timechange2">
+              <text  :style="{'color':'#B42A3E','font-size':'26rpx'}">{{ timeData2.hours>10?timeData2.hours:'0'+timeData2.hours}}时{{ timeData2.minutes }}分{{ timeData2.seconds }}秒</text>
+            </u-count-down>
 
 					</view>
 				</view>
@@ -166,6 +168,7 @@ export default {
 			scrollLeft: 0,
 			scrollLeftOld: 0,
 			timeData: {},
+			timeData2: {},
 			timestamp: 86400,
 			navigationList2: [],
 			ProductNavindex: 0,
@@ -199,6 +202,9 @@ export default {
 		timechange(e) {
 			this.timeData = e
 		},
+    timechange2(e) {
+      this.timeData2 = e
+    },
 		goToDetail(item) {
 			uni.navigateTo({
 				url: `/pages/groupbuying_details/index?id=${item.id}&selfTakeId=${item.selfTake.id}&organizerUserId=${item.organizerUserId}`

pages/index/diy/index_mall.vue

@@ -50,7 +50,8 @@
 			<view :style="{ height: swiperHeight }">
 				<swiper  :style="{ height: swiperHeight }" :current="tabIndex" @change="swiperChange">
 					<swiper-item v-for="(tab, i) in navigationList" :key="i">
-						<mescroll-item ref="MescrollItem" :i="i" :index="tabIndex" :currentId="currentId" :tabs="navigationList" :height="swiperHeight" :positionInfo="positionInfo">
+						<mescroll-item ref="MescrollItem" :i="i" :index="tabIndex" :currentId="currentId" :tabs="navigationList"
+                           :height="swiperHeight" :positionInfo="positionInfo" @openWindow="openWindow">
 						</mescroll-item>
 					</swiper-item>
 				</swiper>
@@ -66,17 +67,17 @@
 				</view>
 
 				<view class="tips2">
-					您所在的城市没有开放团购目前仅支持的城市如下：
+          您所在的城市没有在拼团中的团购，请切换城市或查看历史团购。团购目前仅支持的城市如下：
 				</view>
 
 				<view class="tips3">
-					上海市
+          合肥市
 				</view>
 
 				<view class="tips4">
 					您可以通过右上角"
 					<text class="red">切换地点</text>
-					"定位到支持
+					"按钮切换城市及地点
 				</view>
 				<button class="tips5" @click="showTips = false">
 					知道了
@@ -174,13 +175,9 @@ export default {
 	computed: mapGetters(['isLogin']),
 	created () {
 		this.getAdsList();
-		this.getLatestGroupon();
 		this.getCurrentLocation()
 		let sysInfo=uni.getSystemInfoSync();
-		console.log("设备信息")
-		console.log(sysInfo)
 		this.swiperHeight= sysInfo.windowHeight -(sysInfo.screenWidth/750) * (200) +'px';
-		console.log(this.swiperHeight)
 	},
 	onMounted (options) {
 	},
@@ -225,18 +222,23 @@ export default {
 		},
 
 		changeAddress () {
+		  this.tabIndex = 0;
+		  let that = this;
 			uni.chooseLocation({
 				latitude: this.markers[0].latitude || '', /* 纬度 */
 				longitude: this.markers[0].longitude || '', /* 经度 */
 				success: (res) => {
-					console.log("changeAddress ---> ", res)
-					if (res.name){
+          console.log(res)
+					if (res.address){
+            console.log("wojinlail ...")
 						this.markers[0].latitude = res.latitude;
 						this.markers[0].longitude =res.longitude;
 						this.markers[0].label.content = res.name;
 						uni.setStorageSync('user_longitude', res.longitude);
 						uni.setStorageSync('user_latitude', res.latitude);
-						uni.setStorageSync('user_address', res.address);
+            uni.setStorageSync('user_address', res.address);
+            // that.tabIndex = 0;
+            that.$refs.MescrollItem[that.tabIndex].downCallback();
 					}
 				},
 				fail: function (err) {
@@ -252,11 +254,12 @@ export default {
 				success: function (res) {
 					uni.setStorageSync('user_longitude', res.longitude);
 					uni.setStorageSync('user_latitude', res.latitude);
-
+					uni.setStorageSync('user_address', res.latitude);
 					console.log("dizhixinxi -> ", res)
 					that.markers[0].longitude = res.longitude;
 					that.markers[0].latitude = res.latitude;
 					getAddress(res.longitude, res.latitude).then(res => {
+            uni.setStorageSync('user_address', res.result.address);
 						//初始化地址信息
 						console.log("++++++++++初始化地址信息++++++++++++", res)
 						// if (res.result.address_component.city.indexOf('上海') === -1){
@@ -264,13 +267,16 @@ export default {
 						// }
 						that.positionInfo.address = res.result.address_reference.landmark_l2.title
 						that.markers[0].label.content = res.result.address_reference.landmark_l2.title
-						uni.setStorageSync('user_address', res.result.address);
 					})
 				}
 			});
 
 		},
 
+    openWindow() {
+		  this.showTips = true;
+    },
+
 
 		// 获取当前地址
 		loAcquire (longitude, latitude) {
@@ -848,12 +854,11 @@ page {
 	}
 
 	.tips3 {
-		height: 66rpx;
+		height: 100rpx;
 		font-size: 48rpx;
 		font-weight: 600;
 		color: #333333;
-		line-height: 66rpx;
-		margin-bottom: 30rpx;
+		line-height: 100rpx;
 	}
 
 	.tips4 {

pages/index/diy/module/mescrollUni-item.vue

@@ -114,7 +114,9 @@
 							if (page.num === 1) this.list = []; //如果是第一页需手动制空列表
 							if (res.data.records.length > 0){
 								this.list = this.list.concat(res.data.records); //追加新数据
-							}
+							} else {
+                this.$emit("openWindow");
+              }
 						}).catch((err) => {
 							//联网失败, 结束加载
 							this.mescroll.endErr();