AI助手优化

components/cm-module/cart-components/index.vue

@@ -507,8 +507,6 @@
 
 <script>
 import authorize from '@/common/config/authorize.js'
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import activiPopup from '@/components/cm-module/productDetails/cm-activipopu'
 import couponTabs from '@/components/cm-module/coupon/tui-tabs.vue'
 import cmUnitPopup from './cm-unit-popup.vue'
@@ -526,8 +524,6 @@ export default {
 		}
 	},
 	components: {
-		tuiLoadmore,
-		tuiNomore,
 		activiPopup,
 		couponTabs,
 		cmUnitPopup,

components/cm-module/homeIndex/banner.vue

@@ -117,7 +117,7 @@ export default {
 
 <style lang="scss" scoped>
 .banner {
-	margin-top: 142rpx;
+	margin-top: 150rpx;
 	background: #f7f7f7;
 }
 .swiper-banner-content {

components/cm-module/homeIndex/customer.vue

@@ -2,7 +2,7 @@
     <!-- 自定义导航栏 -->
     <view>
         <view class="navbar-wrap" :class="isScroll ? opacityNav : ''" :style="{
-				height: CustomBar + 72 + 'px',
+				height: CustomBar + 78 + 'px',
 				paddingTop: StatusBar + 'px'
 			}">
             <view class="navbar-text" :style="{
@@ -59,12 +59,9 @@
 
 <script>
     var self
-    import btSearch from '@/components/uni-search/bt-search.vue'
     export default {
         name: 'headerNavbar',
-        components: {
-            btSearch
-        },
+        components: {},
         props: {
             navbarData: {
                 // 由父页面传递的数据
@@ -180,7 +177,7 @@
         background-size: cover;
         border-bottom: none;
     }
-
+    
     .opacityNav {}
 
     .navbar-text {
@@ -232,7 +229,7 @@
         height: 70rpx;
         padding: 0 24rpx 0rpx 24rpx;
         box-sizing: border-box;
-
+        margin-top: 10rpx;
         .gosearch-btn {
             width: 632rpx;
             height: 100%;
@@ -363,7 +360,6 @@
             }
         }
     }
-
     .tui-scroll-box {
         height: 280rpx;
         overflow: hidden;

components/cm-module/productDetails/evaluate.vue

@@ -20,8 +20,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText' />
 				<!--加载loadding-->
 			</scroll-view>	
 		</view>
@@ -30,8 +30,6 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	
 	export default{
@@ -44,8 +42,6 @@
 			}
 		},
 		components:{
-			tuiLoadmore,
-			tuiNomore,
 			uniStars
 		},
 		data() {
@@ -67,7 +63,7 @@
 		created() {
 			this.productID = this.queryProductid
 			this.infoEvaluate()
-			this.setScrollHeight();		
+			this.setScrollHeight()		
 		},
 		methods:{
 			infoEvaluate(){
@@ -77,8 +73,8 @@
 						this.isEmpty = false
 						this.hasNextPage = responseData.hasNextPage
 						this.evaluateList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -102,8 +98,8 @@
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = responseData.hasNextPage
 						this.evaluateList = this.evaluateList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -121,13 +117,13 @@
 				if(this.hasNextPage){
 					this.loadding = true
 					this.pullUpOn = true
-					this.getOnReachBottomData(this.currentTab);
+					this.getOnReachBottomData(this.currentTab)
 				}	
 			},
 			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync()
+				this.windowHeight = windowHeight - 1
+				this.scrollHeight = windowHeight - 1
 			}
 		},
 		

components/thorui/tui-drawer/tui-drawer.vue

@@ -1,98 +1,140 @@
-<template>
-	<view  @touchmove.stop.prevent>
-		<view v-if="mask" class="tui-drawer-mask" :class="{'tui-drawer-mask_show':visible}" @tap="handleMaskClick"></view>
-		<view class="tui-drawer-container" :class="[mode=='left'?'tui-drawer-container_left':'tui-drawer-container_right',visible?'tui-drawer-container_show':'']">
-			<slot></slot>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	/**
-	 * 超过一屏时插槽使用scroll-view
-	 **/
-	export default {
-		name:"tuiDrawer",
-		props: {
-			visible: {
-				type: Boolean,
-				default: false
-			},
-			mask: {
-				type: Boolean,
-				default: true
-			},
-			maskClosable: {
-				type: Boolean,
-				default: true
-			},
-			mode: {
-				type: String,
-				default: 'true' // left right
-			}
-		},
-		methods: {
-			handleMaskClick() {
-				if (!this.maskClosable) {
-					return;
-				}
-				this.$emit('close', {});
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.tui-drawer-mask {
-		opacity: 0;
-		visibility: hidden;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 8888;
-		background-color: rgba(0, 0, 0, 0.6);
-		transition: all 0.3s ease-in-out;
-	}
-	.tui-drawer-mask_show {
-		display: block;
-		visibility: visible;
-		opacity: 1;
-	}
-
-	.tui-drawer-container {
-		position: fixed;
-		left: 50%;
-		height: 100.2%;
-		top: 0;
-		transform: translate3d(-50%, -50%, 0);
-		transform-origin: center;
-		transition: all 0.3s ease-in-out;
-		z-index: 99999;
-		opacity: 0;
-		overflow-y: scroll;
-		background-color: #fff;
-		-webkit-overflow-scrolling: touch;
-		-ms-touch-action: pan-y cross-slide-y;
-		-ms-scroll-chaining: none;
-		-ms-scroll-limit: 0 50 0 50;
-	}
-	.tui-drawer-container_left {
-		left: 0;
-		top: 50%;
-		transform: translate3d(-100%, -50%, 0);
-	}
-
-	.tui-drawer-container_right {
-		right: 0;
-		top: 50%;
-		left: auto;
-		transform: translate3d(100%, -50%, 0);
-	}
-	.tui-drawer-container_show {
-		opacity: 1;
-		transform: translate3d(0, -50%, 0);
-	}
+<template>
+	<!-- @touchmove.stop.prevent -->
+	<view>
+		<view v-if="mask" class="tui-drawer-mask" :class="{ 'tui-drawer-mask_show': visible }" :style="{ zIndex: maskZIndex }" @tap="handleMaskClick"></view>
+		<view
+			class="tui-drawer-container"
+			:class="[`tui-drawer-container_${mode}`, visible ? `tui-drawer-${mode}__show` : '']"
+			:style="{ zIndex: zIndex, backgroundColor: backgroundColor }"
+		>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * 超过一屏时插槽使用scroll-view
+ **/
+export default {
+	name: 'tuiDrawer',
+	emits: ['close'],
+	props: {
+		visible: {
+			type: Boolean,
+			default: false
+		},
+		mask: {
+			type: Boolean,
+			default: true
+		},
+		maskClosable: {
+			type: Boolean,
+			default: true
+		},
+		// left right bottom top
+		mode: {
+			type: String,
+			default: 'right'
+		},
+		//drawer z-index
+		zIndex: {
+			type: [Number, String],
+			default: 990
+		},
+		//mask z-index
+		maskZIndex: {
+			type: [Number, String],
+			default: 980
+		},
+		backgroundColor: {
+			type: String,
+			default: '#fff'
+		}
+	},
+	methods: {
+		handleMaskClick() {
+			if (!this.maskClosable) {
+				return;
+			}
+			this.$emit('close', {});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.tui-drawer-mask {
+	opacity: 0;
+	visibility: hidden;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.6);
+	transition: all 0.3s ease-in-out;
+}
+.tui-drawer-mask_show {
+	display: block;
+	visibility: visible;
+	opacity: 1;
+}
+
+.tui-drawer-container {
+	position: fixed;
+	left: 50%;
+	height: 100.2%;
+	top: 0;
+	transform: translate3d(-50%, -50%, 0);
+	transform-origin: center;
+	transition: all 0.3s ease-in-out;
+	opacity: 0;
+	overflow-y: scroll;
+	-webkit-overflow-scrolling: touch;
+	-ms-touch-action: pan-y cross-slide-y;
+	-ms-scroll-chaining: none;
+	-ms-scroll-limit: 0 50 0 50;
+}
+.tui-drawer-container_left {
+	left: 0;
+	top: 50%;
+	transform: translate3d(-100%, -50%, 0);
+}
+
+.tui-drawer-container_right {
+	right: 0;
+	top: 50%;
+	left: auto;
+	transform: translate3d(100%, -50%, 0);
+}
+
+.tui-drawer-container_bottom,
+.tui-drawer-container_top {
+	width: 100%;
+	height: auto !important;
+	min-height: 20rpx;
+	left: 0;
+	right: 0;
+	transform-origin: center;
+	transition: all 0.3s ease-in-out;
+}
+.tui-drawer-container_bottom {
+	bottom: 0;
+	top: auto;
+	transform: translate3d(0, 100%, 0);
+}
+.tui-drawer-container_top {
+	transform: translate3d(0, -100%, 0);
+}
+.tui-drawer-left__show,
+.tui-drawer-right__show {
+	opacity: 1;
+	transform: translate3d(0, -50%, 0);
+}
+.tui-drawer-top__show,
+.tui-drawer-bottom__show {
+	opacity: 1;
+	transform: translate3d(0, 0, 0);
+}
 </style>

components/thorui/tui-top-dropdown/tui-top-dropdown.vue

@@ -77,7 +77,7 @@ export default {
 	/* visibility: hidden; */
 	transition: all 0.3s ease-in-out;
 	z-index: 996;
-	top: 0;
+	top: -12rpx;
 }
 
 .tui-dropdown-show {

components/tui-components/loadmore/loadmore.vue

@@ -1,166 +0,0 @@
-<template>
-	<view class="tui-loadmore" v-if="visible">
-		<view :class="['tui-loading-'+index, (index==3 && type)?'tui-loading-'+type:'']"></view>
-		<view class="tui-loadmore-tips">{{text}}</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "tuiLoadmore",
-		props: {
-			//显示文本
-			text: {
-				type: String,
-				default: "正在加载..."
-			},
-			//是否可见
-			visible: {
-				type: Boolean,
-				default: false
-			},
-			//loading 样式 ：1,2,3
-			index: {
-				type: Number,
-				default: 1
-			},
-			//颜色设置，只有index=3时生效：primary，red，orange，green
-			type: {
-				type: String,
-				default: ""
-			}
-		}
-	}
-</script>
-
-<style>
-	.tui-loadmore {
-		width: 48%;
-		margin: 1.5em auto;
-		line-height: 1.5em;
-		font-size: 24upx;
-		text-align: center;
-	}
-
-	.tui-loading-1 {
-		margin: 0 5px;
-		width: 20px;
-		height: 20px;
-		display: inline-block;
-		vertical-align: middle;
-		-webkit-animation: a 1s steps(12) infinite;
-		animation: a 1s steps(12) infinite;
-		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
-		background-size: 100%;
-	}
-
-	@-webkit-keyframes a {
-		0% {
-			-webkit-transform: rotate(0deg);
-			transform: rotate(0deg);
-		}
-
-		to {
-			-webkit-transform: rotate(1turn);
-			transform: rotate(1turn);
-		}
-	}
-
-	@keyframes a {
-		0% {
-			-webkit-transform: rotate(0deg);
-			transform: rotate(0deg);
-		}
-
-		to {
-			-webkit-transform: rotate(1turn);
-			transform: rotate(1turn);
-		}
-	}
-
-	.tui-loadmore-tips {
-		display: inline-block;
-		vertical-align: middle;
-	}
-
-	.tui-loading-2 {
-		width: 28upx;
-		height: 28upx;
-		border: 1px solid #8f8d8e;
-		border-radius: 50%;
-		margin: 0 6px;
-		display: inline-block;
-		vertical-align: middle;
-		clip-path: polygon(0% 0%,100% 0%,100% 30%,0% 30%);
-		animation: rotate 1s linear infinite;
-	}
-
-	@-webkit-keyframes rotate {
-		from {
-			transform: rotatez(0deg);
-		}
-
-		to {
-			transform: rotatez(360deg);
-		}
-	}
-
-	@keyframes rotate {
-		from {
-			transform: rotatez(0deg);
-		}
-
-		to {
-			transform: rotatez(360deg);
-		}
-	}
-
-	.tui-loading-3 {
-		display: inline-block;
-		margin: 0 6px;
-		vertical-align: middle;
-		width: 28upx;
-		height: 28upx;
-		background: 0 0;
-		border-radius: 50%;
-		border: 2px solid;
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
-		animation: tui-rotate 0.7s linear infinite;
-	}
-
-	.tui-loading-3.tui-loading-primary {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #5677fc;
-	}
-
-	.tui-loading-3.tui-loading-green {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #19be6b;
-	}
-
-	.tui-loading-3.tui-loading-orange {
-		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #ff7900;
-	}
-
-	.tui-loading-3.tui-loading-red {
-		border-color: #ededed #ededed #ededed #ed3f14;
-	}
-
-	@-webkit-keyframes tui-rotate {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-
-	@keyframes tui-rotate {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
-</style>

components/tui-components/nomore/nomore.vue

@@ -1,119 +0,0 @@
-<template>
-	<view class="tui-nomore-class tui-loadmore-none" v-if="visible">
-		<view :class="[isDot?'tui-nomore-dot':'tui-nomore']">
-			<view :style="{background:bgcolor}" :class="[isDot?'tui-dot-text':'tui-nomore-text']">{{isDot?dotText:text}}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "tuiNomore",
-		props: {
-			//是否可见
-			visible: {
-				type: Boolean,
-				default: false
-			},
-			//当前页面背景颜色
-			bgcolor: {
-				type: String,
-				default: "#FFFFFF"
-			},
-			//是否以圆点代替 "没有更多了"
-			isDot: {
-				type: Boolean,
-				default: false
-			},
-			//isDot为false时生效
-			text: {
-				type: String,
-				default: "已至底部"
-			}
-		},
-		data() {
-			return {
-				dotText: "●"
-			};
-		}
-	}
-</script>
-
-<style>
-	.tui-loadmore-none {
-		width: 50%;
-		margin: 1em auto;
-		line-height: 1.5em;
-		font-size: 24rpx;
-		display: flex;
-		justify-content: center;
-	}
-
-	.tui-nomore {
-		width: 100%;
-		height: 100%;
-		position: relative;
-		display: flex;
-		justify-content: center;
-		margin-top: 10rpx;
-		padding-bottom: 6rpx;
-	}
-
-	.tui-nomore::before {
-		content: ' ';
-		position: absolute;
-		border-bottom: 1rpx solid #e5e5e5;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		width: 100%;
-		top: 18rpx;
-		left: 0;
-	}
-
-	.tui-nomore-text {
-		color: #999;
-		font-size: 24rpx;
-		text-align: center;
-		padding: 0 18rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		position: relative;
-		z-index: 1;
-	}
-
-	.tui-nomore-dot {
-		position: relative;
-		text-align: center;
-		-webkit-display: flex;
-		display: flex;
-		-webkit-justify-content: center;
-		justify-content: center;
-		margin-top: 10rpx;
-		padding-bottom: 6rpx;
-	}
-
-	.tui-nomore-dot::before {
-		content: '';
-		position: absolute;
-		border-bottom: 1rpx solid #e5e5e5;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		width: 360rpx;
-		top: 18rpx;
-	}
-
-	.tui-dot-text {
-		position: relative;
-		color: #e5e5e5;
-		font-size: 10px;
-		text-align: center;
-		width: 50rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		-webkit-transform: scale(0.8);
-		transform: scale(0.8);
-		-webkit-transform-origin: center center;
-		transform-origin: center center;
-		z-index: 1;
-	}
-</style>

components/uni-search/bt-search.vue

@@ -1,67 +0,0 @@
-<template name="bt-search">
-	<view class="search-input">
-		<template>
-			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<text>{{toestText}}</text>
-			</view>
-		</template>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:"bt-search",
-		props:{
-			clickPath:{	//选择块级显示还是圆形显示
-				type: String,
-				default: ''
-			},
-			toestText:{
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				
-			};
-		},
-		methods:{
-			
-		}
-	}	
-</script>
-
-<style lang="scss">
-	.search-input{
-		width: 100%;
-		height: 70rpx;
-		padding: 12rpx 0;
-		background: #FFFFFF;
-		.gosearch-btn{
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex: 1;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			width: 662rpx;
-			height: 100%;
-			border-radius: 40rpx;
-			background: #F0F0F0;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 70rpx;
-			color: #8A8A8A;
-			.icon-iconfonticonfontsousuo1{
-				margin:0 6rpx;
-				font-size: 34rpx;
-				color: #8A8A8A;
-				z-index: 10;
-			}
-		}
-	}
-</style>

components/uni-search/or-search.vue

@@ -1,323 +0,0 @@
-<template name="or-search">
-	<view>
-		<view class="search">
-			<view class="search-input">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="searchStart()" placeholder="请输入商品关键词" v-model.trim="searchText"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn" @click="searchStart()">
-				搜索
-			</view>
-		</view>
-		<view class="search-container">
-			<view :class="'s-' + theme" v-if="isSearchHistory">
-				<view class="header">
-					搜索历史
-					<text class="iconfont icon-shanchu" @click="delhistory"></text>
-				</view>
-				<view class="list">
-					<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 删除弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText' 
-					 @btnConfirm ='confirmDetele'>
-		</model-alert>
-	</view>
-</template>
-
-<script>
-	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
-	import authorize from '@/common/config/authorize.js'
-	export default{
-		name:"or-search",
-		components:{
-			modelAlert
-		},
-		props:{
-			isFocus:{	//是否自动获取焦点
-				type: Boolean,
-				default: false
-			},
-			theme:{	//选择块级显示还是圆形显示
-				type: String,
-				default: 'block'
-			}
-		},
-		data() {
-			return {
-				searchText:'',								//搜索关键词
-				alertText:'确定删除全部历史记录?',
-				isShowDelModal:false,						//控制显示删除弹窗
-				isShowClose:false,							//是否显示清空输入框图标
-				isSearchHistory:false,						//是都显示搜索历史
-				serachRecordList:[]
-			};
-		},
-		created() {
-		},
-		methods: {
-			initGetSerachRecord(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					this.$api.get('/search/history',{organizeID:this.userOrganizeID,code:wechatcode},
-						response =>{
-							if(response.code == '1'){
-								this.serachRecordList = response.data
-								if(this.serachRecordList.length>0){
-									this.isSearchHistory = true
-								}else{
-									this.isSearchHistory = false
-								}
-							}else{
-								this.$util.msg(response.msg,2000)
-							}							
-						}
-					)
-				})
-			},
-			searchStart: function() {	//触发搜索
-				let _this = this;
-				if (_this.searchText == '') {
-					this.$util.msg('请输入商品关键词',2000);
-				}else{
-					_this.isSearchHistory = false
-					_this.$emit('getSearchText', _this.searchText)
-				}
-			},
-			onShowClose () { //输入框失去焦点时触发
-				this.inputEmpty(this.searchText)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.searchText)
-				this.initGetSerachRecord()
-			},
-			delInputText () { //清除输入框内容
-				this.searchText = ''
-				this.isShowClose = false
-				this.$parent.isShowWrapper = false
-				this.inputEmpty(this.searchText)
-				this.initGetSerachRecord()
-			},
-			keywordsClick (item) {	//关键词搜索与历史搜索
-				this.searchText = item;
-				this.searchStart();
-			},
-			delhistory () {		//清空历史记录
-				this.isShowDelModal = true;				
-			},
-			confirmDetele() {
-				this.isShowDelModal = false;
-				authorize.getCode('weixin').then(wechatcode =>{
-					this.$api.get('/search/deleteOrderRecord',{organizeID:this.userOrganizeID,code:wechatcode},
-						response =>{
-							if(response.code == '1'){
-								this.serachRecordList=[];
-								this.isSearchHistory = false
-							}else{
-								this.$util.msg(response.msg,2000)
-							}							
-						}
-					)
-				})
-			},
-			inputEmpty(val){
-				this.$parent.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-				}else{
-					this.isShowClose = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni.scss";
-	.search{
-		width: 702rpx;
-		height: 80rpx;
-		padding: 12rpx 24rpx;
-		border-bottom: 1px solid #F0F0F0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 1001;
-		.search-input{
-			width: 448rpx;
-			height: 80rpx;
-			padding: 0 68rpx;
-			line-height: 80rpx;
-			border-radius: 40rpx;
-			position: relative;
-			background: #F0F0F0;
-			float: left;
-			.icon-iconfonticonfontsousuo1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				left: 24rpx;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 24rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 10;
-			}
-			input{
-				width: 448rpx;
-				height: 80rpx;
-				background-color: #F0F0F0;
-				font-size: 26rpx;
-			}
-		}
-		.search-btn{
-			width: 118rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			color: $color-system;
-			font-size: 30rpx;
-			text-align: center;
-			float: left;
-		}
-		.voice-icon{
-			width: 36rpx;
-			height: 36rpx;
-			padding: 16rpx 20rpx 16rpx 0;
-			position: absolute;
-			left: 16rpx;
-			top: 4rpx;
-			z-index: 10;
-		}
-		
-	}
-	.search-container{
-		padding-top: 106rpx;
-	}
-	.s-block{
-		background: #FFFFFF;
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding-bottom: 40rpx;
-			view{
-				color: #8A8A8A;
-				font-size: 24rpx;
-				box-sizing: border-box;
-				text-align: center;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 24rpx;
-				margin:12rpx;
-				padding:.0 30rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				background-color: #F3F3F3;
-			}
-		}
-	}
-	.s-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-			image{
-				width: 36rpx;
-				height: 36rpx;
-				padding: 10rpx;
-				position: absolute;
-				right: 40rpx;
-				top: 24rpx;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.wanted-block{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 50%;
-				color: #8A8A8A;
-				font-size: 28rpx;
-				box-sizing: border-box;
-				text-align: center;
-				padding: 20rpx 0;
-				border-top: 2rpx solid #FFF;
-				border-left: 2rpx solid #FFF;
-				background-color: #F7F7F7;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-	.wanted-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-</style>

pages.json

@@ -599,8 +599,8 @@
 					"path": "chats/index",
 					"style": {
 						"navigationBarTitleText": "采美Ai助手",
-                        "enablePullDownRefresh": true
-                        // "navigationStyle": "custom"
+                        "enablePullDownRefresh": true,
+                        "navigationStyle": "custom"
 					}
 				}
 				

pages/goods/cart.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="container cart clearfix" :style="{paddingTop:CustomBar+'px'}">
-		<custom :systeminfo='systeminfo'  :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></custom>
+		<custom :systeminfo='systeminfo'  :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1' />
 		<cart ref="cart" :pathType='pathType'></cart>
 	</view>
 </template>
 <script>
-	import { mapState,mapMutations } from 'vuex';
-	import custom from "./components/cm-navbar.vue" //顶部自定义胶囊'
+	import { mapState,mapMutations } from 'vuex'
+	import custom from './components/cm-navbar.vue' //顶部自定义胶囊'
 	import cart from '@/components/cm-module/cart-components/index.vue'
 	export default{
 		components:{
@@ -29,7 +29,7 @@
 			}
 		},
 		onLoad(){
-			this.isShowComponents = true;
+			this.isShowComponents = true
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo','isWxAuthorize'])
@@ -37,11 +37,11 @@
 		methods:{
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
+				let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
 				return headerBtnPosi
 			},
 			setSysteminfo(){
-				let systeminfo;
+				let systeminfo
 				uni.getSystemInfo({ // 获取设备信息
 					success: (res) => {
 						systeminfo = res

pages/goods/components/instrument-recommend.vue

@@ -13,8 +13,6 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	
 	export default{
 		name:'recommend',
@@ -25,8 +23,6 @@
 			}
 		},
 		components:{
-			tuiLoadmore,
-			tuiNomore,
 		},
 		data() {
 			return{
@@ -50,19 +46,19 @@
 						2:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${value.linkParam.id}`,
 					 	// 7:`/pages/supplier/user/my-shop?shopId=${value.linkParam.id}`,
-					 	8:`/pages/h5/activity/activity-list`,
-					 	9:`/pages/second/form/introduce`,
-					 	10:`/pages/second/product/product-list`,
-					 	11:`/pages/second/form/form`,
+					 	8:'/pages/h5/activity/activity-list',
+					 	9:'/pages/second/form/introduce',
+					 	10:'/pages/second/product/product-list',
+					 	11:'/pages/second/form/form',
 					 	12:`/pages/search/search?keyWord=${value.title}`,
 					 	13:`/pages/h5/article/path?link=${value.link}`,
 					 	14:`/pages/h5/article/path?link=${value.link}`,
 					 	15:`/pages/h5/article/path?link=${value.link}`,
-					 	17:`/pages/login/register-select`,
+					 	17:'/pages/login/register-select',
 					 	18:`/pages/h5/article/path?link=${value.link}`,
 					 	19:`/pages/search/search-supplier?keyWord=${value.title}`
 					 }
-					 const url = typeMap[value.linkType];
+					 const url = typeMap[value.linkType]
 					 this.$api.navigateTo(url)
 				 }
 			}

pages/goods/components/recommend.vue

@@ -14,8 +14,6 @@
 <script>
 	import { mapState,mapMutations} from 'vuex'
 	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	
 	export default{
 		name:'recommend',
@@ -30,8 +28,6 @@
 			}
 		},
 		components:{
-			tuiLoadmore,
-			tuiNomore,
 		},
 		data() {
 			return{

pages/goods/good-hot.vue

@@ -245,8 +245,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>

pages/goods/goods-active.vue

@@ -58,23 +58,18 @@
 				</view>
 			</view>
 			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+			<tui-loadmore :visible="loadding" :index="3" type="black" />
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 			<!--加载loadding-->
 		</view>
 	</view>
 </template>
 
 <script>
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import { mapState, mapMutations } from 'vuex'
 
 export default {
-	components: {
-		tuiLoadmore,
-		tuiNomore
-	},
+	components: {},
 	data() {
 		return {
 			isRepuest: false,

pages/goods/goods-classify.vue

@@ -283,8 +283,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 					<!--加载loadding-->
 				</view>
 			</template>

pages/goods/goods-doc-list.vue

@@ -47,8 +47,8 @@
         </view>
         <!-- loading more -->
         <view v-if="showList.length > 6">
-            <tui-loadmore :text="loadingText" :index="1" :visible="isLoading"></tui-loadmore>
-            <tui-nomore :text="loadingText" :visible="!isLoading"></tui-nomore>
+            <tui-loadmore :text="loadingText" :index="1" :visible="isLoading" />
+            <tui-nomore :text="loadingText" :visible="!isLoading" />
         </view>
         <!-- back top -->
         <!-- <tui-scroll-top :scrollTop="scrollTop"></tui-scroll-top> -->

pages/goods/goods-supporting.vue

@@ -265,8 +265,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>
@@ -277,7 +277,7 @@
 			:skuProduct="handlePros"
 			@btnConfirm="handleBtnConfirm"
 			@skuClick="handleSkuClick"
-		></cm-unit-suppor-popup>
+		/>
 		<!-- 取消收藏操作 -->
 		<view class="fiexd-popup-box clearfix">
 			<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0rpx' }">
@@ -299,16 +299,12 @@
 	</view>
 </template>
 <script>
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
 import cmUnitSupporPopup from './components/cm-unit-suppor-popup.vue'
 
 import { mapState, mapMutations } from 'vuex'
 export default {
 	components: {
-		tuiLoadmore,
-		tuiNomore,
 		uniGrader,
 		cmUnitSupporPopup
 	},

pages/h5/activity/activity-list.vue

@@ -12,23 +12,18 @@
 				</view>
 			</view> 
 			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+			<tui-loadmore :visible="loadding" :index="3" type="black" />
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 			<!--加载loadding-->
 		</scroll-view>
 	</view>
 </template>
 
 <script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import cmsMixins from '@/mixins/cmsMixins.js'
 	export default{
 		mixins: [cmsMixins],
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
+		components:{},
 	    data() {
 	        return {
 				isEmpty:false,
@@ -59,8 +54,8 @@
 						this.isEmpty = false
 						this.hasNextPage = responseData.hasNextPage
 						this.list = responseData.list
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -83,8 +78,8 @@
 					if(responseData.list&&responseData.list.length > 0){
 						this.hasNextPage = response.data.hasNextPage
 						this.list = this.list.concat(responseData.list) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'

pages/login/logincode.vue

@@ -20,7 +20,7 @@
     import authorize from '@/common/config/authorize.js'
     import wxLogin from '@/common/config/wxLogin.js'
     import { mapState, mapMutations } from 'vuex'
-    import keyInput from '@/components/uni-keyinput/uni-keyinput'
+    import keyInput from './components/uni-keyinput/uni-keyinput'
 
     export default {
         components: {

pages/notice/club/notice-coupon.vue

@@ -36,8 +36,8 @@
 					</tui-swipe-action>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>
@@ -84,9 +84,9 @@ export default {
 		},
 		handleOrderClick(cell) {
 			const linkJumpMap = {
-				1: `/pages/user/coupon/coupon-collection`,
-				2: `/pages/user/coupon/coupon`,
-				3: `/pages/user/coupon/coupon-collection`,
+				1: '/pages/user/coupon/coupon-collection',
+				2: '/pages/user/coupon/coupon',
+				3: '/pages/user/coupon/coupon-collection',
 			}
 			this.$api.navigateTo(linkJumpMap[cell.couponMessageType])
 		}

pages/notice/club/notice-serve.vue

@@ -30,8 +30,8 @@
 					</tui-swipe-action>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>

pages/notice/club/notice-users.vue

@@ -36,8 +36,8 @@
 					</tui-swipe-action>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>
@@ -84,10 +84,10 @@ export default {
 		},
 		handleOrderClick(cell) {
 			const linkJumpMap = {
-				2: `/pages/user/member/member`,
-				3: `/pages/user/member/member`,
-				4: `/pages/user/member/member`,
-				6: `/pages/login/apply`
+				2: '/pages/user/member/member',
+				3: '/pages/user/member/member',
+				4: '/pages/user/member/member',
+				6: '/pages/login/apply'
 			}
 			this.$api.navigateTo(linkJumpMap[cell.accountType])
 		}

pages/notice/shop/notice-serve.vue

@@ -30,8 +30,8 @@
 					</tui-swipe-action>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>

pages/notice/shop/notice-users.vue

@@ -30,8 +30,8 @@
 					</tui-swipe-action>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>

pages/search/search-instrument.vue

@@ -29,8 +29,8 @@
 						<view class="pros-name">{{ isInterceptHtmlFn(item.name) }}</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 			</view>
 		</view>
@@ -39,15 +39,10 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import wxLogin from "@/common/config/wxLogin.js"
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import wxLogin from '@/common/config/wxLogin.js'
 	import { mapState } from 'vuex'
 	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore
-		},
+		components:{},
 		data() {
 			return {
 				iconClass:'icon-aixin',
@@ -75,7 +70,7 @@
 			}
 			if(option.keyWord){
 				this.listQuery.keyword = option.keyWord
-				this.GetSearchEquipmentList();
+				this.GetSearchEquipmentList()
 			}
 		},
 		methods: {
@@ -100,8 +95,8 @@
 					if(dataList && dataList.length > 0){
 						this.isEmpty = false
 						this.list = dataList
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.total>this.list.length){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -171,7 +166,7 @@
 		      // 来自页面内转发按钮
 		    }
 			return {
-			  title: `做项目找仪器，上采美`,
+			  title: '做项目找仪器，上采美',
 			  path: `pages/search/search-instrument?type=share&keyWord=${this.listQuery.keyword}`
 			}
 		},

pages/search/search-library.vue

@@ -54,12 +54,12 @@
         </view>
         <!-- 加载 loading -->
         <template v-if="!isListEmpty">
-            <tui-loadmore :index="2" :visible="isLoading"></tui-loadmore>
+            <tui-loadmore :index="2" :visible="isLoading" />
             <tui-nomore
                 :text="hasMore ? '上拉加载更多' : '没有更多了'"
                 :visible="!isLoading"
                 backgroundColor="#f5f5f5"
-            ></tui-nomore>
+            />
         </template>
 
         <!-- 搜索关键词库提示 -->

pages/search/search-supplier.vue

@@ -76,16 +76,12 @@
 <script>
 	import wxLogin from '@/common/config/wxLogin.js'
 	import { mapState } from 'vuex'
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import cmRossPopup from '@/components/cm-module/cm-ross/cm-ross-popup'
 	import authorize from '@/common/config/authorize.js'	
 	import cmSrsMixins from '@/utils/cmSrsMixins.js'
 	export default {
 		components:{
-			tuiLoadmore,
-			tuiNomore,
 			uniStars,
 			cmRossPopup
 		},

pages/search/search_new.vue

@@ -69,12 +69,12 @@
 
         <!-- 加载 loading -->
         <template v-if="!isEmpty">
-            <tui-loadmore :index="2" :visible="isLoading"></tui-loadmore>
+            <tui-loadmore :index="2" :visible="isLoading" />
             <tui-nomore
                 :text="hasMore ? '上拉加载更多' : '没有更多了'"
                 :visible="!isLoading"
                 backgroundColor="#f5f5f5"
-            ></tui-nomore>
+            />
         </template>
 
         <!-- 商品筛选框 -->

pages/second/product/components/secondRecommend.vue

@@ -16,8 +16,6 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	
 	export default{
 		name:'recommend',
@@ -27,10 +25,7 @@
 				type: Number,
 			}
 		},
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
+		components:{},
 		data() {
 			return{
 				current:0,
@@ -60,8 +55,8 @@
 			},
 			//轮播图切换修改背景色
 			swiperChange(e) {
-				const index = e.detail.current;
-				this.current = index;
+				const index = e.detail.current
+				this.current = index
 			},
 			navToDetailPage(id) {//跳转商品详情页
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)

pages/seller/cart/cart.vue

@@ -216,10 +216,9 @@
 							</view>
 						</view>
 					</view>
-
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 					<!--加载loadding-->
 				</scroll-view>
 				<!-- 脚部菜单 -->
@@ -281,8 +280,6 @@
 	</view>
 </template>
 <script>
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import activiPopup from './components/cm-activipopu'
 import modalLayer from '@/components/modal-layer'
 import cmUnitPopup from './components/cm-unit-cart-popup'
@@ -299,8 +296,6 @@ const defaultListQuery = {
 export default {
 	mixins: [apisMixins, cartMixins],
 	components: {
-		tuiLoadmore,
-		tuiNomore,
 		activiPopup,
 		cmUnitPopup,
 		modalLayer

pages/seller/club/allClub-list.vue

@@ -42,8 +42,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 				</scroll-view>
 			</view>
@@ -53,13 +53,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
+		components:{},
 		data() {
 			return {
 				serviceProviderId:'',

pages/seller/club/club-list.vue

@@ -74,8 +74,8 @@
                             </view>
                         </view>
                         <!--加载loadding-->
-                        <tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-                        <tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+                        <tui-loadmore :visible="loadding" :index="3" type="black" />
+                        <tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
                         <!--加载loadding-->
                     </scroll-view>
                 </view>
@@ -86,8 +86,6 @@
 
 <script>
     import authorize from '@/common/config/authorize.js'
-    import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-    import tuiNomore from '@/components/tui-components/nomore/nomore'
     const defaultListQuery = {
         userIdentity: '',
         name: '',
@@ -99,10 +97,7 @@
         groupServiceId: 0
     }
     export default {
-        components: {
-            tuiLoadmore,
-            tuiNomore
-        },
+        components: {},
         data() {
             return {
                 skeletonShow:true,

pages/seller/club/stayClub-list.vue

@@ -42,8 +42,8 @@
 						</view>	
 					</view>	
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 				</scroll-view>
 			</view>
@@ -55,13 +55,9 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import shareModel from '@/components/cm-module/modelAlert/shareModel.vue'			 //分享弹窗
 	export default {
 		components:{
-			tuiLoadmore,
-			tuiNomore,
 			shareModel
 		},
 		data() {
@@ -94,19 +90,19 @@
 			}
 		},
 		onLoad(){				
-			this.setScrollHeight();
+			this.setScrollHeight()
 		},
 		methods: {
 			setScrollHeight() {
 				// 窗口高度 - 底部距离
 				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
+					const query = wx.createSelectorQuery().in(this)
+					query.selectAll('.add-btn').boundingClientRect()
 					query.exec(res => {
 						if(res[0][0]){
 							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
+								eleTop = res[0][0].top - 1
+								this.scrollHeight =  eleTop
 						}
 					})
 				}, 500)
@@ -123,8 +119,8 @@
 						this.isEmpty = false
 						this.hasNextPage = response.data.hasNextPage
 						this.clubList =responseData.list
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -149,8 +145,8 @@
 					if(responseData.list&&responseData.list.length > 0){
 						this.hasNextPage = response.data.hasNextPage
 						this.clubList = this.clubList.concat(responseData.list) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -175,7 +171,7 @@
 					.then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
 						setTimeout(()=>{
-							this.searchClubList();
+							this.searchClubList()
 						},2000)
 					})
 					.catch(error =>{
@@ -209,16 +205,16 @@
 			},
 			hidePhone(val){
 				let phone
-				if(val==null || val==""){
-					phone = ""	
+				if(val==null || val==''){
+					phone = ''	
 				}else{
 					phone = this.$reg.hidePhone(val)
 				}
 				return phone
 			},
 			checkData (value){
-				let data;
-				if(value == null || value ==""){
+				let data
+				if(value == null || value ==''){
 					data = ''
 				}else{
 					data = value
@@ -253,8 +249,8 @@
 		onShow() {
 			this.$api.getStorage().then(response =>{
 				this.listQuery.userId = response.userId
-				this.listQuery.pageNum = 1;
-				this.initclubList();
+				this.listQuery.pageNum = 1
+				this.initclubList()
 			})
 		}
 	}

pages/seller/components/category.vue

@@ -2,7 +2,7 @@
 	<view class="category" id="category" :style="{paddingTop:CustomBar+'px'}">
 		<!--顶部搜索导航栏-->
 		<view class="'search-input-fixed" :style="{top:CustomBar/2+'px'}">
-			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick"></cat-search>
+			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick" />
 		</view>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="category-list" v-else>
@@ -77,18 +77,18 @@
 			}
 		},
 		created() {
-			this.initData();
+			this.initData()
 		},
 		methods: {
 			initData() {// 数据初始化
-				this.GetProductCate(this.categoryTabIndex);
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
+				this.GetProductCate(this.categoryTabIndex)
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync()
+				this.windowHeight = windowHeight - 1
+				this.scrollHeight = windowHeight - 1
 			},
 			hanldTabClick(data){
 				this.categoryList = []
-				this.GetProductCate(data);
+				this.GetProductCate(data)
 			},
 			GetProductCate (index) {// 获取商品分类列表
 				this.CommonService.GetFirstClassly({typeSort:index,source :'crm'}).then(response =>{
@@ -96,8 +96,8 @@
 					// 查询第一个拥有二级菜单的子菜单
 					for (let i = 0; i < this.categoryList.length; i++) {
 						if (this.categoryList[i].smallTypeList.length > 0) {
-							this.showCategoryIndex = i;
-							break;
+							this.showCategoryIndex = i
+							break
 						}
 					}
 					this.skeletonShow = false
@@ -106,7 +106,7 @@
 				})
 			},
 			showCategory(e,index){//分类切换显示
-				this.showCategoryIndex = index;
+				this.showCategoryIndex = index
 				this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
 			},
 			toSearch () {// 跳转至搜索详情页
@@ -118,22 +118,22 @@
 				switch(index){
 					case 1:
 						this.$api.navigateTo(`/pages/goods/goods-classify?classType=1&id=${item.bigTypeId}&title=${item.name}`)
-						break;
+						break
 					case 2:
 						this.$api.navigateTo(`/pages/goods/goods-classify?classType=2&id=${item.smallTypeId}&title=${item.name}`)
-						break;
+						break
 					case 3:
 						this.$api.navigateTo(`/pages/goods/goods-classify?classType=3&id=${item.tinyTypeId}&title=${item.name}`)
-						break;
+						break
 				}
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
+				let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
 				return headerBtnPosi
 			},
 			setSysteminfo(){
-				let systeminfo;
+				let systeminfo
 				uni.getSystemInfo({ // 获取设备信息
 					success: (res) => {
 						systeminfo = res

pages/seller/order/order-list.vue

@@ -316,7 +316,6 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义顶部导航
-import btSearch from '@/components/uni-search/bt-search.vue' //搜索
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
 import cmListButton from './components/cm-list-button' //操作按钮
@@ -329,7 +328,6 @@ export default {
 	components: {
 		headerBack,
 		empty,
-		btSearch,
 		modalLayer,
 		cmListButton,
 		cmSharePopup,

pages/seller/remarks/customer-list.vue

@@ -41,8 +41,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 					<!--加载loadding-->
 				</template>
 			</view>

pages/seller/remarks/list.vue

@@ -113,8 +113,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>
@@ -422,7 +422,7 @@ export default {
 			this.$api.navigateTo(`/pages/seller/remarks/details?remarksId=${remarksId}`)
 		},
 		handlerGoReportList() {
-			this.$api.navigateTo(`/pages/seller/remarks/report-list`)
+			this.$api.navigateTo('/pages/seller/remarks/report-list')
 		}
 	},
 	onPageScroll(e) {

pages/seller/remarks/record-list.vue

@@ -120,8 +120,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 					<!--加载loadding-->
 				</template>
 			</view>
@@ -481,7 +481,7 @@ export default {
 			this.$api.navigateTo(`/pages/seller/remarks/record-details?remarksId=${remarksId}`)
 		},
 		handlerGoReportList() {
-			this.$api.navigateTo(`/pages/seller/remarks/report-visitor-list`)
+			this.$api.navigateTo('/pages/seller/remarks/report-visitor-list')
 		}
 	},
 	onPageScroll(e) {

pages/seller/remarks/relation-consult-list.vue

@@ -99,8 +99,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>

pages/seller/remarks/relation-visitor-list.vue

@@ -97,8 +97,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>

pages/seller/remarks/report-list.vue

@@ -86,8 +86,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 					<!--加载loadding-->
 				</template>
 			</view>

pages/seller/remarks/report-visitor-list.vue

@@ -82,8 +82,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 					<!--加载loadding-->
 				</template>
 			</view>

pages/service/news-list.vue

@@ -15,8 +15,8 @@
 						<view class="list-right">{{ list.creationtime }}</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 				</scroll-view>
 			</view>
@@ -26,13 +26,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
+		components:{},
 		data() {
 			return {
 				serviceProviderId:'',

pages/supplier/components/category.vue

@@ -2,7 +2,7 @@
 	<view class="category" id="category" :style="{paddingTop:CustomBar+'px'}">
 		<!--顶部搜索导航栏-->
 		<view class="'search-input-fixed" :style="{top:CustomBar/2+'px'}">
-			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick"></cat-search>
+			<cat-search :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" @click="hanldTabClick" />
 		</view>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="category-list" v-else>
@@ -77,18 +77,18 @@
 			}
 		},
 		created() {
-			this.initData();
+			this.initData()
 		},
 		methods: {
 			initData() {// 数据初始化
-				this.GetProductCate(this.categoryTabIndex);
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
+				this.GetProductCate(this.categoryTabIndex)
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync()
+				this.windowHeight = windowHeight - 1
+				this.scrollHeight = windowHeight - 1
 			},
 			hanldTabClick(data){
 				this.categoryList = []
-				this.GetProductCate(data);
+				this.GetProductCate(data)
 			},
 			GetProductCate (index) {// 获取商品分类列表
 				this.CommonService.GetFirstClassly({typeSort:index,source :'crm'}).then(response =>{
@@ -96,8 +96,8 @@
 					// 查询第一个拥有二级菜单的子菜单
 					for (let i = 0; i < this.categoryList.length; i++) {
 						if (this.categoryList[i].smallTypeList.length > 0) {
-							this.showCategoryIndex = i;
-							break;
+							this.showCategoryIndex = i
+							break
 						}
 					}
 					this.skeletonShow = false
@@ -106,7 +106,7 @@
 				})
 			},
 			showCategory(e,index){//分类切换显示
-				this.showCategoryIndex = index;
+				this.showCategoryIndex = index
 				this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
 			},
 			toSearch () {// 跳转至搜索详情页
@@ -118,22 +118,22 @@
 				switch(index){
 					case 1:
 						this.$api.navigateTo(`/pages/goods/goods-classify?classType=1&id=${item.bigTypeId}&title=${item.name}`)
-						break;
+						break
 					case 2:
 						this.$api.navigateTo(`/pages/goods/goods-classify?classType=2&id=${item.smallTypeId}&title=${item.name}`)
-						break;
+						break
 					case 3:
 						this.$api.navigateTo(`/pages/goods/goods-classify?classType=3&id=${item.tinyTypeId}&title=${item.name}`)
-						break;
+						break
 				}
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
+				let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
 				return headerBtnPosi
 			},
 			setSysteminfo(){
-				let systeminfo;
+				let systeminfo
 				uni.getSystemInfo({ // 获取设备信息
 					success: (res) => {
 						systeminfo = res

pages/supplier/deliver/deliver-record.vue

@@ -82,8 +82,8 @@
 					</order-button>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 				<!--加载loadding-->
 			</scroll-view>
 		</view>
@@ -92,16 +92,12 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import orderButton from './components/supplierRecorgButton.vue' //底部按钮
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import cdCustom from '@/components/cm-custom/custom-d'
 
 var isPreviewImg
 export default {
 	components: {
 		orderButton,
-		tuiLoadmore,
-		tuiNomore,
 		cdCustom
 	},
 	data() {

pages/supplier/order/order-details.vue

@@ -140,8 +140,7 @@
 				:status="btnStatus"
 				:shareCode="shareCode"
 				@buttonConfirm="handButtonConfirm"
-			>
-			</order-button>
+			/>
 		</view>
 		<share-alert :shopOrderId="shopOrderId" v-if="isShareModal" @shareConfirm="onShareAppMessage"> </share-alert>
 	</view>
@@ -150,14 +149,12 @@
 <script>
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
 import orderAddress from './components/details/orderAddress' //地址信息
-import goodsList from './components/details/goodsList' //商品列表
 import orderButton from './components/supplierDetaileButton' //底部按钮
 import shareAlert from '../components/supplierShareAlert' //分享弹窗
 export default {
 	components: {
 		headerBack,
 		orderAddress,
-		goodsList,
 		orderButton,
 		shareAlert
 	},

pages/supplier/order/order-list.vue

@@ -63,8 +63,8 @@
 						</order-button>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 				</view>
 			</view>
@@ -108,12 +108,10 @@
 	</view>
 </template>
 <script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import orderButton from './components/supplierListButton'//底部按钮
 	import shareAlert from '../components/supplierShareAlert'	  //分享弹窗
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
+	import modalLayer from '@/components/modal-layer'
+	import empty from '@/components/empty'
 	import { mapState,mapMutations } from 'vuex'
 	const defaultListQuery = {
 			shopId:0,
@@ -123,11 +121,9 @@
 			payStatus:'',		// 结算状态
 			shopOrderNo:'',		// 订单编号
 			receiver: '',		// 买家名称
-	 };
+	 }
 	export default{
 		components: {
-			tuiLoadmore,
-			tuiNomore,
 			empty,
 			shareAlert,
 			orderButton
@@ -180,26 +176,26 @@
 		filters: {
 			sendOutStatusType(value) {
 				if (value === null) {
-				  return '未发货';
+				  return '未发货'
 				} else if(value === 1) {
-				  return '待发货';
+				  return '待发货'
 				} else if(value === 2) {
-				  return '部分发货';
+				  return '部分发货'
 				} else{
-				  return '已发货';
+				  return '已发货'
 				}
 			},
 			payStatusType(value) {
 				if (value === 1) {
-				  return '待结算';
+				  return '待结算'
 				} else if (value === 2) {
-				  return '部分结算';
+				  return '部分结算'
 				} else {
-				  return '已结算';
+				  return '已结算'
 				}
 			},
 			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
+				return Number(text).toFixed(2)
 			},
 		},
 		computed: {
@@ -212,8 +208,8 @@
 					let data = response.data
 					this.hasNextPage = data.hasNextPage
 					if(data.list && data.list.length > 0){
-						this.isEmpty = false;
-						this.orderData = [...data.list];
+						this.isEmpty = false
+						this.orderData = [...data.list]
 						if(hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -229,7 +225,7 @@
 						this.isEmpty = true
 					}
 				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+					this.$util.msg(error.msg,2000)
 				})
 			}, 
 			getOnReachBottomData(index){//上拉加载
@@ -238,8 +234,8 @@
 					let data = response.data
 					this.hasNextPage = data.hasNextPage
 					this.orderData = this.orderData.concat(data.list)
-					this.pullFlag = false;// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true;},500)
+					this.pullFlag = false// 防上拉暴滑
+					setTimeout(()=>{this.pullFlag = true},500)
 					if(this.total > this.orderData.length){
 						this.pullUpOn = false
 						this.nomoreText = '上拉显示更多'
@@ -251,7 +247,7 @@
 				})	
 			},
 			detail(shopOrderId) {//订单详情跳转
-				this.isModalLayer = true;	
+				this.isModalLayer = true	
 				this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${shopOrderId}`)
 			},
 			handButtonConfirm(data) {//获取点击
@@ -272,11 +268,11 @@
 				}
 			},
 			rDrawer() {//弹出抽屉
-				this.rightDrawer = true;
+				this.rightDrawer = true
 			},
 			closeDrawer(e) {//关闭抽屉
-				this.leftDrawer = false;
-				this.rightDrawer = false;
+				this.leftDrawer = false
+				this.rightDrawer = false
 			},
 			bindPickerChange: function(e) {//选择结算状态筛选
 				this.showSendOutStatus = this.StatusArray[e.target.value].name
@@ -288,14 +284,14 @@
 			},
 			handSearchList(){//搜索
 				this.getOrderDatainit()
-				this.leftDrawer = false;
-				this.rightDrawer = false;
+				this.leftDrawer = false
+				this.rightDrawer = false
 			},
 			handSearchClear(){//重置搜索条件
 				this.listQuery = Object.assign({}, defaultListQuery)
 				this.listQuery.shopId = this.shopId
-				this.showSendOutStatus='';
-				this.showpayStatus='';
+				this.showSendOutStatus=''
+				this.showpayStatus=''
 			},
 		},
 		onShareAppMessage(res){//分享转发

pages/supplier/order/order-service-details.vue

@@ -139,13 +139,11 @@
 <script>
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
 import orderAddress from './components/details/orderAddress' //地址信息
-import goodsList from './components/details/goodsList' //商品列表
 import orderButton from './components/details/orderButton' //底部按钮
 export default {
 	components: {
 		headerBack,
 		orderAddress,
-		goodsList,
 		orderButton
 	},
 	data() {

pages/supplier/user/my-product.vue

@@ -57,8 +57,8 @@
 					</view>
 				</checkbox-group>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 				<!--加载loadding-->
 			</view>
 		</view>
@@ -142,8 +142,6 @@
 	</view>
 </template>
 <script>
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	import modalLayer from '@/components/modal-layer'
 	import { mapState,mapMutations } from 'vuex'
 	const defaultListQuery = {
@@ -161,10 +159,7 @@
 			tinyTypeId:0//三级
 	 }
 	export default{
-		components: {
-			tuiLoadmore,
-			tuiNomore
-		},
+		components: {},
 		data() {
 			return{	
 				CustomBar:this.CustomBar,

pages/supplier/user/operator/list.vue

@@ -52,8 +52,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 				</scroll-view>
 			</view>
@@ -81,13 +81,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
+		components:{},
 		data() {
 			return {
 				shopName:'',
@@ -119,19 +114,19 @@
 			}
 		},
 		onLoad(){				
-			this.setScrollHeight();
+			this.setScrollHeight()
 		},
 		methods: {
 			setScrollHeight() {
 				// 窗口高度 - 底部距离
 				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
+					const query = wx.createSelectorQuery().in(this)
+					query.selectAll('.add-btn').boundingClientRect()
 					query.exec(res => {
 						if(res[0][0]){
 							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
+								eleTop = res[0][0].top - 1
+								this.scrollHeight =  eleTop
 						}
 					})
 				}, 500)
@@ -161,8 +156,8 @@
 						this.isEmpty = false
 						this.hasNextPage = response.data.hasNextPage
 						this.operatorList = responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -185,8 +180,8 @@
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage
 						this.operatorList = this.operatorList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'

pages/user/account/account-bean.vue

@@ -52,23 +52,19 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'/>
 				<!--加载loadding-->
 			</view>
 		</scroll-view>
 	</view>
 </template>
 <script>
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
-	import uniCalendar from '@/components/uni-calendar/uni-calendar.vue'
+	import uniCalendar from '../components/uni-calendar/uni-calendar.vue'
 	var date = new Date()
-	export default{
+	export default{  
 		components: {
 			uniCalendar,
-			tuiLoadmore,
-			tuiNomore
 		},
 		data() {
 			return{

pages/user/account/account.vue

@@ -55,8 +55,8 @@
 				</view>
 			</view>
 			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'></tui-nomore>
+			<tui-loadmore :visible="loadding" :index="3" type="black" />
+			<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText' />
 			<!--加载loadding-->
 		</scroll-view>
 		<view class="showAccounExp" v-if="isShowAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
@@ -66,15 +66,11 @@
 	</view>
 </template>
 <script>
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
-	import uniCalendar from '@/components/uni-calendar/uni-calendar.vue'
+	import uniCalendar from '../components/uni-calendar/uni-calendar.vue'
 	var date = new Date()
 	export default{
 		components: {
 			uniCalendar,
-			tuiLoadmore,
-			tuiNomore
 		},
 		data() {
 			return{

pages/user/chats/components/chat-custom.vue

@@ -9,8 +9,9 @@
         </view>
         <view class="navbar-icon"
             :style="{top:capsule.top +'px;',left:((screenWidth-capsule.right)+5)+'px;',height:capsule.height+'px;',lineHeight:capsule.height+'px;'}">
-            <text :style="{width:navbarBtn.height+'px;'}" @tap="handleBack" class="iconfont icon-fanhui"></text>
-            <text :style="{width:navbarBtn.height+'px;'}" @tap="handleShowDr" class="iconfont icon-xiaoxi"></text>
+            <text :style="{width:capsule.height+'px;'}" @tap="handleBack" class="iconfont icon-fanhui"></text>
+            <text class="iconfont icon-vertical_line" ></text>
+            <text :style="{width:capsule.height+'px;'}" @tap="handleShowDr" class="iconfont icon-xiaoxi1"></text>
         </view>
     </view>
 </template>
@@ -19,11 +20,6 @@
     var self
     export default {
         name: 'chatCustom',
-        props: {
-            navbarData: { // 由父页面传递的数据
-                type: Object
-            }
-        },
         data() {
             return {
                 CustomBar: this.CustomBar, // 顶部导航栏高度
@@ -35,18 +31,14 @@
             }
         },
         created() {
-            if (getCurrentPages().length === 1) { // 当只有一个页面时
-                this.navbarData.haveBack = false
-            } else {
-                this.navbarData.haveBack = true
-            }
+
         },
         onLoad() {
 
         },
         methods: {
             handleBack() {
-                this.$emit('navigateBack')
+                uni.navigateBack({ delta: 1 })
             },
             handleShowDr() {
                 this.$emit('showDr')
@@ -85,34 +77,23 @@
     }
 
     .navbar-icon {
-    	 position: fixed;
-    	 display: flex;
-    	 border-radius: 50%;
-    	 text-align: center;
-    	 background: rgba(255,255,255,0.6);
-    	 border: 0.5px solid rgba(0,0,0, 0.1);
-    	 box-sizing: border-box;
-    	 z-index: 9999;
+    	position: fixed;
+    	display: flex;
+    	border-radius: 64rpx;
+    	border: 0.5px solid rgba(0,0,0, 0.2);
+    	box-sizing: border-box;
     }
     
     .navbar-icon .iconfont {
-    	 height: 100%;
-    	 width: 100%;
-    	 font-size: 38rpx;
-    	 font-weight: bold;
-    	 display: inline-block;
-    	 overflow: hidden;
+    	text-align: center;
+    	display: inline-block;
+    	overflow: hidden;
     }
-    .navbar-icon view {
-    	 height: 18px;
-    	 border-left: 0.5px solid rgba(0,0,0, 0.3);
-    	 margin-top: 6px;
+    .navbar-icon .icon-vertical_line {
+    	color: #999999;
+        border-color: rgba(0,0,0,0.4);
     }
-
-    .navbar-icon .icon-xiaoxi {
-        color: #FF5B00;
-    }
-
+    
     .navbar-loading {
         background: #fff;
         text-align: center;

pages/user/chats/components/chat-drawer.vue

@@ -1,257 +1,237 @@
-<template>
-	<view class="drawer-content">
-		<!--右抽屉-->
-		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
-			<view
-				class="drawer-container clearfix"
-				scroll-y
-				:style="{
-					paddingTop: CustomBar - StatusBar + 8 + 'px',
-					paddingBottom: isIphoneX ? '180rpx' : '146rpx'
-				}"
-			>
-				<scroll-view class="tui-drawer-scroll" scroll-y :style="{ height: drawerH + 'px' }">
-					
-				</scroll-view>
-				<view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
-					<view class="drawer-btn clear" @click="closeDrawer">取消</view>
-					<view class="drawer-btn comfrim" @click="handSearchConfirm">确定</view>
-				</view>
-			</view>
-		</tui-drawer>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex'
-export default {
-	name: 'rightDrawer',
-	props: {
-		rightDrawer: {
-			type: Boolean,
-			default: false
-		},
-		current:{
-			type:Number
-		}
-	},
-	data() {
-		return {
-			date: currentDate,
-			CustomBar: this.CustomBar, // 顶部导航栏高度
-			StatusBar: this.StatusBar,
-			isIphoneX: this.$store.state.isIphoneX,
-			height: 0,
-			drawerH: 0, // 抽屉内部scrollview高度
-			list: [],
-            chatHistoryParams: {
-                userId: '',
-                pageNum: 1,
-                pageSize: 10
-            },
-		}
-	},
-	created() {
-		this.setScrollHeight()
-	},
-	computed: {
-        
-	},
-	methods: {
-		async userNewChatHistory() {
-			//获取组员协销列表
-			try{
-				const userInfo = await this.$api.getStorage()
-                this.chatHistoryParams.userId = userInfo.userId
-				const res = await this.UserService.userNewChatHistory({ spId: userInfo.serviceProviderId })
-				this.list = res.data
-			}catch(e){
-				console.log('=========>获取AI记录异常')
-			}
-		},
-		closeDrawer() {
-			this.$parent.rightDrawer = false
-		},
-		handSearchConfirm() {
-			//确定筛选
-			this.$emit('handSearchConfirm', this.queryData)
-			this.$parent.rightDrawer = false
-		},
-		setScrollHeight() {
-			let obj = {}
-			const { windowHeight, pixelRatio } = wx.getSystemInfoSync()
-			uni.getSystemInfo({
-				success: res => {
-					this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44
-					this.drawerH = res.windowHeight - uni.upx2px(180) - this.height
-				}
-			})
-			this.windowHeight = windowHeight - 1
-			this.scrollHeight = windowHeight - 1
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-/*screen*/
-.drawer-container {
-	width: 580rpx;
-	height: 100%;
-	padding: 80rpx 0;
-	overflow: hidden;
-	box-sizing: border-box;
-	background-color: #ffffff;
-	.drawer-title {
-		width: 100%;
-		height: 72rpx;
-		line-height: 72rpx;
-		box-sizing: border-box;
-		padding: 0 30rpx;
-		float: left;
-		background-color: #f7f7f7;
-		font-size: $font-size-26;
-		color: #333333;
-		font-weight: bold;
-		text-align: left;
-	}
-	.drawer-main {
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		float: left;
-		.drawer-main-name {
-			width: 100%;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: left;
-			font-size: $font-size-26;
-			color: #333333;
-			box-sizing: border-box;
-			padding: 0 20rpx;
-			font-weight: bold;
-			.small{
-				font-weight: normal;
-				color: #999999;
-			}
-		}
-		.drawer-main-time{
-			width: 100%;
-			height: 56rpx;
-			box-sizing: border-box;
-			.line{
-				color: #999999;
-				float: left;
-				line-height: 56rpx;
-			}
-			.drawer-main-time-input{
-				width: 228rpx;
-				height: 56rpx;
-				background: #F7F7F7;
-				border-radius: 28rpx;
-				box-sizing: border-box;
-				padding: 0 20rpx;
-				line-height: 56rpx;
-				float: left;
-				margin: 0 20rpx;
-				position: relative;
-				.input-text{
-					display: block;
-					height: 56rpx;
-					font-size: 26rpx;
-					color: #666666;
-				}
-				.icon-riqi{
-					color: #FF5B00;
-					display: block;
-					width: 40rpx;
-					height: 56rpx;
-					position: absolute;
-					right: 10rpx;
-					top: 0;
-					line-height: 56rpx;
-				}
-			}
-		}
-		.drawer-main-radiov {
-			width: 100%;
-			height: auto;
-			box-sizing: border-box;
-			padding: 0 20rpx;
-			.drawer-main-radio {
-				width: 100%;
-				height: 80rpx;
-				box-sizing: border-box;
-				padding: 0 10rpx;
-				border: 1px solid rgba(0, 0, 0, 0.2);
-				border-radius: 6rpx;
-				margin-bottom: 30rpx;
-				position: relative;
-				&.btn {
-					border: none;
-					margin-top: 40rpx;
-				}
-				.input {
-					width: 100%;
-					height: 80rpx;
-					line-height: 80rpx;
-					float: left;
-					box-sizing: border-box;
-					font-size: $font-size-24;
-					color: #333333;
-					padding: 0 10rpx;
-					padding-right: 68rpx;
-				}
-				.iconfont {
-					width: 50rpx;
-					height: 80rpx;
-					display: block;
-					line-height: 80rpx;
-					text-align: center;
-					font-size: 30rpx;
-					color: #999999;
-					position: absolute;
-					right: 0;
-					top: 0;
-				}
-			}
-		}
-	}
-	.drawer-input {
-		width: 100%;
-		float: left;
-		box-sizing: border-box;
-		padding: 24rpx 10rpx 0 10rpx;
-		border: 1px solid rgba(0, 0, 0, 0.2);
-		border-radius: 4rpx;
-		position: relative;
-		background-color: #ffffff;
-		&.btn {
-			border: none;
-			display: flex;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-		}
-		.drawer-btn {
-			width: 210rpx;
-			height: 84rpx;
-			border-radius: 42rpx;
-			background: $btn-confirm;
-			line-height: 84rpx;
-			text-align: center;
-			font-size: $font-size-26;
-			color: #ffffff;
-			flex: 1;
-			margin: 0 10rpx;
-			&.comfrim {
-				background: $btn-confirm;
-			}
-			&.clear {
-				background: #ffe6dc;
-				color: $color-system;
-			}
-		}
-	}
-}
-</style>
+<template>
+    <view class="drawer-content">
+        <!--右抽屉-->
+        <tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
+            <view class="drawer-container clearfix" scroll-y :style="{
+					paddingTop: CustomBar + StatusBar/2 + 'px',
+					paddingBottom: isIphoneX ? '180rpx' : '146rpx'
+				}">
+                <scroll-view class="tui-drawer-scroll" scroll-y :style="{ height: drawerH + 'px' }">
+                    <view class="cm_ai_container_records">
+                        <view class="cm_ai_records_btn">
+                            <view class="records_btn" :class="disabled ? 'disabled' : 'show'"
+                                @click="handleCreatedChat">
+                                <text class="iconfont icon-jiahao"></text>
+                                <text>新建对话</text>
+                            </view>
+                        </view>
+                        <view class="cm_ai_records_list">
+                            <view class="cm_ai_records_item" v-for="(chat, index) in chatHistory" :key="index"
+                                @click="handleChatDetail(chat.id)">
+                                <text class="content" v-text="chat.firstQuestion"></text>
+                                <text class="time" v-text="chat.addTime"></text>
+                            </view>
+                        </view>
+                    </view>
+                </scroll-view>
+                <view class="drawer-input btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+                    <view class="drawer-btn clear" @click="closeDrawer">
+                        <text class="iconfont icon-iconfontguanbi"></text>
+                    </view>
+                </view>
+            </view>
+        </tui-drawer>
+    </view>
+</template>
+
+<script>
+    import { mapState, mapMutations } from 'vuex'
+    export default {
+        name: 'rightDrawer',
+        props: {
+            rightDrawer: {
+                type: Boolean,
+                default: false
+            },
+            probeIndex: {
+                type: Number
+            }
+        },
+        data() {
+            return {
+                CustomBar: this.CustomBar, // 顶部导航栏高度
+                StatusBar: this.StatusBar,
+                isIphoneX: this.$store.state.isIphoneX,
+                height: 0,
+                drawerH: 0, // 抽屉内部scrollview高度
+                chatHistory: [],
+                chatHistoryParams: {
+                    userId: '',
+                    pageNum: 1,
+                    pageSize: 10
+                },
+            }
+        },
+        created() {
+            this.setScrollHeight()
+            this.userNewChatHistory()
+        },
+        computed: {
+            disabled() {
+                return !this.probeIndex
+            }
+        },
+        methods: {
+            async userNewChatHistory() {
+                //获取组员协销列表
+                try {
+                    const userInfo = await this.$api.getStorage()
+                    this.chatHistoryParams.userId = userInfo.userId
+                    const res = await this.UserService.userNewChatHistory(this.chatHistoryParams)
+                    this.chatHistory = res.data
+                } catch (e) {
+                    console.log('=========>获取AI记录异常')
+                }
+            },
+            //新建对话
+            handleCreatedChat(){
+                this.$emit('chat-news')
+                this.$parent.rightDrawer = false
+            },
+            // 查看记录
+            handleChatDetail(chatId) {
+                this.$emit('chat-detail', chatId)
+                this.$parent.rightDrawer = false
+            },
+            closeDrawer() {
+                this.$parent.rightDrawer = false
+            },
+            setScrollHeight() {
+                let obj = {}
+                const { windowHeight, pixelRatio } = wx.getSystemInfoSync()
+                uni.getSystemInfo({
+                    success: res => {
+                        this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44
+                        this.drawerH = res.windowHeight - uni.upx2px(180) - this.height
+                    }
+                })
+                this.windowHeight = windowHeight - 1
+                this.scrollHeight = windowHeight - 1
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    /*screen*/
+    .drawer-container {
+        width: 580rpx;
+        height: 100%;
+        padding: 80rpx 0;
+        overflow: hidden;
+        box-sizing: border-box;
+        background-image: linear-gradient(180deg, #f0edf7 .03%, #ebeaf5 32.19%, #e8e8f3 68.86%, #e4eaf7 99.12%);
+
+        .cm_ai_container_records {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            box-sizing: border-box;
+            padding: 0 40rpx;
+            flex: 0 0 auto;
+
+            .cm_ai_records_btn {
+                padding: 0 50rpx;
+                margin-bottom: 12px;
+                box-sizing: border-box;
+                display: flex;
+                justify-content: center;
+
+                .records_btn {
+                    width: 100%;
+                    height: 80rpx;
+                    line-height: 80rpx;
+                    flex-shrink: 0;
+                    box-sizing: border-box;
+                    background-color: rgba(255, 91, 0, 0.05);
+                    text-align: center;
+                    border-radius: 16rpx;
+                    display: flex;
+                    justify-content: center;
+                    color: #ff5b00 !important;
+                    opacity: 1;
+
+                    &.disabled {
+                        opacity: 0.7;
+                    }
+
+                    &.show:hover {
+                        background-color: rgba(255, 91, 0, 0.1);
+                    }
+                }
+
+            }
+
+            .cm_ai_records_list {
+                flex: 1;
+                display: flex;
+                flex-direction: column;
+                overflow: hidden;
+
+                .cm_ai_records_item {
+                    display: flex;
+                    align-items: flex-start;
+                    height: 88rpx;
+                    box-sizing: border-box;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    padding: 0 24rpx;
+                    border-radius: 16rpx;
+                    background-color: rgba(255,255,255,0.2);
+                    margin: 10rpx 0;
+                    .content {
+                        width: 200rpx;
+                        font-size: 30rpx;
+                        font-weight: 500;
+                        line-height: 88rpx;
+                        color: #50525c;
+                        display: -webkit-box;
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                        word-break: break-all;
+                        -webkit-line-clamp: 1;
+                        -webkit-box-orient: vertical;
+                    }
+
+                    .time {
+                        font-size: 24rpx;
+                        font-weight: 400;
+                        line-height: 88rpx;
+                        color: #848691;
+                    }
+                }
+            }
+        }
+        .drawer-input {
+        	width: 100%;
+        	float: left;
+        	box-sizing: border-box;
+        	padding: 24rpx 50rpx 0 50rpx;
+        	border: 1px solid rgba(0, 0, 0, 0.2);
+        	border-radius: 4rpx;
+        	position: relative;
+        	&.btn {
+        		border: none;
+        		display: flex;
+        		position: fixed;
+        		left: 0;
+        		bottom: 0;
+        	}
+        	.drawer-btn {
+        		width: 84rpx;
+        		height: 84rpx;
+        		border-radius: 42rpx;
+        		line-height: 84rpx;
+        		text-align: center;
+        		margin: 0 auto;
+                background-color: rgba(255,255,255,0.4);
+                .icon-iconfontguanbi{
+                    font-size: $font-size-48;
+                    color: #999999;
+                }
+        		
+        	}
+        }
+    }
+</style>

pages/user/chats/index.vue

@@ -1,8 +1,7 @@
 <template>
     <view class="container">
-        <!-- <chatCustom @showDr="handleShowDrawer"/> -->
-        <!-- <view class="cm_ai_container_main" :style="{ paddingBottom: isIphoneX ? '208rpx' : '174rpx', paddingTop:CustomBar+'px' }"> -->
-        <view class="cm_ai_container_main" :style="{ paddingBottom: isIphoneX ? '208rpx' : '174rpx' }">
+        <chatCustom @showDr="handleShowDrawer"/>
+        <view class="cm_ai_container_main" :style="{ paddingBottom: isIphoneX ? '208rpx' : '174rpx', paddingTop:CustomBar+'px' }">
             <scroll-view class="cm_ai_container" scroll-y="true" show-scrollbar="true" ref="scrollView" id="scrollChatView">
                 <!--提问回答element-->
                 <view class="cm_ai_answer_main" id="cm_ai_answer">
@@ -21,15 +20,15 @@
             </view>
         </view>
         <!-- 对话记录 -->
-        <!-- <chatDrawer :rightDrawer="isRightDrawer"/> -->
+        <chatDrawer :rightDrawer="rightDrawer" :probeIndex="probeIndex" @chat-detail="handleCHatDetail" @chat-news="handleCreateChat" />
     </view>
 </template>
 
 <script>
     import { mapState, mapMutations } from 'vuex'
-    import chatCustom from './components/chat-custom' //地址信息
-    import chatDrawer from './components/chat-drawer' //地址信息
-    import chatHtml from './components/chat-html' //地址信息
+    import chatCustom from './components/chat-custom' 
+    import chatDrawer from './components/chat-drawer' 
+    import chatHtml from './components/chat-html' 
     export default {
         components: {
             chatCustom,
@@ -41,7 +40,7 @@
                 StaticUrl: this.$Static,
                 isIphoneX: this.$store.state.isIphoneX,
                 CustomBar:this.CustomBar,// 顶部导航栏高度
-                isRightDrawer:false,
+                rightDrawer:false,
                 isLoading: false,
                 nvabarData: {		//顶部自定义导航
                 	haveBack:true,
@@ -154,7 +153,30 @@
                 }
             },
             handleShowDrawer(){
-                this.isRightDrawer = true
+                this.rightDrawer = true
+            },
+            handleCreateChat(){
+                //新建对话
+                this.probeIndex = 0
+                this.messages = []
+            },
+            handleCHatDetail(chatId){
+                // 查看详情
+                this.messages =[]
+                this.userNewChatDetail({ chatId : chatId ,userId:this.chatParams.userId })
+            },
+            // 查询详情
+            async userNewChatDetail(params) {
+                try {
+                    const res = await this.UserService.userNewChatDetail(params)
+                    const data = res.data
+                    data.forEach(chats => {
+                        let from = chats.identity === 0 ? 'me' : 'bot'
+                        this.messages.push({ question: chats.message,from: from,typing: false,currentLength: 0 })
+                    })
+                } catch (error) {
+                    console.log('error',error)
+                }
             },
             scrollToBottom(flag) {
                 // console.log('flag',flag)

pages/user/collection/collection.vue

@@ -153,8 +153,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText" />
 				<!--加载loadding-->
 			</view>
 		</view>
@@ -207,8 +207,6 @@
 	</view>
 </template>
 <script>
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
 import cmDrag from '@/components/cm-custom/cm-drag.vue'
 import cmUnitPopup from '@/components/cm-module/productDetails/cm-unit-popup.vue'
 
@@ -220,8 +218,6 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		tuiLoadmore,
-		tuiNomore,
 		cmDrag,
 		cmUnitPopup
 	},

pages/user/coupon/coupon-activity.vue

@@ -97,8 +97,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ff6b2b'" :color="'#FFFFFF'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ff6b2b'" :color="'#FFFFFF'" :text="nomoreText" />
 					<!--加载loadding-->
 				</template>
 			</view>

pages/user/coupon/coupon-collection.vue

@@ -90,8 +90,8 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</template>
 		</view>

pages/user/coupon/coupon-product.vue

@@ -94,8 +94,8 @@
 				</view>
 			</view>
 			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+			<tui-loadmore :visible="loadding" :index="3" type="black" />
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 			<!--加载loadding-->
 		</view>
 	</view>

pages/user/coupon/coupon.vue

@@ -97,8 +97,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 					<!--加载loadding-->
 				</view>
 			</template>

pages/user/member/member-product.vue

@@ -66,8 +66,8 @@
 				</view>
 			</view>
 			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+			<tui-loadmore :visible="loadding" :index="3" type="black" />
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 			<!--加载loadding-->
 		</view>
 		<!-- 透明模态层 -->

pages/user/member/member-record.vue

@@ -25,8 +25,8 @@
 				</view>
 			</view>
 			<!--加载loadding-->
-			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+			<tui-loadmore :visible="loadding" :index="3" type="black" />
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 			<!--加载loadding-->
 		</view>
 	</view>

pages/user/operator/list.vue

@@ -52,8 +52,8 @@
 						</view>
 					</view>
 					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-loadmore :visible="loadding" :index="3" type="black" />
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText' />
 					<!--加载loadding-->
 				</scroll-view>
 			</view>
@@ -83,13 +83,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
+		components:{},
 		data() {
 			return {
 				clubName:'',

pages/user/order/order-list.vue

@@ -245,7 +245,6 @@
 <script>
 import { mapState, mapMutations } from 'vuex'    
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
-import btSearch from '@/components/uni-search/bt-search.vue' //搜索
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
 import cmListButton from './components/cm-list-button' //底部按钮
@@ -258,7 +257,6 @@ export default {
 		headerBack,
 		empty,
 		modalLayer,
-		btSearch,
 		cmListButton,
 		cmSharePopup,
 		cmOrderpayPopup,

pages/user/order/order-payunder.vue

@@ -6,7 +6,7 @@
 			borderRadius="10rpx"
 			:isLoading="true"
 			:loadingType="5"
-		></tui-skeleton>
+		/>
 		<view class="container-cash clearfix" v-else>
 			<view class="pay-bring-title" v-if="onlinePay == 2">{{ payBringTitle }}</view>
 			<view class="container-wrapper">

pages/user/order/search-order.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="search-container">
-		<!-- <or-search :theme="themeClass" @getSearchText="getSearchText"></or-search> -->
 		<view class="search-main">
 			<view class="search">
 				<view class="search-input">
@@ -237,7 +236,6 @@
 </template>
 
 <script>
-import orSearch from '@/components/uni-search/or-search.vue'
 import empty from '@/components/empty'
 import modalLayer from '@/components/modal-layer'
 import cmListButton from './components/cm-list-button' //底部按钮
@@ -253,7 +251,6 @@ const defaultListQuery = {
 }
 export default {
 	components: {
-		orSearch,
 		empty,
 		modalLayer,
 		cmListButton,

pages/user/pay/card-list.vue

@@ -6,7 +6,7 @@
 			borderRadius="10rpx"
 			:isLoading="true"
 			:loadingType="5"
-		></tui-skeleton>
+		/>
 		<template v-else>
 			<view class="card-title">我的银行卡 <text>{{ list.length }}张</text></view>
 			<view class="card-content">
@@ -89,7 +89,7 @@ export default {
 	filters: {
 		cardsFormat(valus) {
 			// 银行卡只显示最后四位数 ,隐藏信息用*代替
-			return  valus.replace(/^(\d{4})\d+(\d{4})$/,"$1****$2")
+			return  valus.replace(/^(\d{4})\d+(\d{4})$/,'$1****$2')
 		},
 	},
 	methods: {

pages/user/pay/card-sus-list.vue

@@ -6,7 +6,7 @@
 			borderRadius="10rpx"
 			:isLoading="true"
 			:loadingType="5"
-		></tui-skeleton>
+		/>
 		<template v-else>
 			<view class="card-title">
 				<view class="card-tabs" @click="handleCurrent(1)">

services/user.service.js

@@ -1074,4 +1074,16 @@ export default class UserService {
             isLoading: false
         })
     }
+    /**
+     * @采美AI助手-提问记录详情
+     * @param:userId 用户userId
+     * @param:chatId 记录Id
+     */
+    userNewChatDetail(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/chat/history/detail',
+            data,
+            isLoading: false
+        })
+    }
 }