revert: 所有代码与custom/common分支同

pages_tool/agreement/contenr.vue

@@ -5,48 +5,50 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser.js';
+import htmlParser from '@/common/js/html-parser';
 export default {
-	components: {
-	},
-	data() {
-		return {
-			content: '',
-			type: '',
-			uniacid: 0
-		};
-	},
-	onLoad(option) {
+	 components: {
+	  },
+    data() {
+        return {
+			content:'',
+			type:'',
+			uniacid:0
+        };
+    },
+    onLoad(option) {
 		this.type = option.type
-		this.uniacid = option.uniacid ? option.uniacid : 0
-
-		this.isIphoneX = this.$util.uniappIsIPhoneX()
-		this.getcontent()
-	},
-	onShow() {
-
-	},
-	methods: {
-		getcontent() {
+		this.uniacid = option.uniacid?option.uniacid:0
+		
+        this.isIphoneX = this.$util.uniappIsIPhoneX()
+		 this.getcontent()
+    },
+    onShow() {
+      
+    },
+    methods: {
+        getcontent() {
 			// privacy  content
 			var data = {
-				type: this.type
+				type:this.type
 			}
-			if (this.uniacid > 0) data.uniacid = this.uniacid
-			this.$api.sendRequest({
-				url: '/api/config/agreement',
-				data: data,
-				success: res => {
+			if(this.uniacid > 0) data.uniacid = this.uniacid
+            this.$api.sendRequest({
+               	url: '/api/config/agreement',
+				data:data,
+                success: res => {
 					console.log(res.data.title)
 					uni.setNavigationBarTitle({
-						title: res.data.title
+						title:res.data.title
 					})
 					this.content = res.data.content
-				}
-			});
-		}
-	}
+				}                   
+            });
+        }
+    }
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+
+</style>

pages_tool/article/detail.vue

@@ -25,140 +25,134 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser.js';
-export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif			
-	},
-	data() {
-		return {
-			articleId: 0,
-			detail: {},
-			content: ''
-		};
-	},
-	onLoad(options) {
-		this.articleId = options.article_id || 0;
-		// 小程序扫码进入
-		if (options.scene) {
-			var sceneParams = decodeURIComponent(options.scene);
-			this.articleId = sceneParams.split('-')[1];
-		}
-		if (this.articleId == 0) {
-			this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-		}
-	},
-	onShow() {
-		this.getData();
-	},
-	methods: {
-		getData() {
-			this.$api.sendRequest({
-				url: '/api/article/info',
-				data: {
-					article_id: this.articleId
-				},
-				success: res => {
-					if (res.code == 0 && res.data) {
-						this.detail = res.data;
-						this.$langConfig.title(this.detail.article_title);
-						this.content = htmlParser(this.detail.article_content);
-						this.setPublicShare();
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
-						}, 2000);
-					}
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		data() {
+			return {
+				articleId: 0,
+				detail: {},
+				content: ''
+			};
 		},
-		// 设置公众号分享
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
-			this.$util.setPublicShare({
-				title: this.detail.article_title,
-				desc: '',
-				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-			});
+		onLoad(options) {
+			this.articleId = options.article_id || 0;
+			// 小程序扫码进入
+			if (options.scene) {
+				var sceneParams = decodeURIComponent(options.scene);
+				this.articleId = sceneParams.split('-')[1];
+			}
+			if (this.articleId == 0) {
+				this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+			}
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.$api.sendRequest({
+					url: '/api/article/info',
+					data: {
+						article_id: this.articleId
+					},
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.detail = res.data;
+							this.$langConfig.title(this.detail.article_title);
+							this.content = htmlParser(this.detail.article_content);
+							this.setPublicShare();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+							}, 2000);
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/article/detail?article_id=' + this.articleId;
+				this.$util.setPublicShare({
+					title: this.detail.article_title,
+					desc: '',
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				});
+			}
+		},
+		onShareAppMessage(res) {
+			var title = this.detail.article_title;
+			var path = '/pages_tool/article/detail?article_id=' + this.articleId;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = this.detail.article_title;
+			var query = 'article_id=' + this.articleId;
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
 		}
-	},
-	onShareAppMessage(res) {
-		var title = this.detail.article_title;
-		var path = '/pages_tool/article/detail?article_id=' + this.articleId;
-		return {
-			title: title,
-			path: path,
-			success: res => { },
-			fail: res => { }
-		};
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		var title = this.detail.article_title;
-		var query = 'article_id=' + this.articleId;
-		return {
-			title: title,
-			query: query,
-			imageUrl: ''
-		};
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.page {
-	width: 100%;
-	height: 100%;
-	padding: 30rpx;
-	box-sizing: border-box;
-	background: #ffffff;
-}
-
-.help-title {
-	font-size: $font-size-toolbar;
-	text-align: left;
-	font-weight: bold;
-}
-
-.help-content {
-	margin-top: $margin-updown;
-	word-break: break-all;
-}
-
-.help-meta {
-	text-align: left;
-	margin-top: $margin-updown;
-	color: $color-tip;
-
-	.help-time {
-		font-size: $font-size-tag;
-	}
-}
-
-.bottom-area {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: 40rpx;
-
-	.price-font {
-		font-weight: normal !important;
+	.page {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		background: #ffffff;
 	}
 
-	view {
-		color: #999;
-		font-size: 24rpx;
+	.help-title {
+		font-size: $font-size-toolbar;
+		text-align: left;
+		font-weight: bold;
+	}
+
+	.help-content {
+		margin-top: $margin-updown;
+		word-break: break-all;
+	}
+
+	.help-meta {
+		text-align: left;
+		margin-top: $margin-updown;
+		color: $color-tip;
+
+		.help-time {
+			font-size: $font-size-tag;
+		}
+	}
+
+	.bottom-area {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 40rpx;
+
+		.price-font {
+			font-weight: normal !important;
+		}
+
+		view {
+			color: #999;
+			font-size: 24rpx;
+		}
 	}
-}
 </style>

pages_tool/article/list.vue

@@ -6,8 +6,7 @@
 					<ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
 					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="article-img">
-							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix"
-								@error="imgError(index)" />
+							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix" @error="imgError(index)"/>
 						</view>
 						<view class="info-wrap">
 							<text class="title">{{ item.article_title }}</text>
@@ -34,195 +33,203 @@
 </template>
 
 <script>
-
-export default {
-	components: {
-		nsAdv: () => import('@/components/ns-adv/ns-adv.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif
-	},
-	data() {
-		return {
-			list: []
-		};
-	},
-	onShow() {
-		this.setPublicShare();
-	},
-	methods: {
-		getData(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/article/page',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
+	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif	
+	
+	export default {
+		data() {
+			return {
+				list: []
+			};
+		},
+		components: {
+			nsAdv,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
+		},
+		onShow() {
+			this.setPublicShare();
+		},
+		methods: {
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/article/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-					this.list = this.list.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
+				});
+			},
+			toDetail(item) {
+				this.$util.redirectTo('/pages_tool/article/detail', {
+					article_id: item.article_id
+				});
+			},
+			imgError(index) {
+				if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
+				this.$util.setPublicShare({
+					title: '文章列表',
+					desc: '',
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				});
+			}
 		},
-		toDetail(item) {
-			this.$util.redirectTo('/pages_tool/article/detail', {
-				article_id: item.article_id
-			});
+		onShareAppMessage(res) {
+			var title = '文章列表';
+			var path = '/pages_tool/article/list';
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
 		},
-		imgError(index) {
-			if (this.list[index]) this.list[index].cover_img = this.$util.getDefaultImage().article;
-		},
-		// 设置公众号分享
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
-			this.$util.setPublicShare({
-				title: '文章列表',
-				desc: '',
-				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-			});
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = '文章列表';
+			var query = '/pages_tool/article/list';
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
 		}
-	},
-	onShareAppMessage(res) {
-		var title = '文章列表';
-		var path = '/pages_tool/article/list';
-		return {
-			title: title,
-			path: path,
-			success: res => { },
-			fail: res => { }
-		};
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		var title = '文章列表';
-		var query = '/pages_tool/article/list';
-		return {
-			title: title,
-			query: query,
-			imageUrl: ''
-		};
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-/deep/ .fixed {
-	position: relative;
-	top: 0;
-}
-
-.empty-wrap {
-	padding-top: 200rpx;
-}
-
-.article-wrap {
-	background: #f8f8f8;
-
-	.adv-wrap {
-		margin: 24rpx 24rpx 0 24rpx;
-		width: auto;
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
 	}
 
-	.item {
-		display: flex;
-		padding: 20rpx;
-		background-color: #fff;
-		margin: 24rpx;
-		border-radius: 16rpx;
+	.empty-wrap {
+		padding-top: 200rpx;
+	}
 
-		.article-img {
-			margin-right: 20rpx;
-			width: 160rpx;
-			height: 160rpx;
-			overflow: hidden;
-			display: flex;
-			align-items: center;
-			justify-content: center;
+	.article-wrap {
+		background: #f8f8f8;
 
-			image {
-				width: 100%;
-			}
+		.adv-wrap {
+			margin: 24rpx 24rpx 0 24rpx;
+			width: auto;
 		}
 
-		.info-wrap {
-			flex: 1;
+		.item {
 			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
+			padding: 20rpx;
+			background-color: #fff;
+			margin: 24rpx;
+			border-radius: 16rpx;
 
-			.title {
-				font-weight: bold;
-				margin-bottom: 10rpx;
+			.article-img {
+				margin-right: 20rpx;
+				width: 160rpx;
+				height: 160rpx;
 				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				-webkit-box-orient: vertical;
-				font-size: 30rpx;
-				line-height: 1.5;
-			}
-
-			.abstract {
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-line-clamp: 2;
-				-webkit-box-orient: vertical;
-				font-size: $font-size-tag;
-			}
-
-			.read-wrap {
 				display: flex;
-				color: #999ca7;
-				justify-content: flex-start;
 				align-items: center;
-				margin-top: 10rpx;
-				line-height: 1;
+				justify-content: center;
 
-				text {
+				image {
+					width: 100%;
+				}
+			}
+
+			.info-wrap {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.title {
+					font-weight: bold;
+					margin-bottom: 10rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+					font-size: 30rpx;
+					line-height: 1.5;
+				}
+
+				.abstract {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
 					font-size: $font-size-tag;
 				}
 
-				.iconfont {
-					font-size: 36rpx;
-					vertical-align: bottom;
-					margin-right: 10rpx;
-				}
+				.read-wrap {
+					display: flex;
+					color: #999ca7;
+					justify-content: flex-start;
+					align-items: center;
+					margin-top: 10rpx;
+					line-height: 1;
 
-				.category-icon {
-					width: 8rpx;
-					height: 8rpx;
-					border-radius: 50%;
-					background: $base-color;
-					margin-right: 10rpx;
-				}
+					text {
+						font-size: $font-size-tag;
+					}
 
-				.date {
-					margin-left: 20rpx;
+					.iconfont {
+						font-size: 36rpx;
+						vertical-align: bottom;
+						margin-right: 10rpx;
+					}
+
+					.category-icon {
+						width: 8rpx;
+						height: 8rpx;
+						border-radius: 50%;
+						background: $base-color;
+						margin-right: 10rpx;
+					}
+
+					.date {
+						margin-left: 20rpx;
+					}
 				}
 			}
 		}
 	}
-}
 </style>

pages_tool/cases/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view :style="themeColor">
+  <view>
     <view class="about w100">
       <view class="list_cotact padding-top">
         <view class="container">
@@ -8,9 +8,7 @@
               <view class="bl clearfix bor bg-white">
                 <block v-if="item.$orig.case_type === 0">
                   <view class="video-container">
-                    <video class="adaptive-video" style="height:400rpx;" autoPauseIfNavigate="true"
-                      autoPauseIfOpenNative="true" autoplay="false" enableAutoRotation="true" id="myVideo"
-                      :poster="item.g0" :src="item.g1" controls="true"></video>
+                    <video class="adaptive-video" style="height:400rpx;" autoPauseIfNavigate="true" autoPauseIfOpenNative="true" autoplay="false" enableAutoRotation="true" id="myVideo" :poster="item.g0" :src="item.g1" controls="true"></video>
                   </view>
                 </block>
                 <block v-if="item.$orig.case_type === 1">
@@ -19,16 +17,16 @@
                   </view>
                 </block>
                 <view style="padding:20rpx;">
-                  <view style="font-size:36rpx;font-weight:600;">{{ item.$orig.title }}</view>
-                  <view>{{ item.$orig.desc }}</view>
-                  <view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{ "完成时间：" + item.g3 }}</view>
+                  <view style="font-size:36rpx;font-weight:600;">{{item.$orig.title}}</view>
+                  <view>{{item.$orig.desc}}</view>
+                  <view style="font-size:24rpx;color:#888;padding-top:20rpx;">{{"完成时间：" + item.g3}}</view>
                   <block v-if="item.$orig.files_url">
                     <view @tap="toDetail(item.$orig)" class="item">
                       <view class="article-img">
                         <image class="cover-img" :src="item.g4" mode="widthFix" @error="imgError(index)"></image>
                       </view>
                       <view class="info-wrap">
-                        <view class="title">{{ item.$orig.files_title }}</view>
+                        <view class="title">{{item.$orig.files_title}}</view>
                         <view class="read-wrap">
                           <text>查看PDF文件</text>
                         </view>
@@ -61,15 +59,13 @@
                 <view class="fui-cell">
                   <view class="fui-cell-label">联系方式</view>
                   <view class="fui-cell-info">
-                    <input class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number"
-                      v-model="Form.mobile" />
+                    <input class="fui-input" maxlength="11" placeholder="请输入您的手机号" type="number" v-model="Form.mobile" />
                   </view>
                 </view>
                 <view class="fui-cell">
                   <view class="fui-cell-label" style="position:absolute;top:10px;">留言内容</view>
                   <view class="fui-cell-info" style="margin-left:160rpx;border:solid 2rpx #eee;">
-                    <textarea class="textarea" style="font-size:28rpx;padding:10rpx;" placeholder="请输入留言内容"
-                      v-model="Form.remark"></textarea>
+                    <textarea class="textarea" style="font-size:28rpx;padding:10rpx;" placeholder="请输入留言内容" v-model="Form.remark"></textarea>
                   </view>
                 </view>
               </view>
@@ -81,11 +77,9 @@
         </view>
       </uni-popup>
     </view>
-    <uni-popup ref="videoPopup" class="vue-ref" style="background:transparent;width:100%;height:100%;" type="center"
-      @change="videochange">
+    <uni-popup ref="videoPopup" class="vue-ref" style="background:transparent;width:100%;height:100%;" type="center" @change="videochange">
       <view class="video-container" style="position:fixed;top:30%;width:100%;left:0;">
-        <video class="adaptive-video" autoPauseIfNavigate="true" autoPauseIfOpenNative="true" autoplay="false"
-          enableAutoRotation="true" id="myVideo" :src="video_url" controls="true"></video>
+        <video class="adaptive-video" autoPauseIfNavigate="true" autoPauseIfOpenNative="true" autoplay="false" enableAutoRotation="true" id="myVideo" :src="video_url" controls="true"></video>
       </view>
     </uni-popup>
   </view>
@@ -94,9 +88,6 @@
 <script>
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
-  components: {
-    uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-  },
   data() {
     return {
       dataList: [],
@@ -122,7 +113,7 @@ export default {
   },
   components: {
     uniPopup
-  },
+  },  
   methods: {
     init() {
       this.$api.sendRequest({
@@ -544,15 +535,14 @@ image {
   height: 60rpx;
 }
 
-.list_cotact .bor .name,
-.view_ul_100 .name {
+.list_cotact .bor .name, .view_ul_100 .name {
   font-size: 32rpx;
   line-height: 44rpx;
   margin-top: 20rpx;
   color: #fff;
 }
 
-.list_cotact .view_ul_one .view_li:nth-child(1)>button {
+.list_cotact .view_ul_one .view_li:nth-child(1) > button {
   background: #0054a5;
   height: 200rpx;
   line-height: 20rpx;
@@ -573,7 +563,7 @@ image {
   width: 100%;
 }
 
-.view_ul_100>view {
+.view_ul_100 > view {
   background: #fff;
 }
 
@@ -587,12 +577,12 @@ image {
   margin-top: 0;
 }
 
-.list_cotact .view_ul_two .view_li>view {
+.list_cotact .view_ul_two .view_li > view {
   background-color: #fff;
   padding: 20rpx 30rpx 0rpx 30rpx;
 }
 
-.list_cotact .view_ul_two .view_li>view .address {
+.list_cotact .view_ul_two .view_li > view .address {
   background-color: #5dc2d0;
   color: #fff;
   display: inline-block;

pages_tool/components/chat-message/chat-message.vue

@@ -0,0 +1,342 @@
+<template>
+	<view class="chat-message">
+		<block v-if="message.contentType == 'sendGood'">
+			<ns-chat-goods :skuId="message.sku_id" :goodsDetail="message.goodsDetail" @sendMsg="sendGood"></ns-chat-goods>
+		</block>
+		<block v-if="message.contentType == 'sendOrder'">
+			<ns-chat-order :orderId="message.order_id" :orderdetails="message.orderDetail" @sendMsg="sendOrder"></ns-chat-order>
+		</block>
+		<block v-if="message.contentType == 'goodssku'">
+			<ns-chat-receiveGoods :skuId="message.sku_id"></ns-chat-receiveGoods>
+		</block>
+		<view class="message" v-if="message.contentType == 'string'">
+			<view class="message-item " :class="message.isItMe ? 'right' : 'left'">
+				<block v-if="message.isItMe">
+					<view class="head_img">
+						<image class="img" :src="myHeadImg" v-if="myHeadImg" @error="myHeadImgError" mode="aspectFit"/>
+						<image class="img" :src="defaultHead" mode="aspectFit" v-else/>
+					</view>
+				</block>
+				<block v-else>
+					<view class="head_img">
+						<image class="img" :src="avatar" mode="aspectFit" v-if="avatar"></image>
+						<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
+					</view>
+				</block>
+				<view class="chat_text">
+					<text class="iconfont icon-warn margin-right color-base-text" v-if="message.isItMe && !message.sendStatus"></text>
+					<view class="content"><rich-text :nodes="stringToEmjoy(message.content)"></rich-text></view>
+					<!-- <text class="iconfont icon-warn margin-left" v-if="!message.isItMe  && !message.sendStatus"></text> -->
+				</view>
+			</view>
+		</view>
+		<view class="message" v-if="message.contentType == 'image'">
+			<view class="message-item " :class="message.isItMe ? 'right' : 'left'">
+				<block v-if="message.isItMe">
+					<view class="head_img">
+						<image class="img" :src="myHeadImg" v-if="myHeadImg" mode="aspectFit"></image>
+						<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
+					</view>
+				</block>
+				<block v-else>
+					<view class="head_img">
+						<image class="img" :src="avatar" mode="aspectFit" v-if="avatar"></image>
+						<image class="img" :src="defaultHead" mode="aspectFit" v-else></image>
+					</view>
+				</block>
+				<view class="chat_img">
+					<text class="iconfont icon-warn margin-right color-base-text" v-if="message.isItMe && !message.sendStatus"></text>
+					<view class="content_img" @click="previewMedia($util.img(message.image))" :style="{ backgroundImage: 'url(' + $util.img(message.image) + ')' }">
+						<!-- <image class="img_img" :src="$util.img(message.image)" mode="aspectFit"></image> -->
+					</view>
+					<!-- <text class="iconfont icon-warn margin-left" v-if="!message.isItMe  && !message.sendStatus"></text> -->
+				</view>
+			</view>
+		</view>
+		<view v-else-if="message.contentType == 'goods'"><ns-chat-goods :isCanSend="false" :skuId="message.sku_id"></ns-chat-goods></view>
+		<view v-else-if="message.contentType == 'order'"><ns-chat-order :isCanSend="false" :orderId="message.order_id"></ns-chat-order></view>
+
+		<view class="no-connect-box" v-if="message.contentType == 'noline'">
+			<view class="no-connect">客服不在线</view>
+		</view>
+		<view class="no-connect-box" v-if="message.contentType == 'online'">
+			<view class="no-connect">客服在线</view>
+		</view>
+		<uni-popup ref="imgPopup" type="center">
+			<view class="imagePop">
+				<image :src="$util.img(currImg)" mode="aspectFit"></image>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
+	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
+	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
+	import htmlParser from '@/common/js/html-parser';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import emjoy from '@/common/js/emjoy.js';
+
+	export default {
+		name: 'chat-message',
+		props: {
+			message: {
+				type: Object
+			},
+			send: {
+				type: Boolean
+			}
+		},
+		data() {
+			return {
+				avatar: '', //店铺头像
+				defaultAvatar: this.$util.getDefaultImage().store,
+				myHeadImg: '', //我的头像
+				defaultHead: this.$util.getDefaultImage().head,
+				emjoyList: emjoy.emjoyList,
+				currImg: ''
+			};
+		},
+		components: {
+			nsChatGoods,
+			nsChatOrder,
+			uniPopup,
+			nsChatReceiveGoods
+		},
+		mounted() {
+			this.avatar = this.$util.img(this.siteInfo.logo_square);
+			this.myHeadImg = this.$util.img(this.memberInfo.headimg);
+		},
+		methods: {
+			// 预览图片
+			previewMedia(img_url) {
+				var paths = [img_url];
+				uni.previewImage({
+					current: 0,
+					urls: paths
+				});
+			},
+			sendGood() {
+				this.$emit('sendGood', 'goods');
+			},
+			sendOrder() {
+				this.$emit('sendOrder', 'order');
+			},
+			// 处理图片错误
+			myHeadImgError() {
+				this.myHeadImg = this.defaultHead;
+			},
+			stringToEmjoy(value) {
+				if (!value) return;
+				// 兼容旧版本图片
+				var reg = RegExp(/\[/);
+				if (reg.test(value)) {
+					let string = value; // 需要把和匹配出来
+					let reg = new RegExp('\\[emjoy_(.+?)\\]', 'g');
+					let emjoyString = string.replace(reg, v => {
+						let emjoy = '';
+						for (let index in this.emjoyList) {
+							if (v == index) {
+								let _url = this.$util.img(this.emjoyList[index]);
+								emjoy = "<img class='message-img' src='" + _url + "'/>";
+								break;
+							}
+						}
+						if (emjoy) {
+							return emjoy;
+						} else {
+							return v;
+						}
+					});
+					let content = htmlParser(emjoyString);
+					content.forEach(v => {
+						if (v.name == 'img') {
+							v.attrs.style = 'display: inline-block;width: 32rpx !important;height: 32rpx !important;padding:0 2rpx;';
+						}
+					});
+					return content;
+				} else {
+					let content = value;
+					return content;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background-color: #000;
+	}
+
+	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+		max-width: 100%;
+		width: 100%;
+	}
+
+	.imagePop {
+		height: 50vh;
+		width: 100vw;
+		text-align: center;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.chat-message {
+		width: 100%;
+		height: 100%;
+
+		.message {
+			padding: 13rpx 20rpx;
+			position: relative;
+		}
+
+		.left .content {
+			padding: 20rpx;
+			max-width: 450rpx;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+		}
+
+		.right .content {
+			padding: 20rpx;
+			max-width: 450rpx;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+		}
+
+		.content_img {
+			height: 200rpx;
+			width: 100%;
+			overflow: hidden;
+			text-align: right;
+			margin-left: 28rpx;
+			background-position: center right;
+			background-repeat: no-repeat;
+			background-size: contain;
+
+			image {
+				min-height: 80rpx;
+				min-width: 80rpx;
+				height: 100%;
+				width: 100%;
+			}
+		}
+
+		.right .content_img {
+			margin-right: 28rpx;
+			margin-left: 0;
+		}
+
+		.message-item {
+			display: flex;
+			justify-content: flex-start;
+			align-items: flex-start;
+			align-content: flex-start;
+			flex-wrap: nowrap;
+			flex-direction: row;
+
+			.head_img {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				overflow: hidden;
+				position: relative;
+
+				.img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			//图片
+			.contentType3 {
+				padding: 0;
+				border-radius: 2rpx;
+				background-color: transparent !important;
+
+				.img {
+					width: 200rpx;
+					height: auto;
+					max-width: 300rpx;
+					max-height: 400rpx;
+				}
+			}
+
+			.contentType3::after {
+				border: none !important;
+				display: none !important;
+			}
+
+			.content-type-right {
+				flex-direction: row-reverse;
+			}
+
+			&.right {
+				flex-direction: row-reverse;
+
+				.content {
+					background-color: #4cd964;
+					margin-right: 28rpx;
+					word-break: break-all;
+					line-height: 36rpx;
+					position: relative;
+				}
+			}
+
+			&.left {
+				.content {
+					background-color: #ffffff;
+					margin-left: 28rpx;
+					word-break: break-all;
+					line-height: 36rpx;
+					position: relative;
+				}
+			}
+		}
+
+		.next {
+			width: 100%;
+			height: 20rpx;
+		}
+	}
+
+	.no-connect-box {
+		width: 100%;
+		text-align: center;
+		margin: 20rpx 0 50rpx;
+
+		.no-connect {
+			display: inline-block;
+			padding: 0 20rpx;
+			height: 40rpx;
+			background: red;
+			margin: 0 auto;
+			background: rgba(0, 0, 0, 0.5);
+			border-radius: 9rpx;
+			text-align: center;
+			line-height: 40rpx;
+			font-size: 22rpx;
+			color: #ffffff;
+		}
+	}
+
+	.chat_text,
+	.chat_img {
+		display: flex;
+		align-items: center;
+
+		.iconfont {
+			font-size: 36rpx;
+		}
+	}
+
+	.chat_img {
+		width: 30%;
+		height: 200rpx;
+	}
+</style>

pages_tool/components/myp-one/myp-one.vue

@@ -0,0 +1,234 @@
+<template>
+	<view class="code-box">
+		<view class="flex-box">
+			<input :value="inputValue" type="number" :focus="autoFocus" :maxlength="maxlength" class="hide-input" @input="getVal" />
+			<block v-for="(item, index) in ranges" :key="index">
+				<view :class="['item', { active: codeIndex === item, middle: type === 'middle', bottom: type === 'bottom', box: type === 'box' }]">
+					<view class="line" v-if="type !== 'middle'"></view>
+					<view v-if="type === 'middle' && codeIndex <= item" class="bottom-line"></view>
+					<block v-if="isPwd && codeArr.length >= item"><text class="dot">●</text></block>
+					<block v-else>
+						<text class="number">{{ codeArr[index] ? codeArr[index] : '' }}</text>
+					</block>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+// 支持使用 v-model
+// 支持使用refs
+export default {
+	name: 'mypOneInput',
+	props: {
+		// 支持外部提供，支持使用v-model
+		// 支持通过value来做清空
+		value: {
+			type: String,
+			default: ''
+		},
+		// 4/6
+		maxlength: {
+			type: Number,
+			default: 4
+		},
+		autoFocus: {
+			type: Boolean,
+			default: false
+		},
+		isPwd: {
+			type: Boolean,
+			default: false
+		},
+		// middle-middle line, bottom-bottom line, box-square box
+		type: {
+			type: String,
+			default: 'bottom'
+		}
+	},
+	watch: {
+		maxlength: {
+			immediate: true,
+			handler: function(newV) {
+				if (newV === 6) {
+					this.ranges = [1, 2, 3, 4, 5, 6];
+				} else {
+					this.ranges = [1, 2, 3, 4];
+				}
+			}
+		},
+		value: {
+			immediate: true,
+			handler: function(newV) {
+				if (newV !== this.inputValue) {
+					this.inputValue = newV;
+					this.toMakeAndCheck(newV);
+				}
+			}
+		}
+	},
+	data() {
+		return {
+			inputValue: '',
+			codeIndex: 1,
+			codeArr: [],
+			ranges: [1, 2, 3, 4]
+		};
+	},
+	methods: {
+		getVal(e) {
+			const val = e.detail.value;
+			this.inputValue = val;
+			this.$emit('input', val);
+			this.toMakeAndCheck(val);
+		},
+		toMakeAndCheck(val) {
+			const arr = val.split('');
+			this.codeIndex = arr.length + 1;
+			this.codeArr = arr;
+			if (this.codeIndex > Number(this.maxlength)) {
+				this.$emit('finish', this.codeArr.join(''));
+			}
+		},
+		// refs 时不再提供 v-model 支持
+		// 支持使用refs来设置value
+		// 没有提供数据保护与检测，自己在外面对数据进行检测保护
+		set(val) {
+			this.inputValue = val;
+			this.toMakeAndCheck(val);
+		},
+		// 支持使用refs来清空
+		clear() {
+			this.inputValue = '';
+			this.codeArr = [];
+			this.codeIndex = 1;
+		}
+	}
+};
+</script>
+
+<style scoped>
+@keyframes twinkling {
+	0% {
+		opacity: 0.2;
+	}
+
+	50% {
+		opacity: 0.5;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+
+.code-box {
+	text-align: center;
+}
+
+.flex-box {
+	display: flex;
+	justify-content: center;
+	flex-wrap: wrap;
+	position: relative;
+}
+
+.flex-box .hide-input {
+	position: absolute;
+	top: 0;
+	left: -100%;
+	width: 200%;
+	height: 100%;
+	text-align: left;
+	z-index: 9;
+	opacity: 1;
+}
+
+.flex-box .item {
+	position: relative;
+	flex: 1;
+	margin-right: 18rpx;
+	font-size: 70rpx;
+	font-weight: bold;
+	color: #333333;
+	line-height: 100rpx;
+}
+
+.flex-box .item::before {
+	content: '';
+	padding-top: 100%;
+	display: block;
+}
+
+.flex-box .item:last-child {
+	margin-right: 0;
+}
+
+.flex-box .middle {
+	border: none;
+}
+
+.flex-box .box {
+	box-sizing: border-box;
+	border: 2rpx solid #cccccc;
+	border-width: 2rpx 0 2rpx 2rpx;
+	margin-right: 0;
+}
+
+.flex-box .box:first-of-type {
+	border-top-left-radius: 8rpx;
+	border-bottom-left-radius: 8rpx;
+}
+
+.flex-box .box:last-child {
+	border-right: 2rpx solid #cccccc;
+	border-top-right-radius: 8rpx;
+	border-bottom-right-radius: 8rpx;
+}
+
+.flex-box .bottom {
+	box-sizing: border-box;
+	border-bottom: 2rpx solid #ddd;
+}
+
+.flex-box .active {
+	border-color: #ddd;
+}
+
+.flex-box .active .line {
+	display: block;
+}
+
+.flex-box .line {
+	display: none;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	width: 2rpx;
+	height: 40rpx;
+	background: #333333;
+	animation: twinkling 1s infinite ease;
+}
+
+.flex-box .dot,
+.flex-box .number {
+	line-height: 40rpx;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.flex-box .bottom-line {
+	height: 8rpx;
+	background: #000000;
+	width: 80%;
+	position: absolute;
+	border-radius: 4rpx;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+</style>

pages_tool/components/ns-adv/ns-adv.vue

@@ -0,0 +1,120 @@
+<template>
+	<view v-if="advList.length" :class="['container-box',className]">
+		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
+			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
+				<view class="image-box">
+					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view v-else class="container-box item-wrap">
+			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'ns-advert',
+		props: {
+			keyword: {
+				type: String
+			},
+			className: {
+				type: String
+			}
+		},
+		data() {
+			return {
+				advList: [],
+				isImage: false,
+				//滑块的高度(单位px)
+				swiperHeight: 150,
+				//当前索引
+				currentIndex: 0,
+			};
+		},
+		created() {
+			this.getAdvList();
+		},
+		methods: {
+			//获取广告位
+			getAdvList() {
+				var item = {
+					adv_image: '',
+					adv_url: ''
+				};
+				this.$api.sendRequest({
+					url: '/api/adv/detail',
+					data: {
+						keyword: this.keyword
+					},
+					success: res => {
+						if (res.code == 0) {
+							var data = res.data.adv_list;
+							for (var index in data) {
+								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
+							}
+							this.advList = res.data.adv_list;
+
+							//动态设置swiper的高度
+							this.$nextTick(() => {
+								this.setSwiperHeight();
+							});
+						}
+					}
+				});
+			},
+			jumppage(e) {
+				this.$util.diyRedirectTo(e);
+			},
+			imageLoad(data) {
+				this.isImage = true;
+			},
+			//手动切换题目
+			changeSwiper(e) {
+				this.currentIndex = e.detail.current;
+				//动态设置swiper的高度，使用nextTick延时设置
+				this.$nextTick(() => {
+					this.setSwiperHeight();
+				});
+			},
+			//动态设置swiper的高度
+			setSwiperHeight() {
+				if (this.advList.length > 1) {
+					setTimeout(() => {
+						let element = "#content-wrap" + this.currentIndex;
+						let query = uni.createSelectorQuery().in(this);
+						query.select(element).boundingClientRect();
+						query.exec((res) => {
+							if (res && res[0]) {
+								this.swiperHeight = res[0].height;
+							}
+						});
+					}, 10);
+				}
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container-box {
+		width: 100%;
+
+		.item-wrap {
+			border-radius: 10rpx;
+
+			.image-box {
+				border-radius: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: auto;
+				border-radius: 10rpx;
+				will-change: transform;
+			}
+		}
+	}
+</style>

pages_tool/components/ns-chat/ns-chat-goods.vue

@@ -0,0 +1,142 @@
+<template>
+	<view class="message">
+		<view class="goods-item" v-if="goodsInfo.goods_name || goodsInfo.en_goods_name">
+			<image :src="$util.img(goodsInfo.sku_image)" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ goodsInfo.sku_name ? goodsInfo.sku_name : (isEnEnv ? goodsInfo.en_goods_name : goodsInfo.goods_name) }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price">
+						<text class="goods-price-sign color-base-text">￥</text>
+						<text class="color-base-text">{{ goodsInfo.price }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag disabled">已发送</view>
+				</view>
+			</view>
+		</view>
+		<view class="goods-item" v-else-if="goodsDetail">
+			<image :src="$util.img(goodsDetail.sku_image)" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ? goodsDetail.en_goods_name : goodsDetail.goods_name) }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price">
+						<text class="goods-price-sign color-base-text">￥</text>
+						<text class="color-base-text">{{ goodsDetail.price }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag color-base-bg" @click="sendMsg('goods')">发送</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'ns-chat-goods',
+	props: {
+		skuId: {
+			type: [Number, String]
+		},
+		goodsDetail: {
+			type: [Object]
+		}
+	},
+	data() {
+		return {
+			goodsInfo: {}
+		};
+	},
+	mounted() {
+		this.getGoodsInfo();
+	},
+	methods: {
+		getGoodsInfo() {
+			this.$api.sendRequest({
+				url: '/api/goodssku/detail',
+				data: {
+					sku_id: this.skuId
+				},
+				success: res => {
+					if (res.code >= 0) {
+						this.goodsInfo = res.data.goods_sku_detail;
+					}
+				}
+			});
+		},
+		sendMsg() {
+			this.$emit('sendMsg', 'goods');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.message {
+	padding: 13rpx 20rpx;
+	box-sizing: border-box;
+	width: 100vw;
+	position: relative;
+	.goods-item {
+		width: 100%;
+		height: 220rpx;
+
+		background: #ffffff;
+		position: relative;
+		display: flex;
+		align-items: center;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		padding: $padding;
+		box-sizing: border-box;
+		image {
+			width: 180rpx;
+			height: 180rpx;
+			min-width: 180rpx;
+		}
+		.goods-info {
+			width: 100%;
+			height: 180rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			padding-left: 20rpx;
+			box-sizing: border-box;
+			.goods-name {
+				width: 100%;
+				line-height: 1.4;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+			}
+			.goods-bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: flex-end;
+				text {
+					line-height: 1;
+				}
+				.goods-price {
+					display: flex;
+					align-items: flex-end;
+					padding-bottom: 10rpx;
+					font-weight: 500;
+					.goods-price-sign {
+						font-size: $font-size-activity-tag;
+					}
+				}
+				.goods-option {
+					width: 150rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					text-align: center;
+					border-radius: $border-radius;
+					color: #ffffff;
+				}
+			}
+		}
+		.disabled {
+			background: #e5e5e5;
+		}
+	}
+}
+</style>

pages_tool/components/ns-chat/ns-chat-order.vue

@@ -0,0 +1,149 @@
+<template>
+	<view class="message">
+		<view class="goods-item" v-if="orderdetails">
+			<image :src="$util.img(orderdetails.order_goods ? orderdetails.order_goods[0].sku_image : '')" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ orderdetails.order_goods ? orderdetails.order_goods[0].sku_name : '' }}</view>
+				<view class="font-size-goods-tag">订单状态:{{ orderdetails.order_status_name }}</view>
+				<view class="font-size-goods-tag">配送方式:{{ orderdetails.delivery_type_name }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price color-base-text">
+						<text class="goods-price-sign">￥</text>
+						<text>{{ orderdetails.order_goods ? orderdetails.order_goods[0].price : '' }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag color-base-bg" @click="sendMsg('order')">发送</view>
+				</view>
+			</view>
+		</view>
+		<view class="goods-item" v-else-if="orderInfo">
+			<image :src="$util.img(orderInfo.order_goods ? orderInfo.order_goods[0].sku_image : '')" mode="aspectFill"></image>
+			<view class="goods-info">
+				<view class="goods-name">{{ orderInfo.order_goods ? orderInfo.order_goods[0].sku_name : '' }}</view>
+				<view class="font-size-goods-tag">订单状态:{{ orderInfo.order_status_name }}</view>
+				<view class="font-size-goods-tag">配送方式:{{ orderInfo.delivery_type_name }}</view>
+				<view class="goods-bottom">
+					<view class="goods-price color-base-text">
+						<text class="goods-price-sign">￥</text>
+						<text>{{ orderInfo.order_goods ? orderInfo.order_goods[0].price : '' }}</text>
+					</view>
+					<view class="goods-option font-size-goods-tag disabled">已发送</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'ns-chat-order',
+	props: {
+		orderId: {
+			type: [Number, String]
+		},
+		isCanSend: Boolean,
+		orderdetails: {
+			type: [Object]
+		}
+	},
+	data() {
+		return {
+			orderInfo: {}
+		};
+	},
+	mounted() {
+		this.getGoodsInfo();
+	},
+	methods: {
+		getGoodsInfo() {
+			if (this.orderId) {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: this.orderId
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.orderInfo = res.data;
+						}
+					}
+				});
+			}
+		},
+		sendMsg() {
+			this.$emit('sendMsg', 'order');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.message {
+	padding: 13rpx 20rpx;
+	box-sizing: border-box;
+	width: 100vw;
+	position: relative;
+	.goods-item {
+		width: 100%;
+		height: 220rpx;
+		background: #ffffff;
+		position: relative;
+		display: flex;
+		align-items: center;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		padding: $padding;
+		box-sizing: border-box;
+		image {
+			width: 180rpx;
+			height: 180rpx;
+		}
+		.goods-info {
+			width: 100%;
+			height: 180rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			padding-left: 20rpx;
+			box-sizing: border-box;
+			.goods-name {
+				width: 100%;
+				line-height: 1.4;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+				// font-size: $font-size-tag;
+				margin-bottom: 10rpx;
+			}
+			.goods-bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: flex-end;
+				text {
+					line-height: 1;
+				}
+				.goods-price {
+					display: flex;
+					align-items: flex-end;
+					padding-bottom: 10rpx;
+					font-weight: 500;
+					.goods-price-sign {
+						font-size: 20rpx;
+					}
+				}
+				.goods-option {
+					width: 150rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					text-align: center;
+					border-radius: $border-radius;
+					color: #ffffff;
+				}
+			}
+		}
+		.disabled {
+			background: #e5e5e5;
+		}
+	}
+}
+</style>

pages_tool/components/ns-chat/ns-chat-receiveGoods.vue

@@ -0,0 +1,142 @@
+<template>
+	<view class="goods">
+		<view class="goods-msg">
+			<image :src="$util.img(goodsInfo.sku_image)" mode="aspectFill"></image>
+			<view class="goods-item">
+				<view class="title">{{ isEnEnv ? goodsInfo.en_goods_name : goodsInfo.goods_name }}</view>
+				<view class="goods-sku">
+					库存:{{ goodsInfo.stock }}
+					<text>销量:{{ goodsInfo.sale_num }}</text>
+				</view>
+				<view class="goods-price">
+					<view class="price color-base-text">
+						<text class="price-util">￥</text>
+						<text class="price-num">{{ goodsInfo.price }}</text>
+					</view>
+					<view class="see-shop color-base-text" @click="go_shop()">
+						查看商品
+						<text class="iconfont icon-right"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'ns-chat-receiveGoods',
+		props: {
+			skuId: {
+				type: [Number, String]
+			}
+		},
+		data() {
+			return {
+				goodsInfo: {}
+			};
+		},
+		mounted() {
+			this.getInfo();
+		},
+		methods: {
+			getInfo() {
+				this.$api.sendRequest({
+					url: '/api/goodssku/detail',
+					data: {
+						sku_id: this.skuId
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.goodsInfo = res.data.goods_sku_detail;
+							this.$emit('upDOM');
+							// that.setPageScrollTo();
+						}
+					}
+				});
+			},
+			go_shop() {
+				this.$util.redirectTo('/pages_goods/detail?goods_id=' + this.goodsInfo.goods_id);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.goods {
+		padding: 13rpx 20rpx;
+		box-sizing: border-box;
+		width: 100vw;
+		position: relative;
+
+		.goods-msg {
+			width: 100%;
+			height: 220rpx;
+			background: #ffffff;
+			position: relative;
+			display: flex;
+			align-items: center;
+			border-radius: 20rpx;
+			margin: 0 auto;
+			padding: $padding;
+			box-sizing: border-box;
+
+			image {
+				width: 180rpx;
+				height: 180rpx;
+				min-width: 180rpx;
+				border-radius: $border-radius;
+			}
+
+			.goods-item {
+				width: 100%;
+				height: 180rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				padding-left: 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					width: 100%;
+					line-height: 1.4;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
+
+				.goods-sku {
+					color: $color-sub;
+
+					text {
+						padding-left: $padding;
+					}
+				}
+
+				.goods-price {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.price {
+						.price-util {
+							font-size: $font-size-activity-tag;
+						}
+					}
+
+					.see-shop {
+						display: flex;
+						align-items: center;
+
+						text {
+							padding-top: 4rpx;
+							padding-left: 4rpx;
+							font-size: $font-size-sub;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages_tool/components/ns-progress/ns-progress.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="progress"><view class="progress-bar " ref="progress" :style="{ width: progress + '%' }"></view></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	props: {
+		progress: {
+			type: [Number, String],
+			default: 10
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.progress {
+	height: 12rpx;
+	overflow: hidden;
+	background-color: #ccc;
+	border-radius: 8rpx;
+}
+
+.progress-bar {
+	float: left;
+	height: 100%;
+	font-size: $font-size-tag;
+	line-height: 40rpx;
+	color: #fff;
+	text-align: center;
+	transition: width 0.6s ease;
+	background-color: #fff;
+}
+</style>

pages_tool/components/sx-rate/common.js

@@ -0,0 +1,6 @@
+export function getClientRect(selector, component) {
+	return new Promise((resolve, reject) => {
+		let query = component ? uni.createSelectorQuery().in(component) : uni.createSelectorQuery();
+		return query.select(selector).boundingClientRect(resolve).exec()
+	})
+}

pages_tool/components/sx-rate/index.vue

@@ -0,0 +1,218 @@
+<template>
+	<view class="rate-box" :class="[{ animation }, containerClass]" @touchmove="ontouchmove" @touchend="touchMoving = false">
+		<view
+			v-for="(val, i) in list"
+			:key="val"
+			class="rate"
+			:style="{ fontSize, paddingLeft: i !== 0 ? rateMargin : 0, paddingRight: i < list.length - 1 ? rateMargin : 0 }"
+			:class="[
+				{ scale: !disabled && val <= rateValue && animation && touchMoving, 'color-base-text': val <= rateValue, defaultColor: val > rateValue },
+				`rate-${i}`,
+				rateClass
+			]"
+			:data-val="val"
+			@click="onItemClick"
+		>
+			<text class="iconfont icon-star"></text>
+		</view>
+	</view>
+</template>
+
+<script>
+import { getClientRect } from './common';
+
+export default {
+	name: 'sx-rate',
+	props: {
+		// 当前值
+		value: {
+			type: [Number, String]
+		},
+		// 最大星星数量
+		max: {
+			type: Number,
+			default: 5
+		},
+		// 禁用
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 动画效果
+		animation: {
+			type: Boolean,
+			default: true
+		},
+		// 默认星星颜色
+		defaultColor: {
+			type: String,
+			default: '#ccc'
+		},
+		// 滑选后星星颜色
+		activeColor: {
+			type: String
+			// default: '#FFB700'
+		},
+		// 星星大小
+		fontSize: {
+			type: String,
+			default: 'inherit'
+		},
+		// 星星间距
+		margin: {
+			type: String,
+			default: ''
+		},
+		// 自定义类名-容器
+		containerClass: {
+			type: String,
+			default: ''
+		},
+		// 自定义类名-星星
+		rateClass: {
+			type: String,
+			default: ''
+		},
+		index: {
+			// 如果页面中存在多个该组件，通过该属性区分
+			type: [Number, String]
+		}
+	},
+	data() {
+		return {
+			rateValue: 0,
+			touchMoving: false,
+			startX: [],
+			startW: 30
+		};
+	},
+	computed: {
+		list() {
+			return [...new Array(this.max)].map((_, i) => i + 1);
+		},
+		rateMargin() {
+			let margin = this.margin;
+			if (!margin) return 0;
+
+			switch (typeof margin) {
+				case 'number':
+					margin = margin * 2 + 'rpx';
+				case 'string':
+					break;
+				default:
+					return 0;
+			}
+
+			let reg = /^(\d+)([^\d]*)/;
+			let result = reg.exec(margin);
+			if (!result) return 0;
+
+			let [_, num, unit] = result;
+			return num / 2 + unit;
+		}
+	},
+	watch: {
+		value: {
+			handler(val) {
+				this.rateValue = val;
+			},
+			immediate: true
+		}
+	},
+	methods: {
+		// 计算星星位置
+		async initStartX() {
+			let { max } = this;
+			this.startX = [];
+
+			for (let i = 0; i < max; i++) {
+				let selector = `.rate-${i}`;
+				let { left, width } = await getClientRect(selector, this);
+
+				this.startX.push(left);
+				this.startW = width;
+			}
+		},
+
+		/**
+		 * 手指滑动事件回调
+		 * https://github.com/sunxi1997/uni-app-sx-rate/pull/1
+		 * 原本的触摸处理在自定了样式后可能会出现bug, 已解决
+		 */
+		async ontouchmove(e) {
+			if (!this.touchMoving) {
+				this.touchMoving = true;
+				// 开始手指滑动时重新计算星星位置,防止星星位置意外变化
+				await this.initStartX();
+			}
+
+			let { startX, startW, max } = this;
+			let { touches } = e;
+
+			// 触摸焦点停留的位置
+			let { pageX } = touches[touches.length - 1];
+
+			// 超出最左边, 0 星
+			if (pageX <= startX[0]) return this.toggle(0);
+			// 刚好在第一颗星
+			else if (pageX <= startX[0] + startW) return this.toggle(1);
+			// 超出最右边, 最大星
+			else if (pageX >= startX[max - 1]) return this.toggle(max);
+
+			//计算星星停留的位置
+			let startXHash = startX.concat(pageX).sort((a, b) => a - b);
+			this.toggle(startXHash.indexOf(pageX));
+		},
+		// 点击回调
+		onItemClick(e) {
+			let { val } = e.currentTarget.dataset;
+			this.toggle(val);
+		},
+		// 修改值
+		toggle(val) {
+			let { disabled } = this;
+			if (disabled) return;
+			if (this.rateValue !== val) {
+				this.rateValue = val;
+				this.$emit('update:value', val);
+				let data = {
+					index: this.index,
+					value: val
+				};
+				this.$emit('change', data);
+			}
+		}
+	},
+	mounted() {}
+};
+</script>
+
+<style scoped>
+@import './sx-rate/iconfont.css';
+</style>
+
+<style lang="scss">
+.rate-box {
+	min-height: 1.4em;
+	display: flex;
+	align-items: center;
+}
+
+.rate {
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	width: 1.2em;
+	transition: all 0.15s linear;
+}
+
+.rate.scale {
+	transform: scale(1.1);
+}
+
+.defaultColor {
+	color: #ccc !important;
+}
+.activeColor {
+}
+</style>

pages_tool/components/sx-rate/sx-rate/iconfont.css

@@ -0,0 +1,21 @@
+@font-face {font-family: "iconfont";
+  src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
+  src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'),
+  url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'),
+  url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: inherit;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-star:before {
+  content: "\e6e3";
+}
+

pages_tool/components/sx-rate/sx-rate/iconfont.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="star" unicode="&#59107;" d="M544.256 812.032l117.248-237.568c5.12-10.752 15.36-17.92 27.136-19.456l262.144-37.888c29.696-4.096 41.472-40.448 19.968-61.44l-189.44-184.832c-8.704-8.192-12.288-19.968-10.24-31.744l44.544-261.12c5.12-29.184-25.6-51.712-52.224-37.888l-234.496 123.392c-10.24 5.632-23.04 5.632-33.28 0L261.12-59.904c-26.112-13.824-57.344 8.704-52.224 37.888l44.544 261.12c2.048 11.776-2.048 23.552-10.24 31.744L53.76 455.68C32.256 476.16 44.032 512.512 73.728 517.12l262.144 37.888c11.776 1.536 22.016 9.216 27.136 19.456l117.248 237.568C493.056 838.656 530.944 838.656 544.256 812.032z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

pages_tool/components/uni-calendar/calendar.js

@@ -0,0 +1,623 @@
+/**
+ * @1900-2100区间内的公历、农历互转
+ * @charset UTF-8
+ * @github  https://github.com/jjonline/calendar.js
+ * @Author  Jea杨(JJonline@JJonline.Cn)
+ * @Time    2014-7-21
+ * @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+ * @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+ * @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+ * @Version 1.0.3
+ * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+ * @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+ */
+/* eslint-disable */
+var calendar = {
+
+	/**
+	 * 农历1900-2100的润大小信息表
+	 * @Array Of Property
+	 * @return Hex
+	 */
+	lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0,
+		0x055d2, // 1900-1909
+		0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+		0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+		0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+		0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+		0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+		0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+		0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+		0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+		0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+		0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+		0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+		0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+		0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+		0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+		/** Add By JJonline@JJonline.Cn**/
+		0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+		0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+		0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+		0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+		0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+		0x0d520
+	], // 2100
+
+	/**
+	 * 公历每个月份的天数普通表
+	 * @Array Of Property
+	 * @return Number
+	 */
+	solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+	/**
+	 * 天干地支之天干速查表
+	 * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+	 * @return Cn string
+	 */
+	Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+	/**
+	 * 天干地支之地支速查表
+	 * @Array Of Property
+	 * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+	 * @return Cn string
+	 */
+	Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149',
+		'\u620c',
+		'\u4ea5'
+	],
+
+	/**
+	 * 天干地支之地支速查表<=>生肖
+	 * @Array Of Property
+	 * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+	 * @return Cn string
+	 */
+	Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21',
+		'\u72d7', '\u732a'
+	],
+
+	/**
+	 * 24节气速查表
+	 * @Array Of Property
+	 * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+	 * @return Cn string
+	 */
+	solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206',
+		'\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3',
+		'\u5c0f\u6691',
+		'\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732',
+		'\u971c\u964d',
+		'\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'
+	],
+
+	/**
+	 * 1900-2100各年的24节气日期速查表
+	 * @Array Of Property
+	 * @return 0x string For splice
+	 */
+	sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c3598082c95f8c965cc920f',
+		'97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+		'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+		'97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+		'97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+		'9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+		'97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+		'97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+		'97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+		'97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+		'9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+		'7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+		'97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+		'9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+		'97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+		'9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+		'9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+		'97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+		'9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+		'7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+		'977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+		'7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+		'977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+		'977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+		'7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+		'7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+		'7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+		'7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+		'7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+		'7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+		'7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+		'7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+		'7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+		'7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+		'7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+		'7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+		'665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+		'7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+		'7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+		'7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'
+	],
+
+	/**
+	 * 数字转中文速查表
+	 * @Array Of Property
+	 * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+	 * @return Cn string
+	 */
+	nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d',
+		'\u5341'
+	],
+
+	/**
+	 * 日期转农历称呼速查表
+	 * @Array Of Property
+	 * @trans ['初','十','廿','卅']
+	 * @return Cn string
+	 */
+	nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+	/**
+	 * 月份转农历称呼速查表
+	 * @Array Of Property
+	 * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+	 * @return Cn string
+	 */
+	nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341',
+		'\u51ac',
+		'\u814a'
+	],
+
+	/**
+	 * 返回农历y年一整年的总天数
+	 * @param lunar Year
+	 * @return Number
+	 * @eg:var count = calendar.lYearDays(1987) ;//count=387
+	 */
+	lYearDays: function(y) {
+		var i;
+		var sum = 348
+		for (i = 0x8000; i > 0x8; i >>= 1) {
+			sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0
+		}
+		return (sum + this.leapDays(y))
+	},
+
+	/**
+	 * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+	 * @param lunar Year
+	 * @return Number (0-12)
+	 * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+	 */
+	leapMonth: function(y) { // 闰字编码 \u95f0
+		return (this.lunarInfo[y - 1900] & 0xf)
+	},
+
+	/**
+	 * 返回农历y年闰月的天数 若该年没有闰月则返回0
+	 * @param lunar Year
+	 * @return Number (0、29、30)
+	 * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+	 */
+	leapDays: function(y) {
+		if (this.leapMonth(y)) {
+			return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+		}
+		return (0)
+	},
+
+	/**
+	 * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+	 * @param lunar Year
+	 * @return Number (-1、29、30)
+	 * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+	 */
+	monthDays: function(y, m) {
+		if (m > 12 || m < 1) {
+			return -1
+		} // 月份参数从1至12，参数错误返回-1
+		return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+	},
+
+	/**
+	 * 返回公历(!)y年m月的天数
+	 * @param solar Year
+	 * @return Number (-1、28、29、30、31)
+	 * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+	 */
+	solarDays: function(y, m) {
+		if (m > 12 || m < 1) {
+			return -1
+		} // 若参数错误 返回-1
+		var ms = m - 1
+		if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+			return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+		} else {
+			return (this.solarMonth[ms])
+		}
+	},
+
+	/**
+	 * 农历年份转换为干支纪年
+	 * @param  lYear 农历年的年份数
+	 * @return Cn string
+	 */
+	toGanZhiYear: function(lYear) {
+		var ganKey = (lYear - 3) % 10
+		var zhiKey = (lYear - 3) % 12
+		if (ganKey == 0) ganKey = 10 // 如果余数为0则为最后一个天干
+		if (zhiKey == 0) zhiKey = 12 // 如果余数为0则为最后一个地支
+		return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+	},
+
+	/**
+	 * 公历月、日判断所属星座
+	 * @param  cMonth [description]
+	 * @param  cDay [description]
+	 * @return Cn string
+	 */
+	toAstro: function(cMonth, cDay) {
+		var s =
+			'\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+		var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+		return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' // 座
+	},
+
+	/**
+	 * 传入offset偏移量返回干支
+	 * @param offset 相对甲子的偏移量
+	 * @return Cn string
+	 */
+	toGanZhi: function(offset) {
+		return this.Gan[offset % 10] + this.Zhi[offset % 12]
+	},
+
+	/**
+	 * 传入公历(!)y年获得该年第n个节气的公历日期
+	 * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+	 * @return day Number
+	 * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+	 */
+	getTerm: function(y, n) {
+		if (y < 1900 || y > 2100) {
+			return -1
+		}
+		if (n < 1 || n > 24) {
+			return -1
+		}
+		var _table = this.sTermInfo[y - 1900]
+		var _info = [
+			parseInt('0x' + _table.substr(0, 5)).toString(),
+			parseInt('0x' + _table.substr(5, 5)).toString(),
+			parseInt('0x' + _table.substr(10, 5)).toString(),
+			parseInt('0x' + _table.substr(15, 5)).toString(),
+			parseInt('0x' + _table.substr(20, 5)).toString(),
+			parseInt('0x' + _table.substr(25, 5)).toString()
+		]
+		var _calday = [
+			_info[0].substr(0, 1),
+			_info[0].substr(1, 2),
+			_info[0].substr(3, 1),
+			_info[0].substr(4, 2),
+
+			_info[1].substr(0, 1),
+			_info[1].substr(1, 2),
+			_info[1].substr(3, 1),
+			_info[1].substr(4, 2),
+
+			_info[2].substr(0, 1),
+			_info[2].substr(1, 2),
+			_info[2].substr(3, 1),
+			_info[2].substr(4, 2),
+
+			_info[3].substr(0, 1),
+			_info[3].substr(1, 2),
+			_info[3].substr(3, 1),
+			_info[3].substr(4, 2),
+
+			_info[4].substr(0, 1),
+			_info[4].substr(1, 2),
+			_info[4].substr(3, 1),
+			_info[4].substr(4, 2),
+
+			_info[5].substr(0, 1),
+			_info[5].substr(1, 2),
+			_info[5].substr(3, 1),
+			_info[5].substr(4, 2)
+		]
+		return parseInt(_calday[n - 1])
+	},
+
+	/**
+	 * 传入农历数字月份返回汉语通俗表示法
+	 * @param lunar month
+	 * @return Cn string
+	 * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+	 */
+	toChinaMonth: function(m) { // 月 => \u6708
+		if (m > 12 || m < 1) {
+			return -1
+		} // 若参数错误 返回-1
+		var s = this.nStr3[m - 1]
+		s += '\u6708' // 加上月字
+		return s
+	},
+
+	/**
+	 * 传入农历日期数字返回汉字表示法
+	 * @param lunar day
+	 * @return Cn string
+	 * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+	 */
+	toChinaDay: function(d) { // 日 => \u65e5
+		var s
+		switch (d) {
+			case 10:
+				s = '\u521d\u5341';
+				break
+			case 20:
+				s = '\u4e8c\u5341';
+				break
+				break
+			case 30:
+				s = '\u4e09\u5341';
+				break
+				break
+			default:
+				s = this.nStr2[Math.floor(d / 10)]
+				s += this.nStr1[d % 10]
+		}
+		return (s)
+	},
+
+	/**
+	 * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+	 * @param y year
+	 * @return Cn string
+	 * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+	 */
+	getAnimal: function(y) {
+		return this.Animals[(y - 4) % 12]
+	},
+
+	/**
+	 * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+	 * @param y  solar year
+	 * @param m  solar month
+	 * @param d  solar day
+	 * @return JSON object
+	 * @eg:console.log(calendar.solar2lunar(1987,11,01));
+	 */
+	solar2lunar: function(y, m, d) { // 参数区间1900.1.31~2100.12.31
+		// 年份限定、上限
+		if (y < 1900 || y > 2100) {
+			return -1 // undefined转换为数字变为NaN
+		}
+		// 公历传参最下限
+		if (y == 1900 && m == 1 && d < 31) {
+			return -1
+		}
+		// 未传参  获得当天
+		if (!y) {
+			var objDate = new Date()
+		} else {
+			var objDate = new Date(y, parseInt(m) - 1, d)
+		}
+		var i;
+		var leap = 0;
+		var temp = 0
+		// 修正ymd参数
+		var y = objDate.getFullYear()
+		var m = objDate.getMonth() + 1
+		var d = objDate.getDate()
+		var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0,
+				31)) /
+			86400000
+		for (i = 1900; i < 2101 && offset > 0; i++) {
+			temp = this.lYearDays(i)
+			offset -= temp
+		}
+		if (offset < 0) {
+			offset += temp;
+			i--
+		}
+
+		// 是否今天
+		var isTodayObj = new Date()
+		var isToday = false
+		if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+			isToday = true
+		}
+		// 星期几
+		var nWeek = objDate.getDay()
+		var cWeek = this.nStr1[nWeek]
+		// 数字表示周几顺应天朝周一开始的惯例
+		if (nWeek == 0) {
+			nWeek = 7
+		}
+		// 农历年
+		var year = i
+		var leap = this.leapMonth(i) // 闰哪个月
+		var isLeap = false
+
+		// 效验闰月
+		for (i = 1; i < 13 && offset > 0; i++) {
+			// 闰月
+			if (leap > 0 && i == (leap + 1) && isLeap == false) {
+				--i
+				isLeap = true;
+				temp = this.leapDays(year) // 计算农历闰月天数
+			} else {
+				temp = this.monthDays(year, i) // 计算农历普通月天数
+			}
+			// 解除闰月
+			if (isLeap == true && i == (leap + 1)) {
+				isLeap = false
+			}
+			offset -= temp
+		}
+		// 闰月导致数组下标重叠取反
+		if (offset == 0 && leap > 0 && i == leap + 1) {
+			if (isLeap) {
+				isLeap = false
+			} else {
+				isLeap = true;
+				--i
+			}
+		}
+		if (offset < 0) {
+			offset += temp;
+			--i
+		}
+		// 农历月
+		var month = i
+		// 农历日
+		var day = offset + 1
+		// 天干地支处理
+		var sm = m - 1
+		var gzY = this.toGanZhiYear(year)
+
+		// 当月的两个节气
+		// bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+		var firstNode = this.getTerm(y, (m * 2 - 1)) // 返回当月「节」为几日开始
+		var secondNode = this.getTerm(y, (m * 2)) // 返回当月「节」为几日开始
+
+		// 依据12节气修正干支月
+		var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+		if (d >= firstNode) {
+			gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+		}
+
+		// 传入的日期的节气与否
+		var isTerm = false
+		var Term = null
+		if (firstNode == d) {
+			isTerm = true
+			Term = this.solarTerm[m * 2 - 2]
+		}
+		if (secondNode == d) {
+			isTerm = true
+			Term = this.solarTerm[m * 2 - 1]
+		}
+		// 日柱 当月一日与 1900/1/1 相差天数
+		var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+		var gzD = this.toGanZhi(dayCyclical + d - 1)
+		// 该日期所属的星座
+		var astro = this.toAstro(m, d)
+
+		return {
+			'lYear': year,
+			'lMonth': month,
+			'lDay': day,
+			'Animal': this.getAnimal(year),
+			'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month),
+			'IDayCn': this.toChinaDay(day),
+			'cYear': y,
+			'cMonth': m,
+			'cDay': d,
+			'gzYear': gzY,
+			'gzMonth': gzM,
+			'gzDay': gzD,
+			'isToday': isToday,
+			'isLeap': isLeap,
+			'nWeek': nWeek,
+			'ncWeek': '\u661f\u671f' + cWeek,
+			'isTerm': isTerm,
+			'Term': Term,
+			'astro': astro
+		}
+	},
+
+	/**
+	 * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+	 * @param y  lunar year
+	 * @param m  lunar month
+	 * @param d  lunar day
+	 * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+	 * @return JSON object
+	 * @eg:console.log(calendar.lunar2solar(1987,9,10));
+	 */
+	lunar2solar: function(y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+		var isLeapMonth = !!isLeapMonth
+		var leapOffset = 0
+		var leapMonth = this.leapMonth(y)
+		var leapDay = this.leapDays(y)
+		if (isLeapMonth && (leapMonth != m)) {
+			return -1
+		} // 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+		if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) {
+			return -1
+		} // 超出了最大极限值
+		var day = this.monthDays(y, m)
+		var _day = day
+		// bugFix 2016-9-25
+		// if month is leap, _day use leapDays method
+		if (isLeapMonth) {
+			_day = this.leapDays(y, m)
+		}
+		if (y < 1900 || y > 2100 || d > _day) {
+			return -1
+		} // 参数合法性效验
+
+		// 计算农历的时间差
+		var offset = 0
+		for (var i = 1900; i < y; i++) {
+			offset += this.lYearDays(i)
+		}
+		var leap = 0;
+		var isAdd = false
+		for (var i = 1; i < m; i++) {
+			leap = this.leapMonth(y)
+			if (!isAdd) { // 处理闰月
+				if (leap <= i && leap > 0) {
+					offset += this.leapDays(y);
+					isAdd = true
+				}
+			}
+			offset += this.monthDays(y, i)
+		}
+		// 转换闰月农历 需补充该年闰月的前一个月的时差
+		if (isLeapMonth) {
+			offset += day
+		}
+		// 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+		var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+		var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+		var cY = calObj.getUTCFullYear()
+		var cM = calObj.getUTCMonth() + 1
+		var cD = calObj.getUTCDate()
+
+		return this.solar2lunar(cY, cM, cD)
+	}
+}
+
+export default calendar

pages_tool/components/uni-calendar/uni-calendar-item.vue

@@ -0,0 +1,186 @@
+<template>
+	<view
+		class="uni-calendar-item__weeks-box"
+		:class="{
+			'uni-calendar-item--disable': weeks.disable,
+			'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+			'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+			'uni-calendar-item--before-checked': weeks.beforeMultiple,
+			'uni-calendar-item--multiple': weeks.multiple,
+			'uni-calendar-item--after-checked': weeks.afterMultiple
+		}"
+		@click="choiceDate(weeks)"
+	>
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.date }}
+			</text>
+			<text v-if="!lunar && !weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple
+				}"
+			></text>
+			<text v-if="lunar && !weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.isDay ? '今天' : weeks.lunar.IDayCn === '初一' ? weeks.lunar.IMonthCn : weeks.lunar.IDayCn }}
+			</text>
+			<text v-if="weeks.extraInfo && weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text"
+				:class="{
+					'uni-calendar-item--extra': weeks.extraInfo.info,
+					'uni-calendar-item--isDay-text': weeks.isDay,
+					'uni-calendar-item--isDay': calendar.fullDate === weeks.fullDate && weeks.isDay,
+					'uni-calendar-item--checked': calendar.fullDate === weeks.fullDate && !weeks.isDay,
+					'uni-calendar-item--before-checked': weeks.beforeMultiple,
+					'uni-calendar-item--multiple': weeks.multiple,
+					'uni-calendar-item--after-checked': weeks.afterMultiple,
+					'uni-calendar-item--disable': weeks.disable
+				}"
+			>
+				{{ weeks.extraInfo.info }}
+			</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		weeks: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		calendar: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		},
+		selected: {
+			type: Array,
+			default: () => {
+				return [];
+			}
+		},
+		lunar: {
+			type: Boolean,
+			default: false
+		}
+	},
+	methods: {
+		choiceDate(weeks) {
+			this.$emit('change', weeks);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-calendar-item__weeks-box {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-calendar-item__weeks-box-text {
+	font-size: 24rpx;
+	color: #fff;
+}
+
+.uni-calendar-item__weeks-lunar-text {
+	font-size: $uni-font-size-base;
+	color: $uni-text-color;
+}
+
+.uni-calendar-item__weeks-box-item {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+}
+
+.uni-calendar-item__weeks-box-circle {
+	position: absolute;
+	top: 10rpx;
+	right: 10rpx;
+	width: 16rpx;
+	height: 16rpx;
+	border-radius: 16rpx;
+	background-color: $uni-color-error;
+}
+
+.uni-calendar-item--disable {
+	color: #feaa93;
+}
+
+.uni-calendar-item--isDay-text {
+	color: #fff;
+}
+
+.uni-calendar-item--isDay {
+	color: #000;
+	background-color: #fff;
+	border-radius: 50%;
+}
+
+.uni-calendar-item--extra {
+	// color: $uni-color-error;
+	// opacity: 0.8;
+}
+
+.uni-calendar-item--checked {
+	color: #fff;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 50%;
+}
+
+.uni-calendar-item--multiple {
+	background-color: $uni-color-primary;
+	color: #fff;
+	opacity: 0.8;
+}
+.uni-calendar-item--before-checked {
+	background-color: #ff5a5f;
+	color: #fff;
+}
+.uni-calendar-item--after-checked {
+	background-color: #ff5a5f;
+	color: #fff;
+}
+</style>

pages_tool/components/uni-calendar/uni-calendar.vue

@@ -0,0 +1,476 @@
+<template>
+	<view class="uni-calendar">
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{ 'uni-calendar--mask-show': aniMaskShow }" @click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content" :class="{ 'uni-calendar--fixed': !insert, 'uni-calendar--ani-show': aniMaskShow }">
+			<view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+				<view class="uni-calendar__header-btn-box" @click="close"><text class="uni-calendar__header-text uni-calendar--fixed-width">取消</text></view>
+				<view class="uni-calendar__header-btn-box" @click="confirm"><text class="uni-calendar__header-text uni-calendar--fixed-width">确定</text></view>
+			</view>
+			<view class="uni-calendar__header">
+				<view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<!-- <view class="uni-calendar__header-btn uni-calendar--left"></view> -->
+					<text class="iconfont icon-back_light"></text>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text class="uni-calendar__header-text">{{ (nowDate.year || '') + '年' + (nowDate.month || '') + '月' }}</text>
+				</picker>
+				<view class="uni-calendar__header-btn-box" @click.stop="next">
+					<!-- <view class="uni-calendar__header-btn uni-calendar--right"></view> -->
+					<text class="iconfont icon-right"></text>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{ nowDate.month }}</text>
+				</view>
+				<view class="uni-calendar__weeks">
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">日</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">一</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">二</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">三</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">四</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">五</text></view>
+					<view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">六</text></view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item, weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks, weeksIndex) in item" :key="weeksIndex">
+						<uni-calendar-item :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></uni-calendar-item>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import Calendar from './util.js';
+import uniCalendarItem from './uni-calendar-item.vue';
+/**
+ * Calendar 日历
+ * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+ * @property {String} date 自定义当前时间，默认为今天
+ * @property {Boolean} lunar 显示农历
+ * @property {String} startDate 日期选择范围-开始日期
+ * @property {String} endDate 日期选择范围-结束日期
+ * @property {Boolean} range 范围选择
+ * @property {Boolean} insert = [true|false] 插入模式,默认为false
+ * 	@value true 弹窗模式
+ * 	@value false 插入模式
+ * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+ * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+ * @property {Boolean} showMonth 是否选择月份为背景
+ * @event {Function} change 日期改变，`insert :ture` 时生效
+ * @event {Function} confirm 确认选择`insert :false` 时生效
+ * @event {Function} monthSwitch 切换月份时触发
+ * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+ */
+export default {
+	components: {
+		uniCalendarItem
+	},
+	props: {
+		date: {
+			type: String,
+			default: ''
+		},
+		selected: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		lunar: {
+			type: Boolean,
+			default: false
+		},
+		startDate: {
+			type: String,
+			default: ''
+		},
+		endDate: {
+			type: String,
+			default: ''
+		},
+		range: {
+			type: Boolean,
+			default: false
+		},
+		insert: {
+			type: Boolean,
+			default: true
+		},
+		showMonth: {
+			type: Boolean,
+			default: true
+		},
+		clearDate: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			show: false,
+			weeks: [],
+			calendar: {},
+			nowDate: '',
+			aniMaskShow: false
+		};
+	},
+	watch: {
+		date(newVal) {
+			this.cale.setDate(newVal);
+			this.init(this.cale.selectDate.fullDate);
+		},
+		startDate(val) {
+			this.cale.resetSatrtDate(val);
+		},
+		endDate(val) {
+			this.cale.resetEndDate(val);
+		},
+		selected(newVal) {
+			this.cale.setSelectInfo(this.nowDate.fullDate, newVal);
+			this.weeks = this.cale.weeks;
+		}
+	},
+	created() {
+		// 获取日历方法实例
+		this.cale = new Calendar({
+			// date: new Date(),
+			selected: this.selected,
+			startDate: this.startDate,
+			endDate: this.endDate,
+			range: this.range
+		});
+		// 选中某一天
+		this.cale.setDate(this.date);
+		this.init(this.cale.selectDate.fullDate);
+		// this.setDay
+	},
+	methods: {
+		// 取消穿透
+		clean() {},
+		bindDateChange(e) {
+			const value = e.detail.value + '-1';
+			this.cale.setDate(value);
+			this.init(value);
+		},
+		/**
+		 * 初始化日期显示
+		 * @param {Object} date
+		 */
+		init(date) {
+			this.weeks = this.cale.weeks;
+			this.nowDate = this.calendar = this.cale.getInfo(date);
+		},
+		/**
+		 * 打开日历弹窗
+		 */
+		open() {
+			// 弹窗模式并且清理数据
+			if (this.clearDate && !this.insert) {
+				this.cale.cleanMultipleStatus();
+				this.cale.setDate(this.date);
+				this.init(this.cale.selectDate.fullDate);
+			}
+			this.show = true;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.aniMaskShow = true;
+				}, 50);
+			});
+		},
+		/**
+		 * 关闭日历弹窗
+		 */
+		close() {
+			this.aniMaskShow = false;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.show = false;
+					this.$emit('close');
+				}, 300);
+			});
+		},
+		/**
+		 * 确认按钮
+		 */
+		confirm() {
+			this.setEmit('confirm');
+			this.close();
+		},
+		/**
+		 * 变化触发
+		 */
+		change() {
+			if (!this.insert) return;
+			this.setEmit('change');
+		},
+		/**
+		 * 选择月份触发
+		 */
+		monthSwitch() {
+			let { year, month } = this.nowDate;
+			this.$emit('monthSwitch', {
+				year,
+				month: Number(month)
+			});
+		},
+		/**
+		 * 派发事件
+		 * @param {Object} name
+		 */
+		setEmit(name) {
+			let { year, month, date, fullDate, lunar, extraInfo } = this.calendar;
+			this.$emit(name, {
+				range: this.cale.multipleStatus,
+				year,
+				month,
+				date,
+				fulldate: fullDate,
+				lunar,
+				extraInfo: extraInfo || {}
+			});
+		},
+		/**
+		 * 选择天触发
+		 * @param {Object} weeks
+		 */
+		choiceDate(weeks) {
+			if (weeks.disable) return;
+			this.calendar = weeks;
+			// 设置多选
+			this.cale.setMultiple(this.calendar.fullDate);
+			this.weeks = this.cale.weeks;
+			this.change();
+		},
+		/**
+		 * 回到今天
+		 */
+		backtoday() {
+			let date = this.cale.getDate(new Date()).fullDate;
+			this.cale.setDate(date);
+			this.init(date);
+			this.change();
+		},
+		/**
+		 * 上个月
+		 */
+		pre() {
+			const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate;
+			this.setDate(preDate);
+			this.monthSwitch();
+		},
+		/**
+		 * 下个月
+		 */
+		next() {
+			const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate;
+			this.setDate(nextDate);
+			this.monthSwitch();
+		},
+		/**
+		 * 设置日期
+		 * @param {Object} date
+		 */
+		setDate(date) {
+			this.cale.setDate(date);
+			this.weeks = this.cale.weeks;
+			this.nowDate = this.cale.getInfo(date);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-calendar {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.uni-calendar__mask {
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: $uni-bg-color-mask;
+	transition-property: opacity;
+	transition-duration: 0.3s;
+	opacity: 0;
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.uni-calendar--mask-show {
+	opacity: 1;
+}
+
+.uni-calendar--fixed {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transform: translateY(460px);
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+}
+
+.uni-calendar--ani-show {
+	transform: translateY(0);
+}
+
+.uni-calendar__content {
+	background: linear-gradient(180deg, rgba(247, 0, 66, 1), rgba(254, 147, 76, 1));
+	border-bottom-left-radius: 24rpx;
+	border-bottom-right-radius: 24rpx;
+}
+
+.uni-calendar__header {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	height: 56rpx;
+	width: 657rpx;
+	margin: 0 auto;
+	background-color: #fa556a;
+	border-radius: 28px;
+}
+
+.uni-calendar--fixed-top {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 1px;
+}
+
+.uni-calendar--fixed-width {
+	width: 50px;
+	// padding: 0 15px;
+}
+
+.uni-calendar__backtoday {
+	position: absolute;
+	right: 0;
+	top: 25rpx;
+	padding: 0 5px;
+	padding-left: 10px;
+	height: 25px;
+	line-height: 25px;
+	font-size: 12px;
+	border-top-left-radius: 25px;
+	border-bottom-left-radius: 25px;
+	color: $uni-text-color;
+	background-color: $uni-bg-color-hover;
+}
+
+.uni-calendar__header-text {
+	text-align: center;
+	width: 100px;
+	font-size: 26rpx;
+	color: #fff;
+}
+
+.uni-calendar__header-btn-box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	width: 50px;
+	height: 50px;
+	color: #fff !important;
+}
+
+.uni-calendar__header-btn {
+	width: 10px;
+	height: 10px;
+	border-left-color: $uni-text-color-placeholder;
+	border-left-style: solid;
+	border-left-width: 2px;
+	border-top-color: $uni-color-subtitle;
+	border-top-style: solid;
+	border-top-width: 2px;
+}
+
+.uni-calendar--left {
+	transform: rotate(-45deg);
+}
+
+.uni-calendar--right {
+	transform: rotate(135deg);
+}
+
+.uni-calendar__weeks {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.uni-calendar__weeks-item {
+	flex: 1;
+}
+
+.uni-calendar__weeks-day {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	height: 45px;
+	color: #fff;
+	font-size: 24rpx;
+}
+
+.uni-calendar__weeks-day-text {
+	font-size: 14px;
+}
+
+.uni-calendar__box {
+	position: relative;
+}
+
+.uni-calendar__box-bg {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+.uni-calendar__box-bg-text {
+	font-size: 200px;
+	font-weight: bold;
+	color: $uni-text-color-grey;
+	opacity: 0.1;
+	text-align: center;
+	/* #ifndef APP-NVUE */
+	line-height: 1;
+	/* #endif */
+}
+</style>

pages_tool/components/uni-calendar/util.js

@@ -0,0 +1,354 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+			}
+
+			if (this.endDate) {
+				let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !disableBefore || !disableAfter,
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar

pages_tool/components/uni-nav-bar/uni-nav-bar.vue

@@ -0,0 +1,220 @@
+<template>
+	<view class="uni-navbar">
+		<view
+			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': backgroundColor }"
+			class="uni-navbar__content">
+			<uni-status-bar v-if="statusBar" />
+			<view :style="{ color: color, backgroundColor: backgroundColor }" class="uni-navbar__header uni-navbar__content_view">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="leftIcon.length"><uni-icons :color="color" :type="leftIcon" size="24" /></view>
+					<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length }" class="uni-navbar-btn-text uni-navbar__content_view" v-if="leftText.length">
+						<text :style="{ color: color, fontSize: '14px' }">{{ leftText }}</text>
+					</view>
+					<slot name="left" />
+				</view>
+				<view class="uni-navbar__header-container uni-navbar__content_view">
+					<view class="uni-navbar__header-container-inner uni-navbar__content_view" v-if="title.length">
+						<text class="uni-nav-bar-text" :style="{ color: color }">{{ title }}</text>
+					</view>
+					<!-- 标题插槽 -->
+					<slot />
+				</view>
+				<view :class="title.length ? 'uni-navbar__header-btns-right' : ''" @tap="onClickRight" class="uni-navbar__header-btns uni-navbar__content_view">
+					<view class="uni-navbar__content_view" v-if="rightIcon.length"><uni-icons :color="color" :type="rightIcon" size="24" /></view>
+					<!-- 优先显示图标 -->
+					<view class="uni-navbar-btn-text uni-navbar__content_view" v-if="rightText.length && !rightIcon.length">
+						<text class="uni-nav-bar-right-text">{{ rightText }}</text>
+					</view>
+					<slot name="right" />
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<uni-status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" />
+		</view>
+	</view>
+</template>
+
+<script>
+import uniStatusBar from '@/pages_tool/components/uni-status-bar/uni-status-bar.vue';
+import uniIcons from '@/components/uni-icons/uni-icons.vue';
+
+export default {
+	name: 'UniNavBar',
+	components: {
+		uniStatusBar,
+		uniIcons
+	},
+	props: {
+		title: {
+			type: String,
+			default: ''
+		},
+		leftText: {
+			type: String,
+			default: ''
+		},
+		rightText: {
+			type: String,
+			default: ''
+		},
+		leftIcon: {
+			type: String,
+			default: ''
+		},
+		rightIcon: {
+			type: String,
+			default: ''
+		},
+		fixed: {
+			type: [Boolean, String],
+			default: false
+		},
+		color: {
+			type: String,
+			default: '#000000'
+		},
+		backgroundColor: {
+			type: String,
+			default: '#FFFFFF'
+		},
+		statusBar: {
+			type: [Boolean, String],
+			default: false
+		},
+		shadow: {
+			type: [String, Boolean],
+			default: false
+		},
+		border: {
+			type: [String, Boolean],
+			default: true
+		}
+	},
+	mounted() {
+		if (uni.report && this.title !== '') {
+			uni.report('title', this.title);
+		}
+	},
+	methods: {
+		onClickLeft() {
+			this.$emit('clickLeft');
+		},
+		onClickRight() {
+			this.$emit('clickRight');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+$nav-height: 44px;
+.uni-nav-bar-text {
+	/* #ifdef APP-PLUS */
+	font-size: 34rpx;
+	/* #endif */
+	/* #ifndef APP-PLUS */
+	font-size: $uni-font-size-lg;
+	/* #endif */
+}
+.uni-nav-bar-right-text {
+	font-size: $uni-font-size-base;
+}
+
+.uni-navbar {
+	width: 750rpx;
+}
+
+.uni-navbar__content {
+	position: relative;
+	width: 750rpx;
+	background-color: $uni-bg-color;
+	overflow: hidden;
+}
+
+.uni-navbar__content_view {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	flex-direction: row;
+	// background-color: #FFFFFF;
+}
+
+.uni-navbar__header {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	width: 750rpx;
+	height: $nav-height;
+	line-height: $nav-height;
+	font-size: 16px;
+	// background-color: #ffffff;
+}
+
+.uni-navbar__header-btns {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-wrap: nowrap;
+	width: 120rpx;
+	padding: 0 6px;
+	justify-content: center;
+	align-items: center;
+}
+
+.uni-navbar__header-btns-left {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 150rpx;
+	justify-content: flex-start;
+}
+
+.uni-navbar__header-btns-right {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 150rpx;
+	padding-right: 30rpx;
+	justify-content: flex-end;
+}
+
+.uni-navbar__header-container {
+	flex: 1;
+}
+
+.uni-navbar__header-container-inner {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex: 1;
+	align-items: center;
+	justify-content: center;
+	font-size: $uni-font-size-base;
+}
+
+.uni-navbar__placeholder-view {
+	height: $nav-height;
+}
+
+.uni-navbar--fixed {
+	position: fixed;
+	z-index: 998;
+}
+
+.uni-navbar--shadow {
+	/* #ifndef APP-NVUE */
+	box-shadow: 0 1px 6px #ccc;
+	/* #endif */
+}
+
+.uni-navbar--border {
+	border-bottom-width: 1rpx;
+	border-bottom-style: solid;
+	border-bottom-color: $uni-border-color;
+}
+</style>

pages_tool/components/uni-status-bar/uni-status-bar.vue

@@ -0,0 +1,23 @@
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
+</template>
+
+<script>
+var statusBarHeight = uni.getSystemInfoSync().statusBarHeight * 2 + 'rpx';
+export default {
+	name: 'UniStatusBar',
+	data() {
+		return {
+			statusBarHeight: statusBarHeight
+		};
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-status-bar {
+	width: 750rpx;
+	height: 20px;
+	// height: var(--status-bar-height);
+}
+</style>

pages_tool/contact/contact.vue

@@ -10,8 +10,7 @@
 							style="background: #1daa39;width: 100%;border-radius: 10rpx;">
 							<view class="bl bor" style="box-sizing: border-box;">
 								<image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}
-								</view>
+								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}</view>
 							</view>
 						</view>
 					</view>
@@ -29,8 +28,7 @@
 						<view @click="tapMessage" class="view_li w50_li  text-center">
 							<view class="bl bor" style="box-sizing: border-box;">
 								<image mode="heightFix" :src="$util.img('public/static/img/liuyan.png')"></image>
-								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}
-								</view>
+								<view class="name bl line1" style="margin-top: 6rpx;">{{ $lang('onlineMessage') }}</view>
 							</view>
 						</view>
 					</view>
@@ -53,8 +51,7 @@
 									<image mode="widthFix" :src="$util.img('public/static/img/boda.png')"
 										style="margin-top: 8rpx;margin-right: 10rpx;"></image>
 									<view style="flex: 1;">{{ item.mobile }}</view>
-									<view class="btn-container" @click="Tel(item.mobile)"><span class="contact-btn"
-											style="background: #0054a5;">{{ $lang('call') }}</span>
+									<view class="btn-container" @click="Tel(item.mobile)"><span class="contact-btn" style="background: #0054a5;">{{ $lang('call') }}</span>
 									</view>
 								</view>
 								<view class="contact_name"
@@ -62,8 +59,7 @@
 									<image mode="widthFix" :src="$util.img('public/static/img/emall.png')"
 										style="margin-top: 8rpx;margin-right: 10rpx;"></image>
 									<view style="flex: 1;">{{ item.email }}</view>
-									<view class="btn-container" @click="copy(item.email)"><span class="contact-btn"
-											style="background: #888;">{{ $lang('copy') }}</span>
+									<view class="btn-container" @click="copy(item.email)"><span class="contact-btn" style="background: #888;">{{ $lang('copy') }}</span>
 									</view>
 								</view>
 							</view>
@@ -88,8 +84,7 @@
 						:longitude="shop.longitude" :latitude="shop.latitude" show-location>
 						<cover-view
 							style="position:absolute;right:10px;bottom:30rpx;z-index:9;background:#4d83ff;padding:5px 10px;wxcs_style_padding:10rpx 20rpx;border-radius:8rpx;color: #fff;"
-							@click="tomap"><cover-view style="font-size:24rpx">{{ $lang('oneClickNavigation')
-								}}</cover-view>
+							@click="tomap"><cover-view style="font-size:24rpx">{{ $lang('oneClickNavigation') }}</cover-view>
 						</cover-view>
 					</map>
 				</view>
@@ -118,32 +113,26 @@
 								<view class="fui-cell  ">
 									<view class="fui-cell-label ">{{ $lang('name') }}</view>
 									<view class="fui-cell-info">
-										<input v-model="Form.realname" class="fui-input"
-											:placeholder="$lang('pleaseEnterName')" value=""></input>
+										<input v-model="Form.realname" class="fui-input" :placeholder="$lang('pleaseEnterName')" value=""></input>
 									</view>
 								</view>
 								<view class="fui-cell ">
 									<view class="fui-cell-label">{{ $lang('contactInfo') }}</view>
 									<view class="fui-cell-info">
-										<input v-model="Form.mobile" class="fui-input" maxlength="11"
-											:placeholder="$lang('pleaseEnterMobile')" type="number"></input>
+										<input v-model="Form.mobile" class="fui-input" maxlength="11" :placeholder="$lang('pleaseEnterMobile')" type="number"></input>
 									</view>
 								</view>
 								<view class="fui-cell ">
-									<view class="fui-cell-label" style="position: absolute;top:10px">{{
-										$lang('messageContent') }}</view>
+									<view class="fui-cell-label" style="position: absolute;top:10px">{{ $lang('messageContent') }}</view>
 									<view class="fui-cell-info" style="margin-left: 160rpx;border: solid 2rpx #eee;">
 										<!-- <input v-model="Form.mailbox"  class="fui-input" placeholder="请输入您的邮箱" type="text" ></input> -->
-										<textarea class="textarea" v-model="Form.remark"
-											:placeholder="$lang('pleaseEnterMessage')"
-											style="font-size: 28rpx;padding: 10rpx;"></textarea>
+										<textarea class="textarea" v-model="Form.remark" :placeholder="$lang('pleaseEnterMessage')" style="font-size: 28rpx;padding: 10rpx;"></textarea>
 									</view>
 								</view>
 							</view>
 						</view>
 					</scroll-view>
-					<view class="button-box"><button type="primary" @click="save()">{{ $lang('submit') }}</button>
-					</view>
+					<view class="button-box"><button type="primary" @click="save()">{{ $lang('submit') }}</button></view>
 				</view>
 			</uni-popup>
 		</view>
@@ -154,14 +143,12 @@
 </template>
 
 <script>
-
+import toTop from '@/components/toTop/toTop.vue';
 import scroll from '@/common/js/scroll-view.js';
 
 export default {
 	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		toTop: () => import('@/components/toTop/toTop.vue'),
-		hoverNav: () => import('@/components/hover-nav/hover-nav.vue'),
+		toTop
 	},
 	mixins: [scroll],
 	data() {
@@ -290,7 +277,7 @@ export default {
 					console.log('复制失败');
 					// 可以添加错误处理或用户友好的提示
 					uni.showToast({
-						title: err.message || err.errMsg || this.$lang('copyFailed'),
+						title:  err.message || err.errMsg || this.$lang('copyFailed'),
 						icon: 'none',
 						duration: 2000
 					});

pages_tool/files/list.vue

@@ -2,23 +2,41 @@
   <view>
     <view class="search-wrap uni-flex uni-row">
       <view class="flex-item input-wrap">
-        <input class="uni-input" maxlength="50" placeholder="请输入您要搜索的文件名称" v-model="keyword" @confirm="search"
-          @input="__set_model($event, 'keyword')" />
+        <input 
+          class="uni-input" 
+          maxlength="50" 
+          placeholder="请输入您要搜索的文件名称" 
+          v-model="keyword" 
+          @confirm="search" 
+          @input="__set_model($event, 'keyword')"
+        />
         <text class="iconfont icon-sousuo3" @tap="search"></text>
       </view>
     </view>
-    <mescroll-uni ref="mescroll" top="100" @getData="getData">
+    <mescroll-uni 
+      ref="mescroll" 
+      top="100" 
+      @getData="getData"
+    >
       <view slot="list">
         <block v-if="list.length > 0">
           <view class="article-wrap">
-            <ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
+            <ns-adv 
+              keyword="NS_ARTICLE" 
+              class-name="adv-wrap"
+            ></ns-adv>
             <block v-for="(item, index) in list" :key="index">
               <view class="item" @tap="toDetail(item.$orig)">
                 <view class="article-img">
-                  <image class="cover-img" :src="item.g1" mode="widthFix" @error="imgError(index)"></image>
+                  <image 
+                    class="cover-img" 
+                    :src="item.g1" 
+                    mode="widthFix" 
+                    @error="imgError(index)"
+                  ></image>
                 </view>
                 <view class="info-wrap">
-                  <view class="title">{{ item.$orig.files_title }}</view>
+                  <view class="title">{{item.$orig.files_title}}</view>
                   <view class="read-wrap">
                     <text>查看PDF文件</text>
                   </view>
@@ -35,250 +53,227 @@
         <loading-cover ref="loadingCover"></loading-cover>
       </view>
     </mescroll-uni>
-
-    <!-- #ifdef MP-WEIXIN -->
-    <!-- 小程序隐私协议 -->
     <privacy-popup ref="privacyPopup"></privacy-popup>
-    <!-- #endif -->
   </view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      category_id: '',
-      list: [],
-      title: '',
-      keyword: ''
-    }
-  },
-  components: {
-    nsAdv: () => import('@/components/ns-adv/ns-adv.vue'),
-    nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-    loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-    MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-
-    // #ifdef MP-WEIXIN
-    privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-    // #endif
-  },
-  onLoad(options) {
-    if (options.category_id > 0) {
-      this.category_id = options.category_id
-    }
-  },
-  onShow() {
-  },
-  methods: {
-    __set_model(event, field) {
-      this[field] = event.detail.value
+  export default {
+    data() {
+      return {
+        category_id: '',
+        list: [],
+        title: '',
+        keyword: ''
+      }
     },
-    search() {
-      this.list = []
-      this.$refs.mescroll.refresh()
+    components: {
+      nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
+      nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+      loadingCover: () => import('@/components/loading-cover/loading-cover.vue')
     },
-    getData(page) {
-      this.$api.sendRequest({
-        url: '/api/files/getpage',
-        data: {
-          page_size: page.size,
-          page: page.num,
-          category_id: this.category_id,
-          keyword: this.keyword
-        },
-        success: res => {
-          let list = []
-          let message = res.message
-          if (res.code === 0 && res.data) {
-            list = res.data.list
-            if (!this.title && res.data.list.length > 0) {
-              uni.setNavigationBarTitle({
-                title: res.data.list[0].category_name
+    onLoad(options) {
+      if (options.category_id > 0) {
+        this.category_id = options.category_id
+      }
+    },
+    onShow() {
+    },
+    methods: {
+      __set_model(event, field) {
+        this[field] = event.detail.value
+      },
+      search() {
+        this.list = []
+        this.$refs.mescroll.refresh()
+      },
+      getData(page) {
+        this.$api.sendRequest({
+          url: '/api/files/getpage',
+          data: {
+            page_size: page.size,
+            page: page.num,
+            category_id: this.category_id,
+            keyword: this.keyword
+          },
+          success: res => {
+            let list = []
+            let message = res.message
+            if (res.code === 0 && res.data) {
+              list = res.data.list
+              if (!this.title && res.data.list.length > 0) {
+                uni.setNavigationBarTitle({
+                  title: res.data.list[0].category_name
+                })
+              }
+            } else {
+              this.$util.showToast({
+                title: message
               })
             }
-          } else {
-            this.$util.showToast({
-              title: message
-            })
-          }
-          page.endSuccess(list.length)
-          if (page.num === 1) {
-            this.list = []
-          }
-          this.list = this.list.concat(list.map(item => {
-            const orig = item
-            const g1 = this.$util.img("addon/personnel/shop/view/enterprise/fileicon.png")
-            return { $orig: orig, g1: g1 }
-          }))
-          if (this.$refs.loadingCover) {
-            this.$refs.loadingCover.hide()
-          }
-        },
-        fail: () => {
-          page.endErr()
-          if (this.$refs.loadingCover) {
-            this.$refs.loadingCover.hide()
-          }
-        }
-      })
-    },
-    toDetail(item) {
-      console.log(item.files_url)
-      uni.showLoading({
-        title: '正在加载'
-      })
-      try {
-        uni.downloadFile({
-          url: item.files_url,
-          success: res => {
-            console.log(res)
-            if (res.statusCode === 200) {
-              uni.openDocument({
-                filePath: res.tempFilePath,
-                success: () => {
-                  console.log('打开成功')
-                },
-                fail: () => {
-                },
-                complete: () => {
-                  uni.hideLoading()
-                }
-              })
+            page.endSuccess(list.length)
+            if (page.num === 1) {
+              this.list = []
+            }
+            this.list = this.list.concat(list.map(item => {
+              const orig = item
+              const g1 = this.$util.img("addon/personnel/shop/view/enterprise/fileicon.png")
+              return { $orig: orig, g1: g1 }
+            }))
+            if (this.$refs.loadingCover) {
+              this.$refs.loadingCover.hide()
             }
           },
           fail: () => {
-            uni.hideLoading()
-          },
-          complete: res => {
-            console.log('下载完成', res)
-            if (res.statusCode === 404) {
-              uni.showToast({
-                title: '文件不存在',
-                icon: 'none'
-              })
+            page.endErr()
+            if (this.$refs.loadingCover) {
+              this.$refs.loadingCover.hide()
             }
           }
         })
-      } catch (e) {
-        console.log('CatchClause', e)
-        uni.hideLoading()
-      }
-    },
-    imgError(index) {
-      if (this.list[index]) {
-        this.list[index].cover_img = this.$util.getDefaultImage().article
+      },
+      toDetail(item) {
+        console.log(item.files_url)
+        uni.showLoading({
+          title: '正在加载'
+        })
+        try {
+          uni.downloadFile({
+            url: item.files_url,
+            success: res => {
+              console.log(res)
+              if (res.statusCode === 200) {
+                uni.openDocument({
+                  filePath: res.tempFilePath,
+                  success: () => {
+                    console.log('打开成功')
+                  },
+                  fail: () => {
+                  },
+                  complete: () => {
+                    uni.hideLoading()
+                  }
+                })
+              }
+            },
+            fail: () => {
+              uni.hideLoading()
+            },
+            complete: res => {
+              console.log('下载完成', res)
+              if (res.statusCode === 404) {
+                uni.showToast({
+                  title: '文件不存在',
+                  icon: 'none'
+                })
+              }
+            }
+          })
+        } catch (e) {
+          console.log('CatchClause', e)
+          uni.hideLoading()
+        }
+      },
+      imgError(index) {
+        if (this.list[index]) {
+          this.list[index].cover_img = this.$util.getDefaultImage().article
+        }
       }
     }
   }
-}
 </script>
 
 <style scoped>
-.search-wrap {
-  flex: 0.5;
-  padding: 30rpx 30rpx 0;
-  font-size: 24rpx;
-  display: flex;
-  align-items: center;
-}
-
-.search-wrap .iconfont {
-  margin-left: 16rpx;
-  font-size: 36rpx;
-}
-
-.search-wrap .input-wrap {
-  flex: 1;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background: #fff;
-  height: 64rpx;
-  padding-left: 10rpx;
-  border-radius: 70rpx;
-}
-
-.search-wrap .input-wrap input {
-  width: 90%;
-  background: #fff;
-  font-size: 24rpx;
-  height: 100%;
-  padding: 0 25rpx 0 40rpx;
-  line-height: 50rpx;
-  border-radius: 40rpx;
-}
-
-.search-wrap .input-wrap text {
-  font-size: 32rpx;
-  color: #909399;
-  width: 80rpx;
-  text-align: center;
-  margin-right: 20rpx;
-}
-
-.empty-wrap {
-  padding-top: 200rpx;
-}
-
-.article-wrap {
-  background: #f8f8f8;
-}
-
-.article-wrap .adv-wrap {
-  margin: 24rpx 24rpx 0 24rpx;
-  width: auto;
-}
-
-.article-wrap .item {
-  display: flex;
-  padding: 20rpx;
-  background-color: #fff;
-  margin: 24rpx;
-  border-radius: 16rpx;
-}
-
-.article-wrap .item .article-img {
-  margin-right: 20rpx;
-  width: 80rpx;
-  height: 80rpx;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.article-wrap .item .article-img image {
-  width: 100%;
-}
-
-.article-wrap .item .info-wrap {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.article-wrap .item .info-wrap .title {
-  font-weight: 700;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 1;
-  -webkit-box-orient: vertical;
-  font-size: 24rpx;
-}
-
-.article-wrap .item .info-wrap .read-wrap {
-  display: flex;
-  color: #999ca7;
-  justify-content: flex-start;
-  align-items: center;
-  margin-top: 10rpx;
-  line-height: 1;
-}
-
-.article-wrap .item .info-wrap .read-wrap text {
-  font-size: 24rpx;
-}
+  .search-wrap {
+    flex: 0.5;
+    padding: 30rpx 30rpx 0;
+    font-size: 24rpx;
+    display: flex;
+    align-items: center;
+  }
+  .search-wrap .iconfont {
+    margin-left: 16rpx;
+    font-size: 36rpx;
+  }
+  .search-wrap .input-wrap {
+    flex: 1;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #fff;
+    height: 64rpx;
+    padding-left: 10rpx;
+    border-radius: 70rpx;
+  }
+  .search-wrap .input-wrap input {
+    width: 90%;
+    background: #fff;
+    font-size: 24rpx;
+    height: 100%;
+    padding: 0 25rpx 0 40rpx;
+    line-height: 50rpx;
+    border-radius: 40rpx;
+  }
+  .search-wrap .input-wrap text {
+    font-size: 32rpx;
+    color: #909399;
+    width: 80rpx;
+    text-align: center;
+    margin-right: 20rpx;
+  }
+  .empty-wrap {
+    padding-top: 200rpx;
+  }
+  .article-wrap {
+    background: #f8f8f8;
+  }
+  .article-wrap .adv-wrap {
+    margin: 24rpx 24rpx 0 24rpx;
+    width: auto;
+  }
+  .article-wrap .item {
+    display: flex;
+    padding: 20rpx;
+    background-color: #fff;
+    margin: 24rpx;
+    border-radius: 16rpx;
+  }
+  .article-wrap .item .article-img {
+    margin-right: 20rpx;
+    width: 80rpx;
+    height: 80rpx;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .article-wrap .item .article-img image {
+    width: 100%;
+  }
+  .article-wrap .item .info-wrap {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  .article-wrap .item .info-wrap .title {
+    font-weight: 700;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    -webkit-box-orient: vertical;
+    font-size: 24rpx;
+  }
+  .article-wrap .item .info-wrap .read-wrap {
+    display: flex;
+    color: #999ca7;
+    justify-content: flex-start;
+    align-items: center;
+    margin-top: 10rpx;
+    line-height: 1;
+  }
+  .article-wrap .item .info-wrap .read-wrap text {
+    font-size: 24rpx;
+  }
 </style>

pages_tool/form/form.vue

@@ -10,7 +10,7 @@
                 <button type="primary" size="mini" class="button mini" @click="create()">提交</button>
             </view>
         </view>
-        <ns-empty :text="complete ? '提交成功' : '未获取到表单信息'" v-else></ns-empty>
+        <ns-empty :text="complete  ? '提交成功' : '未获取到表单信息'" v-else></ns-empty>
 
         <loading-cover ref="loadingCover"></loading-cover>
         <ns-login ref="login"></ns-login>
@@ -18,135 +18,130 @@
 </template>
 
 <script>
-export default {
-    components: {
-        nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-        nsForm: () => import('@/components/ns-form/ns-form.vue'),
-        loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-        nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-    },
-    data() {
-        return {
-            id: 0,
-            detail: null,
-            isRepeat: false,
-            complete: false,
-            scroll: true
-        };
-    },
-    onLoad(data) {
-        // #ifdef MP-ALIPAY
-        let options = my.getLaunchOptionsSync();
-        options.query && Object.assign(data, options.query)
-        // #endif
-
-        this.id = data.id || 0;
-        if (data.scene) {
-            var sceneParams = decodeURIComponent(data.scene);
-            sceneParams = sceneParams.split('&');
-            if (sceneParams.length) {
-                sceneParams.forEach(item => {
-                    if (item.indexOf('id') != -1) this.id = item.split('-')[1];
-                });
-            }
-        }
-        if (this.storeToken) {
-            this.getData();
-        } else {
-            this.$nextTick(() => {
-                this.$refs.login.open('/pages_tool/form/form?id=' + this.id)
-            })
-        }
-    },
-    watch: {
-        storeToken: function (nVal, oVal) {
-            if (nVal) this.getData();
-        }
-    },
-    methods: {
-        getData() {
-            this.$api.sendRequest({
-                url: '/form/api/form/info',
-                data: {
-                    form_id: this.id
-                },
-                success: res => {
-                    if (res.code == 0 && res.data) {
-                        this.detail = res.data;
-                    }
-                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                },
-                fail: res => {
-                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                }
-            });
+    export default {
+        data() {
+            return {
+                id: 0,
+                detail: null,
+                isRepeat: false,
+                complete: false,
+                scroll:true
+            };
         },
-        create() {
-            if (this.$refs.form.verify()) {
-                if (this.isRepeat) return;
-                this.isRepeat = true;
+        onLoad(data) {
+            // #ifdef MP-ALIPAY
+            let options = my.getLaunchOptionsSync();
+            options.query && Object.assign(data, options.query)
+            // #endif
 
+            this.id = data.id || 0;
+            if (data.scene) {
+                var sceneParams = decodeURIComponent(data.scene);
+                sceneParams = sceneParams.split('&');
+                if (sceneParams.length) {
+                    sceneParams.forEach(item => {
+                        if (item.indexOf('id') != -1) this.id = item.split('-')[1];
+                    });
+                }
+            }
+            if (this.storeToken) {
+                this.getData();
+            } else {
+                this.$nextTick(() => {
+                    this.$refs.login.open('/pages_tool/form/form?id=' + this.id)
+                })
+            }
+        },
+        watch: {
+            storeToken: function(nVal, oVal) {
+                if (nVal) this.getData();
+            }
+        },
+        methods: {
+            getData() {
                 this.$api.sendRequest({
-                    url: '/form/api/form/create',
+                    url: '/form/api/form/info',
                     data: {
-                        form_id: this.id,
-                        form_data: JSON.stringify(this.$refs.form.formData)
+                        form_id: this.id
                     },
                     success: res => {
-                        if (res.code == 0) {
-                            this.$util.showToast({ title: '提交成功' })
-                            setTimeout(() => {
-                                this.complete = true;
-                                this.detail = null;
-                            }, 1500)
-                        } else {
-                            this.isRepeat = false;
-                            this.$util.showToast({ title: res.message })
+                        if (res.code == 0 && res.data) {
+                            this.detail = res.data;
                         }
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                    },
+                    fail: res => {
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
                     }
                 });
-            }
-        },
-    }
-};
+            },
+            create() {
+                if (this.$refs.form.verify()) {
+                    if (this.isRepeat) return;
+                    this.isRepeat = true;
+
+                    this.$api.sendRequest({
+                        url: '/form/api/form/create',
+                        data: {
+                            form_id: this.id,
+                            form_data: JSON.stringify(this.$refs.form.formData)
+                        },
+                        success: res => {
+                            if (res.code == 0) {
+                                this.$util.showToast({ title: '提交成功' })
+                                setTimeout(() => {
+                                    this.complete = true;
+                                    this.detail = null;
+                                }, 1500)
+                            } else {
+                                this.isRepeat = false;
+                                this.$util.showToast({ title: res.message })
+                            }
+                        }
+                    });
+                }
+            },
+        }
+    };
 </script>
 
 <style lang="scss">
-.form-banner {
-    width: 100vw;
-    line-height: 1;
 
-    image {
-        width: 100%;
+    .form-banner {
+        width: 100vw;
         line-height: 1;
-    }
-}
 
-.system-form-wrap {
-    background: $color-bg;
-    border-radius: 32rpx;
-    overflow: hidden;
-    margin: 0 0 60rpx 0;
-    padding: 0 26rpx;
-    transform: translateY(-40rpx);
-
-    .form-title {
-        line-height: 100rpx;
-        padding-top: 20rpx;
+        image {
+            width: 100%;
+            line-height: 1;
+        }
     }
 
-    .button {
-        height: 80rpx;
-        line-height: 80rpx !important;
-        margin-top: 30rpx !important;
-        width: 100%;
-        border-radius: 80rpx;
-    }
-
-    /deep/ .form-wrap {
-        background: #fff;
-        padding: 30rpx;
+    .system-form-wrap {
+        background: $color-bg;
         border-radius: 32rpx;
+        overflow: hidden;
+        margin: 0 0 60rpx 0;
+        padding: 0 26rpx;
+        transform: translateY(-40rpx);
+
+        .form-title {
+            line-height: 100rpx;
+            padding-top: 20rpx;
+        }
+
+        .button {
+            height: 80rpx;
+            line-height: 80rpx !important;
+            margin-top: 30rpx !important;
+            width: 100%;
+            border-radius: 80rpx;
+        }
+
+        /deep/ .form-wrap {
+            background: #fff;
+            padding: 30rpx;
+            border-radius: 32rpx;
+        }
     }
-}
 </style>

pages_tool/form/formdata.vue

@@ -3,13 +3,11 @@
 		<block v-if="detail">
 			<view class="page">
 				<view class="system-form-wrap">
-					<view class="form-title"
-						style="text-align:center;padding-top:40rpx;font-weight:600;font-size:30rpx;">
+					<view class="form-title" style="text-align:center;padding-top:40rpx;font-weight:600;font-size:30rpx;">
 						请填写表单所需信息
 					</view>
 					<ns-newform ref="form" :data="detail.json_data" @submit="create"></ns-newform>
-					<button class="button mini" style="font-size:32rpx;" type="primary" size="mini"
-						@click="create">提交</button>
+					<button class="button mini" style="font-size:32rpx;" type="primary" size="mini" @click="create">提交</button>
 				</view>
 			</view>
 		</block>
@@ -23,12 +21,6 @@
 
 <script>
 export default {
-    components: {
-        nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-        nsNewform: () => import('@/components/ns-newform/ns-newform.vue'),
-        loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-        nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-    },
 	data() {
 		return {
 			id: 0,
@@ -45,7 +37,7 @@ export default {
 				title: '提示',
 				content: '参数错误',
 				showCancel: false,
-				success: () => { }
+				success: () => {}
 			})
 			return false
 		}
@@ -111,7 +103,7 @@ export default {
 							title: '提示',
 							content: '提交成功',
 							showCancel: false,
-							success: () => { }
+							success: () => {}
 						})
 					} else {
 						this.isRepeat = false

pages_tool/goods/brand.vue

@@ -24,106 +24,116 @@
 </template>
 
 <script>
-export default {
-	components: {
-		uniGrid: () => import('@/components/uni-grid/uni-grid.vue'),
-		uniGridItem: () => import('@/components/uni-grid-item/uni-grid-item.vue'),
-		nsAdv: () => import('@/components/ns-adv/ns-adv.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif
-	},
-	data() {
-		return {
-			brandList: [],
-			siteId: 0
-		};
-	},
-	onLoad(options) {
-		if (options.site_id) this.siteId = options.site_id;
-	},
-	onShow() { },
-	methods: {
-		change(e) {
-			this.$util.redirectTo('/pages_goods/list', {
-				brand_id: this.brandList[e.detail.index].brand_id
-			});
+	import uniGrid from '@/components/uni-grid/uni-grid.vue';
+	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
+	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
+	export default {
+		components: {
+			uniGrid,
+			uniGridItem,
+			nsAdv,
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
-		getBrandList(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/goodsbrand/page',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num,
-					site_id: this.siteId
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
+		data() {
+			return {
+				brandList: [],
+				siteId: 0
+			};
+		},
+		onLoad(options) {
+			if (options.site_id) this.siteId = options.site_id;
+		},
+		onShow() {},
+		methods: {
+			change(e) {
+				this.$util.redirectTo('/pages_goods/list', {
+					brand_id: this.brandList[e.detail.index].brand_id
+				});
+			},
+			getBrandList(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/goodsbrand/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						site_id: this.siteId
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.brandList = []; //如果是第一页需手动制空列表
+						this.brandList = this.brandList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail() {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.brandList = []; //如果是第一页需手动制空列表
-					this.brandList = this.brandList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail() {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
+				});
+			}
+		},
+		onShareAppMessage(res) {
+			var title = '你想要的大牌都在这里';
+			var path = '/pages_tool/goods/brand';
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
 		}
-	},
-	onShareAppMessage(res) {
-		var title = '你想要的大牌都在这里';
-		var path = '/pages_tool/goods/brand';
-		return {
-			title: title,
-			path: path,
-			success: res => { },
-			fail: res => { }
-		};
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-/deep/ .uni-grid-item {
-	width: calc((100vw - (#{$margin-both} * 2)) / 3) !important;
-}
-
-.adv-wrap {
-	margin: $margin-updown $margin-both;
-	width: auto;
-}
-
-.brand-content {
-	padding: $padding 0;
-	box-sizing: border-box;
-	background: #ffffff;
-	margin: $margin-updown $margin-both 0;
-
-	.brand-pic {
-		width: 60%;
-		height: 50%;
+	/deep/ .uni-grid-item {
+		width: calc((100vw - (#{$margin-both} * 2)) / 3) !important;
 	}
 
-	.brand_name {
-		width: 70%;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		text-align: center;
+	.adv-wrap {
+		margin: $margin-updown $margin-both;
+		width: auto;
+	}
+
+	.brand-content {
+		padding: $padding 0;
+		box-sizing: border-box;
+		background: #ffffff;
+		margin: $margin-updown $margin-both 0;
+
+		.brand-pic {
+			width: 60%;
+			height: 50%;
+		}
+
+		.brand_name {
+			width: 70%;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			text-align: center;
+		}
 	}
-}
 </style>

pages_tool/goods/coupon.vue

@@ -2,53 +2,42 @@
 	<view :style="themeColor">
 		<view class="cf-container color-line-border">
 			<view class="tab">
-				<view @click="changeSort(1)"><text
-						:class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
-				<view @click="changeSort(2, 'reward')"><text
-						:class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
-				<view @click="changeSort(3, 'discount')"><text
-						:class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
-				<!-- 		<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view> -->
+				<view @click="changeSort(1)"><text :class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
+				<view @click="changeSort(2, 'reward')"><text :class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
+				<view @click="changeSort(3, 'discount')"><text :class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
+		<!-- 		<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view> -->
 			</view>
 		</view>
 
 		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCouponList">
 			<block slot="list">
 				<view class="coupon-listone">
-					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)"
-						:style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 						<view class="item-base" :class="{ disabled: item.useState == 2 }">
-							<image class="coupon-line" mode="heightFix"
-								:src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
+							<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
 							<view>
-								<view class="use_price price-font" v-if="item.type == 'reward'"
-									:class="{ disabled: item.useState == 2 }">
+								<view class="use_price price-font" v-if="item.type == 'reward'" :class="{ disabled: item.useState == 2 }">
 									<text>￥</text>
 									{{ parseFloat(item.money) }}
 								</view>
-								<view class="use_price price-font" v-else-if="item.type == 'discount'"
-									:class="{ disabled: item.useState == 2 }">
+								<view class="use_price price-font" v-else-if="item.type == 'discount'" :class="{ disabled: item.useState == 2 }">
 									{{ parseFloat(item.discount) }}
 									<text>折</text>
 								</view>
-								<view class="use_condition font-size-tag" v-if="item.at_least > 0"
-									:class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
-								<view class="use_condition font-size-tag" v-else
-									:class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
+								<view class="use_condition font-size-tag" v-if="item.at_least > 0" :class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-else :class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
 							</view>
 						</view>
 						<view class="item-info">
 							<view class="use_title">
 								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3"
-									:class="{ disabled: item.useState == 2 }">指定商品</view>
+								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.useState == 2 }">指定商品</view>
 								<view class="max_price" v-else :class="{ disabled: item.useState == 2 }">全场商品</view>
 								<view class="max_price" v-if="item.discount_limit != '0.00'">
 									(最大优惠{{ item.discount_limit }}元)
 								</view>
-								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{
-									item.use_channel_name }}</view>
-								<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
+								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
+							<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
 									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
 								</view> -->
 							</view>
@@ -81,401 +70,406 @@
 </template>
 
 <script>
-
-export default {
-	components: {
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif
-	},
-	data() {
-		return {
-			list: [],
-			sort: 1,
-			types: '',
-			couponBtnSwitch: false,
-			//分享建立上下级id
-			mpShareData: null //小程序分享数据
-		};
-	},
-	onLoad(option) {
-		setTimeout(() => {
-			if (!this.addonIsExist.coupon) {
-				this.$util.showToast({
-					title: '商家未开启优惠券',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		}, 1000);
-
-		//小程序分享接收source_member
-		if (option.source_member) {
-			uni.setStorageSync('source_member', option.source_member);
-		}
-		// 小程序扫码进入，接收source_member
-		if (option.scene) {
-			var sceneParams = decodeURIComponent(option.scene);
-			sceneParams = sceneParams.split('&');
-			if (sceneParams.length) {
-				sceneParams.forEach(item => {
-					if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
-					if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
-					if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
-				});
-			}
-		}
-	},
-	onShow() {
-		//记录分享关系
-		if (this.storeToken && uni.getStorageSync('source_member')) {
-			this.$util.onSourceMember(uni.getStorageSync('source_member'));
-		}
-
-		//小程序分享
-		// #ifdef MP-WEIXIN
-		this.$util.getMpShare().then(res => {
-			this.mpShareData = res;
-		});
-		// #endif
-	},
-	//分享给好友
-	onShareAppMessage() {
-		return this.mpShareData.appMessage;
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		return this.mpShareData.timeLine;
-	},
-	methods: {
-		changeSort(sort, types) {
-			this.list = [];
-			this.sort = sort;
-			this.types = types;
-			this.$refs.mescroll.refresh(false);
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif		
+	export default {
+		components: {
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
 		},
-		liClick(item, index) {
-			if (['limit', 'expire', 'out'].includes(item.receivedType)) return false;
-			if (item.useState == 0) this.receiveCoupon(item, index);
-			else this.toGoodsList(item, index);
+		data() {
+			return {
+				list: [],
+				sort: 1,
+				types: '',
+				couponBtnSwitch: false,
+				//分享建立上下级id
+				mpShareData: null //小程序分享数据
+			};
 		},
+		onLoad(option) {
+			setTimeout( () => {
+				if (!this.addonIsExist.coupon) {
+					this.$util.showToast({
+						title: '商家未开启优惠券',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+			
+			//小程序分享接收source_member
+			if (option.source_member) {
+				uni.setStorageSync('source_member', option.source_member);
+			}
+			// 小程序扫码进入，接收source_member
+			if (option.scene) {
+				var sceneParams = decodeURIComponent(option.scene);
+				sceneParams = sceneParams.split('&');
+				if (sceneParams.length) {
+					sceneParams.forEach(item => {
+						if (item.indexOf('sku_id') != -1) this.skuId = item.split('-')[1];
+						if (item.indexOf('m') != -1) uni.setStorageSync('source_member', item.split('-')[1]);
+						if (item.indexOf('is_test') != -1) uni.setStorageSync('is_test', 1);
+					});
+				}
+			}
+		},
+		onShow() {
+			//记录分享关系
+			if (this.storeToken && uni.getStorageSync('source_member')) {
+				this.$util.onSourceMember(uni.getStorageSync('source_member'));
+			}
 
-		//领取优惠券
-		receiveCoupon(item, index) {
-			if (this.couponBtnSwitch) return;
-			this.couponBtnSwitch = true;
-			if (this.storeToken) {
+			//小程序分享
+			// #ifdef MP-WEIXIN
+			this.$util.getMpShare().then(res => {
+				this.mpShareData = res;
+			});
+			// #endif
+		},
+		//分享给好友
+		onShareAppMessage() {
+			return this.mpShareData.appMessage;
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			return this.mpShareData.timeLine;
+		},
+		methods: {
+			changeSort(sort, types) {
+				this.list = [];
+				this.sort = sort;
+				this.types = types;
+				this.$refs.mescroll.refresh(false);
+			},
+			liClick(item, index) {
+				if(['limit', 'expire', 'out'].includes(item.receivedType)) return false;
+				if (item.useState == 0) this.receiveCoupon(item, index);
+				else this.toGoodsList(item, index);
+			},
+
+			//领取优惠券
+			receiveCoupon(item, index) {
+				if (this.couponBtnSwitch) return;
+				this.couponBtnSwitch = true;
+				if (this.storeToken) {
+					this.$api.sendRequest({
+						url: '/coupon/api/coupon/receive',
+						data: {
+							coupon_type_id: item.coupon_type_id,
+							get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+						},
+						success: res => {
+							this.couponBtnSwitch = false;
+							let msg = '领取成功，快去使用吧';
+							let list = this.list;
+							if (res.code < 0) msg = res.message;
+							
+							if (res.data.is_exist == 1) {
+								for (let i = 0; i < list.length; i++) {
+									if (list[i].coupon_type_id == item.coupon_type_id) {
+										list[i].useState = 1;
+									}
+								}
+							} else {
+								for (let i = 0; i < list.length; i++) {
+									if (list[i].coupon_type_id == item.coupon_type_id) {
+										list[i].receivedType = res.data.type;
+										list[i].useState = 2;
+									}
+								}
+							}
+							this.$util.showToast({
+								title: msg
+							});
+						},
+						fail: res => {
+							this.couponBtnSwitch = false;
+						}
+					});
+				} else {
+					this.couponBtnSwitch = false;
+					this.$refs.login.open('/pages_tool/goods/coupon');
+				}
+			},
+			//获取优惠券列表
+			getMemberCouponList(mescroll) {
 				this.$api.sendRequest({
-					url: '/coupon/api/coupon/receive',
+					url: '/coupon/api/coupon/typepagelists',
 					data: {
-						coupon_type_id: item.coupon_type_id,
-						get_type: 2 //获取方式:1订单2.直接领取3.活动领取
+						page: mescroll.num,
+						page_size: mescroll.size,
+						sort: this.sort,
+						type: this.types
 					},
 					success: res => {
-						this.couponBtnSwitch = false;
-						let msg = '领取成功，快去使用吧';
-						let list = this.list;
-						if (res.code < 0) msg = res.message;
-
-						if (res.data.is_exist == 1) {
-							for (let i = 0; i < list.length; i++) {
-								if (list[i].coupon_type_id == item.coupon_type_id) {
-									list[i].useState = 1;
-								}
-							}
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
 						} else {
-							for (let i = 0; i < list.length; i++) {
-								if (list[i].coupon_type_id == item.coupon_type_id) {
-									list[i].receivedType = res.data.type;
-									list[i].useState = 2;
-								}
-							}
+							this.$util.showToast({
+								title: msg
+							});
 						}
-						this.$util.showToast({
-							title: msg
-						});
+						mescroll.endSuccess(newArr.length);
+						if (newArr.length) {
+							newArr.forEach(v => {
+								if (v.count == v.lead_count) v.useState = 2;
+								else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
+								else v.useState = 0;
+							});
+						}
+						//设置列表数据
+						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					},
-					fail: res => {
-						this.couponBtnSwitch = false;
+					fail() {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
 				});
-			} else {
-				this.couponBtnSwitch = false;
-				this.$refs.login.open('/pages_tool/goods/coupon');
-			}
-		},
-		//获取优惠券列表
-		getMemberCouponList(mescroll) {
-			this.$api.sendRequest({
-				url: '/coupon/api/coupon/typepagelists',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size,
-					sort: this.sort,
-					type: this.types
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					if (newArr.length) {
-						newArr.forEach(v => {
-							if (v.count == v.lead_count) v.useState = 2;
-							else if (v.max_fetch != 0 && v.member_coupon_num && v.member_coupon_num >= v.max_fetch) v.useState = 1;
-							else v.useState = 0;
-						});
-					}
-					//设置列表数据
-					if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-					this.list = this.list.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail() {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+			},
+			imageError(index) {
+				this.list[index].logo = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			couponImageError(index) {
+				this.list[index].image = this.$util.img('public/uniapp/goods/coupon.png');
+				this.$forceUpdate();
+			},
+			toGoodsList(item) {
+				if (item.goods_type != 1) {
+					this.$util.redirectTo('/pages_goods/list', {
+						coupon: item.coupon_type_id
+					});
+				} else {
+					this.$util.redirectTo('/pages_goods/list', {});
 				}
-			});
-		},
-		imageError(index) {
-			this.list[index].logo = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		couponImageError(index) {
-			this.list[index].image = this.$util.img('public/uniapp/goods/coupon.png');
-			this.$forceUpdate();
-		},
-		toGoodsList(item) {
-			if (item.goods_type != 1) {
-				this.$util.redirectTo('/pages_goods/list', {
-					coupon: item.coupon_type_id
-				});
-			} else {
-				this.$util.redirectTo('/pages_goods/list', {});
 			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.coupon-head {
-	padding: 20rpx 50rpx;
-	display: flex;
-	background: #fff;
-
-	.sort {
-		border: 2rpx solid #c5c5c5;
-		padding: 1rpx 20rpx;
-		border-radius: $border-radius;
-		cursor: pointer;
-		margin-right: 15rpx;
-	}
-}
-
-.coupon-listone {
-	padding: 0 30rpx;
-
-	.item {
+	.coupon-head {
+		padding: 20rpx 50rpx;
 		display: flex;
-		background-color: #fff2f0;
-		background-size: 100% 100%;
-		border-radius: 20rpx;
-		align-items: stretch;
-		margin-top: $padding;
-		overflow: hidden;
+		background: #fff;
 
-		.item-base {
-			position: relative;
-			width: 197rpx;
-			min-width: 197rpx;
-			text-align: center;
-			background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			padding: 38rpx 10rpx 38rpx 18rpx;
-
-			&.disabled {
-				background: #dedede;
-			}
-
-			.coupon-line {
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 100%;
-			}
-
-			>view {
-				height: auto;
-				position: relative;
-				top: 50%;
-				transform: translate(0, -50%);
-			}
-
-			.use_price {
-				font-size: 60rpx;
-				line-height: 1;
-				color: #fff;
-
-				text {
-					font-size: $font-size-toolbar;
-				}
-
-				&.disabled {
-					color: $color-tip;
-				}
-			}
-
-			.use_condition {
-				color: #fff;
-				margin-top: $padding;
-
-				&.margin_top_none {
-					margin-top: 0;
-				}
-
-				&.disabled {
-					color: $color-tip;
-				}
-			}
-
-			&::after {
-				position: absolute;
-				content: '';
-				background-color: #f8f8f8;
-				left: 0;
-				top: 50%;
-				transform: translate(0, -50%);
-				height: 30rpx;
-				width: 15rpx;
-				border-radius: 0 30rpx 30rpx 0;
-			}
+		.sort {
+			border: 2rpx solid #c5c5c5;
+			padding: 1rpx 20rpx;
+			border-radius: $border-radius;
+			cursor: pointer;
+			margin-right: 15rpx;
 		}
+	}
 
-		.item-btn {
-			width: 160rpx;
-			min-width: 160rpx;
-			align-self: center;
-			position: relative;
+	.coupon-listone {
+		padding: 0 30rpx;
 
-			view {
-				width: 100rpx;
-				height: 50rpx;
-				border-radius: $border-radius;
-				line-height: 50rpx;
-				margin: auto;
-				text-align: center;
-				background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
-				color: var(--btn-text-color);
-				font-size: $font-size-tag;
-
-				&.disabled {
-					background: #dedede !important;
-					color: #909399 !important;
-				}
-			}
-
-			&::after {
-				position: absolute;
-				content: '';
-				background-color: #f8f8f8;
-				right: 0;
-				top: 50%;
-				transform: translate(0, -50%);
-				height: 30rpx;
-				width: 15rpx;
-				border-radius: 30rpx 0 0 30rpx;
-			}
-		}
-
-		.item-info {
-			flex: 1;
+		.item {
 			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			margin-left: 20rpx;
+			background-color: #fff2f0;
+			background-size: 100% 100%;
+			border-radius: 20rpx;
+			align-items: stretch;
+			margin-top: $padding;
 			overflow: hidden;
-			background-repeat-x: no-repeat;
-			background-repeat-y: repeat;
 
-			.use_time {
-				padding: 20rpx 0;
-				border-top: 2rpx dashed #cccccc;
-				font-size: $font-size-activity-tag;
-				color: #909399;
-			}
+			.item-base {
+				position: relative;
+				width: 197rpx;
+				min-width: 197rpx;
+				text-align: center;
+				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				padding: 38rpx 10rpx 38rpx 18rpx;
 
-			.use_title {
-				font-size: $font-size-base;
-				font-weight: 500;
-				padding: 20rpx 0;
-
-				// height:80rpx;
-				.title {
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
+				&.disabled {
+					background: #dedede;
 				}
 
-				.max_price {
-					font-weight: 400;
+				.coupon-line {
+					position: absolute;
+					right: 0;
+					top: 0;
+					height: 100%;
+				}
+
+				>view {
+					height: auto;
+					position: relative;
+					top: 50%;
+					transform: translate(0, -50%);
+				}
+
+				.use_price {
+					font-size: 60rpx;
+					line-height: 1;
+					color: #fff;
+
+					text {
+						font-size: $font-size-toolbar;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				.use_condition {
+					color: #fff;
+					margin-top: $padding;
+
+					&.margin_top_none {
+						margin-top: 0;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					left: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 0 30rpx 30rpx 0;
+				}
+			}
+
+			.item-btn {
+				width: 160rpx;
+				min-width: 160rpx;
+				align-self: center;
+				position: relative;
+
+				view {
+					width: 100rpx;
+					height: 50rpx;
+					border-radius: $border-radius;
+					line-height: 50rpx;
+					margin: auto;
+					text-align: center;
+					background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
+					color: var(--btn-text-color);
 					font-size: $font-size-tag;
+
+					&.disabled {
+						background: #dedede !important;
+						color: #909399 !important;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					right: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 30rpx 0 0 30rpx;
+				}
+			}
+
+			.item-info {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				margin-left: 20rpx;
+				overflow: hidden;
+				background-repeat-x: no-repeat;
+				background-repeat-y: repeat;
+
+				.use_time {
+					padding: 20rpx 0;
+					border-top: 2rpx dashed #cccccc;
+					font-size: $font-size-activity-tag;
+					color: #909399;
+				}
+
+				.use_title {
+					font-size: $font-size-base;
+					font-weight: 500;
+					padding: 20rpx 0;
+
+					// height:80rpx;
+					.title {
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.max_price {
+						font-weight: 400;
+						font-size: $font-size-tag;
+					}
 				}
 			}
 		}
 	}
-}
 
-.empty {
-	margin-top: 200rpx;
-}
+	.empty {
+		margin-top: 200rpx;
+	}
 
-.cf-container {
-	background: #fff;
-	overflow: hidden;
-}
+	.cf-container {
+		background: #fff;
+		overflow: hidden;
+	}
 
-.tab {
-	display: flex;
-	justify-content: space-between;
-	height: 86rpx;
-
-	>view {
-		text-align: center;
-		width: 33%;
+	.tab {
+		display: flex;
+		justify-content: space-between;
 		height: 86rpx;
 
-		text {
-			display: inline-block;
-			line-height: 86rpx;
-			height: 80rpx;
-			font-size: 30rpx;
+		>view {
+			text-align: center;
+			width: 33%;
+			height: 86rpx;
+
+			text {
+				display: inline-block;
+				line-height: 86rpx;
+				height: 80rpx;
+				font-size: 30rpx;
+			}
 		}
 	}
-}
 
-.active {
-	border-bottom: 4rpx solid;
-}
-
-.truncate {
-	overflow: hidden;
-	-o-text-overflow: ellipsis;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
+	.active {
+		border-bottom: 4rpx solid;
+	}
+	.truncate {
+		overflow: hidden;
+		-o-text-overflow: ellipsis;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 </style>

pages_tool/goods/coupon_receive.vue

@@ -39,13 +39,6 @@
 
 <script>
 	export default {
-		components: {
-			nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-			loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-			// #ifdef MP-WEIXIN
-			privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-			// #endif
-		},
 		data() {
 			return {
 				info: {},

pages_tool/goods/evaluate.vue

@@ -25,7 +25,7 @@
 									</view>
 									<text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
 									<view class="evaluator-time color-tip">{{ $util.timeStampTurnTime(item.create_time)
-									}}</view>
+										}}</view>
 								</view>
 								<view class="evaluator-xing">
 									<xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
@@ -74,16 +74,24 @@
 </template>
 
 <script>
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 
+import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
 export default {
 	components: {
-		xiaoStarComponent: () => import('@/components/xiao-star-component/xiao-star-component.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		xiaoStarComponent,
+		MescrollUni,
+		nsLogin,
+		loadingCover,
+		nsEmpty,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		privacyPopup
 		// #endif
 	},
 	data() {

pages_tool/goods/not_exist.vue

@@ -12,17 +12,16 @@ export default {
 	data() {
 		return {};
 	},
-	onShow() { },
+	onShow() {},
 	methods: {}
 };
 </script>
 
 <style lang="scss">
-.page {
+.page{
 	height: 100vh;
 	overflow: hidden;
 }
-
 .closeBox {
 	width: 100%;
 	display: flex;
@@ -31,11 +30,9 @@ export default {
 	align-items: center;
 	margin-top: 260rpx;
 }
-
 image {
 	width: 400rpx;
 }
-
 .close-title {
 	font-size: $font-size-base;
 	color: $color-tip;

pages_tool/goods/search.vue

@@ -3,9 +3,7 @@
 		<view class="content">
 			<view class="cate-search">
 				<view class="search-box" @click="search()" @tap.stop="search()">
-					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search"
-						@focus="inputFocus" focus @confirm="search()" @click="search()" @tap="search()"
-						:placeholder="searchWords ? searchWords : ''" />
+					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search" @focus="inputFocus" focus @confirm="search()" @click="search()" @tap="search()" :placeholder="searchWords ? searchWords : ''" />
 					<text class="iconfont icon-sousuo3" @click="search()"></text>
 				</view>
 			</view>
@@ -17,10 +15,8 @@
 							<view class="title">历史搜索</view>
 							<view class="icon iconfont icon-icon7" @click="deleteHistoryList"></view>
 						</view>
-						<view class="history-bottom " id="history-list"
-							:style="{ maxHeight: !isAllHistory ? '100%' : '168rpx' }">
-							<view class="history-li" v-for="(item, index) in historyList" :key="index"
-								@click="otherSearch(item)">
+						<view class="history-bottom " id="history-list" :style="{ maxHeight: !isAllHistory ? '100%' : '168rpx' }">
+							<view class="history-li" v-for="(item, index) in historyList" :key="index" @click="otherSearch(item)">
 								<view>{{ item }}</view>
 							</view>
 							<view class="history-li history_more" v-if="isAllHistory" @click="isAllHistory = false">
@@ -37,8 +33,7 @@
 							<view class="title">热门搜索</view>
 						</view>
 						<view class="history-bottom">
-							<view class="history-li" v-for="(item, index) in hotList" :key="index"
-								@click="otherSearch(item)" @longtap="deleteItem(item)">
+							<view class="history-li" v-for="(item, index) in hotList" :key="index" @click="otherSearch(item)" @longtap="deleteItem(item)">
 								<view>{{ item }}</view>
 							</view>
 						</view>
@@ -50,297 +45,297 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			inputValue: '', //搜索框的值
-			historyList: [], //历史搜索记录
-			searchList: [], //搜索发现列表
-			alikeList: [],
-			isIndex: false,
-			searchWords: '',
-			hotList: [],
-			isAllHistory: false
-		};
-	},
-	onLoad(options) {
-		if (options.keyword) this.inputValue = options.keyword;
-		uni.getStorageSync('search') ? '' : uni.setStorageSync('search', []);
-	},
-	onShow() {
-		this.findHistoryList();
-		this.defaultSearch();
-		this.findHotList();
-		this.$nextTick(function () {
-			this.getHistoryHeight();
-		});
-	},
-	methods: {
-		//获取历史搜索记录
-		findHistoryList() {
-			this.historyList = uni.getStorageSync('search').reverse();
+	export default {
+		data() {
+			return {
+				inputValue: '', //搜索框的值
+				historyList: [], //历史搜索记录
+				searchList: [], //搜索发现列表
+				alikeList: [],
+				isIndex: false,
+				searchWords: '',
+				hotList: [],
+				isAllHistory: false
+			};
 		},
-		//删除所有历史记录
-		deleteHistoryList() {
-			uni.showModal({
-				title: '提示',
-				content: '确认删除全部历史记录？',
-				success: res => {
-					if (res.confirm) {
-						uni.setStorageSync('search', []);
-						this.findHistoryList();
+		onLoad(options) {
+			if (options.keyword) this.inputValue = options.keyword;
+			uni.getStorageSync('search') ? '' : uni.setStorageSync('search', []);
+		},
+		onShow() {
+			this.findHistoryList();
+			this.defaultSearch();
+			this.findHotList();
+			this.$nextTick(function() {
+				this.getHistoryHeight();
+			});
+		},
+		methods: {
+			//获取历史搜索记录
+			findHistoryList() {
+				this.historyList = uni.getStorageSync('search').reverse();
+			},
+			//删除所有历史记录
+			deleteHistoryList() {
+				uni.showModal({
+					title: '提示',
+					content: '确认删除全部历史记录？',
+					success: res => {
+						if (res.confirm) {
+							uni.setStorageSync('search', []);
+							this.findHistoryList();
+						}
 					}
-				}
-			});
-		},
-		//删除历史记录的某一项
-		deleteItem(e) {
-			uni.showModal({
-				title: '提示',
-				content: '确认删除该条历史记录？',
-				success: res => {
-					if (res.confirm) {
-						let array = uni.getStorageSync('search');
-						let newArr = array.filter(v => {
-							return v != e;
-						});
-						uni.setStorageSync('search', newArr);
-						this.findHistoryList();
-					}
-				}
-			});
-		},
-		// 获取默认搜素
-		defaultSearch() {
-			this.$api.sendRequest({
-				url: '/api/goods/defaultSearchWords',
-				success: res => {
-					this.searchWords = res.data.words;
-				}
-			});
-		},
-		// 获取热门搜素
-		findHotList() {
-			this.$api.sendRequest({
-				url: '/api/goods/hotSearchWords',
-				success: res => {
-					if (res.data.words != '') {
-						this.hotList = res.data.words.split(',');
-					}
-				}
-			});
-		},
-		//input框获取焦点事件
-		inputFocus(e) {
-			if (this.inputValue.trim() != '') this.dataList = [];
-		},
-		//点击其他列表搜索
-		otherSearch(e) {
-			this.inputValue = e;
-			this.search();
-		},
-		//搜索
-		search() {
-
-			if (this.inputValue.trim() != '') {
-
-				// 对历史搜索处理,判断有无,最近搜索显示在最前
-				let historyList = uni.getStorageSync('search');
-				let array = [];
-				if (historyList.length) {
-					array = historyList.filter(v => {
-						return v != this.inputValue.trim();
-					});
-					array.push(this.inputValue.trim());
-				} else {
-					array.push(this.inputValue.trim());
-				}
-				uni.setStorageSync('search', array);
-
-				this.$util.redirectTo('/pages_goods/list', {
-					keyword: this.inputValue.trim()
 				});
-			} else {
-				if (this.searchWords == '') {
-					this.$util.showToast({
-						title: '搜索内容不能为空哦'
+			},
+			//删除历史记录的某一项
+			deleteItem(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条历史记录？',
+					success: res => {
+						if (res.confirm) {
+							let array = uni.getStorageSync('search');
+							let newArr = array.filter(v => {
+								return v != e;
+							});
+							uni.setStorageSync('search', newArr);
+							this.findHistoryList();
+						}
+					}
+				});
+			},
+			// 获取默认搜素
+			defaultSearch() {
+				this.$api.sendRequest({
+					url: '/api/goods/defaultSearchWords',
+					success: res => {
+						this.searchWords = res.data.words;
+					}
+				});
+			},
+			// 获取热门搜素
+			findHotList() {
+				this.$api.sendRequest({
+					url: '/api/goods/hotSearchWords',
+					success: res => {
+						if (res.data.words != '') {
+							this.hotList = res.data.words.split(',');
+						}
+					}
+				});
+			},
+			//input框获取焦点事件
+			inputFocus(e) {
+				if (this.inputValue.trim() != '') this.dataList = [];
+			},
+			//点击其他列表搜索
+			otherSearch(e) {
+				this.inputValue = e;
+				this.search();
+			},
+			//搜索
+			search() {
+
+				if (this.inputValue.trim() != '') {
+
+					// 对历史搜索处理,判断有无,最近搜索显示在最前
+					let historyList = uni.getStorageSync('search');
+					let array = [];
+					if (historyList.length) {
+						array = historyList.filter(v => {
+							return v != this.inputValue.trim();
+						});
+						array.push(this.inputValue.trim());
+					} else {
+						array.push(this.inputValue.trim());
+					}
+					uni.setStorageSync('search', array);
+
+					this.$util.redirectTo('/pages_goods/list', {
+						keyword: this.inputValue.trim()
 					});
 				} else {
-					this.$util.redirectTo('/pages_goods/list', {
-						//keyword: this.searchWords
-					});
-				}
-			}
-		},
-		// 获取元素高度
-		getHistoryHeight() {
-			const query = uni.createSelectorQuery().in(this);
-			query.select('#history-list')
-				.boundingClientRect(data => {
-					if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
-						this.isAllHistory = true;
+					if (this.searchWords == '') {
+						this.$util.showToast({
+							title: '搜索内容不能为空哦'
+						});
+					} else {
+						this.$util.redirectTo('/pages_goods/list', {
+							//keyword: this.searchWords
+						});
 					}
-				}).exec();
+				}
+			},
+			// 获取元素高度
+			getHistoryHeight() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#history-list')
+					.boundingClientRect(data => {
+						if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
+							this.isAllHistory = true;
+						}
+					}).exec();
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-/deep/ .fixed {
-	position: relative;
-	top: 0;
-}
-
-/deep/ .empty {
-	margin-top: 0 !important;
-}
-
-.cart-empty {
-	padding-top: 54px;
-}
-
-.content {
-	// overflow: hidden;
-	width: 100vw;
-	/* #ifdef MP */
-	height: 100vh;
-	/* #endif */
-	/* #ifdef H5 */
-	height: calc(100vh - env(safe-area-inset-bottom) - var(--status-bar-height));
-	/* #endif */
-	/* #ifdef APP-PLUS */
-	height: calc(100vh - 44px - env(safe-area-inset-bottom));
-	/* #endif */
-	background: #ffffff;
-}
-
-.cate-search {
-	width: 100%;
-	background: #ffffff;
-	padding: 10rpx 30rpx;
-	box-sizing: border-box;
-	/* #ifdef H5 */
-	padding-top: 30rpx;
-	/* #endif */
-
-	input {
-		font-size: $font-size-base;
-		height: 100%;
-		padding: 0 25rpx 0 30rpx;
-		width: calc(100% - 120rpx);
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
 	}
 
-	text {
-		font-size: 32rpx;
-		color: $color-tip;
-		width: 120rpx;
-		text-align: center;
+	/deep/ .empty {
+		margin-top: 0 !important;
 	}
 
-	.search-box {
-		width: 100%;
-		height: 64rpx;
-		background: $color-bg;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 40rpx;
+	.cart-empty {
+		padding-top: 54px;
 	}
-}
 
-.search-content {
-	box-sizing: border-box;
-	background: #ffffff;
-}
-
-.history {
-	width: 100%;
-	box-sizing: border-box;
-
-	.history-box {
-		width: 100%;
-		height: 100%;
+	.content {
+		// overflow: hidden;
+		width: 100vw;
+		/* #ifdef MP */
+		height: 100vh;
+		/* #endif */
+		/* #ifdef H5 */
+		height: calc(100vh - env(safe-area-inset-bottom) - var(--status-bar-height));
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 44px - env(safe-area-inset-bottom));
+		/* #endif */
 		background: #ffffff;
-		padding: 30rpx 30rpx 0rpx 30rpx;
+	}
 
+	.cate-search {
+		width: 100%;
+		background: #ffffff;
+		padding: 10rpx 30rpx;
 		box-sizing: border-box;
-		overflow: hidden;
+		/* #ifdef H5 */
+		padding-top: 30rpx;
+		/* #endif */
 
-		.history-top {
+		input {
+			font-size: $font-size-base;
+			height: 100%;
+			padding: 0 25rpx 0 30rpx;
+			width: calc(100% - 120rpx);
+		}
+
+		text {
+			font-size: 32rpx;
+			color: $color-tip;
+			width: 120rpx;
+			text-align: center;
+		}
+
+		.search-box {
 			width: 100%;
-			height: 60rpx;
+			height: 64rpx;
+			background: $color-bg;
 			display: flex;
-			justify-content: space-between;
+			justify-content: center;
 			align-items: center;
-			font-size: $font-size-toolbar;
-
-			.title {
-				font-weight: 500;
-				font-size: $font-size-toolbar;
-			}
-
-			.iconfont {
-				color: $color-tip;
-				font-size: $font-size-base;
-			}
-		}
-
-		.history-bottom {
-			width: 100%;
-			padding-top: $padding;
-			position: relative;
-
-			.history-li {
-				display: inline-block;
-				margin-right: 20rpx;
-				margin-bottom: 15rpx;
-				max-width: 100%;
-
-				view {
-					line-height: 66rpx;
-					background: #f8f8f8 !important;
-					height: 66rpx;
-					color: #303133 !important;
-					margin: 0 0rpx 4rpx 0 !important;
-					padding: 0 $padding;
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					border-radius: 20rpx;
-				}
-
-				&.history_more {
-					margin-right: 0;
-					position: absolute;
-					bottom: 0;
-					right: 0;
-				}
-			}
+			border-radius: 40rpx;
 		}
 	}
 
-	.hidden-show {
-		width: 100%;
-		height: 70rpx;
-		text-align: center;
-		line-height: 70rpx;
-	}
-}
-
-.search-alike {
-	width: 100%;
-	height: calc(100vh - 100rpx);
-
-	padding: 0 $padding;
-	box-sizing: border-box;
-
-	.alike-box {
-		width: 100%;
-		height: 100%;
+	.search-content {
+		box-sizing: border-box;
 		background: #ffffff;
-		border-radius: $padding;
-		overflow: hidden;
 	}
-}
+
+	.history {
+		width: 100%;
+		box-sizing: border-box;
+
+		.history-box {
+			width: 100%;
+			height: 100%;
+			background: #ffffff;
+			padding: 30rpx 30rpx 0rpx 30rpx;
+
+			box-sizing: border-box;
+			overflow: hidden;
+
+			.history-top {
+				width: 100%;
+				height: 60rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: $font-size-toolbar;
+
+				.title {
+					font-weight: 500;
+					font-size: $font-size-toolbar;
+				}
+
+				.iconfont {
+					color: $color-tip;
+					font-size: $font-size-base;
+				}
+			}
+
+			.history-bottom {
+				width: 100%;
+				padding-top: $padding;
+				position: relative;
+
+				.history-li {
+					display: inline-block;
+					margin-right: 20rpx;
+					margin-bottom: 15rpx;
+					max-width: 100%;
+
+					view {
+						line-height: 66rpx;
+						background: #f8f8f8 !important;
+						height: 66rpx;
+						color: #303133 !important;
+						margin: 0 0rpx 4rpx 0 !important;
+						padding: 0 $padding;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						border-radius: 20rpx;
+					}
+
+					&.history_more {
+						margin-right: 0;
+						position: absolute;
+						bottom: 0;
+						right: 0;
+					}
+				}
+			}
+		}
+
+		.hidden-show {
+			width: 100%;
+			height: 70rpx;
+			text-align: center;
+			line-height: 70rpx;
+		}
+	}
+
+	.search-alike {
+		width: 100%;
+		height: calc(100vh - 100rpx);
+
+		padding: 0 $padding;
+		box-sizing: border-box;
+
+		.alike-box {
+			width: 100%;
+			height: 100%;
+			background: #ffffff;
+			border-radius: $padding;
+			overflow: hidden;
+		}
+	}
 </style>

pages_tool/help/detail.vue

@@ -15,49 +15,51 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser.js';
-export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif
-	},
-	data() {
-		return {
-			id: 0,
-			detail: {},
-			content: ''
-		};
-	},
-	onLoad(options) {
-		this.id = options.id || 0;
-		// 小程序扫码进入
-		if (options.scene) {
-			var sceneParams = decodeURIComponent(options.scene);
-			this.id = sceneParams.split('-')[1];
-		}
-		if (this.id == 0) {
-			this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-		}
-	},
-	onShow() {
-		this.getData();
-	},
-	methods: {
-		getData() {
-			this.$api.sendRequest({
-				url: '/api/help/info',
-				data: {
-					id: this.id
-				},
-				success: res => {
-					if (res.code == 0) {
-						if (res.data) {
-							this.detail = res.data;
-							this.$langConfig.title(this.detail.title);
-							this.content = htmlParser(res.data.content);
-							this.setPublicShare();
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		data() {
+			return {
+				id: 0,
+				detail: {},
+				content: ''
+			};
+		},
+		onLoad(options) {
+			this.id = options.id || 0;
+			// 小程序扫码进入
+			if (options.scene) {
+				var sceneParams = decodeURIComponent(options.scene);
+				this.id = sceneParams.split('-')[1];
+			}
+			if (this.id == 0) {
+				this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+			}
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.$api.sendRequest({
+					url: '/api/help/info',
+					data: {
+						id: this.id
+					},
+					success: res => {
+						if (res.code == 0) {
+							if (res.data) {
+								this.detail = res.data;
+								this.$langConfig.title(this.detail.title);
+								this.content = htmlParser(res.data.content);
+								this.setPublicShare();
+							} else {
+								this.$util.showToast({
+									title: res.message
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
+								}, 2000);
+							}
 						} else {
 							this.$util.showToast({
 								title: res.message
@@ -66,81 +68,73 @@ export default {
 								this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
 							}, 2000);
 						}
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_tool/help/list', {}, 'redirectTo');
-						}, 2000);
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 					}
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
+				});
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/help/detail?id=' + this.id;
+				this.$util.setPublicShare({
+					title: this.detail.title,
+					desc: '',
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
+				});
+			}
 		},
-		// 设置公众号分享
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + '/pages_tool/help/detail?id=' + this.id;
-			this.$util.setPublicShare({
-				title: this.detail.title,
-				desc: '',
-				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
-			});
+		onShareAppMessage(res) {
+			var title = this.detail.title;
+			var path = '/pages_tool/help/detail?id=' + this.id;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = this.detail.title;
+			var query = 'id=' + this.id;
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
 		}
-	},
-	onShareAppMessage(res) {
-		var title = this.detail.title;
-		var path = '/pages_tool/help/detail?id=' + this.id;
-		return {
-			title: title,
-			path: path,
-			success: res => { },
-			fail: res => { }
-		};
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		var title = this.detail.title;
-		var query = 'id=' + this.id;
-		return {
-			title: title,
-			query: query,
-			imageUrl: ''
-		};
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.page {
-	width: 100%;
-	height: 100%;
-	padding: 30rpx;
-	box-sizing: border-box;
-	background: #ffffff;
-}
-
-.help-title {
-	font-size: $font-size-toolbar;
-	text-align: center;
-}
-
-.help-content {
-	margin-top: $margin-updown;
-	word-break: break-all;
-}
-
-.help-meta {
-	text-align: right;
-	margin-top: $margin-updown;
-	color: $color-tip;
-
-	.help-time {
-		font-size: $font-size-tag;
+	.page {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		background: #ffffff;
+	}
+
+	.help-title {
+		font-size: $font-size-toolbar;
+		text-align: center;
+	}
+
+	.help-content {
+		margin-top: $margin-updown;
+		word-break: break-all;
+	}
+
+	.help-meta {
+		text-align: right;
+		margin-top: $margin-updown;
+		color: $color-tip;
+
+		.help-time {
+			font-size: $font-size-tag;
+		}
 	}
-}
 </style>

pages_tool/help/list.vue

@@ -3,8 +3,7 @@
 		<block v-if="dataList.length">
 			<view class="help-item" v-for="(item, index) in dataList" :key="index">
 				<view :class="['item-title', item.child_list.length == 0 ? 'empty' : '']">{{ item.class_name }}</view>
-				<view class="item-content" v-for="(s_item, s_index) in item.child_list" :key="s_index"
-					@click="helpDetail(s_item)">{{ s_item.title }}</view>
+				<view class="item-content" v-for="(s_item, s_index) in item.child_list" :key="s_index" @click="helpDetail(s_item)">{{ s_item.title }}</view>
 			</view>
 		</block>
 		<block v-else><ns-empty text="暂无帮助信息" :isIndex="false"></ns-empty></block>
@@ -20,18 +19,12 @@
 
 <script>
 export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif
-	},
 	data() {
 		return {
 			dataList: []
 		};
 	},
-	onLoad() { },
+	onLoad() {},
 	onShow() {
 		this.setPublicShare();
 		this.getData();
@@ -92,8 +85,8 @@ export default {
 		return {
 			title: title,
 			path: path,
-			success: res => { },
-			fail: res => { }
+			success: res => {},
+			fail: res => {}
 		};
 	}
 };
@@ -119,7 +112,6 @@ export default {
 			font-size: 30rpx;
 			color: #000;
 			border-bottom: 2rpx solid #f1f1f1;
-
 			&.empty {
 				padding-bottom: 0;
 				border-bottom: none;

pages_tool/index/diy.vue

@@ -56,21 +56,15 @@
 </template>
 
 <script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 import diyJs from '@/common/js/diy.js';
 import microPageJs from './public/js/diy.js';
 
 export default {
 	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
-		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif			
+		uniPopup,
+		nsNavbar
 	},
 	mixins: [diyJs, microPageJs]
 };
@@ -85,17 +79,14 @@ export default {
 	background: none !important;
 }
 
-.choose-store>>>.goodslist-uni-popup-box {
-	width: 80%;
-}
-</style>
-
-<style lang="scss" scoped>
-	
 /deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
+.choose-store>>>.goodslist-uni-popup-box {
+	width: 80%;
+}
+
 /deep/ .placeholder {
 	height: 0;
 }
@@ -110,4 +101,4 @@ export default {
 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
-</style>
+</style>

pages_tool/login/find.vue

@@ -23,13 +23,25 @@
 			<!-- 输入手机号和验证码 -->
 			<block v-if="stepShow == 0">
 				<view class="form-input">
-					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="17"
-						v-model="formData.mobile" :placeholder="$lang('accountPlaceholder')" />
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="17"
+						v-model="formData.mobile"
+						:placeholder="$lang('accountPlaceholder')"
+					/>
 				</view>
 
 				<view class="form-input align-type">
-					<input class="uni-input info-content" placeholder-class="placeholder-class" type="number"
-						maxlength="4" :placeholder="$lang('captchaPlaceholder')" v-model="formData.captcha" />
+					<input
+						class="uni-input info-content"
+						placeholder-class="placeholder-class"
+						type="number"
+						maxlength="4"
+						:placeholder="$lang('captchaPlaceholder')"
+						v-model="formData.captcha"
+					/>
 					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 				</view>
 
@@ -44,13 +56,27 @@
 			<!-- 输入新密码 -->
 			<block v-if="stepShow == 2">
 				<view class="form-input">
-					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="30"
-						password="true" :placeholder="$lang('passwordPlaceholder')" v-model="formData.password" />
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="30"
+						password="true"
+						:placeholder="$lang('passwordPlaceholder')"
+						v-model="formData.password"
+					/>
 				</view>
 
 				<view class="form-input">
-					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="30"
-						password="true" :placeholder="$lang('rePasswordPlaceholder')" v-model="formData.rePassword" />
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="30"
+						password="true"
+						:placeholder="$lang('rePasswordPlaceholder')"
+						v-model="formData.rePassword"
+					/>
 				</view>
 
 				<button type="primary" class="find-btn" @click="save">{{ $lang('save') }}</button>
@@ -61,9 +87,10 @@
 
 <script>
 import validate from 'common/js/validate.js';
+import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 export default {
 	components: {
-		mypOne: () => import('@/components/myp-one/myp-one.vue'),
+		mypOne
 	},
 	data() {
 		return {
@@ -111,17 +138,17 @@ export default {
 		// 下一步
 		async nextStep() {
 			let step0Rule = [
-				{
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				},
-				{
-					name: 'captcha',
-					checkType: 'required',
-					errorMsg: this.$lang('captchaPlaceholder')
-				}
-			], //手机验证
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					},
+					{
+						name: 'captcha',
+						checkType: 'required',
+						errorMsg: this.$lang('captchaPlaceholder')
+					}
+				], //手机验证
 				step0CheckRes;
 
 			step0CheckRes = validate.check(this.formData, step0Rule);

pages_tool/login/login.vue

@@ -1,8 +1,7 @@
 <template>
 	<view :style="themeColor">
 		<scroll-view scroll-y="false" class="container">
-			<view class="header-wrap"
-				:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
+			<view class="header-wrap" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
 				<view class="t-b">
 					<div v-html="$lang('welcomeText')"></div>
 				</view>
@@ -67,12 +66,9 @@
 
 <script>
 import validate from 'common/js/validate.js';
+import registerReward from '@/components/register-reward/register-reward.vue';
 
 export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		registerReward: () => import('@/components/register-reward/register-reward.vue'),
-	},
 	data() {
 		return {
 			isAgree: false,

pages_tool/member/account.vue

@@ -0,0 +1,465 @@
+<template>
+	<view :style="themeColor">
+		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
+			<block slot="list">
+				<view class="nc-info-list-content">
+					<view class="list-item balance-item" @click="setBalanceDefault()" v-if="type=='fenxiao' && payList && payList.balance">
+						<view class="item-top">
+							<view class="item-left">
+								<view class="title-text">提现到余额</view>
+							</view>
+						</view>
+					</view>
+					<block v-if="dataList.length > 0">
+						<view class="list-item" v-for="(item, index) in dataList" :key="index">
+							<view class="item-top">
+								<view class="item-left">
+									<view class="title-text">{{ item.withdraw_type_name }}</view>
+									<view class="info-content">
+										<text class="top-title">{{ item.realname }}</text>
+										<text class="top-num">{{ item.mobile }}</text>
+									</view>
+									<view class="content-bottom">
+										<block v-if="item.withdraw_type == 'alipay'">
+											提现账号：{{ item.bank_account }}
+										</block>
+										<block v-if="item.withdraw_type == 'bank'">
+											银行名称 ：{{ item.branch_bank_name }}
+										</block>
+									</view>
+								</view>
+								<view class="item-btn" @click.stop="editAccount('edit', item.id)">修改</view>
+							</view>
+
+							<view class="item-bottom">
+								<view class="account-default" @click="setDefault(item.id,item.is_default)">
+									<text class="default">设为默认账户</text>
+									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)" :color="themeStyle.main_color" />
+									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
+								</view>
+								<view class="account-btn">
+									<text class="delete" v-if="item.is_default != 1" @click="deleteAccount(item.id)">
+										<text class="iconfont iconicon7"></text>
+									</text>
+								</view>
+							</view>
+						</view>
+					</block>
+				</view>
+				<view v-if="dataList.length <= 0 && (type != 'fenxiao'  || (type == 'fenxiao' && payList && !payList.balance))" class="empty-box">
+					<image :src="$util.img('public/uniapp/member/account/empty.png')" mode="widthFix"></image>
+					<view class="tips">暂无账户信息，请添加</view>
+					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+				</view>
+			</block>
+		</mescroll-uni>
+		<view class="btn-add" v-if="dataList.length > 0 || (type == 'fenxiao' && payList && payList.balance)">
+			<button class="add-account" type="primary" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif
+
+	export default {
+		components: {
+			MescrollUni,
+			nsLogin,
+			loadingCover,
+			nsEmpty,
+			// #ifdef MP-WEIXIN
+			privacyPopup
+			// #endif
+		},
+		data() {
+			return {
+				dataList: [], //账号列表
+				back: '', // 返回页
+				redirect: 'redirectTo', // 跳转方式
+				type: 'member',
+				payList: null
+			};
+		},
+		onLoad(option) {
+			if (option.back) this.back = option.back;
+			if (option.type) this.type = option.type;
+			if (option.redirect) this.redirect = option.redirect;
+		},
+		onShow() {
+			if (this.storeToken) {
+				this.getTransferType();
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/account');
+				});
+			}
+		},
+		methods: {
+			// 编辑提现账户信息
+			editAccount(type, id) {
+				let data = {};
+				data.type = this.type;
+				if (type == 'edit') data.id = id;
+				if (this.back) data.back = this.back;
+				this.$util.redirectTo('/pages_tool/member/account_edit', data);
+			},
+			deleteAccount(id) {
+				uni.showModal({
+					title: '操作提示',
+					content: '确定要删除该账户吗？',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/api/memberbankaccount/delete',
+								data: {
+									id: id
+								},
+								success: result => {
+									if (result.code == 0) {
+										this.$util.showToast({
+											title: '删除成功'
+										});
+										this.$refs.mescroll.refresh();
+									} else {
+										this.$util.showToast({
+											title: '删除失败'
+										});
+									}
+								}
+							});
+						}
+					}
+				});
+			},
+			setDefault(id, is_default) {
+				if (is_default == 1) return;
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/setdefault',
+					data: {
+						id
+					},
+					success: res => {
+						if (res.data >= 0) {
+							if (this.back != '') {
+								this.$util.redirectTo(this.back, {}, this.redirect);
+							} else {
+								if (this.$refs.loadingCover) this.$refs.loadingCover.show();
+								this.dataList = [];
+								this.$refs.mescroll.refresh();
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			setBalanceDefault() {
+				this.$util.redirectTo(this.back, {
+					'is_balance': 1
+				}, this.redirect);
+			},
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+
+						let withdrawType = {
+							bank: '银行',
+							alipay: '支付宝',
+							wechatpay: '微信'
+						};
+
+						this.dataList.forEach(item => {
+							item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
+								item.withdraw_type] : '';
+						});
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			getTransferType() {
+				let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
+				"/fenxiao/api/withdraw/transferType";
+				this.$api.sendRequest({
+					url: url,
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.payList = res.data;
+						}
+					}
+				});
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.empty-box {
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		image {
+			width: 50%;
+		}
+
+		.tips {
+			color: #999999;
+			font-size: 26rpx;
+		}
+
+		.get-account,
+		.add-account {
+			width: 50%;
+			height: 78rpx;
+			line-height: 78rpx;
+			border-radius: 78rpx;
+			margin-top: 50rpx;
+			font-weight: 600;
+		}
+
+		.get-account {
+			width: 50%;
+			background: #fff;
+			color: $base-color;
+			border: 2rpx solid $base-color;
+			margin-top: 20rpx;
+			box-sizing: border-box;
+		}
+	}
+
+	.mescroll-downwarp+.empty-box {
+		height: calc(100vh - 260rpx);
+	}
+
+
+	.btn-add {
+		margin-top: 60rpx;
+		bottom: 0;
+		width: 100%;
+		background: #fff;
+		position: fixed;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		z-index: 10;
+
+		.add-account {
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: 80rpx;
+			margin: 30rpx 0 30rpx;
+			font-size: $font-size-toolbar;
+
+			text {
+				margin-right: 10rpx;
+				font-size: $font-size-base;
+			}
+		}
+	}
+
+	.zw {
+		margin-top: 250rpx;
+	}
+
+	.list-item {
+		margin: 0 0;
+		padding: 24rpx $margin-both;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		margin-bottom: 18rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		position: relative;
+
+		&.balance-item {
+			.item-top {
+				border: none;
+				padding: 0;
+			}
+		}
+
+		&:first-child {
+			margin-top: 18rpx;
+		}
+
+		.item-mr {
+			font-size: $font-size-activity-tag;
+			color: #fff;
+			height: 150rpx;
+			width: 150rpx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			position: absolute;
+			right: -90rpx;
+			top: -90rpx;
+			transform: rotate(45deg);
+		}
+
+		.item-top {
+			border-bottom: 2rpx solid $color-line;
+			padding-bottom: 26rpx;
+			display: flex;
+			flex-direction: row;
+
+			.item-left {
+				display: flex;
+				flex-direction: column;
+				width: calc(100% - 100rpx);
+
+				.title-text {
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+
+				.info-content {
+					display: flex;
+
+					.top-title {
+						font-size: 26rpx;
+						margin-right: 15rpx;
+					}
+
+					.top-num {
+						font-size: 26rpx;
+					}
+				}
+
+				.content-bottom {
+					font-size: 26rpx;
+					height: 50rpx;
+				}
+			}
+
+			.item-btn {
+				width: 100rpx;
+				display: flex;
+				align-items: center;
+				color: #999;
+				font-size: 24rpx;
+				justify-content: flex-end;
+			}
+
+		}
+
+		.item-bottom {
+			display: flex;
+			justify-content: space-between;
+			padding-top: 24rpx;
+
+			.account-default {
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				line-height: 1;
+				color: #666666;
+
+				.default {}
+
+				.iconfont {
+					line-height: 1;
+				}
+			}
+
+			.account-btn {
+				font-size: $font-size-base;
+				line-height: 1;
+				display: flex;
+				align-items: center;
+
+				.edit {
+					text {
+						vertical-align: center;
+						margin-right: 10rpx;
+						font-size: 30rpx;
+					}
+				}
+
+				.delete {
+					background: #F1F1F1;
+					justify-content: center;
+					align-items: center;
+					border-radius: 50%;
+					padding: 10rpx;
+					text-align: center;
+					width: 48rpx;
+					height: 48rpx;
+					box-sizing: border-box;
+
+					text {
+						font-size: 26rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
+<style lang="scss">
+	/deep/ .mescroll-upwarp {
+		padding-bottom: 150rpx;
+	}
+</style>
+<style>
+	.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
+		height: 48rpx !important;
+		width: 88rpx !important;
+	}
+
+	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
+		height: 44rpx !important;
+		width: 44rpx !important;
+	}
+
+	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
+		background-color: #EDEDED !important;
+		height: 44rpx !important;
+		width: 90rpx !important;
+	}
+</style>

pages_tool/member/account_edit.vue

@@ -2,8 +2,7 @@
 	<view class="account-list-content" :style="themeColor">
 		<view class="edit-item">
 			<text class="tit">{{ $lang('name') }}</text>
-			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name"
-				v-model="formData.realname" />
+			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入真实姓名" name="name" v-model="formData.realname" />
 		</view>
 		<view class="edit-item">
 			<text class="tit">{{ $lang('mobilePhone') }}</text>
@@ -18,13 +17,11 @@
 		</view>
 		<view class="edit-item" v-if="formData.withdraw_type == 'bank'">
 			<text class="tit">银行名称</text>
-			<input class="desc uni-input" type="text" maxlength="50" placeholder="请输入银行名称"
-				v-model.trim="formData.branch_bank_name" />
+			<input class="desc uni-input" type="text" maxlength="50" placeholder="请输入银行名称" v-model.trim="formData.branch_bank_name" />
 		</view>
 		<view class="edit-item" v-if="formData.withdraw_type != 'wechatpay'">
 			<text class="tit">提现账号</text>
-			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号"
-				v-model.trim="formData.bank_account" />
+			<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号" v-model.trim="formData.bank_account" />
 		</view>
 		<view class="btn">
 			<button type="primary" class="add" @click="saveAccount">{{ $lang('save') }}</button>
@@ -36,9 +33,6 @@
 <script>
 import validate from 'common/js/validate.js';
 export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
 	data() {
 		return {
 			formData: {
@@ -300,7 +294,7 @@ export default {
 	}
 }
 
-.account-list-content>.edit-item+.edit-item {
+.account-list-content > .edit-item + .edit-item {
 	border-top: 2rpx solid $color-line;
 }
 

pages_tool/member/address.vue

@@ -97,16 +97,26 @@
 </template>
 
 <script>
-import { Weixin } from 'common/js/wx-jssdk.js';
+import {
+	Weixin
+} from 'common/js/wx-jssdk.js';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 
 export default {
 	components: {
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		MescrollUni,
+		nsLogin,
+		loadingCover,
+		nsEmpty,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		privacyPopup
 		// #endif
 	},
 	data() {

pages_tool/member/address/address_edit.vue

@@ -1,496 +0,0 @@
-<template>
-    <view class="address-edit-content" :style="themeColor">
-        <view class="edit-wrap">
-            <view class="tip">地址信息</view>
-            <view class="edit-item">
-                <text class="tit">
-                    {{ $lang('consignee') }}
-                    <text>*</text>
-                </text>
-                <input class="uni-input" type="text" placeholder-class="placeholder-class"
-                    :placeholder="$lang('consigneePlaceholder')" maxlength="30" name="name" v-model="formData.name" />
-            </view>
-            <view class="edit-item">
-                <text class="tit">
-                    {{ $lang('mobile') }}
-                    <text>*</text>
-                </text>
-                <input class="uni-input" type="number" placeholder-class="placeholder-class"
-                    :placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" />
-            </view>
-            <view class="edit-item">
-                <text class="tit">{{ $lang('telephone') }}</text>
-                <input class="uni-input" type="text" placeholder-class="placeholder-class"
-                    :placeholder="$lang('telephonePlaceholder')" maxlength="20" v-model="formData.telephone" />
-            </view>
-            <!--  外卖地址区分 -->
-            <block v-if="localType == 2">
-                <view class="edit-item">
-                    <text class="tit">
-                        {{ $lang('receivingCity') }}
-                        <text>*</text>
-                    </text>
-                    <view class="text_inp"
-                        :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }"
-                        @click="selectAddress">
-                        {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
-                    </view>
-
-                    <text @click="selectAddress" class="padding-left iconfont icon-location"></text>
-                </view>
-            </block>
-            <block v-else>
-                <view class="edit-item">
-                    <text class="tit">
-                        {{ $lang('receivingCity') }}
-                        <text>*</text>
-                    </text>
-                    <pick-regions :default-regions="defaultRegions" @getRegions="handleGetRegions">
-                        <text class="select-address "
-                            :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }">
-                            {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
-                        </text>
-                    </pick-regions>
-                </view>
-            </block>
-
-            <view class="edit-item">
-                <text class="tit" style="">
-                    {{ $lang('address') }}
-                    <text>*</text>
-                </text>
-                <input class="uni-input" type="text" placeholder-class="placeholder-class"
-                    :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" />
-                <!-- <textarea class="uni-input  " type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" ></textarea> -->
-            </view>
-        </view>
-        <view class="btn">
-            <button type="primary" class="add" @click="saveAddress">{{ $lang('save') }}</button>
-        </view>
-
-        <loading-cover ref="loadingCover"></loading-cover>
-    </view>
-</template>
-
-<script>
-
-import validate from 'common/js/validate.js';
-import Config from '@/common/js/config.js';
-
-export default {
-    components: {
-        pickRegions: () => import('@/components/pick-regions/pick-regions.vue'),
-        loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-    },
-    data() {
-        return {
-            formData: {
-                id: 0,
-                name: '',
-                mobile: '',
-                telephone: '',
-                province_id: '',
-                city_id: '',
-                district_id: '',
-                community_id: '',
-                address: '',
-                full_address: '',
-                latitude: 0,
-                longitude: 0,
-                is_default: 1
-            },
-            address: '',
-            addressValue: '',
-            back: '', // 返回页
-            redirect: 'redirectTo', // 跳转方式
-            flag: false, //防重复标识
-            defaultRegions: [],
-            localType: 1
-        };
-    },
-    onLoad(option) {
-        if (option.back) this.back = option.back;
-        if (option.redirect) this.redirect = option.redirect;
-        if (option.type) this.localType = option.type;
-        if (option.id && !option.name) {
-            this.formData.id = option.id;
-            this.getAddressDetail();
-        } else if (option.name) {
-            if (uni.getStorageSync('addressInfo')) this.formData = uni.getStorageSync('addressInfo');
-            this.formData.address = option.name;
-            this.localType = 2;
-            this.getAddress(option.latng);
-            //给formData复制
-            var tempArr = this.getQueryVariable('latng').split(',');
-            this.formData.latitude = tempArr[0];
-            this.formData.longitude = tempArr[1];
-        } else {
-            if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-        }
-    },
-    onBackPress() {
-        uni.setStorageSync('addressInfo', '');
-    },
-    onShow() {
-        if (this.formData.id) {
-            uni.setNavigationBarTitle({
-                title: '编辑收货地址'
-            });
-        } else {
-            uni.setNavigationBarTitle({
-                title: '新增收货地址'
-            });
-        }
-    },
-    onReady() {
-        this.$refs.loadingCover.hide();
-    },
-    onHide() {
-        this.flag = false;
-    },
-    methods: {
-        // 获取地址信息
-        getAddressDetail() {
-            this.$api.sendRequest({
-                url: '/api/memberaddress/info',
-                data: {
-                    id: this.formData.id
-                },
-                success: res => {
-                    let data = res.data;
-                    if (data != null) {
-                        this.formData.name = data.name;
-                        this.formData.mobile = data.mobile;
-                        this.formData.telephone = data.telephone;
-                        this.formData.address = data.address;
-                        this.formData.full_address = data.full_address;
-                        this.formData.latitude = data.latitude;
-                        this.formData.longitude = data.longitude;
-                        this.formData.is_default = data.is_default;
-                        this.localType = data.type;
-                        this.defaultRegions = [data.province_id, data.city_id, data.district_id];
-                    }
-                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                },
-                fail: res => {
-                    if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-                }
-            });
-        },
-        //获取详细地址
-        getAddress(value) {
-            this.$api.sendRequest({
-                url: '/api/memberaddress/tranAddressInfo',
-                data: {
-                    latlng: value
-                },
-                success: res => {
-                    if (res.code == 0) {
-                        this.formData.full_address = '';
-                        this.formData.full_address += res.data.province != undefined ? res.data.province : '';
-                        this.formData.full_address += res.data.city != undefined ? '-' + res.data.city : '';
-                        this.formData.full_address += res.data.district != undefined ? '-' + res.data.district : '';
-                        this.addressValue = '';
-                        this.addressValue += res.data.province_id != undefined ? res.data.province_id : '';
-                        this.addressValue += res.data.city_id != undefined ? '-' + res.data.city_id : '';
-                        this.addressValue += res.data.district_id != undefined ? '-' + res.data.district_id : '';
-                    } else {
-                        this.showToast({
-                            title: '数据有误'
-                        });
-                    }
-                }
-            });
-        },
-        // 获取选择的地区
-        handleGetRegions(regions) {
-            this.formData.full_address = '';
-            this.formData.full_address += regions[0] != undefined ? regions[0].label : '';
-            this.formData.full_address += regions[1] != undefined ? '-' + regions[1].label : '';
-            this.formData.full_address += regions[2] != undefined ? '-' + regions[2].label : '';
-            this.addressValue = '';
-            this.addressValue += regions[0] != undefined ? regions[0].value : '';
-            this.addressValue += regions[1] != undefined ? '-' + regions[1].value : '';
-            this.addressValue += regions[2] != undefined ? '-' + regions[2].value : '';
-        },
-
-        selectAddress() {
-            // #ifdef MP
-            /* uni.chooseLocation({
-                 success: res => {
-                     this.formData.latitude = res.latitude;
-                     this.formData.longitude = res.longitude;
-                     this.formData.address = res.name;
-                     this.getAddress(res.latitude + ',' + res.longitude);
-                 },
-                 fail(res) {
-                     uni.getSetting({
-                         success: function(res) {
-                             var statu = res.authSetting;
-                             if (!statu['scope.userLocation']) {
-                                 uni.showModal({
-                                     title: '是否授权当前位置',
-                                     content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
-                                     success(tip) {
-                                         if (tip.confirm) {
-                                             uni.openSetting({
-                                                 success: function (data) {
-                                                     if (data.authSetting['scope.userLocation'] === true) {
-                                                         this.$util.showToast({
-                                                             title: '授权成功'
-                                                         });
-                                                         //授权成功之后，再调用chooseLocation选择地方
-                                                         setTimeout(function () {
-                                                             uni.chooseLocation({
-                                                                 success: data => {
-                                                                     this.formData.latitude = res.latitude;
-                                                                     this.formData.longitude = res.longitude;
-                                                                     this.formData.address = res.name;
-                                                                     this.getAddress(res.latitude + ',' + res.longitude);
-                                                                 }
-                                                             });
-                                                         }, 1000);
-                                                     }
-                                                 }
-                                             });
-                                         } else {
-                                             this.$util.showToast({
-                                                 title: '授权失败'
-                                             });
-                                         }
-                                     }
-                                 });
-                             }
-                         }
-                     });
-                 }
-             });*/
-            // #endif
-            // #ifdef H5
-            var urlencode = this.formData;
-            uni.setStorageSync('addressInfo', urlencode);
-            let backurl = Config.h5Domain + '/pages_tool/member/address_edit?type=' + this.localType;
-            if (this.formData.id) backurl += '&id=' + this.formData.id;
-            if (this.back) backurl += '&back=' + this.back;
-
-            window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
-            // #endif
-        },
-
-        getQueryVariable(variable) {
-            var query = window.location.search.substring(1);
-            var vars = query.split('&');
-            for (var i = 0; i < vars.length; i++) {
-                var pair = vars[i].split('=');
-                if (pair[0] == variable) {
-                    return pair[1];
-                }
-            }
-            return false;
-        },
-        vertify() {
-            this.formData.name = this.formData.name.trim();
-            this.formData.mobile = this.formData.mobile.trim();
-            this.formData.address = this.formData.address.trim();
-            var rule = [{
-                name: 'name',
-                checkType: 'required',
-                errorMsg: '请输入姓名'
-            },
-            {
-                name: 'mobile',
-                checkType: 'required',
-                errorMsg: '请输入手机号'
-            },
-            {
-                name: 'mobile',
-                checkType: 'phoneno',
-                errorMsg: '请输入正确的手机号'
-            },
-            {
-                name: 'full_address',
-                checkType: 'required',
-                errorMsg: '请选择省市区县'
-            },
-            {
-                name: 'address',
-                checkType: 'required',
-                errorMsg: '详细地址不能为空'
-            }
-            ];
-            var checkRes = validate.check(this.formData, rule);
-            if (checkRes) {
-                return true;
-            } else {
-                this.$util.showToast({
-                    title: validate.error
-                });
-                this.flag = false;
-                return false;
-            }
-        },
-        saveAddress() {
-            if (this.flag) return;
-            this.flag = true;
-            if (this.vertify()) {
-                let addressValueArr = this.addressValue.split('-'),
-                    data = {},
-                    url = '';
-
-                data = {
-                    name: this.formData.name,
-                    mobile: this.formData.mobile,
-                    telephone: this.formData.telephone,
-                    province_id: addressValueArr[0],
-                    city_id: addressValueArr[1],
-                    district_id: addressValueArr[2] ? addressValueArr[2] : '',
-                    community_id: 0,
-                    address: this.formData.address,
-                    full_address: this.formData.full_address,
-                    latitude: this.formData.latitude,
-                    longitude: this.formData.longitude,
-                    is_default: this.formData.is_default,
-                    type: this.localType
-                };
-
-                url = 'add';
-                if (this.formData.id) {
-                    url = 'edit';
-                    data.id = this.formData.id;
-                    if (this.back != '') data.is_default = 1;
-                }
-                this.$api.sendRequest({
-                    url: '/api/memberaddress/' + url,
-                    data: data,
-                    success: res => {
-                        this.flag = false;
-
-                        if (res.code == 0) {
-                            if (this.back != '') {
-                                this.$util.redirectTo(this.back, {}, 'redirectTo');
-                            } else {
-                                this.$util.showToast({
-                                    title: res.message
-                                });
-                                uni.navigateBack({
-                                    delta: 1
-                                });
-                            }
-                            uni.removeStorageSync('addressInfo');
-                        } else {
-                            this.$util.showToast({
-                                title: res.message
-                            });
-                        }
-                    },
-                    fail: res => {
-                        this.flag = false;
-                    }
-                });
-            }
-        }
-    }
-};
-</script>
-
-<style lang="scss">
-/deep/ pick-regions,
-.pick-regions {
-    flex: 1;
-}
-
-.edit-wrap {
-    background: #fff;
-    overflow: hidden;
-
-    .tip {
-        padding: 20rpx 30rpx 10rpx;
-        background-color: #f8f8f8;
-        color: $color-tip;
-    }
-}
-
-.edit-item {
-    display: flex;
-    align-items: center;
-    margin: 0 30rpx;
-    min-height: 100rpx;
-    background-color: #fff;
-
-    .text_inp {
-        margin-left: $margin-updown;
-        flex: 1;
-    }
-
-    .tit {
-        width: 148rpx;
-
-        text {
-            margin-left: 10rpx;
-            color: #ff4544;
-        }
-
-        &.margin_tit {
-            align-self: flex-start;
-            margin-top: 24rpx;
-        }
-    }
-
-    .icon-location {
-        color: #606266;
-        align-self: flex-start;
-        margin-top: 20rpx;
-    }
-
-    .select-address {
-        display: block;
-        margin-left: 10rpx;
-
-        &.empty {
-            color: #808080;
-        }
-    }
-
-    textarea,
-    input {
-        flex: 1;
-        font-size: $font-size-base;
-        margin-left: 20rpx;
-        padding: 0;
-    }
-
-    textarea {
-        margin-top: 6rpx;
-        height: 100rpx;
-        padding-bottom: 20rpx;
-        padding-top: 20rpx;
-        line-height: 50rpx;
-    }
-}
-
-.edit-wrap>.edit-item+.edit-item {
-    border-top: 2rpx solid #ebedf0;
-}
-
-.add {
-    margin-top: 60rpx;
-    height: 80rpx;
-    line-height: 80rpx !important;
-    border-radius: 80rpx;
-    font-weight: 500;
-    width: calc(100% - 60rpx);
-    margin-left: 30rpx;
-    font-size: 32rpx;
-}
-
-.btn {
-    position: fixed;
-    width: 100%;
-    bottom: 30rpx;
-    height: auto;
-    padding-bottom: constant(safe-area-inset-bottom);
-    /*兼容 IOS<11.2*/
-    padding-bottom: env(safe-area-inset-bottom);
-    /*兼容 IOS>11.2*/
-}
-</style>

pages_tool/member/address_edit.vue

@@ -0,0 +1,501 @@
+<template>
+    <view class="address-edit-content" :style="themeColor">
+        <view class="edit-wrap">
+            <view class="tip">地址信息</view>
+            <view class="edit-item">
+                <text class="tit">
+                    {{ $lang('consignee') }}
+                    <text>*</text>
+                </text>
+                <input
+                    class="uni-input"
+                    type="text"
+                    placeholder-class="placeholder-class"
+                    :placeholder="$lang('consigneePlaceholder')"
+                    maxlength="30"
+                    name="name"
+                    v-model="formData.name" />
+            </view>
+            <view class="edit-item">
+                <text class="tit">
+                    {{ $lang('mobile') }}
+                    <text>*</text>
+                </text>
+                <input class="uni-input" type="number" placeholder-class="placeholder-class" :placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" />
+            </view>
+            <view class="edit-item">
+                <text class="tit">{{ $lang('telephone') }}</text>
+                <input
+                    class="uni-input"
+                    type="text"
+                    placeholder-class="placeholder-class"
+                    :placeholder="$lang('telephonePlaceholder')"
+                    maxlength="20"
+                    v-model="formData.telephone" />
+            </view>
+            <!--  外卖地址区分 -->
+            <block v-if="localType == 2">
+                <view class="edit-item">
+                    <text class="tit">
+                        {{ $lang('receivingCity') }}
+                        <text>*</text>
+                    </text>
+                    <view class="text_inp" :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }" @click="selectAddress">
+                        {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
+                    </view>
+
+                    <text @click="selectAddress" class="padding-left iconfont icon-location"></text>
+                </view>
+            </block>
+            <block v-else>
+                <view class="edit-item">
+                    <text class="tit">
+                        {{ $lang('receivingCity') }}
+                        <text>*</text>
+                    </text>
+                    <pick-regions :default-regions="defaultRegions" @getRegions="handleGetRegions">
+                        <text class="select-address " :class="{ empty: !formData.full_address, 'color-tip': !formData.full_address }">
+                            {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
+                        </text>
+                    </pick-regions>
+                </view>
+            </block>
+
+            <view class="edit-item">
+                <text class="tit" style="">
+                    {{ $lang('address') }}
+                    <text>*</text>
+                </text>
+                <input class="uni-input" type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" />
+                <!-- <textarea class="uni-input  " type="text" placeholder-class="placeholder-class" :placeholder="$lang('addressPlaceholder')" maxlength="50" v-model="formData.address" ></textarea> -->
+            </view>
+        </view>
+        <view class="btn">
+            <button type="primary" class="add" @click="saveAddress">{{ $lang('save') }}</button>
+        </view>
+
+        <loading-cover ref="loadingCover"></loading-cover>
+    </view>
+</template>
+
+<script>
+    import pickRegions from '@/components/pick-regions/pick-regions.vue';
+    import validate from 'common/js/validate.js';
+    import Config from '@/common/js/config.js';
+
+    export default {
+        components: {
+            pickRegions
+        },
+        data() {
+            return {
+                formData: {
+                    id: 0,
+                    name: '',
+                    mobile: '',
+                    telephone: '',
+                    province_id: '',
+                    city_id: '',
+                    district_id: '',
+                    community_id: '',
+                    address: '',
+                    full_address: '',
+                    latitude: 0,
+                    longitude: 0,
+                    is_default: 1
+                },
+                address: '',
+                addressValue: '',
+                back: '', // 返回页
+                redirect: 'redirectTo', // 跳转方式
+                flag: false, //防重复标识
+                defaultRegions: [],
+                localType: 1
+            };
+        },
+        onLoad(option) {
+            if (option.back) this.back = option.back;
+            if (option.redirect) this.redirect = option.redirect;
+            if (option.type) this.localType = option.type;
+            if (option.id && !option.name) {
+                this.formData.id = option.id;
+                this.getAddressDetail();
+            } else if (option.name) {
+                if (uni.getStorageSync('addressInfo')) this.formData = uni.getStorageSync('addressInfo');
+                this.formData.address = option.name;
+                this.localType = 2;
+                this.getAddress(option.latng);
+                //给formData复制
+                var tempArr = this.getQueryVariable('latng').split(',');
+                this.formData.latitude = tempArr[0];
+                this.formData.longitude = tempArr[1];
+            } else {
+                if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+            }
+        },
+        onBackPress() {
+            uni.setStorageSync('addressInfo', '');
+        },
+        onShow() {
+            if (this.formData.id) {
+                uni.setNavigationBarTitle({
+                    title: '编辑收货地址'
+                });
+            } else {
+                uni.setNavigationBarTitle({
+                    title: '新增收货地址'
+                });
+            }
+        },
+        onReady() {
+            this.$refs.loadingCover.hide();
+        },
+        onHide() {
+            this.flag = false;
+        },
+        methods: {
+            // 获取地址信息
+            getAddressDetail() {
+                this.$api.sendRequest({
+                    url: '/api/memberaddress/info',
+                    data: {
+                        id: this.formData.id
+                    },
+                    success: res => {
+                        let data = res.data;
+                        if (data != null) {
+                            this.formData.name = data.name;
+                            this.formData.mobile = data.mobile;
+                            this.formData.telephone = data.telephone;
+                            this.formData.address = data.address;
+                            this.formData.full_address = data.full_address;
+                            this.formData.latitude = data.latitude;
+                            this.formData.longitude = data.longitude;
+                            this.formData.is_default = data.is_default;
+                            this.localType = data.type;
+                            this.defaultRegions = [data.province_id, data.city_id, data.district_id];
+                        }
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                    },
+                    fail: res => {
+                        if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+                    }
+                });
+            },
+            //获取详细地址
+            getAddress(value) {
+                this.$api.sendRequest({
+                    url: '/api/memberaddress/tranAddressInfo',
+                    data: {
+                        latlng: value
+                    },
+                    success: res => {
+                        if (res.code == 0) {
+                            this.formData.full_address = '';
+                            this.formData.full_address += res.data.province != undefined ? res.data.province : '';
+                            this.formData.full_address += res.data.city != undefined ? '-' + res.data.city : '';
+                            this.formData.full_address += res.data.district != undefined ? '-' + res.data.district : '';
+                            this.addressValue = '';
+                            this.addressValue += res.data.province_id != undefined ? res.data.province_id : '';
+                            this.addressValue += res.data.city_id != undefined ? '-' + res.data.city_id : '';
+                            this.addressValue += res.data.district_id != undefined ? '-' + res.data.district_id : '';
+                        } else {
+                            this.showToast({
+                                title: '数据有误'
+                            });
+                        }
+                    }
+                });
+            },
+            // 获取选择的地区
+            handleGetRegions(regions) {
+                this.formData.full_address = '';
+                this.formData.full_address += regions[0] != undefined ? regions[0].label : '';
+                this.formData.full_address += regions[1] != undefined ? '-' + regions[1].label : '';
+                this.formData.full_address += regions[2] != undefined ? '-' + regions[2].label : '';
+                this.addressValue = '';
+                this.addressValue += regions[0] != undefined ? regions[0].value : '';
+                this.addressValue += regions[1] != undefined ? '-' + regions[1].value : '';
+                this.addressValue += regions[2] != undefined ? '-' + regions[2].value : '';
+            },
+
+            selectAddress() {
+                // #ifdef MP
+               /* uni.chooseLocation({
+                    success: res => {
+                        this.formData.latitude = res.latitude;
+                        this.formData.longitude = res.longitude;
+                        this.formData.address = res.name;
+                        this.getAddress(res.latitude + ',' + res.longitude);
+                    },
+                    fail(res) {
+                        uni.getSetting({
+                            success: function(res) {
+                                var statu = res.authSetting;
+                                if (!statu['scope.userLocation']) {
+                                    uni.showModal({
+                                        title: '是否授权当前位置',
+                                        content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+                                        success(tip) {
+                                            if (tip.confirm) {
+                                                uni.openSetting({
+                                                    success: function (data) {
+                                                        if (data.authSetting['scope.userLocation'] === true) {
+                                                            this.$util.showToast({
+                                                                title: '授权成功'
+                                                            });
+                                                            //授权成功之后，再调用chooseLocation选择地方
+                                                            setTimeout(function () {
+                                                                uni.chooseLocation({
+                                                                    success: data => {
+                                                                        this.formData.latitude = res.latitude;
+                                                                        this.formData.longitude = res.longitude;
+                                                                        this.formData.address = res.name;
+                                                                        this.getAddress(res.latitude + ',' + res.longitude);
+                                                                    }
+                                                                });
+                                                            }, 1000);
+                                                        }
+                                                    }
+                                                });
+                                            } else {
+                                                this.$util.showToast({
+                                                    title: '授权失败'
+                                                });
+                                            }
+                                        }
+                                    });
+                                }
+                            }
+                        });
+                    }
+                });*/
+                // #endif
+                // #ifdef H5
+                var urlencode = this.formData;
+                uni.setStorageSync('addressInfo', urlencode);
+                let backurl = Config.h5Domain + '/pages_tool/member/address_edit?type=' + this.localType;
+                if (this.formData.id) backurl += '&id=' + this.formData.id;
+                if (this.back) backurl += '&back=' + this.back;
+
+                window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + Config.mpKey + '&referer=myapp';
+                // #endif
+            },
+
+            getQueryVariable(variable) {
+                var query = window.location.search.substring(1);
+                var vars = query.split('&');
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split('=');
+                    if (pair[0] == variable) {
+                        return pair[1];
+                    }
+                }
+                return false;
+            },
+            vertify() {
+                this.formData.name = this.formData.name.trim();
+                this.formData.mobile = this.formData.mobile.trim();
+                this.formData.address = this.formData.address.trim();
+                var rule = [{
+                        name: 'name',
+                        checkType: 'required',
+                        errorMsg: '请输入姓名'
+                    },
+                    {
+                        name: 'mobile',
+                        checkType: 'required',
+                        errorMsg: '请输入手机号'
+                    },
+                    {
+                        name: 'mobile',
+                        checkType: 'phoneno',
+                        errorMsg: '请输入正确的手机号'
+                    },
+                    {
+                        name: 'full_address',
+                        checkType: 'required',
+                        errorMsg: '请选择省市区县'
+                    },
+                    {
+                        name: 'address',
+                        checkType: 'required',
+                        errorMsg: '详细地址不能为空'
+                    }
+                ];
+                var checkRes = validate.check(this.formData, rule);
+                if (checkRes) {
+                    return true;
+                } else {
+                    this.$util.showToast({
+                        title: validate.error
+                    });
+                    this.flag = false;
+                    return false;
+                }
+            },
+            saveAddress() {
+                if (this.flag) return;
+                this.flag = true;
+                if (this.vertify()) {
+                    let addressValueArr = this.addressValue.split('-'),
+                        data = {},
+                        url = '';
+
+                    data = {
+                        name: this.formData.name,
+                        mobile: this.formData.mobile,
+                        telephone: this.formData.telephone,
+                        province_id: addressValueArr[0],
+                        city_id: addressValueArr[1],
+                        district_id: addressValueArr[2] ? addressValueArr[2] : '',
+                        community_id: 0,
+                        address: this.formData.address,
+                        full_address: this.formData.full_address,
+                        latitude: this.formData.latitude,
+                        longitude: this.formData.longitude,
+                        is_default: this.formData.is_default,
+                        type: this.localType
+                    };
+
+                    url = 'add';
+                    if (this.formData.id) {
+                        url = 'edit';
+                        data.id = this.formData.id;
+                        if (this.back != '') data.is_default = 1;
+                    }
+                    this.$api.sendRequest({
+                        url: '/api/memberaddress/' + url,
+                        data: data,
+                        success: res => {
+                            this.flag = false;
+
+                            if (res.code == 0) {
+                                if (this.back != '') {
+                                    this.$util.redirectTo(this.back, {}, 'redirectTo');
+                                } else {
+                                    this.$util.showToast({
+                                        title: res.message
+                                    });
+                                    uni.navigateBack({
+                                        delta: 1
+                                    });
+                                }
+                                uni.removeStorageSync('addressInfo');
+                            } else {
+                                this.$util.showToast({
+                                    title: res.message
+                                });
+                            }
+                        },
+                        fail: res => {
+                            this.flag = false;
+                        }
+                    });
+                }
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    /deep/ pick-regions,
+    .pick-regions {
+        flex: 1;
+    }
+
+    .edit-wrap {
+        background: #fff;
+        overflow: hidden;
+
+        .tip {
+            padding: 20rpx 30rpx 10rpx;
+            background-color: #f8f8f8;
+            color: $color-tip;
+        }
+    }
+
+    .edit-item {
+        display: flex;
+        align-items: center;
+        margin: 0 30rpx;
+        min-height: 100rpx;
+        background-color: #fff;
+
+        .text_inp {
+            margin-left: $margin-updown;
+            flex: 1;
+        }
+
+        .tit {
+            width: 148rpx;
+
+            text {
+                margin-left: 10rpx;
+                color: #ff4544;
+            }
+
+            &.margin_tit {
+                align-self: flex-start;
+                margin-top: 24rpx;
+            }
+        }
+
+        .icon-location {
+            color: #606266;
+            align-self: flex-start;
+            margin-top: 20rpx;
+        }
+
+        .select-address {
+            display: block;
+            margin-left: 10rpx;
+
+            &.empty {
+                color: #808080;
+            }
+        }
+
+        textarea,
+        input {
+            flex: 1;
+            font-size: $font-size-base;
+            margin-left: 20rpx;
+            padding: 0;
+        }
+
+        textarea {
+            margin-top: 6rpx;
+            height: 100rpx;
+            padding-bottom: 20rpx;
+            padding-top: 20rpx;
+            line-height: 50rpx;
+        }
+    }
+
+    .edit-wrap>.edit-item+.edit-item {
+        border-top: 2rpx solid #ebedf0;
+    }
+
+    .add {
+        margin-top: 60rpx;
+        height: 80rpx;
+        line-height: 80rpx !important;
+        border-radius: 80rpx;
+        font-weight: 500;
+        width: calc(100% - 60rpx);
+        margin-left: 30rpx;
+        font-size: 32rpx;
+    }
+
+    .btn {
+        position: fixed;
+        width: 100%;
+        bottom: 30rpx;
+        height: auto;
+        padding-bottom: constant(safe-area-inset-bottom);
+        /*兼容 IOS<11.2*/
+        padding-bottom: env(safe-area-inset-bottom);
+        /*兼容 IOS>11.2*/
+    }
+</style>

pages_tool/member/apply_withdrawal.vue

@@ -0,0 +1,425 @@
+<template>
+	<view class="container" :style="themeColor">
+		<view class="bank-account-wrap" @click="goAccount()">
+			<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type">
+				<text class="tx-to">提现到</text>
+				<view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">微信默认钱包</view>
+				<view class="tx-bank" v-else>{{ bankAccountInfo.bank_account }}</view>
+				<view class="tx-img" v-if="bankAccountInfo.withdraw_type == 'alipay'">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/alipay.png')" mode="widthFix"></image>
+				</view>
+				<view class="tx-img" v-else-if="bankAccountInfo.withdraw_type == 'bank'">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/bank.png')" mode="widthFix"></image>
+				</view>
+				<view class="tx-img" v-else-if="bankAccountInfo.withdraw_type == 'wechatpay'">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/wechatpay.png')" mode="widthFix">
+					</image>
+				</view>
+			</view>
+			<text class="tx-to" v-else>请添加提现方式</text>
+			<view class="iconfont icon-right"></view>
+		</view>
+		<view class="empty-box"></view>
+		<view class="withdraw-wrap">
+			<view class="withdraw-wrap-title">提现金额</view>
+			<view class="money-wrap">
+				<text class="unit">{{ $lang('common.currencySymbol') }}</text>
+				<input type="digit" class="withdraw-money" v-model="withdrawMoney" />
+				<view class="delete" @click="remove" v-if="withdrawMoney">
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/close.png')" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="bootom">
+				<view>
+					<text class="color-tip">可提现余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text>
+					<text class="all-tx color-base-text" @click="allTx">全部提现</text>
+				</view>
+			</view>
+			<view class="desc">
+				<text>最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawInfo.config.min | moneyFormat }}</text>
+				<text>，手续费为{{ withdrawInfo.config.rate + '%' }}</text>
+			</view>
+		</view>
+
+		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
+			提现
+		</view>
+
+		<view class="recoend" @click="toWithdrawal">
+			<view class="recoend-con">提现记录</view>
+		</view>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				withdrawInfo: {
+					config: {
+						is_use: 0,
+						min: 1,
+						rate: 0
+					},
+					member_info: {
+						balance_money: 0,
+						balance_withdraw: 0,
+						balance_withdraw_apply: 0
+					}
+				},
+				bankAccountInfo: {},
+				withdrawMoney: '',
+				isSub: false
+			};
+		},
+		onShow() {
+			if (this.storeToken) {
+				this.getWithdrawInfo();
+				this.getBankAccountInfo();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_tool/member/apply_withdrawal'
+				});
+			}
+		},
+		methods: {
+			toWithdrawal() {
+				this.$util.redirectTo('/pages_tool/member/withdrawal');
+			},
+			//全部提现
+			allTx() {
+				this.withdrawMoney = this.withdrawInfo.member_info.balance_money;
+			},
+			// 删除提现金额
+			remove() {
+				this.withdrawMoney = '';
+			},
+			/**
+			 * 获取提现信息
+			 */
+			getWithdrawInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberwithdraw/info',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.withdrawInfo = res.data;
+							if (this.withdrawInfo.config.is_use == 0) {
+								this.$util.showToast({
+									title: '未开启提现'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages/member/index');
+								}, 1500);
+							}
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			/**
+			 * 银行账号信息
+			 */
+			getBankAccountInfo() {
+				this.$api.sendRequest({
+					url: '/api/memberbankaccount/defaultinfo',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.bankAccountInfo = res.data;
+						}
+					}
+				});
+			},
+			verify() {
+				if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) {
+					this.$util.showToast({
+						title: '请输入提现金额'
+					});
+					return false;
+				}
+				if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
+					this.$util.showToast({
+						title: '提现金额超出可提现金额'
+					});
+					return false;
+				}
+				if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) {
+					this.$util.showToast({
+						title: '提现金额小于最低提现金额'
+					});
+					return false;
+				}
+				return true;
+			},
+			withdraw() {
+				if (!this.bankAccountInfo.withdraw_type) {
+					this.$util.showToast({
+						title: '请先添加提现方式'
+					});
+					return;
+				}
+				if (this.verify()) {
+					if (this.isSub) return;
+					this.isSub = true;
+
+					var applet_type = 0;
+					if (this.bankAccountInfo.withdraw_type == 'wechatpay') {
+						// #ifdef MP
+						applet_type = 1;
+						// #endif
+					}
+
+					// #ifdef MP
+					this.subscribeMessage(() => {
+						this.$api.sendRequest({
+							url: '/api/memberwithdraw/apply',
+							data: {
+								apply_money: this.withdrawMoney,
+								transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
+								realname: this.bankAccountInfo.realname,
+								mobile: this.bankAccountInfo.mobile,
+								bank_name: this.bankAccountInfo.branch_bank_name,
+								account_number: this.bankAccountInfo.bank_account,
+								applet_type: applet_type
+							},
+							success: res => {
+								if (res.code >= 0) {
+									this.$util.showToast({
+										title: '提现申请成功'
+									});
+									setTimeout(() => {
+										this.$util.redirectTo(
+											'/pages_tool/member/withdrawal', {},
+											'redirectTo');
+									}, 1500);
+								} else {
+									this.isSub = false;
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							},
+							fail: res => {
+								this.isSub = false;
+							}
+						});
+					});
+					// #endif
+
+					// #ifndef MP-WEIXIN
+					this.$api.sendRequest({
+						url: '/api/memberwithdraw/apply',
+						data: {
+							apply_money: this.withdrawMoney,
+							transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
+							realname: this.bankAccountInfo.realname,
+							mobile: this.bankAccountInfo.mobile,
+							bank_name: this.bankAccountInfo.branch_bank_name,
+							account_number: this.bankAccountInfo.bank_account,
+							applet_type: applet_type
+						},
+						success: res => {
+							if (res.code >= 0) {
+								this.$util.showToast({
+									title: '提现申请成功'
+								});
+								setTimeout(() => {
+									this.$util.redirectTo('/pages_tool/member/withdrawal', {},
+										'redirectTo');
+								}, 1500);
+							} else {
+								this.isSub = false;
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							this.isSub = false;
+						}
+					});
+					// #endif
+				}
+			},
+			goAccount() {
+				this.$util.redirectTo(
+					'/pages_tool/member/account', {
+						back: '/pages_tool/member/apply_withdrawal'
+					},
+					'redirectTo'
+				);
+			},
+			/**
+			 * 微信订阅消息
+			 */
+			subscribeMessage(callback) {
+				this.$api.sendRequest({
+					url: '/weapp/api/weapp/messagetmplids',
+					data: {
+						keywords: 'USER_WITHDRAWAL_SUCCESS'
+					},
+					success: res => {
+						if (res.code == 0 && res.data.length) {
+							uni.requestSubscribeMessage({
+								tmplIds: res.data,
+								fail: res => {
+									console.log('fail', res);
+								},
+								complete: () => {
+									callback();
+								}
+							});
+						} else {
+							callback();
+						}
+					},
+					fail: res => {
+						callback();
+					}
+				});
+			}
+		},
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+	}
+
+	.empty-box {
+		height: 20rpx;
+	}
+
+	.bank-account-wrap {
+		margin: 0 20rpx;
+		padding: 20rpx 30rpx;
+		border-bottom: 2rpx solid #f7f7f7;
+		position: relative;
+
+		.tx-wrap {
+			display: flex;
+			justify-content: space-between;
+			margin-right: 60rpx;
+
+			.tx-bank {
+				margin-right: 60rpx;
+				flex: 1;
+				margin-left: 10rpx;
+				text-align: right;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+
+			.tx-img {
+				position: absolute;
+				right: 100rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.iconfont {
+			position: absolute;
+			right: 40rpx;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+	}
+
+	.withdraw-wrap {
+		margin: 0 20rpx;
+		padding: 30rpx;
+		border-radius: 16rpx;
+		box-shadow: rgba(110, 110, 110, 0.09) 0 0 20rpx 0;
+
+		.money-wrap {
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #eee;
+			display: flex;
+			align-items: baseline;
+
+			.unit {
+				font-size: 60rpx;
+				line-height: 1.3;
+			}
+
+			.withdraw-money {
+				height: 70rpx;
+				line-height: 70rpx;
+				min-height: 70rpx;
+				padding-left: 20rpx;
+				font-size: 60rpx;
+				flex: 1;
+				font-weight: bolder;
+			}
+
+			.delete {
+				width: 40rpx;
+				height: 40rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.bootom {
+			display: flex;
+			padding-top: 20rpx;
+
+			text {
+				line-height: 1;
+				flex: 2;
+			}
+
+			.all-tx {
+				padding-left: 10rpx;
+			}
+		}
+	}
+
+	.btn {
+		margin: 0 30rpx;
+		margin-top: 60rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: $border-radius;
+		color: #fff;
+		text-align: center;
+		background-color: var(--main-color);
+
+		&.disabled {
+			background: #ccc;
+			border-color: #ccc;
+			color: #fff;
+		}
+	}
+
+	.recoend {
+		margin-top: 40rpx;
+
+		.recoend-con {
+			text-align: center;
+		}
+	}
+
+	.desc {
+		font-size: $font-size-tag;
+		color: #999;
+	}
+</style>

pages_tool/member/balance.vue

@@ -2,9 +2,9 @@
 	<view class="balance" :style="themeColor">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="custom-navbar" :style="{
-			'padding-top': menuButtonBounding.top + 'px',
-			'height': menuButtonBounding.height + 'px'
-		}">
+				'padding-top': menuButtonBounding.top + 'px',
+				'height': menuButtonBounding.height + 'px'
+			}">
 			<view class="navbar-wrap">
 				<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
 				<view class="navbar-title">
@@ -13,14 +13,12 @@
 			</view>
 		</view>
 		<!-- #endif -->
-
-		<view class="head-wrap"
-			:style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ')', backgroundSize: '100% 100%' }">
-			<!-- 	<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ') no-repeat right bottom/ auto 380rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }"> -->
+		
+		<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ')',backgroundSize:'100% 100%' }">
+		<!-- 	<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance-bg.png') + ') no-repeat right bottom/ auto 380rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }"> -->
 			<view class="title">账户余额（元）</view>
-			<view class="balance price-font">{{ (parseFloat(balanceInfo.balance) +
-				parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view>
-			<!-- 			<view class="flex-box">
+			<view class="balance price-font">{{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view>
+<!-- 			<view class="flex-box">
 				<view class="flex-item">
 					<view class="num price-font">{{  balanceInfo.balance_money|moneyFormat }}</view>
 					<view class="font-size-tag">现金余额（元）</view>
@@ -51,7 +49,7 @@
 				<text class="title">余额明细</text>
 				<text class="iconfont icon-right"></text>
 			</view>
-			<!-- 	<view class="menu-item" @click="toOrderList">
+		<!-- 	<view class="menu-item" @click="toOrderList">
 				<view class="icon">
 					<text class="iconfont icon-chongzhijilu"></text>
 				</view>
@@ -59,8 +57,8 @@
 				<text class="iconfont icon-right"></text>
 			</view> -->
 		</view>
-
-		<!-- 	<view class="action">
+		
+	<!-- 	<view class="action">
 			<view @click="toList" class="recharge-withdraw" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use">
 				{{ $lang('recharge') }}
 			</view>
@@ -74,11 +72,11 @@
 </template>
 
 <script>
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 export default {
-	components: { 
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'), 
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue') 
-	},
+	components: { nsLogin, loadingCover },
 	data() {
 		return {
 			balanceInfo: {
@@ -116,7 +114,7 @@ export default {
 		toBalanceDetail() {
 			this.$util.redirectTo('/pages_tool/member/balance_detail');
 		},
-		toApply() {
+		toApply(){
 			this.$util.redirectTo('/pages_tool/member/withdrawal');
 		},
 		toList() {
@@ -180,7 +178,7 @@ export default {
 		return true;
 	},
 	watch: {
-		storeToken: function (nVal, oVal) {
+		storeToken: function(nVal, oVal) {
 			if (nVal) {
 				this.getUserInfo();
 			}
@@ -190,5 +188,5 @@ export default {
 </script>
 
 <style lang="scss">
-@import '@/pages_tool/member/public/css/balance.scss';
+@import './public/css/balance.scss';
 </style>

pages_tool/member/balance_detail.vue

@@ -0,0 +1,373 @@
+<template>
+	<view :style="themeColor">
+		<!-- 		<scroll-view id="tab-bar" class="order-nav" :scroll-x="true" :show-scrollbar="false" :scroll-into-view="scrollInto">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
+			</view>
+		</scroll-view> -->
+	<!-- 	<view class="tab color-bg">
+			<view class="tab-left">
+				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
+					<view class="uni-input">
+						{{ date }}
+						<text class="iconfont icon-iconangledown"></text>
+					</view>
+				</picker>
+			</view>
+			<view class="tab-right">
+				<picker @change="bindPickerChange" :value="balanceIndex" :range="balanceType" class="picker" range-key="label">
+					<text class="desc uni-input">{{ balanceType[balanceIndex].label }}</text>
+					<text class="iconfont icon-iconangledown"></text>
+				</picker>
+			</view>
+		</view> -->
+		<mescroll-uni @getData="getData" ref="mescroll">
+			<block slot="list">
+				<!-- 明细列表 -->
+				<block v-if="dataList.length > 0">
+					<view class="detailed-wrap">
+						<view class="balances" v-for="(item, index) in dataList" :key="index">
+							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img" v-if="item.account_data > 0"></image>
+							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix"></image>
+							<view class="balances-info" @click="toFromDetail(item)">
+								<text class="title">{{ item.remark }}</text>
+							<!-- 	<text>{{ item.remark }}</text> -->
+								<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
+							</view>
+							<view class="balances-num">
+								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}元</text>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-else><ns-empty :isIndex="false" text="暂无余额明细"></ns-empty></block>
+				<!-- 无明细列表 -->
+			</block>
+		</mescroll-uni>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+export default {
+	components: {
+		nsEmpty,
+		nsLogin,
+		loadingCover,
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			});
+			return {
+				dataList: [],
+				statusList: [{
+					name: '全部',
+					id: '0'
+				}, {
+					name: '收入',
+					id: '1'
+				}, {
+					name: '支出',
+					id: '2'
+				}],
+				scrollInto: '',
+				orderStatus: '0',
+				date: currentDate,
+				searchType: {
+					from_type: 0,
+					date: ''
+				},
+				balanceType: [{
+					label: '全部',
+					value: '0'
+				}], //积分类型
+				balanceIndex: 0,
+				related_id: 0
+			};
+		},
+		onLoad(option) {
+			if (option.group_id) this.related_id = option.group_id ? option.group_id : 0;
+			if (option.from_type) this.searchType.from_type = option.from_type;
+			if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
+			if (option.status) this.orderStatus = option.status;
+			this.getbalanceType();
+		},
+		onShow() {
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/balance');
+				});
+			}
+		},
+		methods: {
+			bindDateChange: function(e) {
+				var temp = e.target.value;
+				var tempArr = temp.split('-');
+				this.date = tempArr[0] + '年' + tempArr[1] + '月';
+				this.searchType.date = e.target.value;
+				this.$refs.mescroll.refresh();
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}年${month}月`;
+			},
+			bindPickerChange(e) {
+				this.balanceIndex = e.detail.value;
+				this.searchType.from_type = this.balanceType[this.balanceIndex].value;
+				this.$refs.mescroll.refresh();
+			},
+			//获取分类类型
+			getbalanceType() {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/fromType',
+					success: res => {
+						let balanceType = Object.assign(res.balance, res.balance_money),
+							typeArr = [{
+								label: '全部',
+								value: '0'
+							}];
+						for (var index in balanceType) {
+							typeArr.push({
+								label: balanceType[index].type_name,
+								value: index
+							})
+						}
+						this.balanceType = typeArr;
+					}
+				});
+			},
+			ontabtap(e) {
+				let index = e.currentTarget.dataset.current;
+				this.orderStatus = this.statusList[index].id;
+				this.$refs.mescroll.refresh();
+			},
+			getData(mescroll) {
+				this.$api.sendRequest({
+					url: '/api/memberaccount/page',
+					data: {
+						page_size: mescroll.size,
+						page: mescroll.num,
+						account_type: 'balance,balance_money',
+						from_type: this.searchType.from_type,
+						date: this.searchType.date,
+						related_id: this.related_id
+					},
+					success: res => {
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) {
+							this.dataList = []; //如果是第一页需手动制空列表
+							this.related_id = 0;
+						}
+						this.dataList = this.dataList.concat(newArr); //追加新数据
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			toFromDetail(item) {
+				if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
+					this.$util.redirectTo('/pages_order/detail', {
+						order_id: item.type_tag
+					});
+				} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
+					this.$util.redirectTo('/pages_order/detail', {
+						order_id: item.type_tag
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.detailed-wrap {
+		padding-top: 20rpx;
+		
+		margin: 24rpx;
+	}
+
+	.tab {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		z-index: 10;
+		display: flex;
+		justify-content: space-between;
+		height: 80rpx;
+		background-color: $color-bg;
+
+		view {
+			flex: 1;
+			text-align: center;
+			line-height: 80rpx;
+
+			text {
+				margin-left: 10rpx;
+				font-size: $font-size-base;
+			}
+		}
+
+		.tab-left {
+			display: flex;
+			padding-left: 46rpx;
+		}
+
+		.tab-right {
+			display: flex;
+			justify-content: flex-end;
+			padding-right: 26rpx;
+		}
+	}
+
+	.order-nav {
+		width: 100vw;
+		height: 70rpx;
+		display: flex;
+		flex-direction: row;
+		/* #ifndef APP-PLUS */
+		white-space: nowrap;
+		/* #endif */
+		background: #fff;
+		border-bottom-left-radius: 24rpx;
+		border-bottom-right-radius: 24rpx;
+		padding-bottom: 30rpx;
+		position: fixed;
+		left: 0;
+		z-index: 998;
+
+		.uni-tab-item {
+			width: 33.33%;
+			text-align: center;
+			/* #ifndef APP-PLUS */
+			display: inline-block;
+			/* #endif */
+			flex-wrap: nowrap;
+		}
+
+		.uni-tab-item-title {
+			color: #555;
+			font-size: $font-size-base;
+			display: block;
+			height: 64rpx;
+			line-height: 64rpx;
+			border-bottom: 4rpx solid #fff;
+			padding: 0 10rpx;
+			flex-wrap: nowrap;
+			/* #ifndef APP-PLUS */
+			white-space: nowrap;
+			/* #endif */
+		}
+
+		.uni-tab-item-title-active {
+			display: block;
+			height: 64rpx;
+			padding: 0 10rpx;
+		}
+
+		::-webkit-scrollbar {
+			width: 0;
+			height: 0;
+			color: transparent;
+		}
+	}
+
+	.balances {
+		padding: $margin-both 24rpx;
+		// margin: 0 $margin-both;
+		box-sizing: border-box;
+		display: flex;
+		align-items: flex-start;
+		border-bottom: 2rpx solid $color-line;
+		background: #fff;
+		margin-bottom: 20rpx;
+		border-radius: 24rpx;
+		image {
+			width: 54rpx;
+			height: 54rpx;
+			border-radius: 50%;
+			padding-top: 10rpx;
+		}
+
+		.balances-info {
+			flex: 1;
+			margin-left: 16rpx;
+			display: flex;
+			flex-direction: column;
+
+			text {
+				font-size: $font-size-toolbar;
+				line-height: 1;
+
+				&:last-child {}
+
+				&:nth-child(2) {
+					margin-top: $margin-updown;
+					font-size: $font-size-activity-tag;
+					color: $color-tip;
+				}
+
+				&:nth-child(3) {
+					font-size: $font-size-activity-tag;
+					margin-top: $margin-updown;
+					color: $color-tip;
+				}
+			}
+		}
+
+		.balances-num {
+			text {
+				line-height: 1;
+				font-size: $font-size-toolbar;
+				font-weight: 500;
+				color:#09c15f;
+				font-weight: 700;
+			}
+		}
+	}
+
+	.empty {
+		width: 100%;
+		height: 500rpx;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>

pages_tool/member/basic/account.vue

@@ -1,465 +0,0 @@
-<template>
-	<view :style="themeColor">
-		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
-			<block slot="list">
-				<view class="nc-info-list-content">
-					<view class="list-item balance-item" @click="setBalanceDefault()"
-						v-if="type == 'fenxiao' && payList && payList.balance">
-						<view class="item-top">
-							<view class="item-left">
-								<view class="title-text">提现到余额</view>
-							</view>
-						</view>
-					</view>
-					<block v-if="dataList.length > 0">
-						<view class="list-item" v-for="(item, index) in dataList" :key="index">
-							<view class="item-top">
-								<view class="item-left">
-									<view class="title-text">{{ item.withdraw_type_name }}</view>
-									<view class="info-content">
-										<text class="top-title">{{ item.realname }}</text>
-										<text class="top-num">{{ item.mobile }}</text>
-									</view>
-									<view class="content-bottom">
-										<block v-if="item.withdraw_type == 'alipay'">
-											提现账号：{{ item.bank_account }}
-										</block>
-										<block v-if="item.withdraw_type == 'bank'">
-											银行名称 ：{{ item.branch_bank_name }}
-										</block>
-									</view>
-								</view>
-								<view class="item-btn" @click.stop="editAccount('edit', item.id)">修改</view>
-							</view>
-
-							<view class="item-bottom">
-								<view class="account-default" @click="setDefault(item.id, item.is_default)">
-									<text class="default">设为默认账户</text>
-									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)"
-										:color="themeStyle.main_color" />
-									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
-								</view>
-								<view class="account-btn">
-									<text class="delete" v-if="item.is_default != 1" @click="deleteAccount(item.id)">
-										<text class="iconfont iconicon7"></text>
-									</text>
-								</view>
-							</view>
-						</view>
-					</block>
-				</view>
-				<view
-					v-if="dataList.length <= 0 && (type != 'fenxiao' || (type == 'fenxiao' && payList && !payList.balance))"
-					class="empty-box">
-					<image :src="$util.img('public/uniapp/member/account/empty.png')" mode="widthFix"></image>
-					<view class="tips">暂无账户信息，请添加</view>
-					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount')
-					}}</button>
-				</view>
-			</block>
-		</mescroll-uni>
-		<view class="btn-add" v-if="dataList.length > 0 || (type == 'fenxiao' && payList && payList.balance)">
-			<button class="add-account" type="primary" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<ns-login ref="login"></ns-login>
-	</view>
-</template>
-
-<script>
-
-export default {
-	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		toTop: () => import('@/components/toTop/toTop.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif	
-	},
-	data() {
-		return {
-			dataList: [], //账号列表
-			back: '', // 返回页
-			redirect: 'redirectTo', // 跳转方式
-			type: 'member',
-			payList: null
-		};
-	},
-	onLoad(option) {
-		if (option.back) this.back = option.back;
-		if (option.type) this.type = option.type;
-		if (option.redirect) this.redirect = option.redirect;
-	},
-	onShow() {
-		if (this.storeToken) {
-			this.getTransferType();
-			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/account');
-			});
-		}
-	},
-	methods: {
-		// 编辑提现账户信息
-		editAccount(type, id) {
-			let data = {};
-			data.type = this.type;
-			if (type == 'edit') data.id = id;
-			if (this.back) data.back = this.back;
-			this.$util.redirectTo('/pages_tool/member/account_edit', data);
-		},
-		deleteAccount(id) {
-			uni.showModal({
-				title: '操作提示',
-				content: '确定要删除该账户吗？',
-				success: res => {
-					if (res.confirm) {
-						this.$api.sendRequest({
-							url: '/api/memberbankaccount/delete',
-							data: {
-								id: id
-							},
-							success: result => {
-								if (result.code == 0) {
-									this.$util.showToast({
-										title: '删除成功'
-									});
-									this.$refs.mescroll.refresh();
-								} else {
-									this.$util.showToast({
-										title: '删除失败'
-									});
-								}
-							}
-						});
-					}
-				}
-			});
-		},
-		setDefault(id, is_default) {
-			if (is_default == 1) return;
-			this.$api.sendRequest({
-				url: '/api/memberbankaccount/setdefault',
-				data: {
-					id
-				},
-				success: res => {
-					if (res.data >= 0) {
-						if (this.back != '') {
-							this.$util.redirectTo(this.back, {}, this.redirect);
-						} else {
-							if (this.$refs.loadingCover) this.$refs.loadingCover.show();
-							this.dataList = [];
-							this.$refs.mescroll.refresh();
-						}
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		setBalanceDefault() {
-			this.$util.redirectTo(this.back, {
-				'is_balance': 1
-			}, this.redirect);
-		},
-		getData(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/memberbankaccount/page',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) this.dataList = []; //如果是第一页需手动制空列表
-					this.dataList = this.dataList.concat(newArr); //追加新数据
-
-					let withdrawType = {
-						bank: '银行',
-						alipay: '支付宝',
-						wechatpay: '微信'
-					};
-
-					this.dataList.forEach(item => {
-						item.withdraw_type_name = withdrawType[item.withdraw_type] ? withdrawType[
-							item.withdraw_type] : '';
-					});
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		getTransferType() {
-			let url = this.type == "member" ? "/api/memberwithdraw/transferType" :
-				"/fenxiao/api/withdraw/transferType";
-			this.$api.sendRequest({
-				url: url,
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.payList = res.data;
-					}
-				}
-			});
-		}
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.empty-box {
-	width: 100vw;
-	height: 100vh;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-
-	image {
-		width: 50%;
-	}
-
-	.tips {
-		color: #999999;
-		font-size: 26rpx;
-	}
-
-	.get-account,
-	.add-account {
-		width: 50%;
-		height: 78rpx;
-		line-height: 78rpx;
-		border-radius: 78rpx;
-		margin-top: 50rpx;
-		font-weight: 600;
-	}
-
-	.get-account {
-		width: 50%;
-		background: #fff;
-		color: $base-color;
-		border: 2rpx solid $base-color;
-		margin-top: 20rpx;
-		box-sizing: border-box;
-	}
-}
-
-.mescroll-downwarp+.empty-box {
-	height: calc(100vh - 260rpx);
-}
-
-
-.btn-add {
-	margin-top: 60rpx;
-	bottom: 0;
-	width: 100%;
-	background: #fff;
-	position: fixed;
-	padding: 0 30rpx;
-	box-sizing: border-box;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-	z-index: 10;
-
-	.add-account {
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: 80rpx;
-		margin: 30rpx 0 30rpx;
-		font-size: $font-size-toolbar;
-
-		text {
-			margin-right: 10rpx;
-			font-size: $font-size-base;
-		}
-	}
-}
-
-.zw {
-	margin-top: 250rpx;
-}
-
-.list-item {
-	margin: 0 0;
-	padding: 24rpx $margin-both;
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: column;
-	background-color: #fff;
-	margin-bottom: 18rpx;
-	border-radius: 10rpx;
-	overflow: hidden;
-	position: relative;
-
-	&.balance-item {
-		.item-top {
-			border: none;
-			padding: 0;
-		}
-	}
-
-	&:first-child {
-		margin-top: 18rpx;
-	}
-
-	.item-mr {
-		font-size: $font-size-activity-tag;
-		color: #fff;
-		height: 150rpx;
-		width: 150rpx;
-		display: flex;
-		align-items: flex-end;
-		justify-content: center;
-		position: absolute;
-		right: -90rpx;
-		top: -90rpx;
-		transform: rotate(45deg);
-	}
-
-	.item-top {
-		border-bottom: 2rpx solid $color-line;
-		padding-bottom: 26rpx;
-		display: flex;
-		flex-direction: row;
-
-		.item-left {
-			display: flex;
-			flex-direction: column;
-			width: calc(100% - 100rpx);
-
-			.title-text {
-				font-size: 30rpx;
-				font-weight: bold;
-			}
-
-			.info-content {
-				display: flex;
-
-				.top-title {
-					font-size: 26rpx;
-					margin-right: 15rpx;
-				}
-
-				.top-num {
-					font-size: 26rpx;
-				}
-			}
-
-			.content-bottom {
-				font-size: 26rpx;
-				height: 50rpx;
-			}
-		}
-
-		.item-btn {
-			width: 100rpx;
-			display: flex;
-			align-items: center;
-			color: #999;
-			font-size: 24rpx;
-			justify-content: flex-end;
-		}
-
-	}
-
-	.item-bottom {
-		display: flex;
-		justify-content: space-between;
-		padding-top: 24rpx;
-
-		.account-default {
-			display: flex;
-			align-items: center;
-			font-size: 24rpx;
-			line-height: 1;
-			color: #666666;
-
-			.default {}
-
-			.iconfont {
-				line-height: 1;
-			}
-		}
-
-		.account-btn {
-			font-size: $font-size-base;
-			line-height: 1;
-			display: flex;
-			align-items: center;
-
-			.edit {
-				text {
-					vertical-align: center;
-					margin-right: 10rpx;
-					font-size: 30rpx;
-				}
-			}
-
-			.delete {
-				background: #F1F1F1;
-				justify-content: center;
-				align-items: center;
-				border-radius: 50%;
-				padding: 10rpx;
-				text-align: center;
-				width: 48rpx;
-				height: 48rpx;
-				box-sizing: border-box;
-
-				text {
-					font-size: 26rpx;
-				}
-			}
-		}
-	}
-}
-</style>
-<style lang="scss">
-/deep/ .mescroll-upwarp {
-	padding-bottom: 150rpx;
-}
-</style>
-<style>
-.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
-	height: 48rpx !important;
-	width: 88rpx !important;
-}
-
-.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
-	height: 44rpx !important;
-	width: 44rpx !important;
-}
-
-.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
-	background-color: #EDEDED !important;
-	height: 44rpx !important;
-	width: 90rpx !important;
-}
-</style>

pages_tool/member/basic/modify_face.vue

@@ -1,195 +0,0 @@
-<template>
-	<view :style="themeColor" class="nc-modify-content">
-		<view class="modify">
-			<view>
-				<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head"
-					@error="memberImg = $util.getDefaultImage().head" mode="aspectFill" />
-				<image v-else :src="$util.img(newImg)" @error="newImg = $util.getDefaultImage().head"
-					mode="aspectFill" />
-			</view>
-		</view>
-		<view class="opection-box">
-			<block v-if="newImg == ''">
-				<!-- #ifdef MP-ALIPAY -->
-				<button type="primary" @click="uploadFace()">点击上传</button>
-				<!-- #endif -->
-				<!-- #ifndef MP-ALIPAY -->
-				<button type="primary" @click="chooseImage()">点击上传</button>
-				<!-- #endif -->
-			</block>
-			<block v-else>
-				<view class="opec">
-					<button size="mini" class="mini" type="primary" @click="save()">确认保存</button>
-					<button size="mini" class="mini" type="primary" @click="chooseImage()">重新上传</button>
-				</view>
-			</block>
-		</view>
-
-		<img-cropping selWidth="300" selHeight="300" @upload="myUpload" ref="imgCropping"></img-cropping>
-	</view>
-</template>
-
-<script>
-
-export default {
-	components: {
-		imgCropping: () => import('@/components/img-cropping/cropping.vue'),
-	},
-	data() {
-		return {
-			memberImg: '',
-			newImg: '',
-			imgurl: ''
-		};
-	},
-	onShow() {
-		if (!this.storeToken) {
-			this.$util.redirectTo(
-				'/pages_tool/login/login', {
-				back: '/pages_tool/member/modify_face'
-			},
-				'redirectTo'
-			);
-			return;
-		}
-
-		this.memberImg = this.memberInfo.headimg;
-		this.imgurl = this.memberInfo.headimg;
-	},
-	methods: {
-		chooseImage() {
-			this.$refs.imgCropping.fSelect();
-		},
-		//上传返回图片
-		myUpload(rsp) {
-			let app_type = 'h5';
-			let app_type_name = 'H5';
-
-			// #ifdef MP
-			app_type = 'weapp';
-			app_type_name = 'weapp';
-			// #endif
-			uni.request({
-				url: this.$config.baseUrl + '/api/upload/headimgBase64',
-				method: 'POST',
-				data: {
-					app_type: app_type,
-					app_type_name: app_type_name,
-					images: rsp.base64
-				},
-				header: {
-					'content-type': 'application/x-www-form-urlencoded;application/json'
-				},
-				dataType: 'json',
-				responseType: 'text',
-				success: res => {
-					if (res.data.code == 0) {
-						this.newImg = res.data.data.pic_path;
-						this.imgurl = res.data.data.pic_path;
-					}
-				},
-				fail: () => {
-					this.$util.showToast({
-						title: '头像上传失败'
-					});
-				}
-			});
-		},
-		previewImage() {
-			uni.previewImage({
-				current: 0,
-				urls: this.images
-			});
-		},
-		save() {
-			this.$api.sendRequest({
-				url: '/api/member/modifyheadimg',
-				data: {
-					headimg: this.imgurl
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.memberInfo.headimg = this.imgurl;
-						this.$store.commit('setMemberInfo', this.memberInfo);
-						this.$util.showToast({
-							title: '头像修改成功'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');
-						}, 2000);
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		uploadFace() {
-			uni.chooseImage({
-				count: 1,
-				sizeType: ['compressed'],
-				success: (chooseImageRes) => {
-					const tempFilePaths = chooseImageRes.tempFilePaths;
-					this.$api.upload({
-						url: '/api/upload/headimg',
-						filePath: tempFilePaths[0],
-						fileType: 'image',
-						success: (res) => {
-							if (res.code) {
-								this.newImg = res.data.pic_path;
-								this.imgurl = res.data.pic_path;
-							}
-						}
-					})
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	overflow: hidden;
-}
-
-.modify {
-	position: relative;
-	padding-top: 50rpx;
-
-	view {
-		width: 500rpx;
-		height: 500rpx;
-		margin: 0 auto;
-		overflow: hidden;
-		background-color: #ffffff;
-		border: 4rpx solid #ffffff;
-		border-radius: 100%;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-}
-
-.opection-box {
-	margin-top: 50rpx;
-}
-
-.opec {
-	width: 100%;
-	padding: 0 10%;
-	box-sizing: border-box;
-	display: flex;
-	justify-content: space-between;
-
-	button {
-		padding: 0 30rpx;
-		height: 60rpx;
-		line-height: 60rpx;
-		border: none;
-	}
-}
-</style>

pages_tool/member/cancellation.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser.js';
+import htmlParser from '@/common/js/html-parser';
 export default {
 	data() {
 		return {

pages_tool/member/cancelrefuse.vue

@@ -1,9 +1,7 @@
 <template>
 	<view class="container" :style="themeColor">
 		<view class="cancel-wrap">
-			<view class="cancel-img">
-				<image :src="$util.img('public/uniapp/member/refuse.png')"></image>
-			</view>
+			<view class="cancel-img"><image :src="$util.img('public/uniapp/member/refuse.png')"></image></view>
 			<view class="cancel-title">您的申请已拒绝</view>
 			<view class="cancel-reason">拒绝理由：{{ reason }}</view>
 			<view class="cancel-btn">

pages_tool/member/cancelstatus.vue

@@ -0,0 +1,189 @@
+<template>
+	<view class="container" :style="themeColor">
+		<view class="cancelstatus-wrap">
+			<view class="cancelstatus-block">
+				<view class="cancelstatus-box">
+					<view class="cancelstatus-box-sort color-base-bg">1</view>
+					<view class="cancelstatus-box-con">
+						<view class="cancelstatus-box-name">提交申请</view>
+						<view class="cancelstatus-box-info">您已提交申请，请耐心等待~</view>
+					</view>
+					<view class="cancelstatus-box-line color-base-bg"></view>
+				</view>
+				<view class="cancelstatus-box">
+					<view class="cancelstatus-box-sort color-base-bg">2</view>
+					<view class="cancelstatus-box-con">
+						<view class="cancelstatus-box-name">等待审核</view>
+						<view class="cancelstatus-box-info">等待审核中，审核通过后您的账号将直接被删除</view>
+					</view>
+					<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
+				</view>
+				<view class="cancelstatus-box cancelstatus-box-last">
+					<view class="cancelstatus-box-sort color-base-bg" :class="[ state == 1 ?  'opacity': 'opacity-4' ]">
+						3
+					</view>
+					<view class="cancelstatus-box-con">
+						<view class="cancelstatus-box-name">审核通过，注销完成</view>
+						<view class="cancelstatus-box-info">您已成功注销账号，期待下一次与您相遇</view>
+					</view>
+				</view>
+			</view>
+			<view class="cancelstatus-btn" v-if="state == 0">
+				<button type="primary" @click="back">返回</button>
+				<button class="color-base-bg" @click="revoke">撤销申请</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				state: 0
+			};
+		},
+		onLoad(option) {
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				this.getStatus();
+			}
+		},
+		onShow() {
+			this.getStatus();
+		},
+		methods: {
+			getStatus() {
+				this.$api.sendRequest({
+					url: '/membercancel/api/membercancel/info',
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.state = res.data.status;
+							if (this.state == -1) {
+								this.$util.redirectTo('/pages_tool/member/cancelrefuse');
+							}
+						}
+
+						if (res.code == -1) {
+							this.$store.commit('setToken', '');
+							this.$store.commit('setMemberInfo', '');
+							this.$store.commit('setMemberInfo', '');
+							this.$store.dispatch('emptyCart');
+							this.$util.redirectTo('/pages/index/index');
+						}
+					}
+				});
+			},
+			back() {
+				this.$util.redirectTo('/pages/member/index');
+			},
+			revoke() {
+				uni.showModal({
+					title: '风险提示',
+					content: '确定要撤销申请吗？',
+					confirmColor: '#000000',
+					success: res => {
+						if (res.confirm) {
+							this.$api.sendRequest({
+								url: '/membercancel/api/membercancel/cancelApply',
+								success: res => {
+									if (res.code >= 0) {
+										this.$util.redirectTo('/pages/member/index');
+									}
+								}
+							});
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cancelstatus-wrap {
+		.cancelstatus-block {
+			padding: 50rpx;
+		}
+
+		.cancelstatus-box {
+			position: relative;
+			display: flex;
+			height: 200rpx;
+
+			.cancelstatus-box-sort {
+				width: 36rpx;
+				height: 36rpx;
+				text-align: center;
+				line-height: 36rpx;
+				border-radius: 50%;
+				color: #ffffff;
+				margin-right: 17rpx;
+				font-size: 24rpx;
+			}
+
+			.opacity {
+				opacity: 1;
+
+				&-4 {
+					opacity: 0.4;
+				}
+			}
+
+			.cancelstatus-box-name {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				margin-top: 3rpx;
+			}
+
+			.cancelstatus-box-info {
+				margin-top: 15rpx;
+				color: #666666;
+				font-size: 28rpx;
+			}
+
+			.cancelstatus-box-line {
+				position: absolute;
+				width: 2rpx;
+				height: 164rpx;
+				top: 36rpx;
+				left: 18rpx;
+			}
+
+			&.cancelstatus-box-last {
+				height: 80rpx;
+			}
+		}
+
+		.cancelstatus-btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			height: 150rpx;
+
+			button {
+				width: 300rpx;
+				height: 80rpx;
+				font-size: 28rpx;
+				line-height: 80rpx;
+				margin: 0 15rpx;
+				border-radius: $border-radius;
+			}
+
+			button[type='primary'] {
+				background-color: unset !important;
+				color: #333333;
+				border: 2rpx solid #dddddd;
+			}
+
+			button:nth-child(2) {
+				color: #ffffff;
+			}
+		}
+	}
+</style>

pages_tool/member/cancelsuccess.vue

@@ -0,0 +1,99 @@
+<template>
+	<view class="container" :style="themeColor">
+		<view class="cancel-wrap">
+			<view class="cancel-img">
+				<image :src="$util.img('public/uniapp/member/success.png')"></image>
+			</view>
+			<view class="cancel-title">您已成功注销账号</view>
+			<view class="cancel-reason">待下次与您更好的相遇，如需再次使用，请重新注册</view>
+			<view class="cancel-btn"><button class="color-base-bg" @click="success">完成</button></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				state: ''
+			};
+		},
+		onLoad(option) {
+
+			if (option.back) this.back = option.back;
+
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				this.getStatus();
+			}
+		},
+		methods: {
+			getStatus() {
+				this.$api.sendRequest({
+					success: res => {
+						if (res.code >= 0) {
+							this.state = res.data.state;
+							if (res.data.state == 1) {
+								this.$store.commit('setToken', '');
+								this.$store.commit('setMemberInfo', '');
+								this.$store.dispatch('emptyCart');
+								this.$util.redirectTo('/pages/index/index');
+							}
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cancel-wrap {
+		padding-top: 84rpx;
+		text-align: center;
+
+		.cancel-img {
+			width: 100rpx;
+			height: 100rpx;
+			display: inline-block;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.cancel-title {
+			text-align: center;
+			font-size: 24rpx;
+			line-height: 24rpx;
+			margin-top: 30rpx;
+		}
+
+		.cancel-reason {
+			color: #838383;
+			font-size: 20rpx;
+			line-height: 40rpx;
+			margin-top: 20rpx;
+			padding: 0 175rpx;
+		}
+
+		.cancel-btn {
+			width: 100%;
+			margin-top: 173rpx;
+
+			button {
+				display: inline-block;
+				width: 300rpx;
+				height: 80rpx;
+				font-size: 28rpx;
+				line-height: 80rpx;
+				margin: 0 15rpx;
+				color: #ffffff;
+			}
+		}
+	}
+</style>

pages_tool/member/card.vue

@@ -5,9 +5,8 @@
 		</view>
 		<view class="banner-container">
 			<view class="memberInfo">
-				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
-					mode="aspectFill" />
-				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill" />
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
+				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"/>
 				<view class="member-desc">
 					<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
 					<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">
@@ -23,18 +22,15 @@
 						<view class="level-detail">{{ levelInfo.level_name }}</view>
 						<view class="growr-name">{{ levelInfo.level_name }}可享受消费折扣和</view>
 						<view class="growr-value">会员大礼包等权益</view>
-						<view class="growth-rules font-size-tag" @click="openExplainPopup"
-							v-if="levelInfo.remark != ''">
+						<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelInfo.remark != ''">
 							<text class="iconfont icon-wenhao font-size-tag"></text>
 						</view>
-						<button type="default" class="renew-btn"
-							@click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
+						<button type="default" class="renew-btn" @click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
 					</view>
 				</view>
 			</view>
 
-			<view class="card-content"
-				v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
+			<view class="card-content" v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
 				<view class="card-content-head">
 					<view class="line-box">
 						<view class="line right"></view>
@@ -122,111 +118,113 @@
 </template>
 
 <script>
-
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
 import scroll from '@/common/js/scroll-view.js';
+import nsLogin from '@/components/ns-login/ns-login.vue';
 
-export default {
-	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue')
-	},
-	mixins: [scroll],
-	data() {
-		return {
-			isSub: false, // 是否已提交
-			isIphoneX: false,
-			levelId: 0,
-			levelInfo: {
-				bg_color: '#333'
+	export default {
+		components: {
+			uniPopup,
+			nsGoodsRecommend,
+			nsLogin
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				isSub: false, // 是否已提交
+				isIphoneX: false,
+				levelId: 0,
+				levelInfo: {
+					bg_color: '#333'
+				}
+			};
+		},
+		onLoad() {
+			//会员卡
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/card');
+				});
+				return;
 			}
-		};
-	},
-	onLoad() {
-		//会员卡
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/card');
+
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+
+			this.levelId = this.memberInfo.member_level;
+
+			let levelInfo = this.memberInfo.member_level_info;
+			let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
+			levelInfo.charge_rule_arr = [];
+			Object.keys(charge_rule).forEach(key => {
+				levelInfo.charge_rule_arr.push({
+					key: key,
+					value: charge_rule[key]
+				});
 			});
-			return;
-		}
-
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		this.levelId = this.memberInfo.member_level;
-
-		let levelInfo = this.memberInfo.member_level_info;
-		let charge_rule = levelInfo.charge_rule ? JSON.parse(levelInfo.charge_rule) : {};
-		levelInfo.charge_rule_arr = [];
-		Object.keys(charge_rule).forEach(key => {
-			levelInfo.charge_rule_arr.push({
-				key: key,
-				value: charge_rule[key]
-			});
-		});
-		this.levelInfo = levelInfo;
-	},
-	onShow() { },
-	methods: {
-		headimgError() {
-			this.memberInfo.headimg = this.$util.getDefaultImage().head;
+			this.levelInfo = levelInfo;
 		},
-		/**
-		 * 打开说明弹出层
-		 */
-		openExplainPopup() {
-			this.$refs.explainPopup.open();
+		onShow() {},
+		methods: {
+			headimgError() {
+				this.memberInfo.headimg = this.$util.getDefaultImage().head;
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			openExplainPopup() {
+				this.$refs.explainPopup.open();
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			closeExplainPopup() {
+				this.$refs.explainPopup.close();
+			}
 		},
-		/**
-		 * 打开说明弹出层
-		 */
-		closeExplainPopup() {
-			this.$refs.explainPopup.close();
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
 		}
-	},
-	onBackPress(options) {
-		if (options.from === 'navigateBack') {
-			return false;
-		}
-		this.$util.redirectTo('/pages/member/index');
-		return true;
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-@import '@/pages_tool/member/public/css/card.scss';
+	@import './public/css/card.scss';
 
-.banner-container .image-container .slide-image {
-	width: calc(100% - 60rpx);
-	height: 360rpx;
-	background-size: 100% 100%;
-	background-repeat: no-repeat;
-}
+	.banner-container .image-container .slide-image {
+		width: calc(100% - 60rpx);
+		height: 360rpx;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+	}
 
-.banner-container .image-container image {
-	background-color: #e3b66b;
-}
+	.banner-container .image-container image {
+		background-color: #e3b66b;
+	}
 
-.banner-container .slide-image .renew-btn {
-	text-align: center;
-	line-height: 56rpx;
-	height: 56rpx;
-	border-radius: $border-radius;
-	width: 160rpx;
-	font-size: $font-size-tag;
-	color: #e3b66b !important;
-	background: #fff;
-	position: absolute;
-	right: 10rpx;
-	bottom: 40rpx;
-	border: none;
-	z-index: 10;
-}
+	.banner-container .slide-image .renew-btn {
+		text-align: center;
+		line-height: 56rpx;
+		height: 56rpx;
+		border-radius: $border-radius;
+		width: 160rpx;
+		font-size: $font-size-tag;
+		color: #e3b66b !important;
+		background: #fff;
+		position: absolute;
+		right: 10rpx;
+		bottom: 40rpx;
+		border: none;
+		z-index: 10;
+	}
 </style>
 
-<style lang="scss" scoped>
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
+<style scoped>
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_tool/member/card_agreement.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser.js';
+import htmlParser from '@/common/js/html-parser';
 export default {
 	data() {
 		return {
@@ -17,7 +17,7 @@ export default {
 	onLoad() {
 		this.getAgreement();
 	},
-	onShow() { },
+	onShow() {},
 	methods: {
 		getAgreement() {
 			this.$api.sendRequest({

pages_tool/member/card_buy.vue

@@ -6,8 +6,7 @@
 			</view>
 			<view class="banner-container">
 				<view class="memberInfo">
-					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
-						mode="aspectFill" />
+					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
 					<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
 					<view class="member-desc">
 						<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
@@ -23,27 +22,26 @@
 					:circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
 					:next-margin="swiperConfig.nextMargin" @change="swiperChange" @animationfinish="animationfinish"
 					:current="curIndex">
-					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''"
-						v-for="(item, i) in levelList" :key="i">
+					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList" :key="i">
 						<view class="image-container" :class="[
-							curIndex === 0
-								? i === listLen - 1
-									? 'item-left'
-									: i === 1
+								curIndex === 0
+									? i === listLen - 1
+										? 'item-left'
+										: i === 1
 										? 'item-right'
 										: 'item-center'
-								: curIndex === listLen - 1
+									: curIndex === listLen - 1
 									? i === 0
 										? 'item-right'
 										: i === listLen - 2
-											? 'item-left'
-											: 'item-center'
-									: i === curIndex - 1
 										? 'item-left'
-										: i === curIndex + 1
-											? 'item-right'
-											: 'item-center'
-						]">
+										: 'item-center'
+									: i === curIndex - 1
+									? 'item-left'
+									: i === curIndex + 1
+									? 'item-right'
+									: 'item-center'
+							]">
 							<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat"
 								:style="{
 									transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
@@ -52,19 +50,14 @@
 								}">
 								<view class="bg-border"></view>
 
-								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']"
-									:src="$util.img(levelList[curIndex]['level_picture'])" />
-								<image v-else :style="{ backgroundColor: levelList[curIndex]['bg_color'] }" />
+								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
+								<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
 
 								<view class="info">
-									<view class="level-detail" :style="{ color: levelList[curIndex]['level_text_color'] }">
-										{{ levelList[curIndex].level_name }}</view>
-									<view class="growr-name" :style="{ color: levelList[curIndex]['level_text_color'] }">{{
-										levelList[curIndex].level_name }}可享受消费折扣和</view>
-									<view class="growr-value" :style="{ color: levelList[curIndex]['level_text_color'] }">
-										会员大礼包等权益</view>
-									<view class="growth-rules font-size-tag" @click="openExplainPopup"
-										v-if="levelList[curIndex].remark != ''">
+									<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}</view>
+									<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}可享受消费折扣和</view>
+									<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">会员大礼包等权益</view>
+									<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelList[curIndex].remark != ''">
 										<text class="iconfont icon-wenhao font-size-tag"></text>
 									</view>
 								</view>
@@ -85,10 +78,8 @@
 						<view class="clear"></view>
 					</view>
 					<view class="card-time-list">
-						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }"
-							v-for="(item, index) in currCard.charge_rule_arr" :key="index">
-							<view class="card-time-item" :class="{ active: choiceIndex == index }"
-								@click="choice(index)">
+						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }" v-for="(item, index) in currCard.charge_rule_arr" :key="index">
+							<view class="card-time-item" :class="{ active: choiceIndex == index }" @click="choice(index)">
 								<image :src="$util.img('public/uniapp/level/card-icon.png')" mode="widthFix"></image>
 								<view class="time-name">{{ cardType[item.key].name }}</view>
 								<view class="time-price">
@@ -181,8 +172,7 @@
 						</view>
 						<view class="agreement" v-if="agreement">
 							购买既视为同意
-							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title
-								}}》</text>
+							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title }}》</text>
 						</view>
 					</view>
 				</block>
@@ -208,8 +198,7 @@
 				</uni-popup>
 			</view>
 
-			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value"
-				@confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
+			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value" @confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
 		</block>
 		<block v-else><ns-empty text="暂无可开会员卡" :isIndex="false"></ns-empty></block>
 
@@ -220,216 +209,221 @@
 </template>
 
 <script>
-import scroll from '@/common/js/scroll-view.js';
+	import scroll from '@/common/js/scroll-view.js';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsPayment from '@/components/ns-payment/ns-payment.vue';
 
-export default {
-	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsPayment: () => import('@/components/ns-payment/ns-payment.vue')
-	},
-	mixins: [scroll],
-	data() {
-		return {
-			isSub: false, // 是否已提交
-			isIphoneX: false,
-			couponPopList: [],
-			curIndex: 0,
-			isDescAnimating: false,
-			scaleX: (634 / 540).toFixed(4),
-			scaleY: (378 / 330).toFixed(4),
-			swiperConfig: {
-				indicatorDots: false,
-				indicatorColor: 'rgba(255, 255, 255, .4)',
-				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-				interval: 3000,
-				duration: 300,
-				circular: false,
-				previousMargin: '58rpx',
-				nextMargin: '58rpx'
-			},
-			levelList: [],
-			levelId: 0,
-			cardType: {
-				week: {
-					name: '周卡',
-					unit: '周'
-				},
-				month: {
-					name: '月卡',
-					unit: '月'
-				},
-				quarter: {
-					name: '季卡',
-					unit: '季'
-				},
-				year: {
-					name: '年卡',
-					unit: '年'
-				}
-			},
-			choiceIndex: 0,
-			outTradeNo: '',
-			agreement: null
-		};
-	},
-	computed: {
-		listLen() {
-			return this.levelList.length;
+	export default {
+		components: {
+			uniPopup,
+			nsEmpty,
+			nsLogin,
+			loadingCover,
+			nsPayment
 		},
-		currCard() {
-			if (this.levelList[this.curIndex]) {
-				let card = this.levelList[this.curIndex];
-				let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
-				card.charge_rule_arr = [];
-				Object.keys(charge_rule).forEach(key => {
-					card.charge_rule_arr.push({
-						key: key,
-						value: charge_rule[key]
+		mixins: [scroll],
+		data() {
+			return {
+				isSub: false, // 是否已提交
+				isIphoneX: false,
+				couponPopList: [],
+				curIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [],
+				levelId: 0,
+				cardType: {
+					week: {
+						name: '周卡',
+						unit: '周'
+					},
+					month: {
+						name: '月卡',
+						unit: '月'
+					},
+					quarter: {
+						name: '季卡',
+						unit: '季'
+					},
+					year: {
+						name: '年卡',
+						unit: '年'
+					}
+				},
+				choiceIndex: 0,
+				outTradeNo: '',
+				agreement: null
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+			currCard() {
+				if (this.levelList[this.curIndex]) {
+					let card = this.levelList[this.curIndex];
+					let charge_rule = card.charge_rule ? JSON.parse(card.charge_rule) : {};
+					card.charge_rule_arr = [];
+					Object.keys(charge_rule).forEach(key => {
+						card.charge_rule_arr.push({
+							key: key,
+							value: charge_rule[key]
+						});
 					});
-				});
-				return card;
+					return card;
+				}
 			}
-		}
-	},
-	onLoad() {
-		//会员卡
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		},
+		onLoad() {
+			//会员卡
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
 
-		if (this.storeToken) {
-			this.getCardList();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/card_buy');
-			});
-		}
-		this.getAgreement();
-	},
-	onShow() { },
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
+			if (this.storeToken) {
 				this.getCardList();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/card_buy');
+				});
 			}
-		}
-	},
-	methods: {
-		swiperChange(e) {
-			this.curIndex = e.detail.current;
-			this.choiceIndex = 0;
-			this.isDescAnimating = true;
+			this.getAgreement();
 		},
-		animationfinish(e) {
-			this.isDescAnimating = false;
+		onShow() {},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getCardList();
+				}
+			}
 		},
-		getCardList() {
-			this.$api.sendRequest({
-				url: '/supermember/api/membercard/lists',
-				success: res => {
-					if (res.code == 0 && res.data) {
-						this.levelList = res.data;
-						this.levelId = this.memberInfo.member_level;
-						for (let i = 0; i < this.levelList.length; i++) {
-							if (this.levelList[i].level_id == this.levelId) {
-								this.curIndex = i;
-								break;
+		methods: {
+			swiperChange(e) {
+				this.curIndex = e.detail.current;
+				this.choiceIndex = 0;
+				this.isDescAnimating = true;
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getCardList() {
+				this.$api.sendRequest({
+					url: '/supermember/api/membercard/lists',
+					success: res => {
+						if (res.code == 0 && res.data) {
+							this.levelList = res.data;
+							this.levelId = this.memberInfo.member_level;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									break;
+								}
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			choice(index) {
+				this.choiceIndex = index;
+			},
+			/**
+			 * 创建
+			 */
+			create() {
+				if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
+					uni.showModal({
+						title: '提示',
+						content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
+						success: res => {
+							if (res.confirm) {
+								this.$refs.choosePaymentPopup.open();
 							}
 						}
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					});
+				} else {
+					this.$refs.choosePaymentPopup.open();
 				}
-			});
-		},
-		choice(index) {
-			this.choiceIndex = index;
-		},
-		/**
-		 * 创建
-		 */
-		create() {
-			if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
-				uni.showModal({
-					title: '提示',
-					content: '您有尚未过期的会员卡，再次购卡会覆盖掉之前的卡，是否继续？',
+			},
+			/**
+			 * 提交
+			 */
+			toPay() {
+				if (this.isSub) return;
+				this.isSub = true;
+
+				this.$api.sendRequest({
+					url: '/supermember/api/ordercreate/create',
+					data: {
+						level_id: this.currCard.level_id,
+						period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
+					},
 					success: res => {
-						if (res.confirm) {
-							this.$refs.choosePaymentPopup.open();
+						if (res.data && res.code == 0) {
+							this.outTradeNo = res.data.out_trade_no;
+							uni.setStorageSync('paySource', 'membercard');
+							this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
+						} else {
+							this.isSub = false;
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			headimgError() {
+				this.memberInfo.headimg = this.$util.getDefaultImage().head;
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			openExplainPopup() {
+				this.$refs.explainPopup.open();
+			},
+			/**
+			 * 打开说明弹出层
+			 */
+			closeExplainPopup() {
+				this.$refs.explainPopup.close();
+			},
+			getAgreement() {
+				this.$api.sendRequest({
+					url: '/supermember/api/membercard/agreement',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
+							this.agreement = res.data;
 						}
 					}
 				});
-			} else {
-				this.$refs.choosePaymentPopup.open();
 			}
 		},
-		/**
-		 * 提交
-		 */
-		toPay() {
-			if (this.isSub) return;
-			this.isSub = true;
-
-			this.$api.sendRequest({
-				url: '/supermember/api/ordercreate/create',
-				data: {
-					level_id: this.currCard.level_id,
-					period_unit: this.currCard.charge_rule_arr[this.choiceIndex].key
-				},
-				success: res => {
-					if (res.data && res.code == 0) {
-						this.outTradeNo = res.data.out_trade_no;
-						uni.setStorageSync('paySource', 'membercard');
-						this.$refs.choosePaymentPopup.getPayInfo(this.outTradeNo);
-					} else {
-						this.isSub = false;
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		headimgError() {
-			this.memberInfo.headimg = this.$util.getDefaultImage().head;
-		},
-		/**
-		 * 打开说明弹出层
-		 */
-		openExplainPopup() {
-			this.$refs.explainPopup.open();
-		},
-		/**
-		 * 打开说明弹出层
-		 */
-		closeExplainPopup() {
-			this.$refs.explainPopup.close();
-		},
-		getAgreement() {
-			this.$api.sendRequest({
-				url: '/supermember/api/membercard/agreement',
-				success: res => {
-					if (res.code == 0 && res.data && res.data.title != '' && res.data.content != '') {
-						this.agreement = res.data;
-					}
-				}
-			});
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
 		}
-	},
-	onBackPress(options) {
-		if (options.from === 'navigateBack') {
-			return false;
-		}
-		this.$util.redirectTo('/pages/member/index');
-		return true;
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-@import '@/pages_tool/member/public/css/card.scss';
+	@import './public/css/card.scss';
 </style>

pages_tool/member/collection.vue

@@ -0,0 +1,99 @@
+<template>
+	<view :style="themeColor">
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh" v-if="storeToken">
+			<view class="goods_list" slot="list">
+				<block v-if="collectionList.length > 0">
+					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index" @click.stop="toDetail(item)">
+						<view class="pic">
+							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill" @error="goodsImageError(index)"></image>
+						</view>
+						<view class="goods_info">
+							<view class="goods_name font-size-base">{{ item.sku_name }}</view>
+							<view class="goods_opection">
+								<view class="left  lineheight-clear ">
+									<text class="symbol price-style small">￥</text>
+									<text class="price price-style large">{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
+									<text class="symbol price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+								</view>
+								<view class="right">
+									<view class="cars" @click.stop="deleteItem(item.goods_id)">
+										<view class="icon iconfont icon-icon7"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<!-- 第一个列表为空时 -->
+				<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品" :isIndex="false"></ns-empty>
+				<ns-goods-recommend ref="goodsRecommend"></ns-goods-recommend>
+			</view>
+		</mescroll-uni>
+		<ns-login ref="login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+import collection from './public/js/collection.js';
+
+export default {
+	components: {
+		nsGoodsRecommend,
+		nsEmpty,
+		nsLogin,
+		loadingCover,
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+		mixins: [collection],
+		data() {
+			return {};
+		},
+		onShow() {
+			if (this.storeToken) {
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/collection');
+				});
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .fixed {
+		position: relative;
+		top: 0;
+	}
+
+	/deep/ .empty {
+		margin-top: 0 !important;
+	}
+
+	@import './public/css/collection.scss';
+</style>
+
+<style  lang="scss" scoped>
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
+</style>

pages_tool/member/contact.vue

@@ -10,8 +10,8 @@ export default {
 	data() {
 		return {};
 	},
-	onLoad(options) { },
-	onShow() { },
+	onLoad(options) {},
+	onShow() {},
 	methods: {}
 };
 </script>
@@ -21,7 +21,6 @@ export default {
 	width: 80%;
 	text-align: center;
 	margin: 0 auto;
-
 	image {
 		width: 500rpx;
 	}

pages_tool/member/coupon.vue

@@ -0,0 +1,416 @@
+<template>
+	<view :style="themeColor" :class="isIphoneX ? 'iphone-x' : ''">
+		<view class="cf-container color-line-border" v-if="storeToken">
+			<view class="tab">
+				<view @click="changeState(1)"><text :class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
+				<view @click="changeState(2)"><text :class="state == 2 ? 'color-base-text active color-base-border-bottom' : ''">已使用</text></view>
+				<view @click="changeState(3)"><text :class="state == 3 ? 'color-base-text active color-base-border-bottom' : ''">已过期</text></view>
+			</view>
+			<!-- <view class="coupon-head">
+				<view class="sort" :class="sort == 1 ? 'color-base-border color-base-text' : ''" @click="changeSort(1, '')">全部</view>
+				<view class="sort" :class="sort == 2 ? 'color-base-border color-base-text' : ''" @click="changeSort(2, 'reward')">满减券</view>
+				<view class="sort" :class="sort == 3 ? 'color-base-border color-base-text' : ''" @click="changeSort(3, 'discount')">折扣券</view>
+				<view class="sort" :class="sort == 4 ? 'color-base-border color-base-text' : ''" @click="changeSort(4, 'no_threshold')">无门槛券</view>
+			</view> -->
+		</view>
+
+		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCounponList" v-if="storeToken">
+			<block slot="list">
+				<view class="coupon-listone">
+					<view class="item" :class="['item',item.state != 1&&'item-disabled']" v-for="(item, index) in list" :key="index" @click="toGoodsList(item)" :style="{ backgroundColor: item.state != 1 ? '#FFF' : 'var(--main-color-shallow)' }">
+						<view class="item-base">
+							<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
+							<view>
+								<view class="use_price " v-if="item.type == 'divideticket'">
+									<text>￥</text>
+									{{ parseFloat(item.money) }}
+								</view>
+								<view class="use_price " v-if="item.type == 'reward'">
+									<text>￥</text>
+									{{ parseFloat(item.money) }}
+								</view>
+								<view class="use_price" v-else-if="item.type == 'discount'">
+									{{ parseFloat(item.discount) }}
+									<text>折</text>
+								</view>
+								<view class="use_condition font-size-tag" v-if="item.at_least > 0">
+									满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-else>无门槛优惠券</view>
+							</view>
+						</view>
+						<view class="item-info">
+							<view class="use_title">
+								<view class="title">{{ item.coupon_name }}</view>
+								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.state == 3 }">指定商品</view>
+								<view class="max_price" v-if="item.discount_limit != '0.00'">(最大优惠{{ item.discount_limit }}元)</view>
+								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
+							<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
+									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
+								</view> -->
+							</view>
+							<view class="use_time" v-if="item.end_time">有效期：{{ $util.timeStampTurnTime(item.end_time) }}
+							</view>
+							<view class="use_time" v-else>有效期：长期有效</view>
+						</view>
+						<view class="item-btn">
+							<view class="tag" v-if="item.state == 1">去使用</view>
+							<view class="tag disabled" v-if="item.state == 2">已使用</view>
+							<view class="tag disabled" v-if="item.state == 3">已过期</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="!list.length && showEmpty" class="margin-top cart-empty" :fixed="false">
+					<ns-empty :isIndex="true" :emptyBtn="{url: '/pages/index/index',text: '去逛逛'}" text="暂无优惠券"></ns-empty>
+				</view>
+			</block>
+		</mescroll-uni>
+		<ns-login ref="ns-login"></ns-login>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+export default {
+	components: {
+		nsEmpty,
+		nsLogin,
+		loadingCover,
+		MescrollUni,
+		// #ifdef MP-WEIXIN
+		privacyPopup
+		// #endif
+	},
+	data() {
+			return {
+				type: '',
+				types: '',
+				state: 1,
+				sort: 1,
+				list: [],
+				isIphoneX: false, //判断手机是否是iphoneX以上
+				showEmpty: false,
+				related_id: 0
+			};
+		},
+		onLoad(data) {
+			setTimeout( () => {
+				if (!this.addonIsExist.coupon) {
+					this.$util.showToast({
+						title: '商家未开启优惠券',
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(() => {
+						this.$util.redirectTo('/pages/index/index');
+					}, 2000);
+				}
+			},1000);
+
+			if (data.related_id) this.related_id = data.related_id ? data.related_id : 0;
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+		},
+		onShow() {
+			if (this.storeToken) {
+				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/coupon');
+				});
+			}
+		},
+		methods: {
+			//切换状态
+			changeState(state) {
+				this.list = [];
+				this.state = state;
+				this.$refs.mescroll.refresh(false);
+			},
+			changeSort(sort, types) {
+				this.list = [];
+				this.sort = sort;
+				this.types = types;
+				this.$refs.mescroll.refresh(false);
+			},
+			getMemberCounponList(mescroll) {
+				this.showEmpty = false;
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/memberpage',
+					data: {
+						page: mescroll.num,
+						page_size: mescroll.size,
+						state: this.state,
+						is_own: this.type,
+						type: this.types,
+						related_id: this.related_id
+					},
+					success: res => {
+						this.showEmpty = true;
+						let newArr = [];
+						let msg = res.message;
+						if (res.code == 0 && res.data) {
+							newArr = res.data.list;
+						} else {
+							this.$util.showToast({
+								title: msg
+							});
+						}
+						mescroll.endSuccess(newArr.length);
+						//设置列表数据
+						if (mescroll.num == 1) {
+							this.list = []; //如果是第一页需手动制空列表
+							this.related_id = 0;
+						}
+						this.list = this.list.concat(newArr); //追加新数据
+						let data = res.data;
+						if (data) this.couponList = data;
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					},
+					fail: res => {
+						mescroll.endErr();
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			imageError(index) {
+				this.list[index].logo = this.$util.getDefaultImage().goods;
+				this.$forceUpdate();
+			},
+			toGoodsList(item) {
+				if (item.state == 1) {
+					this.$util.redirectTo('/pages_goods/list', {
+						coupon: item.coupon_type_id
+					});
+				}
+			}
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.$refs.mescroll.refresh();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.cart-empty {
+		margin-top: 208rpx !important;
+	}
+
+	.active {
+		border-bottom: 4rpx solid;
+	}
+
+	.coupon-head {
+		display: flex;
+		background: #fff;
+		padding: 20rpx 50rpx;
+
+		.sort {
+			border: 2rpx solid #c5c5c5;
+			padding: 1rpx 20rpx;
+			border-radius: 10rpx;
+			cursor: pointer;
+			margin-right: 15rpx;
+		}
+	}
+
+	.cf-container {
+		background: #fff;
+		overflow: hidden;
+	}
+
+	.tab {
+		display: flex;
+		justify-content: space-between;
+		height: 86rpx;
+
+		>view {
+			text-align: center;
+			width: 33%;
+			height: 86rpx;
+
+			text {
+				display: inline-block;
+				line-height: 86rpx;
+				height: 80rpx;
+				font-size: 30rpx;
+			}
+		}
+	}
+
+	.coupon-listone {
+		margin: 0 30rpx;
+
+		.item {
+			display: flex;
+			background-color: #fff2f0;
+			background-size: 100% 100%;
+			border-radius: 20rpx;
+			align-items: stretch;
+			margin-top: $padding;
+			overflow: hidden;
+
+			&.item-disabled {
+				.item-base {
+					background: #e7e7e7 !important;
+				}
+			}
+
+			.item-base {
+				position: relative;
+				width: 197rpx;
+				min-width: 197rpx;
+				text-align: center;
+				background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				padding: 38rpx 10rpx 38rpx 18rpx;
+
+				&.disabled {
+					background: #dedede;
+				}
+
+				.coupon-line {
+					position: absolute;
+					right: 0;
+					top: 0;
+					height: 100%;
+				}
+
+				>view {
+					width: calc(100%);
+					height: auto;
+					position: relative;
+					top: 50%;
+					transform: translate(0, -50%);
+				}
+
+				.use_price {
+					font-size: 60rpx;
+					line-height: 1;
+					color: #fff;
+
+					text {
+						font-size: $font-size-toolbar;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				.use_condition {
+					color: #fff;
+					margin-top: $padding;
+
+					&.margin_top_none {
+						margin-top: 0;
+					}
+
+					&.disabled {
+						color: $color-tip;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					left: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 0 30rpx 30rpx 0;
+				}
+			}
+
+			.item-btn {
+				position: relative;
+				width: 160rpx;
+				min-width: 160rpx;
+				align-self: center;
+
+				view {
+					width: 100rpx;
+					height: 50rpx;
+					border-radius: $border-radius;
+					line-height: 50rpx;
+					margin: auto;
+					text-align: center;
+					background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
+					color: var(--btn-text-color);
+					;
+					font-size: $font-size-tag;
+
+					&.disabled {
+						background: $color-line !important;
+						color: $color-tip !important;
+					}
+				}
+
+				&::after {
+					position: absolute;
+					content: '';
+					background-color: #f8f8f8;
+					right: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+					height: 30rpx;
+					width: 15rpx;
+					border-radius: 30rpx 0 0 30rpx;
+				}
+			}
+
+			.item-info {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				margin-left: $padding;
+				overflow: hidden;
+				background-repeat-x: no-repeat;
+				background-repeat-y: repeat;
+
+				.use_time {
+					padding: $padding 0;
+					border-top: 2rpx dashed #cccccc;
+					font-size: $font-size-activity-tag;
+					color: #909399;
+				}
+
+				.use_title {
+					font-size: $font-size-base;
+					font-weight: 500;
+					padding: $padding 0;
+
+					.title {
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.max_price {
+						font-weight: 400;
+						font-size: $font-size-tag;
+					}
+				}
+			}
+		}
+	}
+	.truncate {
+		overflow: hidden;
+		-o-text-overflow: ellipsis;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+</style>

pages_tool/member/finance/account/balance_detail.vue

@@ -1,371 +0,0 @@
-<template>
-	<view :style="themeColor">
-		<!-- 		<scroll-view id="tab-bar" class="order-nav" :scroll-x="true" :show-scrollbar="false" :scroll-into-view="scrollInto">
-			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
-				<text class="uni-tab-item-title" :class="statusIndex == orderStatus ? 'uni-tab-item-title-active' : ''">{{ statusItem.name }}</text>
-			</view>
-		</scroll-view> -->
-		<!-- 	<view class="tab color-bg">
-			<view class="tab-left">
-				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
-					<view class="uni-input">
-						{{ date }}
-						<text class="iconfont icon-iconangledown"></text>
-					</view>
-				</picker>
-			</view>
-			<view class="tab-right">
-				<picker @change="bindPickerChange" :value="balanceIndex" :range="balanceType" class="picker" range-key="label">
-					<text class="desc uni-input">{{ balanceType[balanceIndex].label }}</text>
-					<text class="iconfont icon-iconangledown"></text>
-				</picker>
-			</view>
-		</view> -->
-		<mescroll-uni @getData="getData" ref="mescroll">
-			<block slot="list">
-				<!-- 明细列表 -->
-				<block v-if="dataList.length > 0">
-					<view class="detailed-wrap">
-						<view class="balances" v-for="(item, index) in dataList" :key="index">
-							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img"
-								v-if="item.account_data > 0"></image>
-							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix">
-							</image>
-							<view class="balances-info" @click="toFromDetail(item)">
-								<text class="title">{{ item.remark }}</text>
-								<!-- 	<text>{{ item.remark }}</text> -->
-								<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
-							</view>
-							<view class="balances-num">
-								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ?
-									'+' + item.account_data : item.account_data }}元</text>
-							</view>
-						</view>
-					</view>
-				</block>
-				<block v-else><ns-empty :isIndex="false" text="暂无余额明细"></ns-empty></block>
-				<!-- 无明细列表 -->
-			</block>
-		</mescroll-uni>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-
-export default {
-	components: {
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif
-	},
-	data() {
-		const currentDate = this.getDate({
-			format: true
-		});
-		return {
-			dataList: [],
-			statusList: [{
-				name: '全部',
-				id: '0'
-			}, {
-				name: '收入',
-				id: '1'
-			}, {
-				name: '支出',
-				id: '2'
-			}],
-			scrollInto: '',
-			orderStatus: '0',
-			date: currentDate,
-			searchType: {
-				from_type: 0,
-				date: ''
-			},
-			balanceType: [{
-				label: '全部',
-				value: '0'
-			}], //积分类型
-			balanceIndex: 0,
-			related_id: 0
-		};
-	},
-	onLoad(option) {
-		if (option.group_id) this.related_id = option.group_id ? option.group_id : 0;
-		if (option.from_type) this.searchType.from_type = option.from_type;
-		if (option.related_id) this.related_id = option.related_id ? option.related_id : 0;
-		if (option.status) this.orderStatus = option.status;
-		this.getbalanceType();
-	},
-	onShow() {
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/balance');
-			});
-		}
-	},
-	methods: {
-		bindDateChange: function (e) {
-			var temp = e.target.value;
-			var tempArr = temp.split('-');
-			this.date = tempArr[0] + '年' + tempArr[1] + '月';
-			this.searchType.date = e.target.value;
-			this.$refs.mescroll.refresh();
-		},
-		getDate(type) {
-			const date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth() + 1;
-			let day = date.getDate();
-
-			if (type === 'start') {
-				year = year - 60;
-			} else if (type === 'end') {
-				year = year + 2;
-			}
-			month = month > 9 ? month : '0' + month;
-			day = day > 9 ? day : '0' + day;
-			return `${year}年${month}月`;
-		},
-		bindPickerChange(e) {
-			this.balanceIndex = e.detail.value;
-			this.searchType.from_type = this.balanceType[this.balanceIndex].value;
-			this.$refs.mescroll.refresh();
-		},
-		//获取分类类型
-		getbalanceType() {
-			this.$api.sendRequest({
-				url: '/api/memberaccount/fromType',
-				success: res => {
-					let balanceType = Object.assign(res.balance, res.balance_money),
-						typeArr = [{
-							label: '全部',
-							value: '0'
-						}];
-					for (var index in balanceType) {
-						typeArr.push({
-							label: balanceType[index].type_name,
-							value: index
-						})
-					}
-					this.balanceType = typeArr;
-				}
-			});
-		},
-		ontabtap(e) {
-			let index = e.currentTarget.dataset.current;
-			this.orderStatus = this.statusList[index].id;
-			this.$refs.mescroll.refresh();
-		},
-		getData(mescroll) {
-			this.$api.sendRequest({
-				url: '/api/memberaccount/page',
-				data: {
-					page_size: mescroll.size,
-					page: mescroll.num,
-					account_type: 'balance,balance_money',
-					from_type: this.searchType.from_type,
-					date: this.searchType.date,
-					related_id: this.related_id
-				},
-				success: res => {
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) {
-						this.dataList = []; //如果是第一页需手动制空列表
-						this.related_id = 0;
-					}
-					this.dataList = this.dataList.concat(newArr); //追加新数据
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		toFromDetail(item) {
-			if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
-				this.$util.redirectTo('/pages_order/detail/detail', {
-					order_id: item.type_tag
-				});
-			} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
-				this.$util.redirectTo('/pages_order/detail/detail', {
-					order_id: item.type_tag
-				});
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.detailed-wrap {
-	padding-top: 20rpx;
-
-	margin: 24rpx;
-}
-
-.tab {
-	position: fixed;
-	top: 0;
-	width: 100%;
-	z-index: 10;
-	display: flex;
-	justify-content: space-between;
-	height: 80rpx;
-	background-color: $color-bg;
-
-	view {
-		flex: 1;
-		text-align: center;
-		line-height: 80rpx;
-
-		text {
-			margin-left: 10rpx;
-			font-size: $font-size-base;
-		}
-	}
-
-	.tab-left {
-		display: flex;
-		padding-left: 46rpx;
-	}
-
-	.tab-right {
-		display: flex;
-		justify-content: flex-end;
-		padding-right: 26rpx;
-	}
-}
-
-.order-nav {
-	width: 100vw;
-	height: 70rpx;
-	display: flex;
-	flex-direction: row;
-	/* #ifndef APP-PLUS */
-	white-space: nowrap;
-	/* #endif */
-	background: #fff;
-	border-bottom-left-radius: 24rpx;
-	border-bottom-right-radius: 24rpx;
-	padding-bottom: 30rpx;
-	position: fixed;
-	left: 0;
-	z-index: 998;
-
-	.uni-tab-item {
-		width: 33.33%;
-		text-align: center;
-		/* #ifndef APP-PLUS */
-		display: inline-block;
-		/* #endif */
-		flex-wrap: nowrap;
-	}
-
-	.uni-tab-item-title {
-		color: #555;
-		font-size: $font-size-base;
-		display: block;
-		height: 64rpx;
-		line-height: 64rpx;
-		border-bottom: 4rpx solid #fff;
-		padding: 0 10rpx;
-		flex-wrap: nowrap;
-		/* #ifndef APP-PLUS */
-		white-space: nowrap;
-		/* #endif */
-	}
-
-	.uni-tab-item-title-active {
-		display: block;
-		height: 64rpx;
-		padding: 0 10rpx;
-	}
-
-	::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		color: transparent;
-	}
-}
-
-.balances {
-	padding: $margin-both 24rpx;
-	// margin: 0 $margin-both;
-	box-sizing: border-box;
-	display: flex;
-	align-items: flex-start;
-	border-bottom: 2rpx solid $color-line;
-	background: #fff;
-	margin-bottom: 20rpx;
-	border-radius: 24rpx;
-
-	image {
-		width: 54rpx;
-		height: 54rpx;
-		border-radius: 50%;
-		padding-top: 10rpx;
-	}
-
-	.balances-info {
-		flex: 1;
-		margin-left: 16rpx;
-		display: flex;
-		flex-direction: column;
-
-		text {
-			font-size: $font-size-toolbar;
-			line-height: 1;
-
-			&:last-child {}
-
-			&:nth-child(2) {
-				margin-top: $margin-updown;
-				font-size: $font-size-activity-tag;
-				color: $color-tip;
-			}
-
-			&:nth-child(3) {
-				font-size: $font-size-activity-tag;
-				margin-top: $margin-updown;
-				color: $color-tip;
-			}
-		}
-	}
-
-	.balances-num {
-		text {
-			line-height: 1;
-			font-size: $font-size-toolbar;
-			font-weight: 500;
-			color: #09c15f;
-			font-weight: 700;
-		}
-	}
-}
-
-.empty {
-	width: 100%;
-	height: 500rpx;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	align-items: center;
-}
-</style>

pages_tool/member/finance/account/pay_password.vue

@@ -1,280 +0,0 @@
-<template>
-	<view :style="themeColor" class="container">
-		<view class="tips" v-if="step != 0">请输入6位支付密码，建议不要使用重复或连续数字</view>
-		<view class="tips" v-else>验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码</view>
-		<view class="password-wrap">
-			<myp-one :maxlength="step == 0 ? 4 : 6" :is-pwd="step != 0" @input="input" ref="input"
-				:auto-focus="true"></myp-one>
-			<view v-show="step == 0" class="dynacode"
-				:class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">
-				{{ dynacodeData.codeText }}
-			</view>
-			<view class="action-tips" v-show="step == 0">输入短信验证码</view>
-			<view class="action-tips" v-show="step == 1">请设置支付密码</view>
-			<view class="action-tips" v-show="step == 2">请再次输入</view>
-			<view class="btn color-base-bg color-base-border" :class="{ disabled: !isClick }" @click="confirm">确认</view>
-		</view>
-	</view>
-</template>
-
-<script>
-
-export default {
-	components: {
-		mypOne: () => import('@/components/myp-one/myp-one.vue')
-	},
-	data() {
-		return {
-			isClick: false,
-			step: 1,
-			key: '', // 短信key
-			code: '', // 动态码
-			password: '', // 密码
-			repassword: '', // 重复密码
-			isSub: false, // 防重复提交
-			back: '', // 返回页
-			dynacodeData: {
-				seconds: 120,
-				timer: null,
-				codeText: '获取验证码',
-				isSend: false
-			}
-		};
-	},
-	onLoad(option) {
-		if (option.back) this.back = option.back;
-
-		// 判断登录
-		if (!this.storeToken) {
-			this.$util.redirectTo('/pages_tool/login/login');
-		} else {
-			if (this.memberInfo.mobile == '') {
-				uni.showModal({
-					title: '提示',
-					content: '设置支付密码需要先绑定手机号,是否立即绑定?',
-					success: res => {
-						if (res.confirm) {
-							this.$util.redirectTo('/pages_tool/member/info', {
-								action: 'mobile',
-								back: this.back
-							}, 'redirectTo');
-						} else {
-							if (this.back) this.$util.redirectTo(this.back);
-							else this.$util.redirectTo('/pages/member/index');
-						}
-					}
-				});
-			} else {
-				this.step = 0;
-				this.sendMobileCode();
-			}
-		}
-	},
-	methods: {
-		input(val) {
-			if (this.step == 0) {
-				if (val.length == 4) {
-					this.isClick = true;
-					this.code = val;
-				} else {
-					this.isClick = false;
-				}
-			} else if (this.step == 1) {
-				if (val.length == 6) {
-					this.isClick = true;
-					this.password = val;
-				} else {
-					this.isClick = false;
-				}
-			} else {
-				if (val.length == 6) {
-					this.isClick = true;
-					this.repassword = val;
-				} else {
-					this.isClick = false;
-				}
-			}
-		},
-		confirm() {
-			if (this.isClick) {
-				if (this.step == 0) {
-					this.$api.sendRequest({
-						url: '/api/member/verifypaypwdcode',
-						data: {
-							code: this.code,
-							key: this.key
-						},
-						success: res => {
-							if (res.code == 0) {
-								this.$refs.input.clear();
-								this.isClick = false;
-								this.step = 1;
-							} else {
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						}
-					});
-				} else if (this.step == 1) {
-					this.$refs.input.clear();
-					this.isClick = false;
-					this.step = 2;
-				} else {
-					if (this.password == this.repassword) {
-						if (this.isSub) return;
-						this.isSub = true;
-						this.$api.sendRequest({
-							url: '/api/member/modifypaypassword',
-							data: {
-								key: this.key,
-								code: this.code,
-								password: this.password
-							},
-							success: res => {
-								if (res.code >= 0) {
-									this.$util.showToast({
-										title: '修改成功'
-									});
-									setTimeout(() => {
-										if (this.back) this.$util.redirectTo(this.back, {},
-											'redirectTo');
-										else this.$util.redirectTo('/pages/member/index');
-									}, 2000);
-								} else {
-									this.initInfo();
-									this.$util.showToast({
-										title: res.message
-									});
-								}
-							}
-						});
-					} else {
-						this.$util.showToast({
-							title: '两次输入的密码不一致',
-							success: res => {
-								this.initInfo();
-							}
-						});
-					}
-				}
-			}
-		},
-		initInfo() {
-			this.isClick = false;
-			this.step = 1;
-			this.password = '';
-			this.repassword = '';
-			this.oldpassword = '';
-			this.isSub = false;
-			this.$refs.input.clear();
-		},
-		/**
-		 * 发送手机动态码
-		 */
-		sendMobileCode() {
-			if (this.dynacodeData.seconds != 120) return;
-			if (this.dynacodeData.isSend) return;
-			this.dynacodeData.isSend = true;
-
-			this.$api.sendRequest({
-				url: '/api/member/paypwdcode',
-				success: res => {
-					this.dynacodeData.isSend = false;
-					if (res.code >= 0) {
-						this.key = res.data.key;
-
-						if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) {
-							this.dynacodeData.timer = setInterval(() => {
-								this.dynacodeData.seconds--;
-								this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
-							}, 1000);
-						}
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				},
-				fail: () => {
-					this.$util.showToast({
-						title: 'request:fail'
-					});
-					this.dynacodeData.isSend = false;
-				}
-			});
-		}
-	},
-	filters: {
-		mobile(mobile) {
-			return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
-		}
-	},
-	watch: {
-		'dynacodeData.seconds': {
-			handler(newValue, oldValue) {
-				if (newValue == 0) {
-					clearInterval(this.dynacodeData.timer);
-					this.dynacodeData = {
-						seconds: 120,
-						timer: null,
-						codeText: '获取动态码',
-						isSend: false
-					};
-				}
-			},
-			immediate: true,
-			deep: true
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.container {
-	width: 100vw;
-	height: 100vh;
-	background: #fff;
-
-	.tips {
-		width: 60%;
-		margin: 0 auto;
-		text-align: center;
-		padding-top: 100rpx;
-	}
-
-	.password-wrap {
-		width: 80%;
-		margin: 0 auto;
-		margin-top: 40rpx;
-
-		.action-tips {
-			text-align: center;
-			font-weight: 600;
-			margin-top: 80rpx;
-		}
-
-		.dynacode {
-			line-height: 1;
-			margin-top: 20rpx;
-			font-size: $font-size-tag;
-		}
-
-		.btn {
-			margin: 0 auto;
-			margin-top: 30rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius: $border-radius;
-			color: #fff;
-			text-align: center;
-
-			&.disabled {
-				background: #ccc !important;
-				border-color: #ccc !important;
-				color: #fff;
-			}
-		}
-	}
-}
-</style>

pages_tool/member/finance/transaction/apply_withdrawal.vue

@@ -1,430 +0,0 @@
-<template>
-	<view class="container" :style="themeColor">
-		<view class="bank-account-wrap" @click="goAccount()">
-			<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type">
-				<text class="tx-to">提现到</text>
-				<view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">微信默认钱包</view>
-				<view class="tx-bank" v-else>{{ bankAccountInfo.bank_account }}</view>
-				<view class="tx-img" v-if="bankAccountInfo.withdraw_type == 'alipay'">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/alipay.png')" mode="widthFix"></image>
-				</view>
-				<view class="tx-img" v-else-if="bankAccountInfo.withdraw_type == 'bank'">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/bank.png')" mode="widthFix"></image>
-				</view>
-				<view class="tx-img" v-else-if="bankAccountInfo.withdraw_type == 'wechatpay'">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/wechatpay.png')" mode="widthFix">
-					</image>
-				</view>
-			</view>
-			<text class="tx-to" v-else>请添加提现方式</text>
-			<view class="iconfont icon-right"></view>
-		</view>
-		<view class="empty-box"></view>
-		<view class="withdraw-wrap">
-			<view class="withdraw-wrap-title">提现金额</view>
-			<view class="money-wrap">
-				<text class="unit">{{ $lang('common.currencySymbol') }}</text>
-				<input type="digit" class="withdraw-money" v-model="withdrawMoney" />
-				<view class="delete" @click="remove" v-if="withdrawMoney">
-					<image :src="$util.img('public/uniapp/member/apply_withdrawal/close.png')" mode="widthFix"></image>
-				</view>
-			</view>
-			<view class="bootom">
-				<view>
-					<text class="color-tip">可提现余额：{{ $lang('common.currencySymbol') }}{{
-						withdrawInfo.member_info.balance_money | moneyFormat }}</text>
-					<text class="all-tx color-base-text" @click="allTx">全部提现</text>
-				</view>
-			</view>
-			<view class="desc">
-				<text>最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawInfo.config.min | moneyFormat }}</text>
-				<text>，手续费为{{ withdrawInfo.config.rate + '%' }}</text>
-			</view>
-		</view>
-
-		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal"
-			:class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
-			提现
-		</view>
-
-		<view class="recoend" @click="toWithdrawal">
-			<view class="recoend-con">提现记录</view>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	data() {
-		return {
-			withdrawInfo: {
-				config: {
-					is_use: 0,
-					min: 1,
-					rate: 0
-				},
-				member_info: {
-					balance_money: 0,
-					balance_withdraw: 0,
-					balance_withdraw_apply: 0
-				}
-			},
-			bankAccountInfo: {},
-			withdrawMoney: '',
-			isSub: false
-		};
-	},
-	onShow() {
-		if (this.storeToken) {
-			this.getWithdrawInfo();
-			this.getBankAccountInfo();
-		} else {
-			this.$util.redirectTo('/pages_tool/login/login', {
-				back: '/pages_tool/member/apply_withdrawal'
-			});
-		}
-	},
-	methods: {
-		toWithdrawal() {
-			this.$util.redirectTo('/pages_tool/member/withdrawal');
-		},
-		//全部提现
-		allTx() {
-			this.withdrawMoney = this.withdrawInfo.member_info.balance_money;
-		},
-		// 删除提现金额
-		remove() {
-			this.withdrawMoney = '';
-		},
-		/**
-		 * 获取提现信息
-		 */
-		getWithdrawInfo() {
-			this.$api.sendRequest({
-				url: '/api/memberwithdraw/info',
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.withdrawInfo = res.data;
-						if (this.withdrawInfo.config.is_use == 0) {
-							this.$util.showToast({
-								title: '未开启提现'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages/member/index');
-							}, 1500);
-						}
-					}
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		/**
-		 * 银行账号信息
-		 */
-		getBankAccountInfo() {
-			this.$api.sendRequest({
-				url: '/api/memberbankaccount/defaultinfo',
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.bankAccountInfo = res.data;
-					}
-				}
-			});
-		},
-		verify() {
-			if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) {
-				this.$util.showToast({
-					title: '请输入提现金额'
-				});
-				return false;
-			}
-			if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
-				this.$util.showToast({
-					title: '提现金额超出可提现金额'
-				});
-				return false;
-			}
-			if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) {
-				this.$util.showToast({
-					title: '提现金额小于最低提现金额'
-				});
-				return false;
-			}
-			return true;
-		},
-		withdraw() {
-			if (!this.bankAccountInfo.withdraw_type) {
-				this.$util.showToast({
-					title: '请先添加提现方式'
-				});
-				return;
-			}
-			if (this.verify()) {
-				if (this.isSub) return;
-				this.isSub = true;
-
-				var applet_type = 0;
-				if (this.bankAccountInfo.withdraw_type == 'wechatpay') {
-					// #ifdef MP
-					applet_type = 1;
-					// #endif
-				}
-
-				// #ifdef MP
-				this.subscribeMessage(() => {
-					this.$api.sendRequest({
-						url: '/api/memberwithdraw/apply',
-						data: {
-							apply_money: this.withdrawMoney,
-							transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
-							realname: this.bankAccountInfo.realname,
-							mobile: this.bankAccountInfo.mobile,
-							bank_name: this.bankAccountInfo.branch_bank_name,
-							account_number: this.bankAccountInfo.bank_account,
-							applet_type: applet_type
-						},
-						success: res => {
-							if (res.code >= 0) {
-								this.$util.showToast({
-									title: '提现申请成功'
-								});
-								setTimeout(() => {
-									this.$util.redirectTo(
-										'/pages_tool/member/withdrawal', {},
-										'redirectTo');
-								}, 1500);
-							} else {
-								this.isSub = false;
-								this.$util.showToast({
-									title: res.message
-								});
-							}
-						},
-						fail: res => {
-							this.isSub = false;
-						}
-					});
-				});
-				// #endif
-
-				// #ifndef MP-WEIXIN
-				this.$api.sendRequest({
-					url: '/api/memberwithdraw/apply',
-					data: {
-						apply_money: this.withdrawMoney,
-						transfer_type: this.bankAccountInfo.withdraw_type, //转账提现类型
-						realname: this.bankAccountInfo.realname,
-						mobile: this.bankAccountInfo.mobile,
-						bank_name: this.bankAccountInfo.branch_bank_name,
-						account_number: this.bankAccountInfo.bank_account,
-						applet_type: applet_type
-					},
-					success: res => {
-						if (res.code >= 0) {
-							this.$util.showToast({
-								title: '提现申请成功'
-							});
-							setTimeout(() => {
-								this.$util.redirectTo('/pages_tool/member/withdrawal', {},
-									'redirectTo');
-							}, 1500);
-						} else {
-							this.isSub = false;
-							this.$util.showToast({
-								title: res.message
-							});
-						}
-					},
-					fail: res => {
-						this.isSub = false;
-					}
-				});
-				// #endif
-			}
-		},
-		goAccount() {
-			this.$util.redirectTo(
-				'/pages_tool/member/account', {
-				back: '/pages_tool/member/apply_withdrawal'
-			},
-				'redirectTo'
-			);
-		},
-		/**
-		 * 微信订阅消息
-		 */
-		subscribeMessage(callback) {
-			this.$api.sendRequest({
-				url: '/weapp/api/weapp/messagetmplids',
-				data: {
-					keywords: 'USER_WITHDRAWAL_SUCCESS'
-				},
-				success: res => {
-					if (res.code == 0 && res.data.length) {
-						uni.requestSubscribeMessage({
-							tmplIds: res.data,
-							fail: res => {
-								console.log('fail', res);
-							},
-							complete: () => {
-								callback();
-							}
-						});
-					} else {
-						callback();
-					}
-				},
-				fail: res => {
-					callback();
-				}
-			});
-		}
-	},
-};
-</script>
-
-<style lang="scss">
-.container {
-	width: 100vw;
-	height: 100vh;
-	background: #fff;
-}
-
-.empty-box {
-	height: 20rpx;
-}
-
-.bank-account-wrap {
-	margin: 0 20rpx;
-	padding: 20rpx 30rpx;
-	border-bottom: 2rpx solid #f7f7f7;
-	position: relative;
-
-	.tx-wrap {
-		display: flex;
-		justify-content: space-between;
-		margin-right: 60rpx;
-
-		.tx-bank {
-			margin-right: 60rpx;
-			flex: 1;
-			margin-left: 10rpx;
-			text-align: right;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-
-		.tx-img {
-			position: absolute;
-			right: 100rpx;
-			top: 50%;
-			transform: translateY(-50%);
-			width: 40rpx;
-			height: 40rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.iconfont {
-		position: absolute;
-		right: 40rpx;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-}
-
-.withdraw-wrap {
-	margin: 0 20rpx;
-	padding: 30rpx;
-	border-radius: 16rpx;
-	box-shadow: rgba(110, 110, 110, 0.09) 0 0 20rpx 0;
-
-	.money-wrap {
-		padding: 20rpx 0;
-		border-bottom: 2rpx solid #eee;
-		display: flex;
-		align-items: baseline;
-
-		.unit {
-			font-size: 60rpx;
-			line-height: 1.3;
-		}
-
-		.withdraw-money {
-			height: 70rpx;
-			line-height: 70rpx;
-			min-height: 70rpx;
-			padding-left: 20rpx;
-			font-size: 60rpx;
-			flex: 1;
-			font-weight: bolder;
-		}
-
-		.delete {
-			width: 40rpx;
-			height: 40rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.bootom {
-		display: flex;
-		padding-top: 20rpx;
-
-		text {
-			line-height: 1;
-			flex: 2;
-		}
-
-		.all-tx {
-			padding-left: 10rpx;
-		}
-	}
-}
-
-.btn {
-	margin: 0 30rpx;
-	margin-top: 60rpx;
-	height: 80rpx;
-	line-height: 80rpx;
-	border-radius: $border-radius;
-	color: #fff;
-	text-align: center;
-	background-color: var(--main-color);
-
-	&.disabled {
-		background: #ccc;
-		border-color: #ccc;
-		color: #fff;
-	}
-}
-
-.recoend {
-	margin-top: 40rpx;
-
-	.recoend-con {
-		text-align: center;
-	}
-}
-
-.desc {
-	font-size: $font-size-tag;
-	color: #999;
-}
-</style>

pages_tool/member/footprint.vue

@@ -10,14 +10,11 @@
 						<view class="datetime">{{ datetime(item) }}</view>
 						<view class="goods-item" :class="{ manage: manage }">
 							<view class="checkbox-wrap" v-if="manage" @click="singleElection(item)">
-								<text class="iconfont"
-									:class="$util.inArray(item.id, idArr) != -1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
+								<text class="iconfont" :class="$util.inArray(item.id, idArr) != -1 ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></text>
 							</view>
 							<view class="goods-img" @click="toDetail(item)">
-								<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)">
-								</image>
-								<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
-								</view>
+								<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
+								<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
 							</view>
 							<view class="info-wrap" @click="toDetail(item)">
 								<view class="name-wrap">
@@ -27,28 +24,22 @@
 								<view class="lineheight-clear">
 									<view class="discount-price">
 										<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-										<text class="price price-style large">{{
-											parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-										<text class="unit price-style small">.{{
-											parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+										<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+										<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 									</view>
-									<view class="member-price-tag"
-										v-if="item.member_price && item.member_price == showPrice(item)">
+									<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
 										<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 									</view>
 									<view class="member-price-tag" v-else-if="item.promotion_type == 1">
-										<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix">
-										</image>
+										<image :src="$util.img('public/uniapp/index/discount.png')" mode="widthFix"></image>
 									</view>
 								</view>
 								<view class="pro-info">
-									<view class="delete-price font-size-activity-tag color-tip price-font"
-										v-if="showMarketPrice(item)">
+									<view class="delete-price font-size-activity-tag color-tip price-font" v-if="showMarketPrice(item)">
 										<text class="unit">{{ $lang('common.currencySymbol') }}</text>
 										<text>{{ showMarketPrice(item) }}</text>
 									</view>
-									<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{
-										item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale font-size-activity-tag color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
 								</view>
 							</view>
 						</view>
@@ -58,12 +49,10 @@
 
 				<view class="bottom-wrap" v-if="goodsList.length && manage">
 					<view class="all-election" @click="allElection">
-						<view class="iconfont"
-							:class="isAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+						<view class="iconfont" :class="isAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 						<text>全选</text>
 					</view>
-					<view class="action-btn"><button type="primary" @click="deleteFootprint()" class="delete"
-							:class="{ disabled: selected }">删除</button></view>
+					<view class="action-btn"><button type="primary" @click="deleteFootprint()" class="delete" :class="{ disabled: selected }">删除</button></view>
 				</view>
 			</block>
 		</mescroll-uni>
@@ -75,15 +64,22 @@
 
 <script>
 var dateList = [];
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 
 export default {
 	components: {
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsEmpty,
+		nsLogin,
+		loadingCover,
+		MescrollUni,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
+		privacyPopup
 		// #endif
 	},
 	data() {
@@ -183,8 +179,8 @@ export default {
 			let imgs = imgStr.split(',');
 			return imgs[0]
 				? this.$util.img(imgs[0], {
-					size: 'mid'
-				})
+						size: 'mid'
+				  })
 				: this.$util.getDefaultImage().goods;
 		},
 		imgError(index) {
@@ -254,7 +250,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function (nVal, oVal) {
+		storeToken: function(nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
@@ -268,5 +264,5 @@ export default {
 	margin-top: 0 !important;
 }
 
-@import '../public/css/footprint.scss';
+@import './public/css/footprint.scss';
 </style>

pages_tool/member/index.vue

@@ -29,7 +29,7 @@
 				<!-- 退出登录和账号注销按钮 -->
 				<view class="action-buttons" v-if="storeToken">
 					<view class="action-btn cancel-btn" @click="cancellation">{{ $lang('cancellation') }}</view>
-					<view class="action-btn logout-btn" @click="logout">{{ $lang('logout') }}</view>
+					<view class="action-btn logout-btn" @click="logout">{{ $lang('logout') }}</view>					
 				</view>
 			</view>
 
@@ -74,22 +74,15 @@
 </template>
 
 <script>
-
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 import diyJs from '@/common/js/diy.js';
-import indexJs from '../public/js/index.js';
+import indexJs from './public/js/index.js';
 
 export default {
 	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsNavbar: () => import('@/components/ns-navbar/ns-navbar.vue'),
-		nsCopyright: () => import('@/components/ns-copyright/ns-copyright.vue'),
-		nsBirthdayGift: () => import('@/components/ns-birthday-gift/ns-birthday-gift.vue'),
-		nsNewGift: () => import('@/components/ns-new-gift/ns-new-gift.vue'),
-		hoverNav: () => import('@/components/hover-nav/hover-nav.vue'),
-
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif		
+		uniPopup,
+		nsNavbar
 	},
 	mixins: [diyJs, indexJs],
 	methods: {
@@ -163,6 +156,7 @@ export default {
 		color: #F4391c
 	}
 }
+
 </style>
 
 <style scoped>
@@ -170,14 +164,33 @@ export default {
 	background: none !important;
 }
 
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
+
 .choose-store>>>.goodslist-uni-popup-box {
 	width: 80%;
 }
 
+/deep/ .placeholder {
+	height: 0;
+}
+
+/deep/::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
+
 .hide {
 	display: none;
 }
 
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
+
 .action-buttons {
 	display: flex;
 	flex-direction: column;
@@ -203,28 +216,7 @@ export default {
 }
 
 .cancel-btn {
-	background-color: var(--main-color);
+	background-color:var(--main-color);
 	color: #fff;
 }
-</style>
-
-<style lang="scss" scoped>
-/deep/ .diy-index-page .uni-popup .uni-popup__wrapper-box {
-	border-radius: 0;
-}
-
-/deep/ .placeholder {
-	height: 0;
-}
-
-/deep/::-webkit-scrollbar {
-	width: 0;
-	height: 0;
-	background-color: transparent;
-	display: none;
-}
-
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
-</style>
+</style>

pages_tool/member/info.vue

@@ -2,22 +2,21 @@
 	<view :style="themeColor">
 		<view v-if="indent == 'all' && memberInfo" class="info-wrap">
 			<!-- 头像@click="headImage" -->
-			<view class="info-list-cell info-item info-list-con" hover-class="cell-hover">
+			<view  class="info-list-cell info-item info-list-con" hover-class="cell-hover">
 				<text class="cell-tit">头像</text>
 				<view class="info-list-head cell-tip">
-					<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head"
-						@error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill" />
+					<image :src="memberInfo.headimg ? $util.img(memberInfo.headimg) : $util.getDefaultImage().head" @error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 				</view>
 				<text style="margin-right: 20rpx;"></text>
 			</view>
 			<!-- 账号 -->
-			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-if="memberInfo.is_edit_username == 1" @click="modifyInfo('username')">
+		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-if="memberInfo.is_edit_username == 1" @click="modifyInfo('username')">
 				<text class="cell-tit">账号</text>
 				<text class="cell-tip">{{ memberInfoformData.number }}</text>
 				<text class="cell-more"></text>
 			</view> -->
 			<!-- 账号 -->
-			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-else>
+		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" v-else>
 				<text class="cell-tit">{{ $lang('account') }}</text>
 				<text class="cell-tip cell-tip1">{{ memberInfoformData.number }}</text>
 			</view> -->
@@ -53,7 +52,7 @@
 				<text class="cell-more"></text>
 			</view>
 			<!-- 密码 -->
-			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('password')">
+		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('password')">
 				<text class="cell-tit">密码</text>
 				<text class="cell-more"></text>
 			</view> -->
@@ -63,7 +62,7 @@
 				<text class="cell-more"></text>
 			</view> -->
 
-			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
+		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
 				<text class="cell-tit">所在地址</text>
 				<text class="cell-tip" v-if="memberInfo.full_address">{{ memberInfo.full_address }}
 					{{ memberInfo.address }}</text>
@@ -76,11 +75,11 @@
 				<text class="cell-tit">注销账号</text>
 				<text class="cell-more"></text>
 			</view>
-			<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
+		<!-- 	<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="cancellation()" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
 				<text class="cell-tit">注销账号</text>
 				<text class="cell-more"></text>
 			</view> -->
-			<!-- 		<view class="info-list-cell info-list-con" hover-class="cell-hover">
+	<!-- 		<view class="info-list-cell info-list-con" hover-class="cell-hover">
 				<text class="cell-tit">版本号</text>
 				<text class="cell-tip cell-tip1">{{ version }}</text>
 			</view> -->
@@ -108,227 +107,227 @@
 </template>
 
 <script>
-import info from '../public/js/info.js';
+	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
+	import info from './public/js/info.js';
 
-export default {
-	components: {
-		uniNavBar: () => import('@/components/uni-nav-bar/uni-nav-bar.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-	},
-	data() {
-		return {
-			version: ''
-		};
-	},
-	mixins: [info],
-	onLoad(data) {
-		this.version = this.$config.version;
-	},
-};
+	export default {
+		components: {
+			uniNavBar
+		},
+		data() {
+			return {
+				version: ''
+			};
+		},
+		mixins: [info],
+		onLoad(data) {
+			this.version = this.$config.version;
+		},
+	};
 </script>
 
 <style lang="scss">
-.info-head {
-	.head-nav {
-		width: 100%;
-		height: var(--status-bar-height);
-		background: #ffffff;
+	.info-head {
+		.head-nav {
+			width: 100%;
+			height: var(--status-bar-height);
+			background: #ffffff;
+		}
+
+		.head-nav.active {
+			padding-top: 40rpx;
+		}
 	}
 
-	.head-nav.active {
-		padding-top: 40rpx;
-	}
-}
-
-.captcha {
-	width: 170rpx;
-	height: 50rpx;
-}
-
-.info-list-cell {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 24rpx 30rpx;
-	position: relative;
-	line-height: 50rpx;
-	background-color: #fff;
-
-	&:first-child {
-		padding: 28rpx 30rpx;
+	.captcha {
+		width: 170rpx;
+		height: 50rpx;
 	}
 
-	.cell-tit {
-		white-space: nowrap;
-	}
+	.info-list-cell {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx 30rpx;
+		position: relative;
+		line-height: 50rpx;
+		background-color: #fff;
 
-	.cell-tip1 {
-		margin-right: 40rpx;
-	}
-
-	&.log-out-btn {
-		margin-top: 40rpx;
+		&:first-child {
+			padding: 28rpx 30rpx;
+		}
 
 		.cell-tit {
-			margin: auto;
-		}
-	}
-
-	.info-list-head {
-		border: 1rpx solid $color-line;
-		width: 82rpx;
-		height: 82rpx;
-		border-radius: 50%;
-	}
-
-	.info-list-head image {
-		max-width: 100%;
-		max-height: 100%;
-	}
-
-	// #ifdef MP
-	&.info-item {
-		margin-top: 16rpx;
-	}
-
-	// #endif
-
-	&.info-list-con~&.info-list-con:after {
-		content: '';
-		position: absolute;
-		left: 30rpx;
-		right: 30rpx;
-		top: 0;
-		border-bottom: 1rpx solid $color-line;
-	}
-
-	.cell-tip {
-		margin-left: auto;
-		color: $color-tip;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		max-width: 470rpx;
-	}
-
-	.cell-more {
-		margin-left: 10rpx;
-		width: 32rpx;
-		height: 100%;
-	}
-
-	.cell-more:after {
-		content: '';
-		display: block;
-		width: 12rpx;
-		height: 12rpx;
-
-		border: 2rpx solid darken($color-line, 20%) {
-			right-color: transparent;
-			bottom-color: transparent;
+			white-space: nowrap;
 		}
 
-		transform: rotate(135deg);
-	}
-}
-
-.edit-info-box {
-	margin-top: 20rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 20rpx 40rpx;
-	min-height: 50rpx;
-	background-color: #fff;
-
-	.info-name {
-		width: 150rpx;
-		font-size: $font-size-base;
-		text-align: left;
-	}
-
-	.info-content {
-		width: 0;
-		font-size: $font-size-base;
-		padding: 0;
-		flex: 1;
-	}
-
-	.dynacode {
-		margin: 0;
-		padding: 0 10rpx;
-		width: 250rpx;
-		height: 60rpx;
-		font-size: $font-size-base;
-		line-height: 60rpx;
-		color: #fff;
-		word-break: break-all;
-	}
-
-	.edit-sex-list {
-		display: flex;
-
-		label {
-			display: flex;
-			margin-left: 30rpx;
-			align-items: center;
+		.cell-tip1 {
+			margin-right: 40rpx;
 		}
-	}
 
-	uni-radio .uni-radio-input {
-		width: 32rpx;
-		height: 32rpx;
-	}
-}
+		&.log-out-btn {
+			margin-top: 40rpx;
 
-.set-pass-tips {
-	padding: 20rpx 20rpx 0 20rpx;
-}
+			.cell-tit {
+				margin: auto;
+			}
+		}
 
-.input-len {
-	width: 500rpx !important;
-}
+		.info-list-head {
+			border: 1rpx solid $color-line;
+			width: 82rpx;
+			height: 82rpx;
+			border-radius: 50%;
+		}
 
-.save-item {
-	margin: 50rpx auto;
+		.info-list-head image {
+			max-width: 100%;
+			max-height: 100%;
+		}
 
-	button {
-		font-size: 30rpx;
-	}
-}
+		// #ifdef MP
+		&.info-item {
+			margin-top: 16rpx;
+		}
 
-.empty {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: $padding;
-	box-sizing: border-box;
-	justify-content: center;
-	padding-top: 80rpx;
+		// #endif
 
-	.empty_img {
-		width: 63%;
-		height: 450rpx;
+		&.info-list-con~&.info-list-con:after {
+			content: '';
+			position: absolute;
+			left: 30rpx;
+			right: 30rpx;
+			top: 0;
+			border-bottom: 1rpx solid $color-line;
+		}
 
-		image {
-			width: 100%;
+		.cell-tip {
+			margin-left: auto;
+			color: $color-tip;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			max-width: 470rpx;
+		}
+
+		.cell-more {
+			margin-left: 10rpx;
+			width: 32rpx;
 			height: 100%;
 		}
+
+		.cell-more:after {
+			content: '';
+			display: block;
+			width: 12rpx;
+			height: 12rpx;
+
+			border: 2rpx solid darken($color-line, 20%) {
+				right-color: transparent;
+				bottom-color: transparent;
+			}
+
+			transform: rotate(135deg);
+		}
 	}
 
-	.iconfont {
-		font-size: 190rpx;
-		color: $color-tip;
-		line-height: 1.2;
+	.edit-info-box {
+		margin-top: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 40rpx;
+		min-height: 50rpx;
+		background-color: #fff;
+
+		.info-name {
+			width: 150rpx;
+			font-size: $font-size-base;
+			text-align: left;
+		}
+
+		.info-content {
+			width: 0;
+			font-size: $font-size-base;
+			padding: 0;
+			flex: 1;
+		}
+
+		.dynacode {
+			margin: 0;
+			padding: 0 10rpx;
+			width: 250rpx;
+			height: 60rpx;
+			font-size: $font-size-base;
+			line-height: 60rpx;
+			color: #fff;
+			word-break: break-all;
+		}
+
+		.edit-sex-list {
+			display: flex;
+
+			label {
+				display: flex;
+				margin-left: 30rpx;
+				align-items: center;
+			}
+		}
+
+		uni-radio .uni-radio-input {
+			width: 32rpx;
+			height: 32rpx;
+		}
 	}
 
-	button {
-		min-width: 300rpx;
-		margin-top: 100rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		font-size: $font-size-base;
+	.set-pass-tips {
+		padding: 20rpx 20rpx 0 20rpx;
+	}
+
+	.input-len {
+		width: 500rpx !important;
+	}
+
+	.save-item {
+		margin: 50rpx auto;
+
+		button {
+			font-size: 30rpx;
+		}
+	}
+
+	.empty {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: $padding;
+		box-sizing: border-box;
+		justify-content: center;
+		padding-top: 80rpx;
+
+		.empty_img {
+			width: 63%;
+			height: 450rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.iconfont {
+			font-size: 190rpx;
+			color: $color-tip;
+			line-height: 1.2;
+		}
+
+		button {
+			min-width: 300rpx;
+			margin-top: 100rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+		}
 	}
-}
 </style>

pages_tool/member/info_edit.vue

@@ -5,8 +5,7 @@
 			<view v-if="indent == 'username'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">用户名</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入"
-						v-model="formData.username" />
+					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.username" />
 				</view>
 				<view class="color-tip font-size-goods-tag set-pass-tips">用户名仅可修改一次，请谨慎设置</view>
 				<view class="save-item" @click="save('username')">
@@ -17,8 +16,7 @@
 			<view v-if="indent == 'name'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">昵称</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入"
-						v-model="formData.nickName" />
+					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.nickName" />
 				</view>
 				<view class="save-item" @click="save('name')">
 					<button type="primary">保存</button>
@@ -28,8 +26,7 @@
 			<view v-if="indent == 'realName'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">姓名</text>
-					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入"
-						v-model="formData.realName" />
+					<input class="uni-input info-content input-len" type="text" maxlength="30" placeholder="请输入" v-model="formData.realName" />
 				</view>
 				<view class="save-item" @click="save('realName')">
 					<button type="primary">保存</button>
@@ -42,8 +39,7 @@
 					<radio-group @change="radioChange" class="edit-sex-list">
 						<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items" :key="item.value">
 							<view>
-								<radio :color="themeStyle.main_color" :value="item.value"
-									:checked="index === formData.sex" />
+								<radio :color="themeStyle.main_color" :value="item.value" :checked="index === formData.sex" />
 							</view>
 							<view>{{ item.name }}</view>
 						</label>
@@ -57,8 +53,7 @@
 			<view v-if="indent == 'birthday'" class="edit-info edit-birthday-list">
 				<view class="edit-info-box">
 					<text class="info-name">生日</text>
-					<picker mode="date" :value="formData.birthday" :start="startDate" :end="endDate"
-						@change="bindDateChange">
+					<picker mode="date" :value="formData.birthday" :start="startDate" :end="endDate" @change="bindDateChange">
 						<view class="uni-input">{{ formData.birthday ? formData.birthday : '请选择生日' }}</view>
 					</picker>
 				</view>
@@ -74,42 +69,35 @@
 							<image :src="$util.img('public/uniapp/common/common-empty.png')" mode="aspectFit"></image>
 						</view>
 						<view class="color-tip margin-top margin-bottom">请先绑定手机再执行该操作</view>
-						<button type="primary" size="mini" class="mini button color-base-bg"
-							@click="modifyInfo('mobile')">立即绑定</button>
+						<button type="primary" size="mini" class="mini button color-base-bg" @click="modifyInfo('mobile')">立即绑定</button>
 					</view>
 				</block>
 				<block v-else>
 					<view class="edit-info-box" v-if="memberInfo.password">
 						<text class="info-name">原密码</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入"
-							v-model="formData.currentPassword" />
+						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.currentPassword" />
 					</view>
 					<block v-else>
 						<view class="edit-info-box">
 							<text class="info-name">新密码</text>
-							<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入"
-								v-model="formData.mobileVercode" />
+							<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入" v-model="formData.mobileVercode" />
 							<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 						</view>
 						<view class="edit-info-box">
 							<text class="info-name">再次输入</text>
-							<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入"
-								v-model="formData.mobileDynacode" />
-							<button type="primary" class="dynacode" @click="passwordMoblieCode()">{{
-								formData.mobileCodeText }}</button>
+							<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入" v-model="formData.mobileDynacode" />
+							<button type="primary" class="dynacode" @click="passwordMoblieCode()">{{ formData.mobileCodeText }}</button>
 						</view>
 						<view class="color-tip font-size-goods-tag set-pass-tips">
 							点击“获取动态码”，将会向您已绑定的手机号{{ memberInfoformData.mobile | mobile }}发送验证码</view>
 					</block>
 					<view class="edit-info-box">
 						<text class="info-name">新密码</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入"
-							v-model="formData.newPassword" />
+						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.newPassword" />
 					</view>
 					<view class="edit-info-box">
 						<text class="info-name">再次输入</text>
-						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入"
-							v-model="formData.confirmPassword" />
+						<input class="uni-input info-content input-len" type="password" maxlength="30" placeholder="请输入" v-model="formData.confirmPassword" />
 					</view>
 
 					<view class="save-item" @click="save('password')">
@@ -121,21 +109,17 @@
 			<view v-if="indent == 'mobile'" class="edit-info">
 				<view class="edit-info-box">
 					<text class="info-name">手机号</text>
-					<input class="uni-input info-content" type="number" maxlength="11" placeholder="请输入"
-						v-model="formData.mobile" />
+					<input class="uni-input info-content" type="number" maxlength="11" placeholder="请输入" v-model="formData.mobile" />
 				</view>
 				<view class="edit-info-box">
 					<text class="info-name">验证码</text>
-					<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入"
-						v-model="formData.mobileVercode" />
+					<input class="uni-input info-content" type="number" maxlength="4" placeholder="请输入" v-model="formData.mobileVercode" />
 					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 				</view>
 				<view class="edit-info-box">
 					<text class="info-name">短信验证码</text>
-					<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入"
-						v-model="formData.mobileDynacode" />
-					<button type="primary" class="dynacode" @click="bindMoblieCode()">{{ formData.mobileCodeText
-						}}</button>
+					<input class="uni-input info-content" type="number" maxlength="6" placeholder="请输入" v-model="formData.mobileDynacode" />
+					<button type="primary" class="dynacode" @click="bindMoblieCode()">{{ formData.mobileCodeText }}</button>
 				</view>
 				<view class="save-item" @click="save('mobile')">
 					<button type="primary">保存</button>
@@ -154,7 +138,7 @@
 				<view class="edit-info-box">
 					<text class="info-name">所在地区</text>
 					<pick-regions :default-regions="defaultRegions" select-arr="3" @getRegions="handleGetRegions">
-						<text class="select-address " :class="{ 'color-tip': !formData.fullAddress }">
+						<text class="select-address " :class="{'color-tip': !formData.fullAddress }">
 							{{ formData.fullAddress ? formData.fullAddress : '请选择省市区县' }}
 						</text>
 					</pick-regions>
@@ -173,238 +157,237 @@
 </template>
 
 <script>
+	import uniNavBar from '@/pages_tool/components/uni-nav-bar/uni-nav-bar.vue';
+	import pickRegions from '@/components/pick-regions/pick-regions.vue';
+	import info from './public/js/info.js';
+	import auth from '@/common/js/auth.js';
 
-import info from '../public/js/info.js';
-import auth from '@/common/js/auth.js';
-
-export default {
-	components: {
-		uniNavBar: () => import('@/components/uni-nav-bar/uni-nav-bar.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		pickRegions: () => import('@/components/pick-regions/pick-regions.vue'),
-	},
-	data() {
-		return {};
-	},
-	onLoad(data) {
-		if (data.type) this.indent = data.type;
-	},
-	mixins: [info, auth],
-	filters: {
-		mobile(mobile) {
-			return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+	export default {
+		components: {
+			uniNavBar,
+			pickRegions
+		},
+		data() {
+			return {};
+		},
+		onLoad(data) {
+			if (data.type) this.indent = data.type;
+		},
+		mixins: [info, auth],
+		filters: {
+			mobile(mobile) {
+				return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.info-head {
-	.head-nav {
-		width: 100%;
-		height: var(--status-bar-height);
-		background: #ffffff;
-	}
-
-	.head-nav.active {
-		padding-top: 40rpx;
-	}
-}
-
-.captcha {
-	width: 170rpx;
-	height: 50rpx;
-}
-
-.info-list-cell {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 24rpx 30rpx;
-	position: relative;
-	line-height: 50rpx;
-	background-color: #fff;
-
-	&:first-child {
-		padding: 28rpx 30rpx;
-	}
-
-	.cell-tip1 {
-		margin-right: 40rpx;
-	}
-
-	&.log-out-btn {
-		margin-top: 40rpx;
-
-		.cell-tit {
-			margin: auto;
-		}
-	}
-
-	.info-list-head {
-		border: 1rpx solid $color-line;
-		width: 82rpx;
-		height: 82rpx;
-		border-radius: 50%;
-	}
-
-	.info-list-head image {
-		max-width: 100%;
-		max-height: 100%;
-	}
-
-	// #ifdef MP
-	&.info-item {
-		margin-top: 16rpx;
-	}
-
-	// #endif
-
-	&.info-list-con~&.info-list-con:after {
-		content: '';
-		position: absolute;
-		left: 30rpx;
-		right: 30rpx;
-		top: 0;
-		border-bottom: 1rpx solid $color-line;
-	}
-
-	.cell-tip {
-		margin-left: auto;
-		color: $color-tip;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		max-width: 470rpx;
-	}
-
-	.cell-more {
-		margin-left: 10rpx;
-		width: 32rpx;
-		height: 100%;
-	}
-
-	.cell-more:after {
-		content: '';
-		display: block;
-		width: 12rpx;
-		height: 12rpx;
-
-		border: 2rpx solid darken($color-line, 20%) {
-			right-color: transparent;
-			bottom-color: transparent;
-		}
-
-		transform: rotate(135deg);
-	}
-}
-
-.edit-info-box {
-	margin-top: 20rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 20rpx 40rpx;
-	min-height: 50rpx;
-	background-color: #fff;
-
-	.info-name {
-		width: 150rpx;
-		font-size: $font-size-base;
-		text-align: left;
-	}
-
-	.info-content {
-		flex: 1;
-		width: 0;
-		font-size: $font-size-base;
-		padding: 0;
-	}
-
-	.dynacode {
-		margin: 0;
-		padding: 0 10rpx;
-		width: 250rpx;
-		height: 60rpx;
-		font-size: $font-size-base;
-		line-height: 60rpx;
-		word-break: break-all;
-	}
-
-	.edit-sex-list {
-		display: flex;
-
-		label {
-			display: flex;
-			margin-left: 30rpx;
-			align-items: center;
-		}
-	}
-
-	uni-radio .uni-radio-input {
-		width: 32rpx;
-		height: 32rpx;
-	}
-
-	.pick-regions {
-		flex: 1;
-	}
-}
-
-.set-pass-tips {
-	padding: 20rpx 20rpx 0 20rpx;
-}
-
-.input-len {
-	width: 500rpx !important;
-}
-
-.save-item {
-	margin-top: 50rpx;
-
-	button {
-		font-size: 30rpx;
-	}
-}
-
-.bind-mobile {
-	button {
-		border-radius: 60rpx;
-	}
-}
-
-.empty {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: $padding;
-	box-sizing: border-box;
-	justify-content: center;
-	padding-top: 80rpx;
-
-	.empty_img {
-		width: 63%;
-		height: 450rpx;
-
-		image {
+	.info-head {
+		.head-nav {
 			width: 100%;
+			height: var(--status-bar-height);
+			background: #ffffff;
+		}
+
+		.head-nav.active {
+			padding-top: 40rpx;
+		}
+	}
+
+	.captcha {
+		width: 170rpx;
+		height: 50rpx;
+	}
+
+	.info-list-cell {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx 30rpx;
+		position: relative;
+		line-height: 50rpx;
+		background-color: #fff;
+
+		&:first-child {
+			padding: 28rpx 30rpx;
+		}
+
+		.cell-tip1 {
+			margin-right: 40rpx;
+		}
+
+		&.log-out-btn {
+			margin-top: 40rpx;
+
+			.cell-tit {
+				margin: auto;
+			}
+		}
+
+		.info-list-head {
+			border: 1rpx solid $color-line;
+			width: 82rpx;
+			height: 82rpx;
+			border-radius: 50%;
+		}
+
+		.info-list-head image {
+			max-width: 100%;
+			max-height: 100%;
+		}
+
+		// #ifdef MP
+		&.info-item {
+			margin-top: 16rpx;
+		}
+		// #endif
+
+		&.info-list-con~&.info-list-con:after {
+			content: '';
+			position: absolute;
+			left: 30rpx;
+			right: 30rpx;
+			top: 0;
+			border-bottom: 1rpx solid $color-line;
+		}
+
+		.cell-tip {
+			margin-left: auto;
+			color: $color-tip;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			max-width: 470rpx;
+		}
+
+		.cell-more {
+			margin-left: 10rpx;
+			width: 32rpx;
 			height: 100%;
 		}
+
+		.cell-more:after {
+			content: '';
+			display: block;
+			width: 12rpx;
+			height: 12rpx;
+
+			border: 2rpx solid darken($color-line, 20%) {
+				right-color: transparent;
+				bottom-color: transparent;
+			}
+
+			transform: rotate(135deg);
+		}
 	}
 
-	.iconfont {
-		font-size: 190rpx;
-		color: $color-tip;
-		line-height: 1.2;
+	.edit-info-box {
+		margin-top: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 40rpx;
+		min-height: 50rpx;
+		background-color: #fff;
+
+		.info-name {
+			width: 150rpx;
+			font-size: $font-size-base;
+			text-align: left;
+		}
+
+		.info-content {
+			flex: 1;
+			width: 0;
+			font-size: $font-size-base;
+			padding: 0;
+		}
+
+		.dynacode {
+			margin: 0;
+			padding: 0 10rpx;
+			width: 250rpx;
+			height: 60rpx;
+			font-size: $font-size-base;
+			line-height: 60rpx;
+			word-break: break-all;
+		}
+
+		.edit-sex-list {
+			display: flex;
+
+			label {
+				display: flex;
+				margin-left: 30rpx;
+				align-items: center;
+			}
+		}
+
+		uni-radio .uni-radio-input {
+			width: 32rpx;
+			height: 32rpx;
+		}
+
+		.pick-regions {
+			flex: 1;
+		}
 	}
 
-	button {
-		min-width: 300rpx;
-		margin-top: 100rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		font-size: $font-size-base;
+	.set-pass-tips {
+		padding: 20rpx 20rpx 0 20rpx;
+	}
+
+	.input-len {
+		width: 500rpx !important;
+	}
+
+	.save-item {
+		margin-top: 50rpx;
+
+		button {
+			font-size: 30rpx;
+		}
+	}
+
+	.bind-mobile {
+		button {
+			border-radius: 60rpx;
+		}
+	}
+
+	.empty {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: $padding;
+		box-sizing: border-box;
+		justify-content: center;
+		padding-top: 80rpx;
+
+		.empty_img {
+			width: 63%;
+			height: 450rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.iconfont {
+			font-size: 190rpx;
+			color: $color-tip;
+			line-height: 1.2;
+		}
+
+		button {
+			min-width: 300rpx;
+			margin-top: 100rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: $font-size-base;
+		}
 	}
-}
 </style>

pages_tool/member/invite_friends.vue

@@ -9,15 +9,12 @@
 					<text class="iconfont icon-bangzhu"></text>
 					活动说明
 				</view>
-				<image class="font" :src="$util.img('public/uniapp/member/invite/top_font.png')" mode="widthFix" />
+				<image class="font" :src="$util.img('public/uniapp/member/invite/top_font.png')" mode="widthFix"/>
 				<view class="time">
-					活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1)
-					}}
+					活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1) }}
 				</view>
 
-				<view class="btn"
-					:style="{ 'background-image': 'url(' + $util.img('public/uniapp/member/invite/top_btn.png') + ')' }"
-					@click="openSharePopup">立即邀请</view>
+				<view class="btn" :style="{ 'background-image': 'url(' + $util.img('public/uniapp/member/invite/top_btn.png') + ')' }" @click="openSharePopup">立即邀请</view>
 			</view>
 			<view class="content invite-list">
 				<view class="title">我的好友</view>
@@ -26,8 +23,7 @@
 						<view class="invitelist">
 							<view class="list-item" v-for="(item, index) in inviteList" :key="index">
 								<view class="img color-base-border">
-									<image mode="aspectFit"
-										:src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)" />
+									<image mode="aspectFit" :src="item.headimg == '' ? $util.img($util.getDefaultImage().head) : $util.img(item.headimg)"/>
 								</view>
 								<view class="list-left">
 									<view class="info">
@@ -47,13 +43,11 @@
 								</view>
 							</view>
 						</view>
-						<view class="more_invite color-tip font-size-tag " @click="moreList"
-							v-if="isClick && total_num > page">
+						<view class="more_invite color-tip font-size-tag " @click="moreList" v-if="isClick && total_num > page">
 							查看更多
 							<text class="iconfont icon-iconangledown"></text>
 						</view>
-						<view class="more_invite color-tip font-size-tag " @click="moreList"
-							v-if="!isClick && inviteList.length > 5 && total_num <= page">没有更多数据了</view>
+						<view class="more_invite color-tip font-size-tag " @click="moreList" v-if="!isClick && inviteList.length > 5 && total_num <= page">没有更多数据了</view>
 					</view>
 				</block>
 				<block v-else>
@@ -68,7 +62,7 @@
 				<view class="invite_active">
 					<view class="list">
 						<view class="item" v-if="$util.inArray('balance', info.type) != -1">
-							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill" />
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill"/>
 							<view class="desc">
 								<view class="price">
 									<text class="font-size-base">{{ $lang('common.currencySymbol') }}</text>
@@ -79,7 +73,7 @@
 						</view>
 
 						<view class="item" v-if="$util.inArray('point', info.type) != -1">
-							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill" />
+							<image :src="$util.img('public/uniapp/member/invite/coupon_bg.png')" mode="aspectFill"/>
 							<view class="desc">
 								<view class="price">
 									<text>{{ parseInt(info.point) }}</text>
@@ -134,7 +128,7 @@
 					<view class="step">
 						<view>
 							<view class="img">
-								<image :src="$util.img('public/uniapp/member/invite/fenxiang.png')" mode="aspectFit" />
+								<image :src="$util.img('public/uniapp/member/invite/fenxiang.png')" mode="aspectFit"/>
 							</view>
 							<view class="text">分享链接给好友</view>
 						</view>
@@ -143,7 +137,7 @@
 						</view>
 						<view>
 							<view class="img">
-								<image :src="$util.img('public/uniapp/member/invite/shouji.png')" mode="aspectFit" />
+								<image :src="$util.img('public/uniapp/member/invite/shouji.png')" mode="aspectFit"/>
 							</view>
 							<view class="text">好友进入</view>
 						</view>
@@ -152,7 +146,7 @@
 						</view>
 						<view>
 							<view class="img">
-								<image :src="$util.img('public/uniapp/member/invite/hongbao.png')" mode="aspectFit" />
+								<image :src="$util.img('public/uniapp/member/invite/hongbao.png')" mode="aspectFit"/>
 							</view>
 							<view class="text">好友注册成功获得奖励</view>
 						</view>
@@ -237,55 +231,56 @@
 </template>
 
 <script>
-import inviteFriends from '../public/js/invite_friends.js';
-
-export default {
-	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	data() {
-		return {
-			inviteList: [],
-			info: null,
-			page: 1,
-			page_size: 5,
-			total_num: 0,
-			isClick: true,
-			poster: '-1', //海报
-			posterMsg: '' //海报错误信息
-		};
-	},
-	onLoad(option) {
-		this.getBaseInfo();
-		if (this.storeToken) {
-			this.getList();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/invite_friends');
-			});
-		}
-	},
-	onShow() { },
-	mixins: [inviteFriends],
-	onReady() { }
-};
+	import inviteFriends from './public/js/invite_friends.js';
+	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	export default {
+		components: {
+			nsEmpty,
+			nsLogin,
+			loadingCover
+		},
+		data() {
+			return {
+				inviteList: [],
+				info: null,
+				page: 1,
+				page_size: 5,
+				total_num: 0,
+				isClick: true,
+				poster: '-1', //海报
+				posterMsg: '' //海报错误信息
+			};
+		},
+		onLoad(option) {
+			this.getBaseInfo();
+			if (this.storeToken) {
+				this.getList();
+			} else {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/invite_friends');
+				});
+			}
+		},
+		onShow() {},
+		mixins: [inviteFriends],
+		onReady() {}
+	};
 </script>
 
 <style lang="scss">
-@import '../public/css/invite_friends.scss';
+	@import './public/css/invite_friends.scss';
 </style>
 
 <style lang="scss" scoped>
-/deep/ .uni-popup__wrapper.bottom {
-	border-radius: 24rpx 24rpx 0 0;
-}
+	/deep/ .uni-popup__wrapper.bottom {
+		border-radius: 24rpx 24rpx 0 0;
+	}
 </style>
 
 <style scoped>
-.poster-layer>>>.uni-popup__wrapper-box {
-	max-height: initial !important;
-}
+	.poster-layer>>>.uni-popup__wrapper-box {
+		max-height: initial !important;
+	}
 </style>

pages_tool/member/level.vue

@@ -0,0 +1,382 @@
+<template>
+	<view :style="themeColor" class="member-level">
+		<view class="level-top">
+			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
+		</view>
+		<view class="banner-container">
+			<view class="memberInfo" v-if="memberInfo">
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
+				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
+				<view class="member-desc">
+					<view class="font-size-base">{{ memberInfo.nickname }}</view>
+					<view class="font-size-activity-tag">当前等级：{{ memberInfo.member_level_name }}</view>
+				</view>
+				<view class="growth-rules font-size-tag" @click="growthRules">
+					<text class="iconfont icon-wenhao font-size-tag"></text>
+					成长规则
+				</view>
+			</view>
+			<swiper :style="{ width: '100vw', height: '390rpx' }" class="margin-bottom"
+				:indicator-dots="swiperConfig.indicatorDots" :indicator-color="swiperConfig.indicatorColor"
+				:indicator-active-color="swiperConfig.indicatorActiveColor" :autoplay="false"
+				:interval="swiperConfig.interval" :duration="swiperConfig.duration" :circular="swiperConfig.circular"
+				:previous-margin="swiperConfig.previousMargin" :next-margin="swiperConfig.nextMargin"
+				@change="swiperChange" @animationfinish="animationfinish" :current="curIndex">
+				<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList"
+					:key="i">
+					<view class="image-container" :class="[
+							curIndex === 0
+								? i === listLen - 1
+									? 'item-left'
+									: i === 1
+									? 'item-right'
+									: 'item-center'
+								: curIndex === listLen - 1
+								? i === 0
+									? 'item-right'
+									: i === listLen - 2
+									? 'item-left'
+									: 'item-center'
+								: i === curIndex - 1
+								? 'item-left'
+								: i === curIndex + 1
+								? 'item-right'
+								: 'item-center'
+						]">
+						<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat" :style="{
+								transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
+								transitionDuration: '.3s',
+								transitionTimingFunction: 'ease'
+							}">
+							<image v-if="levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
+							<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+
+							<view class="info">
+								<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">
+									{{ levelList[curIndex].level_name }}
+									<text class="isnow " :style="{color:levelList[curIndex]['level_text_color']}" v-if="levelId == item.level_id">当前等级</text>
+								</view>
+								<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">当前成长值</view>
+								<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">{{ growth }}</view>
+								<block v-if="levelId == item.level_id">
+									<block v-if="levelList[curIndex + 1] != undefined">
+										<ns-progress :progress="levelList[curIndex + 1].rate"></ns-progress>
+										<view class="residue-growr-value"
+											:style="{color:levelList[curIndex]['level_text_color']}">
+											再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex + 1].needGrowth : 0 }}成长值成为{{
+												levelList[curIndex + 1].level_name
+											}}
+										</view>
+									</block>
+									<block v-else>
+										<view class="residue-growr-value" :style="{color:levelList[curIndex]['level_text_color']}">您现在已经是最高等级</view>
+									</block>
+								</block>
+								<block v-else>
+									<ns-progress :progress="levelList[curIndex].rate" v-if="levelList[curIndex].needGrowth > 0"></ns-progress>
+									<view class="residue-growr-value" v-if="levelList[curIndex].needGrowth > 0" :style="{color:levelList[curIndex]['level_text_color']}">
+										再获得{{ levelList[curIndex].needGrowth }}成长值成为{{ levelList[curIndex].level_name }}
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="member-equity" v-if="levelList[curIndex].is_free_shipping > 0 || levelList[curIndex].consume_discount > 0 || levelList[curIndex].point_feedback > 0">
+				<view class="equity-title">会员权益</view>
+				<view class="equity-itme" v-if="levelList[curIndex].is_free_shipping > 0">
+					<image :src="$util.img('public/uniapp/level/exemption_postage.png')" mode="aspectFit"></image>
+					<view class="equity-content" :class="{ active: levelList[curIndex].consume_discount > 0 }">
+						<text>包邮服务</text>
+						<text class="equity-desc">提供商品包邮服务</text>
+					</view>
+				</view>
+				<view class="equity-itme" v-if="levelList[curIndex].consume_discount > 0">
+					<image :src="$util.img('public/uniapp/level/consumption_discount.png')" mode="aspectFit"></image>
+					<view class="equity-content" :class="{ active: levelList[curIndex].point_feedback > 0 }">
+						<text>享受消费折扣服务</text>
+						<text class="equity-desc" v-if="levelList[curIndex].is_default == 1">不享受任何消费折扣和其他权益</text>
+						<text class="equity-desc" v-else>提供{{ levelList[curIndex].consume_discount }}折消费折扣</text>
+					</view>
+				</view>
+				<view class="equity-itme" v-if="levelList[curIndex].point_feedback > 0">
+					<image :src="$util.img('public/uniapp/level/integral_feedback.png')" mode="aspectFit"></image>
+					<view class="equity-content">
+						<text>享受积分回馈服务</text>
+						<text class="equity-desc">提供{{ levelList[curIndex].point_feedback }}倍积分回馈倍率</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="member-gift" v-if="levelList[curIndex].send_balance > 0 || levelList[curIndex].send_balance > 0 || levelList[curIndex].send_coupon">
+				<view class="gift-title">会员礼包</view>
+				<view class="gift-itme" v-if="levelList[curIndex].send_point > 0">
+					<image :src="$util.img('public/uniapp/level/integral.png')" mode="aspectFit"></image>
+					<view class="gift-content" :class="{ active: levelList[curIndex].send_balance > 0 }">
+						<text>积分礼包</text>
+						<text class="gift-desc">赠送{{ levelList[curIndex].send_point }}积分</text>
+					</view>
+				</view>
+				<view class="gift-itme" v-if="levelList[curIndex].send_balance > 0">
+					<image :src="$util.img('public/uniapp/level/red_packet.png')" mode="aspectFit"></image>
+					<view class="gift-content" :class="{ active: levelList[curIndex].send_coupon }">
+						<text>红包礼包</text>
+						<text class="gift-desc">赠送{{ levelList[curIndex].send_balance }}元红包</text>
+					</view>
+				</view>
+				<view class="gift-itme" v-if="levelList[curIndex].send_coupon" @click="openCoupon(levelList[curIndex].send_coupon)">
+					<image :src="$util.img('public/uniapp/level/coupon.png')" mode="aspectFit"></image>
+					<view class="gift-content">
+						<text>优惠券礼包</text>
+						<text class="gift-desc">赠送{{ levelList[curIndex].coupon_length }}张优惠券</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 优惠券 -->
+		<uni-popup ref="couponPopup" type="bottom">
+			<view class="coupon-popup-box">
+				<view class="coupon-popup-title" @click="closeCoupon">
+					优惠券
+					<text class="iconfont icon-close"></text>
+				</view>
+				<scroll-view class="coupon-popup-content" scroll-y>
+					<view class="coupon-item" v-for="(item, index) in couponPopList" :key="index">
+						<view class="coupon-name">
+							<text class="name">{{ item.coupon_name }}</text>
+							<text class="desc"></text>
+						</view>
+						<view class="coupon-price" v-if="item.type == 'reward'">
+							<text>{{ item.money }}</text>
+							元
+						</view>
+						<view class="coupon-price" v-if="item.type == 'discount'">
+							<text>{{ $util.numberFixed(item.discount, 1) }}</text>
+							折
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<loading-cover ref="loadingCover"></loading-cover>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
+	import toTop from '@/components/toTop/toTop.vue';
+	import scroll from '@/common/js/scroll-view.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import loadingCover from '@/components/loading-cover/loading-cover.vue';
+	import nsLogin from '@/components/ns-login/ns-login.vue';
+
+	export default {
+		components: {
+			nsProgress,
+			toTop,
+			uniPopup
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				couponPopList: [],
+				curIndex: 0,
+				descIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [{
+					needGrowth: 0,
+					growth: 0
+				}],
+				levelId: 0,
+				growth: 0,
+
+				nowIndex: 0, //我当前所在等级的index
+				rule: [] //成长值规则
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+			remark() {
+				if (this.levelList[this.curIndex]) {
+					return this.levelList[this.curIndex].remark;
+				}
+			},
+			nextIndex() {
+				let num = 0;
+				if (this.curIndex == this.levelList.length - 1) {
+					return this.curIndex;
+				} else {
+					return this.curIndex + 1;
+				}
+			}
+		},
+		onLoad() {
+			this.getLevelRule();
+			if (!this.storeToken) {
+				this.$nextTick(() => {
+					this.$refs.login.open('/pages_tool/member/level');
+				});
+			} else {
+				this.getLevelList();
+			}
+			// #ifdef MP-ALIPAY
+			this.scaleX = 1
+			this.scaleY = 1
+			// #endif
+		},
+		onShow() {
+		},
+		filters: {
+			rate(index, list, growth) {
+				let nowGrowth = Number(growth);
+				let minGrouth = Number(list[index].growth);
+				if (index == list.length - 1) {
+					return nowGrowth > minGrouth ? 100 : 0;
+				} else {
+					let maxGrouth = Number(list[index + 1].growth);
+					let num2 = nowGrowth - minGrouth;
+					let num1 = maxGrouth - minGrouth;
+					let num = Math.floor((num2 / num1) * 100);
+					return num > 100 ? 100 : num;
+				}
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				let that = this;
+				this.curIndex = e.detail.current;
+				this.isDescAnimating = true;
+				let timer = setTimeout(function() {
+					that.descIndex = e.detail.current;
+					clearTimeout(timer);
+				}, 150);
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getBannerDetail(index) {
+				uni.showLoading({
+					title: '将前往详情页面',
+					duration: 2000,
+					mask: true
+				});
+			},
+			getLevelList() {
+				this.$api.sendRequest({
+					url: '/api/memberlevel/lists',
+					success: res => {
+						if (res.data && res.code == 0) {
+							this.levelList = res.data;
+							for (var i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].send_coupon) {
+									this.levelList[i].coupon_length = this.levelList[i].send_coupon.split(',')
+										.length;
+								}
+							}
+							this.levelId = this.memberInfo.member_level;
+							this.growth = this.memberInfo.growth;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									this.descIndex = i;
+									this.nowIndex = i;
+									break;
+								}
+							}
+							this.levelList.forEach((v, i) => {
+								if (parseFloat(v.growth) < parseFloat(this.growth)) {
+									v.needGrowth = 0;
+									v.rate = 100;
+								} else {
+									v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth))
+										.toFixed(2);
+									v.rate = (this.growth / v.growth).toFixed(2) * 100;
+								}
+							});
+
+							this.levelList.forEach(v => {
+								if (v.consume_discount) {
+									v.consume_discount = (v.consume_discount / 10).toFixed(2);
+								}
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			getLevelRule() {
+				this.$api.sendRequest({
+					url: '/api/member/accountrule',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.growth) {
+							this.rule = res.data.growth;
+						}
+					}
+				});
+			},
+			growthRules() {
+				this.$util.redirectTo('/pages_tool/member/level_growth_rules');
+			},
+			openCoupon(data) {
+				this.couponPopList = [];
+				this.$api.sendRequest({
+					url: '/coupon/api/coupon/couponbyid',
+					data: {
+						id: data
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.couponPopList = res.data;
+						}
+					}
+				});
+				this.$refs.couponPopup.open();
+			},
+			closeCoupon() {
+				this.$refs.couponPopup.close();
+			}
+		},
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		},
+		watch: {
+			storeToken: function(nVal, oVal) {
+				if (nVal) {
+					this.getLevelList();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	@import './public/css/level.scss';
+</style>

pages_tool/member/level_growth_rules.vue

@@ -0,0 +1,274 @@
+<template>
+	<view :style="themeColor" class="member-level">
+		<view class="grow-explain">
+			<view class="explain-title">
+				<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
+				成长值说明
+				<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
+			</view>
+			<view class="explain-table">
+				<view class="explain-tr">
+					<text class="explain-th">等级</text>
+					<text class="explain-th">成长值</text>
+				</view>
+				<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
+					<text class="explain-td">{{ item.level_name }}</text>
+					<text class="explain-td">{{ item.growth }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="grow-value">
+			<view class="title">
+				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
+				<text>什么是成长值</text>
+			</view>
+			<view class="content color-tip">成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。</view>
+		</view>
+		<view class="acquisition-grow">
+			<view class="title">
+				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
+				<text>如何获得成长值</text>
+			</view>
+			<view class="content color-tip">
+				<text>1、注册会员送x成长值。</text>
+				<text>2、会员充值到余额送x成长值。</text>
+				<text>3、会员签到送x成长值。</text>
+				<text>4、会员消费x元，交易完成即可获得x个成长值。</text>
+			</view>
+		</view>
+
+		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+</template>
+
+<script>
+	import nsProgress from '@/pages_tool/components/ns-progress/ns-progress.vue';
+	import toTop from '@/components/toTop/toTop.vue';
+	import scroll from '@/common/js/scroll-view.js';
+
+	export default {
+		components: {
+			nsProgress,
+			toTop
+		},
+		mixins: [scroll],
+		data() {
+			return {
+				curIndex: 0,
+				descIndex: 0,
+				isDescAnimating: false,
+				scaleX: (634 / 540).toFixed(4),
+				scaleY: (378 / 330).toFixed(4),
+				swiperConfig: {
+					//type==1时的默认参数
+					indicatorDots: false,
+					indicatorColor: 'rgba(255, 255, 255, .4)',
+					indicatorActiveColor: 'rgba(255, 255, 255, 1)',
+					interval: 3000,
+					duration: 300,
+					circular: false,
+					previousMargin: '58rpx',
+					nextMargin: '58rpx'
+				},
+				levelList: [{
+					needGrowth: 0,
+					growth: 0
+				}],
+				levelId: 0,
+				growth: 0,
+
+				nowIndex: 0, //我当前所在等级的index
+				rule: [] //成长值规则
+			};
+		},
+		computed: {
+			listLen() {
+				return this.levelList.length;
+			},
+		},
+		onLoad() {
+			//会员等级
+			this.getLevelList();
+			this.getLevelRule();
+		},
+		onShow() {},
+		filters: {
+			rate(index, list, growth) {
+				let nowGrowth = Number(growth);
+				let minGrouth = Number(list[index].growth);
+				if (index == list.length - 1) {
+					return nowGrowth > minGrouth ? 100 : 0;
+				} else {
+					let maxGrouth = Number(list[index + 1].growth);
+					let num2 = nowGrowth - minGrouth;
+					let num1 = maxGrouth - minGrouth;
+					let num = Math.floor((num2 / num1) * 100);
+					return num > 100 ? 100 : num;
+				}
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				let that = this;
+				this.curIndex = e.detail.current;
+				this.isDescAnimating = true;
+				let timer = setTimeout(function() {
+					that.descIndex = e.detail.current;
+					clearTimeout(timer);
+				}, 150);
+			},
+			animationfinish(e) {
+				this.isDescAnimating = false;
+			},
+			getBannerDetail(index) {
+				uni.showLoading({
+					title: '将前往详情页面',
+					duration: 2000,
+					mask: true
+				});
+			},
+			getLevelList() {
+				this.$api.sendRequest({
+					url: '/api/memberlevel/lists',
+					success: res => {
+						if (res.data && res.code == 0) {
+							this.levelList = res.data;
+							this.levelId = this.memberInfo.member_level;
+							this.growth = this.memberInfo.growth;
+							for (let i = 0; i < this.levelList.length; i++) {
+								if (this.levelList[i].level_id == this.levelId) {
+									this.curIndex = i;
+									this.descIndex = i;
+									this.nowIndex = i;
+									break;
+								}
+							}
+							this.levelList.forEach((v, i) => {
+								let rate = 0;
+								if (i != this.levelList.length - 1) {
+									v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+
+									if (v.needGrowth <= 0) {
+										rate = 100;
+									} else {
+										rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
+									}
+								} else {
+									v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
+									if (v.needGrowth <= 0) {
+										rate = 100;
+									} else {
+										rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
+									}
+								}
+								v.rate = rate;
+							});
+
+							this.levelList.forEach(v => {
+								if (v.consume_discount) {
+									v.consume_discount = (v.consume_discount / 10).toFixed(2);
+								}
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					}
+				});
+			},
+			getLevelRule() {
+				this.$api.sendRequest({
+					url: '/api/member/accountrule',
+					success: res => {
+						if (res.code == 0 && res.data && res.data.growth) {
+							this.rule = res.data.growth;
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.grow-explain {
+		padding: 30rpx;
+		margin-top: 30rpx;
+
+		.explain-title {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			line-height: 1;
+
+			image {
+				margin: 0 20rpx;
+				width: 54rpx;
+				height: 18rpx;
+			}
+
+			margin-bottom: 40rpx;
+		}
+
+		.explain-tr {
+			display: flex;
+		}
+
+		.explain-th {
+			padding: 10rpx 30rpx;
+
+			&~.explain-th {
+				border-left: 4rpx solid #fff;
+			}
+
+			flex: 1;
+			background-color: #f6f1e4;
+		}
+
+		.explain-td {
+			padding: 10rpx 30rpx;
+
+			&~.explain-td {
+				border-left: 4rpx solid #fff;
+			}
+
+			height: 60rpx;
+			line-height: 60rpx;
+			flex: 1;
+			background-color: #fcfbf7;
+		}
+	}
+
+	.grow-value,
+	.acquisition-grow {
+		padding: 0 30rpx 30rpx;
+
+		.title {
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.content {
+			font-size: 24rpx;
+			margin-left: 40rpx;
+
+			text {
+				display: block;
+			}
+		}
+	}
+</style>

pages_tool/member/modify_face.vue

@@ -0,0 +1,194 @@
+<template>
+	<view :style="themeColor" class="nc-modify-content">
+		<view class="modify">
+			<view>
+				<image v-if="newImg == ''" :src="memberImg ? $util.img(memberImg) : $util.getDefaultImage().head" @error="memberImg = $util.getDefaultImage().head" mode="aspectFill"/>
+				<image v-else :src="$util.img(newImg)" @error="newImg = $util.getDefaultImage().head" mode="aspectFill" />
+			</view>
+		</view>
+		<view class="opection-box">
+			<block v-if="newImg == ''">
+				<!-- #ifdef MP-ALIPAY -->
+				<button type="primary" @click="uploadFace()">点击上传</button>
+				<!-- #endif -->
+				<!-- #ifndef MP-ALIPAY -->
+				<button type="primary" @click="chooseImage()">点击上传</button>
+				<!-- #endif -->
+			</block>
+			<block v-else>
+				<view class="opec">
+					<button size="mini" class="mini" type="primary" @click="save()">确认保存</button>
+					<button size="mini" class="mini" type="primary" @click="chooseImage()">重新上传</button>
+				</view>
+			</block>
+		</view>
+
+		<img-cropping selWidth="300" selHeight="300" @upload="myUpload" ref="imgCropping"></img-cropping>
+	</view>
+</template>
+
+<script>
+	import imgCropping from '@/pages_tool/components/img-cropping/cropping.vue';
+
+	export default {
+		data() {
+			return {
+				memberImg: '',
+				newImg: '',
+				imgurl: ''
+			};
+		},
+		components: {
+			imgCropping
+		},
+		onShow() {
+			if (!this.storeToken) {
+				this.$util.redirectTo(
+					'/pages_tool/login/login', {
+						back: '/pages_tool/member/modify_face'
+					},
+					'redirectTo'
+				);
+				return;
+			}
+
+			this.memberImg = this.memberInfo.headimg;
+			this.imgurl = this.memberInfo.headimg;
+		},
+		methods: {
+			chooseImage() {
+				this.$refs.imgCropping.fSelect();
+			},
+			//上传返回图片
+			myUpload(rsp) {
+				let app_type = 'h5';
+				let app_type_name = 'H5';
+
+				// #ifdef MP
+				app_type = 'weapp';
+				app_type_name = 'weapp';
+				// #endif
+				uni.request({
+					url: this.$config.baseUrl + '/api/upload/headimgBase64',
+					method: 'POST',
+					data: {
+						app_type: app_type,
+						app_type_name: app_type_name,
+						images: rsp.base64
+					},
+					header: {
+						'content-type': 'application/x-www-form-urlencoded;application/json'
+					},
+					dataType: 'json',
+					responseType: 'text',
+					success: res => {
+						if (res.data.code == 0) {
+							this.newImg = res.data.data.pic_path;
+							this.imgurl = res.data.data.pic_path;
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: '头像上传失败'
+						});
+					}
+				});
+			},
+			previewImage() {
+				uni.previewImage({
+					current: 0,
+					urls: this.images
+				});
+			},
+			save() {
+				this.$api.sendRequest({
+					url: '/api/member/modifyheadimg',
+					data: {
+						headimg: this.imgurl
+					},
+					success: res => {
+						if (res.code == 0) {
+							this.memberInfo.headimg = this.imgurl;
+							this.$store.commit('setMemberInfo', this.memberInfo);
+							this.$util.showToast({
+								title: '头像修改成功'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');
+							}, 2000);
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					}
+				});
+			},
+			uploadFace() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						this.$api.upload({
+							url: '/api/upload/headimg',
+							filePath: tempFilePaths[0],
+							fileType: 'image',
+							success: (res) => {
+								if (res.code) {
+									this.newImg = res.data.pic_path;
+									this.imgurl = res.data.pic_path;
+								}
+							}
+						})
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		overflow: hidden;
+	}
+
+	.modify {
+		position: relative;
+		padding-top: 50rpx;
+
+		view {
+			width: 500rpx;
+			height: 500rpx;
+			margin: 0 auto;
+			overflow: hidden;
+			background-color: #ffffff;
+			border: 4rpx solid #ffffff;
+			border-radius: 100%;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.opection-box {
+		margin-top: 50rpx;
+	}
+
+	.opec {
+		width: 100%;
+		padding: 0 10%;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+
+		button {
+			padding: 0 30rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			border: none;
+		}
+	}
+</style>

pages_tool/member/other/cancelstatus.vue

@@ -1,188 +0,0 @@
-<template>
-	<view class="container" :style="themeColor">
-		<view class="cancelstatus-wrap">
-			<view class="cancelstatus-block">
-				<view class="cancelstatus-box">
-					<view class="cancelstatus-box-sort color-base-bg">1</view>
-					<view class="cancelstatus-box-con">
-						<view class="cancelstatus-box-name">提交申请</view>
-						<view class="cancelstatus-box-info">您已提交申请，请耐心等待~</view>
-					</view>
-					<view class="cancelstatus-box-line color-base-bg"></view>
-				</view>
-				<view class="cancelstatus-box">
-					<view class="cancelstatus-box-sort color-base-bg">2</view>
-					<view class="cancelstatus-box-con">
-						<view class="cancelstatus-box-name">等待审核</view>
-						<view class="cancelstatus-box-info">等待审核中，审核通过后您的账号将直接被删除</view>
-					</view>
-					<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
-				</view>
-				<view class="cancelstatus-box cancelstatus-box-last">
-					<view class="cancelstatus-box-sort color-base-bg" :class="[state == 1 ? 'opacity' : 'opacity-4']">
-					</view>
-					<view class="cancelstatus-box-con">
-						<view class="cancelstatus-box-name">审核通过，注销完成</view>
-						<view class="cancelstatus-box-info">您已成功注销账号，期待下一次与您相遇</view>
-					</view>
-				</view>
-			</view>
-			<view class="cancelstatus-btn" v-if="state == 0">
-				<button type="primary" @click="back">返回</button>
-				<button class="color-base-bg" @click="revoke">撤销申请</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			state: 0
-		};
-	},
-	onLoad(option) {
-		// 判断登录
-		if (!this.storeToken) {
-			this.$util.redirectTo('/pages_tool/login/login');
-		} else {
-			this.getStatus();
-		}
-	},
-	onShow() {
-		this.getStatus();
-	},
-	methods: {
-		getStatus() {
-			this.$api.sendRequest({
-				url: '/membercancel/api/membercancel/info',
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.state = res.data.status;
-						if (this.state == -1) {
-							this.$util.redirectTo('/pages_tool/member/cancelrefuse');
-						}
-					}
-
-					if (res.code == -1) {
-						this.$store.commit('setToken', '');
-						this.$store.commit('setMemberInfo', '');
-						this.$store.commit('setMemberInfo', '');
-						this.$store.dispatch('emptyCart');
-						this.$util.redirectTo('/pages/index/index');
-					}
-				}
-			});
-		},
-		back() {
-			this.$util.redirectTo('/pages/member/index');
-		},
-		revoke() {
-			uni.showModal({
-				title: '风险提示',
-				content: '确定要撤销申请吗？',
-				confirmColor: '#000000',
-				success: res => {
-					if (res.confirm) {
-						this.$api.sendRequest({
-							url: '/membercancel/api/membercancel/cancelApply',
-							success: res => {
-								if (res.code >= 0) {
-									this.$util.redirectTo('/pages/member/index');
-								}
-							}
-						});
-					}
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.cancelstatus-wrap {
-	.cancelstatus-block {
-		padding: 50rpx;
-	}
-
-	.cancelstatus-box {
-		position: relative;
-		display: flex;
-		height: 200rpx;
-
-		.cancelstatus-box-sort {
-			width: 36rpx;
-			height: 36rpx;
-			text-align: center;
-			line-height: 36rpx;
-			border-radius: 50%;
-			color: #ffffff;
-			margin-right: 17rpx;
-			font-size: 24rpx;
-		}
-
-		.opacity {
-			opacity: 1;
-
-			&-4 {
-				opacity: 0.4;
-			}
-		}
-
-		.cancelstatus-box-name {
-			font-size: 32rpx;
-			line-height: 32rpx;
-			margin-top: 3rpx;
-		}
-
-		.cancelstatus-box-info {
-			margin-top: 15rpx;
-			color: #666666;
-			font-size: 28rpx;
-		}
-
-		.cancelstatus-box-line {
-			position: absolute;
-			width: 2rpx;
-			height: 164rpx;
-			top: 36rpx;
-			left: 18rpx;
-		}
-
-		&.cancelstatus-box-last {
-			height: 80rpx;
-		}
-	}
-
-	.cancelstatus-btn {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 150rpx;
-
-		button {
-			width: 300rpx;
-			height: 80rpx;
-			font-size: 28rpx;
-			line-height: 80rpx;
-			margin: 0 15rpx;
-			border-radius: $border-radius;
-		}
-
-		button[type='primary'] {
-			background-color: unset !important;
-			color: #333333;
-			border: 2rpx solid #dddddd;
-		}
-
-		button:nth-child(2) {
-			color: #ffffff;
-		}
-	}
-}
-</style>

pages_tool/member/other/cancelsuccess.vue

@@ -1,99 +0,0 @@
-<template>
-	<view class="container" :style="themeColor">
-		<view class="cancel-wrap">
-			<view class="cancel-img">
-				<image :src="$util.img('public/uniapp/member/success.png')"></image>
-			</view>
-			<view class="cancel-title">您已成功注销账号</view>
-			<view class="cancel-reason">待下次与您更好的相遇，如需再次使用，请重新注册</view>
-			<view class="cancel-btn"><button class="color-base-bg" @click="success">完成</button></view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	components: {},
-	data() {
-		return {
-			state: ''
-		};
-	},
-	onLoad(option) {
-
-		if (option.back) this.back = option.back;
-
-		// 判断登录
-		if (!this.storeToken) {
-			this.$util.redirectTo('/pages_tool/login/login');
-		} else {
-			this.getStatus();
-		}
-	},
-	methods: {
-		getStatus() {
-			this.$api.sendRequest({
-				success: res => {
-					if (res.code >= 0) {
-						this.state = res.data.state;
-						if (res.data.state == 1) {
-							this.$store.commit('setToken', '');
-							this.$store.commit('setMemberInfo', '');
-							this.$store.dispatch('emptyCart');
-							this.$util.redirectTo('/pages/index/index');
-						}
-					}
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.cancel-wrap {
-	padding-top: 84rpx;
-	text-align: center;
-
-	.cancel-img {
-		width: 100rpx;
-		height: 100rpx;
-		display: inline-block;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.cancel-title {
-		text-align: center;
-		font-size: 24rpx;
-		line-height: 24rpx;
-		margin-top: 30rpx;
-	}
-
-	.cancel-reason {
-		color: #838383;
-		font-size: 20rpx;
-		line-height: 40rpx;
-		margin-top: 20rpx;
-		padding: 0 175rpx;
-	}
-
-	.cancel-btn {
-		width: 100%;
-		margin-top: 173rpx;
-
-		button {
-			display: inline-block;
-			width: 300rpx;
-			height: 80rpx;
-			font-size: 28rpx;
-			line-height: 80rpx;
-			margin: 0 15rpx;
-			color: #ffffff;
-		}
-	}
-}
-</style>

pages_tool/member/other/collection.vue

@@ -1,96 +0,0 @@
-<template>
-	<view :style="themeColor">
-		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh"
-			v-if="storeToken">
-			<view class="goods_list" slot="list">
-				<block v-if="collectionList.length > 0">
-					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index"
-						@click.stop="toDetail(item)">
-						<view class="pic">
-							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill"
-								@error="goodsImageError(index)"></image>
-						</view>
-						<view class="goods_info">
-							<view class="goods_name font-size-base">{{ item.sku_name }}</view>
-							<view class="goods_opection">
-								<view class="left  lineheight-clear ">
-									<text class="symbol price-style small">￥</text>
-									<text class="price price-style large">{{
-										parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
-									<text class="symbol price-style small">.{{
-										parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
-								</view>
-								<view class="right">
-									<view class="cars" @click.stop="deleteItem(item.goods_id)">
-										<view class="icon iconfont icon-icon7"></view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</block>
-				<!-- 第一个列表为空时 -->
-				<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品" :isIndex="false"></ns-empty>
-				<ns-goods-recommend ref="goodsRecommend"></ns-goods-recommend>
-			</view>
-		</mescroll-uni>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import collection from '../public/js/collection.js';
-
-export default {
-	components: {
-		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
-		// #endif
-	},
-	mixins: [collection],
-	data() {
-		return {};
-	},
-	onShow() {
-		if (this.storeToken) {
-			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/collection');
-			});
-		}
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-/deep/ .fixed {
-	position: relative;
-	top: 0;
-}
-
-/deep/ .empty {
-	margin-top: 0 !important;
-}
-
-@import '../public/css/collection.scss';
-</style>
-
-<style lang="scss" scoped>
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
-</style>

pages_tool/member/pay_password.vue

@@ -0,0 +1,278 @@
+<template>
+	<view :style="themeColor" class="container">
+		<view class="tips" v-if="step != 0">请输入6位支付密码，建议不要使用重复或连续数字</view>
+		<view class="tips" v-else>验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码</view>
+		<view class="password-wrap">
+			<myp-one :maxlength="step == 0 ? 4 : 6" :is-pwd="step != 0" @input="input" ref="input" :auto-focus="true"></myp-one>
+			<view v-show="step == 0" class="dynacode" :class="dynacodeData.seconds == 120 ? 'color-base-text' : 'color-tip'" @click="sendMobileCode">
+				{{ dynacodeData.codeText }}
+			</view>
+			<view class="action-tips" v-show="step == 0">输入短信验证码</view>
+			<view class="action-tips" v-show="step == 1">请设置支付密码</view>
+			<view class="action-tips" v-show="step == 2">请再次输入</view>
+			<view class="btn color-base-bg color-base-border" :class="{ disabled: !isClick }" @click="confirm">确认</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
+	export default {
+		components: {
+			mypOne
+		},
+		data() {
+			return {
+				isClick: false,
+				step: 1,
+				key: '', // 短信key
+				code: '', // 动态码
+				password: '', // 密码
+				repassword: '', // 重复密码
+				isSub: false, // 防重复提交
+				back: '', // 返回页
+				dynacodeData: {
+					seconds: 120,
+					timer: null,
+					codeText: '获取验证码',
+					isSend: false
+				}
+			};
+		},
+		onLoad(option) {
+			if (option.back) this.back = option.back;
+
+			// 判断登录
+			if (!this.storeToken) {
+				this.$util.redirectTo('/pages_tool/login/login');
+			} else {
+				if (this.memberInfo.mobile == '') {
+					uni.showModal({
+						title: '提示',
+						content: '设置支付密码需要先绑定手机号,是否立即绑定?',
+						success: res => {
+							if (res.confirm) {
+								this.$util.redirectTo('/pages_tool/member/info', {
+									action: 'mobile',
+									back: this.back
+								}, 'redirectTo');
+							} else {
+								if (this.back) this.$util.redirectTo(this.back);
+								else this.$util.redirectTo('/pages/member/index');
+							}
+						}
+					});
+				} else {
+					this.step = 0;
+					this.sendMobileCode();
+				}
+			}
+		},
+		methods: {
+			input(val) {
+				if (this.step == 0) {
+					if (val.length == 4) {
+						this.isClick = true;
+						this.code = val;
+					} else {
+						this.isClick = false;
+					}
+				} else if (this.step == 1) {
+					if (val.length == 6) {
+						this.isClick = true;
+						this.password = val;
+					} else {
+						this.isClick = false;
+					}
+				} else {
+					if (val.length == 6) {
+						this.isClick = true;
+						this.repassword = val;
+					} else {
+						this.isClick = false;
+					}
+				}
+			},
+			confirm() {
+				if (this.isClick) {
+					if (this.step == 0) {
+						this.$api.sendRequest({
+							url: '/api/member/verifypaypwdcode',
+							data: {
+								code: this.code,
+								key: this.key
+							},
+							success: res => {
+								if (res.code == 0) {
+									this.$refs.input.clear();
+									this.isClick = false;
+									this.step = 1;
+								} else {
+									this.$util.showToast({
+										title: res.message
+									});
+								}
+							}
+						});
+					} else if (this.step == 1) {
+						this.$refs.input.clear();
+						this.isClick = false;
+						this.step = 2;
+					} else {
+						if (this.password == this.repassword) {
+							if (this.isSub) return;
+							this.isSub = true;
+							this.$api.sendRequest({
+								url: '/api/member/modifypaypassword',
+								data: {
+									key: this.key,
+									code: this.code,
+									password: this.password
+								},
+								success: res => {
+									if (res.code >= 0) {
+										this.$util.showToast({
+											title: '修改成功'
+										});
+										setTimeout(() => {
+											if (this.back) this.$util.redirectTo(this.back, {},
+												'redirectTo');
+											else this.$util.redirectTo('/pages/member/index');
+										}, 2000);
+									} else {
+										this.initInfo();
+										this.$util.showToast({
+											title: res.message
+										});
+									}
+								}
+							});
+						} else {
+							this.$util.showToast({
+								title: '两次输入的密码不一致',
+								success: res => {
+									this.initInfo();
+								}
+							});
+						}
+					}
+				}
+			},
+			initInfo() {
+				this.isClick = false;
+				this.step = 1;
+				this.password = '';
+				this.repassword = '';
+				this.oldpassword = '';
+				this.isSub = false;
+				this.$refs.input.clear();
+			},
+			/**
+			 * 发送手机动态码
+			 */
+			sendMobileCode() {
+				if (this.dynacodeData.seconds != 120) return;
+				if (this.dynacodeData.isSend) return;
+				this.dynacodeData.isSend = true;
+
+				this.$api.sendRequest({
+					url: '/api/member/paypwdcode',
+					success: res => {
+						this.dynacodeData.isSend = false;
+						if (res.code >= 0) {
+							this.key = res.data.key;
+
+							if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) {
+								this.dynacodeData.timer = setInterval(() => {
+									this.dynacodeData.seconds--;
+									this.dynacodeData.codeText = this.dynacodeData.seconds + 's后可重新获取';
+								}, 1000);
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: () => {
+						this.$util.showToast({
+							title: 'request:fail'
+						});
+						this.dynacodeData.isSend = false;
+					}
+				});
+			}
+		},
+		filters: {
+			mobile(mobile) {
+				return mobile.substring(0, 4 - 1) + '****' + mobile.substring(6 + 1);
+			}
+		},
+		watch: {
+			'dynacodeData.seconds': {
+				handler(newValue, oldValue) {
+					if (newValue == 0) {
+						clearInterval(this.dynacodeData.timer);
+						this.dynacodeData = {
+							seconds: 120,
+							timer: null,
+							codeText: '获取动态码',
+							isSend: false
+						};
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		width: 100vw;
+		height: 100vh;
+		background: #fff;
+
+		.tips {
+			width: 60%;
+			margin: 0 auto;
+			text-align: center;
+			padding-top: 100rpx;
+		}
+
+		.password-wrap {
+			width: 80%;
+			margin: 0 auto;
+			margin-top: 40rpx;
+
+			.action-tips {
+				text-align: center;
+				font-weight: 600;
+				margin-top: 80rpx;
+			}
+
+			.dynacode {
+				line-height: 1;
+				margin-top: 20rpx;
+				font-size: $font-size-tag;
+			}
+
+			.btn {
+				margin: 0 auto;
+				margin-top: 30rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				border-radius: $border-radius;
+				color: #fff;
+				text-align: center;
+
+				&.disabled {
+					background: #ccc !important;
+					border-color: #ccc !important;
+					color: #fff;
+				}
+			}
+		}
+	}
+</style>

pages_tool/member/point.vue

@@ -2,9 +2,10 @@
 	<view :style="themeColor" class="point">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="custom-navbar" :style="{
-			'padding-top': menuButtonBounding.top + 'px',
-			'height': menuButtonBounding.height + 'px'
-		}">
+				'padding-top': menuButtonBounding.top + 'px',
+				'height': menuButtonBounding.height + 'px'
+			}"
+		>
 			<view class="navbar-wrap">
 				<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
 				<view class="navbar-title">
@@ -13,9 +14,8 @@
 			</view>
 		</view>
 		<!-- #endif -->
-
-		<view class="head-wrap"
-			:style="{ background: 'url(' + $util.img('public/uniapp/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }">
+		
+		<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }">
 			<view class="point price-font">{{ pointInfo.point }}</view>
 			<view class="title">当前积分</view>
 			<view class="flex-box">
@@ -48,7 +48,7 @@
 				<text class="title">积分商城</text>
 			</view>
 		</view>
-		<!-- 
+<!-- 
 		<view class="task-wrap">
 			<view class="title">做任务赚积分</view>
 			<view class="task-item" @click="toSign">
@@ -75,11 +75,13 @@
 </template>
 
 <script>
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
 	components: {
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		nsLogin,
+		loadingCover
 	},
 	data() {
 		return {
@@ -151,7 +153,7 @@ export default {
 		return true;
 	},
 	watch: {
-		storeToken: function (nVal, oVal) {
+		storeToken: function(nVal, oVal) {
 			if (nVal) {
 				this.getMemberPoint();
 			}
@@ -161,5 +163,5 @@ export default {
 </script>
 
 <style lang="scss">
-@import '@/pages_tool/member/public/css/point.scss';
+@import './public/css/point.scss';
 </style>

pages_tool/member/point_detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="themeColor">
-		<!-- 	<view class="tab color-bg">
+	<!-- 	<view class="tab color-bg">
 			<view class="tab-left">
 				<picker mode="date" :value="searchType.date" @change="bindDateChange" fields="month">
 					<view class="uni-input">
@@ -26,12 +26,10 @@
 								<view class="info" @click="toFromDetail(item)">
 									<view class="event">{{ item.type_name }}</view>
 									<view class="time-box">
-										<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time)
-											}}</text>
+										<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
 									</view>
 								</view>
-								<view class="num color-base-text" v-if="item.account_data > 0">+{{
-									parseInt(item.account_data) }}</view>
+								<view class="num color-base-text" v-if="item.account_data > 0">+{{ parseInt(item.account_data) }}</view>
 								<view class="num " v-else>{{ parseInt(item.account_data) }}</view>
 							</view>
 						</view>
@@ -47,15 +45,21 @@
 </template>
 
 <script>
-
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 export default {
 	components: {
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsEmpty,
+		nsLogin,
+		loadingCover,
+		MescrollUni,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		privacyPopup
 		// #endif
 	},
 	data() {
@@ -99,7 +103,7 @@ export default {
 		this.getPointType();
 	},
 	methods: {
-		bindDateChange: function (e) {
+		bindDateChange: function(e) {
 			var temp = e.target.value;
 			var tempArr = temp.split('-');
 			this.date = tempArr[0] + '年' + tempArr[1] + '月';
@@ -161,22 +165,22 @@ export default {
 							if (data.type == 1 && data.relate_order_id) {
 								switch (data.delivery_type) {
 									case 'store':
-										this.$util.redirectTo('/pages_order/detail/detail_pickup', {
+										this.$util.redirectTo('/pages_order/detail_pickup', {
 											order_id: data.relate_order_id
 										});
 										break;
 									case 'local':
-										this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
+										this.$util.redirectTo('/pages_order/detail_local_delivery', {
 											order_id: data.relate_order_id
 										});
 										break;
 									default:
-										this.$util.redirectTo('/pages_order/detail/detail', {
+										this.$util.redirectTo('/pages_order/detail', {
 											order_id: data.relate_order_id
 										});
 								}
 							} else {
-								this.$util.redirectTo('/pages_order/detail/detail_point', {
+								this.$util.redirectTo('/pages_order/detail_point', {
 									order_id: data.order_id
 								});
 							}
@@ -184,7 +188,7 @@ export default {
 					}
 				});
 			} else if (item.from_type == 'pointcash') {
-				this.$util.redirectTo('/pages_order/detail/detail', {
+				this.$util.redirectTo('/pages_order/detail', {
 					order_id: item.type_tag
 				});
 			} else if (item.from_type == 'memberconsume') {
@@ -192,11 +196,11 @@ export default {
 				// 	order_id: item.type_tag
 				// });
 			} else if (item.from_type == 'pointexchangerefund' && parseInt(item.type_tag) != 0) {
-				this.$util.redirectTo('/pages_order/detail/detail_point', {
+				this.$util.redirectTo('/pages_order/detail_point', {
 					order_id: item.type_tag
 				});
 			} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
-				this.$util.redirectTo('/pages_order/detail/detail', {
+				this.$util.redirectTo('/pages_order/detail', {
 					order_id: item.type_tag
 				});
 			}
@@ -268,13 +272,11 @@ export default {
 			font-size: $font-size-base;
 		}
 	}
-
-	.tab-left {
+	.tab-left{
 		display: flex;
 		padding-left: 30rpx;
 	}
-
-	.tab-right {
+	.tab-right{
 		display: flex;
 		justify-content: flex-end;
 		padding-right: 40rpx;
@@ -295,7 +297,7 @@ export default {
 		display: flex;
 		height: 90rpx;
 
-		&>view {
+		& > view {
 			flex: 1;
 			text-align: left;
 			padding: 0 $padding;

pages_tool/member/rights/coupon.vue

@@ -1,421 +0,0 @@
-<template>
-	<view :style="themeColor" :class="isIphoneX ? 'iphone-x' : ''">
-		<view class="cf-container color-line-border" v-if="storeToken">
-			<view class="tab">
-				<view @click="changeState(1)"><text
-						:class="state == 1 ? 'color-base-text active color-base-border-bottom' : ''">未使用</text></view>
-				<view @click="changeState(2)"><text
-						:class="state == 2 ? 'color-base-text active color-base-border-bottom' : ''">已使用</text></view>
-				<view @click="changeState(3)"><text
-						:class="state == 3 ? 'color-base-text active color-base-border-bottom' : ''">已过期</text></view>
-			</view>
-			<!-- <view class="coupon-head">
-				<view class="sort" :class="sort == 1 ? 'color-base-border color-base-text' : ''" @click="changeSort(1, '')">全部</view>
-				<view class="sort" :class="sort == 2 ? 'color-base-border color-base-text' : ''" @click="changeSort(2, 'reward')">满减券</view>
-				<view class="sort" :class="sort == 3 ? 'color-base-border color-base-text' : ''" @click="changeSort(3, 'discount')">折扣券</view>
-				<view class="sort" :class="sort == 4 ? 'color-base-border color-base-text' : ''" @click="changeSort(4, 'no_threshold')">无门槛券</view>
-			</view> -->
-		</view>
-
-		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCounponList" v-if="storeToken">
-			<block slot="list">
-				<view class="coupon-listone">
-					<view class="item" :class="['item', item.state != 1 && 'item-disabled']" v-for="(item, index) in list"
-						:key="index" @click="toGoodsList(item)"
-						:style="{ backgroundColor: item.state != 1 ? '#FFF' : 'var(--main-color-shallow)' }">
-						<view class="item-base">
-							<image class="coupon-line" mode="heightFix"
-								:src="$util.img('public/uniapp/coupon/coupon_line.png')" />
-							<view>
-								<view class="use_price " v-if="item.type == 'divideticket'">
-									<text>￥</text>
-									{{ parseFloat(item.money) }}
-								</view>
-								<view class="use_price " v-if="item.type == 'reward'">
-									<text>￥</text>
-									{{ parseFloat(item.money) }}
-								</view>
-								<view class="use_price" v-else-if="item.type == 'discount'">
-									{{ parseFloat(item.discount) }}
-									<text>折</text>
-								</view>
-								<view class="use_condition font-size-tag" v-if="item.at_least > 0">
-									满{{ item.at_least }}元可用</view>
-								<view class="use_condition font-size-tag" v-else>无门槛优惠券</view>
-							</view>
-						</view>
-						<view class="item-info">
-							<view class="use_title">
-								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3"
-									:class="{ disabled: item.state == 3 }">指定商品</view>
-								<view class="max_price" v-if="item.discount_limit != '0.00'">(最大优惠{{ item.discount_limit
-									}}元)</view>
-								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{
-									item.use_channel_name }}</view>
-								<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
-									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
-								</view> -->
-							</view>
-							<view class="use_time" v-if="item.end_time">有效期：{{ $util.timeStampTurnTime(item.end_time) }}
-							</view>
-							<view class="use_time" v-else>有效期：长期有效</view>
-						</view>
-						<view class="item-btn">
-							<view class="tag" v-if="item.state == 1">去使用</view>
-							<view class="tag disabled" v-if="item.state == 2">已使用</view>
-							<view class="tag disabled" v-if="item.state == 3">已过期</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="!list.length && showEmpty" class="margin-top cart-empty" :fixed="false">
-					<ns-empty :isIndex="true" :emptyBtn="{ url: '/pages/index/index', text: '去逛逛' }"
-						text="暂无优惠券"></ns-empty>
-				</view>
-			</block>
-		</mescroll-uni>
-		<ns-login ref="ns-login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-
-export default {
-	components: {
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
-		// #endif
-	},
-	data() {
-		return {
-			type: '',
-			types: '',
-			state: 1,
-			sort: 1,
-			list: [],
-			isIphoneX: false, //判断手机是否是iphoneX以上
-			showEmpty: false,
-			related_id: 0
-		};
-	},
-	onLoad(data) {
-		setTimeout(() => {
-			if (!this.addonIsExist.coupon) {
-				this.$util.showToast({
-					title: '商家未开启优惠券',
-					mask: true,
-					duration: 2000
-				});
-				setTimeout(() => {
-					this.$util.redirectTo('/pages/index/index');
-				}, 2000);
-			}
-		}, 1000);
-
-		if (data.related_id) this.related_id = data.related_id ? data.related_id : 0;
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-	},
-	onShow() {
-		if (this.storeToken) {
-			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/coupon');
-			});
-		}
-	},
-	methods: {
-		//切换状态
-		changeState(state) {
-			this.list = [];
-			this.state = state;
-			this.$refs.mescroll.refresh(false);
-		},
-		changeSort(sort, types) {
-			this.list = [];
-			this.sort = sort;
-			this.types = types;
-			this.$refs.mescroll.refresh(false);
-		},
-		getMemberCounponList(mescroll) {
-			this.showEmpty = false;
-			this.$api.sendRequest({
-				url: '/coupon/api/coupon/memberpage',
-				data: {
-					page: mescroll.num,
-					page_size: mescroll.size,
-					state: this.state,
-					is_own: this.type,
-					type: this.types,
-					related_id: this.related_id
-				},
-				success: res => {
-					this.showEmpty = true;
-					let newArr = [];
-					let msg = res.message;
-					if (res.code == 0 && res.data) {
-						newArr = res.data.list;
-					} else {
-						this.$util.showToast({
-							title: msg
-						});
-					}
-					mescroll.endSuccess(newArr.length);
-					//设置列表数据
-					if (mescroll.num == 1) {
-						this.list = []; //如果是第一页需手动制空列表
-						this.related_id = 0;
-					}
-					this.list = this.list.concat(newArr); //追加新数据
-					let data = res.data;
-					if (data) this.couponList = data;
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				},
-				fail: res => {
-					mescroll.endErr();
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		imageError(index) {
-			this.list[index].logo = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		toGoodsList(item) {
-			if (item.state == 1) {
-				this.$util.redirectTo('/pages_goods/list', {
-					coupon: item.coupon_type_id
-				});
-			}
-		}
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.cart-empty {
-	margin-top: 208rpx !important;
-}
-
-.active {
-	border-bottom: 4rpx solid;
-}
-
-.coupon-head {
-	display: flex;
-	background: #fff;
-	padding: 20rpx 50rpx;
-
-	.sort {
-		border: 2rpx solid #c5c5c5;
-		padding: 1rpx 20rpx;
-		border-radius: 10rpx;
-		cursor: pointer;
-		margin-right: 15rpx;
-	}
-}
-
-.cf-container {
-	background: #fff;
-	overflow: hidden;
-}
-
-.tab {
-	display: flex;
-	justify-content: space-between;
-	height: 86rpx;
-
-	>view {
-		text-align: center;
-		width: 33%;
-		height: 86rpx;
-
-		text {
-			display: inline-block;
-			line-height: 86rpx;
-			height: 80rpx;
-			font-size: 30rpx;
-		}
-	}
-}
-
-.coupon-listone {
-	margin: 0 30rpx;
-
-	.item {
-		display: flex;
-		background-color: #fff2f0;
-		background-size: 100% 100%;
-		border-radius: 20rpx;
-		align-items: stretch;
-		margin-top: $padding;
-		overflow: hidden;
-
-		&.item-disabled {
-			.item-base {
-				background: #e7e7e7 !important;
-			}
-		}
-
-		.item-base {
-			position: relative;
-			width: 197rpx;
-			min-width: 197rpx;
-			text-align: center;
-			background: linear-gradient(to left, var(--bg-color), var(--bg-color-shallow));
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			padding: 38rpx 10rpx 38rpx 18rpx;
-
-			&.disabled {
-				background: #dedede;
-			}
-
-			.coupon-line {
-				position: absolute;
-				right: 0;
-				top: 0;
-				height: 100%;
-			}
-
-			>view {
-				width: calc(100%);
-				height: auto;
-				position: relative;
-				top: 50%;
-				transform: translate(0, -50%);
-			}
-
-			.use_price {
-				font-size: 60rpx;
-				line-height: 1;
-				color: #fff;
-
-				text {
-					font-size: $font-size-toolbar;
-				}
-
-				&.disabled {
-					color: $color-tip;
-				}
-			}
-
-			.use_condition {
-				color: #fff;
-				margin-top: $padding;
-
-				&.margin_top_none {
-					margin-top: 0;
-				}
-
-				&.disabled {
-					color: $color-tip;
-				}
-			}
-
-			&::after {
-				position: absolute;
-				content: '';
-				background-color: #f8f8f8;
-				left: 0;
-				top: 50%;
-				transform: translate(0, -50%);
-				height: 30rpx;
-				width: 15rpx;
-				border-radius: 0 30rpx 30rpx 0;
-			}
-		}
-
-		.item-btn {
-			position: relative;
-			width: 160rpx;
-			min-width: 160rpx;
-			align-self: center;
-
-			view {
-				width: 100rpx;
-				height: 50rpx;
-				border-radius: $border-radius;
-				line-height: 50rpx;
-				margin: auto;
-				text-align: center;
-				background-image: linear-gradient(to right, var(--bg-color), var(--bg-color-shallow));
-				color: var(--btn-text-color);
-				;
-				font-size: $font-size-tag;
-
-				&.disabled {
-					background: $color-line !important;
-					color: $color-tip !important;
-				}
-			}
-
-			&::after {
-				position: absolute;
-				content: '';
-				background-color: #f8f8f8;
-				right: 0;
-				top: 50%;
-				transform: translate(0, -50%);
-				height: 30rpx;
-				width: 15rpx;
-				border-radius: 30rpx 0 0 30rpx;
-			}
-		}
-
-		.item-info {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			margin-left: $padding;
-			overflow: hidden;
-			background-repeat-x: no-repeat;
-			background-repeat-y: repeat;
-
-			.use_time {
-				padding: $padding 0;
-				border-top: 2rpx dashed #cccccc;
-				font-size: $font-size-activity-tag;
-				color: #909399;
-			}
-
-			.use_title {
-				font-size: $font-size-base;
-				font-weight: 500;
-				padding: $padding 0;
-
-				.title {
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-				}
-
-				.max_price {
-					font-weight: 400;
-					font-size: $font-size-tag;
-				}
-			}
-		}
-	}
-}
-
-.truncate {
-	overflow: hidden;
-	-o-text-overflow: ellipsis;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-</style>

pages_tool/member/rights/level.vue

@@ -1,391 +0,0 @@
-<template>
-	<view :style="themeColor" class="member-level">
-		<view class="level-top">
-			<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
-		</view>
-		<view class="banner-container">
-			<view class="memberInfo" v-if="memberInfo">
-				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg"
-					@error="memberInfo.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
-				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
-				<view class="member-desc">
-					<view class="font-size-base">{{ memberInfo.nickname }}</view>
-					<view class="font-size-activity-tag">当前等级：{{ memberInfo.member_level_name }}</view>
-				</view>
-				<view class="growth-rules font-size-tag" @click="growthRules">
-					<text class="iconfont icon-wenhao font-size-tag"></text>
-					成长规则
-				</view>
-			</view>
-			<swiper :style="{ width: '100vw', height: '390rpx' }" class="margin-bottom"
-				:indicator-dots="swiperConfig.indicatorDots" :indicator-color="swiperConfig.indicatorColor"
-				:indicator-active-color="swiperConfig.indicatorActiveColor" :autoplay="false"
-				:interval="swiperConfig.interval" :duration="swiperConfig.duration" :circular="swiperConfig.circular"
-				:previous-margin="swiperConfig.previousMargin" :next-margin="swiperConfig.nextMargin"
-				@change="swiperChange" @animationfinish="animationfinish" :current="curIndex">
-				<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList"
-					:key="i">
-					<view class="image-container" :class="[
-						curIndex === 0
-							? i === listLen - 1
-								? 'item-left'
-								: i === 1
-									? 'item-right'
-									: 'item-center'
-							: curIndex === listLen - 1
-								? i === 0
-									? 'item-right'
-									: i === listLen - 2
-										? 'item-left'
-										: 'item-center'
-								: i === curIndex - 1
-									? 'item-left'
-									: i === curIndex + 1
-										? 'item-right'
-										: 'item-center'
-					]">
-						<view class="slide-image" style="background-size: 100% 100%;background-repeat:no-repeat" :style="{
-							transform: curIndex === i ? 'scale(' + scaleX + ',' + scaleY + ')' : 'scale(1,1)',
-							transitionDuration: '.3s',
-							transitionTimingFunction: 'ease'
-						}">
-							<image v-if="levelList[curIndex]['level_picture']"
-								:src="$util.img(levelList[curIndex]['level_picture'])" />
-							<image v-else :style="{ backgroundColor: levelList[curIndex]['bg_color'] }" />
-
-							<view class="info">
-								<view class="level-detail" :style="{ color: levelList[curIndex]['level_text_color'] }">
-									{{ levelList[curIndex].level_name }}
-									<text class="isnow " :style="{ color: levelList[curIndex]['level_text_color'] }"
-										v-if="levelId == item.level_id">当前等级</text>
-								</view>
-								<view class="growr-name" :style="{ color: levelList[curIndex]['level_text_color'] }">当前成长值
-								</view>
-								<view class="growr-value" :style="{ color: levelList[curIndex]['level_text_color'] }">{{
-									growth }}</view>
-								<block v-if="levelId == item.level_id">
-									<block v-if="levelList[curIndex + 1] != undefined">
-										<ns-progress :progress="levelList[curIndex + 1].rate"></ns-progress>
-										<view class="residue-growr-value"
-											:style="{ color: levelList[curIndex]['level_text_color'] }">
-											再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex +
-												1].needGrowth : 0 }}成长值成为{{
-												levelList[curIndex + 1].level_name
-											}}
-										</view>
-									</block>
-									<block v-else>
-										<view class="residue-growr-value"
-											:style="{ color: levelList[curIndex]['level_text_color'] }">您现在已经是最高等级</view>
-									</block>
-								</block>
-								<block v-else>
-									<ns-progress :progress="levelList[curIndex].rate"
-										v-if="levelList[curIndex].needGrowth > 0"></ns-progress>
-									<view class="residue-growr-value" v-if="levelList[curIndex].needGrowth > 0"
-										:style="{ color: levelList[curIndex]['level_text_color'] }">
-										再获得{{ levelList[curIndex].needGrowth }}成长值成为{{ levelList[curIndex].level_name }}
-									</view>
-								</block>
-							</view>
-						</view>
-					</view>
-				</swiper-item>
-			</swiper>
-			<view class="member-equity"
-				v-if="levelList[curIndex].is_free_shipping > 0 || levelList[curIndex].consume_discount > 0 || levelList[curIndex].point_feedback > 0">
-				<view class="equity-title">会员权益</view>
-				<view class="equity-itme" v-if="levelList[curIndex].is_free_shipping > 0">
-					<image :src="$util.img('public/uniapp/level/exemption_postage.png')" mode="aspectFit"></image>
-					<view class="equity-content" :class="{ active: levelList[curIndex].consume_discount > 0 }">
-						<text>包邮服务</text>
-						<text class="equity-desc">提供商品包邮服务</text>
-					</view>
-				</view>
-				<view class="equity-itme" v-if="levelList[curIndex].consume_discount > 0">
-					<image :src="$util.img('public/uniapp/level/consumption_discount.png')" mode="aspectFit"></image>
-					<view class="equity-content" :class="{ active: levelList[curIndex].point_feedback > 0 }">
-						<text>享受消费折扣服务</text>
-						<text class="equity-desc" v-if="levelList[curIndex].is_default == 1">不享受任何消费折扣和其他权益</text>
-						<text class="equity-desc" v-else>提供{{ levelList[curIndex].consume_discount }}折消费折扣</text>
-					</view>
-				</view>
-				<view class="equity-itme" v-if="levelList[curIndex].point_feedback > 0">
-					<image :src="$util.img('public/uniapp/level/integral_feedback.png')" mode="aspectFit"></image>
-					<view class="equity-content">
-						<text>享受积分回馈服务</text>
-						<text class="equity-desc">提供{{ levelList[curIndex].point_feedback }}倍积分回馈倍率</text>
-					</view>
-				</view>
-			</view>
-
-			<view class="member-gift"
-				v-if="levelList[curIndex].send_balance > 0 || levelList[curIndex].send_balance > 0 || levelList[curIndex].send_coupon">
-				<view class="gift-title">会员礼包</view>
-				<view class="gift-itme" v-if="levelList[curIndex].send_point > 0">
-					<image :src="$util.img('public/uniapp/level/integral.png')" mode="aspectFit"></image>
-					<view class="gift-content" :class="{ active: levelList[curIndex].send_balance > 0 }">
-						<text>积分礼包</text>
-						<text class="gift-desc">赠送{{ levelList[curIndex].send_point }}积分</text>
-					</view>
-				</view>
-				<view class="gift-itme" v-if="levelList[curIndex].send_balance > 0">
-					<image :src="$util.img('public/uniapp/level/red_packet.png')" mode="aspectFit"></image>
-					<view class="gift-content" :class="{ active: levelList[curIndex].send_coupon }">
-						<text>红包礼包</text>
-						<text class="gift-desc">赠送{{ levelList[curIndex].send_balance }}元红包</text>
-					</view>
-				</view>
-				<view class="gift-itme" v-if="levelList[curIndex].send_coupon"
-					@click="openCoupon(levelList[curIndex].send_coupon)">
-					<image :src="$util.img('public/uniapp/level/coupon.png')" mode="aspectFit"></image>
-					<view class="gift-content">
-						<text>优惠券礼包</text>
-						<text class="gift-desc">赠送{{ levelList[curIndex].coupon_length }}张优惠券</text>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 优惠券 -->
-		<uni-popup ref="couponPopup" type="bottom">
-			<view class="coupon-popup-box">
-				<view class="coupon-popup-title" @click="closeCoupon">
-					优惠券
-					<text class="iconfont icon-close"></text>
-				</view>
-				<scroll-view class="coupon-popup-content" scroll-y>
-					<view class="coupon-item" v-for="(item, index) in couponPopList" :key="index">
-						<view class="coupon-name">
-							<text class="name">{{ item.coupon_name }}</text>
-							<text class="desc"></text>
-						</view>
-						<view class="coupon-price" v-if="item.type == 'reward'">
-							<text>{{ item.money }}</text>
-							元
-						</view>
-						<view class="coupon-price" v-if="item.type == 'discount'">
-							<text>{{ $util.numberFixed(item.discount, 1) }}</text>
-							折
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</uni-popup>
-
-		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<ns-login ref="login"></ns-login>
-	</view>
-</template>
-
-<script>
-
-import scroll from '@/common/js/scroll-view.js';
-export default {
-	components: {
-		nsProgress: () => import('@/components/ns-progress/ns-progress.vue'),
-		toTop: () => import('@/components/toTop/toTop.vue'),
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-	},
-	mixins: [scroll],
-	data() {
-		return {
-			couponPopList: [],
-			curIndex: 0,
-			descIndex: 0,
-			isDescAnimating: false,
-			scaleX: (634 / 540).toFixed(4),
-			scaleY: (378 / 330).toFixed(4),
-			swiperConfig: {
-				indicatorDots: false,
-				indicatorColor: 'rgba(255, 255, 255, .4)',
-				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-				interval: 3000,
-				duration: 300,
-				circular: false,
-				previousMargin: '58rpx',
-				nextMargin: '58rpx'
-			},
-			levelList: [{
-				needGrowth: 0,
-				growth: 0
-			}],
-			levelId: 0,
-			growth: 0,
-
-			nowIndex: 0, //我当前所在等级的index
-			rule: [] //成长值规则
-		};
-	},
-	computed: {
-		listLen() {
-			return this.levelList.length;
-		},
-		remark() {
-			if (this.levelList[this.curIndex]) {
-				return this.levelList[this.curIndex].remark;
-			}
-		},
-		nextIndex() {
-			let num = 0;
-			if (this.curIndex == this.levelList.length - 1) {
-				return this.curIndex;
-			} else {
-				return this.curIndex + 1;
-			}
-		}
-	},
-	onLoad() {
-		this.getLevelRule();
-		if (!this.storeToken) {
-			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/level');
-			});
-		} else {
-			this.getLevelList();
-		}
-		// #ifdef MP-ALIPAY
-		this.scaleX = 1
-		this.scaleY = 1
-		// #endif
-	},
-	onShow() {
-	},
-	filters: {
-		rate(index, list, growth) {
-			let nowGrowth = Number(growth);
-			let minGrouth = Number(list[index].growth);
-			if (index == list.length - 1) {
-				return nowGrowth > minGrouth ? 100 : 0;
-			} else {
-				let maxGrouth = Number(list[index + 1].growth);
-				let num2 = nowGrowth - minGrouth;
-				let num1 = maxGrouth - minGrouth;
-				let num = Math.floor((num2 / num1) * 100);
-				return num > 100 ? 100 : num;
-			}
-		}
-	},
-	methods: {
-		swiperChange(e) {
-			let that = this;
-			this.curIndex = e.detail.current;
-			this.isDescAnimating = true;
-			let timer = setTimeout(function () {
-				that.descIndex = e.detail.current;
-				clearTimeout(timer);
-			}, 150);
-		},
-		animationfinish(e) {
-			this.isDescAnimating = false;
-		},
-		getBannerDetail(index) {
-			uni.showLoading({
-				title: '将前往详情页面',
-				duration: 2000,
-				mask: true
-			});
-		},
-		getLevelList() {
-			this.$api.sendRequest({
-				url: '/api/memberlevel/lists',
-				success: res => {
-					if (res.data && res.code == 0) {
-						this.levelList = res.data;
-						for (var i = 0; i < this.levelList.length; i++) {
-							if (this.levelList[i].send_coupon) {
-								this.levelList[i].coupon_length = this.levelList[i].send_coupon.split(',')
-									.length;
-							}
-						}
-						this.levelId = this.memberInfo.member_level;
-						this.growth = this.memberInfo.growth;
-						for (let i = 0; i < this.levelList.length; i++) {
-							if (this.levelList[i].level_id == this.levelId) {
-								this.curIndex = i;
-								this.descIndex = i;
-								this.nowIndex = i;
-								break;
-							}
-						}
-						this.levelList.forEach((v, i) => {
-							if (parseFloat(v.growth) < parseFloat(this.growth)) {
-								v.needGrowth = 0;
-								v.rate = 100;
-							} else {
-								v.needGrowth = (parseFloat(v.growth) - parseFloat(this.growth))
-									.toFixed(2);
-								v.rate = (this.growth / v.growth).toFixed(2) * 100;
-							}
-						});
-
-						this.levelList.forEach(v => {
-							if (v.consume_discount) {
-								v.consume_discount = (v.consume_discount / 10).toFixed(2);
-							}
-						});
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				}
-			});
-		},
-		getLevelRule() {
-			this.$api.sendRequest({
-				url: '/api/member/accountrule',
-				success: res => {
-					if (res.code == 0 && res.data && res.data.growth) {
-						this.rule = res.data.growth;
-					}
-				}
-			});
-		},
-		growthRules() {
-			this.$util.redirectTo('/pages_tool/member/level_growth_rules');
-		},
-		openCoupon(data) {
-			this.couponPopList = [];
-			this.$api.sendRequest({
-				url: '/coupon/api/coupon/couponbyid',
-				data: {
-					id: data
-				},
-				success: res => {
-					if (res.code >= 0) {
-						this.couponPopList = res.data;
-					}
-				}
-			});
-			this.$refs.couponPopup.open();
-		},
-		closeCoupon() {
-			this.$refs.couponPopup.close();
-		}
-	},
-	onBackPress(options) {
-		if (options.from === 'navigateBack') {
-			return false;
-		}
-		this.$util.redirectTo('/pages/member/index');
-		return true;
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
-				this.getLevelList();
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-@import '../public/css/level.scss';
-</style>

pages_tool/member/rights/level_growth_rules.vue

@@ -1,274 +0,0 @@
-<template>
-	<view :style="themeColor" class="member-level">
-		<view class="grow-explain">
-			<view class="explain-title">
-				<image :src="$util.img('public/uniapp/level/growth_that_left.png')" mode="aspectFit"></image>
-				成长值说明
-				<image :src="$util.img('public/uniapp/level/growth_that_right.png')" mode="aspectFit"></image>
-			</view>
-			<view class="explain-table">
-				<view class="explain-tr">
-					<text class="explain-th">等级</text>
-					<text class="explain-th">成长值</text>
-				</view>
-				<view class="explain-tr" v-for="(item, index) in levelList" :key="index">
-					<text class="explain-td">{{ item.level_name }}</text>
-					<text class="explain-td">{{ item.growth }}</text>
-				</view>
-			</view>
-		</view>
-		<view class="grow-value">
-			<view class="title">
-				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
-				<text>什么是成长值</text>
-			</view>
-			<view class="content color-tip">成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。</view>
-		</view>
-		<view class="acquisition-grow">
-			<view class="title">
-				<image :src="$util.img('public/uniapp/level/explain.png')" mode="aspectFit"></image>
-				<text>如何获得成长值</text>
-			</view>
-			<view class="content color-tip">
-				<text>1、注册会员送x成长值。</text>
-				<text>2、会员充值到余额送x成长值。</text>
-				<text>3、会员签到送x成长值。</text>
-				<text>4、会员消费x元，交易完成即可获得x个成长值。</text>
-			</view>
-		</view>
-
-		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-
-import scroll from '@/common/js/scroll-view.js';
-
-export default {
-	components: {
-		nsProgress: () => import('@/components/ns-progress/ns-progress.vue'),
-		toTop: () => import('@/components/toTop/toTop.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	mixins: [scroll],
-	data() {
-		return {
-			curIndex: 0,
-			descIndex: 0,
-			isDescAnimating: false,
-			scaleX: (634 / 540).toFixed(4),
-			scaleY: (378 / 330).toFixed(4),
-			swiperConfig: {
-				//type==1时的默认参数
-				indicatorDots: false,
-				indicatorColor: 'rgba(255, 255, 255, .4)',
-				indicatorActiveColor: 'rgba(255, 255, 255, 1)',
-				interval: 3000,
-				duration: 300,
-				circular: false,
-				previousMargin: '58rpx',
-				nextMargin: '58rpx'
-			},
-			levelList: [{
-				needGrowth: 0,
-				growth: 0
-			}],
-			levelId: 0,
-			growth: 0,
-
-			nowIndex: 0, //我当前所在等级的index
-			rule: [] //成长值规则
-		};
-	},
-	computed: {
-		listLen() {
-			return this.levelList.length;
-		},
-	},
-	onLoad() {
-		//会员等级
-		this.getLevelList();
-		this.getLevelRule();
-	},
-	onShow() { },
-	filters: {
-		rate(index, list, growth) {
-			let nowGrowth = Number(growth);
-			let minGrouth = Number(list[index].growth);
-			if (index == list.length - 1) {
-				return nowGrowth > minGrouth ? 100 : 0;
-			} else {
-				let maxGrouth = Number(list[index + 1].growth);
-				let num2 = nowGrowth - minGrouth;
-				let num1 = maxGrouth - minGrouth;
-				let num = Math.floor((num2 / num1) * 100);
-				return num > 100 ? 100 : num;
-			}
-		}
-	},
-	methods: {
-		swiperChange(e) {
-			let that = this;
-			this.curIndex = e.detail.current;
-			this.isDescAnimating = true;
-			let timer = setTimeout(function () {
-				that.descIndex = e.detail.current;
-				clearTimeout(timer);
-			}, 150);
-		},
-		animationfinish(e) {
-			this.isDescAnimating = false;
-		},
-		getBannerDetail(index) {
-			uni.showLoading({
-				title: '将前往详情页面',
-				duration: 2000,
-				mask: true
-			});
-		},
-		getLevelList() {
-			this.$api.sendRequest({
-				url: '/api/memberlevel/lists',
-				success: res => {
-					if (res.data && res.code == 0) {
-						this.levelList = res.data;
-						this.levelId = this.memberInfo.member_level;
-						this.growth = this.memberInfo.growth;
-						for (let i = 0; i < this.levelList.length; i++) {
-							if (this.levelList[i].level_id == this.levelId) {
-								this.curIndex = i;
-								this.descIndex = i;
-								this.nowIndex = i;
-								break;
-							}
-						}
-						this.levelList.forEach((v, i) => {
-							let rate = 0;
-							if (i != this.levelList.length - 1) {
-								v.needGrowth = Number(this.levelList[i + 1].growth) - Number(this.growth); //距离下一阶段需要多少成长值
-
-								if (v.needGrowth <= 0) {
-									rate = 100;
-								} else {
-									rate = (this.growth / this.levelList[i + 1].growth).toFixed(2) * 100;
-								}
-							} else {
-								v.needGrowth = Number(this.levelList[i].growth) - Number(this.growth); //距离下一阶段需要多少成长值
-								if (v.needGrowth <= 0) {
-									rate = 100;
-								} else {
-									rate = (this.growth / this.levelList[i].growth).toFixed(2) * 100;
-								}
-							}
-							v.rate = rate;
-						});
-
-						this.levelList.forEach(v => {
-							if (v.consume_discount) {
-								v.consume_discount = (v.consume_discount / 10).toFixed(2);
-							}
-						});
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					}
-				}
-			});
-		},
-		getLevelRule() {
-			this.$api.sendRequest({
-				url: '/api/member/accountrule',
-				success: res => {
-					if (res.code == 0 && res.data && res.data.growth) {
-						this.rule = res.data.growth;
-					}
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background-color: #fff;
-}
-
-.grow-explain {
-	padding: 30rpx;
-	margin-top: 30rpx;
-
-	.explain-title {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		line-height: 1;
-
-		image {
-			margin: 0 20rpx;
-			width: 54rpx;
-			height: 18rpx;
-		}
-
-		margin-bottom: 40rpx;
-	}
-
-	.explain-tr {
-		display: flex;
-	}
-
-	.explain-th {
-		padding: 10rpx 30rpx;
-
-		&~.explain-th {
-			border-left: 4rpx solid #fff;
-		}
-
-		flex: 1;
-		background-color: #f6f1e4;
-	}
-
-	.explain-td {
-		padding: 10rpx 30rpx;
-
-		&~.explain-td {
-			border-left: 4rpx solid #fff;
-		}
-
-		height: 60rpx;
-		line-height: 60rpx;
-		flex: 1;
-		background-color: #fcfbf7;
-	}
-}
-
-.grow-value,
-.acquisition-grow {
-	padding: 0 30rpx 30rpx;
-
-	.title {
-		display: flex;
-		align-items: center;
-
-		image {
-			width: 30rpx;
-			height: 30rpx;
-			margin-right: 10rpx;
-		}
-	}
-
-	.content {
-		font-size: 24rpx;
-		margin-left: 40rpx;
-
-		text {
-			display: block;
-		}
-	}
-}
-</style>

pages_tool/member/withdrawal.vue

@@ -30,15 +30,21 @@
 </template>
 
 <script>
-
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 export default {
 	components: {
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
+		nsEmpty,
+		nsLogin,
+		loadingCover,
+		MescrollUni,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue')
+		privacyPopup
 		// #endif
 	},
 	data() {

pages_tool/member/withdrawal_detail.vue

@@ -53,10 +53,11 @@
 </template>
 
 <script>
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
 	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		loadingCover
 	},
 	data() {
 		return {

pages_tool/notice/detail.vue

@@ -5,7 +5,7 @@
 			<text class="notice-time">发表时间: {{ $util.timeStampTurnTime(detail.create_time) }}</text>
 		</view>
 		<view class="notice-content"><rich-text :nodes="content"></rich-text></view>
-
+	
 		<loading-cover ref="loadingCover"></loading-cover>
 
 		<!-- #ifdef MP-WEIXIN -->
@@ -16,132 +16,126 @@
 </template>
 
 <script>
-import htmlParser from '@/common/js/html-parser.js';
-export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
-		// #endif		
-	},
-	data() {
-		return {
-			noticeId: 0,
-			content: '',
-			detail: {}
-		};
-	},
-	onLoad(options) {
-		this.noticeId = options.notice_id || 0;
-		// 小程序扫码进入
-		if (options.scene) {
-			var sceneParams = decodeURIComponent(options.scene);
-			this.noticeId = sceneParams.split('-')[1];
-		}
-		if (this.noticeId == 0) {
-			this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-		}
-	},
-	onShow() {
-		this.getData();
-	},
-	methods: {
-		getData() {
-			this.$api.sendRequest({
-				url: '/api/notice/info',
-				data: {
-					id: this.noticeId
-				},
-				success: res => {
-					if (res.code == 0) {
-						if (res.data) {
-							this.detail = res.data;
-							this.content = htmlParser(res.data.content);
-							this.$langConfig.title(this.detail.title);
-							this.setPublicShare();
-
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						} else {
-							this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-						}
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-						}, 2000);
-					}
-				},
-				fail: res => {
-					this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
+	import htmlParser from '@/common/js/html-parser';
+	export default {
+		data() {
+			return {
+				noticeId: 0,
+				content: '',
+				detail: {}
+			};
 		},
-		// 设置公众号分享
-		setPublicShare() {
-			let shareUrl = this.$config.h5Domain + '/pages_tool/notice/detail?notice_id=' + this.noticeId;
-			this.$util.setPublicShare({
-				title: this.detail.title,
-				desc: '',
-				link: shareUrl,
-				imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) :
-					''
-			});
+		onLoad(options) {
+			this.noticeId = options.notice_id || 0;
+			// 小程序扫码进入
+			if (options.scene) {
+				var sceneParams = decodeURIComponent(options.scene);
+				this.noticeId = sceneParams.split('-')[1];
+			}
+			if (this.noticeId == 0) {
+				this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+			}
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.$api.sendRequest({
+					url: '/api/notice/info',
+					data: {
+						id: this.noticeId
+					},
+					success: res => {
+						if (res.code == 0) {
+							if (res.data) {
+								this.detail = res.data;
+								this.content = htmlParser(res.data.content);
+								this.$langConfig.title(this.detail.title);
+								this.setPublicShare();
+
+								if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+							} else {
+								this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+							}
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+							}, 2000);
+						}
+					},
+					fail: res => {
+						this.$util.redirectTo('/pages_tool/notice/list', {}, 'redirectTo');
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			// 设置公众号分享
+			setPublicShare() {
+				let shareUrl = this.$config.h5Domain + '/pages_tool/notice/detail?notice_id=' + this.noticeId;
+				this.$util.setPublicShare({
+					title: this.detail.title,
+					desc: '',
+					link: shareUrl,
+					imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) :
+						''
+				});
+			}
+		},
+		onShareAppMessage(res) {
+			var title = '[公告]' + this.detail.title;
+			var path = '/pages_tool/notice/detail?notice_id=' + this.noticeId;
+			return {
+				title: title,
+				path: path,
+				success: res => {},
+				fail: res => {}
+			};
+		},
+		//分享到朋友圈
+		onShareTimeline() {
+			var title = this.detail.title;
+			var query = 'notice_id=' + this.noticeId;
+			return {
+				title: title,
+				query: query,
+				imageUrl: ''
+			};
 		}
-	},
-	onShareAppMessage(res) {
-		var title = '[公告]' + this.detail.title;
-		var path = '/pages_tool/notice/detail?notice_id=' + this.noticeId;
-		return {
-			title: title,
-			path: path,
-			success: res => { },
-			fail: res => { }
-		};
-	},
-	//分享到朋友圈
-	onShareTimeline() {
-		var title = this.detail.title;
-		var query = 'notice_id=' + this.noticeId;
-		return {
-			title: title,
-			query: query,
-			imageUrl: ''
-		};
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.page {
-	width: 100%;
-	height: 100%;
-	padding: 30rpx;
-	box-sizing: border-box;
-	background-color: #fff;
-}
-
-.notice-title {
-	font-size: $font-size-toolbar;
-	text-align: left;
-	font-weight: bold;
-}
-
-.notice-content {
-	margin-top: $margin-updown;
-	word-break: break-all;
-	font-size: $font-size-base;
-}
-
-.notice-meta {
-	text-align: left;
-	margin-top: $margin-updown;
-	color: $color-tip;
-
-	.notice-time {
-		font-size: $font-size-tag;
+	.page {
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+	}
+
+	.notice-title {
+		font-size: $font-size-toolbar;
+		text-align: left;
+		font-weight: bold;
+	}
+
+	.notice-content {
+		margin-top: $margin-updown;
+		word-break: break-all;
+		font-size: $font-size-base;
+	}
+
+	.notice-meta {
+		text-align: left;
+		margin-top: $margin-updown;
+		color: $color-tip;
+
+		.notice-time {
+			font-size: $font-size-tag;
+		}
 	}
-}
 </style>

pages_tool/notice/list.vue

@@ -28,15 +28,20 @@
 </template>
 
 <script>
-
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif	
 export default {
 	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
+		nsLogin,
+		MescrollUni,
+		nsEmpty,
 		// #ifdef MP-WEIXIN
-		privacyPopup: () => import('@/components/wx-privacy-popup/privacy-popup.vue'),
+		privacyPopup
 		// #endif
 	},
 	data() {

pages_tool/order/activist.vue

@@ -12,11 +12,9 @@
 								<view class="status-name color-base-text" v-if="item.refund_status == -1">退款失败</view>
 							</view>
 							<view class="goods-wrap">
-								<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)"
-									mode="aspectFill" :lazy-load="true"></image>
+								<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" :lazy-load="true"></image>
 								<view class="goods-info">
-									<view class="goods-name" @click="refundDetail(item.order_goods_id)">{{ item.sku_name
-										}}</view>
+									<view class="goods-name" @click="refundDetail(item.order_goods_id)">{{ item.sku_name }}</view>
 									<view class="goods-num">
 										<view class="num-text color-base-text">{{ item.refund_status_name }}</view>
 										<view class="num-price">
@@ -29,14 +27,17 @@
 							<view class="goods-btn">
 								<view class="btn-text">
 									<text>共{{ item.num }}件商品</text>
-									<text>退款：￥{{ item.refund_status == 3 ? item.refund_real_money :
-										item.refund_apply_money }}</text>
+									<text>退款：￥{{ item.refund_status == 3 ? item.refund_real_money : item.refund_apply_money }}</text>
 								</view>
 								<view class="order-action">
 									<view class="order-box-btn" @click="refundDetail(item.order_goods_id)">查看详情</view>
 									<block v-if="item.refund_action.length">
-										<view class="order-box-btn" @click="refundAction(actionItem.event, item)"
-											v-for="(actionItem, actionIndex) in item.refund_action" :key="actionIndex">
+										<view
+											class="order-box-btn"
+											@click="refundAction(actionItem.event, item)"
+											v-for="(actionItem, actionIndex) in item.refund_action"
+											:key="actionIndex"
+										>
 											{{ actionItem.title }}
 										</view>
 									</block>
@@ -45,8 +46,7 @@
 						</view>
 					</block>
 					<block v-else>
-						<view class="cart-empty" v-if="showEmpty"><ns-empty :isIndex="false"
-								:text="$lang('emptyTips')"></ns-empty></view>
+						<view class="cart-empty" v-if="showEmpty"><ns-empty :isIndex="false" :text="$lang('emptyTips')"></ns-empty></view>
 					</block>
 				</view>
 			</block>
@@ -56,12 +56,17 @@
 
 <script>
 import refundMethod from './public/js/refundMethod.js';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 export default {
 	components: {
-		MescrollUni: () => import('@/components/mescroll/my-list-mescroll.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		MescrollUni,
+		nsEmpty,
+		nsLogin,
+		loadingCover
 	},
 	data() {
 		return {
@@ -149,10 +154,8 @@ export default {
 	position: relative;
 	top: 0;
 }
-
 .cart-empty {
 	padding-top: 308rpx !important;
 }
-
 @import './public/css/activist.scss';
 </style>

pages_tool/order/detail_virtual.vue

@@ -10,15 +10,13 @@ export default {
 	data() {
 		return {};
 	},
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
 	onLoad(option) {
 		if (option.order_id) {
-			this.$util.redirectTo('/pages_order/detail/detail', { order_id: option.order_id }, 'redirectTo');
+			this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
 		}
 	}
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+</style>

pages_tool/order/evaluate.vue

@@ -6,31 +6,27 @@
 					<view class="eval-wrap">
 						<view class="eval-good">
 							<view class="good-box">
-								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })"
-									@error="imageError(index)" mode="widthFix" />
+								<image class="good_pic" :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="widthFix" />
 								<view class="good_info font-size-base">{{ item.sku_name }}</view>
 							</view>
 						</view>
 						<view class="eval-star" v-if="!isEvaluate">
 							<view class="star-box">
 								<view class="star-title color-base-bg-before">描述相符</view>
-								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index"
-										@change="setStar" /></view>
+								<view class="rate-box"><sx-rate :value="goodsEvalList[index].scores" :index="index" @change="setStar" /></view>
 								<view class="grade-li">
-									<view class="icon iconfont" :class="goodsEvalList[index].explain_type == '1'
-										? 'icon-haoping1 color-base-text'
-										: goodsEvalList[index].explain_type == '2'
-											? 'icon-zhongchaping color-base-text'
-											: goodsEvalList[index].explain_type == '3'
+									<view class="icon iconfont" :class="
+											goodsEvalList[index].explain_type == '1'
+												? 'icon-haoping1 color-base-text'
+												: goodsEvalList[index].explain_type == '2'
+												? 'icon-zhongchaping color-base-text'
+												: goodsEvalList[index].explain_type == '3'
 												? 'icon-zhongchaping'
 												: ''
 										"></view>
-									<view class="font-size-tag color-base-text"
-										v-if="goodsEvalList[index].explain_type == '1'">好评</view>
-									<view class="font-size-tag color-base-text"
-										v-if="goodsEvalList[index].explain_type == '2'">中评</view>
-									<view class="font-size-tag color-base-text"
-										v-if="goodsEvalList[index].explain_type == '3'">差评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '1'">好评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '2'">中评</view>
+									<view class="font-size-tag color-base-text" v-if="goodsEvalList[index].explain_type == '3'">差评</view>
 								</view>
 							</view>
 						</view>
@@ -39,24 +35,20 @@
 					<view class="eval-text">
 						<view class="text-box">
 							<block v-if="!isEvaluate">
-								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content"
-									maxlength="200" />
+								<textarea placeholder="请在此处输入您的评价" v-model="goodsEvalList[index].content" maxlength="200" />
 								<text class="maxSize">{{ goodsEvalList[index].content.length }}/200</text>
 							</block>
 							<block v-else>
-								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content"
-									maxlength="200" />
+								<textarea placeholder="请在此处输入您的追评" v-model="goodsEvalList[index].again_content" maxlength="200" />
 								<text class="maxSize">{{ goodsEvalList[index].again_content.length }}/200</text>
 							</block>
 
 							<view class="other-info">
 								<view class="other-info-box" v-for="(i, t) in imgList[index]" :key="t">
 									<image :src="$util.img(i)" mode="aspectFill" @click="preview(i, index)"></image>
-									<view class="imgDel" @click="deleteImg(i, index, t)"><text
-											class=" icon iconfont icon-delete"></text></view>
+									<view class="imgDel" @click="deleteImg(i, index ,t)"><text class=" icon iconfont icon-delete"></text></view>
 								</view>
-								<view class="other-info-box active" @click="addImg(index)"
-									v-if="imgList[index].length < 6 || imgList[index].length == undefined">
+								<view class="other-info-box active" @click="addImg(index)" v-if="imgList[index].length < 6 || imgList[index].length == undefined">
 									<text class="icon iconfont icon-zhaoxiangji"></text>
 									<text>{{ imgList[index].length ? 6 - imgList[index].length : 0 }}/6</text>
 								</view>
@@ -67,8 +59,7 @@
 			</view>
 			<view class="eval-bottom" :class="{ 'safe-area': isIphoneX }">
 				<view class="all-election" @click="isAll()" v-if="!isEvaluate">
-					<view class="iconfont color-base-text"
-						:class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+					<view class="iconfont color-base-text" :class="isAnonymous ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 					<text>匿名</text>
 				</view>
 				<view class="action-btn"><button type="primary" @click="save()">提交</button></view>
@@ -80,17 +71,16 @@
 </template>
 
 <script>
-
-import evaluate from './public/js/evaluate.js';
-export default {
-	components: {
-		sxRate: () => import('@/components/sx-rate/index.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	mixins: [evaluate],
-};
+	import sxRate from '@/pages_tool/components/sx-rate/index.vue';
+	import evaluate from './public/js/evaluate.js';
+	export default {
+		components: {
+			sxRate
+		},
+		mixins: [evaluate],
+	};
 </script>
 
 <style lang="scss">
-@import './public/css/evaluate.scss'
+	@import './public/css/evaluate.scss'
 </style>

pages_tool/order/logistics.vue

@@ -1,27 +1,22 @@
 <template>
 	<view :style="themeColor">
 		<scroll-view class="order-nav" :scroll-x="true" :show-scrollbar="false">
-			<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item"
-				@click="ontabtap(packageIndex)">
-				<text class="uni-tab-item-title"
-					:class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border  color-base-text' : ''">
+			<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="uni-tab-item" @click="ontabtap(packageIndex)">
+				<text class="uni-tab-item-title" :class="packageIndex == currIndex ? 'uni-tab-item-title-active color-base-border  color-base-text' : ''">
 					{{ packageItem.package_name }}
 				</text>
 			</view>
 		</scroll-view>
-		<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item"
-			v-show="packageIndex == currIndex">
+		<view v-for="(packageItem, packageIndex) in packageList" :key="packageIndex" class="swiper-item" v-show="packageIndex == currIndex">
 			<view class="container">
 				<view class="goods-wrap">
 					<view class="body">
 						<view class="goods" v-for="(goodsItem, goodsIndex) in packageItem.goods_list" :key="goodsIndex">
 							<view class="goods-img" @click="toGoodsDetail(goodsItem.sku_id)">
-								<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
-									@error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
+								<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(packageIndex, goodsIndex)" mode="aspectFill"></image>
 							</view>
 							<view class="goods-info">
-								<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name
-									}}</view>
+								<view @click="toGoodsDetail(goodsItem.sku_id)" class="goods-name">{{ goodsItem.sku_name }}</view>
 								<view class="goods-sub-section">
 									<view>
 										<text>
@@ -36,9 +31,7 @@
 				</view>
 
 				<view class="express-company-wrap" v-if="packageItem.delivery_type == 1">
-					<view class="company-logo">
-						<image :src="$util.img(packageItem.express_company_image)"></image>
-					</view>
+					<view class="company-logo"><image :src="$util.img(packageItem.express_company_image)"></image></view>
 					<view class="info">
 						<view class="company">
 							<text>承运公司： {{ packageItem.express_company_name }}</text>
@@ -55,14 +48,16 @@
 
 				<view class="track-wrap" v-if="packageItem.delivery_type == 1">
 					<block v-if="packageItem.trace.success && packageItem.trace.list.length != 0">
-						<view class="track-item" v-for="(traceItem, traceIndex) in packageItem.trace.list"
-							:class="traceIndex == 0 ? 'active' : ''" :key="traceIndex">
+						<view
+							class="track-item"
+							v-for="(traceItem, traceIndex) in packageItem.trace.list"
+							:class="traceIndex == 0 ? 'active' : ''"
+							:key="traceIndex"
+						>
 							<view class="dot" :class="traceIndex == 0 ? 'color-base-bg' : ''"></view>
 							<view class="msg">
-								<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark
-									}}</view>
-								<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{
-									traceItem.datetime }}</view>
+								<view class="text" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.remark }}</view>
+								<view class="time" :class="traceIndex == 0 ? 'color-base-text' : ''">{{ traceItem.datetime }}</view>
 							</view>
 						</view>
 					</block>
@@ -81,9 +76,6 @@
 
 <script>
 export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
 	data() {
 		return {
 			orderId: '',
@@ -135,7 +127,7 @@ export default {
 							title: '未获取到订单信息！'
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1500);
 					}
 				},
@@ -151,7 +143,7 @@ export default {
 			this.packageList[packageIndex].goods_list[goodsIndex].sku_image = this.$util.getDefaultImage().goods;
 			this.$forceUpdate();
 		},
-		copyDeliveryNo(value) {
+		copyDeliveryNo(value){
 			this.$util.copy(value);
 		}
 	}
@@ -160,7 +152,6 @@ export default {
 
 <style lang="scss">
 @import './public/css/logistics.scss';
-
 /deep/.uni-scroll-view ::-webkit-scrollbar {
 	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 	display: none;
@@ -169,7 +160,6 @@ export default {
 	color: transparent;
 	background: transparent;
 }
-
 /deep/::-webkit-scrollbar {
 	display: none;
 	width: 0;

pages_tool/order/public/js/evaluate.js

@@ -23,7 +23,7 @@ export default {
 	},
 	onLoad(options) {
 		//接收订单号，订单是否是追评等信息
-		options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages_order/base/list');
+		options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages_order/list');
 
 		this.isIphoneX = this.$util.uniappIsIPhoneX();
 		if (!this.storeToken) {
@@ -90,7 +90,7 @@ export default {
 							title: "未获取到订单数据"
 						})
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list', {}, "redirectTo");
+							this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
 						}, 1000)
 					}
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
@@ -200,7 +200,7 @@ export default {
 							title: "评价成功"
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list', {}, "redirectTo");
+							this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
 						}, 1000);
 					} else {
 						this.$util.showToast({

pages_tool/order/refund.vue

@@ -4,9 +4,7 @@
 			<scroll-view scroll-y="true" class="refund-container">
 				<view class="goods-wrap">
 					<view class="goods-img">
-						<image :src="$util.img(refund_data.order_goods_info.sku_image, { size: 'mid' })"
-							@error="refund_data.order_goods_info.sku_image = $util.getDefaultImage().goods"
-							mode="aspectFill" :lazy-load="true" />
+						<image :src="$util.img(refund_data.order_goods_info.sku_image, { size: 'mid' })" @error="refund_data.order_goods_info.sku_image = $util.getDefaultImage().goods" mode="aspectFill" :lazy-load="true"/>
 					</view>
 					<view class="goods-info">
 						<view class="goods-name">{{ refund_data.order_goods_info.sku_name }}</view>
@@ -42,23 +40,32 @@
 						</view>
 						<view class="item-wrap">
 							<view class="label">退款金额：</view>
-							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{
-								refund_data.refund_money }}</view>
+							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
 						</view>
 					</view>
-
+					
 					<view class="refund-form">
-						<view class="item-wrap">
-							<view class="label active">退款说明</view>
-						</view>
-
+						<view class="item-wrap"><view class="label active">退款说明</view></view>
+						
 						<!-- #ifdef MP-WEIXIN -->
-						<textarea v-if="!showText" class="newText" placeholder="请输入退款说明(选填)"
-							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
+						<textarea
+							v-if="!showText"
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
 						<!-- #endif -->
 						<!-- #ifdef H5 -->
-						<textarea class="newText" placeholder="请输入退款说明(选填)" @blur="textBlur()"
-							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
+						<textarea
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							@blur="textBlur()"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
 						<!-- #endif -->
 					</view>
 
@@ -72,18 +79,14 @@
 					<view class="refund-reason-popup popup">
 						<view class="popup-header">
 							<view><text class="tit">退款原因</text></view>
-							<view class="align-right" @click="closePopup('refundReasonPopup')"><text
-									class="iconfont icon-close"></text></view>
+							<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
 						</view>
 						<view class="popup-body">
 							<scroll-view scroll-y="true" class="scroll-view" :class="{ 'safe-area': isIphoneX }">
 								<view class="reason-list">
-									<view class="item" v-for="(item, index) in refund_data.refund_reason_type"
-										:key="index" @click="changeReason(item)">
+									<view class="item" v-for="(item, index) in refund_data.refund_reason_type" :key="index" @click="changeReason(item)">
 										<view class="reason">{{ item }}</view>
-										<view class="iconfont"
-											:class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
-										</view>
+										<view class="iconfont" :class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 									</view>
 								</view>
 							</scroll-view>
@@ -95,16 +98,16 @@
 				</uni-popup>
 			</scroll-view>
 			<loading-cover ref="loadingCover"></loading-cover>
+			
 		</view>
 	</view>
 </template>
 
 <script>
-
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		uniPopup
 	},
 	data() {
 		return {
@@ -175,7 +178,7 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1000);
 					}
 				},
@@ -188,7 +191,7 @@ export default {
 			if (this.verify()) {
 				if (this.isSub) return;
 				this.isSub = true;
-
+				
 				// #ifdef MP
 				this.subscribeMessage(() => {
 					this.$api.sendRequest({
@@ -213,7 +216,7 @@ export default {
 					});
 				})
 				// #endif
-
+				
 				// #ifndef MP-WEIXIN
 				this.$api.sendRequest({
 					url: '/api/orderrefund/refund',
@@ -254,7 +257,7 @@ export default {
 		/**
 		 * 微信订阅消息
 		 */
-		subscribeMessage(callback) {
+		subscribeMessage(callback){
 			this.$api.sendRequest({
 				url: '/weapp/api/weapp/messagetmplids',
 				data: {
@@ -267,7 +270,7 @@ export default {
 							fail: (res) => {
 								console.log('fail', res)
 							},
-							complete: () => {
+							complete: ()=> {
 								callback();
 							}
 						})
@@ -287,18 +290,15 @@ export default {
 <style lang="scss">
 @import './public/css/refund.scss';
 </style>
-
-<style lang="scss" scoped>
+<style scoped>
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
 }
-
 /deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
 }
-
 /deep/ .uni-popup {
 	z-index: 8;
 }

pages_tool/order/refund_batch.vue

@@ -2,11 +2,9 @@
 	<view :style="themeColor">
 		<view>
 			<scroll-view scroll-y="true" class="refund-container">
-				<view class="goods-wrap" v-for="(item, index) in refund_data.order_goods_info" :key="index">
+				<view class="goods-wrap" v-for="(item,index) in refund_data.order_goods_info" :key="index">
 					<view class="goods-img">
-						<image :src="$util.img(item.sku_image, { size: 'mid' })"
-							@error="item.sku_image = $util.getDefaultImage().goods" mode="aspectFill"
-							:lazy-load="true" />
+						<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="item.sku_image = $util.getDefaultImage().goods" mode="aspectFill" :lazy-load="true"/>
 					</view>
 					<view class="goods-info">
 						<view class="goods-name">{{ item.sku_name }}</view>
@@ -14,7 +12,7 @@
 				</view>
 
 				<view>
-
+					
 					<view class="refund-form">
 						<view class="item-wrap" @click="openPopup('refundReasonPopup')">
 							<view class="label">退款原因：</view>
@@ -31,23 +29,32 @@
 						</view>
 						<view class="item-wrap">
 							<view class="label">退款金额：</view>
-							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{
-								refund_data.refund_money }}</view>
+							<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
 						</view>
 					</view>
-
+					
 					<view class="refund-form">
-						<view class="item-wrap">
-							<view class="label active">退款说明</view>
-						</view>
-
+						<view class="item-wrap"><view class="label active">退款说明</view></view>
+						
 						<!-- #ifdef MP-WEIXIN -->
-						<textarea v-if="!showText" class="newText" placeholder="请输入退款说明(选填)"
-							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
+						<textarea
+							v-if="!showText"
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
 						<!-- #endif -->
 						<!-- #ifdef H5 -->
-						<textarea class="newText" placeholder="请输入退款说明(选填)" @blur="textBlur()"
-							placeholder-class="color-tip font-size-tag" :auto-height="true" v-model="refund_remark" />
+						<textarea
+							class="newText"
+							placeholder="请输入退款说明(选填)"
+							@blur="textBlur()"
+							placeholder-class="color-tip font-size-tag"
+							:auto-height="true"
+							v-model="refund_remark"
+						/>
 						<!-- #endif -->
 					</view>
 
@@ -62,18 +69,14 @@
 					<view class="refund-reason-popup popup">
 						<view class="popup-header">
 							<view><text class="tit">退款原因</text></view>
-							<view class="align-right" @click="closePopup('refundReasonPopup')"><text
-									class="iconfont icon-close"></text></view>
+							<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
 						</view>
 						<view class="popup-body">
 							<scroll-view scroll-y="true" class="scroll-view" :class="{ 'safe-area': isIphoneX }">
 								<view class="reason-list">
-									<view class="item" v-for="(item, index) in refund_data.refund_reason_type"
-										:key="index" @click="changeReason(item)">
+									<view class="item" v-for="(item, index) in refund_data.refund_reason_type" :key="index" @click="changeReason(item)">
 										<view class="reason">{{ item }}</view>
-										<view class="iconfont"
-											:class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
-										</view>
+										<view class="iconfont" :class="refund_reason == item ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
 									</view>
 								</view>
 							</scroll-view>
@@ -85,17 +88,16 @@
 				</uni-popup>
 			</scroll-view>
 			<loading-cover ref="loadingCover"></loading-cover>
-
+			
 		</view>
 	</view>
 </template>
 
 <script>
-
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
+		uniPopup
 	},
 	data() {
 		return {
@@ -116,7 +118,7 @@ export default {
 	},
 	onLoad(option) {
 		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
-
+		
 		if (option.refund_type) this.refund_type = option.refund_type;
 	},
 	onShow() {
@@ -168,7 +170,7 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1000);
 					}
 				},
@@ -181,7 +183,7 @@ export default {
 			if (this.verify()) {
 				if (this.isSub) return;
 				this.isSub = true;
-
+				
 				// #ifdef MP
 				this.subscribeMessage(() => {
 					this.$api.sendRequest({
@@ -196,8 +198,8 @@ export default {
 							this.$util.showToast({ title: res.message });
 							if (res.code >= 0) {
 								uni.removeStorage({
-									key: 'refund_goods_data',
-									success: res => {
+									key:'refund_goods_data',
+									success:res=>{
 										this.$util.redirectTo('/pages_tool/order/activist');
 									}
 								})
@@ -211,7 +213,7 @@ export default {
 					});
 				})
 				// #endif
-
+				
 				// #ifndef MP-WEIXIN
 				this.$api.sendRequest({
 					url: '/api/orderrefund/refund',
@@ -225,8 +227,8 @@ export default {
 						this.$util.showToast({ title: res.message });
 						if (res.code >= 0) {
 							uni.removeStorage({
-								key: 'refund_goods_data',
-								success: res => {
+								key:'refund_goods_data',
+								success:res=>{
 									this.$util.redirectTo('/pages_tool/order/activist');
 								}
 							})
@@ -257,7 +259,7 @@ export default {
 		/**
 		 * 微信订阅消息
 		 */
-		subscribeMessage(callback) {
+		subscribeMessage(callback){
 			this.$api.sendRequest({
 				url: '/weapp/api/weapp/messagetmplids',
 				data: {
@@ -270,7 +272,7 @@ export default {
 							fail: (res) => {
 								console.log('fail', res)
 							},
-							complete: () => {
+							complete: ()=> {
 								callback();
 							}
 						})
@@ -290,22 +292,19 @@ export default {
 <style lang="scss">
 @import './public/css/refund.scss';
 </style>
-<style lang="scss" scoped>
+<style scoped>
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
 }
-
 /deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
 }
-
 /deep/ .uni-popup {
 	z-index: 8;
 }
-
-.sub-btn {
+.sub-btn{
 	padding-top: 20rpx;
 	background-color: #FFFFFF;
 }

pages_tool/order/refund_detail.vue

@@ -40,8 +40,7 @@
 						<!-- 商品信息 -->
 						<view class="goods-wrap">
 							<view class="goods-img" @click="refundDetail(detail)">
-								<image :src="$util.img(detail.sku_image, { size: 'mid' })" @error="imageError()"
-									mode="aspectFill" :lazy-load="true"></image>
+								<image :src="$util.img(detail.sku_image, { size: 'mid' })" @error="imageError()" mode="aspectFill" :lazy-load="true"></image>
 							</view>
 							<view class="goods-info">
 								<view class="goods-name" @click="refundDetail(detail)">{{ detail.sku_name }}</view>
@@ -50,26 +49,21 @@
 						<!-- 退款信息 -->
 						<view class="info">
 							<view class="cell">退款方式：{{ detail.refund_type == 1 ? '仅退款' : '退款退货' }}</view>
-							<view class="cell" v-if="detail.refund_status == 3">退款途径：{{ detail.refund_money_type == 1 ?
-								'原路退款' : detail.refund_money_type == 2 ? '线下退款' : '退款到余额' }}</view>
+							<view class="cell" v-if="detail.refund_status == 3">退款途径：{{ detail.refund_money_type == 1 ? '原路退款' : detail.refund_money_type == 2 ? '线下退款' : '退款到余额' }}</view>
 							<view class="cell">退款原因：{{ detail.refund_reason }}</view>
-							<view class="cell" v-if="detail.refund_status == 3 && detail.refund_real_money > 0">退款金额：{{
-								$lang('common.currencySymbol') }}{{ detail.refund_real_money }}</view>
-							<view class="cell" v-else-if="detail.refund_apply_money > 0">退款金额：{{
-								$lang('common.currencySymbol') }}{{ detail.refund_apply_money }}</view>
+							<view class="cell" v-if="detail.refund_status == 3 && detail.refund_real_money>0">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_real_money }}</view>
+							<view class="cell" v-else-if="detail.refund_apply_money>0">退款金额：{{ $lang('common.currencySymbol') }}{{ detail.refund_apply_money }}</view>
 							<view class="cell">退款编号：{{ detail.refund_no }}</view>
 							<view class="cell">申请时间：{{ $util.timeStampTurnTime(detail.refund_action_time) }}</view>
-							<view class="cell" v-if="detail.refund_time">退款时间：{{
-								$util.timeStampTurnTime(detail.refund_time) }}</view>
+							<view class="cell" v-if="detail.refund_time">退款时间：{{ $util.timeStampTurnTime(detail.refund_time) }}</view>
 							<view class="cell" v-if="detail.refund_remark != ''">退款说明：{{ detail.refund_remark }}</view>
-							<view class="cell" v-if="detail.use_point > 0">退款积分：{{ detail.use_point }}</view>
+							<view class="cell" v-if="detail.use_point>0">退款积分：{{ detail.use_point }}</view>
 						</view>
 					</view>
 				</view>
 
 				<view class="action" :class="{ 'bottom-safe-area': isIphoneX }" v-if="detail.refund_action.length">
-					<view class="order-box-btn" v-for="(actionItem, actionIndex) in detail.refund_action"
-						:key="actionIndex" @click="refundAction(actionItem.event)">
+					<view class="order-box-btn" v-for="(actionItem, actionIndex) in detail.refund_action" :key="actionIndex" @click="refundAction(actionItem.event)">
 						{{ actionItem.title }}
 					</view>
 				</view>
@@ -81,24 +75,37 @@
 						<view class="item">
 							<view class="label">物流公司</view>
 							<view class="cont">
-								<input type="text" placeholder="请输入物流公司" class="input"
+								<input
+									type="text"
+									placeholder="请输入物流公司"
+									class="input"
 									placeholder-class="input-placeholder color-tip"
-									v-model="formData.refund_delivery_name" />
+									v-model="formData.refund_delivery_name"
+								/>
 							</view>
 						</view>
 						<view class="item">
 							<view class="label">物流单号</view>
 							<view class="cont">
-								<input type="text" placeholder="请输入物流单号" class="input"
+								<input
+									type="text"
+									placeholder="请输入物流单号"
+									class="input"
 									placeholder-class="input-placeholder color-tip"
-									v-model="formData.refund_delivery_no" />
+									v-model="formData.refund_delivery_no"
+								/>
 							</view>
 						</view>
 						<view class="item">
 							<view class="label">物流说明</view>
 							<view class="cont">
-								<textarea placeholder-class="color-tip font-size-tag" :auto-height="true"
-									class="textarea" placeholder="选填" v-model="formData.refund_delivery_remark" />
+								<textarea
+									placeholder-class="color-tip font-size-tag"
+									:auto-height="true"
+									class="textarea"
+									placeholder="选填"
+									v-model="formData.refund_delivery_remark"
+								/>
 							</view>
 						</view>
 					</view>
@@ -108,8 +115,7 @@
 
 			<view v-show="action == 'consultrecord'">
 				<view class="record-wrap">
-					<view class="record-item" :class="logItem.action_way == 1 ? 'buyer' : ''"
-						v-for="(logItem, logIndex) in detail.refund_log_list" :key="logIndex">
+					<view class="record-item" :class="logItem.action_way == 1 ? 'buyer' : ''" v-for="(logItem, logIndex) in detail.refund_log_list" :key="logIndex">
 						<view class="cont">
 							<view class="head">
 								<text>{{ logItem.action_way == 1 ? '买家' : '卖家' }}</text>
@@ -124,7 +130,7 @@
 					<view class="empty-box"></view>
 				</view>
 				<view class="history-bottom" :class="{ 'bottom-safe-area': isIphoneX }">
-					<!-- 	<ns-contact :niushop="{order_id: detail.order_id}">
+				<!-- 	<ns-contact :niushop="{order_id: detail.order_id}">
 						<view>
 							<text class="iconfont icon-ziyuan"></text>
 							<text>联系客服</text>
@@ -135,19 +141,15 @@
 			</view>
 		</scroll-view>
 		<loading-cover ref="loadingCover"></loading-cover>
-
+		
 	</view>
 </template>
 
 <script>
 import refundMethod from './public/js/refundMethod.js';
 import validate from 'common/js/validate.js';
-
+import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
-	components: {
-		nsContact: () => import('@/components/ns-contact/ns-contact.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},	
 	data() {
 		return {
 			order_goods_id: '',
@@ -164,6 +166,9 @@ export default {
 			isSub: false
 		};
 	},
+	components: {
+		nsContact
+	},
 	mixins: [refundMethod],
 	onLoad(option) {
 		if (option.order_goods_id) this.order_goods_id = option.order_goods_id;
@@ -191,7 +196,7 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1000);
 					}
 				},
@@ -207,7 +212,7 @@ export default {
 						if (res.code >= 0) {
 							this.$util.showToast({ title: '撤销成功' });
 							setTimeout(() => {
-								this.$util.redirectTo('/pages_order/base/list');
+								this.$util.redirectTo('/pages_order/list');
 							}, 1000);
 						}
 					});

pages_tool/order/refund_goods_select.vue

@@ -1,236 +1,225 @@
 <template>
 	<view class="goods-select" :style="themeColor">
 		<view class="top">
-			共<text class="color-base-text">{{ refund_data.length }}</text>件商品
+			共<text class="color-base-text">{{refund_data.length}}</text>件商品
 		</view>
-
+		
 		<view class="body">
-			<view class="item" v-for="(item, index) in refund_data" :key="index">
+			<view class="item" v-for="(item,index) in refund_data" :key="index">
 				<view @click="single(index)" style="display:none">
 					<text v-if="item.judge" class="iconfont icon-yuan_checked color-base-text"></text>
 					<text v-else class="iconfont icon-yuan_checkbox"></text>
 				</view>
 				<image :src="$util.img(item.sku_image)" @error="error(index)"></image>
 				<view class="title">
-					<text>{{ item.sku_name }}</text>
+					<text>{{item.sku_name}}</text>
 				</view>
 			</view>
 		</view>
-
+		
 		<view class="bottom-all">
-			<view>
-				<!-- 	@click="all"
+			<view >
+			<!-- 	@click="all"
 				<text v-if="judge" class="iconfont icon-yuan_checked color-base-text"></text>
 				<text v-else class="iconfont icon-yuan_checkbox"></text> -->
 			</view>
-
+			
 			<view v-if="nexthover" class="next" @click="next">下一步</view>
 			<view v-else class="next nexthover">请选择商品</view>
 		</view>
-
+		
 		<!-- <loading-cover ref="loadingCover"></loading-cover> -->
 	</view>
 </template>
 
 <script>
-export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	data() {
-		return {
-			refund_type: 1,
-			refund_data: [],
-			judge: true,
-			order_goods_id: [],
-			nexthover: true
-		}
-	},
-
-	onLoad(option) {
-		if (option.refund_type) {
-			this.refund_type = option.refund_type;
-			this.getGoodsInfo()
-		} else {
-			uni.showToast({
-				title: '未查找到订单信息',
-				icon: 'none'
-			})
-			setTimeout(() => {
-				this.$util.redirectTo('/pages_order/base/list');
-			}, 1000)
-		}
-	},
-
-	methods: {
-		/**
-		 * 处理商品选中数据
-		 */
-		getGoodsInfo() {
-			uni.getStorage({
-				key: 'refund_goods_data',
-				success: res => {
-					let refund_data = JSON.parse(res.data);
-					this.refund_data = [];
-					refund_data.forEach(item => {
-						if (item.refund_status == 0) {
-							item.judge = true;
-							this.refund_data.push(item);
-						}
-					})
-				}
-			})
-		},
-		/**
-		 *单选事件 
-		 */
-		single(key) {
-			this.refund_data[key].judge = !this.refund_data[key].judge;
-			let allJudge = true;
-
-			this.refund_data.forEach((item) => {
-				if (!item.judge) {
-					allJudge = false;
-				}
-			})
-			this.judge = allJudge;
-
-			this.getOrderIdInfo();
-			this.$forceUpdate()
-		},
-		/**
-		 * 全选选择
-		 */
-		all() {
-
-			this.judge = !this.judge;
-			this.refund_data.map(item => {
-				item.judge = this.judge;
-				return item;
-			})
-
-			this.getOrderIdInfo();
-			this.$forceUpdate()
-		},
-
-		/**
-		 * 获取选择的order_goods_id
-		 */
-		getOrderIdInfo() {
-			this.order_goods_id = [];
-			this.refund_data.forEach(item => {
-				if (item.judge) {
-					this.order_goods_id.push(item.order_goods_id)
-				}
-			})
-			if (this.order_goods_id.length == 0) {
-				this.nexthover = false;
-			} else {
-				this.nexthover = true;
+	export default{
+		data(){
+			return{
+				refund_type:1, 
+				refund_data:[],
+				judge:true,
+				order_goods_id:[],
+				nexthover:true
 			}
-
-			this.$forceUpdate();
 		},
-		/**
-		 * 跳转退款界面
-		 */
-		next() {
-			this.refund_data.forEach(item => {
-				this.order_goods_id.push(item.order_goods_id)
-			})
-			if (this.order_goods_id.length == 0) {
+		
+		onLoad(option){
+			if(option.refund_type){
+				this.refund_type = option.refund_type;
+				this.getGoodsInfo()
+			} else{
+				uni.showToast({
+					title:'未查找到订单信息',
+					icon:'none'
+				})
+				setTimeout(()=>{
+					this.$util.redirectTo('/pages_order/list');
+				},1000)
+			}
+		},
+		
+		methods:{
+			/**
+			 * 处理商品选中数据
+			 */
+			getGoodsInfo(){
+				uni.getStorage({
+					key:'refund_goods_data',
+					success:res=>{
+						let refund_data = JSON.parse(res.data);
+						this.refund_data = [];
+						refund_data.forEach(item=>{
+							if(item.refund_status == 0){
+								item.judge = true;
+								this.refund_data.push(item);
+							}
+						})
+					}
+				})
+			},
+			/**
+			 *单选事件 
+			 */
+			single(key){
+				this.refund_data[key].judge = !this.refund_data[key].judge;
+				let allJudge = true;
+				
+				this.refund_data.forEach((item)=>{
+					if(!item.judge){
+						allJudge = false;
+					}
+				})
+				this.judge = allJudge;
+				
 				this.getOrderIdInfo();
+				this.$forceUpdate()
+			},
+			/**
+			 * 全选选择
+			 */
+			all(){
+				
+				this.judge = !this.judge;
+				this.refund_data.map(item=>{
+					item.judge = this.judge;
+					return item;
+				})
+				
+				this.getOrderIdInfo();
+				this.$forceUpdate()
+			},
+			
+			/**
+			 * 获取选择的order_goods_id
+			 */
+			getOrderIdInfo(){
+				this.order_goods_id = [];
+				this.refund_data.forEach(item=>{
+					if(item.judge){
+						this.order_goods_id.push(item.order_goods_id)
+					}
+				})
+				if(this.order_goods_id.length == 0){
+					this.nexthover = false; 
+				}else{
+					this.nexthover = true; 
+				}
+				
+				this.$forceUpdate();
+			},
+			/**
+			 * 跳转退款界面
+			 */
+			next(){
+				this.refund_data.forEach(item=>{
+					this.order_goods_id.push(item.order_goods_id)
+				})
+				if(this.order_goods_id.length == 0){
+					this.getOrderIdInfo();
+				}
+				
+				this.$util.redirectTo('/pages_tool/order/refund_batch', { order_goods_id: this.order_goods_id.join(), refund_type:this.refund_type });
+			},
+			/**
+			 * 默认图片处理
+			 */
+			error(index){
+				this.refund_data[index].sku_image = this.$util.getDefaultImage().goods
+				this.$forceUpdate();
 			}
-
-			this.$util.redirectTo('/pages_tool/order/refund_batch', { order_goods_id: this.order_goods_id.join(), refund_type: this.refund_type });
-		},
-		/**
-		 * 默认图片处理
-		 */
-		error(index) {
-			this.refund_data[index].sku_image = this.$util.getDefaultImage().goods
-			this.$forceUpdate();
 		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-.goods-select {
-	.top {
-		padding: 20rpx 30rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		background: #FFFFFF;
-
-		text {
-			font-size: 30rpx;
-			margin: 0 10rpx;
-			font-weight: bold;
-		}
-	}
-
-	.iconfont {
-		font-size: 40rpx;
-	}
-
-	.body {
-		margin: 30rpx;
-		border-radius: 10rpx;
-		background: #FFFFFF;
-		padding: 30rpx 0 0;
-
-		.item {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 30rpx 30rpx;
-
-			image {
-				width: 180rpx;
-				height: 180rpx;
-				border-radius: 10rpx;
+	.goods-select{
+		.top{
+			padding: 20rpx 30rpx;
+			box-sizing: border-box;
+			font-size: 28rpx;
+			background: #FFFFFF;
+			text{
+				font-size: 30rpx;
+				margin: 0 10rpx;
+				font-weight: bold;
 			}
+		}
+		.iconfont{
+			font-size: 40rpx;
+		}
+		.body{
+			margin: 30rpx;
+			border-radius: 10rpx;
+			background: #FFFFFF;
+			padding: 30rpx 0 0;
+			.item{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 30rpx 30rpx;
 
-			.title {
-				width: 368rpx;
-				height: 180rpx;
-				font-size: 28rpx;
-
-				text {
-					text-overflow: -o-ellipsis-lastline;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 3;
-					line-clamp: 3;
-					-webkit-box-orient: vertical;
+				image{
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 10rpx;
+				}
+				.title{
+					width: 368rpx;
+					height:180rpx;
+					font-size: 28rpx;
+					text{
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 3;
+						line-clamp: 3;
+						-webkit-box-orient: vertical;
+					}
 				}
 			}
 		}
-	}
-
-	.bottom-all {
-		padding-left: 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		background: #FFFFFF;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		box-sizing: border-box;
-
-		.next {
-			padding: 16rpx 80rpx;
-			color: #FFFFFF;
-			background: #ff4544;
-		}
-
-		.nexthover {
-			background: #e7dcdc !important;
+		.bottom-all{
+			padding-left: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			background: #FFFFFF;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			box-sizing: border-box;
+			.next{
+				padding: 16rpx 80rpx;
+				color: #FFFFFF;
+				background: #ff4544;
+			}
+			.nexthover{
+				background: #e7dcdc !important;
+			}
 		}
 	}
-}
+	
 </style>

pages_tool/order/refund_type_select.vue

@@ -25,97 +25,96 @@
 </template>
 
 <script>
-
-export default {
-	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	data() {
-		return {
-			order_id: '',
-			isIphoneX: false,
-			refund_data: {},
-		};
-	},
-	onLoad(option) {
-		if (option.order_id) this.order_id = option.order_id;
-	},
-	onShow() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-		if (this.storeToken) {
-			this.getRefundData();
-		} else {
-			this.$util.redirectTo('/pages_tool/login/login', {
-				back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id
-			});
-		}
-	},
-	methods: {
-		/**
-		 * 选择退款方式
-		 * @param {Object} type
-		 */
-		selectRefundType(type) {
-			this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
-				refund_type: type
-			});
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	export default {
+		components: {
+			uniPopup
 		},
-		/**
-		 * 获取退款订单数据
-		 */
-		getRefundData() {
-			this.$api.sendRequest({
-				url: '/api/order/detail',
-				data: {
-					order_id: this.order_id
-				},
-				success: res => {
-					if (res.code >= 0) {
-						this.refund_data = res.data;
-						uni.setStorage({
-							key: 'refund_goods_data',
-							data: JSON.stringify(res.data.order_goods),
-						})
+		data() {
+			return {
+				order_id: '',
+				isIphoneX: false,
+				refund_data: {},
+			};
+		},
+		onLoad(option) {
+			if (option.order_id) this.order_id = option.order_id;
+		},
+		onShow() {
+			this.isIphoneX = this.$util.uniappIsIPhoneX();
+			if (this.storeToken) {
+				this.getRefundData();
+			} else {
+				this.$util.redirectTo('/pages_tool/login/login', {
+					back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id
+				});
+			}
+		},
+		methods: {
+			/**
+			 * 选择退款方式
+			 * @param {Object} type
+			 */
+			selectRefundType(type) {
+				this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
+					refund_type: type
+				});
+			},
+			/**
+			 * 获取退款订单数据
+			 */
+			getRefundData() {
+				this.$api.sendRequest({
+					url: '/api/order/detail',
+					data: {
+						order_id: this.order_id
+					},
+					success: res => {
+						if (res.code >= 0) {
+							this.refund_data = res.data;
+							uni.setStorage({
+								key: 'refund_goods_data',
+								data: JSON.stringify(res.data.order_goods),
+							})
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: '未获取到该订单项退款信息'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages_order/list');
+							}, 1000);
+						}
+					},
+					fail: res => {
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					} else {
-						this.$util.showToast({
-							title: '未获取到该订单项退款信息'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages_order/base/list');
-						}, 1000);
 					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-	}
-};
+				});
+			},
+		}
+	};
 </script>
 
 <style lang="scss">
-@import './public/css/refund.scss';
+	@import './public/css/refund.scss';
 </style>
-<style lang="scss" scoped>
-/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	background: none;
-	max-height: unset !important;
-	overflow-y: hidden !important;
-}
+<style scoped>
+	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none;
+		max-height: unset !important;
+		overflow-y: hidden !important;
+	}
 
-/deep/ .uni-popup__wrapper {
-	border-radius: 20rpx 20rpx 0 0;
-}
+	/deep/ .uni-popup__wrapper {
+		border-radius: 20rpx 20rpx 0 0;
+	}
 
-/deep/ .uni-popup {
-	z-index: 8;
-}
+	/deep/ .uni-popup {
+		z-index: 8;
+	}
 
-.sub-btn {
-	padding-top: 20rpx;
-	background-color: #FFFFFF;
-}
+	.sub-btn {
+		padding-top: 20rpx;
+		background-color: #FFFFFF;
+	}
 </style>

pages_tool/pay/cashier.vue

@@ -7,17 +7,15 @@
 					<text class="unit price-font">￥</text>
 					<text class="money price-font">{{ payInfo.pay_money | moneyFormat }}</text>
 				</view>
-
+				
 				<block v-if="payTypeList.length > 0">
 					<view class="pay-type">
-						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
-							@click="payIndex = index">
+						<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
 							<view>
 								<text class="iconfont" :class="item.icon"></text>
 								<text class="name">{{ item.name }}</text>
 							</view>
-							<text class="iconfont"
-								:class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+							<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
 						</view>
 					</view>
 					<button type="primary" @click="confirm">确认支付</button>
@@ -33,13 +31,11 @@
 
 <script>
 import { Weixin } from 'common/js/wx-jssdk.js';
+import nsLogin from '@/components/ns-login/ns-login.vue';
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 
 export default {
-	components: {
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-		nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
+	components: { nsLogin, nsEmpty },
 	data() {
 		return {
 			payIndex: 0,
@@ -90,7 +86,7 @@ export default {
 								this.autoPay();
 							}, 500)
 						}
-					}
+					} 
 				}
 			});
 		},
@@ -110,10 +106,10 @@ export default {
 				}
 			});
 		},
-		autoPay() {
+		autoPay(){
 			if (!this.payTypeList.length) return;
 			if (this.$util.isWeiXin()) {
-				this.payTypeList.forEach((item, index) => {
+			 	this.payTypeList.forEach((item, index) => {
 					if (item.type == 'wechatpay') {
 						this.payIndex = index;
 						this.confirm();
@@ -290,7 +286,7 @@ export default {
 		// #endif
 	},
 	watch: {
-		storeToken: function (nVal, oVal) {
+		storeToken: function(nVal, oVal) {
 			if (nVal) {
 				this.getPayInfo();
 			}
@@ -314,7 +310,6 @@ export default {
 	align-items: center;
 	flex-direction: column;
 	padding: 80rpx 26rpx;
-
 	.content {
 		white-space: nowrap;
 		overflow: hidden;
@@ -323,16 +318,13 @@ export default {
 		padding: 0 60rpx;
 		text-align: center;
 	}
-
 	.money-wrap {
 		font-weight: bold;
 		margin: 40rpx 0;
-
 		.unit {
 			font-size: 40rpx;
 			margin-right: 6rpx;
 		}
-
 		.money {
 			font-size: 70rpx;
 		}
@@ -342,7 +334,6 @@ export default {
 		width: 100%;
 		background: #fff;
 		border-radius: 20rpx;
-
 		.payment-item {
 			display: flex;
 			align-items: center;
@@ -350,43 +341,34 @@ export default {
 			height: 90rpx;
 			border-bottom: 2rpx solid $color-line;
 			padding: 20rpx 30rpx;
-
 			&:last-of-type {
 				border-bottom: none;
 			}
-
-			>view {
+			> view {
 				display: flex;
 				align-items: center;
-
 				.name {
 					margin-left: 20rpx;
 				}
 			}
-
 			.iconfont {
 				font-size: 64rpx;
 			}
-
 			.icon-weixin1 {
 				color: #24af41;
 			}
-
 			.icon-zhifubaozhifu- {
 				color: #00a0e9;
 			}
-
 			.icon-yuan_checked {
 				font-size: 40rpx;
 				color: $base-color;
 			}
-
 			.icon-checkboxblank {
 				font-size: 40rpx;
 			}
 		}
 	}
-
 	button {
 		width: 100%;
 		margin-top: 80rpx !important;

pages_tool/pay/index.vue

@@ -18,9 +18,7 @@
 
 <script>
 export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
+	components: {},
 	data() {
 		return {
 			isIphoneX: false,

pages_tool/pay/result.vue

@@ -3,19 +3,16 @@
 		<template v-if="payInfo.pay_status != undefined">
 			<view class="result-box">
 				<template v-if="payInfo.pay_status">
-					<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true"
-						class="result-image" />
+					<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true" class="result-image"/>
 					<view class="msg success">{{ $lang('paymentSuccess') }}</view>
 					<view class="pay-amount">
 						<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-						<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0]
-							}}</text>
-						<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1]
-							}}</text>
+						<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0] }}</text>
+						<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1] }}</text>
 					</view>
 				</template>
 				<template v-else>
-					<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image" />
+					<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image"/>
 					<view class="msg fail">{{ $lang('paymentFail') }}</view>
 				</template>
 
@@ -63,288 +60,284 @@
 </template>
 
 <script>
-export default {
-	components: {
-		nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-	},
-	data() {
-		return {
-			payInfo: {},
-			outTradeNo: '',
-			paySource: '',
-			consumeInfo: {},
-			consumeStatus: 0,
-		};
-	},
-	onLoad(option) {
-		if (option.code) this.outTradeNo = option.code;
-		this.paySource = uni.getStorageSync('paySource');
-	},
-	onShow() {
-		this.getPayInfo();
-		this.getConsume();
-	},
-	methods: {
-		consume(type) {
-			switch (type) {
-				case 'point':
-					this.$util.redirectTo('/pages_tool/member/point_detail', {});
-					break;
-				case 'growth':
-					this.$util.redirectTo('/pages_tool/member/level', {});
-					break;
-				case 'coupon':
-					this.$util.redirectTo('/pages_tool/member/coupon', {});
-					break;
-				default:
-					this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-					break;
-			}
+	export default {
+		data() {
+			return {
+				payInfo: {},
+				outTradeNo: '',
+				paySource: '',
+				consumeInfo: {},
+				consumeStatus: 0,
+			};
 		},
-		getConsume() {
-			this.$api.sendRequest({
-				url: '/memberconsume/api/config/info',
-				data: {
-					out_trade_no: this.outTradeNo
-				},
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						let reward = res.data.value;
-						if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
-							this.consumeStatus = res.data.is_use;
-							this.consumeInfo = res.data.value;
+		onLoad(option) {
+			if (option.code) this.outTradeNo = option.code;
+			this.paySource = uni.getStorageSync('paySource');
+		},
+		onShow() {
+			this.getPayInfo();
+			this.getConsume();
+		},
+		methods: {
+			consume(type) {
+				switch (type) {
+					case 'point':
+						this.$util.redirectTo('/pages_tool/member/point_detail', {});
+						break;
+					case 'growth':
+						this.$util.redirectTo('/pages_tool/member/level', {});
+						break;
+					case 'coupon':
+						this.$util.redirectTo('/pages_tool/member/coupon', {});
+						break;
+					default:
+						this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+						break;
+				}
+			},
+			getConsume() {
+				this.$api.sendRequest({
+					url: '/memberconsume/api/config/info',
+					data: {
+						out_trade_no: this.outTradeNo
+					},
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							let reward = res.data.value;
+							if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
+								this.consumeStatus = res.data.is_use;
+								this.consumeInfo = res.data.value;
+							}
 						}
-					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-				}
-			});
-		},
-		getPayInfo() {
-			this.$api.sendRequest({
-				url: '/api/pay/info',
-				data: {
-					out_trade_no: this.outTradeNo
-				},
-				success: res => {
-					if (res.code >= 0 && res.data) {
-						this.payInfo = res.data;
-						this.payInfo.pay_money = parseFloat(res.data.pay_money);
-						this.payInfo.pay_money += parseFloat(res.data.balance);
-						this.payInfo.pay_money += parseFloat(res.data.balance_money);
+					},
+					fail: res => {
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-					} else {
-						this.$util.showToast({
-							title: '未获取到支付信息！'
-						});
-						setTimeout(() => {
-							this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
-						}, 1500);
 					}
-				},
-				fail: res => {
-					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				});
+			},
+			getPayInfo() {
+				this.$api.sendRequest({
+					url: '/api/pay/info',
+					data: {
+						out_trade_no: this.outTradeNo
+					},
+					success: res => {
+						if (res.code >= 0 && res.data) {
+							this.payInfo = res.data;
+							this.payInfo.pay_money = parseFloat(res.data.pay_money);
+							this.payInfo.pay_money += parseFloat(res.data.balance);
+							this.payInfo.pay_money += parseFloat(res.data.balance_money);
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						} else {
+							this.$util.showToast({
+								title: '未获取到支付信息！'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
+							}, 1500);
+						}
+					},
+					fail: res => {
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					}
+				});
+			},
+			goHome() {
+				this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
+			},
+			toOrderDetail(id) {
+				if (this.payInfo.order_type == 2) {
+					this.$util.redirectTo('/pages_order/detail_pickup', {
+						order_id: id
+					}, 'redirectTo');
+				} else if (this.payInfo.order_type == 3) {
+					this.$util.redirectTo('/pages_order/detail_local_delivery', {
+						order_id: id
+					}, 'redirectTo');
+				} else if (this.payInfo.order_type == 4) {
+					this.$util.redirectTo('/pages_tool/order/detail_virtual', {
+						order_id: id
+					}, 'redirectTo');
+				} else {
+					this.$util.redirectTo('/pages_order/detail', {
+						order_id: id
+					}, 'redirectTo');
 				}
-			});
-		},
-		goHome() {
-			this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
-		},
-		toOrderDetail(id) {
-			if (this.payInfo.order_type == 2) {
-				this.$util.redirectTo('/pages_order/detail/detail_pickup', {
-					order_id: id
-				}, 'redirectTo');
-			} else if (this.payInfo.order_type == 3) {
-				this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
-					order_id: id
-				}, 'redirectTo');
-			} else if (this.payInfo.order_type == 4) {
-				this.$util.redirectTo('/pages_tool/order/detail_virtual', {
-					order_id: id
-				}, 'redirectTo');
-			} else {
-				this.$util.redirectTo('/pages_order/detail/detail', {
-					order_id: id
-				}, 'redirectTo');
+			},
+			toOrder(id) {
+				this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toRecharge() {
+				this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toCard() {
+				this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toPresaleOrder() {
+				this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
+			},
+			toExchangeOrder() {
+				this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
+				uni.setStorageSync('paySource', '');
 			}
-		},
-		toOrder(id) {
-			this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
-			uni.setStorageSync('paySource', '');
-		},
-		toRecharge() {
-			this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
-			uni.setStorageSync('paySource', '');
-		},
-		toCard() {
-			this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
-			uni.setStorageSync('paySource', '');
-		},
-		toPresaleOrder() {
-			this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
-			uni.setStorageSync('paySource', '');
-		},
-		toExchangeOrder() {
-			this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
-			uni.setStorageSync('paySource', '');
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.consume-box {
-	padding: $padding;
-	background: #F8F8F8;
-	width: calc(100% - 48rpx);
-	margin: 0 24rpx 0 24rpx;
-	box-sizing: border-box;
-	border-radius: 20rpx;
-
-	.consume-head {
-		display: flex;
-		justify-content: center;
-		font-weight: 500;
-		font-size: 26rpx;
-
-		.consume-head-text {
-			line-height: 1;
-		}
-	}
-
-	.consume-list {
-		display: flex;
-	}
-
-	.consume-item {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: $color-title;
-		font-size: $font-size-base;
-		margin-top: 10rpx;
-
-		image {
-			width: 24rpx;
-			margin-right: 4rpx;
-		}
-
-		.consume-value {
-			font-size: 26rpx;
-		}
-	}
-
-	.consume-remark {
-		color: $color-tip;
-		font-size: $font-size-tag;
-		padding: 10rpx 20rpx;
-	}
-}
-
-.clear {
-	clear: both;
-}
-
-.container {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-
-	.result-box {
-		padding-top: 94rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		background-color: #FFFFFF;
-		width: 100%;
-		padding-bottom: 40rpx;
-	}
-
-	.result-image {
-		width: 80rpx;
-		height: auto;
-		will-change: transform;
-	}
-
-	.msg {
-		font-size: 32rpx;
-		margin-top: 25rpx;
-
-		&.success {
-			color: #09BB07;
-		}
-
-		&.fail {
-			color: #FF4646;
-		}
-	}
-
-	.pay-amount {
-		font-size: 30rpx;
-		margin: 40rpx 0 24rpx 0;
-		font-weight: 600;
-		line-height: 50rpx;
-
-		text {
-			color: #333333 !important;
-			font-weight: bold !important;
-		}
-
-		.unit {
-			margin-right: 4rpx;
-		}
-
-		.large {
-			font-size: 60rpx !important;
-		}
-
-		.small {
-			font-size: 36rpx !important;
-		}
-	}
-
-	.action {
-		width: 100%;
-		height: 80rpx;
-		display: flex;
-		justify-content: center;
+	.consume-box {
+		padding: $padding;
+		background: #F8F8F8;
+		width: calc(100% - 48rpx);
+		margin: 0 24rpx 0 24rpx;
 		box-sizing: border-box;
-		margin-top: 24rpx;
+		border-radius: 20rpx;
 
-		.btn {
-			font-size: 30rpx;
-			width: 200rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			text-align: center;
-			border-radius: 66rpx;
-			border: 1px solid $color-tip;
-			box-sizing: border-box;
+		.consume-head {
+			display: flex;
+			justify-content: center;
+			font-weight: 500;
+			font-size: 26rpx;
 
-			&:last-child {
-				margin-left: 40rpx;
+			.consume-head-text {
+				line-height: 1;
 			}
 		}
 
-		.go-home {
-			background-color: $base-color;
-			color: #fff;
-			border-color: $base-color;
+		.consume-list {
+			display: flex;
+		}
+
+		.consume-item {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: $color-title;
+			font-size: $font-size-base;
+			margin-top: 10rpx;
+
+			image {
+				width: 24rpx;
+				margin-right: 4rpx;
+			}
+
+			.consume-value {
+				font-size: 26rpx;
+			}
+		}
+
+		.consume-remark {
+			color: $color-tip;
+			font-size: $font-size-tag;
+			padding: 10rpx 20rpx;
 		}
 	}
-}
 
-/deep/ .goods-recommend {
-	margin-top: 30rpx;
-}
+	.clear {
+		clear: both;
+	}
+
+	.container {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.result-box {
+			padding-top: 94rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background-color: #FFFFFF;
+			width: 100%;
+			padding-bottom: 40rpx;
+		}
+
+		.result-image {
+			width: 80rpx;
+			height: auto;
+			will-change: transform;
+		}
+
+		.msg {
+			font-size: 32rpx;
+			margin-top: 25rpx;
+
+			&.success {
+				color: #09BB07;
+			}
+
+			&.fail {
+				color: #FF4646;
+			}
+		}
+
+		.pay-amount {
+			font-size: 30rpx;
+			margin: 40rpx 0 24rpx 0;
+			font-weight: 600;
+			line-height: 50rpx;
+
+			text {
+				color: #333333 !important;
+				font-weight: bold !important;
+			}
+
+			.unit {
+				margin-right: 4rpx;
+			}
+
+			.large {
+				font-size: 60rpx !important;
+			}
+
+			.small {
+				font-size: 36rpx !important;
+			}
+		}
+
+		.action {
+			width: 100%;
+			height: 80rpx;
+			display: flex;
+			justify-content: center;
+			box-sizing: border-box;
+			margin-top: 24rpx;
+
+			.btn {
+				font-size: 30rpx;
+				width: 200rpx;
+				height: 66rpx;
+				line-height: 66rpx;
+				text-align: center;
+				border-radius: 66rpx;
+				border: 1px solid $color-tip;
+				box-sizing: border-box;
+
+				&:last-child {
+					margin-left: 40rpx;
+				}
+			}
+
+			.go-home {
+				background-color: $base-color;
+				color: #fff;
+				border-color: $base-color;
+			}
+		}
+	}
+
+	/deep/ .goods-recommend {
+		margin-top: 30rpx;
+	}
 </style>
 
-<style lang="scss" scoped>
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-	max-height: unset !important;
-}
+<style scoped>
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_tool/pay/wx_pay.vue

@@ -12,15 +12,15 @@ export default {
 	name: 'wx_pay',
 	data() {
 		return {
-			show: true,
-			wx_alipay: "",
-			out_trade_no: ""
+			show : true,
+			wx_alipay : "",
+			out_trade_no : ""
 		};
 	},
 	onLoad(options) {
 		this.wx_alipay = options.wx_alipay || '';
 		this.out_trade_no = options.out_trade_no || '';
-		if (!this.$util.isWeiXin() && this.wx_alipay) {
+		if(!this.$util.isWeiXin() && this.wx_alipay){
 			this.show = false;
 			location.href = this.wx_alipay;
 		}
@@ -36,7 +36,7 @@ export default {
 				success: res => {
 					if (res.code >= 0 && res.data) {
 						this.checkPayStatus();
-					}
+					} 
 				}
 			});
 		},
@@ -64,33 +64,29 @@ export default {
 </script>
 
 <style lang="scss">
-.launch-mask {
-	position: fixed;
-	top: 0px;
+.launch-mask{
+	position:fixed;
+	top:0px;
 	left: 0px;
-	width: 100%;
+	width:100%;
 	height: 100%;
-	background: rgba(0, 0, 0, 0.8);
-
-	.mask-img {
+	background:rgba(0,0,0,0.8);
+	.mask-img{
 		text-align: right;
-		margin: 10% 10px 10px 30px;
-
-		image {
+		margin:10% 10px 10px 30px;
+		image{
 			width: 50px;
-			height: 117px;
-			margin-right: 9%
+			height:117px;
+			margin-right:9%
 		}
 	}
-
-	.mask-word {
+	.mask-word{
 		color: #fff;
 		text-align: center;
 		font-weight: bold;
 		font-size: 18px;
-
-		text {
-			color: #FF0036 !important
+		text{
+			color:#FF0036 !important
 		}
 	}
 }