diff --git a/frontend/app-employee/api/gas.js b/frontend/app-employee/api/gas.js
index 7c280d0..763e818 100644
--- a/frontend/app-employee/api/gas.js
+++ b/frontend/app-employee/api/gas.js
@@ -71,7 +71,23 @@ export function savaLiquefiedGasBottle(data) {
data: data
})
}
+//判断扫码的二维码是气瓶二维码还是员工二维码
+export function judgeGasOrBottle(params) {
+ return request({
+ url: '/manage/qpxx/v1/getQRCode',
+ method: 'get',
+ params:params
+ })
+}
+//获取用户详细信息的接口
+export function userDetailInfoPort(params) {
+ return request({
+ url: '/user/wYgxx/v1/getYgxxByScanCode',
+ method: 'get',
+ params:params
+ })
+}
export default {
@@ -82,5 +98,7 @@ export default {
getliquefiedGasBottle,
gasReceiveQp,
submitQpcrk,
- savaLiquefiedGasBottle
+ savaLiquefiedGasBottle,
+ judgeGasOrBottle,
+ userDetailInfoPort
}
\ No newline at end of file
diff --git a/frontend/app-employee/pages.json b/frontend/app-employee/pages.json
index fdb3ab7..874711e 100644
--- a/frontend/app-employee/pages.json
+++ b/frontend/app-employee/pages.json
@@ -49,6 +49,14 @@
"navigationStyle": "custom"
}
},
+ // 员工扫二维码跳转
+ {
+ "path": "pages/scanCodeUserInfo/index",
+ "style": {
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
+ }
+ },
// 用户详情
{
"path": "pages/userInfo/index",
diff --git a/frontend/app-employee/pages/scan/scanCode.vue b/frontend/app-employee/pages/scan/scanCode.vue
index 5bd04df..a7e9c95 100644
--- a/frontend/app-employee/pages/scan/scanCode.vue
+++ b/frontend/app-employee/pages/scan/scanCode.vue
@@ -178,47 +178,60 @@
qptm: code,
// lx:'ckxx',
}
- // const result = await this.$api.gasApi.getDetailByQuery(query);
- this.queryParams.qptm = code;
- let result = null;
- if(this.mode === 1){
- result = await this.$api.gasApi.getDetailByQuery(query);
- }else{
- result = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);
- }
- // const result = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);
- // console.log("查询参数", query);
- that.$modal.closeLoading();
- let {
- state,
- message,
- value
- } = result;
- console.log('打印扫描气瓶二维码value',value);
- if (!state) {
- uni.$u.toast(message);
- setTimeout(() => {
- that.componentKey += 1;
- that.$forceUpdate()
- }, 1000)
- return;
- }
- if (this.mode === 1) {
- uni.redirectTo({
- url: '/pages/home/appList/gasInformation/gasInformation?qptm=' + value.fQptm
- })
- } else if (this.mode === 2) {
- let fQptm = value.fQptm;
- // let fQptmObj = JSON.stringify(value);
- let fQptmObj = value;
- //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
- console.log("模式2");
- let fQpgg = value.fQpgg;
- console.log("气瓶规格",fQpgg);
- let name = that.pathName;
- uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
- this.closeScan();
- }
+ await this.$api.gasApi.judgeGasOrBottle({code:code}).then(async (res)=>{
+ const { type } = res.value;
+ if(!type){
+ uni.$u.toast('二维码编号错误!');
+ return;
+ }
+ // const result = await this.$api.gasApi.getDetailByQuery(query);
+ this.queryParams.qptm = code;
+ let result1 = null;
+ if(this.mode === 1){
+ result1 = await this.$api.gasApi.getDetailByQuery(query);
+ }else{
+ result1 = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);
+ }
+ // const result = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);
+ // console.log("查询参数", query);
+ that.$modal.closeLoading();
+ let {
+ state,
+ message,
+ value
+ } = result1;
+ console.log('打印扫描气瓶二维码value',value);
+ if (!state) {
+ uni.$u.toast(message);
+ setTimeout(() => {
+ that.componentKey += 1;
+ that.$forceUpdate()
+ }, 1000)
+ return;
+ }
+ if (this.mode === 1) {
+ if(type=='qp'){
+ uni.redirectTo({
+ url: '/pages/home/appList/gasInformation/gasInformation?qptm=' + value.fQptm
+ })
+ }else{
+ uni.redirectTo({
+ url: '/pages/scanCodeUserInfo/index?ygbh=' + code
+ })
+ }
+ } else if (this.mode === 2) {
+ let fQptm = value.fQptm;
+ // let fQptmObj = JSON.stringify(value);
+ let fQptmObj = value;
+ //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
+ console.log("模式2");
+ let fQpgg = value.fQpgg;
+ console.log("气瓶规格",fQpgg);
+ let name = that.pathName;
+ uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
+ this.closeScan();
+ }
+ })
},
// 传递code模式关闭扫码
closeScan() {
diff --git a/frontend/app-employee/pages/scanCodeUserInfo/components/functionCard.vue b/frontend/app-employee/pages/scanCodeUserInfo/components/functionCard.vue
new file mode 100644
index 0000000..f8c9d14
--- /dev/null
+++ b/frontend/app-employee/pages/scanCodeUserInfo/components/functionCard.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+ {{item.title}}
+ {{item.direction}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/app-employee/pages/scanCodeUserInfo/components/userInfoCard.vue b/frontend/app-employee/pages/scanCodeUserInfo/components/userInfoCard.vue
new file mode 100644
index 0000000..4bc2ba1
--- /dev/null
+++ b/frontend/app-employee/pages/scanCodeUserInfo/components/userInfoCard.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+ {{userInfo.name}}
+ {{userInfo.address}}
+
+
+
+ {{userInfo.phone}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/app-employee/pages/scanCodeUserInfo/index.vue b/frontend/app-employee/pages/scanCodeUserInfo/index.vue
new file mode 100644
index 0000000..2df3659
--- /dev/null
+++ b/frontend/app-employee/pages/scanCodeUserInfo/index.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/app-employee/static/images/appList/otherImg/bluePhone.png b/frontend/app-employee/static/images/appList/otherImg/bluePhone.png
new file mode 100644
index 0000000..42792b1
Binary files /dev/null and b/frontend/app-employee/static/images/appList/otherImg/bluePhone.png differ
diff --git a/frontend/app-employee/static/images/appList/otherImg/order.png b/frontend/app-employee/static/images/appList/otherImg/order.png
new file mode 100644
index 0000000..8a74fd7
Binary files /dev/null and b/frontend/app-employee/static/images/appList/otherImg/order.png differ
diff --git a/frontend/app-employee/static/images/appList/otherImg/phone-fill.png b/frontend/app-employee/static/images/appList/otherImg/phone-fill.png
new file mode 100644
index 0000000..c16812f
Binary files /dev/null and b/frontend/app-employee/static/images/appList/otherImg/phone-fill.png differ
diff --git a/frontend/app-employee/static/images/appList/otherImg/shoppingCart.png b/frontend/app-employee/static/images/appList/otherImg/shoppingCart.png
new file mode 100644
index 0000000..5a1483e
Binary files /dev/null and b/frontend/app-employee/static/images/appList/otherImg/shoppingCart.png differ
diff --git a/frontend/app-employee/static/images/appList/otherImg/smokeAlarm.png b/frontend/app-employee/static/images/appList/otherImg/smokeAlarm.png
new file mode 100644
index 0000000..fff0b82
Binary files /dev/null and b/frontend/app-employee/static/images/appList/otherImg/smokeAlarm.png differ
diff --git a/frontend/app-employee/static/images/mine/userInfo.png b/frontend/app-employee/static/images/mine/userInfo.png
new file mode 100644
index 0000000..ec24f7e
Binary files /dev/null and b/frontend/app-employee/static/images/mine/userInfo.png differ
diff --git a/frontend/app-employee/utils/ruoyi.js b/frontend/app-employee/utils/ruoyi.js
index ec4cd5d..b44132d 100644
--- a/frontend/app-employee/utils/ruoyi.js
+++ b/frontend/app-employee/utils/ruoyi.js
@@ -352,6 +352,7 @@ export function assignValues(obj, arr) {
const updatedArr = arr.map(item => {
item.value = obj[item.key];
return {
+ imgSrc:item.imgSrc?item.imgSrc:'',
type: item.type ? item.type : '',
imgIcon: item.imgIcon ? item.imgIcon : '',
name: item.name,
diff --git a/frontend/app-user/api/gas.js b/frontend/app-user/api/gas.js
index 3004809..c8289bf 100644
--- a/frontend/app-user/api/gas.js
+++ b/frontend/app-user/api/gas.js
@@ -1,5 +1,6 @@
import request from '@/utils/request.js'
+//获取气瓶的气瓶条码接口
export function getDetailByQuery(params) {
return request({
url: '/user/gasBottle/getDetailByQuery',
@@ -24,7 +25,23 @@ export function savewQpxx(data) {
data:data
})
}
+//判断扫码的二维码是气瓶二维码还是员工二维码
+export function judgeGasOrBottle(params) {
+ return request({
+ url: '/manage/qpxx/v1/getQRCode',
+ method: 'get',
+ params:params
+ })
+}
+//获取用户详细信息的接口
+export function userDetailInfoPort(params) {
+ return request({
+ url: '/user/wYgxx/v1/getYgxxByScanCode',
+ method: 'get',
+ params:params
+ })
+}
@@ -34,5 +51,7 @@ export default {
// getwQplxlist,
getwQpxxDetail,
getDetailByQuery,
- savewQpxx
+ savewQpxx,
+ judgeGasOrBottle,
+ userDetailInfoPort
}
diff --git a/frontend/app-user/pages/mine/appList/realNameAuth/components/enterprise.vue b/frontend/app-user/pages/mine/appList/realNameAuth/components/enterprise.vue
index 2de8c52..90f61f2 100644
--- a/frontend/app-user/pages/mine/appList/realNameAuth/components/enterprise.vue
+++ b/frontend/app-user/pages/mine/appList/realNameAuth/components/enterprise.vue
@@ -14,7 +14,7 @@
@click="previewPicture(picture[0].temp)">
-
+
@@ -29,7 +29,7 @@
@click="previewPicture(picture[1].temp)">
-
+
@@ -61,7 +61,7 @@
@click="previewPicture(picture[2].temp)" height="108rpx">
-
+
@@ -76,7 +76,7 @@
@click="previewPicture(picture[3].temp)" height="108rpx">
-
+
@@ -93,7 +93,7 @@
@click="previewPicture(picture[4].temp)">
-
+
@@ -108,7 +108,7 @@
@click="previewPicture(picture[5].temp)">
-
+
@@ -137,45 +137,45 @@
-
+
-
+
-
-
+
-
+
-
+
-
-
+
+
-
-
- 清空
+
-
-
+
+
@@ -219,8 +219,12 @@
await this.getLocation();
}
console.log('打印是否出发这个事件',this.optionsInfo.fRzzt)
- if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中'){
+ if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中' || this.optionsInfo.fRzzt == '认证未通过'){
this.getRealNameDetail();
+ this.canEditBtn = true;
+ if(this.optionsInfo.fRzzt == '认证未通过'){
+ this.canEditBtn = false;
+ }
}
console.log('打印是否出阿飞this.addJd',this.adsJd,this.adsWd)
await this.getStoreList();
@@ -230,6 +234,7 @@
return {
pickShow: false,
dateShow: false,
+ canEditBtn:false,
date: Number(new Date()),
enterpriseObj: {
name: "",
@@ -329,11 +334,17 @@
});
}
this.enterpriseObj.fSsczmc = value.fSsczmc;
- this.enterpriseObj.name = value.fHync;
+ this.enterpriseObj.name = value.fXm;
this.enterpriseObj.age = value.fNl;
this.enterpriseObj.sex = value.fXb;
this.enterpriseObj.phone = value.fSjh;
- this.enterpriseObj.industryAndCommerce = value.fSfzhyxq;
+ this.enterpriseObj.idcard = value.fSfzh;
+ this.enterpriseObj.industryAndCommerce = value.fSymc;
+ let date = value.fSfzhyxq?value.fSfzhyxq.substring(0,10):'';
+ console.log('打印date',date);
+ this.enterpriseObj.termOfValidity = date;
+ this.enterpriseObj.socialUnifiedCreditCode = value.fShtysbm;
+ this.enterpriseObj.fSsczID = value.fSsczID;
},
//获取当前的定位
getLocation() {
@@ -392,7 +403,8 @@
// });
let mcArrayList = this.storeList.map((item)=>item.fCzmc);
this.columns = [mcArrayList];
- console.log('打印this.c',this.columns)
+ console.log('打印this.c',this.columns);
+ break;
}
},
//选择器确认的事件
diff --git a/frontend/app-user/pages/mine/appList/realNameAuth/components/resident.vue b/frontend/app-user/pages/mine/appList/realNameAuth/components/resident.vue
index f5c1c53..3829f49 100644
--- a/frontend/app-user/pages/mine/appList/realNameAuth/components/resident.vue
+++ b/frontend/app-user/pages/mine/appList/realNameAuth/components/resident.vue
@@ -25,7 +25,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
@@ -66,33 +66,33 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -126,6 +126,7 @@
watch: {},
data() {
return {
+ canEditBtn:false,
picture:[],
idCardObj: {
name: "",
@@ -173,8 +174,12 @@
await this.getLocation();
}
console.log('打印this.options',this.optionsInfo);
- if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中'){
+ if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中' || this.optionsInfo.fRzzt == '认证未通过'){
this.getRealNameDetail();
+ this.canEditBtn = true;
+ if(this.optionsInfo.fRzzt == '认证未通过'){
+ this.canEditBtn = false;
+ }
}
console.log('打印是否出阿飞this.addJd',this.adsJd,this.adsWd)
await this.getStoreList();
@@ -188,7 +193,34 @@
const reseult= await this.$api.realNameAuthApi.realNameDetailInfoPort(this.optionsInfo.id);
console.log('打印Result',reseult);
const { value } = reseult;
- this.detailInfo = value;
+ if(value.fSfzghy){
+ let sfzghImg = JSON.parse(value.fSfzghy);
+ console.log('打印Result',sfzghImg);
+ let sfzghImgUrl = await this.$getPhotoUrl(sfzghImg[0].response.fileId);
+ this.$set(this.picture,1,{
+ temp:sfzghImgUrl,
+ fileId:sfzghImg[0].response.fileId,
+ fileObj: JSON.stringify(sfzghImg)
+ });
+ }
+ if(value.fSfzrxy){
+ let sfzrxImg = JSON.parse(value.fSfzrxy);
+ let sfzrxImgUrl = await this.$getPhotoUrl(sfzrxImg[0].response.fileId);
+ this.$set(this.picture,0,{
+ temp:sfzrxImgUrl,
+ fileId:sfzrxImg[0].response.fileId,
+ fileObj: JSON.stringify(sfzrxImg)
+ });
+ }
+ this.idCardObj.name = value.fXm;
+ this.idCardObj.phone = value.fSjh;
+ this.idCardObj.sex = value.fXb;
+ this.idCardObj.age = value.fNl;
+ this.idCardObj.idcard = value.fSfzh;
+ let date = value.fSfzhyxq?value.fSfzhyxq.substring(0,10):'';
+ this.idCardObj.termOfValidity = date;
+ this.idCardObj.fSsczmc = value.fSsczmc;
+ this.idCardObj.fSsczID = value.fSsczID;
},
//获取当前的定位
getLocation() {
@@ -314,6 +346,7 @@
.idCardWarp {
background: #F4F5F8;
+ //background: #ffffff;
border-radius: 10rpx;
padding: 0 24rpx;
}
diff --git a/frontend/app-user/pages/mine/appList/realNameAuth/realNameMode.vue b/frontend/app-user/pages/mine/appList/realNameAuth/realNameMode.vue
index e8abf11..b85878d 100644
--- a/frontend/app-user/pages/mine/appList/realNameAuth/realNameMode.vue
+++ b/frontend/app-user/pages/mine/appList/realNameAuth/realNameMode.vue
@@ -52,15 +52,24 @@
components: {
basisCellCard
},
- onLoad(){
+ onLoad(routeData){
+ console.log('打印options',routeData)
+ if(routeData.option){
+ this.options = JSON.parse(routeData.option);
+ }
+ if(routeData && routeData.mode){
+ this.handleToAuth(routeData.mode);
+ }
},
data() {
- return {};
+ return {
+ options:{}
+ };
},
methods: {
handleToAuth(mode) {
uni.navigateTo({
- url: '/pages/mine/appList/realNameAuth/realNameAuthentication?mode=' + mode
+ url: `/pages/mine/appList/realNameAuth/realNameAuthentication?mode=${mode}&option=${JSON.stringify(this.options)}`
})
}
}
diff --git a/frontend/app-user/pages/mine/components/commonApplications.vue b/frontend/app-user/pages/mine/components/commonApplications.vue
index 9d0b3ce..a784de9 100644
--- a/frontend/app-user/pages/mine/components/commonApplications.vue
+++ b/frontend/app-user/pages/mine/components/commonApplications.vue
@@ -155,7 +155,7 @@
});
},
goToAppPage(app) {
- console.log(app);
+ console.log('打印goToAppPage',app);
if (this.appList[app].path) {
let toUrl = this.appList[app].path;
let urlName = this.appList[app].name
diff --git a/frontend/app-user/pages/mine/mine.vue b/frontend/app-user/pages/mine/mine.vue
index 92a5aaf..ca9a5d0 100644
--- a/frontend/app-user/pages/mine/mine.vue
+++ b/frontend/app-user/pages/mine/mine.vue
@@ -201,11 +201,12 @@
fHylx:this.user.userInfo.fHylx?this.user.userInfo.fHylx:'',
id:this.user.userInfo.id?this.user.userInfo.id:''
}
- if(this.user.userInfo.fRzzt == '' || this.user.userInfo.fRzzt == '待认证'){
+ console.log('打印this.userInfo.fRzzt',this.user.userInfo.fRzzt)
+ if(!this.user.userInfo.fRzzt || this.user.userInfo.fRzzt == '' || this.user.userInfo.fRzzt == '待认证'){
uni.navigateTo({
url:`/pages/mine/appList/realNameAuth/realNameMode`
})
- }else{
+ }else if(this.user.userInfo.fRzzt == '认证中' || this.user.userInfo.fRzzt == '已认证'){
let mode = 0;
if(this.user.userInfo.fHylx == '非居民'){
mode = 1;
@@ -213,6 +214,14 @@
uni.navigateTo({
url: `/pages/mine/appList/realNameAuth/realNameAuthentication?mode=${mode}&option=${JSON.stringify(options)}`
})
+ }else{
+ let mode = 0;
+ if(this.user.userInfo.fHylx == '非居民'){
+ mode = 1;
+ }
+ uni.navigateTo({
+ url:`/pages/mine/appList/realNameAuth/realNameMode?mode=${mode}&option=${JSON.stringify(options)}`
+ })
}
},
handleItem() {
diff --git a/frontend/app-user/pages/scan/scanCode.vue b/frontend/app-user/pages/scan/scanCode.vue
index 4ebeee0..3dae8ec 100644
--- a/frontend/app-user/pages/scan/scanCode.vue
+++ b/frontend/app-user/pages/scan/scanCode.vue
@@ -162,44 +162,75 @@
qptm: code
}
console.log("查询参数", query);
- await this.$api.gasApi.getDetailByQuery(query).then(result => {
- that.$modal.closeLoading();
- let {
- state,
- value,
- message
- } = result;
- console.log('打印扫描气瓶二维码value',value);
- if (!state) {
- uni.$u.toast(message);
- return;
- }
- if (this.mode === 1) {
- uni.redirectTo({
- url: '/pages/mine/appList/gasInformation/gasInformation?qptm=' + value.fQptm
- })
- } else if (this.mode === 2) {
- let fQptm = value.fQptm;
- // let fQptmObj = JSON.stringify(value);
- let fQptmObj = value;
- //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
- console.log("模式2");
- let fQpgg = value.fQpgg;
- console.log("气瓶规格",fQpgg);
- let name = that.pathName;
- //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
- console.log("模式2");
- // uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
- uni.$emit("scanCode",fQptm);
- this.closeScan();
- }
- }).catch(e => {
- console.log(e);
- setTimeout(() => {
- that.componentKey += 1;
- that.$forceUpdate();
- }, 1000)
- })
+ await this.$api.gasApi.judgeGasOrBottle({code:code}).then(async (res)=>{
+ const { type } = res.value;
+ if(!type){
+ uni.$u.toast('二维码编号错误!');
+ return;
+ }
+ if(type == 'qp'){
+ await this.$api.gasApi.getDetailByQuery(query).then(result => {
+ that.$modal.closeLoading();
+ let {
+ state,
+ value,
+ message
+ } = result;
+ console.log('打印扫描气瓶二维码value',value);
+ if (!state) {
+ uni.$u.toast(message);
+ return;
+ }
+ if (this.mode === 1) {
+ uni.redirectTo({
+ url: '/pages/mine/appList/gasInformation/gasInformation?qptm=' + value.fQptm
+ })
+ } else if (this.mode === 2) {
+ let fQptm = value.fQptm;
+ // let fQptmObj = JSON.stringify(value);
+ let fQptmObj = value;
+ //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
+ console.log("模式2");
+ let fQpgg = value.fQpgg;
+ console.log("气瓶规格",fQpgg);
+ let name = that.pathName;
+ //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
+ console.log("模式2");
+ // uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
+ uni.$emit("scanCode",fQptm);
+ this.closeScan();
+ }
+ }).catch(e => {
+ console.log(e);
+ setTimeout(() => {
+ that.componentKey += 1;
+ that.$forceUpdate();
+ }, 1000)
+ })
+ }else if(type == 'yg'){
+ if (this.mode === 1) {
+ uni.redirectTo({
+ url: '/pages/scanCodeUserInfo/index?ygbh=' + code
+ })
+ } else if (this.mode === 2) {
+ let fQptm = value.fQptm;
+ // let fQptmObj = JSON.stringify(value);
+ let fQptmObj = value;
+ //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
+ console.log("模式2");
+ let fQpgg = value.fQpgg;
+ console.log("气瓶规格",fQpgg);
+ let name = that.pathName;
+ //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
+ console.log("模式2");
+ // uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
+ uni.$emit("scanCode",fQptm);
+ this.closeScan();
+ }
+ }
+ console.log('打印判断是否是员工还是气瓶二维码',res);
+ })
+
},
// 传递code模式关闭扫码
closeScan() {
diff --git a/frontend/app-user/pages/scanCodeUserInfo/components/userInfoCard.vue b/frontend/app-user/pages/scanCodeUserInfo/components/userInfoCard.vue
index 2cf268f..3bf6208 100644
--- a/frontend/app-user/pages/scanCodeUserInfo/components/userInfoCard.vue
+++ b/frontend/app-user/pages/scanCodeUserInfo/components/userInfoCard.vue
@@ -17,11 +17,11 @@
-
+
- {{item.title}}
- {{item.num}}
+ {{item.name}}
+ {{item.value}}
@@ -39,27 +39,36 @@ export default {
default:{
name:'ce'
}
+ },
+ orderList:{
+ type:Array,
+ default: []
}
},
data(){
return{
- orderList:[
+ orderList1:[
{
key:'ljpsdd',
imgSrc:orderImg,
- title:'累计配送订单',
- num:25
- },
- {
+ name:'累计配送订单',
+ value:25
+ }, {
key:'ljpsqp',
imgSrc:smokeAlarmImg,
- title:'累计配送气瓶',
- num:25
+ name:'累计配送气瓶',
+ value:25
}
- ],
-
+ ]
}
},
+ onLoad(){
+
+ },
+ mounted(){
+ console.log('打印tis.orderList',this.orderList);
+ this.orderList1 = this.orderList;
+ },
methods:{
handleCallPhone(){
if(this.userInfo.phone){
diff --git a/frontend/app-user/pages/scanCodeUserInfo/index.vue b/frontend/app-user/pages/scanCodeUserInfo/index.vue
index 4acd6ca..c67e553 100644
--- a/frontend/app-user/pages/scanCodeUserInfo/index.vue
+++ b/frontend/app-user/pages/scanCodeUserInfo/index.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/frontend/app-user/utils/ruoyi.js b/frontend/app-user/utils/ruoyi.js
index caf4ba6..8b4da18 100644
--- a/frontend/app-user/utils/ruoyi.js
+++ b/frontend/app-user/utils/ruoyi.js
@@ -351,6 +351,7 @@ export function assignValues(obj, arr) {
const updatedArr = arr.map(item => {
item.value = obj[item.key];
return {
+ imgSrc:item.imgSrc?item.imgSrc:'',
type: item.type ? item.type : '',
name: item.name,
key: item.key,
diff --git a/frontend/front/src/components/dialog/realNameAuditDialog.vue b/frontend/front/src/components/dialog/realNameAuditDialog.vue
index 66eb08b..4c735af 100644
--- a/frontend/front/src/components/dialog/realNameAuditDialog.vue
+++ b/frontend/front/src/components/dialog/realNameAuditDialog.vue
@@ -108,7 +108,7 @@ export default {
{
name: '经营者姓名',
value: '张三',
- key:'fHync'
+ key:'fXm'
},
{
name: '经营者联系电话',
@@ -151,7 +151,7 @@ export default {
{
name: '姓名',
value: '张三',
- key:'fHync'
+ key:'fXm'
},
{
name: '联系电话',
--
libgit2 0.21.2