twt 1 gadu atpakaļ
vecāks
revīzija
67719b065b

+ 6 - 2
pages/activity/jkDetail.vue

@@ -255,7 +255,7 @@
 		
 		<view class="shareBox" v-if="shareShow" @click="shareShowyc">
 			   <img :src="shareQrCode" alt=""style="width: 300rpx;height:300rpx">
-			 <view class="shareCont" @click.stop="">
+			 <view class="shareCont" >
 				 <button open-type="share" class=" shareBtn" >
 				 	<image src="../../static/timg/icon_wxhy.png" mode="" class="shareBimg"></image>
 				 	<view class="bottomTxtshare">分享</view>
@@ -414,7 +414,7 @@
 			  if (this.ticker) {
 			   clearInterval(this.ticker);
 			 }
-		    this.beginTimer();
+		   
 		   
 		},
 		onPullDownRefresh(){
@@ -436,7 +436,10 @@
 		
 		methods: {
 			beginTimer() { //这个计时器是每秒减去数组中指定字段的时间
+			 // console.log("??????????????????"+this.info.groupType)
+			  
 			  if(this.info.groupType){
+				
 				  this.ticker = setInterval(() => {
 					 this.info.groupList= JSON.parse(JSON.stringify( this.info.groupList))
 					/* for (let i = 0, len = this.info.groupList.length; i < len; i++) {
@@ -874,6 +877,7 @@
 					if(this.shopInfo==''){
 						this.shopInfo=this.info.shopList[0]
 					}
+					 this.beginTimer();
 				})
 			},
 			call() {

+ 2 - 1
pages/shop/confirm.vue

@@ -172,7 +172,8 @@
 					shopId:this.shopID,
 					comment:this.comment,
 					sheetDetail:JSON.stringify(jsonArray),
-					shareId:this.shareId
+					shareId:this.shareId,
+					groupType:0
 				}
 				uni.showLoading({
 					title: '加载中'

+ 9 - 4
pages/subPack/jkDetail.vue

@@ -51,7 +51,7 @@
 				<view class="ptTime">{{ds}}</view>
 			</view>
 			<view class="ptmobilePhoneLine">
-				<image src="../../../static/timg/icon_guan.png" mode="" class="vipIcon"></image>
+				<image src="../../static/timg/icon_guan.png" mode="" class="vipIcon"></image>
 				<view class="ptmobilePhone">{{info.shareOpenGroup.firstMobilePhone}}</view>
 			</view>
 			<view class="DiffBNumber">还差 <span style="#FF0000">{{info.shareOpenGroup.groupNumber - info.shareGroupList.length}}</span> 人,赶快邀请好友来拼团吧</view>
@@ -370,7 +370,6 @@
 				 groupID:'',
 				 ticker: null,
 				 djsMoreShow:false,
-				 groupID:'',
 				 dh:'',
 				 dm:'',
 				 ds:'',
@@ -657,6 +656,7 @@
 					params.groupOwner=1;
 					params.groupType=1;
 					params.totalMoney=this.info.groupMoney;
+					//params.groupID=this.groupID;
 					if(this.cyptNum==1){
 						params.shareOpenID=this.shareOpenID;
 						params.shareName=this.shareName;
@@ -667,7 +667,11 @@
 					params.groupOwner=2;
 					params.groupType=1;
 					params.groupID=this.groupID;
-					params.totalMoney=this.info.groupMoney
+					params.totalMoney=this.info.groupMoney;
+					if(this.cyptNum==1){
+						params.shareOpenID=this.shareOpenID;
+						params.shareName=this.shareName;
+					}
 				}
 				uni.showLoading({
 					title: '加载中'
@@ -785,7 +789,7 @@
 				}
 			},
 			jionPt(){
-				this.groupOwner=1;
+				this.groupOwner=2;
 				this.cyptNum=1;
 				if(this.userInfo){	
 					this.bmShow=true;
@@ -1027,6 +1031,7 @@
 				this.dh=0;
 				this.dm=0;
 				this.ds=0;
+				this.queryActivityInfo();
 			    return
 			  }
 			

+ 243 - 45
pages/user/myOrder/activityOrderDetail.vue

@@ -223,13 +223,13 @@
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
-		<view class="bottom" v-if="orderData.data.sheetState == 1">
-            <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType==1">取消订单</view>
+		<view class="bottom" v-if="orderData.data.sheetState == 1||orderData.data.sheetState == 2">
+            <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view>
 			<view class="cancel" @click="cancelBespeak" v-if="!orderData.data.groupType">取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
-		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType">取消订单</view>
+		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType">退款</view>
 		</view>
 
 
@@ -238,7 +238,7 @@
 			<view class="querenMa">
 				<view class="maTop">
 					<view class="maTitle">请到店出示券码即可开始服务</view>
-					<image @click="isShowMa=false" src="../../../static/img/icon_delete.png" mode=""
+					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
@@ -295,6 +295,64 @@
 		</view>
 	</view>
 	
+	<!-- 退款原因 -->
+	<view class="tuikuanBox" v-if="isShowTui==true">
+		<view class="tuikuan">
+			<view class="tuiTop">
+				<view class="tuiTitle">退款</view>
+				<image @click="isShowTuiHide" src="../../../static/img/icon_delete.png" mode=""
+					style="width: 26rpx; height: 26rpx;"></image>
+	
+			</view>
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="../../static/img/icon_star.png" mode="" class="star"></image>
+					退款原因
+				</view>
+				<view class="contlineRight carModelRight" @click="">
+	
+					<picker class="carModel" @change="bindChange" mode="selector" :value="index"
+						:range="tuicauseList" range-key="contents">
+						<view class="uni-input">{{tuicauseList[index].contents}}</view>
+						<!-- <view class="uni-input noColor" v-else>请选择</view> -->
+					</picker>
+					<image src="../../static/img/little_rightArrow.png" mode="" class="contlineRightJt"></image>
+				</view>
+			</view>
+	
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="../../static/img/icon_star.png" mode="" class="star"></image>
+					退款金额
+				</view>
+				<view class="contlineRight carModelRight" @click="cktime">
+					<span class="carModel">{{orderData.data.realMoney}}</span>
+	
+				</view>
+			</view>
+	
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="" mode="" class="star"></image>
+					补充描述
+				</view>
+	
+				<view class="contlineRight">
+					<textarea placeholder-style="color:#999999" placeholder="请输入" v-model="tuikuanContent"
+						class="contlineRightInput" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				</view>
+			</view>
+	
+			<view class="tuiBtns">
+				<view class="btn" @click="isShowTuiHide">取消</view>
+				<view class="btn2" @click="goTui">确认退款</view>
+			</view>
+	
+		</view>
+	</view>
+  
+
+
 
 	</view>
 </template>
@@ -341,6 +399,10 @@
 				dm:'',
 				ds:'',
 				seeTyshow:false,
+				isShowTui:false,
+				index:0,
+				tuicauseList: [],
+				tuikuanContent: '',
 			}
 		},
 		//0拼团取消1拼团失败 2拼团中3拼团成功4自动成团 groupState
@@ -352,7 +414,8 @@
             this.ext=this.$common.getExtStoreId();
             if(this.userInfo){
             	if (this.id) {
-            		this.getData()
+            		this.getData();
+					this.getTuiKuanData()
             	}
             }else{
             	this.$common.automaticlogin().then(val => {
@@ -360,7 +423,8 @@
             		this.wxOpenData=this.$store.state.wxOpenData;
             		this.themeColor = uni.getStorageSync("themeColor");
             		if (this.id) {
-            			this.getData()
+            			this.getData();
+						this.getTuiKuanData()
             		}
 					if(!this.userInfo){
 						this.authorizShow=true
@@ -374,6 +438,52 @@
 		
 
 		methods: {
+			isShowTuiHide(){
+				this.isShowTui=false;
+			},
+			bindChange(e) {
+				console.log(e);
+				this.index = e.detail.value
+			},
+			getTuiKuanData() {
+				console.log("退款原因")
+				this.$http('openMallOrder/getOpenReason', {
+			
+					// id: this.id,
+				}, 'GET').then(res => {
+				
+					this.tuicauseList = res.data;
+			
+				})
+			},
+			goTui(){
+				var that=this;
+				uni.showLoading({
+					title: '加载中'
+				})
+				let yuanyin = this.tuicauseList[this.index].contents
+				that.$http('openMallOrder/cancelOrder', {
+				    realMoney:that.orderData.data.realMoney,
+					sheetId: that.id,
+					refundReason:yuanyin,
+					refundComment:this.tuikuanContent,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					// var list = res.data.Items
+					this.isShowTui=false;
+					uni.showToast({
+						title: '取消成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
+				})
+			},
+			cancelOrder(){
+				this.isShowTui=true;
+			},
 			seeTyHide(){
 				this.seeTyshow=false;
 			},
@@ -508,45 +618,7 @@
 
 				})
 			},
-			cancelOrder(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openMallOrder/cancelOrder', {
-							        realMoney:that.orderData.data.realMoney,
-									sheetId: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
-			},
+			
 			cancelBespeak(){
 				var that = this
 				uni.showModal({
@@ -660,6 +732,7 @@
 				this.dh=0;
 				this.dm=0;
 				this.ds=0;
+				_this.getData();
 			    return
 			  }
 			
@@ -1393,4 +1466,129 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 			
 			height: 100%;
 			}
+			
+.tuikuanBox {
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.4);
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 999;
+	}
+	
+	.tuikuan {
+		width: 638rpx;
+		height: 664rpx;
+		background: #ffffff;
+		margin: 0 36rpx;
+		margin-top: 50%;
+		border-radius: 24rpx;
+		padding: 30rpx 20rpx;
+	}
+	
+	.tuiTop {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 36rpx;
+	}
+	
+	.tuiTitle {
+		width: 56rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #3C3C3C;
+		line-height: 40rpx;
+	
+	}
+	
+	.contLine {
+		display: flex;
+		justify-content: space-between;
+		font-size: 28rpx;
+		padding: 30rpx 0;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	
+	.contlineLeft {
+		color: #666666;
+		line-height: 40rpx;
+		align-items: center;
+	}
+	
+	.star {
+		width: 14rpx;
+		height: 14rpx;
+		padding-bottom: 5rpx;
+	}
+	
+	.carModel {
+		width: 350rpx;
+		text-align: left;
+	}
+	
+	.noColor {
+		color: #CCCCCC;
+	}
+	
+	.carModelRight {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+	
+	.contlineRight {
+		color: #333333;
+		line-height: 40rpx;
+	
+		width: 400rpx;
+		text-align: right;
+	}
+	
+	.contlineRightInput {
+		color: #333333;
+		text-align: left;
+		font-size: 28rpx;
+		min-height: 182rpx;
+		width: 400rpx;
+	}
+	
+	.contlineRightJt {
+		width: 30rpx;
+		height: 30rpx;
+	
+	}
+	
+	.tuiBtns {
+		display: flex;
+		padding: 40rpx 20rpx 10rpx;
+	
+	}
+	.btn {
+		width: 288rpx;
+		height: 98rpx;
+		background: #F4F5F7;
+		border-radius: 10rpx;
+		margin-right: 22rpx;
+	
+	
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #3C3C3C;
+		line-height: 98rpx;
+		text-align: center;
+	}
+	
+	.btn2 {
+		width: 288rpx;
+		height: 98rpx;
+		background: #3F90F7;
+		border-radius: 10rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 98rpx;
+		text-align: center;
+	}
 </style>

+ 5 - 2
pages/user/myOrder/mallOrderDetail.vue

@@ -199,11 +199,11 @@
 
 
 		<!-- 券码 -->
-		<view class="maBox" v-if="isShowMa==true" @click="isShowMa=false">
+		<view class="maBox" v-if="isShowMa==true" @click="isShowMaHide">
 			<view class="querenMa">
 				<view class="maTop">
 					<view class="maTitle">请到店出示券码即可开始服务</view>
-					<image @click="isShowMa=false" src="../../../static/img/icon_delete.png" mode=""
+					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
@@ -312,6 +312,9 @@
 		methods: {
 			isShowMaSHow(){
 				 this.isShowMa=true
+			},
+			isShowMaHide(){
+				this.isShowMa=false
 			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);