修改

pages/home/index.vue

@@ -1,74 +1,93 @@
-<template>
-	<view class="content">
-		<view class="one">
-			<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索商品">
-		</view>
-		<view class="two">
-			<uni-grid :column="4" :show-border="false" :square="false">
-				<uni-grid-item v-for="(item, index) in moduleList" :index="index" :key="index" @tap="change(item)">
-					<view class="grid">
-						<image class="image" :src="item.url&&item.url.length>0?item.url[0].url:''" mode="aspectFill">
-						</image>
-						<text class="text">{{ item.name }}</text>
-					</view>
-				</uni-grid-item>
-			</uni-grid>
-		</view>
-		<view class="thr">
-			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
-				<view class="list-scroll-view">
-					<view class="thr_1">
-						<view class="list" v-for="(item,index) in list" :key="index" @tap="toBuy(item)">
-							<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
-								mode="aspectFill">
-							</image>
-							<view class="name textOver">{{item.name||'暂无'}}</view>
-						</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 {
+<template>
+	<view class="content">
+		<view class="one">
+			<view class="one_1" v-if="!focus">
+				<input type='text' placeholder='搜索商品' confirm-type='search' @focus="focusHandler"></input>
+			</view>
+			<view class="one_2" v-if="focus">
+				<view class="left">
+					<input type="text" v-model="searchInfo.name" @focus="focusHandler" placeholder="搜索商品">
+				</view>
+				<view class="right">
+					<button size="mini" class="button" type="default" @click="cancelHandler">取消</button>
+				</view>
+			</view>
+			<!-- 搜索结果显示框 -->
+			<scroll-view v-if="focus" class="one_3" scroll-y="true">
+				<view class="list" v-for="(item, index) in goodsList" :index="index" :key="index"
+					@click="toInput(item)">
+					<text class="name"> {{item.name}}</text>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="two">
+			<uni-grid :column="4" :show-border="false" :square="false">
+				<uni-grid-item v-for="(item, index) in moduleList" :index="index" :key="index" @tap="change(item)">
+					<view class="grid">
+						<image class="image" :src="item.url&&item.url.length>0?item.url[0].url:''" mode="aspectFill">
+						</image>
+						<text class="text">{{ item.name }}</text>
+					</view>
+				</uni-grid-item>
+			</uni-grid>
+		</view>
+		<view class="thr">
+			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="thr_1">
+						<view class="list" v-for="(item,index) in list" :key="index" @tap="toBuy(item)">
+							<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
+								mode="aspectFill">
+							</image>
+							<view class="name textOver">{{item.name||'暂无'}}</view>
+						</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 {
+				focus: false, //控制是否显示带取消按钮的搜索框
 				config: {},
-				user:{},
-				searchInfo: {},
-				moduleList: [],
-				list: [],
-				total: 0,
-				skip: 0,
-				limit: 6,
-				page: 0,
-				// 数据是否触底
-				is_bottom: false,
-				scrollTop: 0,
-			}
-		},
-		async onLoad() {
-			const that = this;
-			that.searchToken();
-			that.searchConfig();
-		},
-		async onShow() {
-			const that = this;
-			that.clearPage();
-			await that.search();
-		},
-		onPullDownRefresh: async function() {
-			const that = this;
-			that.clearPage();
-			await that.search();
-			uni.stopPullDownRefresh();
-		},
-		methods: {
+				user: {},
+				searchInfo: {},
+				moduleList: [],
+				goodsList: [],
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+			}
+		},
+		async onLoad() {
+			const that = this;
+			that.searchToken();
+			that.searchConfig();
+		},
+		async onShow() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
 			searchToken() {
 				const that = this;
 				try {
@@ -81,204 +100,262 @@
 						duration: 2000
 					});
 				}
