团购修改

components/evan-steps/evan-step.vue

@@ -347,11 +347,11 @@
 		position: absolute;
 		height: 30px;
 		top: 0;
-		left: 30px;
+		left: 50%;
 		/* #ifdef APP-NVUE */
 		right: -39px;
 		/* #endif */
-		padding: 0 0px 0 40px;
+		padding:0;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		width: 100%;
@@ -390,6 +390,7 @@
 
 	.evan-step__circle--horizontal {
 		margin-left: 0px;
+		z-index: 1;
 	}
 
 	.evan-step__circle--finish {}

pages/welcome/welcome.vue

@@ -19,8 +19,8 @@
 			
 			
 			// uni.reLaunch({
-			// 	// url: '/pages/login/login',
+			// 	url: '/pages/login/login',
-			// 	url: '/subpackages/groupBuyingConfiguration/groupVerify/groupVerify?orderKey='+2925678915731387,
+			// 	// url: '/subpackages/groupBuyingConfiguration/groupVerify/groupVerify?orderKey='+'4576027622249814',
 			// })
 			// return
 			
@@ -104,11 +104,16 @@
 				// 0001扫码核销https://gratia-pay.dctpay.com/cweb?accountId=0001&key=123
 				if (app.globalData.accountId == '0001' && app.globalData.h5code){
 					let orderKey = uni.getStorageSync("urlKey");
-					if(orderKey){
+					if(orderKey&&this.userInfo.store.id){
 						uni.redirectTo({
 							url: '/subpackages/groupBuyingConfiguration/groupVerify/groupVerify?orderKey='+orderKey,
 						})
 						return false;
+					}else{
+						uni.redirectTo({
+							url: '/pages/login/login'
+						})
+						return false;
 					}
 				}
 				return true;

subpackages/groupBuyingConfiguration/groupProduct/groupProduct.vue

@@ -20,7 +20,7 @@
 				</view>
 				<view class="flex-1 fotct text1">{{item.name}}</view>
 				<view class="flex-1 fotct text1">{{item.price}}</view>
-				<view class="flex-1 fotct text1">{{item.status | filterStatus}}</view>
+				<view :class="'flex-1 fotct text1'+(item.status == 2 ? ' fcorred ':'')">{{item.status | filterStatus}}</view>
 				<next-bubble-menu class="flex-1 fotct font14" :d-width="150" :dataList="item.status | filterDataList"
 					bingEleId="imgType" @change="getItem($event,item)">
 					<view class=" font14 fcor41c " id="imgType">操作<text class="icon xia font14 fcor41c"></text></view>
@@ -52,7 +52,7 @@
 					</view>
 					<view class="width100 dis-flex bor-botm1">
 						<view class=" fotct fontwig6 backcor6 titleWidth minheight40">状态</view>
-						<view class="flex-1 fotct ">{{productDetail.status | filterStatus}}</view>
+						<view :class="'flex-1 fotct'+(productDetail.status == 2 ? ' fcorred ':'') ">{{productDetail.status | filterStatus}}</view>
 					</view>
 					<view class="width100 dis-flex bor-botm1">
 						<view class=" fotct fontwig6 backcor6 titleWidth minheight40">使用时间</view>

subpackages/groupBuyingConfiguration/groupProduct/groupProductAdd.vue

@@ -85,7 +85,7 @@
 						<view class="content dis-flex flex-sp" v-for="(item2,index2) in item.list" :key="index2">
 							<view class="text">{{item2.productName}}</view>
 							<view class="dis-flex">
-								<view class="text">{{item2.count}}份</view>
+								<view class="text">{{item2.productSpec}}</view>
 								<view class="icon shanchu margle20 font16 fcorred" @click.stop="deleteGroupDetail(item2.id)"></view>
 							</view>
 							
@@ -108,9 +108,11 @@
 
 			<!-- 底部按钮 -->
 			<view class="footer-btn backcorfff">
-				<view v-if="(status==2&&merchart>1)" class="height50 flex-1 fcor089 fotct" @click="merchart--">上一步</view>
+				<!-- <view v-if="(status==2&&merchart>1)" class="height50 flex-1 fcor089 fotct" @click="merchart--">上一步</view>
 				<button class="backcor89 flex-1 fcorfff" @click="clickToSave" v-if="merchart!=2">保存</button>
-				<view v-if="(status==2&&merchart<3)||merchart==2" class="height50 flex-1 fcor089 fotct" @click="merchart++">下一步</view>
+				<view v-if="(status==2&&merchart<3)||merchart==2" class="height50 flex-1 fcor089 fotct" @click="merchart++">下一步</view> -->
+				<view v-if="(status==2&&merchart>1)" class="height50 flex-1 fcor089 fotct" @click="merchart--">上一步</view>
+				<button class="backcor89 flex-1 fcorfff" @click="clickToSave" >保存</button>
 				
 			</view>
 
@@ -374,6 +376,7 @@
 				return true
 			},
 			clickToSave() {
+				
 				if (this.merchart == 1) {
 					/* 第一步:团购基本内容*/
 					if (!this.validate()) return; //校验是否有空
@@ -387,7 +390,10 @@
 						return
 					}
 				}
