From 09485747a640b1b6474270bd96c529dd05ffedde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Wed, 20 Jul 2022 18:24:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E4=BB=85=E4=BE=9B=E6=B5=8B=E8=AF=95]?= =?UTF-8?q?=E9=87=8D=E5=86=99navigateTo=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E4=B8=AD=E8=B6=85=E8=BF=8710=E4=B8=AA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=88=E6=97=B6=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 469 +++++++++--------- components/m-buy/goods.vue | 112 ++--- components/m-goods-list/list.vue | 8 +- components/m-goods-recommend/index.vue | 2 +- main.js | 6 +- pages/cart/coupon/couponCenter.vue | 2 +- pages/cart/coupon/myCoupon.vue | 4 +- pages/cart/payment/payOrder.vue | 16 +- pages/mine/address/add.vue | 6 +- pages/mine/address/address.vue | 4 +- pages/mine/address/addressManage.vue | 2 +- pages/mine/deposit/operation.vue | 2 +- pages/mine/deposit/recharge.vue | 2 +- pages/mine/distribution/home.vue | 4 +- pages/mine/distribution/list.vue | 2 +- pages/mine/msgTips/main.vue | 2 +- pages/mine/msgTips/packageMsg/index.vue | 2 +- pages/mine/myCollect.vue | 4 +- pages/mine/myTracks.vue | 6 +- pages/mine/set/editionIntro.vue | 2 +- .../set/securityCenter/securityCenter.vue | 2 +- pages/mine/set/setUp.vue | 2 +- pages/navigation/search/searchPage.vue | 4 +- pages/order/afterSales/afterSales.vue | 10 +- pages/order/afterSales/afterSalesSelect.vue | 2 +- pages/order/afterSales/applyDetail.vue | 4 +- pages/order/complain/complainList.vue | 4 +- pages/order/evaluate/myEvaluate.vue | 4 +- pages/order/fillorder.vue | 4 +- pages/order/myOrder.vue | 16 +- pages/order/orderDetail.vue | 20 +- pages/passport/login.vue | 6 +- pages/product/goods.vue | 10 +- .../product/evaluation/-evaluation.vue | 2 +- pages/product/product/popup/address.vue | 4 +- pages/product/product/shop/-shop.vue | 4 +- pages/product/shopList.vue | 2 +- pages/product/shopPage.vue | 30 +- pages/promotion/bargain/list.vue | 2 +- pages/promotion/bargain/log.vue | 2 +- pages/promotion/joinGroup.vue | 2 +- pages/promotion/lives.vue | 2 +- pages/promotion/point/pointList.vue | 4 +- pages/promotion/seckill.vue | 2 +- pages/tabbar/cart/cartList.vue | 12 +- pages/tabbar/category/category.vue | 4 +- pages/tabbar/home/template/tpl_goods.vue | 2 +- .../home/template/tpl_promotions_detail.vue | 8 +- pages/tabbar/home/template/tpl_search.vue | 2 +- pages/tabbar/home/views.vue | 14 +- pages/tabbar/screen/fullScreen.vue | 4 +- pages/tabbar/user/my.vue | 2 +- pages/tabbar/user/similarGoods.vue | 2 +- pages/tabbar/user/utils/tool.vue | 8 +- utils/navigateRoute.js | 24 + uview-ui/components/u-parse/libs/trees.vue | 4 +- uview-ui/components/u-parse/u-parse.vue | 4 +- uview-ui/components/u-toast/u-toast.vue | 2 +- 58 files changed, 472 insertions(+), 421 deletions(-) create mode 100644 utils/navigateRoute.js diff --git a/App.vue b/App.vue index 42b33aa..6290180 100644 --- a/App.vue +++ b/App.vue @@ -1,234 +1,257 @@ - - diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue index 60724a3..e73204f 100644 --- a/components/m-buy/goods.vue +++ b/components/m-buy/goods.vue @@ -46,20 +46,20 @@ formatPrice(item.price)[0] }} .{{ formatPrice(item.price)[1] }} - - - {{item.num}}{{goodsDetail.goodsUnit}} + + + {{item.num}}{{goodsDetail.goodsUnit}} - -
- - ￥ - {{ - formatPrice(goodsDetail.price)[0] - }} - .{{ formatPrice(goodsDetail.price)[1] }} - +
+
+ + ￥ + {{ + formatPrice(goodsDetail.price)[0] + }} + .{{ formatPrice(goodsDetail.price)[1] }} +
@@ -68,12 +68,12 @@ {{ selectName }} ，{{ num }}个 - - - 库存 - - {{ goodsDetail.quantity }} - + + + 库存 + + {{ goodsDetail.quantity }} + @@ -101,7 +101,7 @@ 数量 - + @@ -133,14 +133,14 @@ formatList: [], currentSelceted: [], skuList: "", - isClose: false, //是否可以点击遮罩关闭 + isClose: false, //是否可以点击遮罩关闭 }; }, - props: { - wholesaleList:{ - type: null, - default: false, + props: { + wholesaleList:{ + type: null, + default: false, }, buyMask: { type: Boolean, @@ -170,23 +170,23 @@ default: "", type: null, }, - }, - computed: { - wholesalePrice(key){ - return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.price }) :[] - }, - wholesaleNum(key){ - return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.num }) :[] - } }, - watch: { - num(val){ - if(val){ - if(val > this.goodsDetail.quantity){ - console.log(val) - this.val = this.goodsDetail.quantity - } - } + computed: { + wholesalePrice(key){ + return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.price }) :[] + }, + wholesaleNum(key){ + return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.num }) :[] + } + }, + watch: { + num(val){ + if(val){ + if(val > this.goodsDetail.quantity){ + console.log(val) + this.val = this.goodsDetail.quantity + } + } }, buyType: { handler(val) { @@ -263,7 +263,7 @@ buy(data) { API_trade.addToCart(data).then((res) => { if (res.data.success) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/order/fillorder?way=${ data.cartType }&addr=${""}&parentOrder=${encodeURIComponent( @@ -314,7 +314,7 @@ API_trade.addToCart(data).then((res) => { if (res.data.code == 200) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/order/fillorder?way=${data.cartType}&addr=${ this.addr.id || "" }&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`, @@ -399,9 +399,9 @@ + diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue index 18b4a53..dfc6e89 100644 --- a/components/m-goods-list/list.vue +++ b/components/m-goods-list/list.vue @@ -151,7 +151,7 @@ for (let i of Array.from(keyword)) { unicodes += this.unicode(i) + "|" } - const rule = '(' + unicodes + ')' + const rule = '(' + unicodes + ')' const reg = new RegExp(rule, 'gi'); return str ? str.replace(reg, matchValue => `${matchValue}` @@ -198,13 +198,13 @@ }, // 跳转到商品详情 navigateToDetailPage(item) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, // 跳转地址 navigateToStoreDetailPage(item) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/product/shopPage?id=${item.content.storeId}`, }); }, @@ -341,4 +341,4 @@ } } - + diff --git a/components/m-goods-recommend/index.vue b/components/m-goods-recommend/index.vue index 8f60967..dc19323 100644 --- a/components/m-goods-recommend/index.vue +++ b/components/m-goods-recommend/index.vue @@ -62,7 +62,7 @@ export default { this.goodsList.push(...goodsList.data.result.content); }, handleClick(item) { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, diff --git a/main.js b/main.js index e02f774..37296c1 100644 --- a/main.js +++ b/main.js @@ -3,7 +3,7 @@ import App from "./App"; import * as filters from "./utils/filters.js"; // global filter import uView from "uview-ui"; import store from "./store"; - +import {navigateTo} from '@/utils/navigateRoute.js' /** * 仅在h5中显示唤醒app功能 @@ -27,6 +27,10 @@ Object.keys(filters).forEach((key) => { // 引入Vuex Vue.prototype.$store = store; + + +// // 引入Vuex +Vue.prototype.$navigateTo = navigateTo; Vue.use(uView); Vue.config.productionTip = false; diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue index e8806ad..5c8e818 100644 --- a/pages/cart/coupon/couponCenter.vue +++ b/pages/cart/coupon/couponCenter.vue @@ -145,7 +145,7 @@ }, }, onNavigationBarButtonTap(e) { - uni.navigateTo({ + this.$navigateTo({ url: "/pages/cart/coupon/couponIntro", }); }, diff --git a/pages/cart/coupon/myCoupon.vue b/pages/cart/coupon/myCoupon.vue index ac59a4a..1d63237 100644 --- a/pages/cart/coupon/myCoupon.vue +++ b/pages/cart/coupon/myCoupon.vue @@ -189,7 +189,7 @@ export default { */ useItNow(item) { if (item.storeId && item.storeId!='0') { - uni.navigateTo({ + this.$navigateTo({ url: `/pages/product/shopPage?id=${item.storeId}`, }); } else { @@ -203,7 +203,7 @@ export default { * 优惠券详情 */ couponDetail(item) { - uni.navigateTo({ + this.$navigateTo({ url: "/pages/cart/coupon/couponDetail?item=" + encodeURIComponent(JSON.stringify(item)), diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index f5b092c..179422b 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -120,7 +120,7 @@ * 支付成功后跳转 */ callback(paymentMethod){ - uni.navigateTo({ + this.$navigateTo({ url: "/pages/cart/payment/success?paymentMethod=" + paymentMethod + "&payPrice=" + @@ -138,7 +138,7 @@ if (this.routerVal.recharge_sn) { // 判断当前是否是充值 this.sn = this.routerVal.recharge_sn; - this.orderType = "RECHARGE"; + this.orderType = "RECHARGE"; } else if (this.routerVal.trade_sn) { this.sn = this.routerVal.trade_sn; @@ -178,12 +178,12 @@ this.payList = res.data.result.support.filter((item) => { return item != "ALIPAY"; - }); - // 充值的话仅保留微信支付 - if(this.orderType == "RECHARGE"){ - this.payList = res.data.result.support.filter((item) => { - return item == "WECHAT"; - }); + }); + // 充值的话仅保留微信支付 + if(this.orderType == "RECHARGE"){ + this.payList = res.data.result.support.filter((item) => { + return item == "WECHAT"; + }); } } diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue index 7cf807f..08bac21 100644 --- a/pages/mine/address/add.vue +++ b/pages/mine/address/add.vue @@ -1,11 +1,11 @@ diff --git a/components/m-goods-list/seckill.vue b/components/m-goods-list/seckill.vue new file mode 100644 index 0000000..4e7b834 --- /dev/null +++ b/components/m-goods-list/seckill.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/config/api.js b/config/api.js index 4e4741c..e8461b2 100644 --- a/config/api.js +++ b/config/api.js @@ -4,8 +4,12 @@ */ // 开发环境 const dev = { - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", + // common: "https://common-api.pickmall.cn", + // buyer: "https://buyer-api.pickmall.cn", + + common: "http://192.168.0.106:8890", + buyer: "http://192.168.0.106:8888", + }; diff --git a/manifest.json b/manifest.json index 9267136..4cc39c1 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__EC9FD60", "description" : "", - "versionName" : "4.2.6", - "versionCode" : 4000260, + "versionName" : "4.2.5", + "versionCode" : 4000250, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue index 162d771..b80f856 100644 --- a/pages/promotion/bargain/list.vue +++ b/pages/promotion/bargain/list.vue @@ -88,10 +88,10 @@ page { diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js index cfa6979..b980d1c 100644 --- a/plugins/APPUpdate/index.js +++ b/plugins/APPUpdate/index.js @@ -854,7 +854,8 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) { export default function (isPrompt = false) { getCurrentNo((version) => { getServerNo((res) => { - if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "") ) { + + if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "")) { return false; } diff --git a/static/buy.png b/static/buy.png new file mode 100644 index 0000000000000000000000000000000000000000..e4accb0b891f5e7c87728e40d15b16cde90e545e GIT binary patch literal 2273 zcmV<72p;!|P)zdUgLlME^iU{bpwSmW=z0g#SfJ|13TK zK}G*3IQ~yi|1LiLJw^RvWBpK8{aj!EJxTsFL;p!o`*Cypl#2f;IR7O!|2#tfIY9p| zJO460|297V|Ns9XHUB?D|EH|~`uqR$^#4Om|5983+TH)t*8k|~|F5 zhImE*002UCQchC<0|*5T8Xy-CC>0VwB^)p~Ei^nxSW-~+a5P}`H$(O@P4hpD^Obo42WT zaTa;oNsJ}ocTk;3Q(Ml5>)cpC>3ykSTKk>nt4s)CRC@_Bee8G-(-!QI|nniPYUB zjD#O6z%Z8yA~T2#Ve&5Q%kMXDVx`jEhK*q^ZcM))I+K^NL6SLYW&&IswsvDEOPCr? z(;230VLk)qXhu`ul4%U588u;=hEK9GEQ~G~xb$=hBe7$Ua#{x&t{JUNvM_LI=1rs| z-&lDch6ysc$`Hl|shOdx(ll(d#>(d*QzOHaf$_pjJsBxUH-@r!Qa6RlBntD;!md#z zzhmX{HLc9UD%%*w3Jbs_RqPndGC(V1FquhWVd2y)Y}3Xr!&n)cr3}pQ`ZYb2jL9{| zWf#eiuKB%&42)0mFd0#`WAWsnI7^uo!%3b-RPEUQDb7-2$=I=v&!qkaEDxV+!*qNu z+2Jp>Vu7G^V=M>@24t3u!QlT2T(KD#m*pUZ%sk40)kwmi^Va*9v_NA{xDd*N`CB%uoG1f-47 zC>WCm09$N5F&Mp?orUR&UT6xJtK2RRY8w{xHh7FY;-YPb6> zc-u-Ff@AH`Bclf|J0lS`=I0oN1>A$73~cCmhUZ{FTB5Kaysow>tck8_oj0ZoW_Xu1 zhH2y5jxrf?R@m&2C77lFYtAVhyFZbPUx6WXrE~HOk&*bdL&cK4M z!z#{cQ7f>Z1_IwW%tjcCt1vG6OI@vI<9<3#3ZutvFZbS!73iNKtJyE|&~<09A=$Tg zht)bnG0eZtz^o?$))~D!>_6}2lH(u@1kt;dVmpz7m;~dPKS2{F_dmh7{6T0WW)-=% zY@XUhS9KlMr<9uSSp{*m-9!WGz*$=AgX2N1@+ zo{eR3pxsl0?U)QAGgvUz6~I(DKoz*eO1tmD#>`;fjRzZ}*ILIlF3a-v;grDK_=;ZS z^cWc1)B`{l5`0c2R-ZR8Qf8f4S*67Q$d<1sCHbg(sWvcU)>BR}bXw~t!$<+@#weHe z*-++MstwG}^DJ_k9}CNAyhx0ds`Ro4cV)gkCONSI056WWIy`uDPfYejXo+BjsQRy+ zrnF%Dx-K(=*_FSgu}I~=*lCSmrE%za!SM1lKX96w%OB|o#xMPU9{YT?o;a^&kU+|& zy;3AS3Ko8+qiX&6W8_yUz@BY%fD;6`ho<_VfB>k&0(?SzP>Ty%^pYqahC(=u${k+H z2Zvp#+u_AJc0pE%A%+NOH`+t?;4pPZdo;DEmB#cn!49L=z@4%QwbGceGF3+u z?OLcUCBy|`Lm&`n{{N?XM_M?7DmEDhM0>sTEDn-(bM9{Bzp-J516yS+INha?-+UpY zmtq?%Qu(XrX4}es&wFFwYPU_edS)-{%Ul@UkDL=5dTm5rhRb@k-axNR>dWDNP3v&c zl3rM#H}HiJf0SpAX6pxm&iHq?XT>00000NkvXXu0mjfO<-vV literal 0 HcmV?d00001 diff --git a/uview-ui/libs/css/common.scss b/uview-ui/libs/css/common.scss index ffed482..201d271 100644 --- a/uview-ui/libs/css/common.scss +++ b/uview-ui/libs/css/common.scss @@ -109,63 +109,63 @@ text { } // 定义flex等分 -@for $i from 0 through 12 { - .u-flex-#{$i} { - flex: $i; - } -} +// @for $i from 0 through 12 { +// .u-flex-#{$i} { +// flex: $i; +// } +// } -// 定义字体(px)单位，小于20都为px单位字体 -@for $i from 9 to 20 { - .u-font-#{$i} { - font-size: $i + px; - } -} +// // 定义字体(px)单位，小于20都为px单位字体 +// @for $i from 9 to 20 { +// .u-font-#{$i} { +// font-size: $i + px; +// } +// } -// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体 -@for $i from 20 through 40 { - .u-font-#{$i} { - font-size: $i + rpx; - } -} +// // 定义字体(rpx)单位，大于或等于20的都为rpx单位字体 +// @for $i from 20 through 40 { +// .u-font-#{$i} { +// font-size: $i + rpx; +// } +// } -// 定义内外边距，历遍1-80 -@for $i from 0 through 80 { - // 只要双数和能被5除尽的数 - @if $i % 2 == 0 or $i % 5 == 0 { - // 得出：u-margin-30或者u-m-30 - .u-margin-#{$i}, .u-m-#{$i} { - margin: $i + rpx!important; - } +// // 定义内外边距，历遍1-80 +// @for $i from 0 through 80 { +// // 只要双数和能被5除尽的数 +// @if $i % 2 == 0 or $i % 5 == 0 { +// // 得出：u-margin-30或者u-m-30 +// .u-margin-#{$i}, .u-m-#{$i} { +// margin: $i + rpx!important; +// } - // 得出：u-padding-30或者u-p-30 - .u-padding-#{$i}, .u-p-#{$i} { - padding: $i + rpx!important; - } +// // 得出：u-padding-30或者u-p-30 +// .u-padding-#{$i}, .u-p-#{$i} { +// padding: $i + rpx!important; +// } - @each $short, $long in l left, t top, r right, b bottom { - // 缩写版，结果如： u-m-l-30 - // 定义外边距 - .u-m-#{$short}-#{$i} { - margin-#{$long}: $i + rpx!important; - } +// @each $short, $long in l left, t top, r right, b bottom { +// // 缩写版，结果如： u-m-l-30 +// // 定义外边距 +// .u-m-#{$short}-#{$i} { +// margin-#{$long}: $i + rpx!important; +// } - // 定义内边距 - .u-p-#{$short}-#{$i} { - padding-#{$long}: $i + rpx!important; - } +// // 定义内边距 +// .u-p-#{$short}-#{$i} { +// padding-#{$long}: $i + rpx!important; +// } - // 完整版，结果如：u-margin-left-30 - // 定义外边距 - .u-margin-#{$long}-#{$i} { - margin-#{$long}: $i + rpx!important; - } +// // 完整版，结果如：u-margin-left-30 +// // 定义外边距 +// .u-margin-#{$long}-#{$i} { +// margin-#{$long}: $i + rpx!important; +// } - // 定义内边距 - .u-padding-#{$long}-#{$i} { - padding-#{$long}: $i + rpx!important; - } - } - } -} +// // 定义内边距 +// .u-padding-#{$long}-#{$i} { +// padding-#{$long}: $i + rpx!important; +// } +// } +// } +// } From 1e9df74034183893fb6b4e92f658726fd5915fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 15 Sep 2022 15:40:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?perf:=20:art:=20=E6=94=B9=E5=96=84=E4=BF=83?= =?UTF-8?q?=E9=94=80=E9=83=A8=E5=88=86=E8=8D=A3=E8=AA=89=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=20=E5=B0=81=E8=A3=85=E4=B8=BA=E7=BB=84=E4=BB=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20=E6=9B=B4=E5=8A=A0=E4=BE=BF=E6=8D=B7=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=A5=BD=E7=9C=8B=E3=80=82=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除部分原有的老样式 更新新版促销样式 页面更加好看 删除冗余代码 封装多种方法以及组件 --- App.vue | 4 +- components/m-buy/goods.vue | 4 +- components/m-goods-list/promotion.vue | 160 +++++++ components/m-goods-list/seckill.vue | 190 --------- components/m-goods-recommend/index.vue | 2 +- config/api.js | 10 +- main.js | 4 +- pages.json | 7 +- pages/cart/coupon/couponCenter.vue | 2 +- pages/cart/coupon/myCoupon.vue | 4 +- pages/cart/payment/payOrder.vue | 2 +- pages/mine/address/add.vue | 2 +- pages/mine/address/address.vue | 4 +- pages/mine/address/addressManage.vue | 20 +- pages/mine/deposit/operation.vue | 2 +- pages/mine/deposit/recharge.vue | 2 +- pages/mine/distribution/home.vue | 4 +- pages/mine/distribution/list.vue | 2 +- pages/mine/msgTips/main.vue | 2 +- pages/mine/msgTips/packageMsg/index.vue | 2 +- pages/mine/myCollect.vue | 4 +- pages/mine/myTracks.vue | 4 +- pages/mine/set/editionIntro.vue | 2 +- .../set/securityCenter/securityCenter.vue | 2 +- pages/mine/set/setUp.vue | 2 +- pages/navigation/search/searchPage.vue | 4 +- pages/order/afterSales/afterSales.vue | 10 +- pages/order/afterSales/afterSalesSelect.vue | 2 +- pages/order/afterSales/applyDetail.vue | 4 +- pages/order/complain/complainList.vue | 4 +- pages/order/evaluate/myEvaluate.vue | 4 +- pages/order/fillorder.vue | 4 +- pages/order/myOrder.vue | 22 +- pages/order/orderDetail.vue | 20 +- pages/passport/login.vue | 6 +- pages/product/goods.vue | 10 +- .../product/evaluation/-evaluation.vue | 2 +- pages/product/product/popup/address.vue | 4 +- pages/product/product/shop/-shop.vue | 4 +- pages/product/shopList.vue | 2 +- pages/product/shopPage.vue | 12 +- pages/promotion/bargain/detail.vue | 20 +- pages/promotion/bargain/list.vue | 25 +- pages/promotion/bargain/log.vue | 2 +- pages/promotion/joinGroup.vue | 262 ++++++------ pages/promotion/lives.vue | 2 +- pages/promotion/point/pointList.vue | 62 +-- pages/promotion/seckill.vue | 65 ++- pages/tabbar/cart/cartList.vue | 8 +- pages/tabbar/category/category.vue | 4 +- pages/tabbar/home/template/tpl_goods.vue | 21 +- .../home/template/tpl_promotions_detail.vue | 8 +- pages/tabbar/home/template/tpl_search.vue | 2 +- pages/tabbar/home/views.vue | 6 +- pages/tabbar/screen/fullScreen.vue | 4 +- pages/tabbar/user/my.vue | 2 +- pages/tabbar/user/similarGoods.vue | 2 +- pages/tabbar/user/utils/tool.vue | 8 +- static/bg.png | Bin 0 -> 5295 bytes static/bg1.png | Bin 0 -> 19444 bytes static/join-buy.png | Bin 0 -> 6887 bytes static/seckill.png | Bin 0 -> 1423 bytes static/seckill/active.png | Bin 692 -> 0 bytes uni.scss | 3 + utils/filters.js | 40 +- utils/navigateRoute.js | 24 -- utils/request.js | 398 +++++++++--------- uview-ui/components/u-parse/libs/trees.vue | 4 +- uview-ui/components/u-parse/u-parse.vue | 4 +- uview-ui/components/u-toast/u-toast.vue | 2 +- 70 files changed, 721 insertions(+), 814 deletions(-) create mode 100644 components/m-goods-list/promotion.vue delete mode 100644 components/m-goods-list/seckill.vue create mode 100644 static/bg.png create mode 100644 static/bg1.png create mode 100644 static/join-buy.png create mode 100644 static/seckill.png delete mode 100644 static/seckill/active.png delete mode 100644 utils/navigateRoute.js diff --git a/App.vue b/App.vue index 6290180..4304ad7 100644 --- a/App.vue +++ b/App.vue @@ -189,7 +189,7 @@ url: path, }); } else { - this.$navigateTo({ + uni.navigateTo({ url: path, }); } @@ -214,7 +214,7 @@ url: `/${path}`, }); } else { - this.$navigateTo({ + uni.navigateTo({ url: `/${path}`, }); } diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue index e73204f..46f1678 100644 --- a/components/m-buy/goods.vue +++ b/components/m-buy/goods.vue @@ -263,7 +263,7 @@ buy(data) { API_trade.addToCart(data).then((res) => { if (res.data.success) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/order/fillorder?way=${ data.cartType }&addr=${""}&parentOrder=${encodeURIComponent( @@ -314,7 +314,7 @@ API_trade.addToCart(data).then((res) => { if (res.data.code == 200) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/order/fillorder?way=${data.cartType}&addr=${ this.addr.id || "" }&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`, diff --git a/components/m-goods-list/promotion.vue b/components/m-goods-list/promotion.vue new file mode 100644 index 0000000..361bbcb --- /dev/null +++ b/components/m-goods-list/promotion.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/components/m-goods-list/seckill.vue b/components/m-goods-list/seckill.vue deleted file mode 100644 index 4e7b834..0000000 --- a/components/m-goods-list/seckill.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - - diff --git a/components/m-goods-recommend/index.vue b/components/m-goods-recommend/index.vue index dc19323..8f60967 100644 --- a/components/m-goods-recommend/index.vue +++ b/components/m-goods-recommend/index.vue @@ -62,7 +62,7 @@ export default { this.goodsList.push(...goodsList.data.result.content); }, handleClick(item) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, diff --git a/config/api.js b/config/api.js index e8461b2..96131ba 100644 --- a/config/api.js +++ b/config/api.js @@ -4,14 +4,8 @@ */ // 开发环境 const dev = { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", - - common: "http://192.168.0.106:8890", - buyer: "http://192.168.0.106:8888", - - - + common: "https://common-api.pickmall.cn", + buyer: "https://buyer-api.pickmall.cn", }; // 生产环境 const prod = { diff --git a/main.js b/main.js index 3ea0c2b..9b47071 100644 --- a/main.js +++ b/main.js @@ -3,7 +3,7 @@ import App from "./App"; import * as filters from "./utils/filters.js"; // global filter import uView from "uview-ui"; import store from "./store"; -import {navigateTo} from '@/utils/navigateRoute.js' + /** * 仅在h5中显示唤醒app功能 @@ -32,8 +32,6 @@ Object.keys(filters).forEach((key) => { Vue.prototype.$store = store; -// // 引入Vuex -Vue.prototype.$navigateTo = navigateTo; Vue.use(uView); Vue.config.productionTip = false; diff --git a/pages.json b/pages.json index 4d1a33f..115501b 100644 --- a/pages.json +++ b/pages.json @@ -465,7 +465,9 @@ "pages": [ { "path": "seckill", "style": { - "navigationBarTitleText": "限时抢购", + "navigationBarTitleText": "限时抢购", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" , "app-plus": { "titleNView": { "homeButton":true @@ -478,7 +480,8 @@ "path": "joinGroup", "style": { "navigationBarTitleText": "拼团活动", - "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" , "app-plus": { // 将回弹属性关掉 "bounce": "none" diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue index 5c8e818..e8806ad 100644 --- a/pages/cart/coupon/couponCenter.vue +++ b/pages/cart/coupon/couponCenter.vue @@ -145,7 +145,7 @@ }, }, onNavigationBarButtonTap(e) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/cart/coupon/couponIntro", }); }, diff --git a/pages/cart/coupon/myCoupon.vue b/pages/cart/coupon/myCoupon.vue index 1d63237..ac59a4a 100644 --- a/pages/cart/coupon/myCoupon.vue +++ b/pages/cart/coupon/myCoupon.vue @@ -189,7 +189,7 @@ export default { */ useItNow(item) { if (item.storeId && item.storeId!='0') { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/shopPage?id=${item.storeId}`, }); } else { @@ -203,7 +203,7 @@ export default { * 优惠券详情 */ couponDetail(item) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/cart/coupon/couponDetail?item=" + encodeURIComponent(JSON.stringify(item)), diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index 179422b..71be635 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -120,7 +120,7 @@ * 支付成功后跳转 */ callback(paymentMethod){ - this.$navigateTo({ + uni.navigateTo({ url: "/pages/cart/payment/success?paymentMethod=" + paymentMethod + "&payPrice=" + diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue index 08bac21..33723f9 100644 --- a/pages/mine/address/add.vue +++ b/pages/mine/address/add.vue @@ -162,7 +162,7 @@ export default { delete this.form.updateTime; editAddress(this.form).then((res) => { if (res.data.success) { - this.$navigateTo({ + uni.navigateTo({ url: `/${beforePage.route}`, }); } diff --git a/pages/mine/address/address.vue b/pages/mine/address/address.vue index 22b4feb..e025746 100644 --- a/pages/mine/address/address.vue +++ b/pages/mine/address/address.vue @@ -129,7 +129,7 @@ export default { //新建。编辑地址 addAddress(id) { if (id) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/mine/address/add?id=" + id + @@ -138,7 +138,7 @@ export default { "&type=order", }); } else { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/mine/address/add?way=" + this.routerVal.way + "&type=order", }); diff --git a/pages/mine/address/addressManage.vue b/pages/mine/address/addressManage.vue index 0d70500..f28382c 100644 --- a/pages/mine/address/addressManage.vue +++ b/pages/mine/address/addressManage.vue @@ -86,23 +86,9 @@ export default { * 进入页面检测当前账户是否登录 */ onShow() { - let that = this; - if (this.$options.filters.isLogin("auth")) { + if (this.$options.filters.tipsToLogin()) { this.getAddressList(); - } else { - uni.showModal({ - title: "提示", - content: "检测到您的账号还未登录,是否去登录？", - confirmColor: this.$lightColor, - success: function (res) { - if (res.confirm) { - that.$options.filters.navigateToLogin(); - } else if (res.cancel) { - uni.navigateBack(); - } - }, - }); - } + } }, methods: { //获取地址列表 @@ -145,7 +131,7 @@ export default { }, //新建。编辑地址 addAddress(id) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/mine/address/add${id ? "?id=" + id : ""}`, }); }, diff --git a/pages/mine/deposit/operation.vue b/pages/mine/deposit/operation.vue index 8832a3b..e9c8dff 100644 --- a/pages/mine/deposit/operation.vue +++ b/pages/mine/deposit/operation.vue @@ -50,7 +50,7 @@ export default { * 跳转 */ navgition(url) { - this.$navigateTo({ + uni.navigateTo({ url, }); }, diff --git a/pages/mine/deposit/recharge.vue b/pages/mine/deposit/recharge.vue index 0d16c8e..c9272d5 100644 --- a/pages/mine/deposit/recharge.vue +++ b/pages/mine/deposit/recharge.vue @@ -38,7 +38,7 @@ export default { let res = await recharge({ price: this.price }); if (res.data.success) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/cart/payment/payOrder?orderType=RECHARGE&recharge_sn=${res.data.result.rechargeSn}`, }); } diff --git a/pages/mine/distribution/home.vue b/pages/mine/distribution/home.vue index e2029a9..7dda626 100644 --- a/pages/mine/distribution/home.vue +++ b/pages/mine/distribution/home.vue @@ -58,12 +58,12 @@ export default { }, methods: { handleClick(url) { - this.$navigateTo({ + uni.navigateTo({ url, }); }, queryGoods(src) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/mine/distribution/${src}`, }); }, diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue index 852f523..989daf3 100644 --- a/pages/mine/distribution/list.vue +++ b/pages/mine/distribution/list.vue @@ -221,7 +221,7 @@ export default { * 查看图片 */ handleNavgationGoods(val) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.goodsId}`, }); }, diff --git a/pages/mine/msgTips/main.vue b/pages/mine/msgTips/main.vue index 6ceed10..eb383da 100644 --- a/pages/mine/msgTips/main.vue +++ b/pages/mine/msgTips/main.vue @@ -56,7 +56,7 @@ methods: { ...mapMutations(["logout"]), navigateTo(url) { - this.$navigateTo({ + uni.navigateTo({ url }); }, diff --git a/pages/mine/msgTips/packageMsg/index.vue b/pages/mine/msgTips/packageMsg/index.vue index aa2df11..619cf4e 100644 --- a/pages/mine/msgTips/packageMsg/index.vue +++ b/pages/mine/msgTips/packageMsg/index.vue @@ -45,7 +45,7 @@ export default { }, methods: { goDetail(sn,logi_id,ship_no){ - this.$navigateTo({ + uni.navigateTo({ url:'/pages/msgTips/packagemsg/logisticsDetail?order_sn=' + sn +'&logi_id='+logi_id+'&ship_no='+ship_no, }) }, diff --git a/pages/mine/myCollect.vue b/pages/mine/myCollect.vue index e39c4e8..18ee619 100644 --- a/pages/mine/myCollect.vue +++ b/pages/mine/myCollect.vue @@ -174,7 +174,7 @@ */ goGoodsDetail(val) { //商品详情 - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId, }); }, @@ -184,7 +184,7 @@ */ goStoreMainPage(id) { //店铺主页 - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/shopPage?id=" + id, }); }, diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue index c6119f1..00a130f 100644 --- a/pages/mine/myTracks.vue +++ b/pages/mine/myTracks.vue @@ -84,7 +84,7 @@ * 导航到店铺 */ navgaiteToStore(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/shopPage?id=" + val.storeId, }); }, @@ -100,7 +100,7 @@ * 跳转详情 */ navgaiteToDetail(item) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/goods?id=" + item.id + "&goodsId=" + item.goodsId, }); }, diff --git a/pages/mine/set/editionIntro.vue b/pages/mine/set/editionIntro.vue index 63b6056..4e90bdd 100644 --- a/pages/mine/set/editionIntro.vue +++ b/pages/mine/set/editionIntro.vue @@ -88,7 +88,7 @@ export default { }, navigateTo(url) { - this.$navigateTo({ + uni.navigateTo({ url, }); }, diff --git a/pages/mine/set/securityCenter/securityCenter.vue b/pages/mine/set/securityCenter/securityCenter.vue index 956a0f1..64c07f4 100644 --- a/pages/mine/set/securityCenter/securityCenter.vue +++ b/pages/mine/set/securityCenter/securityCenter.vue @@ -16,7 +16,7 @@ export default { methods: { navigateTo(url) { - this.$navigateTo({ + uni.navigateTo({ url: url, }); }, diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue index f09afcc..df48137 100644 --- a/pages/mine/set/setUp.vue +++ b/pages/mine/set/setUp.vue @@ -49,7 +49,7 @@ export default { if (url == "/pages/set/securityCenter/securityCenter") { url += `?mobile=${this.userInfo.mobile}`; } - this.$navigateTo({ + uni.navigateTo({ url: url, }); }, diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue index 7b76ac6..1d9fbf0 100644 --- a/pages/navigation/search/searchPage.vue +++ b/pages/navigation/search/searchPage.vue @@ -488,13 +488,13 @@ export default { }, // 跳转到商品详情 navigateToDetailPage(item) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, // 跳转地址 navigateToStoreDetailPage(item) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/shopPage?id=${item.content.storeId}`, }); }, diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue index 44bc5cc..9fcdac3 100644 --- a/pages/order/afterSales/afterSales.vue +++ b/pages/order/afterSales/afterSales.vue @@ -352,7 +352,7 @@ export default { * 售后详情 */ afterDetails(order) { - this.$navigateTo({ + uni.navigateTo({ url: "./applyDetail?sn=" + order.sn, }); }, @@ -395,7 +395,7 @@ export default { ...sku, }; storage.setAfterSaleData(data); - this.$navigateTo({ + uni.navigateTo({ url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}`, }); }, @@ -411,7 +411,7 @@ export default { }; storage.setAfterSaleData(data); - this.$navigateTo({ + uni.navigateTo({ url: `./afterSalesDetailExpress?serviceSn=${order.sn}`, }); }, @@ -422,13 +422,13 @@ export default { onDetail(goods, sku) { // 售后申请 if (this.current == 0) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${sku.skuId}&goodsId=${ sku.goodsId || sku.goodsId }`, }); } else { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${goods.skuId}&goodsId=${ goods.goodsId || goods.goodsId }`, diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue index fb8e3fc..d298151 100644 --- a/pages/order/afterSales/afterSalesSelect.vue +++ b/pages/order/afterSales/afterSalesSelect.vue @@ -94,7 +94,7 @@ export default { * 跳转到商品信息 */ navigateToGoodsDetail(id) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${id}&goodsId=${goodsId}`, }); }, diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue index 54fce3a..c8564d9 100644 --- a/pages/order/afterSales/applyDetail.vue +++ b/pages/order/afterSales/applyDetail.vue @@ -381,7 +381,7 @@ export default { * 访问商品详情 */ navgiateToGoodsDetail(item) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`, }); }, @@ -390,7 +390,7 @@ export default { * 进度 */ onProgress() { - this.$navigateTo({ + uni.navigateTo({ url: `./applyProgress?sn=${ this.serviceDetail.sn }&createTime=${encodeURIComponent(this.serviceDetail.createTime)} diff --git a/pages/order/complain/complainList.vue b/pages/order/complain/complainList.vue index 45777d9..ccdec07 100644 --- a/pages/order/complain/complainList.vue +++ b/pages/order/complain/complainList.vue @@ -86,7 +86,7 @@ export default { methods: { // 点击跳转到商品 handleToGoods(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId, }); }, @@ -120,7 +120,7 @@ export default { * 查看详情 */ handleInfo(val) { - this.$navigateTo({ + uni.navigateTo({ url: "./complainInfo?id=" + val.id, }); }, diff --git a/pages/order/evaluate/myEvaluate.vue b/pages/order/evaluate/myEvaluate.vue index 99c5798..35dc244 100644 --- a/pages/order/evaluate/myEvaluate.vue +++ b/pages/order/evaluate/myEvaluate.vue @@ -219,7 +219,7 @@ export default { */ talkCommont(sku) { console.log(sku); - this.$navigateTo({ + uni.navigateTo({ url: `./releaseEvaluate?sn=${sku.sn}&sku=${encodeURIComponent( JSON.stringify(sku) )}`, @@ -270,7 +270,7 @@ export default { * 评价详情 */ onDetail(comment) { - this.$navigateTo({ + uni.navigateTo({ url: "./evaluateDetail?comment=" + encodeURIComponent(JSON.stringify(comment)), diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index 71aa936..e0c03a8 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -481,7 +481,7 @@ export default { // 跳转到店铺 navigateToStore(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/shopPage?id=" + val.storeId, }); }, @@ -555,7 +555,7 @@ export default { * 跳转 */ navigateTo(url) { - this.$navigateTo({ + uni.navigateTo({ url, }); }, diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 45ac708..2d1eb1c 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -326,10 +326,10 @@ export default { // this.loadData(this.status); }, onShow() { - if (!this.tabCurrentIndex) { - this.initData(0); - } else { - + if(this.$options.filters.tipsToLogin()){ + if (!this.tabCurrentIndex) { + this.initData(0); + } } // this.loadData(this.status); }, @@ -364,14 +364,14 @@ export default { methods: { // 售后 applyService(order) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`, }); }, // 店铺详情 navigateToStore(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/shopPage?id=" + val.storeId, }); }, @@ -423,7 +423,7 @@ export default { }).pay(); // #endif // #ifndef MP-WEIXIN - this.$navigateTo({ + uni.navigateTo({ url: "/pages/cart/payment/payOrder?order_sn=" + val.sn, }); // #endif @@ -522,7 +522,7 @@ export default { * 跳转到订单详情 */ navigateToOrderDetail(sn) { - this.$navigateTo({ + uni.navigateTo({ url: "./orderDetail?sn=" + sn, }); }, @@ -588,7 +588,7 @@ export default { * 评价商品 */ onComment(sn) { - this.$navigateTo({ + uni.navigateTo({ url: "./evaluate/myEvaluate", }); }, @@ -599,7 +599,7 @@ export default { reBuy(order) { console.log(order); return; - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId, }); @@ -609,7 +609,7 @@ export default { * 查看物流 */ navigateToLogistics(order) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn, }); diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index d1b2e88..4014a7e 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -277,7 +277,7 @@ export default { }, methods: { tostore(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/shopPage?id=" + val.storeId, }); }, @@ -294,7 +294,7 @@ export default { }, // #TODO 这块需要写一下 目前没有拼团的详细信息 ByUserMessage(order) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/cart/payment/shareOrderGoods?sn=" + order.sn + @@ -318,12 +318,12 @@ export default { }); }, onReceipt(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/order/invoice/invoiceDetail?id=" + val.id, }); }, gotoGoodsDetail(sku) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`, }); }, @@ -363,7 +363,7 @@ export default { * 投诉 */ complaint(sku) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/order/complain/complain?sn=" + this.sn + @@ -373,7 +373,7 @@ export default { }, //售后按钮 onAfterSales(sn, sku) { - this.$navigateTo({ + uni.navigateTo({ url: `./afterSales/afterSalesSelect?sn=${sn}&sku=${encodeURIComponent( JSON.stringify(sku) )}`, @@ -382,7 +382,7 @@ export default { // 去支付 toPay(val) { val.sn - ? this.$navigateTo({ + ? uni.navigateTo({ url: "/pages/cart/payment/payOrder?order_sn=" + val.sn, }) : false; @@ -459,12 +459,12 @@ export default { }, //评价商品 onComment(sn) { - this.$navigateTo({ + uni.navigateTo({ url: "./evaluate/myEvaluate", }); }, //查看物流 onLogistics(order) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/mine/msgTips/packageMsg/logisticsDetail?logi_id=" + order.logi_id + @@ -480,7 +480,7 @@ export default { this.reason = reason; }, reBuy(order) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId, }); diff --git a/pages/passport/login.vue b/pages/passport/login.vue index b2e2d5d..227da4e 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -545,7 +545,7 @@ export default { if (user.data.result.mobile) { whetherNavigate(); } else { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/passport/bindUserPhone", }); } @@ -639,13 +639,13 @@ export default { }, // 跳转 navigateToPrivacy(val) { - this.$navigateTo({ + uni.navigateTo({ url: "/pages/mine/help/tips?type=" + val, }); console.log(val) }, navigateToPrivacys(val){ - this.$navigateTo({ + uni.navigateTo({ url:"/pages/mine/help/tips?type="+ val, }) }, diff --git a/pages/product/goods.vue b/pages/product/goods.vue index 418295a..76ac9e1 100644 --- a/pages/product/goods.vue +++ b/pages/product/goods.vue @@ -710,13 +710,13 @@ export default { linkMsgDetail() { // lili 基础客服 - this.$navigateTo({ + uni.navigateTo({ url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`, }); // udesk 代码 // if (this.storeDetail.merchantEuid) { - // this.$navigateTo({ + // uni.navigateTo({ // url: `/pages/tabbar/home/web-view?src=${this.IM}`, // }); // } @@ -736,7 +736,7 @@ export default { // sign: this.storeDetail.yzfSign, // mpSign: this.storeDetail.yzfMpSign, // }; - // this.$navigateTo({ + // uni.navigateTo({ // url: // "/pages/product/customerservice/index?params=" + // encodeURIComponent(JSON.stringify(params)), @@ -744,7 +744,7 @@ export default { // // #endif // // #ifndef MP-WEIXIN // const sign = this.storeDetail.yzfSign; - // this.$navigateTo({ + // uni.navigateTo({ // url: // "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" + // sign, @@ -908,7 +908,7 @@ export default { * 跳转到店铺页面 */ navigateToStore(store_id) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/shopPage?id=` + store_id, }); }, diff --git a/pages/product/product/evaluation/-evaluation.vue b/pages/product/product/evaluation/-evaluation.vue index e19c39b..27ad2fd 100644 --- a/pages/product/product/evaluation/-evaluation.vue +++ b/pages/product/product/evaluation/-evaluation.vue @@ -94,7 +94,7 @@ export default { ); }, toComment(id, grade) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/comment?id=${id}&grade=${grade}`, }); }, diff --git a/pages/product/product/popup/address.vue b/pages/product/product/popup/address.vue index a2a4829..50ce0b9 100644 --- a/pages/product/product/popup/address.vue +++ b/pages/product/product/popup/address.vue @@ -54,7 +54,7 @@ export default { this.getShippingAddress() } else{ - this.$navigateTo({ + uni.navigateTo({ url: 'pages/passport/login' }); } @@ -71,7 +71,7 @@ export default { getpicker() { // this.$refs.cityPicker.show(); - this.$navigateTo({ + uni.navigateTo({ url: "/pages/mine/address/add", }); this.closeAddress(); diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue index 2ab359c..3220628 100644 --- a/pages/product/product/shop/-shop.vue +++ b/pages/product/product/shop/-shop.vue @@ -57,13 +57,13 @@ export default { }, // 点击商品 clickGoods(val) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`, }); }, tostorePage(val) { - this.$navigateTo({ + uni.navigateTo({ url: "../product/shopPage?id=" + val.storeId, }); }, diff --git a/pages/product/shopList.vue b/pages/product/shopList.vue index 8ba4ecc..c91daa8 100644 --- a/pages/product/shopList.vue +++ b/pages/product/shopList.vue @@ -74,7 +74,7 @@ export default { }, methods: { handleClickStore(val){ - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/shopPage?id=${val.id}` }); }, diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue index f7b018b..cbceb11 100644 --- a/pages/product/shopPage.vue +++ b/pages/product/shopPage.vue @@ -152,7 +152,7 @@ export default { methods: { getStoreLicencePhoto() { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/licencePhoto?id=${this.storeId}`, }); }, @@ -190,7 +190,7 @@ export default { // sign: this.storeInfo.yzfSign, // mpSign: this.storeInfo.yzfMpSign, // }; - // this.$navigateTo({ + // uni.navigateTo({ // url: // "/pages/product/customerservice/index?params=" + // encodeURIComponent(JSON.stringify(params)), @@ -198,14 +198,14 @@ export default { // // #endif // // #ifndef MP-WEIXIN // const sign = this.storeInfo.yzfSign; - // this.$navigateTo({ + // uni.navigateTo({ // url: // "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" + // sign, // }); // // #endif - this.$navigateTo({ + uni.navigateTo({ url: `/pages/tabbar/home/web-view?IM=${this.storeId}`, }); }, @@ -227,7 +227,7 @@ export default { /**商品分类中商品集合 */ getCategoryGoodsList(val) { - this.$navigateTo({ + uni.navigateTo({ url: `/pages/product/shopPageGoods?title=${val.labelName}&id=${val.id}&storeId=${this.storeId}`, }); }, @@ -237,7 +237,7 @@ export default { */ search() { console.log("点击") - this.$navigateTo({ + uni.navigateTo({ url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`, }); }, diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue index 52cf0dc..185407d 100644 --- a/pages/promotion/bargain/detail.vue +++ b/pages/promotion/bargain/detail.vue @@ -3,7 +3,7 @@ -
+
@@ -106,10 +106,6 @@ - -
- -
@@ -352,11 +348,11 @@ page { align-items: center; padding: 10rpx 0; } -.wrapper { - background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png"); +.wrapper-box { + background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png"); background-repeat: no-repeat; background-size: 100% 100%; - height: 700rpx; + height: 506rpx; width: 100%; } @@ -371,16 +367,16 @@ page { } } .box1 { - top: 750rpx; + top: 560rpx; } .box2 { - top: 770rpx; + top: 580rpx; } .box3 { - top: 790rpx; + top: 600rpx; } .box4 { - top: 810rpx; + top: 620 rpx; height: 200rpx; } .bargain-item { diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue index b80f856..d553050 100644 --- a/pages/promotion/bargain/list.vue +++ b/pages/promotion/bargain/list.vue @@ -6,22 +6,7 @@
-
-
-
- -
-
-
- {{item.goodsName}} -
-
-
最低：￥{{item.purchasePrice | unitPrice}}
-
参与砍价
-
-
-
-
+
@@ -32,7 +17,9 @@ diff --git a/pages/promotion/lives.vue b/pages/promotion/lives.vue index eeedaad..bd0a728 100644 --- a/pages/promotion/lives.vue +++ b/pages/promotion/lives.vue @@ -229,7 +229,7 @@ export default { let customParams = encodeURIComponent( JSON.stringify({ path: "pages/index/index", pid: 1 }) ); // 开发者在直播间页面路径上携带自定义参数，后续可以在分享卡片链接和跳转至商详页时获取，详见【获取自定义参数】、【直播间到商详页面携带参数】章节（上限600个字符，超过部分会被截断） - this.$navigateTo({ + uni.navigateTo({ url: "plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=" + roomId + diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue index c34799a..59ddfd6 100644 --- a/pages/promotion/point/pointList.vue +++ b/pages/promotion/point/pointList.vue @@ -23,8 +23,8 @@ {{ item.goodsName }} - - {{ item.points }}积分 + +
{{ item.points }}积分
¥{{ item.originalPrice | unitPrice }} @@ -137,14 +137,14 @@ export default { methods: { // 跳转 navigateTo(url) { - this.$navigateTo({ + uni.navigateTo({ url, }); }, toGoods(item) { //跳转详情 - this.$navigateTo({ + uni.navigateTo({ url: `/pages/promotion/point/detail?id=${item.id}`, }); }, @@ -194,46 +194,12 @@ page { height: 100%; } .tipsMkt { - float: right; color: #c0c4cc; - font-size: 24rpx; + font-size: 24rpx !important; text-decoration: line-through; - margin-right: 20rpx; + margin-right: 20rpx !important; } -.header { - background: $light-color; - position: relative; - color: #fff; - display: flex; - height: 80rpx; - align-items: center; - justify-content: center; - font-size: 26rpx; - font-size: 34rpx; - - .left, - .right { - position: absolute; - width: max-content; - height: max-content; - top: 0; - bottom: 0; - margin: auto; - } - - .left { - float: left; - top: 0; - bottom: 0; - left: 20rpx; - } - - .right { - float: right; - right: 20rpx; - } -} .index { height: 100vh; @@ -341,15 +307,19 @@ page { overflow: hidden; } -.index-item-title-desc { - font-size: 25rpx; - color: #999999; - margin-top: 10rpx; -} + .index-item-price { font-size: 28rpx; - color: #ff5a10; + overflow: hidden; + color: $main-color; padding: 20rpx 0 0 20rpx; + >.point{ + >span{ + font-size: 42rpx; + font-weight: bold; + margin-right:10rpx; + } + } } diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue index 2f5a527..5d1566b 100644 --- a/pages/promotion/seckill.vue +++ b/pages/promotion/seckill.vue @@ -1,7 +1,8 @@