-			},
-			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
-					});
-				}
-			},
-			async search() {
-				const that = this;
-				let res;
-				res = await that.$api(`/Module`, 'GET', {
-					is_use: '0'
-				});
-				if (res.errcode == '0') that.$set(that, `moduleList`, res.data);
-				let info = {
-					skip: that.skip,
-					limit: that.limit,
-					is_use: '0'
-				}
-				res = await that.$api(`/Good`, 'GET', {
-					...info,
-					...that.searchInfo
-				})
-				if (res.errcode == '0') {
-					let list = [...that.list, ...res.data];
-					that.$set(that, `list`, list)
-					that.$set(that, `total`, res.total)
-				} else {
-					uni.showToast({
-						title: res.errmsg,
-					});
-				}
-			},
-			// 输入框
-			toInput(e) {
-				const that = this;
-				if (that.searchInfo.name) that.$set(that.searchInfo, `name`, e.detail.value)
-				else that.$set(that, `searchInfo`, {})
-				that.clearPage();
-				that.search();
-			},
-			async change(e) {
-				uni.navigateTo({
-					url: `${e.route}?type=${e.type}`
-				})
-			},
-			// 购买
-			toBuy(e) {
-				const that = this;
-				uni.navigateTo({
-					url: `/pagesGoods/index/index?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);
-			},
-			// 清空列表
-			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 {
-			padding: 1vw 2vw;
-			background-color: var(--f9Color);
-
-			.grid {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				padding: 5px 0 0 0;
-				margin: 5px;
-				background-color: var(--mainColor);
-				border-radius: 10px;
-
-				.image {
-					width: 25px;
-					height: 25px;
-				}
-
-				.text {
-					font-size: var(--font14Size);
-					margin-top: 5px;
-				}
-			}
-		}
-
-		.thr {
-			position: relative;
-			flex-grow: 1;
-			background-color: var(--f9Color);
-
-			.thr_1 {
-				display: flex;
-				justify-content: space-between;
-				flex-wrap: wrap;
-				padding: 2vw;
-
-				.list {
-					display: flex;
-					flex-direction: column;
-					justify-content: inherit;
-					width: 43vw;
-					padding: 2vw;
-					margin: 0 0 2vw 0;
-					border-radius: 10px;
-					background-color: var(--mainColor);
-
-					.image {
-						width: 100%;
-						height: 40vw;
-						border-top-right-radius: 10px;
-						border-top-left-radius: 10px;
-					}
-
-					.name {
-						font-size: var(--font14Size);
-					}
-				}
-			}
-		}
-	}
-
-	.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>
+			},
+			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
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let res;
+				res = await that.$api(`/Module`, 'GET', {
+					is_use: '0'
+				});
+				if (res.errcode == '0') that.$set(that, `moduleList`, res.data);
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					is_use: '0'
+				}
+				res = await that.$api(`/Good`, 'GET', {
+					...info,
+					...that.searchInfo
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (e.name) that.$set(that.searchInfo, `name`, e.name)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			async focusHandler(e) {
+				const that = this;
+				let res;
+				let info = {
+					name: e.detail.value,
+					is_use: '0'
+				}
+				res = await that.$api(`/Good/search`, 'GET', {
+					...info,
+				})
+				if (res.errcode == '0') that.$set(that, `goodsList`, res.data)
+				that.$set(that, `focus`, true)
+			},
+			cancelHandler(e) {
+				const that = this;
+				that.$set(that, `focus`, false)
+			},
+			async change(e) {
+				uni.navigateTo({
+					url: `${e.route}?type=${e.type}`
+				})
+			},
+			// 购买
+			toBuy(e) {
+				const that = this;
+				uni.navigateTo({
+					url: `/pagesGoods/index/index?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);
+			},
+			// 清空列表
+			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;
+
+			.one_1 {
+				input {
+					padding: 2vw;
+					background-color: var(--f1Color);
+					font-size: var(--font14Size);
+					border-radius: 5px;
+				}
+			}
+
+			.one_2 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.left {
+					padding: 0 2vw;
+					width: 75vw;
+
+					input {
+						padding: 2vw;
+						background-color: var(--f1Color);
+						font-size: var(--font14Size);
+						border-radius: 5px;
+					}
+				}
+
+				.button {
+					background-color: var(--f3CColor);
+					color: var(--mainColor);
+				}
+			}
+
+			.one_3 {
+				height: 20vh;
+
+				.list {
+					padding: 2vw;
+					border-bottom: 1px solid var(--f5Color);
+
+					.name {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						word-break: break-all;
+						display: -webkit-box;
+					}
+				}
+			}
+		}
+
+		.two {
+			padding: 1vw 2vw;
+			background-color: var(--f9Color);
+
+			.grid {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 5px 0 0 0;
+				margin: 5px;
+				background-color: var(--mainColor);
+				border-radius: 10px;
+
+				.image {
+					width: 25px;
+					height: 25px;
+				}
+
+				.text {
+					font-size: var(--font14Size);
+					margin-top: 5px;
+				}
+			}
+		}
+
+		.thr {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+
+			.thr_1 {
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				padding: 2vw;
+
+				.list {
+					display: flex;
+					flex-direction: column;
+					justify-content: inherit;
+					width: 43vw;
+					padding: 2vw;
+					margin: 0 0 2vw 0;
+					border-radius: 10px;
+					background-color: var(--mainColor);
+
+					.image {
+						width: 100%;
+						height: 40vw;
+						border-top-right-radius: 10px;
+						border-top-left-radius: 10px;
+					}
+
+					.name {
+						font-size: var(--font14Size);
+					}
+				}
+			}
+		}
+	}
+
+	.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>

