@@ -126,7 +126,8 @@
let fullUrl = window.location.href;
let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
let paramUrl = window.location.href.split("#")[0];
- let param = {code: code, url: fullUrl};
+ let param = {code: code, url: paramUrl};
+ console.log(paramUrl);
szyptGetToken(param, success => {
let resMsg = success.data;
console.log(resMsg);
@@ -149,7 +150,7 @@
ClickScan()
});
wx.error((res) => {
- console.log("获取失败", res);
+ console.log("获取失败");
});
}, error => {
});
@@ -170,7 +171,7 @@
router.push({
path: "/enterpriseScanPreview",
query: {
- enterpriseNumber: success.data.salt,
+ enterpriseNumber: success.data.enterpriseNumber,
isNoScan: false
}
})
@@ -214,7 +215,7 @@
cancel: (res) => {
console.log('err', res);
},
-
+
});
};
@@ -245,9 +246,6 @@
freshMap.listFinished = false;
freshMap.listLoading = true;
freshMap.refreshLoad = true;
- // Promise.all([getCarousel(), boutiqueGoods(), recommendGoods()]).then(() => {
- // freshMap.refreshLoad = false;
- // });
};
// 触底加载
@@ -255,15 +253,9 @@
// recommendGoods(true);
};
- // onMounted(() => {
- // // new Vconsole();
- // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber}, success => {
- // if (success.data != null && success.data.length > 0) {
- // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
- // }
- // }, error => {
- // })
- // })
+ onMounted(() => {
+ // new Vconsole();
+ })
// 返回
const goBack = () => {
@@ -359,7 +351,7 @@ export default {
.boutique_box {
position: relative;
- top: 10%;
+ top: 25%;
z-index: 100;
width: 100%;
@@ -373,7 +365,7 @@ export default {
.box-qr-code {
width: 52%;
text-align: right;
- height: 7rem;
+ height: 6rem;
//background-color: var(--van-primary-color);
background: url("../../assets/images/scan-btn.jpg") no-repeat center center;
background-size: 100%;
@@ -400,6 +392,7 @@ export default {
}
.white-body {
+ position: relative;
margin: 0 3%;
width: 94%;
height: 99%;
@@ -408,10 +401,212 @@ export default {
}
.nocode {
+ margin: 15% 0 0;
width: 100%;
color: #fb7905;
font-size: 0.42rem;
text-align: center;
- line-height: 3;
+ line-height: 5;
+ }
+
+ .scan-note {
+ width: 100%;
+ color: #d3d0d0;
+ font-size: 0.35rem;
+ text-align: center;
+ line-height: 2;
+ }
+
+ .popup {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.35);
+ }
+
+ .popup-content {
+ position: fixed;
+ z-index: 999;
+ bottom: 0;
+ left: 0;
+ padding: 0 3%;
+ width: 94%;
+ height: 35vh;
+ background: #fff;
+ overflow-y: auto;
+ font-size: 0.37rem;
+ }
+
+ .subtitle {
+ margin: 5% 2% 2%;
+ width: 96%;
+ /*font-size: 0.4rem;
+ font-weight: 600;*/
+ border-bottom: 1px solid #f4f4f4;
+ line-height: 2;
+ }
+
+ .item-btn {
+ float: left;
+ margin: 0.3rem 0.2rem;
+ padding: 0.2rem 0.3rem;
+ background-color: #f2f3f4;
+ color: #999;
+ border-radius: 1rem;
+ font-size: 0.35rem;
+ }
+
+ .item-btn.active {
+ background-color: #e9f2fb;
+ color: #1367fe;
+ }
+
+ .btnbox {
+ display: flex;
+ justify-content: center;
+ position: absolute;
+ bottom: 1rem;
+ left: 5%;
+ width: 90%;
+ height: 1rem;
+ }
+
+ .btn-reset {
+ display: inline-block;
+ margin: 0 2%;
+ padding: 0;
+ width: 60%;
+ color: #fff;
+ font-size: 0.35rem;
+ border-radius: 1rem;
+ background: #1367fe;
+ border: 1px solid #1367fe;
+ text-align: center;
+ }
+
+ .btn-search {
+ display: inline-block;
+ margin: 3% 7%;
+ padding: 0;
+ width: 70%;
+ color: #fff;
+ font-size: 0.35rem;
+ border-radius: 1rem;
+ background: #1367fe;
+ border: 1px solid #1367fe;
+ text-align: center;
+ height: 90%;
+ }
+
+ .btn-reset {
+ width: 35%;
+ background-color: #fff;
+ border-color: rgba(19, 103, 254, .7);
+ color: #1367fe;
+ }
+
+ .close-button {
+ position: absolute;
+ top: 0.15rem;
+ right: 0.1rem;
+ width: 0.8rem;
+ height: 0.8rem;
+ background-color: rgba(255, 255, 255, .5);
+ border: 0.05rem solid rgba(255, 255, 255, .7);
+ border-radius: 50%;
+ transform: rotate(45deg);
}
+
+ .close-button:before,
+ .close-button:after {
+ content: '';
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ background: #333;
+ border-radius: 50%;
+ transform: translate(-50%, -50%);
+ height: 0.4rem;
+ width: 0.02rem;
+ }
+
+ .close-button:after {
+ height: 0.02rem;
+ width: 0.4rem;
+ }
+
+ .nav-div {
+ display: flex;
+ margin: 15% 2% 0;
+ width: 96%;
+ color: #287eef;
+ font-size: 0.4rem;
+ line-height: 2;
+ text-align: center;
+ }
+
+ .nav-div > div {
+ margin: 2% 3%;
+ width: 45%;
+ }
+
+ .nav-div div span{
+ display: block;
+ }
+
+ .nav-div div i {
+ margin: 0.35rem;
+ width: 1.5rem;
+ height: 1.5rem;
+ font-size: 0.8rem;
+ background: #e6eff7;
+ border-radius: 50%;
+ text-align: center;
+ line-height: 1.85;
+ }
+
+ .nav-div .act-note {
+ margin: 10% 0 0;
+ width: 100%;
+ font-size: 0.3rem;
+ color: #d3d0d0;
+ line-height: 1.5;
+ text-align: left;
+ }
+
+ .addinfo {
+ position: absolute;
+ bottom: 2rem;
+ right: 2%;
+ z-index: 999;
+ width: 1.5rem;
+ height: 1.5rem;
+ background-color: #e0e9f9;
+ border-radius: 50%;
+ box-shadow: 0 0 0.27rem #90b6f9;
+ color: #0240f7;
+ font-size: 0.4rem;
+ text-align: center;
+ vertical-align: middle;
+ padding-top: 0.45rem;
+ box-sizing: border-box;
+ }
+
+ .record {
+ position: absolute;
+ bottom: 2rem;
+ color: #bbbaba;
+ font-size: 0.35rem;
+ width: 100%;
+ text-align: center;
+ white-space: nowrap;
+ }
+
+ .record a {
+ color: #287eef;
+ }
+
+
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index cec4c5d..bee7c53 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -1,5 +1,5 @@
-
+