diff --git a/api/store.js b/api/store.js index 999f4f6..467b0b3 100644 --- a/api/store.js +++ b/api/store.js @@ -72,6 +72,14 @@ export function getGroomList(type) { login: true }); } +/* + * 获取商品海报 + * */ +export function getProductPoster(id) { + return request.get("/product/poster/" + id, {}, { + login: true + }); +} /* * 购物车 添加 diff --git a/components/StorePoster.vue b/components/StorePoster.vue index 47bcb91..4575267 100644 --- a/components/StorePoster.vue +++ b/components/StorePoster.vue @@ -47,6 +47,80 @@ + + + - diff --git a/components/SwitchWindow.vue b/components/SwitchWindow.vue index 9c0038c..7d8e76e 100644 --- a/components/SwitchWindow.vue +++ b/components/SwitchWindow.vue @@ -145,7 +145,7 @@ export default { .catch(err => { uni.hideLoading(); uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/config/index.js b/config/index.js index f799d81..633b56c 100644 --- a/config/index.js +++ b/config/index.js @@ -1,3 +1,4 @@ +// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; export const VUE_APP_API_URL = 'https://h5api.dayouqiantu.cn/api'; export const VUE_APP_RESOURCES_URL = 'https://h5.dayouqiantu.cn/static'; diff --git a/manifest.json b/manifest.json index fa99d41..c0f8b75 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ "compilerVersion" : 3, "splashscreen" : { "alwaysShowBeforeRender" : true, - "waiting" : true, + "waiting" : false, "autoclose" : true, "delay" : 0 }, diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue index 909ea33..279a7dd 100644 --- a/pages/activity/DargainDetails/index.vue +++ b/pages/activity/DargainDetails/index.vue @@ -279,7 +279,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index 5f82c99..bb366ce 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -338,7 +338,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue index 187342c..3fbfdf1 100644 --- a/pages/activity/GroupRule/index.vue +++ b/pages/activity/GroupRule/index.vue @@ -155,7 +155,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue index edb95f2..8a9bdc4 100644 --- a/pages/activity/SeckillDetails/index.vue +++ b/pages/activity/SeckillDetails/index.vue @@ -214,7 +214,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/home/index.vue b/pages/home/index.vue index 58ee30b..5dae79e 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -5,19 +5,25 @@ 搜索商品 - + + + - + + + @@ -36,14 +42,18 @@ - + + + {{ item.name }} - 热门榜单 + + 热门榜单 + 更多 @@ -53,7 +63,9 @@ - + + + {{ item.storeName }} ¥{{ item.price }} @@ -63,7 +75,9 @@ - 精品推荐 + + 精品推荐 + 更多 @@ -89,7 +103,9 @@ - + + + {{ item.storeName }} ¥{{ item.price }} @@ -99,7 +115,9 @@ - 促销单品 + + 促销单品 + 更多 @@ -111,166 +129,209 @@ diff --git a/pages/order/GoodsReturn/index.vue b/pages/order/GoodsReturn/index.vue index 1bcc07f..b50ed1b 100644 --- a/pages/order/GoodsReturn/index.vue +++ b/pages/order/GoodsReturn/index.vue @@ -82,7 +82,7 @@ imageuploaded(res) { if (res.status !== 200) { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -97,7 +97,7 @@ }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -137,7 +137,7 @@ }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -150,4 +150,4 @@ this.getRefundReason(); } }; - + diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue index deff0b5..365889d 100644 --- a/pages/order/Logistics/index.vue +++ b/pages/order/Logistics/index.vue @@ -140,7 +140,7 @@ }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -149,7 +149,7 @@ getExpress() { if (!this.id) { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -172,7 +172,7 @@ }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue index 6d89077..eb4f597 100644 --- a/pages/orderAdmin/OrderCancellation/index.vue +++ b/pages/orderAdmin/OrderCancellation/index.vue @@ -112,7 +112,7 @@ }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/orderAdmin/OrderIndex/index.vue b/pages/orderAdmin/OrderIndex/index.vue index 0afd538..fdd83d8 100644 --- a/pages/orderAdmin/OrderIndex/index.vue +++ b/pages/orderAdmin/OrderIndex/index.vue @@ -130,7 +130,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -150,7 +150,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/orderAdmin/Statistics/index.vue b/pages/orderAdmin/Statistics/index.vue index 3b98a13..04199c5 100644 --- a/pages/orderAdmin/Statistics/index.vue +++ b/pages/orderAdmin/Statistics/index.vue @@ -400,7 +400,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 7de0f95..0daa95a 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -135,6 +135,7 @@ v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" :posterData="posterData" + :goodId="id" > @@ -258,6 +259,7 @@ export default { computed: mapGetters(["isLogin"]), mounted: function() { let url = handleQrCode(); + console.log(url); if (url && url.productId) { this.id = url.productId; } else { @@ -327,6 +329,7 @@ export default { if (this.$deviceType == "app") { form.form = "app"; } + uni.showLoading({ title: "加载中", mask: true }); getProductDetail(that.id, form) .then(res => { that.$set(that, "storeInfo", res.data.storeInfo); @@ -370,6 +373,9 @@ export default { icon: "none", duration: 2000 }); + }) + .finally(() => { + uni.hideLoading(); }); }, //默认选中属性; @@ -498,14 +504,14 @@ export default { }, changeattr: function(msg) { // 修改了规格 - console.log(msg) + console.log(msg); this.attr.cartAttr = msg; this.isOpen = false; }, //选择属性; ChangeAttr: function(res) { - // 修改了规格 - console.log(res) + // 修改了规格 + console.log(res); let productSelect = this.productValue[res.value]; if (productSelect) { this.attr.productAttr[res.indexw].index = res.indexn; diff --git a/pages/shop/GoodsEvaluate/index.vue b/pages/shop/GoodsEvaluate/index.vue index f4c302a..bb8cb43 100644 --- a/pages/shop/GoodsEvaluate/index.vue +++ b/pages/shop/GoodsEvaluate/index.vue @@ -205,7 +205,7 @@ }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/shop/GoodsPromotion/index.vue b/pages/shop/GoodsPromotion/index.vue index 8bf8fe5..56a74ec 100644 --- a/pages/shop/GoodsPromotion/index.vue +++ b/pages/shop/GoodsPromotion/index.vue @@ -67,7 +67,7 @@ }) .catch((err) => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -75,4 +75,4 @@ } } }; - + diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue index 2d412d8..88b3766 100644 --- a/pages/shop/HotNewGoods/index.vue +++ b/pages/shop/HotNewGoods/index.vue @@ -73,7 +73,7 @@ export default { }) .catch((err)=> { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/user/Login/index.vue b/pages/user/Login/index.vue index 693a7f4..ce4f99a 100644 --- a/pages/user/Login/index.vue +++ b/pages/user/Login/index.vue @@ -1,340 +1,329 @@ diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue index c146239..8b0abea 100644 --- a/pages/user/PersonalData/index.vue +++ b/pages/user/PersonalData/index.vue @@ -156,7 +156,7 @@ export default { .catch(err => { uni.hideLoading(); uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); @@ -214,7 +214,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/Recharge/index.vue b/pages/user/Recharge/index.vue index 28d1fdd..a99f5ed 100644 --- a/pages/user/Recharge/index.vue +++ b/pages/user/Recharge/index.vue @@ -97,7 +97,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); @@ -174,7 +174,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/RetrievePassword/index.vue b/pages/user/RetrievePassword/index.vue index e312430..6e2d588 100644 --- a/pages/user/RetrievePassword/index.vue +++ b/pages/user/RetrievePassword/index.vue @@ -109,7 +109,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); @@ -141,7 +141,7 @@ export default { }) .catch(err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/UserAccount/index.vue b/pages/user/UserAccount/index.vue index f34ff3f..d0ee1f5 100644 --- a/pages/user/UserAccount/index.vue +++ b/pages/user/UserAccount/index.vue @@ -75,7 +75,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -92,7 +92,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/user/UserBill/index.vue b/pages/user/UserBill/index.vue index c95b95f..fe21e6a 100644 --- a/pages/user/UserBill/index.vue +++ b/pages/user/UserBill/index.vue @@ -97,7 +97,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/user/UserVip/index.vue b/pages/user/UserVip/index.vue index 1ea57fe..b8ed735 100644 --- a/pages/user/UserVip/index.vue +++ b/pages/user/UserVip/index.vue @@ -165,7 +165,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); @@ -182,7 +182,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue index 920aab0..e444696 100644 --- a/pages/user/address/AddAddress/index.vue +++ b/pages/user/address/AddAddress/index.vue @@ -201,7 +201,7 @@ export default { }); } catch (err) { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/address/AddressManagement/index.vue b/pages/user/address/AddressManagement/index.vue index 0e500c6..daa5798 100644 --- a/pages/user/address/AddressManagement/index.vue +++ b/pages/user/address/AddressManagement/index.vue @@ -211,7 +211,7 @@ export default { // .catch(err => { // uni.hideLoading(); // uni.showToast({ - // title: err.msg || err.response.data.msg, + // title: err.msg || err.response.data.msg|| err.response.data.message, // icon: 'none', // duration: 2000 // }); diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue index 5d2bbc9..297ce3a 100644 --- a/pages/user/coupon/GetCoupon/index.vue +++ b/pages/user/coupon/GetCoupon/index.vue @@ -76,7 +76,7 @@ export default { }) .catch(function(err) { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/promotion/CashRecord/index.vue b/pages/user/promotion/CashRecord/index.vue index 79caca2..404c841 100644 --- a/pages/user/promotion/CashRecord/index.vue +++ b/pages/user/promotion/CashRecord/index.vue @@ -76,7 +76,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -91,7 +91,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/promotion/CommissionDetails/index.vue b/pages/user/promotion/CommissionDetails/index.vue index 02308b4..1170d37 100644 --- a/pages/user/promotion/CommissionDetails/index.vue +++ b/pages/user/promotion/CommissionDetails/index.vue @@ -77,7 +77,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -92,7 +92,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/user/promotion/Poster/index.vue b/pages/user/promotion/Poster/index.vue index ae47991..ca2e053 100644 --- a/pages/user/promotion/Poster/index.vue +++ b/pages/user/promotion/Poster/index.vue @@ -74,7 +74,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/promotion/PromoterList/index.vue b/pages/user/promotion/PromoterList/index.vue index 79ce0a0..e2cedec 100644 --- a/pages/user/promotion/PromoterList/index.vue +++ b/pages/user/promotion/PromoterList/index.vue @@ -157,7 +157,7 @@ }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/user/promotion/PromoterOrder/index.vue b/pages/user/promotion/PromoterOrder/index.vue index 8e9bd15..b011fe7 100644 --- a/pages/user/promotion/PromoterOrder/index.vue +++ b/pages/user/promotion/PromoterOrder/index.vue @@ -92,7 +92,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/promotion/UserCash/index.vue b/pages/user/promotion/UserCash/index.vue index 09a0332..9b641f4 100644 --- a/pages/user/promotion/UserCash/index.vue +++ b/pages/user/promotion/UserCash/index.vue @@ -103,7 +103,7 @@ export default { }, function(err) { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); @@ -200,7 +200,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: "none", duration: 2000 }); diff --git a/pages/user/promotion/UserPromotion/index.vue b/pages/user/promotion/UserPromotion/index.vue index c2e94f9..7a33a75 100644 --- a/pages/user/promotion/UserPromotion/index.vue +++ b/pages/user/promotion/UserPromotion/index.vue @@ -84,7 +84,7 @@ export default { }, function(err) { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/pages/user/signIn/Integral/index.vue b/pages/user/signIn/Integral/index.vue index a656ffb..6662465 100644 --- a/pages/user/signIn/Integral/index.vue +++ b/pages/user/signIn/Integral/index.vue @@ -135,7 +135,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); @@ -150,7 +150,7 @@ export default { }, err => { uni.showToast({ - title: err.msg || err.response.data.msg, + title: err.msg || err.response.data.msg|| err.response.data.message, icon: 'none', duration: 2000 }); diff --git a/utils/dialog.js b/utils/dialog.js index 23ed337..e634afc 100644 --- a/utils/dialog.js +++ b/utils/dialog.js @@ -27,9 +27,9 @@ const dialog = { // notify, loading: { open: () => { - uni.showLoading({ - title: '加载中' - }) + // uni.showLoading({ + // title: '加载中' + // }) }, close: () => { uni.hideLoading() diff --git a/utils/index.js b/utils/index.js index b8e771b..547afb9 100644 --- a/utils/index.js +++ b/utils/index.js @@ -459,19 +459,23 @@ export function handleQrCode() { try { var urlSpread = parseQuery()["q"]; if (urlSpread) { - // 通过海报二维码进来 - urlSpread = urlSpread - .split("%3F")[1] - .replace(/%3D/g, ":") - .replace(/%26/g, ",") - .split(",") - .map((item, index) => { - item = item.split(":"); - return `"${item[0]}":"${item[1]}"`; - }) - .join(","); - urlSpread = JSON.parse("{" + urlSpread + "}"); - return urlSpread + if (urlSpread.indexOf('%3F') != -1) { + // 通过海报二维码进来 + urlSpread = urlSpread + .split("%3F")[1] + .replace(/%3D/g, ":") + .replace(/%26/g, ",") + .split(",") + .map((item, index) => { + item = item.split(":"); + return `"${item[0]}":"${item[1]}"`; + }) + .join(","); + urlSpread = JSON.parse("{" + urlSpread + "}"); + return urlSpread + } else { + return handleUrlParam(urlSpread) + } } return null } catch { @@ -480,6 +484,19 @@ export function handleQrCode() { } +export function handleUrlParam(path) { + console.log(path) + + var url = path.split("?")[1]; //获取url中"?"符后的字串 + console.log(url) + var theRequest = new Object(); + let strs = url.split("&"); + for (var i = 0; i < strs.length; i++) { + theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]); + } + return theRequest; +} + const getImageInfo = (images) => { return new Promise((resolve, reject) => { let imageAry = {}