ZongYue / lpg

Download as
Browse Code »

Commit b0a34327452e0f9648805fd1d7d6c1b51ac784c2

Authored by 郭娟
1 parent 1b62ea02
Exists in dev

fix:优化员工审核以及扫码跳转功能

Showing 24 changed files with 671 additions and 140 deletions   Show diff stats
frontend/app-employee/api/gas.js
  Diff comments   View file @b0a3432
@@ -71,7 +71,23 @@ export function savaLiquefiedGasBottle(data) { @@ -71,7 +71,23 @@ export function savaLiquefiedGasBottle(data) {
71 data: data 71 data: data
72 }) 72 })
73 } 73 }
  74 +//判断扫码的二维码是气瓶二维码还是员工二维码
  75 +export function judgeGasOrBottle(params) {
  76 + return request({
  77 + url: '/manage/qpxx/v1/getQRCode',
  78 + method: 'get',
  79 + params:params
  80 + })
  81 +}
74 82
  83 +//获取用户详细信息的接口
  84 +export function userDetailInfoPort(params) {
  85 + return request({
  86 + url: '/user/wYgxx/v1/getYgxxByScanCode',
  87 + method: 'get',
  88 + params:params
  89 + })
  90 +}
75 91
76 92
77 export default { 93 export default {
@@ -82,5 +98,7 @@ export default { @@ -82,5 +98,7 @@ export default {
82 getliquefiedGasBottle, 98 getliquefiedGasBottle,
83 gasReceiveQp, 99 gasReceiveQp,
84 submitQpcrk, 100 submitQpcrk,
85 - savaLiquefiedGasBottle 101 + savaLiquefiedGasBottle,
  102 + judgeGasOrBottle,
  103 + userDetailInfoPort
86 } 104 }
87 \ No newline at end of file 105 \ No newline at end of file
frontend/app-employee/pages.json
  Diff comments   View file @b0a3432
@@ -49,6 +49,14 @@ @@ -49,6 +49,14 @@
49 "navigationStyle": "custom" 49 "navigationStyle": "custom"
50 } 50 }
51 }, 51 },
  52 + // 员工扫二维码跳转
  53 + {
  54 + "path": "pages/scanCodeUserInfo/index",
  55 + "style": {
  56 + "navigationStyle": "custom",
  57 + "enablePullDownRefresh": true
  58 + }
  59 + },
52 // 用户详情 60 // 用户详情
53 { 61 {
54 "path": "pages/userInfo/index", 62 "path": "pages/userInfo/index",
frontend/app-employee/pages/scan/scanCode.vue
  Diff comments   View file @b0a3432
@@ -178,47 +178,60 @@ @@ -178,47 +178,60 @@
178 qptm: code, 178 qptm: code,
179 // lx:'ckxx', 179 // lx:'ckxx',
180 } 180 }
181 - // const result = await this.$api.gasApi.getDetailByQuery(query);  
182 - this.queryParams.qptm = code;  
183 - let result = null;  
184 - if(this.mode === 1){  
185 - result = await this.$api.gasApi.getDetailByQuery(query);  
186 - }else{  
187 - result = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);  
188 - }  
189 - // const result = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);  
190 - // console.log("查询参数", query);  
191 - that.$modal.closeLoading();  
192 - let {  
193 - state,  
194 - message,  
195 - value  
196 - } = result;  
197 - console.log('打印扫描气瓶二维码value',value);  
198 - if (!state) {  
199 - uni.$u.toast(message);  
200 - setTimeout(() => {  
201 - that.componentKey += 1;  
202 - that.$forceUpdate()  
203 - }, 1000)  
204 - return;  
205 - }  
206 - if (this.mode === 1) {  
207 - uni.redirectTo({  
208 - url: '/pages/home/appList/gasInformation/gasInformation?qptm=' + value.fQptm  
209 - })  
210 - } else if (this.mode === 2) {  
211 - let fQptm = value.fQptm;  
212 - // let fQptmObj = JSON.stringify(value);  
213 - let fQptmObj = value;  
214 - //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code  
215 - console.log("模式2");  
216 - let fQpgg = value.fQpgg;  
217 - console.log("气瓶规格",fQpgg);  
218 - let name = that.pathName;  
219 - uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);  
220 - this.closeScan();  
221 - } 181 + await this.$api.gasApi.judgeGasOrBottle({code:code}).then(async (res)=>{
  182 + const { type } = res.value;
  183 + if(!type){
  184 + uni.$u.toast('二维码编号错误!');
  185 + return;
  186 + }
  187 + // const result = await this.$api.gasApi.getDetailByQuery(query);
  188 + this.queryParams.qptm = code;
  189 + let result1 = null;
  190 + if(this.mode === 1){
  191 + result1 = await this.$api.gasApi.getDetailByQuery(query);
  192 + }else{
  193 + result1 = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);
  194 + }
  195 + // const result = await this.$api.gasApi.getliquefiedGasBottle(this.queryParams);
  196 + // console.log("查询参数", query);
  197 + that.$modal.closeLoading();
  198 + let {
  199 + state,
  200 + message,
  201 + value
  202 + } = result1;
  203 + console.log('打印扫描气瓶二维码value',value);
  204 + if (!state) {
  205 + uni.$u.toast(message);
  206 + setTimeout(() => {
  207 + that.componentKey += 1;
  208 + that.$forceUpdate()
  209 + }, 1000)
  210 + return;
  211 + }
  212 + if (this.mode === 1) {
  213 + if(type=='qp'){
  214 + uni.redirectTo({
  215 + url: '/pages/home/appList/gasInformation/gasInformation?qptm=' + value.fQptm
  216 + })
  217 + }else{
  218 + uni.redirectTo({
  219 + url: '/pages/scanCodeUserInfo/index?ygbh=' + code
  220 + })
  221 + }
  222 + } else if (this.mode === 2) {
  223 + let fQptm = value.fQptm;
  224 + // let fQptmObj = JSON.stringify(value);
  225 + let fQptmObj = value;
  226 + //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
  227 + console.log("模式2");
  228 + let fQpgg = value.fQpgg;
  229 + console.log("气瓶规格",fQpgg);
  230 + let name = that.pathName;
  231 + uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
  232 + this.closeScan();
  233 + }
  234 + })
