修改

common/css/font-icon.css

@@ -1,88 +1,91 @@
 @font-face {
-	font-family: "iconfont";
-	/* Project id 4182834 */
-	src: url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.woff2?t=1690870665503') format('woff2'),
-		url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.woff?t=1690870665503') format('woff'),
-		url('//at.alicdn.com/t/c/font_4182834_cocd3rt4v2.ttf?t=1690870665503') format('truetype');
+  font-family: "iconfont"; /* Project id 4182834 */
+  src: url('//at.alicdn.com/t/c/font_4182834_c6qoydiu4q.woff2?t=1691042294599') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4182834_c6qoydiu4q.woff?t=1691042294599') format('woff'),
+       url('//at.alicdn.com/t/c/font_4182834_c6qoydiu4q.ttf?t=1691042294599') format('truetype');
 }
 
 .iconfont {
-	font-family: "iconfont" !important;
-	font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-changshangguanli:before {
+  content: "\e621";
 }
 
 .icon-icon-cross-empty:before {
-	content: "\e65c";
+  content: "\e65c";
 }
 
 .icon-dayuhao:before {
-	content: "\e625";
+  content: "\e625";
 }
 
 .icon-shenpi1:before {
-	content: "\e63a";
+  content: "\e63a";
 }
 
 .icon-zhuyuanriqingdanchaxunbeifen:before {
-	content: "\e62b";
+  content: "\e62b";
 }
 
 .icon-shangpinguanli:before {
-	content: "\fcda";
+  content: "\fcda";
 }
 
 .icon-31daifahuo:before {
-	content: "\e600";
+  content: "\e600";
 }
 
 .icon-daishouhuo:before {
-	content: "\e617";
+  content: "\e617";
 }
 
 .icon-transaction:before {
-	content: "\e693";
+  content: "\e693";
 }
 
 .icon-shenpi:before {
-	content: "\e733";
+  content: "\e733";
 }
 
 .icon-weixin:before {
-	content: "\e73b";
-	color: #0bc918;
+  content: "\e73b";
+  color: #0bc918;
 }
 
 .icon-yonghu:before {
-	content: "\e643";
+  content: "\e643";
 }
 
 .icon-shezhi:before {
-	content: "\10127";
+  content: "\10127";
 }
 
 .icon-shouye:before {
-	content: "\10128";
+  content: "\10128";
 }
 
 .icon-taocan:before {
-	content: "\10129";
+  content: "\10129";
 }
 
 .icon-fuwu:before {
-	content: "\1012b";
+  content: "\1012b";
 }
 
 .icon-tukuguanli:before {
-	content: "\1012d";
+  content: "\1012d";
 }
 
 .icon-haoyoutuijian:before {
-	content: "\1012f";
+  content: "\1012f";
 }
 
 .icon-zengjia:before {
-	content: "\e608";
+  content: "\e608";
 }

config.js

@@ -69,6 +69,12 @@ export default {
 			role: ['cs'],
 			route: "pagesMy/goods/index",
 		},
+		{
+			icon: "icon-zhuyuanriqingdanchaxunbeifen",
+			title: "订单管理",
+			role: ['cs'],
+			route: "pagesMy/order/order",
+		},
 		{
 			icon: "icon-shenpi1",
 			title: "采购审批",

pages.json

@@ -61,6 +61,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "order/order",
+					"style": {
+						"navigationBarTitleText": "订单管理",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "repair/index",
 					"style": {

pages/market/index.vue

@@ -26,37 +26,42 @@
 										{{item.supplier.name}}
 									</checkbox>
 								</view>
-								<checkbox-group name="checkbox" @change="goodsChange
-								">
-									<view class="content" v-for="gs in item.list" :key="gs.specs._id">
-										<view class="box">
-											<checkbox :value="gs.specs._id" :checked="gs.check" />
-										</view>
-										<view class="img">
-											<image :src="getFile(gs)"></image>
-										</view>
-										<view class="one_1" v-if="num==0"
-											@click="toCommon('/pagesGoods/index/index',gs)">
-											<view class="name textOver">{{gs.goods.name}}</view>
-											<view class="info">
-												<view class="title_1 textOver" v-if="gs.specs.name">
-													<text>规格:{{gs.specs.name}}</text>
+								<view v-for="gs in item.list" :key="gs.specs._id">
+									<checkbox-group name="checkbox" @click="goodsChange(gs)">
+										<view class="content">
+											<view class="box">
+												<checkbox :value="gs.cart_id" :checked="gs.check" />
+											</view>
+											<view class="img">
+												<image :src="getFile(gs)"></image>
+											</view>
+											<view class="thr_1" v-if="num==0"
+												@click="toCommon('/pagesGoods/index/index',gs)">
+												<view class="left">
+													<view class="name textOver">{{gs.goods.name}}</view>
+													<view class="other">
+														<view class="money" v-if="num==0">
+															<view>¥{{gs.money}}</view>
+															<view>x{{gs.num}}</view>
+														</view>
+													</view>
+												</view>
+												<view class="right">
+													<view class="title_1 textOver" v-if="gs.specs.name">
+														<text>规格:{{gs.specs.name}}</text>
+													</view>
 												</view>
 											</view>
+											<view class="num" v-if="num==1">
+												<uni-number-box @change="changeValue(gs)" name="num" value="gs" :min="1"
+													:max="gs.specs.num" v-model="gs.num" />
+											</view>
+											<view class="del" v-if="num==1">
+												<text class="iconfont icon-icon-cross-empty" @click="toDel(gs)"></text>
+											</view>
 										</view>
-										<view class="money" v-if="num==0">
-											<view>¥{{gs.money}}</view>
-											<view>x{{gs.num}}</view>
-										</view>
-										<view class="num" v-if="num==1">
-											<uni-number-box @change="changeValue(gs)" name="num" value="gs" :min="1"
-												:max="gs.specs.num" v-model="gs.num" />
-										</view>
-										<view class="del" v-if="num==1">
-											<text class="iconfont icon-icon-cross-empty" @click="toDel(gs)"></text>
-										</view>
-									</view>
-								</checkbox-group>
+									</checkbox-group>
+								</view>
 							</view>
 						</view>
 					</checkbox-group>
@@ -179,33 +184,10 @@
 			goodsChange(e) {
 				const that = this;
 				let list = that.list;
-				const {
-					value
-				} = e.detail;
-				let shop = list.find(f => f.list.find(i => value.find(s => s == i.specs._id)))
-				if (shop) {
-					for (let val of shop.list) {
-						let p2 = value.find((i) => i == val.specs._id);
-						if (p2) val.check = true;
-						else val.check = false;
+				for (let val of list) {
+					for (let as of val.list) {
+						if (e.cart_id == as.cart_id) as.check = !as.check;
 					}
-				} else {
-					list = list.map(i => {
-						if (i.check == false) {
-							i.list = i.list.map(g => ({
-								...g,
-								check: false
-							}))
-						} else {
-							if (i.list.length == 1) {
-								i.list = i.list.map(g => ({
-									...g,
-									check: false
-								}))
-							}
-						}
-						return i;
-					})
 				}
 				that.$set(that, `list`, list)
 				that.goodsAllChange();
@@ -360,7 +342,7 @@
 						});
 						if (res.errcode == '0') {
 							uni.navigateTo({
-								url: `/pagesMy/order/index`
+								url: `/pagesMy/order/index?status=${'0'}`
 							})
 						}
 					} else {
@@ -489,21 +471,36 @@
 						}
 					}
 
-					.one_1 {
-						width: 49vw;
-						margin: 0 2vw;
-						flex-grow: 1;
+					.thr_1 {
+						width: 60vw;
+						margin: 0 0 0 2vw;
 
-						.info {
-							width: 100%;
+						.left {
 							display: flex;
+							justify-content: space-between;
+
+							.other {
+								margin: 0 2vw;
+
+								.money {
+									text-align: right;
+									flex-grow: 1;
+								}
+							}
+						}
+
+						.right {
+							margin: 2vw 0 0 0;
 
 							.title_1 {
 								font-size: var(--font12Size);
 								color: #666;
-								margin-top: 10px;
+
 
 								text {
+									white-space: nowrap;
+									overflow: hidden;
+									text-overflow: ellipsis;
 									background-color: #eee;
 									padding: 5px;
 								}
@@ -511,11 +508,6 @@
 						}
 					}
 
-					.money {
-						text-align: right;
-						flex-grow: 1;
-					}
-
 					.num {
 						margin: 6vw 4vw;
 						font-size: var(--font20Size);

pages/my/index.vue

@@ -63,7 +63,7 @@
 				const that = this;
 				if (that.user && that.user._id) {
 					uni.navigateTo({
-						url: `/${item.route}`
+						url: `/${item.route}?status=${item.status}`
 					})
 				} else {
 					uni.navigateTo({

pagesGoods/index/index.vue

@@ -133,7 +133,8 @@
 				// 底部商品导航
 				options: [{
 						icon: 'shop',
-						text: '店铺'
+						text: '店铺',
+						type: '0'
 					},
 					{
 						icon: 'cart',
@@ -203,10 +204,12 @@
 			},
 			// 点击店铺或者购物车
 			onClick(e) {
-				uni.showToast({
-					title: `点击${e.content.text}`,
-					icon: 'none'
-				})
+				const that = this;
+				if (e.content.text == '购物车') {
+					uni.reLaunch({
+						url: 'pages/market/index'
+					})
+				}
 			},
 			// 加入购物车
 			buttonClick(e) {

pagesMy/buyExamine/index.vue

@@ -1,7 +1,57 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<view class="one">
+			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<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.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 class="spec textOver">
+										<text>购买用户：{{item.user_name||'暂无'}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="bottom">
+							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审核通过</button>
+							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审核拒绝</button>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
@@ -10,28 +60,319 @@
 	export default {
 		data() {
 			return {
-				title: '采购审批'
+				// 系统设置
+				config: {},
+				user: {},
+				searchInfo: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
 			}
 		},
-		onLoad() {
-
+		onLoad: function(e) {
+			const that = this;
+			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.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+				};
+				if (user.role == 'kj') {
+					info.status = '0';
+					info.accounting = user._id;
+				} else {
+					info.status = '2';
+					info.leader = user._id;
+				}
+				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'
+					})
+				}
+			},
+			// 查看详情
+			toInfo(item) {
+				console.log(item);
+			},
+			// 查询状态
+			searchStatus(e) {
+				const that = this;
+				let data = that.statusList.find((i) => i.value == e);
+				if (data) return data.label
+				else return '暂无'
+			},
+			// 分页
+			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.searchMarket();
+					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 toExam(item, type) {
+				const that = this;
+				let user = that.user;
+				let obj = {};
+				if (type == '0') {
+					if (user.role == 'kj') obj.status = '2';
+					else obj.status = '4';
+				} else {
+					if (user.role == 'kj') obj.status = '-2';
+					else obj.status = '-3';
+				}
+				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'
+								})
+							}
+						}
+					}
+				});
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询状态
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'order_status'
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+			},
+			// 清空列表
+			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>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		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);
+
+			.list {
+				background-color: #fff;
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+					justify-content: space-between;
+					padding: 2vw 0;
+					font-size: var(--font14Size);
+
+					.status {
+						color: var(--fF0Color);
+					}
+				}
+
+				.list_2 {
+					display: flex;
+
+					.left {
+						.image {
+							width: 20vw;
+							height: 20vw;
+							border-radius: 5px;
+						}
+					}
+
+					.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;
+					}
+				}
+			}
+		}
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
 	}
 </style>

