From de71b4cd588703d0fdbd112a57fd5b233f5b1682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 29 Sep 2021 14:42:46 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=BC=80=E9=80=9A=E4=BC=9A=E5=91=98?=
=?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD=E5=BC=80?=
=?UTF-8?q?=E5=8F=91,=E8=B0=83=E6=95=B4=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
=?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A6=81=E6=AD=A2=E9=A1=B5=E9=9D=A2=E5=AD=97?=
=?UTF-8?q?=E4=BD=93=E8=B7=9F=E9=9A=8F=E7=B3=BB=E7=BB=9F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/index.js | 11 +-
apis/interfaces/vip.js | 5 +-
apis/interfaces/wx.js | 25 +-
pages.json | 8 +-
pages/login/login.vue | 3 -
pages/vip/vip.vue | 1313 ++++++++---------
pages/wxAuth/wxAuth.vue | 46 +
router/index.js | 6 +
store/index.js | 8 +
unpackage/dist/build/h5/index.html | 2 +-
.../build/h5/static/dev/WechatIMG9663.png | Bin 0 -> 556814 bytes
.../build/h5/static/dev/WechatIMG9664.png | Bin 0 -> 802289 bytes
.../build/h5/static/dev/WechatIMG9666.png | Bin 0 -> 554508 bytes
.../h5/static/img/WechatIMG9663.f9994151.png | Bin 0 -> 556814 bytes
.../h5/static/img/user-portrait.a799acef.png | Bin 0 -> 4577 bytes
...{index.f4fc78fe.css => index.5e7e3b56.css} | 2 +-
.../h5/static/js/chunk-vendors.1319762c.js | 13 -
.../h5/static/js/chunk-vendors.61332aa4.js | 13 +
.../dist/build/h5/static/js/index.162be1d6.js | 1 +
.../dist/build/h5/static/js/index.21bb54d6.js | 1 -
... pages-certification-personal.bd1b815f.js} | 2 +-
...e.js => pages-company-approve.ee61e4a7.js} | 2 +-
...nagement~pages-wallet-property.c7e3e98e.js | 1 -
...nagement~pages-wallet-property.faa7f7c7.js | 1 +
.../static/js/pages-coupons-add.81e2e046.js | 1 -
.../static/js/pages-coupons-add.ffce8dd4.js | 1 +
...s => pages-coupons-magDetails.b34761c7.js} | 2 +-
...s => pages-coupons-management.9915286f.js} | 2 +-
.../js/pages-coupons-selectGoods.89767834.js | 1 +
.../js/pages-coupons-selectGoods.faf3ac6a.js | 1 -
.../js/pages-employees-list.1b874734.js | 1 +
.../js/pages-employees-list.224e80ee.js | 1 -
.../static/js/pages-found-index.30fb891a.js | 1 -
.../static/js/pages-found-index.96b97e43.js | 1 +
...926a78b.js => pages-goods-add.8813e1b3.js} | 2 +-
.../js/pages-goods-addClassify.13a20228.js | 1 +
.../js/pages-goods-addClassify.3f01cef4.js | 1 -
...5.js => pages-goods-goodsAuth.7718ce7e.js} | 2 +-
.../js/pages-goods-management.3dd9de08.js | 1 -
.../js/pages-goods-management.e988d3f8.js | 1 +
...4d120.js => pages-index-index.51cbfbf4.js} | 2 +-
...-history~pages-verif~55d7ae09.26fabf5b.js} | 2 +-
...js => pages-instrument-Spread.bc3fad98.js} | 2 +-
.../js/pages-instrument-basics.78ac420c.js | 1 +
.../js/pages-instrument-basics.a921fc6f.js | 1 -
.../static/js/pages-login-guide.5c006db5.js | 1 -
.../static/js/pages-login-guide.f8a07de7.js | 1 +
.../static/js/pages-login-login.393cf35a.js | 1 -
.../static/js/pages-login-login.9a24b7d6.js | 1 +
...3d1d5.js => pages-news-detail.ed7f9345.js} | 2 +-
.../h5/static/js/pages-news-index.48900f65.js | 1 +
.../h5/static/js/pages-news-index.c6c5b272.js | 1 -
...c.js => pages-setting-setting.c8651891.js} | 2 +-
.../static/js/pages-shop-create.0ae26a0f.js | 1 -
.../static/js/pages-shop-create.ffacd7ad.js | 1 +
.../h5/static/js/pages-user-code.1e5ba97b.js | 1 +
.../h5/static/js/pages-user-code.64bb4494.js | 1 -
...d254f91.js => pages-user-help.ac9c04f0.js} | 2 +-
.../h5/static/js/pages-user-index.06977806.js | 1 +
.../h5/static/js/pages-user-index.66777635.js | 1 -
.../static/js/pages-user-partner.bddbdaf8.js | 1 -
.../static/js/pages-user-partner.c11efe24.js | 1 +
.../js/pages-verification-history.af57bf10.js | 1 -
.../js/pages-verification-history.f61e3b0a.js | 1 +
...ment~pages-wallet-withdrawList.4ad30839.js | 1 -
...ment~pages-wallet-withdrawList.7d06ea47.js | 1 +
...ent~pages-wallet-withdrawList.901fa571.js} | 2 +-
.../js/pages-verification-index.0b9da5e7.js | 1 -
.../js/pages-verification-index.aa7384c4.js | 1 +
...76574c1.js => pages-vip-agree.799a5b41.js} | 2 +-
.../h5/static/js/pages-vip-vip.3a099adf.js | 1 -
.../h5/static/js/pages-vip-vip.d20b6230.js | 1 +
.../js/pages-wallet-addBank.6014eef7.js | 1 +
.../js/pages-wallet-addBank.c9f2b6e9.js | 1 -
.../js/pages-wallet-bankList.245b883d.js | 1 +
.../js/pages-wallet-bankList.a195e244.js | 1 -
...b2.js => pages-wallet-extract.1dddfb79.js} | 2 +-
.../js/pages-wallet-fragment.c14ea3a3.js | 1 -
.../js/pages-wallet-fragment.cc486754.js | 1 +
.../js/pages-wallet-property.3ef1cecd.js | 1 +
.../js/pages-wallet-property.de9dfc40.js | 1 -
.../js/pages-wallet-withdrawList.88567fbc.js | 1 +
.../js/pages-wallet-withdrawList.b0a9677a.js | 1 -
.../static/js/pages-wxAuth-wxAuth.df1cdd41.js | 1 +
84 files changed, 787 insertions(+), 749 deletions(-)
create mode 100644 pages/wxAuth/wxAuth.vue
create mode 100644 unpackage/dist/build/h5/static/dev/WechatIMG9663.png
create mode 100644 unpackage/dist/build/h5/static/dev/WechatIMG9664.png
create mode 100644 unpackage/dist/build/h5/static/dev/WechatIMG9666.png
create mode 100644 unpackage/dist/build/h5/static/img/WechatIMG9663.f9994151.png
create mode 100644 unpackage/dist/build/h5/static/img/user-portrait.a799acef.png
rename unpackage/dist/build/h5/static/{index.f4fc78fe.css => index.5e7e3b56.css} (73%)
delete mode 100644 unpackage/dist/build/h5/static/js/chunk-vendors.1319762c.js
create mode 100644 unpackage/dist/build/h5/static/js/chunk-vendors.61332aa4.js
create mode 100644 unpackage/dist/build/h5/static/js/index.162be1d6.js
delete mode 100644 unpackage/dist/build/h5/static/js/index.21bb54d6.js
rename unpackage/dist/build/h5/static/js/{pages-certification-personal.45576eaf.js => pages-certification-personal.bd1b815f.js} (69%)
rename unpackage/dist/build/h5/static/js/{pages-company-approve.6b479cae.js => pages-company-approve.ee61e4a7.js} (99%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-company-approve~pages-goods-add~pages-goods-management~pages-wallet-property.c7e3e98e.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-company-approve~pages-goods-add~pages-goods-management~pages-wallet-property.faa7f7c7.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-coupons-add.81e2e046.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-coupons-add.ffce8dd4.js
rename unpackage/dist/build/h5/static/js/{pages-coupons-magDetails.8883789e.js => pages-coupons-magDetails.b34761c7.js} (70%)
rename unpackage/dist/build/h5/static/js/{pages-coupons-management.fd43b6cf.js => pages-coupons-management.9915286f.js} (54%)
create mode 100644 unpackage/dist/build/h5/static/js/pages-coupons-selectGoods.89767834.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-coupons-selectGoods.faf3ac6a.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-employees-list.1b874734.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-employees-list.224e80ee.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-found-index.30fb891a.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-found-index.96b97e43.js
rename unpackage/dist/build/h5/static/js/{pages-goods-add.6926a78b.js => pages-goods-add.8813e1b3.js} (90%)
create mode 100644 unpackage/dist/build/h5/static/js/pages-goods-addClassify.13a20228.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-addClassify.3f01cef4.js
rename unpackage/dist/build/h5/static/js/{pages-goods-goodsAuth.e052bf55.js => pages-goods-goodsAuth.7718ce7e.js} (97%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-goods-management.3dd9de08.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-goods-management.e988d3f8.js
rename unpackage/dist/build/h5/static/js/{pages-index-index.13a4d120.js => pages-index-index.51cbfbf4.js} (73%)
rename unpackage/dist/build/h5/static/js/{pages-index-index~pages-setting-aboutUs~pages-setting-setting~pages-verification-history~pages-verif~55d7ae09.9574878a.js => pages-index-index~pages-setting-aboutUs~pages-setting-setting~pages-verification-history~pages-verif~55d7ae09.26fabf5b.js} (57%)
rename unpackage/dist/build/h5/static/js/{pages-instrument-Spread.2b6d8508.js => pages-instrument-Spread.bc3fad98.js} (82%)
create mode 100644 unpackage/dist/build/h5/static/js/pages-instrument-basics.78ac420c.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-instrument-basics.a921fc6f.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-login-guide.5c006db5.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-login-guide.f8a07de7.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-login-login.393cf35a.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-login-login.9a24b7d6.js
rename unpackage/dist/build/h5/static/js/{pages-news-detail.3953d1d5.js => pages-news-detail.ed7f9345.js} (79%)
create mode 100644 unpackage/dist/build/h5/static/js/pages-news-index.48900f65.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-news-index.c6c5b272.js
rename unpackage/dist/build/h5/static/js/{pages-setting-setting.a42fccbc.js => pages-setting-setting.c8651891.js} (66%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-shop-create.0ae26a0f.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-shop-create.ffacd7ad.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-user-code.1e5ba97b.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-user-code.64bb4494.js
rename unpackage/dist/build/h5/static/js/{pages-user-help.3d254f91.js => pages-user-help.ac9c04f0.js} (53%)
create mode 100644 unpackage/dist/build/h5/static/js/pages-user-index.06977806.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-user-index.66777635.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-user-partner.bddbdaf8.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-user-partner.c11efe24.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-verification-history.af57bf10.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-verification-history.f61e3b0a.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-verification-history~pages-wallet-addBank~pages-wallet-fragment~pages-wallet-withdrawList.4ad30839.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-verification-history~pages-wallet-addBank~pages-wallet-fragment~pages-wallet-withdrawList.7d06ea47.js
rename unpackage/dist/build/h5/static/js/{pages-verification-history~pages-wallet-fragment~pages-wallet-withdrawList.9bd31c2a.js => pages-verification-history~pages-wallet-fragment~pages-wallet-withdrawList.901fa571.js} (78%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-verification-index.0b9da5e7.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-verification-index.aa7384c4.js
rename unpackage/dist/build/h5/static/js/{pages-vip-agree.876574c1.js => pages-vip-agree.799a5b41.js} (82%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-vip-vip.3a099adf.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-vip-vip.d20b6230.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-addBank.6014eef7.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-addBank.c9f2b6e9.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-bankList.245b883d.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-bankList.a195e244.js
rename unpackage/dist/build/h5/static/js/{pages-wallet-extract.fb104ab2.js => pages-wallet-extract.1dddfb79.js} (56%)
delete mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-fragment.c14ea3a3.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-fragment.cc486754.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-property.3ef1cecd.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-property.de9dfc40.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-withdrawList.88567fbc.js
delete mode 100644 unpackage/dist/build/h5/static/js/pages-wallet-withdrawList.b0a9677a.js
create mode 100644 unpackage/dist/build/h5/static/js/pages-wxAuth-wxAuth.df1cdd41.js
diff --git a/apis/index.js b/apis/index.js
index d8664da..3bb3546 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -9,11 +9,11 @@ import store from '@/store'
// 基础配置
const config = {
- // apiUrl : 'https://oapi.lianshang.vip/api/',
- // apiUrls : 'https://oapi.lianshang.vip/',
+ apiUrl : 'https://oapi.lianshang.vip/api/',
+ apiUrls : 'https://oapi.lianshang.vip/',
- apiUrl : 'http://api.ahxh.shangkelian.cn/api/',
- apiUrls : 'http://api.ahxh.shangkelian.cn/',
+ // apiUrl : 'http://api.ahxh.shangkelian.cn/api/',
+ // apiUrls : 'http://api.ahxh.shangkelian.cn/',
timeout : 60000
}
@@ -34,9 +34,6 @@ const request = (parameter) => {
'Accept': 'application/json',
'Authorization': store.getters.getToken || ''
}
-
- // console.log('parameterDbug', parameter)
-
// 加载提示
uni.showLoading({
title: '加载中',
diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js
index 0784a70..cae8a79 100644
--- a/apis/interfaces/vip.js
+++ b/apis/interfaces/vip.js
@@ -25,9 +25,10 @@ const vipOrder = (id, data) =>{
}
// 开通会员微信支付
-const vipWechatPay = id => {
+const vipWechatPay = (id, data) => {
return request({
- url : 'user/identities/pay/' + id + '/wechat'
+ url: 'user/identities/pay/' + id + '/wechat',
+ data
})
}
diff --git a/apis/interfaces/wx.js b/apis/interfaces/wx.js
index 2fede15..be5c261 100644
--- a/apis/interfaces/wx.js
+++ b/apis/interfaces/wx.js
@@ -9,13 +9,32 @@
import { request } from '../index'
+// 微信配置信息
const wxConfig = data => {
return request({
- url : 'user/auth/get_jssdk',
- data : data
+ url: 'user/auth/get_jssdk',
+ data
+ })
+}
+
+// 鉴权转跳地址
+const wxCode = data => {
+ return request({
+ url: 'user/auth/get_auth_url',
+ data
+ })
+}
+
+// 获取openid
+const wxOpenid = data => {
+ return request({
+ url: 'user/auth/get_openid',
+ data
})
}
export {
- wxConfig
+ wxConfig,
+ wxCode,
+ wxOpenid
}
diff --git a/pages.json b/pages.json
index b013e69..0fad0e7 100644
--- a/pages.json
+++ b/pages.json
@@ -332,8 +332,12 @@
},
"name": "withdrawList",
"aliasPath": "/wallet/withdraw/list"
- }
- ],
+ }, {
+ "path" : "pages/wxAuth/wxAuth",
+ "name" : "wxAuth",
+ "aliasPath": "/wechat-auth"
+ }
+ ],
"globalStyle": {
"navigationStyle": "custom",
"backgroundColor": "#F5F5F5"
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 950f5f8..75807a3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -57,9 +57,6 @@
}
},
onShow(){
-
- console.log(this.$Route)
-
this.parentId = this.$Route.query.invite || ''
},
methods: {
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 2ed047f..34838d1 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -1,105 +1,90 @@
-
-
-
-
- 上传打款凭证
-
- 提交
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
- {{item.count.stock > 0 ? '剩余名额：' + item.count.residue : '不限名数'}}
-
-
-
-
- {{item.title}}
-
-
-
-
- {{item.title}}
-
-
-
-
- {{item.title}}
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 节点定义
-
- {{identitie[tabsIndex].node_definition}}
-
-
-
-
-
-
- 升级条件
-
-
- {{openCondition.energy_shard.message}}
- {{openCondition.price.message}}
- {{openCondition.service_charge.message}}
-
-
- {{openCondition.price.message}}
-
-
-
-
-
-
-
- 节点权益
-
-
- &{{item.remark}}
-
-
-
-
-
-
-
- 请仔细阅读并确认服务协议
-
-
-
- 会员服务协议
-
-
-
-
-
+}
+// 会员特权
+.privilege {
+ padding: 20rpx 30rpx 80rpx;
+ box-sizing: border-box;
+ .privilege-list {
+ margin-bottom: 50rpx;
+ display: flex;
+ .privilege-img {
+ width: 74rpx;
+ height: 74rpx;
+ }
+ .privilege-text {
+ width: calc(100% - 74rpx);
+ padding-left: 40rpx;
+ font-size: 32rpx;
+ color: #999999;
+ line-height: 52rpx;
+ .privilege-name {
+ font-size: 40rpx;
+ color: #000000;
+ margin: 10rpx 0 20rpx;
+ }
+ .privilege-label.active {
+ color: #f6b338;
+ }
+ .privilege-right {
+ color: #7877eb;
+ }
+ }
+ }
+}
+
+// 用户协议
+.agree {
+ margin: $margin 0;
+ text-align: center;
+ .agree-tips {
+ background-color: #999999;
+ display: inline-block;
+ padding: 14rpx $padding;
+ color: #ffffff;
+ border-radius: 60rpx;
+ }
+}
+.agree-btn {
+ display: flex;
+ font-size: $title-size-lg;
+ text-align: left;
+ color: #999999;
+ padding: $padding;
+}
+
+// .content{
+// min-height: 100vh;
+// background: #fefaef;
+// }
+// 开通须知
+.notice {
+ font-size: $title-size-m;
+ color: $text-gray;
+ padding: $padding $padding * 2 $padding * 2;
+ .title {
+ padding-bottom: $padding/2;
+ font-weight: bold;
+ }
+ .item {
+ padding-bottom: $padding/2;
+ line-height: 40rpx;
+ text-align: justify;
+ }
+}
+// footer
+.footer {
+ padding: 0 $padding;
+ box-sizing: border-box;
+ text-align: center;
+ .footer-btn {
+ width: 74%;
+ }
+}
+// 会员权限
+.privilege {
+ padding: $padding;
+ .title {
+ font-weight: bold;
+ color: #322711;
+ font-size: $title-size;
+ text-align: center;
+ line-height: 90rpx;
+ }
+ .privilege-box {
+ display: flex;
+ flex-wrap: wrap;
+ padding: $padding 0;
+ .item {
+ width: 25%;
+ padding: $padding/2;
+ box-sizing: border-box;
+ text-align: center;
+ .icon {
+ width: 78rpx;
+ height: 78rpx;
+ background: #bd995d;
+ border-radius: 50%;
+ vertical-align: top;
+ }
+ .text {
+ font-size: $title-size-sm;
+ color: #201212;
+ line-height: 60rpx;
+ }
+ }
+ }
+}
+// 会员卡
+.cards {
+ position: relative;
+ background: #1f1b1c;
+ .card {
+ position: relative;
+ margin: 0 $margin;
+ background: linear-gradient(to right, #3b3d4a, #231d1f);
+ padding: 15rpx;
+ border-radius: $radius/2;
+ z-index: 2;
+ .card-content {
+ position: relative;
+ border: solid 1rpx rgba($color: white, $alpha: 0.4);
+ border-radius: $radius/2;
+ padding: 30rpx 180rpx 60rpx 148rpx;
+ min-height: 98rpx;
+ .cover {
+ position: absolute;
+ left: 30rpx;
+ top: 30rpx;
+ width: 98rpx;
+ height: 98rpx;
+ border-radius: 50%;
+ }
+ .user {
+ color: rgba($color: white, $alpha: 0.7);
+ line-height: 58rpx;
+ font-size: $title-size-lg;
+ }
+ .sub-time {
+ line-height: 40rpx;
+ color: #e6ce9e;
+ font-size: $title-size-sm;
+ }
+ .btn {
+ position: absolute;
+ color: #261f0f;
+ background: #e6ce9e;
+ width: 160rpx;
+ border-radius: 30rpx;
+ font-size: $title-size-m;
+ right: 30rpx;
+ top: 50rpx;
+ line-height: 58rpx;
+ text-align: center;
+ }
+ }
+ }
+ .cards-angle {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ z-index: 3;
+ }
+ &::after {
+ content: ' ';
+ height: 70rpx;
+ background: #b29671;
+ position: absolute;
+ width: 100%;
+ bottom: 0;
+ border-radius: $radius/2;
+ z-index: 0;
+ }
+}
+// tabs
+.tabs {
+ background: #1f1b1c;
+ color: white;
+ padding: 0 0 $padding 0;
+ display: flex;
+ justify-content: center;
+ font-size: $title-size-lg;
+ .item {
+ margin: 0 $margin;
+ line-height: 70rpx;
+ height: 70rpx;
+ color: rgba($color: white, $alpha: 0.6);
+ &.show {
+ position: relative;
+ font-weight: bold;
+ font-size: $title-size;
+ color: white;
+ &::after {
+ position: absolute;
+ bottom: 0;
+ left: 20%;
+ width: 60%;
+ height: 6rpx;
+ border-radius: 3rpx;
+ content: ' ';
+ background: white;
+ }
+ }
+ }
+}
+
diff --git a/pages/wxAuth/wxAuth.vue b/pages/wxAuth/wxAuth.vue
new file mode 100644
index 0000000..251602e
--- /dev/null
+++ b/pages/wxAuth/wxAuth.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
diff --git a/router/index.js b/router/index.js
index 4b8717c..2c5b68b 100644
--- a/router/index.js
+++ b/router/index.js
@@ -28,6 +28,12 @@ const router = createRouter({
// 全局路由前置守卫
router.beforeEach((to, from, next) => {
const token = store.getters.getToken || uni.getStorageSync('token')
+ // 检查是否需要微信授权
+ if(store.getters.getCode === '' && to.name != 'wxAuth'){
+ next({
+ name: 'wxAuth'
+ })
+ }
// 检查是否需要登录
if(to.auth && token === ''){
next({
diff --git a/store/index.js b/store/index.js
index 9e3927a..4483f7e 100644
--- a/store/index.js
+++ b/store/index.js
@@ -13,6 +13,7 @@ Vue.use(Vuex)
export default new Vuex.Store({
state: {
token : uni.getStorageSync('token') || '',
+ code : uni.getStorageSync('wxCode') || '',
coupongoods : []
},
getters: {
@@ -21,6 +22,9 @@ export default new Vuex.Store({
},
getCoupongoods: state => {
return state.coupongoods
+ },
+ getCode: state => {
+ return state.code
}
},
mutations: {
@@ -30,6 +34,10 @@ export default new Vuex.Store({
},
setCoupongoods(state, value) {
state.coupongoods = value
+ },
+ setCode(state, value) {
+ state.code = value
+ uni.setStorageSync('wxCode', value)
}
}
})
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index bc22657..1399c72 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
链商星球
\ No newline at end of file
+ document.write('')