From aadb1ef48237130ddcaab934791092b93a210afa Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 9 Nov 2023 15:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0v5.2.1=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/kefu/pc/components/baseHeader.vue   |  22 +-
 template/admin/src/pages/kefu/pc/index.vue    |   4 +-
 .../admin/src/pages/system/auth/index.vue     |  12 +-
 template/admin/src/theme/app.scss             |   4 -
 .../uni-app/components/catGoodList/index.vue  | 314 +++++++++---------
 .../users/user_distribution_level/index.vue   |   8 +-
 6 files changed, 183 insertions(+), 181 deletions(-)

diff --git a/template/admin/src/pages/kefu/pc/components/baseHeader.vue b/template/admin/src/pages/kefu/pc/components/baseHeader.vue
index c8d2ea0c0..fa970ea29 100644
--- a/template/admin/src/pages/kefu/pc/components/baseHeader.vue
+++ b/template/admin/src/pages/kefu/pc/components/baseHeader.vue
@@ -2,11 +2,12 @@
   <div class="base-header">
     <div class="left-header-wrapper">
       <el-input
+        v-model="value"
         class="search_box"
         prefix="ios-search"
         placeholder="搜索用户名称"
-        @on-enter="bindSearch"
-        @change="inputChange"
+        @change="bindSearch"
+        @input="inputChange"
       />
       <div class="user_info">
         <img v-lazy="kefuInfo.avatar" alt="" />
@@ -79,6 +80,7 @@ export default {
       ],
       curIndex: 0,
       isOnline: false,
+      value: '',
     };
   },
   mounted() {
@@ -104,28 +106,28 @@ export default {
       let self = this;
       this.$msgbox({
         title: '退出登录确认',
-        message:'您确定退出登录当前账户吗？打开的标签页和个人设置将会保存。',
+        message: '您确定退出登录当前账户吗？打开的标签页和个人设置将会保存。',
         showCancelButton: true,
         cancelButtonText: '取消',
         confirmButtonText: '确认',
         iconClass: 'el-icon-warning',
-        confirmButtonClass: 'btn-custom-cancel'
-      }).then(() => {
+        confirmButtonClass: 'btn-custom-cancel',
+      })
+        .then(() => {
           self.logoutKefu({
             confirm: false,
             vm: self,
           });
-      }).catch(() => {
-
-      })
+        })
+        .catch(() => {});
     },
     // 搜索
     bindSearch(e) {
-      this.$emit('search', e.target.value);
+      this.$emit('search', e);
     },
     // inputChange
     inputChange(e) {
-      this.bus.$emit('change', e.target.value);
+      this.bus.$emit('change', e);
     },
   },
 };
diff --git a/template/admin/src/pages/kefu/pc/index.vue b/template/admin/src/pages/kefu/pc/index.vue
index f754f63db..dcd821563 100644
--- a/template/admin/src/pages/kefu/pc/index.vue
+++ b/template/admin/src/pages/kefu/pc/index.vue
@@ -81,7 +81,7 @@
           </div>
           <div class="chat-textarea">
             <div class="chat-btn-wrapper">
-              <div class="left-wrapper">
+              <div class="left-wrappers">
                 <div class="icon-item" @click.stop="isEmoji = !isEmoji">
                   <span class="iconfont iconbiaoqing1"></span>
                 </div>