pagesMy/collectionExamin/index.vue

@@ -1,7 +1,57 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<view class="one">
+			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<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.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 class="spec textOver">
+										<text>购买用户：{{item.user_name||'暂无'}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="bottom">
+							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审核通过</button>
+							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审核拒绝</button>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
@@ -10,28 +60,319 @@
 	export default {
 		data() {
 			return {
-				title: '回款审批'
+				// 系统设置
+				config: {},
+				user: {},
+				searchInfo: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
 			}
 		},
-		onLoad() {
-
+		onLoad: function(e) {
+			const that = this;
+			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.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+				};
+				if (user.role == 'kj') {
+					info.status = '7';
+					info.accounting = user._id;
+				} else if (user.role == 'ld') {
+					info.status = '8';
+					info.leader = user._id;
+				}
+				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'
+					})
+				}
+			},
+			// 查看详情
+			toInfo(item){
+				console.log(item);
+			},
+			// 查询状态
+			searchStatus(e) {
+				const that = this;
+				let data = that.statusList.find((i) => i.value == e);
+				if (data) return data.label
+				else return '暂无'
+			},
+			// 审核
+			async toExam(item, type) {
+				const that = this;
+				let user = that.user;
+				let obj = {}
+				if (type == '0') {
+					if (user.role == 'kj') obj.status = '8';
+					else obj.status = '9';
+				} else {
+					if (user.role == 'kj') obj.status = '-9';
+					else obj.status = '-9';
+				}
+				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'
+								})
+							}
+						}
+					}
+				});
+			},
+			// 分页
+			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.searchMarket();
+					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'
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+			},
+			// 清空列表
+			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>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		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);
+
+			.list {
+				background-color: #fff;
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+					justify-content: space-between;
+					padding: 2vw 0;
+					font-size: var(--font14Size);
+
+					.status {
+						color: var(--fF0Color);
+					}
+				}
+
+				.list_2 {
+					display: flex;
+
+					.left {
+						.image {
+							width: 20vw;
+							height: 20vw;
+							border-radius: 5px;
+						}
+					}
+
+					.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;
+					}
+				}
+			}
+		}
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
 	}
 </style>