222 }, 235 },
223 // 传递code模式关闭扫码 236 // 传递code模式关闭扫码
224 closeScan() { 237 closeScan() {
frontend/app-employee/pages/scanCodeUserInfo/components/functionCard.vue 0 → 100644
  Diff comments   View file @b0a3432
@@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@
  1 +<template>
  2 + <view class="container">
  3 + <u-row customStyle="margin-bottom: 10px" style="width: 100%;" class="flex flex-direction flex-wrap">
  4 + <view class="usuallyCard margin-bottom-sm boxCss flex justify-between align-center" v-for="(item,index) of cardList" :key="index" :style="{marginLeft:index %2 !==0?'5px':'0px'}" >
  5 + <view>
  6 + <view class="titleCss">{{item.title}}</view>
  7 + <view class="directionCss">{{item.direction}}</view>
  8 + </view>
  9 + <u-image :src="item.imgSrc" mode="aspectFit" width="40px" @click="hanldeClick(item)"
  10 + height="40px"></u-image>
  11 + </view>
  12 + </u-row>
  13 +
  14 + </view>
  15 +</template>
  16 +
  17 +<script>
  18 +import shoppingCartImg from '@/static/images/appList/otherImg/shoppingCart.png'
  19 +import bluePhoneImg from '@/static/images/appList/otherImg/bluePhone.png'
  20 +export default {
  21 + name: "functionCard",
  22 + props:{
  23 +
  24 + },
  25 + data(){
  26 + return {
  27 + cardList:[
  28 + {
  29 + title:'电话订气',
  30 + direction:'快速联系员工',
  31 + imgSrc:bluePhoneImg
  32 + },
  33 + {
  34 + title:'线上订气',
  35 + direction:'便捷、实时追踪',
  36 + imgSrc:shoppingCartImg
  37 + },
  38 + {
  39 + title:'线上订气',
  40 + direction:'便捷、实时追踪',
  41 + imgSrc:shoppingCartImg
  42 + }
  43 + ]
  44 +
  45 + }
  46 + },
  47 + methods:{
  48 + handleClick(item){
  49 + console.log('打印item',item);
  50 + if(item.title == '电话订气'){
  51 + // if(this.userInfo.phone){
  52 + // uni.makePhoneCall({
  53 + // phoneNumber:this.userInfo.phone,
  54 + // })
  55 + // }
  56 + }
  57 + },
  58 +
  59 + },
  60 +
  61 +}
  62 +</script>
  63 +
  64 +<style lang="scss" scoped>
  65 +.container{
  66 + width: 100%;
  67 + margin-top: 15px;
  68 + .boxCss{
  69 + width:49%;
  70 + padding:20rpx;
  71 + .titleCss{
  72 + font-family: '苹方 粗体', '苹方 中等', '苹方', sans-serif;
  73 + font-weight: 700;
  74 + font-style: normal;
  75 + font-size: 28rpx;
  76 + color: #333333;
  77 + }
  78 + .directionCss{
  79 + font-family: '苹方 中等', '苹方', sans-serif;
  80 + font-weight: 400;
  81 + font-style: normal;
  82 + line-height: 42rpx;
  83 + font-size: 26rpx;
  84 + color: #999999;
  85 + }
  86 + }
  87 +
  88 +}
  89 +
  90 +</style>
0 \ No newline at end of file 91 \ No newline at end of file
frontend/app-employee/pages/scanCodeUserInfo/components/userInfoCard.vue 0 → 100644
  Diff comments   View file @b0a3432
@@ -0,0 +1,124 @@ @@ -0,0 +1,124 @@
  1 +<template>
  2 + <view class="container">
  3 + <view class="topInfoCss">
  4 + <view class="flex justify-between">
  5 + <view class="flex ">
  6 + <u-avatar size="60" shape="square" :src="userInfo.imgSrc" ></u-avatar>
  7 + <view class="flex flex-direction margin-left-sm">
  8 + <view class="textCss">{{userInfo.name}}</view>
  9 + <view class="addressCss">{{userInfo.address}}</view>
  10 + </view>
  11 + </view>
  12 + <view class="flex align-center">
  13 + <view class="margin-right-sm">{{userInfo.phone}}</view>
  14 + <u-image src="/static/images/appList/otherImg/phone-fill.png" mode="aspectFit" width="32px"
  15 + height="32px" @click="handleCallPhone"></u-image>
  16 + </view>
  17 + </view>
  18 + </view>
  19 +<!-- <view class="flex justify-between margin-top">-->
  20 +<!-- <view class="flex flex-direction justify-center align-center " style="width: 50%;" v-for="(item,index) of orderList1" :key="index">-->
  21 +<!-- <u-image :src="item.imgSrc" mode="aspectFit" width="51px"-->
  22 +<!-- height="60px"></u-image>-->
  23 +<!-- <view class="titleCss">{{item.name}}</view>-->
  24 +<!-- <view class="numCss">{{item.value}}</view>-->
  25 +<!-- </view>-->
  26 +<!-- </view>-->
  27 +
  28 + </view>
  29 +</template>
  30 +
  31 +<script>
  32 +import orderImg from '@/static/images/appList/otherImg/order.png'
  33 +import smokeAlarmImg from '@/static/images/appList/otherImg/smokeAlarm.png'
  34 +export default {
  35 + name: "userInfoCard",
  36 + props:{
  37 + userInfo:{
  38 + type:Object,
  39 + default:{
  40 + name:'ce'
  41 + }
  42 + },
  43 + orderList:{
  44 + type:Array,
  45 + default: []
  46 + }
  47 + },
  48 + data(){
  49 + return{
  50 + orderList1:[
  51 + {
  52 + key:'ljpsdd',
  53 + imgSrc:orderImg,
  54 + name:'累计配送订单',
  55 + value:25
  56 + }, {
  57 + key:'ljpsqp',
  58 + imgSrc:smokeAlarmImg,
  59 + name:'累计配送气瓶',
  60 + value:25
  61 + }
  62 + ]
  63 + }
  64 + },
  65 + onLoad(){
  66 +
  67 + },
  68 + mounted(){
  69 + console.log('打印tis.orderList',this.orderList);
  70 + this.orderList1 = this.orderList;
  71 + },
  72 + methods:{
  73 + handleCallPhone(){
  74 + if(this.userInfo.phone){
  75 + uni.makePhoneCall({
  76 + phoneNumber:this.userInfo.phone,
  77 + })
  78 + }
  79 + },
  80 +
  81 + }
  82 +}
  83 +</script>
  84 +
  85 +<style lang="scss" scoped>
  86 +.container{
  87 + //margin: 0 10px;
  88 + padding: 10px;
  89 + background: #ffffff;
  90 + border-radius: 10px;
  91 + .topInfoCss{
  92 + .textCss{
  93 + font-family: '苹方 中等', '苹方', sans-serif;
  94 + font-weight: 400;
  95 + font-style: normal;
  96 + font-size: 52rpx;
  97 + }
  98 + .addressCss{
  99 + font-family: '苹方 中等', '苹方', sans-serif;
  100 + font-weight: 400;
  101 + font-style: normal;
  102 + font-size: 26rpx;
  103 + line-height: 60rpx;
  104 + color: #666666;
  105 + }
  106 + }
  107 + .titleCss{
  108 + font-family: '苹方 中等', '苹方', sans-serif;
  109 + font-weight: 400;
  110 + font-style: normal;
  111 + line-height: 60rpx;
  112 + font-size: 26rpx;
  113 + color: #999DB0;
  114 + }
  115 + .numCss{
  116 + font-family: '苹方 粗体', '苹方 中等', '苹方', sans-serif;
  117 + font-weight: 700;
  118 + font-style: normal;
  119 + font-size: 34rpx;
  120 + color:#333333
  121 + }
  122 +}
  123 +
  124 +</style>
0 \ No newline at end of file 125 \ No newline at end of file
frontend/app-employee/pages/scanCodeUserInfo/index.vue 0 → 100644
  Diff comments   View file @b0a3432
@@ -0,0 +1,119 @@ @@ -0,0 +1,119 @@
  1 +<template>
  2 + <view class="container">
  3 + <Navbar bgColor="#ff630c" title="配送工主页" :textColor="'#ffffff'" :canBack="true"></Navbar>
  4 + <view class="topContentCss"></view>
  5 + <view class="cardAreaCss" >
  6 + <!-- 员工信息 -->
  7 + <userInfoCard :userInfo="userInfoData" :orderList="orderInfoList"></userInfoCard>
  8 + <!-- 头部气瓶背景文字 -->
  9 + <!-- 消息轮播 -->
  10 + <u-notice-bar class="margin-top" :text="text" direction="column" color="#EB5C11" bgColor="#F1E4DB" speed="50"
  11 + url="/pages/componentsB/tag/tag"></u-notice-bar>
  12 +<!-- <functionCard ></functionCard>-->
  13 + </view>
  14 + </view>
  15 +</template>
  16 +
  17 +<script>
  18 +import orderImg from '@/static/images/appList/otherImg/order.png'
  19 +import smokeAlarmImg from '@/static/images/appList/otherImg/smokeAlarm.png'
  20 +import userInfoImg from '@/static/images/mine/userInfo.png'
  21 +import userInfoCard from "./components/userInfoCard";
  22 +import functionCard from "./components/functionCard"
  23 +export default {
  24 + components:{
  25 + userInfoCard,
  26 + functionCard
  27 + },
  28 + onLoad(data){
  29 + if(data.ygbh){
  30 + this.getDetailData(data.ygbh);
  31 + }
  32 + console.log('打印data',data);
  33 + },
  34 + mounted(){},
  35 + data(){
  36 + return {
  37 + orderInfoList:[
  38 + {
  39 + key:'ljpsdd',
  40 + imgSrc:orderImg,
  41 + name:'累计配送订单',
  42 + value:25
  43 + },
  44 + {
  45 + key:'ljpsqp',
  46 + imgSrc:smokeAlarmImg,
  47 + name:'累计配送气瓶',
  48 + value:25
  49 + }
  50 + ],
  51 + text: [
  52 + '为了您和家人的安全，请不要使用过期的石油气钢瓶',
  53 + '温馨提示'
  54 + ],
  55 + userInfoData:{
  56 + imgSrc:userInfoImg,
  57 + name:'任巧生',
  58 + address:'孝感城南液化石油气',
  59 + phone:'181****4021'
  60 + }
  61 + }
  62 + },
  63 + methods:{
  64 + async getDetailData(ygbhCode){
  65 + const result = await this.$api.gasApi.userDetailInfoPort({code:ygbhCode});
  66 + const { value } = result;
  67 + this.userInfoData.phone = value.ffzrlxfs;
  68 + this.userInfoData.name = value.fxm;
  69 + this.userInfoData.address = value.fssczmc;
  70 + this.orderInfoList = await this.$assignValues(value,this.orderInfoList);
  71 + this.$forceUpdate();
  72 +
  73 + console.log('打印获取员工详细信息的result===>',result);
  74 +
  75 + }
  76 + },
  77 +
  78 +}
  79 +</script>
  80 +
  81 +<style lang="scss" scoped>
  82 +.container{
  83 + ::v-deep.u-icon__icon{
  84 + color: #ffffff!important;
  85 + }
  86 + .topContentCss {
  87 + position: relative;
  88 + width: 100%;
  89 + height: 200px;
  90 + //background: #EA5504;
  91 + background: linear-gradient(180deg, rgba(255, 99, 12, 1) 0%, rgba(242, 244, 243, 1) 100%);
  92 + border-radius: 0 0 30px 30px;
  93 + color: #fff;
  94 +
  95 + .topBarCss {
  96 + height: 65px;
  97 + }
  98 +
  99 + .authCss {
  100 + border-radius: 30px 0 0 30px;
  101 + background: #fff;
  102 + // width: 0px;
  103 + padding: 5px;
  104 + }
  105 +
  106 + .chatCss {
  107 + // position: absolute;
  108 + // margin: -10px 0 0 -10px;
  109 + }
  110 + }
  111 + .cardAreaCss {
  112 + position: relative;
  113 + top: -150px;
  114 + margin: 0px 10px;
  115 + color: #000;
  116 + }
  117 +
  118 +}
  119 +</style>
0 \ No newline at end of file 120 \ No newline at end of file
frontend/app-employee/static/images/appList/otherImg/bluePhone.png 0 → 100644
View file @b0a3432

3.03 KB
frontend/app-employee/static/images/appList/otherImg/order.png 0 → 100644
View file @b0a3432

3.3 KB
frontend/app-employee/static/images/appList/otherImg/phone-fill.png 0 → 100644
View file @b0a3432

2.29 KB
frontend/app-employee/static/images/appList/otherImg/shoppingCart.png 0 → 100644
View file @b0a3432

5.2 KB
frontend/app-employee/static/images/appList/otherImg/smokeAlarm.png 0 → 100644
View file @b0a3432

2.75 KB
frontend/app-employee/static/images/mine/userInfo.png 0 → 100644
View file @b0a3432

335 KB
frontend/app-employee/utils/ruoyi.js
  Diff comments   View file @b0a3432
@@ -352,6 +352,7 @@ export function assignValues(obj, arr) { @@ -352,6 +352,7 @@ export function assignValues(obj, arr) {
352 const updatedArr = arr.map(item => { 352 const updatedArr = arr.map(item => {
353 item.value = obj[item.key]; 353 item.value = obj[item.key];
354 return { 354 return {
  355 + imgSrc:item.imgSrc?item.imgSrc:'',
355 type: item.type ? item.type : '', 356 type: item.type ? item.type : '',
356 imgIcon: item.imgIcon ? item.imgIcon : '', 357 imgIcon: item.imgIcon ? item.imgIcon : '',
357 name: item.name, 358 name: item.name,
frontend/app-user/api/gas.js
  Diff comments   View file @b0a3432
1 import request from '@/utils/request.js' 1 import request from '@/utils/request.js'
2 2
  3 +//获取气瓶的气瓶条码接口
3 export function getDetailByQuery(params) { 4 export function getDetailByQuery(params) {
4 return request({ 5 return request({
5 url: '/user/gasBottle/getDetailByQuery', 6 url: '/user/gasBottle/getDetailByQuery',
@@ -24,7 +25,23 @@ export function savewQpxx(data) { @@ -24,7 +25,23 @@ export function savewQpxx(data) {
24 data:data 25 data:data
25 }) 26 })
26 } 27 }
  28 +//判断扫码的二维码是气瓶二维码还是员工二维码
  29 +export function judgeGasOrBottle(params) {
  30 + return request({
  31 + url: '/manage/qpxx/v1/getQRCode',
  32 + method: 'get',
  33 + params:params
  34 + })
  35 +}
27 36
  37 +//获取用户详细信息的接口
  38 +export function userDetailInfoPort(params) {
  39 + return request({
  40 + url: '/user/wYgxx/v1/getYgxxByScanCode',
  41 + method: 'get',
  42 + params:params
  43 + })
  44 +}
28 45
29 46
30 47
@@ -34,5 +51,7 @@ export default { @@ -34,5 +51,7 @@ export default {
34 // getwQplxlist, 51 // getwQplxlist,
35 getwQpxxDetail, 52 getwQpxxDetail,
36 getDetailByQuery, 53 getDetailByQuery,
37 - savewQpxx 54 + savewQpxx,
  55 + judgeGasOrBottle,
  56 + userDetailInfoPort
38 } 57 }
frontend/app-user/pages/mine/appList/realNameAuth/components/enterprise.vue
  Diff comments   View file @b0a3432
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 @click="previewPicture(picture[0].temp)"></u-image> 14 @click="previewPicture(picture[0].temp)"></u-image>
15 <u-image v-else src="@/static/images/gas-icon/front.png" width="180rpx" 15 <u-image v-else src="@/static/images/gas-icon/front.png" width="180rpx"
16 height="108rpx"></u-image> 16 height="108rpx"></u-image>
17 - <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证不通过') && picture[0]?picture[0].temp:''" @click="deleteImg(0)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon> 17 + <u-icon v-if="(!this.optionsInfo.fRzzt||this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') && picture[0]?picture[0].temp:''" @click="deleteImg(0)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon>
18 </view> 18 </view>
19 <view class="cardBar"> 19 <view class="cardBar">
20 <view class="flex justify-center"> 20 <view class="flex justify-center">
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 @click="previewPicture(picture[1].temp)"></u-image> 29 @click="previewPicture(picture[1].temp)"></u-image>
30 <u-image v-else src="@/static/images/gas-icon/back.png" width="180rpx" 30 <u-image v-else src="@/static/images/gas-icon/back.png" width="180rpx"
31 height="108rpx"></u-image> 31 height="108rpx"></u-image>
32 - <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证不通过') && picture[1]?picture[1].temp:''" @click="deleteImg(1)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon> 32 + <u-icon v-if="(!this.optionsInfo.fRzzt||this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') && picture[1]?picture[1].temp:''" @click="deleteImg(1)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon>
33 </view> 33 </view>
34 <view class="cardBar"> 34 <view class="cardBar">
35 <view class="flex justify-center"> 35 <view class="flex justify-center">
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 @click="previewPicture(picture[2].temp)" height="108rpx"></u-image> 61 @click="previewPicture(picture[2].temp)" height="108rpx"></u-image>
62 <u-image v-else src="@/static/images/gas-icon/front.png" width="180rpx" 62 <u-image v-else src="@/static/images/gas-icon/front.png" width="180rpx"
63 height="108rpx"></u-image> 63 height="108rpx"></u-image>
64 - <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证不通过') &&picture[2]?picture[2].temp:''" @click="deleteImg(2)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon> 64 + <u-icon v-if="(!this.optionsInfo.fRzzt||this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') &&picture[2]?picture[2].temp:''" @click="deleteImg(2)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon>
65 </view> 65 </view>
66 <view class="cardBar"> 66 <view class="cardBar">
67 <view class="flex justify-center"> 67 <view class="flex justify-center">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 @click="previewPicture(picture[3].temp)" height="108rpx"></u-image> 76 @click="previewPicture(picture[3].temp)" height="108rpx"></u-image>
77 <u-image v-else src="@/static/images/gas-icon/back.png" width="180rpx" 77 <u-image v-else src="@/static/images/gas-icon/back.png" width="180rpx"
78 height="108rpx"></u-image> 78 height="108rpx"></u-image>
79 - <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证不通过') &&picture[3]?picture[3].temp:''" @click="deleteImg(3)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon> 79 + <u-icon v-if="(!this.optionsInfo.fRzzt||this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') &&picture[3]?picture[3].temp:''" @click="deleteImg(3)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon>
80 </view> 80 </view>
81 <view class="cardBar"> 81 <view class="cardBar">
82 <view class="flex justify-center"> 82 <view class="flex justify-center">
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 @click="previewPicture(picture[4].temp)"></u-image> 93 @click="previewPicture(picture[4].temp)"></u-image>
94 <u-image v-else src="@/static/images/gas-icon/front.png" width="180rpx" 94 <u-image v-else src="@/static/images/gas-icon/front.png" width="180rpx"
95 height="108rpx"></u-image> 95 height="108rpx"></u-image>
96 - <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证不通过') &&picture[4]?picture[4].temp:''" @click="deleteImg(4)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon> 96 + <u-icon v-if="(!this.optionsInfo.fRzzt||this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') &&picture[4]?picture[4].temp:''" @click="deleteImg(4)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon>
97 </view> 97 </view>
98 <view class="cardBar"> 98 <view class="cardBar">
99 <view class="flex justify-center"> 99 <view class="flex justify-center">
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 @click="previewPicture(picture[5].temp)"></u-image> 108 @click="previewPicture(picture[5].temp)"></u-image>
109 <u-image v-else src="@/static/images/gas-icon/back.png" width="180rpx" 109 <u-image v-else src="@/static/images/gas-icon/back.png" width="180rpx"
110 height="108rpx"></u-image> 110 height="108rpx"></u-image>
111 - <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证不通过') &&picture[5]?picture[5].temp:''" @click="deleteImg(5)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon> 111 + <u-icon v-if="(!this.optionsInfo.fRzzt||this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') &&picture[5]?picture[5].temp:''" @click="deleteImg(5)" style="position: absolute; top:-10px;right: 22px;" name="close-circle-fill" color="red" size="14"></u-icon>
112 </view> 112 </view>
113 <view class="cardBar"> 113 <view class="cardBar">
114 <view class="flex justify-center"> 114 <view class="flex justify-center">
@@ -137,45 +137,45 @@ @@ -137,45 +137,45 @@
137 <u-form labelPosition="left" :model="enterpriseObj" :rules="rules" ref="uForm"> 137 <u-form labelPosition="left" :model="enterpriseObj" :rules="rules" ref="uForm">
138 <view class="flex justify-between"> 138 <view class="flex justify-between">
139 <u-form-item class="w50"> 139 <u-form-item class="w50">
140 - <u-input placeholder="经营者姓名" v-model="enterpriseObj.name" border="none"></u-input> 140 + <u-input placeholder="经营者姓名" :disabled="canEditBtn" disabledColor="#fff" v-model="enterpriseObj.name" border="none"></u-input>
141 </u-form-item> 141 </u-form-item>
142 <u-form-item class="w50"> 142 <u-form-item class="w50">
143 - <u-input placeholder="经营者联系电话" v-model="enterpriseObj.phone" border="none"></u-input> 143 + <u-input placeholder="经营者联系电话" :disabled="canEditBtn" disabledColor="#fff" v-model="enterpriseObj.phone" border="none"></u-input>
144 </u-form-item> 144 </u-form-item>
145 </view> 145 </view>
146 <view class="flex justify-between"> 146 <view class="flex justify-between">
147 <u-form-item class="w50"> 147 <u-form-item class="w50">
148 - <u-input placeholder="经营者性别" disabledColor="#fff" v-model="enterpriseObj.sex" disabled 148 + <u-input placeholder="经营者性别" disabledColor="#fff" v-model="enterpriseObj.sex" disabled
149 border="none"> 149 border="none">
150 - <u-icon name="arrow-down" slot="suffix" @click="selectPickCloums('sex')"></u-icon> 150 + <u-icon name="arrow-down" slot="suffix" @click="canEditBtn?'':selectPickCloums('sex')"></u-icon>
151 </u-input> 151 </u-input>
152 </u-form-item> 152 </u-form-item>
153 <u-form-item class="w45"> 153 <u-form-item class="w45">
154 - <u-input placeholder="经营者年龄" v-model="enterpriseObj.age" border="none"></u-input> 154 + <u-input placeholder="经营者年龄" :disabled="canEditBtn" disabledColor="#fff" v-model="enterpriseObj.age" border="none"></u-input>
155 </u-form-item> 155 </u-form-item>
156 </view> 156 </view>
157 <u-form-item> 157 <u-form-item>
158 - <u-input placeholder="经营者身份证号" v-model="enterpriseObj.idcard" border="none"></u-input> 158 + <u-input placeholder="经营者身份证号" :disabled="canEditBtn" disabledColor="#fff" v-model="enterpriseObj.idcard" border="none"></u-input>
159 </u-form-item> 159 </u-form-item>
160 <u-form-item> 160 <u-form-item>
161 - <u-input placeholder="有效期" v-model="enterpriseObj.termOfValidity" border="none">  
162 - <u-icon name="calendar" slot="suffix" @click="dateShow = true"></u-icon> 161 + <u-input placeholder="有效期" :disabled="canEditBtn" disabledColor="#fff" v-model="enterpriseObj.termOfValidity" border="none">
  162 + <u-icon name="calendar" slot="suffix" @click="canEditBtn?'':dateShow = true"></u-icon>
163 </u-input> 163 </u-input>
164 </u-form-item> 164 </u-form-item>
165 <u-form-item> 165 <u-form-item>
166 - <u-input placeholder="工/商业名称(填工商已有注册名称)" v-model="enterpriseObj.industryAndCommerce" 166 + <u-input placeholder="工/商业名称(填工商已有注册名称)" disabledColor="#fff" :disabled="canEditBtn" v-model="enterpriseObj.industryAndCommerce"
167 border="none"> 167 border="none">
168 </u-input> 168 </u-input>
169 </u-form-item> 169 </u-form-item>
170 <u-form-item> 170 <u-form-item>
171 - <u-input placeholder="统一社会信用代码(纳税人识别号)" v-model="enterpriseObj.socialUnifiedCreditCode" 171 + <u-input placeholder="统一社会信用代码(纳税人识别号)" :disabled="canEditBtn" disabledColor="#fff" v-model="enterpriseObj.socialUnifiedCreditCode"
172 border="none"> 172 border="none">
173 - <view slot="suffix">清空</view> 173 +<!-- <view slot="suffix">清空</view>-->
174 </u-input> 174 </u-input>
175 </u-form-item> 175 </u-form-item>
176 <u-form-item> 176 <u-form-item>
177 - <u-input placeholder="认证气站" v-model="enterpriseObj.fSsczmc" disabledColor="#fff" disabled border="none">  
178 - <u-icon name="arrow-down" slot="suffix" @click="selectPickCloums('rzqz')"></u-icon> 177 + <u-input placeholder="认证气站" v-model="enterpriseObj.fSsczmc" disabledColor="#fff" disabled border="none">
  178 + <u-icon name="arrow-down" slot="suffix" @click="canEditBtn?'':selectPickCloums('rzqz')"></u-icon>
179 </u-input> 179 </u-input>
180 </u-form-item> 180 </u-form-item>
181 </u-form> 181 </u-form>
@@ -219,8 +219,12 @@ @@ -219,8 +219,12 @@
219 await this.getLocation(); 219 await this.getLocation();
220 } 220 }
221 console.log('打印是否出发这个事件',this.optionsInfo.fRzzt) 221 console.log('打印是否出发这个事件',this.optionsInfo.fRzzt)
222 - if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中'){ 222 + if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中' || this.optionsInfo.fRzzt == '认证未通过'){
223 this.getRealNameDetail(); 223 this.getRealNameDetail();
  224 + this.canEditBtn = true;
  225 + if(this.optionsInfo.fRzzt == '认证未通过'){
  226 + this.canEditBtn = false;
  227 + }
224 } 228 }
225 console.log('打印是否出阿飞this.addJd',this.adsJd,this.adsWd) 229 console.log('打印是否出阿飞this.addJd',this.adsJd,this.adsWd)
226 await this.getStoreList(); 230 await this.getStoreList();
@@ -230,6 +234,7 @@ @@ -230,6 +234,7 @@
230 return { 234 return {
231 pickShow: false, 235 pickShow: false,
232 dateShow: false, 236 dateShow: false,
  237 + canEditBtn:false,
233 date: Number(new Date()), 238 date: Number(new Date()),
234 enterpriseObj: { 239 enterpriseObj: {
235 name: "", 240 name: "",
@@ -329,11 +334,17 @@ @@ -329,11 +334,17 @@
329 }); 334 });
330 } 335 }
331 this.enterpriseObj.fSsczmc = value.fSsczmc; 336 this.enterpriseObj.fSsczmc = value.fSsczmc;
332 - this.enterpriseObj.name = value.fHync; 337 + this.enterpriseObj.name = value.fXm;
333 this.enterpriseObj.age = value.fNl; 338 this.enterpriseObj.age = value.fNl;
334 this.enterpriseObj.sex = value.fXb; 339 this.enterpriseObj.sex = value.fXb;
335 this.enterpriseObj.phone = value.fSjh; 340 this.enterpriseObj.phone = value.fSjh;
336 - this.enterpriseObj.industryAndCommerce = value.fSfzhyxq; 341 + this.enterpriseObj.idcard = value.fSfzh;
  342 + this.enterpriseObj.industryAndCommerce = value.fSymc;
  343 + let date = value.fSfzhyxq?value.fSfzhyxq.substring(0,10):'';
  344 + console.log('打印date',date);
  345 + this.enterpriseObj.termOfValidity = date;
  346 + this.enterpriseObj.socialUnifiedCreditCode = value.fShtysbm;
  347 + this.enterpriseObj.fSsczID = value.fSsczID;