-				if(this.merchart == 2){}
+				if(this.merchart == 2){
+					this.merchart = this.merchart+1;
+					return
+				}
 				
 				if(this.merchart==3){/* 第三步规则内容 */
 					if(!this.ruleData.content){
@@ -438,7 +444,7 @@
 						this.groupId = res.return_data.id;
 						this.productDetail.groupId = res.return_data.id;
 						this.ruleData.groupId = res.return_data.id;
-						this.merchart = 2;
+						this.merchart = this.merchart+1;
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -452,17 +458,17 @@
 			/* 修改配置团购基本内容*/
 			editGroupContent() {
 				editGroupContent(this.productData).then(res => {
-					let title;
+					
 					if (res.return_code == '000000') {
-						title = res.return_data;
+						this.merchart = this.merchart+1;
 					} else {
-						title = res.return_msg;
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
-					uni.showToast({
+					
-						title: title,
-						icon: 'none',
-						duration: 2000
-					})
 					this.merchart = 2;
 				})
 			},

subpackages/groupBuyingConfiguration/storeImg/storeImgAdd.vue

@@ -68,11 +68,12 @@
 				return true	
 			},
 			isShowAdd(){
-				if(this.imgValue.length>=1){
+				// if(this.imgValue.length>=1){
-					return false
+				// 	return false
-				}else{
+				// }else{
-					return true
+				// 	return true
-				}
+				// }
+				return true;
 			},
 			
 		},
@@ -167,6 +168,9 @@
 			//上传
 			uploadFile(imgURL) {
 				 const that = this;
+				 uni.showLoading({
+				 	title:'加载中...'
+				 })
 				uni.uploadFile({
 					url: that.reqUrl + '/fileUpload/uploadfile',
 					filePath: imgURL,
@@ -175,8 +179,12 @@
 					},
 					name: 'files',
 					success: function(uploadFileRes) {
+						uni.hideLoading();
 						that.getImgSignedUrl(JSON.parse(uploadFileRes.data)
 							.return_data);
+					},
+					fail: function() {
+						uni.hideLoading();
 					}
 				});
 			},

subpackages/groupBuyingConfiguration/storeProduct/storeProductAdd.vue

@@ -14,7 +14,8 @@
 					class=" flex-1 " placeholder="请输入价格(保留两位小数)">
 			</view>
 			<view class="dis-flex marb10 bor-botm1">
-				<view class=" marRight10 fontwig6 padleft15 paddtright10">规格:
+				<view class=" marRight10 fontwig6 padleft15 paddtright10">
+					规格:
 				</view>
 				<input type="text" name="name" v-model.trim="productData.spec" placeholder-class="corf6"
 					class=" flex-1 " placeholder="请输入规格">