diff --git a/.env b/.env new file mode 100644 index 0000000..2f3ac11 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +VITE_API_URL = "https://shop.jhxinyu.com" +VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" +VITE_WX_APPID = "wx7f6c37c381b4f273" diff --git a/.env.development b/.env.development deleted file mode 100644 index f465bc7..0000000 --- a/.env.development +++ /dev/null @@ -1,2 +0,0 @@ -VITE_API_URL = "https://shop.jhxinyu.com" -VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" \ No newline at end of file diff --git a/.env.production b/.env.production deleted file mode 100644 index f465bc7..0000000 --- a/.env.production +++ /dev/null @@ -1,2 +0,0 @@ -VITE_API_URL = "https://shop.jhxinyu.com" -VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" \ No newline at end of file diff --git a/public/img/icon-trade-detail-state-1.png b/public/img/icon-trade-detail-state-1.png new file mode 100644 index 0000000..573bc88 Binary files /dev/null and b/public/img/icon-trade-detail-state-1.png differ diff --git a/public/img/icon-trade-detail-state-2.png b/public/img/icon-trade-detail-state-2.png new file mode 100644 index 0000000..36c0e6b Binary files /dev/null and b/public/img/icon-trade-detail-state-2.png differ diff --git a/public/img/icon-trade-detail-state-3.png b/public/img/icon-trade-detail-state-3.png new file mode 100644 index 0000000..7e555c6 Binary files /dev/null and b/public/img/icon-trade-detail-state-3.png differ diff --git a/public/img/icon-trade-detail-state-4.png b/public/img/icon-trade-detail-state-4.png new file mode 100644 index 0000000..088125d Binary files /dev/null and b/public/img/icon-trade-detail-state-4.png differ diff --git a/public/img/icon-trade-detail-state-5.png b/public/img/icon-trade-detail-state-5.png new file mode 100644 index 0000000..972950d Binary files /dev/null and b/public/img/icon-trade-detail-state-5.png differ diff --git a/public/img/icon-trade-detail-state-6.png b/public/img/icon-trade-detail-state-6.png new file mode 100644 index 0000000..d23b2d7 Binary files /dev/null and b/public/img/icon-trade-detail-state-6.png differ diff --git a/src/App.vue b/src/App.vue index c0d44bb..211ad15 100644 --- a/src/App.vue +++ b/src/App.vue @@ -111,13 +111,13 @@ export default { wx.ready(() => { wx.updateAppMessageShareData(shareinfo); wx.updateTimelineShareData(shareinfo); - wx.getLocation({ - type: 'gcj02', - success: (e) => { - localStorage.setItem('user_latitude', e.latitude) - localStorage.setItem('user_longitude', e.longitude) - } - }); + // wx.getLocation({ + // type: 'gcj02', + // success: (e) => { + // localStorage.setItem('user_latitude', e.latitude) + // localStorage.setItem('user_longitude', e.longitude) + // } + // }); }); wx.error((e) => { }); diff --git a/src/styles/ch.less b/src/styles/ch.less index 5421897..69bf742 100644 --- a/src/styles/ch.less +++ b/src/styles/ch.less @@ -1,8 +1,6 @@ @import 'public.less'; @import 'tailwind.less'; -@proColor: #841e36; - :root:root { --main-color: #2e5d31; } @@ -1062,7 +1060,7 @@ .box; .box-center-center; padding: 0 2.4vw; - background: @proColor; + background: var(--main-color); width: 13.33vw; height: 6vw; border-radius: 3vw; diff --git a/src/styles/public.less b/src/styles/public.less index 090c68c..72595ef 100644 --- a/src/styles/public.less +++ b/src/styles/public.less @@ -667,6 +667,7 @@ img { .trade_confirm__deduction { .trade_confirm__deduction_top { .box; + padding-bottom: 3.33vw; span { font-weight: bold; diff --git a/src/views/Account/Login.vue b/src/views/Account/Login.vue index 965d0a0..6859b84 100644 --- a/src/views/Account/Login.vue +++ b/src/views/Account/Login.vue @@ -176,7 +176,7 @@ export default { checkWxLogin() { if (!this.$isWechat()) return const REDIRECT_URI = encodeURIComponent('https://shop.jhxinyu.com/#/WxCallback') - window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxdff8dd2032f1e054&redirect_uri=${REDIRECT_URI}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect` + window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${import.meta.env.VITE_WX_APPID}&redirect_uri=${REDIRECT_URI}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect` }, validatePhone(phone) { if (!phone) { diff --git a/src/views/Goods/GoodsDetail.vue b/src/views/Goods/GoodsDetail.vue index 50e50fe..1666b0b 100644 --- a/src/views/Goods/GoodsDetail.vue +++ b/src/views/Goods/GoodsDetail.vue @@ -31,7 +31,7 @@ -
+
@@ -153,7 +153,8 @@ {{ data.saleprice?.toFixed(2) || '0.00' }}积分
¥{{ data.saleprice?.toFixed(2) || '0.00' }}
-
¥{{ data.originalprice?.toFixed(2) || '0.00' }}
+
¥{{ + data.originalprice?.toFixed(2) || '0.00' }}
@@ -172,8 +173,8 @@ + style=" width: 86.67vw; background-color: #fff7f7; border-radius: 2.67vw;overflow: visible;" + class="goods_detail__area_popup" @click.self="showArea = false">
diff --git a/src/views/Trade/TradeConfirm.vue b/src/views/Trade/TradeConfirm.vue index 9276d21..bb09c41 100644 --- a/src/views/Trade/TradeConfirm.vue +++ b/src/views/Trade/TradeConfirm.vue @@ -45,7 +45,7 @@ 商品金额 {{ totalPrice }}
-
+
运费 ¥{{ freight.toFixed(2) }}
-
+
diff --git a/src/views/Trade/TradeList.vue b/src/views/Trade/TradeList.vue index 57fc976..7a8bae9 100644 --- a/src/views/Trade/TradeList.vue +++ b/src/views/Trade/TradeList.vue @@ -2,13 +2,14 @@
- - + --> - + @@ -25,7 +26,8 @@