浏览代码

修改小程序

zs 1 年之前
父节点
当前提交
e0cd5aa4f7
共有 45 个文件被更改,包括 502 次插入499 次删除
  1. 417 418
      pagesMy/order/index.vue
  2. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  3. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/shop/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  44. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/order/index.js
  45. 42 38
      unpackage/dist/dev/mp-weixin/project.config.json

+ 417 - 418
pagesMy/order/index.vue

@@ -1,419 +1,418 @@
-<template>
-	<view class="content">
-		<view class="one">
-			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
-		</view>
-		<view class="two">
-			<tabs :tabs="tabs" @tabsChange="tabsChange">
-				<view class="tabsList">
-					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
-						<view class="list-scroll-view">
-							<view class="list" v-for="(item,index) in list" :key="index" @tap="toInfo(item)">
-								<view class="list_1">
-									<text>
-										<text class="iconfont icon-changshangguanli"></text>
-										{{item.supplier_name}}
-									</text>
-									<text class="status">{{item.zhStatus}}</text>
-								</view>
-								<view class="list_2">
-									<view class="left">
-										<image v-if="item.spec_file" class="image"
-											:src="item.spec_file?item.spec_file.url:''" mode="">
-										</image>
-										<image v-else class="image" :src="item.good_file?item.good_file.url:''" mode="">
-										</image>
-									</view>
-									<view class="right">
-										<view class="right_1">
-											<view class="name textOver">
-												<text>{{item.good_name||'暂无'}}</text>
-											</view>
-											<view class="num">
-												<text>¥{{item.total_money||'0'}}</text>
-												<text>×{{item.num||'0'}}</text>
-											</view>
-										</view>
-										<view class="right_2">
-											<view class="spec textOver">
-												<text>规格:{{item.spec_name||'暂无'}}</text>
-											</view>
-										</view>
-									</view>
-								</view>
-								<view class="bottom">
-									<button v-if="item.status=='5'" size="mini" type="default"
-										@tap.stop="toConfirm(item)">确认发货</button>
-								</view>
-							</view>
-							<view class="is_bottom" v-if="is_bottom">
-								<text>{{config.bottom_title}}</text>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-			</tabs>
-		</view>
-	</view>
-</template>
-
-<script>
-	import tabs from '../../components/tabs/index.vue';
-	export default {
-		components: {
-			tabs
-		},
-		data() {
-			return {
-				// 系统设置
-				config: {},
-				user: {},
-				status: '',
-				searchInfo: {},
-				tabs: {
-					active: '0',
-					menu: []
-				},
-				list: [],
-				total: 0,
-				skip: 0,
-				limit: 6,
-				page: 0,
-				// 数据是否触底
-				is_bottom: false,
-				scrollTop: 0,
-				// 字典表
-				statusList: [],
-			}
-		},
-		onLoad: function(e) {
-			const that = this;
-			that.$set(that, `status`, e.status || '0');
-			that.$set(that.tabs, `active`, e.status || '0');
-			that.searchConfig();
-		},
-		onShow: async function(e) {
-			const that = this;
-			await that.searchOther();
-			that.searchToken();
-		},
-		onPullDownRefresh: async function() {
-			const that = this;
-			that.clearPage();
-			await that.search();
-			uni.stopPullDownRefresh();
-		},
-		methods: {
-			searchConfig() {
-				const that = this;
-				try {
-					const res = uni.getStorageSync('config');
-					if (res) that.$set(that, `config`, res);
-				} catch (e) {
-					uni.showToast({
-						title: err.errmsg,
-						icon: 'error',
-						duration: 2000
-					});
-				}
-			},
-			searchToken() {
-				const that = this;
-				try {
-					const res = uni.getStorageSync('token');
-					if (res) {
-						that.$set(that, `user`, res);
-						that.clearPage();
-						that.search();
-					}
-				} catch (e) {
-					uni.showToast({
-						title: err.errmsg,
-						icon: 'error',
-						duration: 2000
-					});
-				}
-			},
-			async search() {
-				const that = this;
-				let user = that.user;
-				let status = that.status;
-				let info = {
-					skip: that.skip,
-					limit: that.limit,
-					user: user._id,
-				}
-				if (status != '-1') info.status = status
-				let res;
-				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
-					...info,
-					...that.searchInfo
-				});
-				if (res.errcode == '0') {
-					let list = [...that.list, ...res.data];
-					for (let val of list) {
-						val.zhStatus = that.searchStatus(val.status)
-					}
-					that.$set(that, `list`, list);
-					that.$set(that, `total`, res.total)
-				} else {
-					uni.showToast({
-						title: res.errmsg,
-						icon: 'none'
-					})
-				}
-			},
-			// 查询状态
-			searchStatus(e) {
-				const that = this;
-				let data = that.statusList.find((i) => i.value == e);
-				if (data) return data.label
-				else return '暂无'
-			},
-			// 确认发货
-			async toConfirm(item) {
-				const that = this;
-				let user = that.user;
-				let obj = {
-					status: '6'
-				}
-				uni.showModal({
-					title: '提示',
-					content: '是否要确认收货?',
-					success: async function(res) {
-						if (res.confirm) {
-							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
-							if (res.errcode == '0') {
-								uni.showToast({
-									title: '维护信息成功',
-									icon: 'none'
-								})
-								that.clearPage()
-								that.search()
-							} else {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none'
-								})
-							}
-						}
-					}
-				});
-			},
-			// 查看详情
-			toInfo(e) {
-				uni.navigateTo({
-					url: `/pagesMy/order/detail?id=${e.id||e._id}`
-				})
-			},
-			// 分页
-			toPage(e) {
-				const that = this;
-				let list = that.list;
-				let limit = that.limit;
-				if (that.total > list.length) {
-					uni.showLoading({
-						title: '加载中',
-						mask: true
-					})
-					let page = that.page + 1;
-					that.$set(that, `page`, page)
-					let skip = page * limit;
-					that.$set(that, `skip`, skip)
-					that.search();
-					uni.hideLoading();
-				} else that.$set(that, `is_bottom`, true)
-			},
-			// 触底
-			toScroll(e) {
-				const that = this;
-				let up = that.scrollTop;
-				that.$set(that, `scrollTop`, e.detail.scrollTop);
-				let num = Math.sign(up - e.detail.scrollTop);
-				if (num == 1) that.$set(that, `is_bottom`, false);
-			},
-			// 输入框
-			toInput(e) {
-				const that = this;
-				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
-				else that.$set(that, `searchInfo`, {})
-				that.clearPage();
-				that.search();
-			},
-			// 查询其他信息
-			async searchOther() {
-				const that = this;
-				let res;
-				// 查询状态
-				res = await that.$api(`/DictData`, 'GET', {
-					type: 'order_status',
-					is_use: '0',
-				})
-				if (res.errcode == '0') {
-					that.$set(that, `statusList`, res.data);
-					let status = res.data.filter((i) => {
-						return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6' || i
-							.value == '7';
-					});
-					var menu = status.map((item) => {
-						return {
-							title: item.label,
-							active: item.value
-						}
-					})
-					menu.unshift({
-						title: '全部',
-						active: '-1'
-					})
-					that.$set(that.tabs, `menu`, menu)
-				}
-			},
-			// 选择选项卡
-			tabsChange(e) {
-				const that = this;
-				that.$set(that.tabs, `active`, e.active)
-				that.$set(that, `status`, e.active);
-				that.clearPage();
-				that.search()
-			},
-			// 清空列表
-			clearPage() {
-				const that = this;
-				that.$set(that, `list`, [])
-				that.$set(that, `skip`, 0)
-				that.$set(that, `limit`, 6)
-				that.$set(that, `page`, 0)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		display: flex;
-		flex-direction: column;
-		width: 100vw;
-		height: 100vh;
-
-		.one {
-			padding: 2vw;
-
-			input {
-				padding: 2vw;
-				background-color: var(--f1Color);
-				font-size: var(--font14Size);
-				border-radius: 5px;
-			}
-		}
-
-		.two {
-			position: relative;
-			flex-grow: 1;
-			background-color: var(--f9Color);
-
-			.tabsList {
-				position: relative;
-				width: 100vw;
-				height: 82vh;
-
-				.list {
-					background-color: var(--mainColor);
-					border: 1px solid var(--f5Color);
-					padding: 2vw;
-					margin: 0 2vw 2vw 2vw;
-					border-radius: 5px;
-
-					.list_1 {
-						display: flex;
-						justify-content: space-between;
-						padding: 2vw 0;
-						font-size: var(--font16Size);
-
-						.status {
-							font-size: var(--font14Size);
-							color: var(--fF0Color);
-						}
-					}
-
-					.list_2 {
-						display: flex;
-
-						.left {
-							.image {
-								width: 20vw;
-								height: 20vw;
+<template>
+	<view class="content">
+		<view class="one">
+			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<tabs :tabs="tabs" @tabsChange="tabsChange">
+				<view class="tabsList">
+					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+						<view class="list-scroll-view">
+							<view class="list" v-for="(item,index) in list" :key="index" @tap="toInfo(item)">
+								<view class="list_1">
+									<text>
+										<text class="iconfont icon-changshangguanli"></text>
+										{{item.supplier_name}}
+									</text>
+									<text class="status">{{item.zhStatus}}</text>
+								</view>
+								<view class="list_2">
+									<view class="left">
+										<image v-if="item.spec_file" class="image"
+											:src="item.spec_file?item.spec_file.url:''" mode="">
+										</image>
+										<image v-else class="image" :src="item.good_file?item.good_file.url:''" mode="">
+										</image>
+									</view>
+									<view class="right">
+										<view class="right_1">
+											<view class="name textOver">
+												<text>{{item.good_name||'暂无'}}</text>
+											</view>
+											<view class="num">
+												<text>¥{{item.total_money||'0'}}</text>
+												<text>×{{item.num||'0'}}</text>
+											</view>
+										</view>
+										<view class="right_2">
+											<view class="spec textOver">
+												<text>规格:{{item.spec_name||'暂无'}}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="bottom">
+									<button v-if="item.status=='5'" size="mini" type="default"
+										@tap.stop="toConfirm(item)">确认发货</button>
+								</view>
+							</view>
+							<view class="is_bottom" v-if="is_bottom">
+								<text>{{config.bottom_title}}</text>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</tabs>
+		</view>
+	</view>
+</template>
+
+<script>
+	import tabs from '../../components/tabs/index.vue';
+	export default {
+		components: {
+			tabs
+		},
+		data() {
+			return {
+				// 系统设置
+				config: {},
+				user: {},
+				status: '',
+				searchInfo: {},
+				tabs: {
+					active: '0',
+					menu: []
+				},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
+			}
+		},
+		onLoad: function(e) {
+			const that = this;
+			that.$set(that, `status`, e.status || '0');
+			that.$set(that.tabs, `active`, e.status || '0');
+			that.searchConfig();
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchOther();
+			that.searchToken();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+						that.clearPage();
+						that.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let status = that.status;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					user: user._id,
+				}
+				if (status != '-1') info.status = status
+				let res;
+				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
+					...info,
+					...that.searchInfo
+				});
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						val.zhStatus = that.searchStatus(val.status)
+					}
+					that.$set(that, `list`, list);
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
+			// 查询状态
+			searchStatus(e) {
+				const that = this;
+				let data = that.statusList.find((i) => i.value == e);
+				if (data) return data.label
+				else return '暂无'
+			},
+			// 确认发货
+			async toConfirm(item) {
+				const that = this;
+				let user = that.user;
+				let obj = {
+					status: '6'
+				}
+				uni.showModal({
+					title: '提示',
+					content: '是否要确认收货?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: '维护信息成功',
+									icon: 'none'
+								})
+								that.clearPage()
+								that.search()
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
+			// 查看详情
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pagesMy/order/detail?id=${e.id||e._id}`
+				})
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			// 触底
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询状态
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'order_status',
+					is_use: '0',
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `statusList`, res.data);
+					let status = res.data.filter((i) => {
+						return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6';
+					});
+					var menu = status.map((item) => {
+						return {
+							title: item.label,
+							active: item.value
+						}
+					})
+					menu.unshift({
+						title: '全部',
+						active: '-1'
+					})
+					that.$set(that.tabs, `menu`, menu)
+				}
+			},
+			// 选择选项卡
+			tabsChange(e) {
+				const that = this;
+				that.$set(that.tabs, `active`, e.active)
+				that.$set(that, `status`, e.active);
+				that.clearPage();
+				that.search()
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 6)
+				that.$set(that, `page`, 0)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			padding: 2vw;
+
+			input {
+				padding: 2vw;
+				background-color: var(--f1Color);
+				font-size: var(--font14Size);
+				border-radius: 5px;
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+
+			.tabsList {
+				position: relative;
+				width: 100vw;
+				height: 82vh;
+
+				.list {
+					background-color: var(--mainColor);
+					border: 1px solid var(--f5Color);
+					padding: 2vw;
+					margin: 0 2vw 2vw 2vw;
+					border-radius: 5px;
+
+					.list_1 {
+						display: flex;
+						justify-content: space-between;
+						padding: 2vw 0;
+						font-size: var(--font16Size);
+
+						.status {
+							font-size: var(--font14Size);
+							color: var(--fF0Color);
+						}
+					}
+
+					.list_2 {
+						display: flex;
+
+						.left {
+							.image {
+								width: 20vw;
+								height: 20vw;
 								border-radius: 5px;
-								border: 1px solid var(--f9Color);
-							}
-						}
-
-						.right {
-							width: 70vw;
-							margin: 0 0 0 2vw;
-
-							.right_1 {
-								display: flex;
-								justify-content: space-between;
-								margin: 2vw 0;
-
-								.name {
-									font-size: var(--font14Size);
-								}
-
-								.num {
-									display: flex;
-									flex-direction: column;
-									align-items: flex-end;
-
-									text:last-child {
-										font-size: var(--font13Size);
-										color: var(--f85Color);
-									}
-								}
-							}
-
-							.right_2 {
-								font-size: var(--font12Size);
-								color: var(--f85Color);
-							}
-						}
-					}
-
-					.bottom {
-						text-align: center;
-						padding: 1vw 0;
-
-						button {
-							margin: 0 5px 0 0;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.scroll-view {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-
-		.list-scroll-view {
-			display: flex;
-			flex-direction: column;
-		}
-	}
-
-	.is_bottom {
-		width: 100%;
-		text-align: center;
-
-		text {
-			padding: 2vw 0;
-			display: inline-block;
-			color: var(--f85Color);
-			font-size: var(--font14Size);
-		}
-	}
-</style>
+								border: 1px solid var(--f9Color);
+							}
+						}
+
+						.right {
+							width: 70vw;
+							margin: 0 0 0 2vw;
+
+							.right_1 {
+								display: flex;
+								justify-content: space-between;
+								margin: 2vw 0;
+
+								.name {
+									font-size: var(--font14Size);
+								}
+
+								.num {
+									display: flex;
+									flex-direction: column;
+									align-items: flex-end;
+
+									text:last-child {
+										font-size: var(--font13Size);
+										color: var(--f85Color);
+									}
+								}
+							}
+
+							.right_2 {
+								font-size: var(--font12Size);
+								color: var(--f85Color);
+							}
+						}
+					}
+
+					.bottom {
+						text-align: center;
+						padding: 1vw 0;
+
+						button {
+							margin: 0 5px 0 0;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/shop/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/order/index.js

@@ -341,7 +341,7 @@ var _default = {
                 if (res.errcode == '0') {
                   that.$set(that, "statusList", res.data);
                   status = res.data.filter(function (i) {
-                    return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6' || i.value == '7';
+                    return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6';
                   });
                   menu = status.map(function (item) {
                     return {

+ 42 - 38
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,39 +1,43 @@
-{
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx23c71bee5876d1b9",
-  "projectname": "test",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "系统首页",
-          "pathName": "pages/index/index",
-          "query": ""
-        }
-      ]
-    }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "wx23c71bee5876d1b9",
+  "projectname": "test",
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 0,
+      "list": [
+        {
+          "name": "系统首页",
+          "query": "",
+          "id": 0,
+          "pathName": "pages/index/index"
+        }
+      ]
+    }
+  }
 }