From c53af2fcc3e5ec7459c16c0efea95996212801fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 27 Aug 2021 17:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=8A=96=E7=99=BB=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-buy/README.md | 3 + components/m-buy/goods.vue | 424 +++++++++++++++++++++++++ components/m-buy/popup.js | 8 + components/m-buy/popup.scss | 37 +++ components/m-share/index.vue | 36 +-- pages/cart/payment/shareOrderGoods.vue | 2 +- pages/order/fillorder.vue | 2 +- pages/order/myOrder.vue | 3 + pages/passport/wechatMPLogin.vue | 10 +- pages/product/product/style.scss | 2 +- pages/promotion/bargain/detail.vue | 46 ++- pages/promotion/bargain/list.vue | 6 +- pages/promotion/bargain/log.vue | 3 +- pages/promotion/point/detail.vue | 2 +- pages/promotion/point/user.vue | 21 +- pages/promotion/static/Bargaining.png | Bin 77520 -> 0 bytes pages/promotion/static/bargain.jpeg | Bin 36911 -> 0 bytes utils/request.js | 21 +- 18 files changed, 564 insertions(+), 62 deletions(-) create mode 100644 components/m-buy/README.md create mode 100644 components/m-buy/goods.vue create mode 100644 components/m-buy/popup.js create mode 100644 components/m-buy/popup.scss delete mode 100644 pages/promotion/static/Bargaining.png delete mode 100644 pages/promotion/static/bargain.jpeg diff --git a/components/m-buy/README.md b/components/m-buy/README.md new file mode 100644 index 0000000..c004c1f --- /dev/null +++ b/components/m-buy/README.md @@ -0,0 +1,3 @@ +## 购买组件 +1.本组件是砍价，积分购买，参团等复用组 +2.后续会将此组件和商品购买组件合并，文档后续再出 diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue new file mode 100644 index 0000000..b675f44 --- /dev/null +++ b/components/m-buy/goods.vue @@ -0,0 +1,424 @@ + + + diff --git a/components/m-buy/popup.js b/components/m-buy/popup.js new file mode 100644 index 0000000..2833633 --- /dev/null +++ b/components/m-buy/popup.js @@ -0,0 +1,8 @@ + + +export default { + height:"1000rpx", //弹出层高度 + mode:"bottom", //弹出层位置 + radius:"32", //圆角 rpx, + close:false //能否点击遮罩退出 +} \ No newline at end of file diff --git a/components/m-buy/popup.scss b/components/m-buy/popup.scss new file mode 100644 index 0000000..d571c30 --- /dev/null +++ b/components/m-buy/popup.scss @@ -0,0 +1,37 @@ +.view-class-title { + font-size: 26rpx; + color: #262626; + + font-weight: 700; + height: 80rpx; + line-height: 80rpx; +} +.confirmBtn { + width: 90%; +} +.confirmBtn, +.box-btn { + line-height: 80rpx; + height: 80rpx; + + background: $price-color; + color: #fff; + border-radius: 200px; + text-align: center; + margin: 5rpx auto; +} + +.btns { + display: flex; + width: 100%; + + margin: 0 auto; +} +.goods-price-bigshow { + font-size: 48rpx; + font-weight: bold; +} +.box-btn { + flex: 1; + margin: 0 10rpx; +} diff --git a/components/m-share/index.vue b/components/m-share/index.vue index a3d87d8..449ea4b 100644 --- a/components/m-share/index.vue +++ b/components/m-share/index.vue @@ -58,13 +58,6 @@ export default { // 图片缩略图、 商品名称 、 type（goods,shop,pintuan) 拼团商品分享以及店铺分享 props: ["thumbnail", "goodsName", "type", "goodsId", "link"], - // #ifdef MP-WEIXIN - onShareAppMessage(res) { - return { - imageUrl: this.thumbnail || require("@/static/logo.png"), - }; - }, - // #endif methods: { close() { this.$emit("close"); @@ -97,21 +90,24 @@ export default { }, // #endif + shareTitle() { + let shareTitle; + if (this.type == "goods") { + shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`; + } else if (this.type == "shops") { + shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`; + } else if (this.type == "pintuan") { + shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`; + } else if (this.type == "kanjia") { + shareTitle = `请快来帮我砍一刀${this.goodsName}`; + } + return shareTitle; + }, + // #ifdef APP-PLUS handleShare(val) { + console.log("12312312") if (val.type <= 1) { - let shareTitle; - - if (this.type == "goods") { - shareTitle = `我发现了一个${this.goodsName}商品快来跟我一起看看吧`; - } else if (this.type == "shops") { - shareTitle = `我发现了一个${this.goodsName}店铺快来跟我一起看看吧`; - } else if (this.type == "pintuan") { - shareTitle = `我拼了一个${this.goodsName}快来跟我一起抢购吧!`; - } else if (this.type == "kanjia") { - shareTitle = `请快来帮我砍一刀${this.goodsName}`; - } - let scene; // "WXSenceTimeline 朋友圈 WXSceneSession 微信好友" val.type == 1 ? (scene = "WXSenceTimeline") @@ -123,7 +119,7 @@ export default { imageUrl: this.thumbnail, type: 0, summary: this.goodsName, - title: shareTitle, + title: this.shareTitle(), success: function (res) { uni.showToast({ title: "分享成功!", diff --git a/pages/cart/payment/shareOrderGoods.vue b/pages/cart/payment/shareOrderGoods.vue index 36f03de..79c4312 100644 --- a/pages/cart/payment/shareOrderGoods.vue +++ b/pages/cart/payment/shareOrderGoods.vue @@ -67,7 +67,7 @@ import { getGoods } from "@/api/goods.js"; import { getPinTuanShare } from "@/api/order"; import shares from "@/components/m-share/index"; import storage from "@/utils/storage.js"; -import popupGoods from "./popup/goods"; //购物车商品的模块 +import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块 export default { data() { diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index c8a9674..ccd1c96 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -80,7 +80,7 @@ {{ item.storeName }} -
{{ item.promotionNotice }}
+
{{ item.promotionNotice || '' }}
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 7684cfe..a0caf53 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -505,6 +505,9 @@ page, .swiper-box { height: calc(100vh - 40px); + // #ifdef H5 + height: calc(100vh - 40px - 44px); + // #endif } .list-scroll-content { diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue index 3c05af1..838ff79 100644 --- a/pages/passport/wechatMPLogin.vue +++ b/pages/passport/wechatMPLogin.vue @@ -134,11 +134,10 @@ export default { getUserInfo().then((user) => { storage.setUserInfo(user.data.result); storage.setHasLogin(true); - setTimeout(() => { - uni.navigateBack({ - delta: 1, - }); - }, 500); + + uni.navigateBack({ + delta: 1, + }); }); }); }, @@ -228,7 +227,6 @@ text.shop { background: #fff !important; } - .btn-auth { width: 92%; margin: 0 auto 40rpx; diff --git a/pages/product/product/style.scss b/pages/product/product/style.scss index 0d2beea..c10c602 100644 --- a/pages/product/product/style.scss +++ b/pages/product/product/style.scss @@ -81,7 +81,7 @@ page { align-items: center; } .-goods-price { - flex: 8; + flex: 7; color: $price-color; font-size: 32rpx; line-height: 1; diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue index beef97c..fd784d0 100644 --- a/pages/promotion/bargain/detail.vue +++ b/pages/promotion/bargain/detail.vue @@ -1,6 +1,6 @@