pagesMy/goods/index.vue

@@ -41,7 +41,7 @@
 	export default {
 		data() {
 			return {
-				config:{},
+				config: {},
 				searchInfo: {},
 				user: {},
 				list: [],
@@ -156,11 +156,24 @@
 			// 删除
 			async toDel(e) {
 				const that = this;
-				const res = await that.$api(`/Good/${e._id}`, 'DELETE', {})
-				if (res.errcode == 0) {
-					that.clearPage();
-					that.search();
-				}
+				uni.showModal({
+					title: '提示',
+					content: '确定取消该商品吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/Good/${e._id}`, 'DELETE', {})
+							if (res.errcode == 0) {
+								that.clearPage();
+								that.search();
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
 			},
 			// 新增规格
 			toSpec(e) {

pagesMy/order/index.vue

@@ -1,37 +1,364 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<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.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>
+							<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 {
-				title: '订单'
+				// 系统设置
+				config: {},
+				user: {},
+				status: '',
+				searchInfo: {},
+				tabs: {
+					active: '0',
+					menu: []
+				},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
 			}
 		},
-		onLoad() {
-
+		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.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,
+					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 '暂无'
+			},
+			// 查看详情
+			toInfo(item) {
+				console.log(item);
+			},
+			// 分页
+			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.searchMarket();
+					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'
+				})
+				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
+						}
+					})
+					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>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		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: #fff;
+					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(--font14Size);
+
+						.status {
+							color: var(--fF0Color);
+						}
+					}
+
+					.list_2 {
+						display: flex;
+
+						.left {
+							.image {
+								width: 20vw;
+								height: 20vw;
+								border-radius: 5px;
+							}
+						}
+
+						.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);
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
 	}
 </style>

