diff --git a/src/views/Home.vue b/src/views/Home.vue
index 9a7b133..d013269 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -51,6 +51,7 @@
import Vconsolefrom from 'vconsole';
import * as w6s from 'szient-js-sdk';
import sha1 from 'crypto-js/sha1';
+ import { Loading } from 'vant';
import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest, siqCode} from '../api/Home';
import {showSuccessToast} from "vant";
import 'vant/es/toast/style';
@@ -148,11 +149,12 @@
onMounted(() => {
// console.log(useCommon.phonenumber)
// useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
- new Vconsolefrom();
+ // new Vconsolefrom();
// const access_key = '6374106c5eb449a4ad6c2430f30796e6';
// const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
// generateRandomNumber()
+ console.log(useCommon.firstLoad);
isLoading.value = useCommon.firstLoad;
siqCode(null, success => {
let access_key = "";
@@ -174,61 +176,76 @@
//深i企鉴权测试
// getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
- getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
- console.log(success.data);
- useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
- useCommon.SET_USER_ID(success.data.userId);
- useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
- useCommon.SET_TOKEN(success.data.token);
- console.log(useCommon.userId);
- if(useCommon.firstLoad){
- isLoading.value = false;
- }
- getEnterpriseMerchant(success.data.phonenumber.toString());
- }, error => {
- })
-
- // w6s.config({
- // access_key: access_key,
- // nonce: nonce,
- // timestamp: timestamp,
- // signature: signature,
- // }).then((res) => {
- // // 成功
- // console.log("鉴权", res);
- //
- // }).catch((err) => {
- // // 失败
- // // console.log(err)
- // console.log("鉴权", err);
- // // todo 临时工
- // 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());
- // if(useCommon.firstLoad){
- // isLoading.value = false;
- // }
- // }, error => {
- // console.log("error : " + error)
- // })
- // },
- // fail: function (err) {
- // console.log(err)
- // console.log("认证", err);
- // },
- // });
- // });
+ // getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
+ // console.log(success.data);
+ // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
+ // useCommon.SET_USER_ID(success.data.userId);
+ // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
+ // useCommon.SET_TOKEN(success.data.token);
+ // console.log(useCommon.userId);
+ // console.log(useCommon.firstLoad);
+ // if(useCommon.firstLoad){
+ // isLoading.value = false;
+ // }
+ // //设置已经初始化
+ // useCommon.SET_IS_FIRST_LOAD(false)
+ // getEnterpriseMerchant(success.data.phonenumber.toString());
+ // }, error => {
+ // })
+
+ w6s.config({
+ access_key: access_key,
+ nonce: nonce,
+ timestamp: timestamp,
+ signature: signature,
+ }).then((res) => {
+ // 成功
+ console.log("鉴权", res);
+
+ }).catch((err) => {
+ // 失败
+ // console.log(err)
+ console.log("鉴权", err);
+ // todo 临时工
+ 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);
+ console.log(success.data);
+ // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
+ // useCommon.SET_USER_ID(success.data.userId);
+ // useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
+ useCommon.SET_TOKEN(success.data.token);
+ console.log(useCommon.userId);
+ console.log(useCommon.firstLoad);
+ if(useCommon.firstLoad){
+ isLoading.value = false;
+ }
+ //设置已经初始化
+ useCommon.SET_IS_FIRST_LOAD(false)
+ getEnterpriseMerchant(success.data.phonenumber.toString());
+ if(useCommon.firstLoad){
+ isLoading.value = false;
+ }
+ }, 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)){
@@ -448,5 +465,10 @@
background-size: 100% auto;
}
}
+ .loading-div{
+ position: absolute;
+ top: 45%;
+ left: 48%;
+ }
diff --git a/src/views/enforce/evaluate.vue b/src/views/enforce/evaluate.vue
new file mode 100644
index 0000000..110b8bb
--- /dev/null
+++ b/src/views/enforce/evaluate.vue
@@ -0,0 +1,653 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index d52959a..7aaeedc 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -214,7 +214,7 @@
console.log(success)
//跳转企业二维码地址
if (success.success) {
- showSuccessToast("登记成功")
+ showSuccessToast("投诉成功")
console.log("登记成功");
setTimeout(() => {
goBack();
@@ -222,7 +222,7 @@
}
}, error => {
- console.log("登记失败")
+ console.log("投诉失败")
})
}
//消息提醒
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 87c675f..68513f2 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -28,7 +28,7 @@
+ 生成时间:{{ data.generateTime }}
-
+
@@ -49,7 +49,8 @@ const router = useRouter();
const route = useRoute();
const data = reactive({
qrCodeUrl:"",
- enterpriseName:""
+ enterpriseName:"",
+ generateTime:"",
});
@@ -65,6 +66,7 @@ onMounted(() => {
if(success.success){
data.qrCodeUrl = baseUrl + success.data.qrCodeUrl;
data.enterpriseName = success.data.enterpriseName;
+ data.generateTime = success.data.generateTime;
}
},error =>{
console.log("查询失败")
@@ -255,7 +257,7 @@ const toHisrotyView = () =>{
position: relative;
margin-top: 20%;
.qr_code_img {
- margin: 3% 10%;
+ margin: 1% 10%;
width: 80%;
height: 70%;
}
@@ -263,8 +265,8 @@ const toHisrotyView = () =>{
display: block;
position: relative;
width: 100%;
- color: #999;
- font-size: 0.3rem;
+ // color: #999;
+ font-size: 0.4rem;
text-align: center;
line-height: 3;
}