337 }, 348 },
338 //获取当前的定位 349 //获取当前的定位
339 getLocation() { 350 getLocation() {
@@ -392,7 +403,8 @@ @@ -392,7 +403,8 @@
392 // }); 403 // });
393 let mcArrayList = this.storeList.map((item)=>item.fCzmc); 404 let mcArrayList = this.storeList.map((item)=>item.fCzmc);
394 this.columns = [mcArrayList]; 405 this.columns = [mcArrayList];
395 - console.log('打印this.c',this.columns) 406 + console.log('打印this.c',this.columns);
  407 + break;
396 } 408 }
397 }, 409 },
398 //选择器确认的事件 410 //选择器确认的事件
frontend/app-user/pages/mine/appList/realNameAuth/components/resident.vue
  Diff comments   View file @b0a3432
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <u-image v-else src="@/static/images/gas-icon/front.png" width="366rpx" 25 <u-image v-else src="@/static/images/gas-icon/front.png" width="366rpx"
26 height="236rpx"></u-image> 26 height="236rpx"></u-image>
27 </view> 27 </view>
28 - <u-icon v-if="picture[0]?picture[0].temp:''" @click="deleteImg(0)" style="position: absolute; top:0px;right: 0px;" name="close-circle-fill" color="red" size="14"></u-icon> 28 + <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') && picture[0]?picture[0].temp:''" @click="deleteImg(0)" style="position: absolute; top:0px;right: 0px;" name="close-circle-fill" color="red" size="14"></u-icon>
29 <!-- <u-image src="" width="366rpx" height="236rpx" v-if="!idCardObj.back.length"></u-image>--> 29 <!-- <u-image src="" width="366rpx" height="236rpx" v-if="!idCardObj.back.length"></u-image>-->
30 <!-- <u-image :src="idCardObj.back[0]" width="366rpx" height="236rpx" v-else></u-image>--> 30 <!-- <u-image :src="idCardObj.back[0]" width="366rpx" height="236rpx" v-else></u-image>-->
31 </view> 31 </view>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <u-image v-else src="@/static/images/gas-icon/back.png" width="366rpx" 49 <u-image v-else src="@/static/images/gas-icon/back.png" width="366rpx"
50 height="236rpx"></u-image> 50 height="236rpx"></u-image>
51 </view> 51 </view>
52 - <u-icon v-if="picture[1]?picture[1].temp:''" @click="deleteImg(1)" style="position: absolute; top:0px;right: 0px;" name="close-circle-fill" color="red" size="14"></u-icon> 52 + <u-icon v-if="(this.optionsInfo.fRzzt ==''||this.optionsInfo.fRzzt == '待认证' || this.optionsInfo.fRzzt == '认证未通过') && picture[1]?picture[1].temp:''" @click="deleteImg(1)" style="position: absolute; top:0px;right: 0px;" name="close-circle-fill" color="red" size="14"></u-icon>
53 53
54 54
55 <!-- <u-image src="" width="366rpx" height="236rpx" v-if="!idCardObj.front.length"></u-image>--> 55 <!-- <u-image src="" width="366rpx" height="236rpx" v-if="!idCardObj.front.length"></u-image>-->
@@ -66,33 +66,33 @@ @@ -66,33 +66,33 @@
66 <u-form labelPosition="left" :model="idCardObj" :rules="rules" ref="uForm"> 66 <u-form labelPosition="left" :model="idCardObj" :rules="rules" ref="uForm">
67 <view class="flex justify-between"> 67 <view class="flex justify-between">
68 <u-form-item class="w50"> 68 <u-form-item class="w50">
69 - <u-input placeholder="姓名" v-model="idCardObj.name" border="none"></u-input> 69 + <u-input placeholder="姓名" :disabled="canEditBtn" v-model="idCardObj.name" border="none"></u-input>
70 </u-form-item> 70 </u-form-item>
71 <u-form-item class="w50"> 71 <u-form-item class="w50">
72 - <u-input placeholder="联系电话" v-model="idCardObj.phone" border="none"></u-input> 72 + <u-input placeholder="联系电话" :disabled="canEditBtn" v-model="idCardObj.phone" border="none"></u-input>
73 </u-form-item> 73 </u-form-item>
74 </view> 74 </view>
75 <view class="flex justify-between"> 75 <view class="flex justify-between">
76 <u-form-item class="w50"> 76 <u-form-item class="w50">
77 - <u-input placeholder="性别" v-model="idCardObj.sex" disabled border="none">  
78 - <u-icon name="arrow-down" slot="suffix" @click="selectPickCloums('sex')"></u-icon> 77 + <u-input placeholder="性别" v-model="idCardObj.sex" disabled border="none">
  78 + <u-icon name="arrow-down" slot="suffix" @click="canEditBtn?'':selectPickCloums('sex')"></u-icon>
