From 79723019142f2325fd76f4b184ba95c1ead0d48c Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 19 Jun 2024 17:10:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E6=94=B9?= =?UTF-8?q?=E6=88=90=E6=A3=80=E6=9F=A5=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/lawFilter.vue | 2 +- src/views/enforce/sign.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/enforce/lawFilter.vue b/src/views/enforce/lawFilter.vue index 7b9503b..0f98521 100644 --- a/src/views/enforce/lawFilter.vue +++ b/src/views/enforce/lawFilter.vue @@ -18,7 +18,7 @@
企业名：{{ item.enterpriseName }}
-
执法项：{{ item.checkItem }}
+
执法事项：{{ item.checkItem }}
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index de21190..33cbb7b 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -110,7 +110,7 @@ Date: Wed, 19 Jun 2024 18:00:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=81=94=E5=90=88=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointment.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 6745453..6345809 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -107,7 +107,6 @@ rows="2" autosize type="textarea" - maxlength="50" placeholder="请选择" show-word-limit readonly From ca6cc1b873afb049f619f63110e90869d404cb86 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Wed, 19 Jun 2024 18:14:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8C=85=E8=A3=B9=E4=B8=80=E5=B1=82code?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Home.js | 3 +- src/views/Home.vue | 420 +++++++++++++++++++++++---------------------- 2 files changed, 219 insertions(+), 204 deletions(-) diff --git a/src/api/Home.js b/src/api/Home.js index 238ec60..5b4902b 100644 --- a/src/api/Home.js +++ b/src/api/Home.js @@ -18,4 +18,5 @@ export const getSiqLoginAuthTest = (params, success, error) => _post("/app/third export const getSzyptLoginAuth = (code, success, error) => _get("/app/thirdLogin/szyptLogin/"+code,null,success,error); export const szyptGetToken = (params, success, error) => _get("/app/thirdLogin/szyptGetToken",params,success,error); - +// 获取包裹的数据 +export const siqCode = (params, success, error) => _get("/app/thirdLogin/getSiqCode",params,success,error); diff --git a/src/views/Home.vue b/src/views/Home.vue index 0be5572..512459e 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -50,7 +50,7 @@ import Vconsolefrom from 'vconsole'; import * as w6s from 'szient-js-sdk'; import sha1 from 'crypto-js/sha1'; - import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest} from '../api/Home'; + import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home'; import {showSuccessToast} from "vant"; import 'vant/es/toast/style'; @@ -149,38 +149,46 @@ // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber); // new Vconsolefrom(); - const access_key = '6374106c5eb449a4ad6c2430f30796e6'; - const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f'; + // const access_key = '6374106c5eb449a4ad6c2430f30796e6'; + // const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f'; // generateRandomNumber() - const nonce = generateRandomNumber(); - const timestamp = `${Date.now()}`; - - const str = [access_secret, nonce, timestamp] - .sort() - .reduce((str, item) => str += item, ''); - - // 最终还需要转成全小写 - const signature = sha1(str).toString().toLowerCase(); - - // //深i企鉴权测试 - // getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"},success =>{ - // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); - // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); - // console.log("phone : "+useCommon.phonenumber); - // },error =>{}) - - w6s.config({ - access_key: access_key, - nonce: nonce, - timestamp: timestamp, - signature: signature, - }) - .then((res) => { + + siqCode(null, success => { + let access_key = ""; + let access_secret = ""; + if (success.success) { + access_key = success.data.accessKey; + access_secret = success.data.accessSecret; + } + + const nonce = generateRandomNumber(); + const timestamp = `${Date.now()}`; + + const str = [access_secret, nonce, timestamp] + .sort() + .reduce((str, item) => str += item, ''); + + // 最终还需要转成全小写 + const signature = sha1(str).toString().toLowerCase(); + + //深i企鉴权测试 + // getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => { + // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); + // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); + // console.log("phone : " + useCommon.phonenumber); + // }, error => { + // }) + + w6s.config({ + access_key: access_key, + nonce: nonce, + timestamp: timestamp, + signature: signature, + }).then((res) => { // 成功 console.log("鉴权", res); - }) - .catch((err) => { + }).catch((err) => { // 失败 // console.log(err) console.log("鉴权", err); @@ -188,35 +196,38 @@ getEnterpriseMerchant(useCommon.phonenumber.toString()); }); - w6s.ready(() => { - w6s.szient.getAuthCode({ - success: function (res) { - console.log(res) - console.log("认证", res); - console.log("code: " + res.result.result.code); - getSiqLoginAuth({code: res.result.result.code}, success => { - useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); - useCommon.SET_USER_ID(success.data.userId); - useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); - getEnterpriseMerchant(success.data.phonenumber.toString()); - }, error => { - console.log("error : " + error) - }) - }, - fail: function (err) { - console.log(err) - console.log("认证", err); - }, + w6s.ready(() => { + w6s.szient.getAuthCode({ + success: function (res) { + console.log(res) + console.log("认证", res); + console.log("code: " + res.result.result.code); + getSiqLoginAuth({code: res.result.result.code}, success => { + useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); + useCommon.SET_USER_ID(success.data.userId); + useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); + getEnterpriseMerchant(success.data.phonenumber.toString()); + }, error => { + console.log("error : " + error) + }) + }, + fail: function (err) { + console.log(err) + console.log("认证", err); + }, + }); }); - }); - // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{ - // if(!(success.data == null && success.data.length == 0)){ - // console.log("success.data[0].enterpriseNumber :" + success.data[0].enterpriseNumber) - // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber); - // } - // },error =>{ - // }) + // getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{ + // if(!(success.data == null && success.data.length == 0)){ + // console.log("success.data[0].enterpriseNumber :" + success.data[0].enterpriseNumber) + // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber); + // } + // },error =>{ + // }) + + + }); }); @@ -229,14 +240,14 @@ background-color: #f4f4f4; .warp_body { - position: relative; - margin: 0; - width: 100%; - height: 100%; - background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; - background-size: auto 100%; - overflow-x: hidden; - overflow-y: auto; + position: relative; + margin: 0; + width: 100%; + height: 100%; + background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; + background-size: auto 100%; + overflow-x: hidden; + overflow-y: auto; .carousel_box { height: 4rem; @@ -247,149 +258,152 @@ } - .boutique_box { - position: absolute; - width: 100%; - bottom: 1%; + .boutique_box { + position: absolute; + width: 100%; + bottom: 1%; - .boutique_body { - padding: 0 0 0.27rem 0; - display: flex; - justify-content: center; - } + .boutique_body { + padding: 0 0 0.27rem 0; + display: flex; + justify-content: center; + } - .box-qr-code { - position: relative; - margin: 2% 0; - width: 90%; - height: 3.67rem; - text-align: right; - border-radius: 0.27rem; + .box-qr-code { + position: relative; + margin: 2% 0; + width: 90%; + height: 3.67rem; + text-align: right; + border-radius: 0.27rem; + + .box-qr-code-text { + position: absolute; + z-index: 10; + top: 0.35rem; + right: 0.35rem; + display: block; + font-size: 0.5rem; + } + } - .box-qr-code-text { - position: absolute; - z-index: 10; - top: 0.35rem; - right: 0.35rem; - display: block; - font-size: 0.5rem; - } - } - .box-qr-code::before { - content: ""; - position: absolute; - top: -0.14rem; - left: -0.14rem; - z-index: 0; - width: calc(100% + 0.13rem); - height: calc(100% + 0.13rem); - background-color: #fff; - border: 0.14rem solid rgba(255,255,255,0.5); - border-radius: 0.27rem; - } + .box-qr-code::before { + content: ""; + position: absolute; + top: -0.14rem; + left: -0.14rem; + z-index: 0; + width: calc(100% + 0.13rem); + height: calc(100% + 0.13rem); + background-color: #fff; + border: 0.14rem solid rgba(255, 255, 255, 0.5); + border-radius: 0.27rem; + } - .box-qr-code::after { - content: ""; - position: absolute; - top: 0; - left: 0; - z-index: 1; - width: 100%; - height: 100%; - border-radius: 0.27rem; - background: #fff url("../assets/images/item_code.jpg") no-repeat left; - background-size: auto 100%; - border: 1px solid #8db4ff; - } + .box-qr-code::after { + content: ""; + position: absolute; + top: 0; + left: 0; + z-index: 1; + width: 100%; + height: 100%; + border-radius: 0.27rem; + background: #fff url("../assets/images/item_code.jpg") no-repeat left; + background-size: auto 100%; + border: 1px solid #8db4ff; + } - .box-info { - position: relative; - margin-right: 2%; - width: 50%; - height: 3.67rem; - text-align: right; - border-radius: 0.27rem; + .box-info { + position: relative; + margin-right: 2%; + width: 50%; + height: 3.67rem; + text-align: right; + border-radius: 0.27rem; + + .box-info-text { + position: absolute; + z-index: 10; + top: 0.35rem; + right: 0.35rem; + display: block; + font-size: 0.5rem; + } + } - .box-info-text { - position: absolute; - z-index: 10; - top: 0.35rem; - right: 0.35rem; - display: block; - font-size: 0.5rem; - } - } - .box-info::before { - content: ""; - position: absolute; - top: -0.14rem; - left: -0.14rem; - z-index: 0; - width: calc(100% + 0.13rem); - height: calc(100% + 0.13rem); - background-color: #fff; - border: 0.14rem solid rgba(255,255,255,0.5); - border-radius: 0.27rem; - } + .box-info::before { + content: ""; + position: absolute; + top: -0.14rem; + left: -0.14rem; + z-index: 0; + width: calc(100% + 0.13rem); + height: calc(100% + 0.13rem); + background-color: #fff; + border: 0.14rem solid rgba(255, 255, 255, 0.5); + border-radius: 0.27rem; + } + + .box-info::after { + content: ""; + position: absolute; + top: 0; + left: 0; + z-index: 1; + width: 100%; + height: 100%; + border-radius: 0.27rem; + background: #fff url("../assets/images/item_checkc.jpg") no-repeat left; + background-size: auto 100%; + border: 1px solid #8db4ff; + } - .box-info::after { - content: ""; - position: absolute; - top: 0; - left: 0; - z-index: 1; - width: 100%; - height: 100%; - border-radius: 0.27rem; - background: #fff url("../assets/images/item_checkc.jpg") no-repeat left; - background-size: auto 100%; - border: 1px solid #8db4ff; + .box-complaint { + position: relative; + margin-left: 3%; + width: 35%; + height: 3.67rem; + text-align: right; + border-radius: 0.27rem; + + .box-complaint-text { + position: absolute; + z-index: 10; + top: 0.35rem; + right: 0.35rem; + display: block; + font-size: 0.5rem; + } + } } - .box-complaint { - position: relative; - margin-left: 3%; - width: 35%; - height: 3.67rem; - text-align: right; - border-radius: 0.27rem; + .box-complaint::before { + content: ""; + position: absolute; + top: -0.14rem; + left: -0.14rem; + z-index: 0; + width: calc(100% + 0.13rem); + height: calc(100% + 0.13rem); + background-color: #fff; + border: 0.14rem solid rgba(255, 255, 255, 0.5); + border-radius: 0.27rem; + } - .box-complaint-text { + .box-complaint::after { + content: ""; position: absolute; - z-index: 10; - top: 0.35rem; - right: 0.35rem; - display: block; - font-size: 0.5rem; - } + top: 0; + left: 0; + z-index: 1; + width: 100%; + height: 100%; + border-radius: 0.27rem; + background: #fff url("../assets/images/item_complain.jpg") no-repeat left; + background-size: auto 100%; + border: 1px solid #8db4ff; } - } - .box-complaint::before { - content: ""; - position: absolute; - top: -0.14rem; - left: -0.14rem; - z-index: 0; - width: calc(100% + 0.13rem); - height: calc(100% + 0.13rem); - background-color: #fff; - border: 0.14rem solid rgba(255,255,255,0.5); - border-radius: 0.27rem; - } - - .box-complaint::after { - content: ""; - position: absolute; - top: 0; - left: 0; - z-index: 1; - width: 100%; - height: 100%; - border-radius: 0.27rem; - background: #fff url("../assets/images/item_complain.jpg") no-repeat left; - background-size: auto 100%; - border: 1px solid #8db4ff; - } .recommend_box { .recommend_body { @@ -410,17 +424,17 @@ } @media screen and (max-width: 380px) { - .home .warp_body { - background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; - background-size: 100% auto; - } + .home .warp_body { + background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; + background-size: 100% auto; + } } @media screen and (min-width: 540px) { - .home .warp_body { - background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; - background-size: 100% auto; - } + .home .warp_body { + background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; + background-size: 100% auto; + } } From 7d84afedf8b1294357db7f8f6cf5070bddcb1675 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 20 Jun 2024 15:44:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8D=E5=BC=BA=E5=88=B6=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=A2=84=E7=BA=A6=E6=A3=80=E6=9F=A5=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/sign.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 33cbb7b..8ea6b7c 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -114,8 +114,6 @@ maxlength="50" placeholder="请选择" readonly - required - :rules="[{ required: true, message: '必填项' }]" @click="data.lawChecked=true" />