From 6ca01d2c71d3f38811d21bd6ee4a090c0fb156c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 2 Sep 2021 16:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=8E=E7=AB=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B9=8B=E5=90=8Ees=E4=B8=AD=E4=B8=8E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E5=8C=B9=E9=85=8Dbug,=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E5=A4=8D=E7=94=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/m-goods-recommend/index.vue | 9 ++-- config/config.js | 5 ++- pages/navigation/search/searchPage.vue | 24 +++++------ pages/order/fillorder.vue | 2 +- pages/passport/login.scss | 2 +- pages/passport/login.vue | 10 ++--- pages/passport/wechatMPLogin.vue | 5 ++- pages/product/goods.vue | 41 ++++++++++++------- .../product/goods/-goods-recommend.vue | 12 +++--- pages/product/product/popup/goods.vue | 2 +- pages/product/product/shop/-shop.vue | 8 ++-- pages/product/shopPage.vue | 15 +++---- pages/product/shopPageGoods.vue | 9 ++-- pages/promotion/bargain/detail.vue | 3 +- pages/tabbar/user/similarGoods.vue | 14 +++---- 15 files changed, 88 insertions(+), 73 deletions(-) diff --git a/components/m-goods-recommend/index.vue b/components/m-goods-recommend/index.vue index bd61072..dbd5815 100644 --- a/components/m-goods-recommend/index.vue +++ b/components/m-goods-recommend/index.vue @@ -4,16 +4,16 @@
- +
- {{ item.goodsName }} + {{ item.content.goodsName }}
-
￥{{ item.price | unitPrice }}
+
￥{{ item.content.price | unitPrice }}
@@ -73,13 +73,12 @@ export default { delete submit[key]; } }); - let goodsList = await getGoodsList(submit); this.goodsList.push(...goodsList.data.result.content); }, handleClick(item) { uni.navigateTo({ - url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`, + url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, }, diff --git a/config/config.js b/config/config.js index 2f1bff6..48013e5 100644 --- a/config/config.js +++ b/config/config.js @@ -1,7 +1,8 @@ -const name = "lilishop"; +const name = "lilishop"; //全局商城name +const schemeName = 'lilishop' //唤醒app需要的schemeName export default { name: name, - schemeLink: `${name}://`, //唤起app地址 + schemeLink: `${schemeName}://`, //唤起app地址 downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址，下载app的地址 shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址 appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态） diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue index cdd060c..5dc8fa9 100644 --- a/pages/navigation/search/searchPage.vue +++ b/pages/navigation/search/searchPage.vue @@ -85,16 +85,16 @@
- + -
{{ item.goodsName }}
+
{{ item.content.goodsName }}
-
- ¥{{ formatPrice(item.price )[0] }} .{{ - formatPrice(item.price )[1] +
+ ¥{{ formatPrice(item.content.price )[0] }} .{{ + formatPrice(item.content.price )[1] }}
@@ -156,15 +156,15 @@ - + -
{{ item.goodsName }}
+
{{ item.content.goodsName }}
-
+
- ¥{{ formatPrice(item.price )[0] }} .{{ - formatPrice(item.price )[1] + ¥{{ formatPrice(item.content.price )[0] }} .{{ + formatPrice(item.content.price )[1] }}
@@ -538,7 +538,7 @@ export default { }, navigateToDetailPage(item) { uni.navigateTo({ - url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`, + url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, loadmore() { @@ -669,7 +669,7 @@ export default { if (type == "refresh") { this.goodsList = []; } - //没有更多直接返回 + //没有更多直接返回 #TODO let goodsList = await getGoodsList(this.params); if (goodsList.data.result.content.length < 10) { diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index 130f353..c599db9 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -790,7 +790,7 @@ page { .wrapper { height: auto; - background: #ededed; + background: #f7f7f7; padding-bottom: 200rpx; overflow: auto !important; } diff --git a/pages/passport/login.scss b/pages/passport/login.scss index 4d58d01..7762a64 100644 --- a/pages/passport/login.scss +++ b/pages/passport/login.scss @@ -48,10 +48,10 @@ span { border-radius: 100px; } .logo { + margin-top: 20rpx; width: 200rpx; height: 200rpx; text-align: center; - transform: scale(2.5); } .logo-cell { text-align: center; diff --git a/pages/passport/login.vue b/pages/passport/login.vue index 2c82933..cfd35fc 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -4,9 +4,9 @@ - + - LiLi商城 + {{config.name}} @@ -31,8 +31,8 @@ import { getUserInfo } from "@/api/members"; import storage from "@/utils/storage.js"; import { loginCallback } from "@/api/connect.js"; import { webConnect } from "@/api/connect.js"; +import config from "@/config/config"; export default { - onShow() { // #ifdef MP-WEIXIN this.mpWechatLogin = false; @@ -65,7 +65,8 @@ export default { }, data() { return { - lightColor:this.$lightColor, + config, + lightColor: this.$lightColor, mpWechatLogin: true, //是否加载微信登录 value: true, //隐私政策 loginData: { @@ -102,7 +103,6 @@ export default { //联合信息返回登录 stateLogin(state) { loginCallback(state).then((res) => { - let data = res.data; if (data.success) { storage.setAccessToken(data.result.accessToken); diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue index 838ff79..2b5dcb2 100644 --- a/pages/passport/wechatMPLogin.vue +++ b/pages/passport/wechatMPLogin.vue @@ -12,7 +12,7 @@
- 欢迎进入{{ projectName }}商城 + 欢迎进入{{ projectName }} 为您提供优质服务,{{ projectName }}需要获取以下信息 @@ -33,13 +33,14 @@ import { mpAutoLogin } from "@/api/connect.js"; import { whetherNavigate } from "@/utils/Foundation"; //登录跳转 import { getUserInfo } from "@/api/members"; import storage from "@/utils/storage.js"; +import config from '@/config/config' export default { data() { return { // 是否展示手机号码授权弹窗，默认第一步不展示，要先获取用户基础信息 phoneAuthPopup: false, // 授权信息展示，商城名称 - projectName: "LiLi", + projectName: config.name, //微信返回信息，用于揭秘信息，获取sessionkey code: "", //微信昵称 diff --git a/pages/product/goods.vue b/pages/product/goods.vue index d581c99..6f847a7 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -7,9 +7,11 @@ - - + @@ -22,7 +24,8 @@
-
+
{{ header.text }}
@@ -30,7 +33,8 @@
- +
@@ -42,7 +46,8 @@ - + @@ -58,7 +63,8 @@ {{ goodsDetail.goodsName || "" }} - + + {{ favorite ? "已收藏" : "收藏" }} @@ -88,7 +94,8 @@ 分享 - + {{ favorite ? "已收藏" : "收藏" }} @@ -153,7 +160,8 @@ - + @@ -178,7 +186,8 @@ - 加入购物车 + + 加入购物车 立即购买 暂未开始 @@ -215,10 +224,12 @@ - + - @@ -510,11 +521,11 @@ export default { this.productId = id; // skuId // 这里请求获取到页面数据 解析数据 - let response = await getGoods(id, goodsId); if (!response.data.success) { - uni.navigateBack(); - return false; + setTimeout(()=>{ + uni.navigateBack(); + },500) } // 这里是绑定分销员 if (distributionId || this.$store.state.distributionId) { @@ -719,6 +730,7 @@ export default { /** * 获取相似商品列表 + * */ getOtherLikeGoods() { getGoodsList({ @@ -728,7 +740,6 @@ export default { keyword: this.goodsDetail.name, }).then((res) => { this.likeGoodsList = res.data.result.content; - console.warn(this.likeGoodsList); }); }, diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue index 832c009..c05de1e 100644 --- a/pages/product/product/goods/-goods-recommend.vue +++ b/pages/product/product/goods/-goods-recommend.vue @@ -13,7 +13,7 @@ :fade="true" duration="450" :lazy-load="true" - :src="item.thumbnail" + :src="item.content.thumbnail" width="330rpx" height="330rpx" class="like-goods-uimage" @@ -21,12 +21,12 @@ - {{ item.goodsName }} + {{ item.content.goodsName }} -
+
￥ - {{ formatPrice(item.price)[0] }} - .{{formatPrice(item.price)[1]}} + {{ formatPrice(item.content.price)[0] }} + .{{formatPrice(item.content.price)[1]}}
@@ -44,7 +44,7 @@ export default { // 点击店铺推荐 clickGoods(val) { uni.navigateTo({ - url: `/pages/product/goods?id=${val.id}&goodsId=${val.goodsId}` + url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}` }); }, // 格式化金钱 1999 --> [1999,00] diff --git a/pages/product/product/popup/goods.vue b/pages/product/product/popup/goods.vue index 5bc8df9..c5e0341 100644 --- a/pages/product/product/popup/goods.vue +++ b/pages/product/product/popup/goods.vue @@ -63,7 +63,7 @@ 数量 - + diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue index bebe6b7..3220628 100644 --- a/pages/product/product/shop/-shop.vue +++ b/pages/product/product/shop/-shop.vue @@ -24,15 +24,15 @@ 商品推荐 - + 加载失败 - {{ item.goodsName }} + {{ item.content.goodsName }} - ￥{{ formatPrice(item.price)[0] }}.{{ formatPrice(item.price)[1] }} + ￥{{ formatPrice(item.content.price)[0] }}.{{ formatPrice(item.content.price)[1] }} @@ -58,7 +58,7 @@ export default { // 点击商品 clickGoods(val) { uni.navigateTo({ - url: `/pages/product/goods?id=${val.id}&goodsId=${val.goodsId}`, + url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`, }); }, diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue index beae1a5..40b432f 100644 --- a/pages/product/shopPage.vue +++ b/pages/product/shopPage.vue @@ -6,7 +6,7 @@
- +
{{ storeInfo.storeName || ''}} @@ -60,15 +60,15 @@
暂无商品信息 - + -
{{ item.goodsName }}
+
{{ item.content.goodsName }}
-
￥{{ item.price | unitPrice }}
+
￥{{ item.content.price | unitPrice }}
-
已售 {{ item.buyCount || "0" }}
+
已售 {{ item.content.buyCount || "0" }}
@@ -99,13 +99,14 @@ import { collectionGoods, getGoodsIsCollect, } from "@/api/members.js"; - +import config from '@/config/config' import storage from "@/utils/storage"; import { getGoodsList } from "@/api/goods.js"; import { getAllCoupons } from "@/api/promotions.js"; export default { data() { return { + config, scrollTop: 0, mainColor: this.$mainColor, //主色调 current: 0, //初始tabs的索引 @@ -278,7 +279,7 @@ export default { */ navigateToGoodsDetail(val) { uni.navigateTo({ - url: `/pages/product/goods?id=${val.id}&goodsId=${val.goodsId}`, + url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`, }); }, diff --git a/pages/product/shopPageGoods.vue b/pages/product/shopPageGoods.vue index bf95ef5..2696e2d 100644 --- a/pages/product/shopPageGoods.vue +++ b/pages/product/shopPageGoods.vue @@ -5,12 +5,12 @@
暂无商品信息 - + -
{{ item.goodsName }}
+
{{ item.content.goodsName }}
-
￥{{ item.price | unitPrice }}
+
￥{{ item.content.price | unitPrice }}
已售 {{ item.buyCount || "0" }}
@@ -61,11 +61,12 @@ export default { */ navigateToGoodsDetail(val) { uni.navigateTo({ - url: `/pages/product/goods?id=${val.id}&goodsId=${val.goodsId}`, + url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`, }); }, async getGoodsData() { + // #TODO let goodsList = await getGoodsList(this.params); if (goodsList.data.success) { this.goodsList.push(...goodsList.data.result.content); diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue index fd784d0..697e97a 100644 --- a/pages/promotion/bargain/detail.vue +++ b/pages/promotion/bargain/detail.vue @@ -124,6 +124,7 @@ import { helpBargain, } from "@/api/promotions"; import shares from "@/components/m-share/index"; +import config from "@/config/config"; export default { components: { shares, @@ -178,7 +179,7 @@ export default { return { path: this.share(), title: `请快来帮我砍一刀${this.bargainDetail.goodsName}`, - imageUrl: this.thumbnail || require("@/static/logo.png"), + imageUrl: this.thumbnail || config.logo, }; }, // #endif diff --git a/pages/tabbar/user/similarGoods.vue b/pages/tabbar/user/similarGoods.vue index fe15f8b..b182475 100644 --- a/pages/tabbar/user/similarGoods.vue +++ b/pages/tabbar/user/similarGoods.vue @@ -13,17 +13,17 @@ 没有相似商品 - - {{item.name}} + + {{item.content.name}} - ￥{{item.price | unitPrice}} + ￥{{item.content.price | unitPrice}} - ￥{{item.mktprice}} + ￥{{item.content.mktprice}} - 已售{{item.buy_count}}件 - {{item.grade}}%好评 + 已售{{item.content.buy_count}}件 + {{item.content.grade}}%好评 @@ -74,7 +74,7 @@ }, goDetail(item) { uni.navigateTo({ - url: '/pages/product/goods?id=' + item.id + "&goodsId=" +item.goodsId + url: '/pages/product/goods?id=' + item.content.id + "&goodsId=" +item.content.goodsId }) }, loadData() {