79 </u-input> 79 </u-input>
80 </u-form-item> 80 </u-form-item>
81 <u-form-item class="w45"> 81 <u-form-item class="w45">
82 - <u-input placeholder="年龄" v-model="idCardObj.age" border="none"></u-input> 82 + <u-input placeholder="年龄" :disabled="canEditBtn" v-model="idCardObj.age" border="none"></u-input>
83 </u-form-item> 83 </u-form-item>
84 </view> 84 </view>
85 <u-form-item> 85 <u-form-item>
86 - <u-input placeholder="身份证号" v-model="idCardObj.idcard" border="none"></u-input> 86 + <u-input placeholder="身份证号" :disabled="canEditBtn" v-model="idCardObj.idcard" border="none"></u-input>
87 </u-form-item> 87 </u-form-item>
88 <u-form-item> 88 <u-form-item>
89 - <u-input placeholder="有效期" v-model="idCardObj.termOfValidity" border="none">  
90 - <u-icon name="calendar" slot="suffix" @click="dateShow = true"></u-icon> 89 + <u-input placeholder="有效期" :disabled="canEditBtn" v-model="idCardObj.termOfValidity" border="none">
  90 + <u-icon name="calendar" slot="suffix" @click="canEditBtn?'':dateShow = true"></u-icon>
