From 094c46e7625dbb58cd4748517059a3fab8074806 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Wed, 22 Nov 2023 11:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/evan-steps/evan-step.vue | 5 +--
pages/welcome/welcome.vue | 11 +++++--
.../groupProduct/groupProduct.vue | 4 +--
.../groupProduct/groupProductAdd.vue | 32 +++++++++++--------
.../storeImg/storeImgAdd.vue | 18 ++++++++---
.../storeProduct/storeProductAdd.vue | 3 +-
6 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/components/evan-steps/evan-step.vue b/components/evan-steps/evan-step.vue
index 172a7a2..c33e8ab 100644
--- a/components/evan-steps/evan-step.vue
+++ b/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 {}
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 943825f..9ae40c3 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -19,8 +19,8 @@
// uni.reLaunch({
- // // url: '/pages/login/login',
- // url: '/subpackages/groupBuyingConfiguration/groupVerify/groupVerify?orderKey='+2925678915731387,
+ // url: '/pages/login/login',
+ // // 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;
diff --git a/subpackages/groupBuyingConfiguration/groupProduct/groupProduct.vue b/subpackages/groupBuyingConfiguration/groupProduct/groupProduct.vue
index 7fd031d..b22d910 100644
--- a/subpackages/groupBuyingConfiguration/groupProduct/groupProduct.vue
+++ b/subpackages/groupBuyingConfiguration/groupProduct/groupProduct.vue
@@ -20,7 +20,7 @@
{{item.name}}
{{item.price}}
- {{item.status | filterStatus}}
+ {{item.status | filterStatus}}
操作
@@ -52,7 +52,7 @@
状态
- {{productDetail.status | filterStatus}}
+ {{productDetail.status | filterStatus}}
使用时间
diff --git a/subpackages/groupBuyingConfiguration/groupProduct/groupProductAdd.vue b/subpackages/groupBuyingConfiguration/groupProduct/groupProductAdd.vue
index f386425..e4301d7 100644
--- a/subpackages/groupBuyingConfiguration/groupProduct/groupProductAdd.vue
+++ b/subpackages/groupBuyingConfiguration/groupProduct/groupProductAdd.vue
@@ -85,7 +85,7 @@
{{item2.productName}}
- {{item2.count}}份
+ {{item2.productSpec}}
@@ -108,9 +108,11 @@
@@ -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;
})
},
diff --git a/subpackages/groupBuyingConfiguration/storeImg/storeImgAdd.vue b/subpackages/groupBuyingConfiguration/storeImg/storeImgAdd.vue
index fc77a5b..6b25430 100644
--- a/subpackages/groupBuyingConfiguration/storeImg/storeImgAdd.vue
+++ b/subpackages/groupBuyingConfiguration/storeImg/storeImgAdd.vue
@@ -68,11 +68,12 @@
return true
},
isShowAdd(){
- if(this.imgValue.length>=1){
- return false
- }else{
- return true
- }
+ // if(this.imgValue.length>=1){
+ // return false
+ // }else{
+ // 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();
}
});
},
diff --git a/subpackages/groupBuyingConfiguration/storeProduct/storeProductAdd.vue b/subpackages/groupBuyingConfiguration/storeProduct/storeProductAdd.vue
index d010ded..9d7179a 100644
--- a/subpackages/groupBuyingConfiguration/storeProduct/storeProductAdd.vue
+++ b/subpackages/groupBuyingConfiguration/storeProduct/storeProductAdd.vue
@@ -14,7 +14,8 @@
class=" flex-1 " placeholder="请输入价格(保留两位小数)">
- 规格:
+
+ 规格: