pangqijun 1 жил өмнө
parent
commit
9b8695383c

+ 2 - 2
components/orderList/orderList.vue

@@ -16,13 +16,13 @@
 						<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/日期@2x.png" />
 
 						<text>
-							团购日期:{{item.grouponStartTime}} 至 {{item.grouponEndTime}}
+							团购日期:{{item.grouponStartTimeStr}} 至 {{item.grouponEndTimeStr}}
 						</text>
 					</view>
 					<view class="time">
 						<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
 						<text>
-							提货时间:{{item.takeStartTime}} 至 {{item.takeEndTime}}
+							提货时间:{{item.takeStartTimeStr}} 至 {{item.takeEndTimeStr}}
 						</text>
 					</view>
 				</view>

+ 2 - 2
pages/groupbuying/groupbuying_order_details/index.vue

@@ -16,13 +16,13 @@
 						<view class="phone">
 							<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/日期@2x.png" />
 							<text>
-								团购日期:{{groupBuy.grouponStartTime}} 至 {{groupBuy.grouponEndTime}}
+								团购日期:{{groupBuy.grouponStartTimeStr}} 至 {{groupBuy.grouponEndTimeStr}}
 							</text>
 						</view>
 						<view class="time">
 							<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
 							<text>
-								提货时间:{{groupBuy.takeStartTime}} 至 {{groupBuy.takeEndTime}}
+								提货时间:{{groupBuy.takeStartTimeStr}} 至 {{groupBuy.takeEndTimeStr}}
 							</text>
 						</view>
 					</view>

+ 6 - 1
pages/groupbuying/groupbuying_order_list/index.vue

@@ -16,7 +16,7 @@
 			</swiper>
 		</view>
 		<view class="publish">
-			<button>发布团购</button>
+			<button @click="publishGroupon">发布团购</button>
 		</view>
 		<!-- #ifndef MP -->
 		<home></home>
@@ -154,6 +154,11 @@ export default {
 		}
 	},
 	methods: {
+		publishGroupon() {
+			uni.navigateTo({
+				url: `/pages/groupbuying/publish_group/index`
+			})
+		},
 
 		swiperChange(e) {
 			this.tabIndex = e.detail.current

+ 2 - 4
pages/groupbuying/publish_group/index.vue

@@ -246,11 +246,9 @@ export default {
 			+ end.substr(5,2) + "/" + end.substr(8,2) + " " + end.substr(11,5);
 		},
 		selectDatetime() {
-			console.log("select datetime");
 			this.$refs.mySon.show();
 		},
 		openSelfTakeTable() {
-			console.log("openSelfTakeTable -> ", this.selfTakeList);
 			getAllSelfTake({
 				current: 1,
 				size: 50
@@ -597,12 +595,14 @@ export default {
 					title: that.$t(`请填写主标题`)
 				});
 			}
+			that.grouponReqData.mainTitle = value.mainTitle;
 				
 			if (!value.subTitle.trim()) {
 				return that.$util.Tips({
 					title: that.$t(`请填写副标题`)
 				});
 			}
+			that.grouponReqData.subTitle = value.subTitle;
 			
 			if (!that.grouponReqData.grouponStartTime.trim() || !that.grouponReqData.grouponEndTime.trim()) {
 				return that.$util.Tips({
@@ -631,8 +631,6 @@ export default {
 				goodsIds.push(e.id);
 				that.grouponReqData.goodsIds = goodsIds;
 			})
-
-
 			uni.showLoading({
 				title: that.$t(`发布中`),
 				mask: true