91 </u-input> 91 </u-input>
92 </u-form-item> 92 </u-form-item>
93 <u-form-item> 93 <u-form-item>
94 - <u-input placeholder="认证气站" v-model="idCardObj.fSsczmc" disabled border="none">  
95 - <u-icon name="arrow-down" slot="suffix" @click="selectPickCloums('rzqz')"></u-icon> 94 + <u-input placeholder="认证气站" v-model="idCardObj.fSsczmc" disabled border="none">
  95 + <u-icon name="arrow-down" slot="suffix" @click="canEditBtn?'':selectPickCloums('rzqz')"></u-icon>
96 </u-input> 96 </u-input>
97 </u-form-item> 97 </u-form-item>
98 </u-form> 98 </u-form>
@@ -126,6 +126,7 @@ @@ -126,6 +126,7 @@
126 watch: {}, 126 watch: {},
127 data() { 127 data() {
128 return { 128 return {
  129 + canEditBtn:false,
129 picture:[], 130 picture:[],
130 idCardObj: { 131 idCardObj: {
131 name: "", 132 name: "",
@@ -173,8 +174,12 @@ @@ -173,8 +174,12 @@
173 await this.getLocation(); 174 await this.getLocation();
174 } 175 }
175 console.log('打印this.options',this.optionsInfo); 176 console.log('打印this.options',this.optionsInfo);
176 - if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中'){ 177 + if(this.optionsInfo.fRzzt == '已认证'||this.optionsInfo.fRzzt =='认证中' || this.optionsInfo.fRzzt == '认证未通过'){
177 this.getRealNameDetail(); 178 this.getRealNameDetail();
  179 + this.canEditBtn = true;
  180 + if(this.optionsInfo.fRzzt == '认证未通过'){
  181 + this.canEditBtn = false;
  182 + }
178 } 183 }
179 console.log('打印是否出阿飞this.addJd',this.adsJd,this.adsWd) 184 console.log('打印是否出阿飞this.addJd',this.adsJd,this.adsWd)
180 await this.getStoreList(); 185 await this.getStoreList();
@@ -188,7 +193,34 @@ @@ -188,7 +193,34 @@
188 const reseult= await this.$api.realNameAuthApi.realNameDetailInfoPort(this.optionsInfo.id); 193 const reseult= await this.$api.realNameAuthApi.realNameDetailInfoPort(this.optionsInfo.id);
189 console.log('打印Result',reseult); 194 console.log('打印Result',reseult);
190 const { value } = reseult; 195 const { value } = reseult;
191 - this.detailInfo = value; 196 + if(value.fSfzghy){
  197 + let sfzghImg = JSON.parse(value.fSfzghy);
  198 + console.log('打印Result',sfzghImg);
  199 + let sfzghImgUrl = await this.$getPhotoUrl(sfzghImg[0].response.fileId);
  200 + this.$set(this.picture,1,{
  201 + temp:sfzghImgUrl,
  202 + fileId:sfzghImg[0].response.fileId,
  203 + fileObj: JSON.stringify(sfzghImg)
  204 + });
  205 + }
  206 + if(value.fSfzrxy){
  207 + let sfzrxImg = JSON.parse(value.fSfzrxy);
  208 + let sfzrxImgUrl = await this.$getPhotoUrl(sfzrxImg[0].response.fileId);
  209 + this.$set(this.picture,0,{
  210 + temp:sfzrxImgUrl,
  211 + fileId:sfzrxImg[0].response.fileId,
  212 + fileObj: JSON.stringify(sfzrxImg)
  213 + });
  214 + }
  215 + this.idCardObj.name = value.fXm;
  216 + this.idCardObj.phone = value.fSjh;
  217 + this.idCardObj.sex = value.fXb;
  218 + this.idCardObj.age = value.fNl;
  219 + this.idCardObj.idcard = value.fSfzh;
  220 + let date = value.fSfzhyxq?value.fSfzhyxq.substring(0,10):'';
  221 + this.idCardObj.termOfValidity = date;
  222 + this.idCardObj.fSsczmc = value.fSsczmc;
  223 + this.idCardObj.fSsczID = value.fSsczID;
192 }, 224 },
193 //获取当前的定位 225 //获取当前的定位
194 getLocation() { 226 getLocation() {
@@ -314,6 +346,7 @@ @@ -314,6 +346,7 @@
314 346
315 .idCardWarp { 347 .idCardWarp {
316 background: #F4F5F8; 348 background: #F4F5F8;
  349 + //background: #ffffff;
317 border-radius: 10rpx; 350 border-radius: 10rpx;
318 padding: 0 24rpx; 351 padding: 0 24rpx;
319 } 352 }
frontend/app-user/pages/mine/appList/realNameAuth/realNameMode.vue
  Diff comments   View file @b0a3432
@@ -52,15 +52,24 @@ @@ -52,15 +52,24 @@
52 components: { 52 components: {
53 basisCellCard 53 basisCellCard
54 }, 54 },
55 - onLoad(){ 55 + onLoad(routeData){
  56 + console.log('打印options',routeData)
  57 + if(routeData.option){
  58 + this.options = JSON.parse(routeData.option);
  59 + }
  60 + if(routeData && routeData.mode){
  61 + this.handleToAuth(routeData.mode);
  62 + }
56 }, 63 },
57 data() { 64 data() {
58 - return {}; 65 + return {
  66 + options:{}
  67 + };
59 }, 68 },
60 methods: { 69 methods: {
61 handleToAuth(mode) { 70 handleToAuth(mode) {
62 uni.navigateTo({ 71 uni.navigateTo({
63 - url: '/pages/mine/appList/realNameAuth/realNameAuthentication?mode=' + mode 72 + url: `/pages/mine/appList/realNameAuth/realNameAuthentication?mode=${mode}&option=${JSON.stringify(this.options)}`
64 }) 73 })
65 } 74 }
66 } 75 }
frontend/app-user/pages/mine/components/commonApplications.vue
  Diff comments   View file @b0a3432
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 }); 155 });
156 }, 156 },
157 goToAppPage(app) { 157 goToAppPage(app) {
158 - console.log(app); 158 + console.log('打印goToAppPage',app);
159 if (this.appList[app].path) { 159 if (this.appList[app].path) {
160 let toUrl = this.appList[app].path; 160 let toUrl = this.appList[app].path;
161 let urlName = this.appList[app].name 161 let urlName = this.appList[app].name
frontend/app-user/pages/mine/mine.vue
  Diff comments   View file @b0a3432
@@ -201,11 +201,12 @@ @@ -201,11 +201,12 @@
201 fHylx:this.user.userInfo.fHylx?this.user.userInfo.fHylx:'', 201 fHylx:this.user.userInfo.fHylx?this.user.userInfo.fHylx:'',
202 id:this.user.userInfo.id?this.user.userInfo.id:'' 202 id:this.user.userInfo.id?this.user.userInfo.id:''
203 } 203 }
204 - if(this.user.userInfo.fRzzt == '' || this.user.userInfo.fRzzt == '待认证'){ 204 + console.log('打印this.userInfo.fRzzt',this.user.userInfo.fRzzt)
  205 + if(!this.user.userInfo.fRzzt || this.user.userInfo.fRzzt == '' || this.user.userInfo.fRzzt == '待认证'){
205 uni.navigateTo({ 206 uni.navigateTo({
206 url:`/pages/mine/appList/realNameAuth/realNameMode` 207 url:`/pages/mine/appList/realNameAuth/realNameMode`
207 }) 208 })
208 - }else{ 209 + }else if(this.user.userInfo.fRzzt == '认证中' || this.user.userInfo.fRzzt == '已认证'){
209 let mode = 0; 210 let mode = 0;
210 if(this.user.userInfo.fHylx == '非居民'){ 211 if(this.user.userInfo.fHylx == '非居民'){
211 mode = 1; 212 mode = 1;
@@ -213,6 +214,14 @@ @@ -213,6 +214,14 @@
213 uni.navigateTo({ 214 uni.navigateTo({
214 url: `/pages/mine/appList/realNameAuth/realNameAuthentication?mode=${mode}&option=${JSON.stringify(options)}` 215 url: `/pages/mine/appList/realNameAuth/realNameAuthentication?mode=${mode}&option=${JSON.stringify(options)}`
215 }) 216 })
  217 + }else{
  218 + let mode = 0;
  219 + if(this.user.userInfo.fHylx == '非居民'){
  220 + mode = 1;
  221 + }
  222 + uni.navigateTo({
  223 + url:`/pages/mine/appList/realNameAuth/realNameMode?mode=${mode}&option=${JSON.stringify(options)}`
  224 + })
216 } 225 }
217 }, 226 },
218 handleItem() { 227 handleItem() {
frontend/app-user/pages/scan/scanCode.vue
  Diff comments   View file @b0a3432
@@ -162,44 +162,75 @@ @@ -162,44 +162,75 @@
162 qptm: code 162 qptm: code
163 } 163 }
164 console.log("查询参数", query); 164 console.log("查询参数", query);
165 - await this.$api.gasApi.getDetailByQuery(query).then(result => {  
166 - that.$modal.closeLoading();  
167 - let {  
168 - state,  
169 - value,  
170 - message  
171 - } = result;  
172 - console.log('打印扫描气瓶二维码value',value);  
173 - if (!state) {  
174 - uni.$u.toast(message);  
175 - return;  
176 - }  
177 - if (this.mode === 1) {  
178 - uni.redirectTo({  
179 - url: '/pages/mine/appList/gasInformation/gasInformation?qptm=' + value.fQptm  
180 - })  
181 - } else if (this.mode === 2) {  
182 - let fQptm = value.fQptm;  
183 - // let fQptmObj = JSON.stringify(value);  
184 - let fQptmObj = value;  
185 - //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code  
186 - console.log("模式2");  
187 - let fQpgg = value.fQpgg;  
188 - console.log("气瓶规格",fQpgg);  
189 - let name = that.pathName;  
190 - //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code  
191 - console.log("模式2");  
192 - // uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);  
193 - uni.$emit("scanCode",fQptm);  
194 - this.closeScan();  
195 - }  
196 - }).catch(e => {  
197 - console.log(e);  
198 - setTimeout(() => {  
199 - that.componentKey += 1;  
200 - that.$forceUpdate();  
201 - }, 1000)  
202 - }) 165 + await this.$api.gasApi.judgeGasOrBottle({code:code}).then(async (res)=>{
  166 + const { type } = res.value;
  167 + if(!type){
  168 + uni.$u.toast('二维码编号错误!');
  169 + return;
  170 + }
  171 + if(type == 'qp'){
  172 + await this.$api.gasApi.getDetailByQuery(query).then(result => {
  173 + that.$modal.closeLoading();
  174 + let {
  175 + state,
  176 + value,
  177 + message
  178 + } = result;
  179 + console.log('打印扫描气瓶二维码value',value);
  180 + if (!state) {
  181 + uni.$u.toast(message);
  182 + return;
  183 + }
  184 + if (this.mode === 1) {
  185 + uni.redirectTo({
  186 + url: '/pages/mine/appList/gasInformation/gasInformation?qptm=' + value.fQptm
  187 + })
  188 + } else if (this.mode === 2) {
  189 + let fQptm = value.fQptm;
  190 + // let fQptmObj = JSON.stringify(value);
  191 + let fQptmObj = value;
  192 + //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
  193 + console.log("模式2");
  194 + let fQpgg = value.fQpgg;
  195 + console.log("气瓶规格",fQpgg);
  196 + let name = that.pathName;
  197 + //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
  198 + console.log("模式2");
  199 + // uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
  200 + uni.$emit("scanCode",fQptm);
  201 + this.closeScan();
  202 + }
  203 + }).catch(e => {
  204 + console.log(e);
  205 + setTimeout(() => {
  206 + that.componentKey += 1;
  207 + that.$forceUpdate();
  208 + }, 1000)
  209 + })
  210 + }else if(type == 'yg'){
  211 + if (this.mode === 1) {
  212 + uni.redirectTo({
  213 + url: '/pages/scanCodeUserInfo/index?ygbh=' + code
  214 + })
  215 + } else if (this.mode === 2) {
  216 + let fQptm = value.fQptm;
  217 + // let fQptmObj = JSON.stringify(value);
  218 + let fQptmObj = value;
  219 + //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
  220 + console.log("模式2");
  221 + let fQpgg = value.fQpgg;
  222 + console.log("气瓶规格",fQpgg);
  223 + let name = that.pathName;
  224 + //在需要扫码获取code的地方使用uni.$on监听scanCode即可获取code
  225 + console.log("模式2");
  226 + // uni.$emit("scanCode",fQptm,name,fQptmObj,fQpgg);
  227 + uni.$emit("scanCode",fQptm);
  228 + this.closeScan();
  229 + }
  230 + }
  231 + console.log('打印判断是否是员工还是气瓶二维码',res);
  232 + })
  233 +
203 }, 234 },
204 // 传递code模式关闭扫码 235 // 传递code模式关闭扫码
205 closeScan() { 236 closeScan() {
frontend/app-user/pages/scanCodeUserInfo/components/userInfoCard.vue
  Diff comments   View file @b0a3432
@@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
17 </view> 17 </view>
18 </view> 18 </view>
19 <view class="flex justify-between margin-top"> 19 <view class="flex justify-between margin-top">
20 - <view class="flex flex-direction justify-center align-center " style="width: 50%;" v-for="(item,index) of orderList" :key="index"> 20 + <view class="flex flex-direction justify-center align-center " style="width: 50%;" v-for="(item,index) of orderList1" :key="index">
21 <u-image :src="item.imgSrc" mode="aspectFit" width="51px" 21 <u-image :src="item.imgSrc" mode="aspectFit" width="51px"
22 height="60px"></u-image> 22 height="60px"></u-image>
23 - <view class="titleCss">{{item.title}}</view>  
24 - <view class="numCss">{{item.num}}</view> 23 + <view class="titleCss">{{item.name}}</view>
  24 + <view class="numCss">{{item.value}}</view>
25 </view> 25 </view>
26 </view> 26 </view>
27 27
@@ -39,27 +39,36 @@ export default { @@ -39,27 +39,36 @@ export default {
39 default:{ 39 default:{
40 name:'ce' 40 name:'ce'
41 } 41 }
  42 + },
  43 + orderList:{
  44 + type:Array,
  45 + default: []
42 } 46 }
43 }, 47 },
44 data(){ 48 data(){
45 return{ 49 return{
46 - orderList:[ 50 + orderList1:[
47 { 51 {
48 key:'ljpsdd', 52 key:'ljpsdd',
49 imgSrc:orderImg, 53 imgSrc:orderImg,
50 - title:'累计配送订单',  
51 - num:25  
52 - },  
53 - { 54 + name:'累计配送订单',
  55 + value:25
  56 + }, {
54 key:'ljpsqp', 57 key:'ljpsqp',
55 imgSrc:smokeAlarmImg, 58 imgSrc:smokeAlarmImg,
56 - title:'累计配送气瓶',  
57 - num:25 59 + name:'累计配送气瓶',
  60 + value:25
58 } 61 }
59 - ],  
60 - 62 + ]
61 } 63 }
62 }, 64 },
  65 + onLoad(){
  66 +
  67 + },
  68 + mounted(){
  69 + console.log('打印tis.orderList',this.orderList);
  70 + this.orderList1 = this.orderList;
  71 + },
