Browse Source

文字优化

shish 6 năm trước cách đây
mục cha
commit
d17b20dc6a

+ 0 - 87
shop/src/config/change.bat

@@ -1,87 +0,0 @@
-@echo off
-echo start......
-echo,
-set isMobile=business
-set sass=s-
-set business=b-
-set env=env.js
-set pages=pages.json
-set config=config.js
-set uni=uni.scss
-set /a sum=0
-
-for %%m in (*) do (
-	if "%%m"=="s-config.js" (
-		set isMobile=saas
-	)
-)
-
-echo %isMobile%
-
-if "%isMobile%"=="saas" (
-	echo %isMobile%
-	for %%z in (*) do (
-		echo %%z
-		if "%%z"=="config.js" (
-			ren %%z %business%%%z
-			set /a sum+=1
-		)
-		if "%%z"=="env.js" (
-			ren %%z %business%%%z
-			set /a sum+=1
-		)
-	)
-	echo,
-	for %%z in (*) do (
-		echo %%z
-		if "%%z"=="s-config.js" (
-			ren %%z %config%
-			set /a sum+=1
-		)
-		if "%%z"=="s-env.js" (
-			ren %%z %env%
-			set /a sum+=1
-		)
-	)
-) else (
-	echo %isMobile%
-	for %%z in (*) do (
-		echo %%z
-		if "%%z"=="config.js" (
-			ren %%z %saas%%%z
-			set /a sum+=1
-		)
-		if "%%z"=="env.js" (
-			ren %%z %saas%%%z
-			set /a sum+=1
-		)
-	)
-	echo,
-	for %%z in (*) do (
-		echo %%z
-		if "%%z"=="b-config.js" (
-			ren %%z %config%
-			set /a sum+=1
-		)
-		if "%%z"=="b-env.js" (
-			ren %%z %env%
-			set /a sum+=1
-		)
-	)
-)
-echo,
-echo file change success to *********    %isMobile%
-echo,
-echo ******************  ljd  ********************
-echo,
-echo end ******  %sum%  ****** file is change confirm
-echo,
-echo ******************  jmq  ********************
-echo,
-set isMobile=
-set mobile=
-set business=
-set manifest=
-set pages=
-set config=
-set sum=

+ 14 - 6
shop/src/views/staff/list.vue

@@ -91,7 +91,7 @@
 						</el-select>
 						</el-select>
 					</el-form-item>
 					</el-form-item>
 					<!--
 					<!--
-					<el-form-item label="绑定微信" prop="userId">
+					<el-form-item label="绑定小程序" prop="userId">
 						<div>
 						<div>
 							<div class="member-wrap flex-center" v-if="!$util.isEmpty(memberData)">
 							<div class="member-wrap flex-center" v-if="!$util.isEmpty(memberData)">
 								<div class="member-img">
 								<div class="member-img">
@@ -355,17 +355,26 @@ export default {
 							prop: 'avatar',
 							prop: 'avatar',
 							label: '头像',
 							label: '头像',
 							align: 'center',
 							align: 'center',
-							width: 90
+							width: 90,
+							formatter: row => {
+								return row.adminBaseInfo.avatarUrl;
+							}
 						},
 						},
 						{
 						{
 							prop: 'adminName',
 							prop: 'adminName',
 							label: '姓名',
 							label: '姓名',
-							align: 'center'
+							align: 'center',
+							formatter: row => {
+								return row.adminBaseInfo.adminName;
+							}
 						},
 						},
 						{
 						{
 							prop: 'mobile',
 							prop: 'mobile',
 							label: '手机号',
 							label: '手机号',
-							align: 'center'
+							align: 'center',
+							formatter: row => {
+								return row.adminBaseInfo.mobile;
+							}
 						},
 						},
 						{
 						{
 							prop: 'roleName',
 							prop: 'roleName',
@@ -374,7 +383,7 @@ export default {
 						},
 						},
 						{
 						{
 							prop: 'userId',
 							prop: 'userId',
-							label: '绑定微信',
+							label: '绑定小程序',
 							align: 'center',
 							align: 'center',
 							'min-width': 80
 							'min-width': 80
 						},
 						},
@@ -396,7 +405,6 @@ export default {
 								if (row.loginTime == '0') {
 								if (row.loginTime == '0') {
 									return '-';
 									return '-';
 								}
 								}
-
 								return row.lastLoginTime;
 								return row.lastLoginTime;
 							}
 							}
 						},
 						},