pages/market/index.vue

@@ -326,20 +326,27 @@
 								if (s.check) cartIds.push(s.cart_id)
 							}
 						}
-						const res = await that.$api(`/Cart/checkCartBuy`, 'POST', {
-							cartIds,
-							totalMoney: that.totalMoney
+						uni.showModal({
+							title: '提示',
+							content: '是否确定要提交？',
+							success: async (arr) => {
+								if (!arr.confirm) return
+								const res = await that.$api(`/Cart/checkCartBuy`, 'POST', {
+									cartIds,
+									totalMoney: that.totalMoney
+								});
+								if (res.errcode == '0') {
+									uni.navigateTo({
+										url: `/pagesMy/order/index?status=${'0'}`
+									})
+								} else {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none'
+									})
+								}
+							}
 						});
-						if (res.errcode == '0') {
-							uni.navigateTo({
-								url: `/pagesMy/order/index?status=${'0'}`
-							})
-						} else {
-							uni.showToast({
-								title: res.errmsg,
-								icon: 'none'
-							})
-						}
 					} else {
 						uni.showToast({
 							title: '角色不匹配 无法进行结算！',

pagesMy/account/info.vue

@@ -14,13 +14,13 @@
 				<uni-forms-item label="角色" required name="role">
 					<uni-data-select v-model="form.role" :localdata="roleList" @change="rolechange"></uni-data-select>
 				</uni-forms-item>
-				<uni-forms-item v-if="disabled" label="所属街道" required name="street">
-					<uni-data-select v-model="form.street" :localdata="streetList" @change="streetchange">
-					</uni-data-select>
-				</uni-forms-item>
-				<uni-forms-item v-if="disabled" label="所属社区">
-					<uni-data-select v-model="form.community" :localdata="commList" @change="commchange">
-					</uni-data-select>
+				<uni-forms-item v-if="disabledOne" label="所属街道" required name="street">
+					<uni-data-select v-model="form.street" :localdata="streetList" @change="streetchange">
+					</uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item v-if="disabledTwo" label="所属社区">
+					<uni-data-select v-model="form.community" :localdata="commList" @change="commchange">
+					</uni-data-select>
 				</uni-forms-item>
 			</uni-forms>
 			<button class="button" type="primary" @click="submit('valiForm')">修改</button>
@@ -32,7 +32,8 @@
 	export default {
 		data() {
 			return {
-				disabled: true,
+				disabledOne: true,
+				disabledTwo: true,
 				id:'',
 				form: {},
 				// 校验规则
@@ -86,8 +87,16 @@
 						that.$set(that, `id`, res.data._id);
 						that.$set(that, `form`, res.data);
 						that.streetchange(res.data.street)
-						if (res.data.role == 'cs') that.$set(that, `disabled`, false);
-						else that.$set(that, `disabled`, true);
+						if (res.data.role == 'cs') {
+							that.$set(that, `disabledOne`, false);
+							that.$set(that, `disabledTwo`, false);
+						} else if (res.data.role == 'sqry') {
+							that.$set(that, `disabledOne`, true);
+							that.$set(that, `disabledTwo`, true);
+						} else {
+							that.$set(that, `disabledOne`, true);
+							that.$set(that, `disabledTwo`, false);
+						}
 					},
 					fail: function(err) {
 						uni.showToast({
@@ -101,8 +110,16 @@
 			// 角色选择
 			rolechange(role) {
 				const that = this;
-				if (role == 'cs') that.$set(that, `disabled`, false);
-				else that.$set(that, `disabled`, true);
+				if (role == 'cs') {
+					that.$set(that, `disabledOne`, false);
+					that.$set(that, `disabledTwo`, false);
+				} else if (role == 'sqry') {
+					that.$set(that, `disabledOne`, true);
+					that.$set(that, `disabledTwo`, true);
+				} else {
+					that.$set(that, `disabledOne`, true);
+					that.$set(that, `disabledTwo`, false);
+				}
 			},
 			// 所属街道选择
 			async streetchange(belong) {

unpackage/dist/dev/mp-weixin/.gitignore

@@ -1,14 +0,0 @@
-# Windows
-[Dd]esktop.ini
-Thumbs.db
-$RECYCLE.BIN/
-
-# macOS
-.DS_Store
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-
-# Node.js
-node_modules/

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

@@ -1,4 +0,0 @@
-
-require('./common/runtime.js')
-require('./common/vendor.js')
-require('./common/main.js')

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

@@ -1,86 +0,0 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/login/index",
-    "pages/register/index",
-    "pages/home/index",
-    "pages/good/index",
-    "pages/market/index",
-    "pages/my/index"
-  ],
-  "subPackages": [
-    {
-      "root": "pagesMy",
-      "pages": [
-        "order/index",
-        "order/order",
-        "order/detail",
-        "repair/index",
-        "repair/detail",
-        "account/index",
-        "account/info",
-        "account/update",
-        "user/index",
-        "buyExamine/index",
-        "collectionExamin/index",
-        "maintenance/index",
-        "record/index",
-        "goods/index",
-        "goods/add",
-        "spec/index",
-        "spec/add"
-      ]
-    },
-    {
-      "root": "pagesGoods",
-      "pages": [
-        "index/index",
-        "sort/index",
-        "shop/index"
-      ]
-    }
-  ],
-  "window": {
-    "pageOrientation": "portrait",
-    "navigationBarTitleText": "耗材小程序",
-    "navigationBarTextStyle": "white",
-    "navigationBarBackgroundColor": "#007AFF",
-    "backgroundColor": "#F8F8F8",
-    "backgroundColorTop": "#F4F5F6",
-    "backgroundColorBottom": "#F4F5F6"
-  },
-  "tabBar": {
-    "color": "#7A7E83",
-    "selectedColor": "#007AFF",
-    "borderStyle": "black",
-    "backgroundColor": "#F8F8F8",
-    "list": [
-      {
-        "pagePath": "pages/home/index",
-        "iconPath": "static/home.png",
-        "selectedIconPath": "static/homeHL.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/good/index",
-        "iconPath": "static/good.png",
-        "selectedIconPath": "static/goodHL.png",
-        "text": "全部商品"
-      },
-      {
-        "pagePath": "pages/market/index",
-        "iconPath": "static/shop.png",
-        "selectedIconPath": "static/shopHL.png",
-        "text": "购物车"
-      },
-      {
-        "pagePath": "pages/my/index",
-        "iconPath": "static/my.png",
-        "selectedIconPath": "static/myHL.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "lazyCodeLoading": "requiredComponents",
-  "usingComponents": {}
-}

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

@@ -1,3 +0,0 @@
-@import './common/main.wxss';
-
-[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

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

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

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

@@ -1,23 +0,0 @@
-@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

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

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

@@ -1,38 +0,0 @@
-@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

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

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

@@ -1,97 +0,0 @@
-@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;
-  margin: 2vw 0 0 0;
-}
-.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 {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  width: 45vw;
-  padding: 0 0 0 2vw;
-}
-.content .one .one_2 .one_2_1 .list .info .name {
-  font-size: var(--font15Size);
-}
-.content .one .one_2 .one_2_1 .list .info .num {
-  display: flex;
-  justify-content: space-between;
-}
-.content .one .one_2 .one_2_1 .list .info .num .left {
-  font-size: var(--font14Size);
-  color: var(--fF0Color);
-}
-.content .one .one_2 .one_2_1 .list .info .num .right {
-  font-size: var(--font12Size);
-  color: var(--f85Color);
-}
-.scroll-view {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-.scroll-view .list-scroll-view {
-  display: flex;
-  flex-direction: column;
-}
-.is_bottom {
-  width: 100%;
-  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

@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "首页",
-  "enablePullDownRefresh": true,
-  "usingComponents": {
-    "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

@@ -1,91 +0,0 @@
-@charset "UTF-8";
-/* 水平间距 */
-/* 水平间距 */
-.content {
-  display: flex;
-  flex-direction: column;
-  width: 100vw;
-  height: 100vh;
-}
-.content .one {
-  padding: 2vw;
-}
-.content .one input {
-  padding: 2vw;
-  background-color: var(--f1Color);
-  font-size: var(--font14Size);
-  border-radius: 5px;
-}
-.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 {
-  display: flex;
-  flex-direction: column;
-  justify-content: inherit;
-  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 {
-  width: 100%;
-  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

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

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

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

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

@@ -1,20 +0,0 @@
-@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

@@ -1,8 +0,0 @@
-{
-  "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

@@ -1,6 +0,0 @@
-{
-  "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

@@ -1,167 +0,0 @@
-@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

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