63 methods:{ 72 methods:{
64 handleCallPhone(){ 73 handleCallPhone(){
65 if(this.userInfo.phone){ 74 if(this.userInfo.phone){
frontend/app-user/pages/scanCodeUserInfo/index.vue
  Diff comments   View file @b0a3432
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <view class="topContentCss"></view> 4 <view class="topContentCss"></view>
5 <view class="cardAreaCss" > 5 <view class="cardAreaCss" >
6 <!-- 员工信息 --> 6 <!-- 员工信息 -->
7 - <userInfoCard :userInfo="userInfoData"></userInfoCard> 7 + <userInfoCard :userInfo="userInfoData" :orderList="orderInfoList"></userInfoCard>
8 <!-- 头部气瓶背景文字 --> 8 <!-- 头部气瓶背景文字 -->
9 <!-- 消息轮播 --> 9 <!-- 消息轮播 -->
10 <u-notice-bar class="margin-top" :text="text" direction="column" color="#EB5C11" bgColor="#F1E4DB" speed="50" 10 <u-notice-bar class="margin-top" :text="text" direction="column" color="#EB5C11" bgColor="#F1E4DB" speed="50"
@@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
15 </template> 15 </template>
16 16
17 <script> 17 <script>
  18 +import orderImg from '@/static/images/appList/otherImg/order.png'
  19 +import smokeAlarmImg from '@/static/images/appList/otherImg/smokeAlarm.png'
18 import userInfoImg from '@/static/images/mine/userInfo.png' 20 import userInfoImg from '@/static/images/mine/userInfo.png'
19 import userInfoCard from "./components/userInfoCard"; 21 import userInfoCard from "./components/userInfoCard";
20 import functionCard from "./components/functionCard" 22 import functionCard from "./components/functionCard"
@@ -23,9 +25,29 @@ export default { @@ -23,9 +25,29 @@ export default {
23 userInfoCard, 25 userInfoCard,
24 functionCard 26 functionCard
25 }, 27 },
  28 + onLoad(data){
  29 + if(data.ygbh){
  30 + this.getDetailData(data.ygbh);
  31 + }
  32 + console.log('打印data',data);
  33 + },
26 mounted(){}, 34 mounted(){},
27 data(){ 35 data(){
28 return { 36 return {
  37 + orderInfoList:[
  38 + {
  39 + key:'ljpsdd',
  40 + imgSrc:orderImg,
  41 + name:'累计配送订单',
  42 + value:25
  43 + },
  44 + {
  45 + key:'ljpsqp',
  46 + imgSrc:smokeAlarmImg,
  47 + name:'累计配送气瓶',
  48 + value:25
  49 + }
  50 + ],
29 text: [ 51 text: [
30 '为了您和家人的安全，请不要使用过期的石油气钢瓶', 52 '为了您和家人的安全，请不要使用过期的石油气钢瓶',
31 '温馨提示' 53 '温馨提示'
@@ -38,7 +60,20 @@ export default { @@ -38,7 +60,20 @@ export default {
38 } 60 }
39 } 61 }
40 }, 62 },
41 - methods:{}, 63 + methods:{
  64 + async getDetailData(ygbhCode){
  65 + const result = await this.$api.gasApi.userDetailInfoPort({code:ygbhCode});
  66 + const { value } = result;
  67 + this.userInfoData.phone = value.ffzrlxfs;
  68 + this.userInfoData.name = value.fxm;
  69 + this.userInfoData.address = value.fssczmc;
  70 + this.orderInfoList = await this.$assignValues(value,this.orderInfoList);
  71 + this.$forceUpdate();
  72 +
  73 + console.log('打印获取员工详细信息的result===>',result);
  74 +
  75 + }
  76 + },
42 77
43 } 78 }
44 </script> 79 </script>
frontend/app-user/utils/ruoyi.js
  Diff comments   View file @b0a3432
@@ -351,6 +351,7 @@ export function assignValues(obj, arr) { @@ -351,6 +351,7 @@ export function assignValues(obj, arr) {
351 const updatedArr = arr.map(item => { 351 const updatedArr = arr.map(item => {
352 item.value = obj[item.key]; 352 item.value = obj[item.key];
353 return { 353 return {
  354 + imgSrc:item.imgSrc?item.imgSrc:'',
354 type: item.type ? item.type : '', 355 type: item.type ? item.type : '',
355 name: item.name, 356 name: item.name,
356 key: item.key, 357 key: item.key,
frontend/front/src/components/dialog/realNameAuditDialog.vue
  Diff comments   View file @b0a3432
@@ -108,7 +108,7 @@ export default { @@ -108,7 +108,7 @@ export default {
108 { 108 {
109 name: '经营者姓名', 109 name: '经营者姓名',
110 value: '张三', 110 value: '张三',
111 - key:'fHync' 111 + key:'fXm'
112 }, 112 },
113 { 113 {
114 name: '经营者联系电话', 114 name: '经营者联系电话',
@@ -151,7 +151,7 @@ export default { @@ -151,7 +151,7 @@ export default {
151 { 151 {
152 name: '姓名', 152 name: '姓名',
153 value: '张三', 153 value: '张三',
154 - key:'fHync' 154 + key:'fXm'
155 }, 155 },
156 { 156 {
157 name: '联系电话', 157 name: '联系电话',