优惠方式

mall/src/pages/home/user.vue

@@ -210,6 +210,7 @@
 				this.popupShow = false
 			},
 			logoutFn() {
+				return false
 				uni.clearStorageSync()
 				// #ifdef H5
 				// location.reload()

mall/src/pages/order/detail.vue

@@ -94,7 +94,7 @@
 				<div class="module-com coupon-wrap" v-if="data.discountAmount && data.discountAmount != '0.00'">
 					<div class="module-tit">优惠信息</div>
 					<div class="module-det">
-						<div class="app-color-3">{{ data.discountType == 0 ? '使用优惠券' : data.discountType == 1 ? '会员打折' : '付款随机优惠' }}</div>
+						<div class="app-color-3">{{ data.discountType == 1 ? '使用优惠券' : data.discountType == 2 ? '会员打折' : '随机优惠' }}</div>
 						<div class="app-price">-￥{{ data.discountAmount }}</div>
 					</div>
 				</div>

shop/src/views/member/list.vue

@@ -26,7 +26,12 @@
 			</template>
 
 			<template #table-column-id="{scope}">
-				<span>{{ scope.row.id }}</span>
+				<el-link
+					:underline="true"
+					@click="detailShowFn(scope.row)"
+					style="font-size:12px;"
+					>{{ scope.row.id }}</el-link
+				>
 			</template>
 
 			<template #table-column-mobile="{scope}">
@@ -36,7 +41,7 @@
 
 			<template #table-column-userName="{scope}">
 				<el-link
-					:underline="false"
+					:underline="true"
 					@click="detailShowFn(scope.row)"
 					style="font-size:12px;"
 					>{{ scope.row.userName }}</el-link
@@ -363,7 +368,7 @@ export default {
 						},
 						{
 							prop: 'store',
-							label: '到店',
+							label: '到店消费',
 							align: 'center',
 							width: 100
 						},

shop/src/views/order/list.vue

@@ -21,7 +21,7 @@
 			<!-- 单号 -->
 			<template #table-column-orderSn="{scope}">
 				<el-link
-					:underline="false"
+					:underline="true"
 					@click="detailShowFn(scope.row)"
 					style="font-size:12px;display:inline-block;"
 					>{{ scope.row.orderSn }}</el-link

store/src/admin/member/detail.vue

@@ -102,7 +102,7 @@
 			<template v-slot:content>
 				<div class="app-modal-input-wrap">
 					<div class="inp-list-line">
-						<div class="line-label">请选择等级</div>
+						<div class="line-label">会员等级</div>
 						<div class="line-input">
 							<picker mode="selector" :value="upgradeForm.member" :range="levelData.list" range-key="level" @change="changeLevelFn" class="inp-select">
 								<div v-if="upgradeForm.member">{{ levelSelData.level }}</div>

store/src/admin/setting/list.vue

@@ -25,12 +25,12 @@ export default {
 					url: '/admin/setting/wx-menu'
 				},
 				{
-					name: '新人优惠券',
+					name: '新客优惠',
 					icon: 'iconxinrenlingquanshezhi',
 					url: '/admin/setting/coupon'
 				},
 				{
-					name: '会员等级',
+					name: '客户等级',
 					icon: 'iconhuiyuandengjishezhi',
 					url: '/admin/setting/level'
 				}