diff --git a/src/views/canteen/customers/index.vue b/src/views/canteen/customers/index.vue
index 5044abb0..c353e179 100644
--- a/src/views/canteen/customers/index.vue
+++ b/src/views/canteen/customers/index.vue
@@ -109,7 +109,11 @@
-
+
+
+ {{ transformPhoneNumber(scope.row.phonenumber) }}
+
+
@@ -167,8 +171,8 @@
-
-
+
+
import {
- listCustomers,
- getCustomers,
- delCustomers,
addCustomers,
- updateCustomers,
- syncUserData, updateCache
+ delCustomers,
+ getCustomers,
+ listCustomers,
+ syncUserData,
+ updateCache,
+ updateCustomers
} from "@/api/canteen/customers";
import {findDict} from "@/api/canteen/foodStatistics";
import {listCanteenAll} from "@/api/canteen/canteenIncome";
@@ -325,6 +330,8 @@ export default {
userTypeListMap: [],
canteenList: [],
postList: [],
+ // 定义一个临时变量用来处理手机号的加密解密
+ tempPhoneNumber: '',
};
},
created() {
@@ -337,6 +344,12 @@ export default {
},
},
methods: {
+ transformPhoneNumber(phoneNumber){
+ if (!phoneNumber) {
+ return ''
+ }
+ return atob(phoneNumber)
+ },
// 初始化数据
initData() {
this.getList();
@@ -452,6 +465,11 @@ export default {
this.reset();
const id = row.id || this.ids
getCustomers(id).then(response => {
+ if(response.data.phonenumber === null){
+ this.tempPhoneNumber = '';
+ }else {
+ this.tempPhoneNumber = atob(response.data.phonenumber)
+ }
this.form = {
...response.data,
postCodes: response.data.postCodes ? response.data.postCodes.split(',') : []
diff --git a/src/views/canteen/pointsDistribution/bulkSubsidy.vue b/src/views/canteen/pointsDistribution/bulkSubsidy.vue
index cfcf8236..772517b8 100644
--- a/src/views/canteen/pointsDistribution/bulkSubsidy.vue
+++ b/src/views/canteen/pointsDistribution/bulkSubsidy.vue
@@ -23,6 +23,7 @@
localDownloadTemplateUrl="/glweb/yjCanteen-template/UserFoodAllowance_template.xlsx"
errorUrl="canteen/cmPersonAccount/importExport" template-file-name="用户餐补数据模板"
export-error-file-name="用户餐补数据.xls" title="用户餐补数据" />
+
diff --git a/src/views/canteen/publishMenu/menuList.vue b/src/views/canteen/publishMenu/menuList.vue
index 13716cc3..2949b05f 100644
--- a/src/views/canteen/publishMenu/menuList.vue
+++ b/src/views/canteen/publishMenu/menuList.vue
@@ -65,6 +65,7 @@
修改
+ 下架
删除
@@ -83,7 +84,7 @@