@@ -786,7 +786,7 @@ export default {
           justify-content: space-between;
           padding: 15px 0;
 
-          .left-wrapper {
+          .left-wrappers {
             display: flex;
             align-items: center;
 
diff --git a/template/admin/src/pages/system/auth/index.vue b/template/admin/src/pages/system/auth/index.vue
index 0e6a7f800..1b47ab448 100644
--- a/template/admin/src/pages/system/auth/index.vue
+++ b/template/admin/src/pages/system/auth/index.vue
@@ -45,8 +45,9 @@
         </div>
         <el-button type="primary" @click="saveCopyRight">保存</el-button>
       </div>
-      <div class="authorized">
-        <div>
+      <div class="authorized auth">
+        <div class="acea-row row-middle">
+          <div class="box"></div>
           <span class="update">上传授权图片:</span>
         </div>
         <div class="uploadPictrue" v-if="authorizedPicture" @click="modalPicTap('单选')">
@@ -265,6 +266,9 @@ export default {
 <style scoped lang="scss">
 .auth {
   padding: 9px 16px 9px 10px;
+  .box{
+    width: 50px;
+  }
 }
 
 .auth .iconIos {
@@ -303,8 +307,6 @@ export default {
 
 .authorized {
   display: flex;
-  margin-left: 18px;
-  margin-bottom: 14px;
 
   .upload {
     width: 60px;
@@ -351,7 +353,7 @@ export default {
 }
 
 .prompt {
-  margin-left: 114px;
+  margin-left: 150px;
   font-size: 12px;
   font-weight: 400;
   color: #999999;
diff --git a/template/admin/src/theme/app.scss b/template/admin/src/theme/app.scss
index 828780b0f..44aa2c392 100644
--- a/template/admin/src/theme/app.scss
+++ b/template/admin/src/theme/app.scss
@@ -259,10 +259,6 @@ body,
   padding: 40px;
 }
 
-.el-table tbody td .cell span:empty::after  {
-  content: '--' !important;
-}
-
 /* 字体大小全局样式
 ------------------------------- */
 @for $i from 10 through 32 {
diff --git a/template/uni-app/components/catGoodList/index.vue b/template/uni-app/components/catGoodList/index.vue
index 4b0e19383..d1e0d6efc 100644
--- a/template/uni-app/components/catGoodList/index.vue
+++ b/template/uni-app/components/catGoodList/index.vue
@@ -1,199 +1,201 @@
 <template>
 	<view class="goodsList">
-		<view class="item" v-for="(item,index) in tempArr" :key='index' @click="goDetail(item)">
+		<view class="item" v-for="(item, index) in tempArr" :key="index" @click="goDetail(item)">
 			<view class="pictrue">
-				<span class="pictrue_log pictrue_log_class"
-					v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-				<span class="pictrue_log pictrue_log_class"
-					v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-				<span class="pictrue_log pictrue_log_class"
-					v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '1'">{{ $t(`秒杀`) }}</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '2'">{{ $t(`砍价`) }}</span>
+				<span class="pictrue_log pictrue_log_class" v-if="item.activity && item.activity.type === '3'">{{ $t(`拼团`) }}</span>
 				<image :src="item.recommend_image" mode="" v-if="item.recommend_image"></image>
 				<image :src="item.image" mode="" v-else></image>
 			</view>
-			<view class="text line2">{{item.store_name}}</view>
+			<view class="text line2">{{ item.store_name }}</view>
 			<view class="bottom acea-row row-between-wrapper">
 				<view class="sales acea-row row-middle">
-					<view class="money font-color"><text>{{$t(`￥`)}}</text>{{item.price}}</view>
-					<view>{{$t(`已售`)}}{{item.sales}}</view>
+					<view class="money font-color">
+						<text>{{ $t(`￥`) }}</text>
+						{{ item.price }}
+					</view>
+					<view>{{ $t(`已售`) }}{{ item.sales }}</view>
 				</view>
-				<view v-if="item.stock>0">
-					<view class="bnt"
-						v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3') || item.is_virtual) || !item.cart_button">
-						{{$t(`立即购买`)}}
+				<view v-if="item.stock > 0">
+					<view
+						class="bnt"
+						v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3')) || item.is_virtual || !item.cart_button"
+					>
+						{{ $t(`立即购买`) }}
 					</view>
 					<view v-else>
 						<!-- 多规格 -->
 						<view class="bnt" @click.stop="goCartDuo(item)" v-if="item.spec_type">
-							{{$t(`加入购物车`)}}
-							<view class="num" v-if="isLogin && item.cart_num">{{item.cart_num}}</view>
+							{{ $t(`加入购物车`) }}
+							<view class="num" v-if="isLogin && item.cart_num">{{ item.cart_num }}</view>
 						</view>
 						<!-- 单规格 -->
-						<view class="bnt" v-if="!item.spec_type && !item.cart_num" @click.stop="goCartDan(item,index)">
-							{{$t(`加入购物车`)}}
+						<view class="bnt" v-if="!item.spec_type && !item.cart_num" @click.stop="goCartDan(item, index)">
+							{{ $t(`加入购物车`) }}
 						</view>
 						<view class="cart acea-row row-middle" v-if="!item.spec_type && item.cart_num">
-							<view class="pictrue iconfont icon-jianhao" @click.stop="CartNumDes(index,item)"></view>
-							<view class="num">{{item.cart_num}}</view>
-							<view class="pictrue iconfont icon-jiahao" @click.stop="CartNumAdd(index,item)"></view>
+							<view class="iconfont icon-jianhao" @click.stop="CartNumDes(index, item)"></view>
+							<view class="num">{{ item.cart_num }}</view>
+							<view class="iconfont icon-jiahao" @click.stop="CartNumAdd(index, item)"></view>
 						</view>
 					</view>
 				</view>
-				<view class="bnt end" v-else>{{$t(`已售罄`)}}</view>
+				<view class="bnt end" v-else>{{ $t(`已售罄`) }}</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		name: 'catGoodList',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			tempArr: {
-				type: Array,
-				default: []
-			},
-			isLogin: {
-				type: Boolean,
-				default: false
-			}
+export default {
+	name: 'catGoodList',
+	props: {
+		dataConfig: {
+			type: Object,
+			default: () => {}
 		},
-		data() {
-			return {
-				addIng: false
-			};
+		tempArr: {
+			type: Array,
+			default: []
 		},
-		created() {},
-		mounted() {},
-		methods: {
-			goDetail(item) {
-				this.$emit('detail', item);
-			},
-			goCartDuo(item) {
-				this.$emit('gocartduo', item);
-			},
-			goCartDan(item, index) {
-				this.$emit('gocartdan', item, index);
-			},
-			CartNumDes(index, item) {
-				if (this.addIng) return
-				this.addIng = true
-				this.$emit('ChangeCartNumDan', false, index, item);
-			},
-			CartNumAdd(index, item) {
-				if (this.addIng) return
-				this.addIng = true
-				this.$emit('ChangeCartNumDan', true, index, item);
-			}
+		isLogin: {
+			type: Boolean,
+			default: false
 		}
-	};
+	},
+	data() {
+		return {
+			addIng: false
+		};
+	},
+	created() {},
+	mounted() {},
+	methods: {
+		goDetail(item) {
+			this.$emit('detail', item);
+		},
+		goCartDuo(item) {
+			this.$emit('gocartduo', item);
+		},
+		goCartDan(item, index) {
+			this.$emit('gocartdan', item, index);
+		},
+		CartNumDes(index, item) {
+			if (this.addIng) return;
+			this.addIng = true;
+			this.$emit('ChangeCartNumDan', false, index, item);
+		},
+		CartNumAdd(index, item) {
+			if (this.addIng) return;
+			this.addIng = true;
+			this.$emit('ChangeCartNumDan', true, index, item);
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	.goodsList {
-		padding: 0 30rpx;
+.goodsList {
+	padding: 0 30rpx;
 
-		.item {
-			width: 100%;
-			box-sizing: border-box;
-			margin-bottom: 63rpx;
+	.item {
+		width: 100%;
+		box-sizing: border-box;
+		margin-bottom: 63rpx;
 
-			.pictrue {
-				// width: 100%;
-				// height: 290rpx;
-				border-radius: 16rpx;
+		.pictrue {
+			// width: 100%;
+			// height: 290rpx;
+			border-radius: 16rpx;
+			position: relative;
+			padding-top: 40%;
+
+			image {
+				border-radius: 10rpx;
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				object-fit: cover;
+			}
+		}
+
+		.text {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #282828;
+			margin: 20rpx 0;
+		}
+
+		.bottom {
+			.sales {
+				font-size: 22rpx;
+				color: #8e8e8e;
+
+				.money {
+					font-size: 42rpx;
+					font-weight: bold;
+					margin-right: 18rpx;
+
+					text {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.cart {
+				height: 56rpx;
+
+				.pictrue {
+					color: var(--view-theme);
+					font-size: 46rpx;
+					width: 50rpx;
+					height: 50rpx;
+					text-align: center;
+					line-height: 50rpx;
+				}
+
+				.num {
+					font-size: 30rpx;
+					color: #282828;
+					font-weight: bold;
+					width: 80rpx;
+					text-align: center;
+				}
+			}
+
+			.bnt {
+				padding: 0 30rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				background: var(--view-theme);
+				border-radius: 42rpx;
+				font-size: 26rpx;
+				color: #fff;
 				position: relative;
-				padding-top: 40%;
 
-				image {
-					border-radius: 10rpx;
-					position: absolute;
-					top: 0;
-					left: 0;
-					width: 100%;
-					height: 100%;
-					object-fit: cover;
-				}
-			}
-
-			.text {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #282828;
-				margin: 20rpx 0;
-			}
-
-			.bottom {
-				.sales {
-					font-size: 22rpx;
-					color: #8E8E8E;
-
-					.money {
-						font-size: 42rpx;
-						font-weight: bold;
-						margin-right: 18rpx;
-
-						text {
-							font-size: 28rpx;
-						}
-					}
+				&.end {
+					background: rgba(203, 203, 203, 1);
 				}
 
-				.cart {
-					height: 56rpx;
-
-					.pictrue {
-						color: var(--view-theme);
-						font-size: 46rpx;
-						width: 50rpx;
-						height: 50rpx;
-						text-align: center;
-						line-height: 50rpx;
-					}
-
-					.num {
-						font-size: 30rpx;
-						color: #282828;
-						font-weight: bold;
-						width: 80rpx;
-						text-align: center;
-					}
-				}
-
-				.bnt {
-					padding: 0 30rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					background: var(--view-theme);
-					border-radius: 42rpx;
-					font-size: 26rpx;
+				.num {
+					background-color: var(--view-priceColor);
+					min-width: 12rpx;
 					color: #fff;
-					position: relative;
-
-					&.end {
-						background: rgba(203, 203, 203, 1);
-					}
-
-					.num {
-						background-color: var(--view-priceColor);
-						min-width: 12rpx;
-						color: #fff;
-						border-radius: 15px;
-						position: absolute;
-						right: -14rpx;
-						top: -15rpx;
-						font-size: 22rpx;
-						padding: 0 10rpx;
-						height: 34rpx;
-						line-height: 34rpx;
-					}
+					border-radius: 15px;
+					position: absolute;
+					right: -14rpx;
+					top: -15rpx;
+					font-size: 22rpx;
+					padding: 0 10rpx;
+					height: 34rpx;
+					line-height: 34rpx;
 				}
 			}
 		}
 	}
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/template/uni-app/pages/users/user_distribution_level/index.vue b/template/uni-app/pages/users/user_distribution_level/index.vue
index 9602d00e9..8dc9bf2a2 100644
--- a/template/uni-app/pages/users/user_distribution_level/index.vue
+++ b/template/uni-app/pages/users/user_distribution_level/index.vue
@@ -32,15 +32,15 @@
 									<view class="level-grow-wrap">
 										<view class="level-info"
 											:class="{'lock-sty':item.grade > (levelInfo.grade || 0)}">
-											<view class="level-info-title">{{$t(`一级分佣上浮`)}}</view>
-											<view class="num">{{item.one_brokerage}}
+											<view class="level-info-title">{{$t(`一级分佣比例`)}}</view>
+											<view class="num">{{item.one_brokerage_percent}}
 												<text class="percent">%</text>
 											</view>
 										</view>
 										<view class="level-info"
 											:class="{'lock-sty':item.grade > (levelInfo.grade || 0)}">
-											<view class="level-info-title">{{$t(`二级分佣上浮`)}}</view>
-											<view class="num">{{item.two_brokerage}}<text class="percent">%</text>
+											<view class="level-info-title">{{$t(`二级分佣比例`)}}</view>
+											<view class="num">{{item.two_brokerage_percent}}<text class="percent">%</text>
 											</view>
 										</view>