pagesMy/order/order.vue

@@ -0,0 +1,367 @@
+<template>
+	<view class="content">
+		<view class="one">
+			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<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.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 class="spec textOver">
+										<text>购买用户：{{item.user_name||'暂无'}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="bottom">
+							<button 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>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 系统设置
+				config: {},
+				user: {},
+				searchInfo: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
+			}
+		},
+		onLoad: function(e) {
+			const that = this;
+			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.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					supplier: user._id,
+					status: '4'
+				};
+				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'
+					})
+				}
+			},
+			// 查看详情
+			toInfo(item) {
+				console.log(item);
+			},
+			// 查询状态
+			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: '5'
+				}
+				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'
+								})
+							}
+						}
+					}
+				});
+			},
+			// 分页
+			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.searchMarket();
+					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'
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+			},
+			// 清空列表
+			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);
+
+			.list {
+				background-color: #fff;
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+					justify-content: space-between;
+					padding: 2vw 0;
+					font-size: var(--font14Size);
+
+					.status {
+						color: var(--fF0Color);
+					}
+				}
+
+				.list_2 {
+					display: flex;
+
+					.left {
+						.image {
+							width: 20vw;
+							height: 20vw;
+							border-radius: 5px;
+						}
+					}
+
+					.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 {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

pagesMy/spec/index.vue

@@ -42,7 +42,7 @@
 			return {
 				id: '',
 				searchInfo: {},
-				config:{},
+				config: {},
 				user: {},
 				list: [],
 				total: 0,
@@ -155,11 +155,24 @@
 			// 删除
 			async toDel(e) {
 				const that = this;
-				const res = await that.$api(`/Good/${e._id}`, 'DELETE', {})
-				if (res.errcode == 0) {
-					that.clearPage();
-					that.search();
-				}
+				uni.showModal({
+					title: '提示',
+					content: '确定取消该规格吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/Specs/${e._id}`, 'DELETE', {})
+							if (res.errcode == 0) {
+								that.clearPage();
+								that.search();
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
 			},
 			async searchOther() {
 				const that = this;

unpackage/dist/dev/mp-weixin/app.json

@@ -14,6 +14,7 @@
       "root": "pagesMy",
       "pages": [
         "order/index",
+        "order/order",
         "repair/index",
         "account/index",
         "account/info",

unpackage/dist/dev/mp-weixin/components/tabs/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/tabs/index.wxss

@@ -0,0 +1,23 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.tabs .one {
+  padding: 2vw;
+}
+.tabs .one .scrollView {
+  display: flex;
+  white-space: nowrap;
+  text-align: center;
+}
+.tabs .one .list {
+  display: inline-block;
+  padding: 2vw;
+  margin: 0 1.5vw;
+  text-align: center;
+  border-radius: 5px;
+}
+.tabs .one .list text {
+  font-weight: bold;
+  font-size: 14px;
+}
+

unpackage/dist/dev/mp-weixin/components/upload/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/upload/index.wxss

@@ -0,0 +1,38 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.upload {
+  padding: 0 2vw;
+}
+.upload .upload_1 {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.upload .upload_1 .list {
+  position: relative;
+  width: 30vw;
+  height: 28vw;
+  text-align: center;
+  margin: 0 3vw 2vw 0;
+  border-radius: 5px;
+  box-shadow: 0 0 2px var(--f85Color);
+}
+.upload .upload_1 .list .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.upload .upload_1 .list .add {
+  position: relative;
+  top: 20px;
+}
+.upload .upload_1 .list .del {
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+.upload .upload_1 .list:nth-child(3n) {
+  margin: 0 0 2vw 0;
+}
+

unpackage/dist/dev/mp-weixin/pages/good/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "所有商品",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/good/index.wxss

@@ -0,0 +1,86 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content .one {
+  height: 100vh;
+  display: flex;
+  flex-direction: row;
+}
+.content .one .one_1 {
+  position: relative;
+  width: 25vw;
+  background-color: #fafafa;
+  display: flex;
+  flex-direction: column;
+}
+.content .one .one_1 .list {
+  text-align: center;
+  padding: 2.5vw 0;
+  border-bottom: 1px solid var(--f1Color);
+}
+.content .one .one_1 .list text {
+  font-size: var(--font14Size);
+}
+.content .one .one_1 .listActive {
+  background-color: var(--fffColor);
+}
+.content .one .one_2 {
+  flex-grow: 1;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+.content .one .one_2 .one_2_1 {
+  padding: 0 2vw;
+  width: 70vw;
+}
+.content .one .one_2 .one_2_1 .list {
+  display: flex;
+  width: 66vw;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  box-shadow: 0 0 5px var(--f1Color);
+  border-radius: 5px;
+}
+.content .one .one_2 .one_2_1 .list .img {
+  width: 20vw;
+}
+.content .one .one_2 .one_2_1 .list .img .image {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 5px;
+}
+.content .one .one_2 .one_2_1 .list .info {
+  width: 45vw;
+  padding: 0 0 0 2vw;
+}
+.content .one .one_2 .one_2_1 .list .info .name {
+  font-size: var(--font15Size);
+  margin: 0 0 1vw 0;
+}
+.content .one .one_2 .one_2_1 .list .info .num {
+  font-size: var(--font14Size);
+  color: var(--f85Color);
+  margin: 0 0 1vw 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pages/home/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "首页",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar",
+    "uni-grid": "/uni_modules/uni-grid/components/uni-grid/uni-grid",
+    "uni-grid-item": "/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -0,0 +1,81 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  width: 100%;
+}
+.content .two {
+  padding: 1vw 2vw;
+  background-color: var(--f9Color);
+}
+.content .two .grid {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 5px 0 0 0;
+  margin: 5px;
+  background-color: var(--mainColor);
+  border-radius: 10px;
+}
+.content .two .grid .image {
+  width: 25px;
+  height: 25px;
+}
+.content .two .grid .text {
+  font-size: var(--font14Size);
+  margin-top: 5px;
+}
+.content .thr {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+}
+.content .thr .thr_1 {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 2vw;
+}
+.content .thr .thr_1 .list {
+  width: 43vw;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .thr .thr_1 .list .image {
+  width: 100%;
+  height: 40vw;
+  border-top-right-radius: 10px;
+  border-top-left-radius: 10px;
+}
+.content .thr .thr_1 .list .name {
+  font-size: var(--font14Size);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "系统页",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -0,0 +1 @@
+<view class="main"><view class="one"><image class="logo" src="{{logoUrl}}"></image></view></view>

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -0,0 +1,20 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one {
+  text-align: center;
+  margin: 40vw 0 0 0;
+}
+.main .one .logo {
+  width: 50vw;
+  height: 50vw;
+  border-radius: 90px;
+  box-shadow: 0 0 5px var(--f1Color);
+}
+

unpackage/dist/dev/mp-weixin/pages/login/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "登录",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/market/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "购物车",
+  "usingComponents": {
+    "uni-number-box": "/uni_modules/uni-number-box/components/uni-number-box/uni-number-box"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/market/index.wxss

@@ -0,0 +1,167 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  background-color: var(--footColor);
+}
+.main .one {
+  text-align: center;
+  margin: 2vw 0;
+}
+.main .one .logo {
+  margin: 10vw 0 2vw 0;
+}
+.main .one .logo .iconfont {
+  font-size: 35vw;
+}
+.main .one .one_1 {
+  margin: 3vw 0;
+}
+.main .one button {
+  background-color: var(--f3CColor);
+}
+.main .two {
+  display: flex;
+  background-color: var(--mainColor);
+  height: 35px;
+  margin: 0 0 4px 0;
+  padding: 5px 4vw;
+}
+.main .two .text_1 {
+  flex-grow: 1;
+  line-height: 30px;
+}
+.main .two .text_2 {
+  line-height: 35px;
+}
+.main .thr {
+  position: relative;
+  flex-grow: 1;
+  margin: 0 2vw;
+}
+.main .thr .list_1 {
+  background-color: var(--mainColor);
+  margin: 2vw 0;
+  padding: 2vw 2.5vw;
+  border-radius: 4px;
+}
+.main .thr .list_1 .title {
+  border-bottom: 1px solid var(--fcColor);
+  padding: 0 0 2vw 0;
+  font-size: var(--font18Size);
+}
+.main .thr .list_1 .title text {
+  margin: 0 1vw;
+}
+.main .thr .list_1 .content {
+  display: flex;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+  border-bottom: 1px dashed var(--fcColor);
+}
+.main .thr .list_1 .content .box {
+  line-height: 20vw;
+}
+.main .thr .list_1 .content .img {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 2vw;
+  border: 1px solid var(--fcColor);
+}
+.main .thr .list_1 .content .img image {
+  width: 20vw;
+  height: 20vw;
+}
+.main .thr .list_1 .content .thr_1 {
+  width: 60vw;
+  margin: 0 0 0 2vw;
+}
+.main .thr .list_1 .content .thr_1 .left {
+  display: flex;
+  justify-content: space-between;
+}
+.main .thr .list_1 .content .thr_1 .left .other {
+  margin: 0 2vw;
+}
+.main .thr .list_1 .content .thr_1 .left .other .money {
+  text-align: right;
+  flex-grow: 1;
+}
+.main .thr .list_1 .content .thr_1 .right {
+  margin: 2vw 0 0 0;
+}
+.main .thr .list_1 .content .thr_1 .right .title_1 {
+  font-size: var(--font12Size);
+  color: #666;
+}
+.main .thr .list_1 .content .thr_1 .right .title_1 text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  background-color: #eee;
+  padding: 5px;
+}
+.main .thr .list_1 .content .num {
+  margin: 6vw 4vw;
+  font-size: var(--font20Size);
+}
+.main .thr .list_1 .content .del {
+  margin: 6vw 0;
+  text-align: right;
+  flex-grow: 1;
+}
+.main .foot {
+  background-color: var(--fffColor);
+  display: flex;
+  justify-content: space-between;
+  height: 45px;
+  padding: 0 0 0 6vw;
+  border-right: 1px solid var(--f99Color);
+}
+.main .foot .total {
+  flex-grow: 1;
+  display: flex;
+  align-content: flex-end;
+  line-height: 40px;
+}
+.main .foot .total text {
+  color: var(--f3CColor);
+}
+.main .foot .btn button {
+  width: 30vw;
+  height: 45px;
+  line-height: 45px;
+  border-radius: 0px;
+  background-color: var(--f3CColor);
+  font-weight: normal;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+checkbox .wx-checkbox-input {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+  border-color: var(--f99Color);
+  background-color: var(--mainColor);
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+  border-color: var(--f3CColor);
+  background-color: var(--f3CColor);
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+  color: var(--fffColor);
+}
+

unpackage/dist/dev/mp-weixin/pages/my/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "我的",
+  "usingComponents": {
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/my/index.wxss

@@ -0,0 +1,111 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+}
+.content .one {
+  display: flex;
+  align-items: center;
+  background: repeating-linear-gradient(to bottom, var(--f3CColor), var(--mainColor));
+  padding: 5vw;
+}
+.content .one .logo {
+  width: 15vw;
+  height: 15vw;
+  border-radius: 90px;
+}
+.content .one .one_1 {
+  display: flex;
+  flex-direction: column;
+  padding: 0 2vw;
+}
+.content .one .one_1 .name {
+  margin: 0 0 1vw 0;
+  font-size: var(--font16Size);
+}
+.content .one .one_1 .gender {
+  color: var(--f85Color);
+  font-size: var(--font13Size);
+}
+.content .two {
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 0 2vw;
+  border-radius: 10px;
+  background-color: var(--mianColor);
+}
+.content .two .two_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+  border-bottom: 1px solid var(--f9Color);
+}
+.content .two .two_1 .left {
+  font-weight: 600;
+  font-size: var(--font14Size);
+}
+.content .two .two_1 .right {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+  color: var(--f99Color);
+}
+.content .two .two_2 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+}
+.content .two .two_2 .list {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+.content .two .two_2 .list .icon .iconfont {
+  font-size: 25px;
+}
+.content .two .two_2 .list .title {
+  display: inline-block;
+  margin: 2vw 0 0 0;
+  font-size: var(--font12Size);
+}
+.content .thr {
+  display: flex;
+  flex-direction: column;
+  margin: 2vw;
+  border-radius: 10px;
+  background-color: var(--mianColor);
+}
+.content .thr .list {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f9Color);
+}
+.content .thr .list .left {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+}
+.content .thr .list .left .icon {
+  padding: 0 2vw 0 0;
+}
+.content .thr .list .left .icon .iconfont {
+  color: var(--f3CColor);
+  font-size: 20px;
+}
+.content .thr .list .left .title {
+  display: inline-block;
+  font-size: var(--font12Size);
+}
+.content .thr .list .right {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+  color: var(--f99Color);
+}
+

unpackage/dist/dev/mp-weixin/pages/procure/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "采购",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/procure/index.wxml

@@ -0,0 +1 @@
+<view class="content"><view class="text-area"><text class="title">{{title}}</text></view></view>

unpackage/dist/dev/mp-weixin/pages/procure/index.wxss

@@ -0,0 +1,13 @@
+
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.text-area {
+	display: flex;
+	justify-content: center;
+}
+
+

unpackage/dist/dev/mp-weixin/pages/register/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "注册",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
+  }
+}