修改

manifest.json

@@ -1,65 +1,66 @@
 {
-	"name": "test",
-	"appid": "__UNI__617FB52",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"nvueStyleCompiler": "uni-app",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			/* ios打包配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"appid" : "wx23c71bee5876d1b9",
-		"setting" : {
-		    "urlCheck" : false,
-		    "minified" : true,
-		    "postcss" : true
-		},
-		"optimization": {
-			"subPackages": true
-		},
-		"usingComponents" : true
-	},
-	"vueVersion": "2"
+    "name" : "test",
+    "appid" : "__UNI__617FB52",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            /* ios打包配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "wx23c71bee5876d1b9",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : true,
+            "es6" : true
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "usingComponents" : true
+    },
+    "vueVersion" : "2"
 }

pages.json

@@ -133,6 +133,19 @@
 						"navigationBarTitleText": "新增商品"
 					}
 				},
+				{
+					"path": "spec/index",
+					"style": {
+						"navigationBarTitleText": "商品规格",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "spec/add",
+					"style": {
+						"navigationBarTitleText": "新增规格"
+					}
+				},
 				{
 					"path": "shop/index",
 					"style": {

pages/home/index.vue

@@ -14,16 +14,20 @@
 				</uni-grid-item>
 			</uni-grid>
 		</view>
-		<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scroll="scroll">
-			<view class="list-scroll-view">
-				<view class="thr">
+		<view class="thr">
+			<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="toBuy(item)">
-						<image :src="item.file" class="image" mode="aspectFill" />
+						<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 class="is_bottom" v-if="is_bottom">
+						<text>已经到底了！</text>
+					</view>
 				</view>
-			</view>
-		</scroll-view>
+			</scroll-view>
+		</view>
 	</view>
 </template>
 
@@ -32,60 +36,13 @@
 		data() {
 			return {
 				moduleList: [],
-				list: [{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					},
-					{
-						name: '联想（Lenovo）LT201黑色墨粉盒(适用S1801/LJ2205/M1851/M7206W/M7255F/F2081/LJ2206W/M7256WHF打印机)',
-						type: '0',
-						file: '/static/lenovo.jpeg',
-						brief: '联想（Lenovo）LT201黑色墨粉盒',
-					}
-				],
+				list: [],
 				total: 0,
 				skip: 0,
 				limit: 6,
 				page: 0,
-				// 返回顶部
+				// 数据是否触底
+				is_bottom: false,
 				scrollTop: 0,
 			}
 		},
@@ -96,6 +53,12 @@
 		},
 		onShow() {
 
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
 		},
 		methods: {
 			async searchToken() {
@@ -133,10 +96,28 @@
 			},
 			async search() {
 				const that = this;
-				let res = await that.$api(`/Module`, 'GET', {
+				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
+				})
+				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,
+					});
+				}
 			},
 			async toSearch(res) {
 				console.log(res);
@@ -161,15 +142,18 @@
 					that.$set(that, `page`, page)
 					let skip = page * limit;
 					that.$set(that, `skip`, skip)
-					that.searchMarket();
+					that.search();
 					uni.hideLoading();
-				}
+				} else that.$set(that, `is_bottom`, true)
 			},
-			// 计算高度
-			scroll: function(e) {
+			toScroll(e) {
 				const that = this;
-				that.old_scrollTop = e.detail.scrollTop
+				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, `moduleList`, [])
@@ -186,6 +170,8 @@
 	.content {
 		display: flex;
 		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
 
 		.one {
 			width: 100%;
@@ -193,7 +179,7 @@
 
 		.two {
 			padding: 1vw 2vw;
-			background-color: var(--f8Color);
+			background-color: var(--f9Color);
 
 			.grid {
 				display: flex;
@@ -217,11 +203,13 @@
 		}
 
 		.thr {
+			position: relative;
+			flex-grow: 1;
 			display: flex;
 			justify-content: space-between;
 			flex-wrap: wrap;
 			padding: 2vw;
-			background-color: var(--f8Color);
+			background-color: var(--f9Color);
 
 			.list {
 				position: relative;
@@ -246,6 +234,26 @@
 	}
 
 	.scroll-view {
-		// height: 100vw;
+		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>

pages/my/index.vue

@@ -54,7 +54,7 @@
 		},
 		async onLoad() {
 			const that = this;
-			await that.searchToken();
+			that.searchToken();
 			await that.searchOther();
 		},
 		methods: {
@@ -84,43 +84,40 @@
 					})
 				}
 			},
-			async searchToken() {
+			searchToken() {
 				const that = this;
-				uni.getStorage({
-					key: 'token',
-					success: function(res) {
-						that.$set(that, `user`, res.data);
-						uni.getStorage({
-							key: 'config',
-							success: function(arr) {
-								if (res.data.gender == '0') that.$set(that, `logo`,
-									arr.data.boy_url[0].url);
-								else if (res.data.gender == '1') that.$set(that, `logo`,
-									arr.data.girl_url[0].url);
-								else that.$set(that, `logo`, arr.data.logo_url[0].url ||
-									'../../static/login.jpeg');
-							}
-						})
-						let config = that.$config;
-						that.$set(that, `orderList`, config.orderList);
-						let menu = []
-						for (let val of config.menuList) {
-							const role = val.role.find((i) => i == that.user.role);
-							if (role) menu.push(val)
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+					uni.getStorage({
+						key: 'config',
+						success: function(arr) {
+							if (res.gender == '0') that.$set(that, `logo`,
+								arr.data.boy_url[0].url);
+							else if (res.gender == '1') that.$set(that, `logo`,
+								arr.data.girl_url[0].url);
+							else that.$set(that, `logo`, arr.data.logo_url[0].url ||
+								'../../static/login.jpeg');
 						}
-						that.$set(that, `menuList`, menu);
-					},
-					fail: function(err) {
-						uni.showToast({
-							title: err.errmsg,
-							icon: 'error',
-							duration: 2000
-						});
-					}
-				})
+					})
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
 			},
 			async searchOther() {
 				const that = this;
+				let config = that.$config;
+				that.$set(that, `orderList`, config.orderList);
+				let menu = []
+				for (let val of config.menuList) {
+					const role = val.role.find((i) => i == that.user.role);
+					if (role) menu.push(val)
+				}
+				that.$set(that, `menuList`, menu);
 			}
 		}
 	}

pagesMy/goods/add.vue

@@ -16,8 +16,12 @@
 					<upload class='upload' :list="form.file" name="file" :count="6" @uplSuc="uplSuc" @uplDel="uplDel">
 					</upload>
 				</uni-forms-item>
+				<uni-forms-item label="是否使用" required name="is_use">
+					<uni-data-select v-model="form.is_use" :localdata="is_useList" @change="is_usechange">
+					</uni-data-select>
+				</uni-forms-item>
 			</uni-forms>
-			<button class="button" type="primary" @click="submit('valiForm')">修改</button>
+			<button class="button" type="primary" @click="submit('valiForm')">确定</button>
 		</view>
 	</view>
 </template>
@@ -60,44 +64,66 @@
 							errorMessage: '图片不能为空'
 						}]
 					},
+					is_use: {
+						rules: [{
+							required: true,
+							errorMessage: '是否使用不能为空'
+						}]
+					},
 				},
 				// 字典表
 				typeList: [],
+				is_useList: [],
 			}
 		},
 		onLoad: async function(e) {
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
-			await that.searchToken();
+			that.searchToken();
 			await that.searchOther();
+			await that.search();
 		},
 
 		methods: {
-			async searchToken() {
+			searchToken() {
 				const that = this;
-				uni.getStorage({
-					key: 'token',
-					success: function(res) {
-						that.$set(that.form, `supplier_id`, res.data._id);
-					},
-					fail: function(err) {
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that.form, `supplier_id`, res._id);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/Good/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `form`, res.data)
+					} else {
 						uni.showToast({
-							title: err.errmsg,
-							icon: 'error',
-							duration: 2000
+							title: res.errmsg,
 						});
 					}
-				})
+				}
 			},
 			// 类型选择
 			typechange(type) {
 				const that = this;
 				that.$set(that.form, `type`, type);
 			},
+			// 是否使用
+			is_usechange(is_use) {
+				const that = this;
+				that.$set(that.form, `is_use`, is_use);
+			},
 			// 图片上传
 			uplSuc(e) {
 				const that = this;
-				console.log(e);
 				that.$set(that.form, `${e.name}`, [...that.form[e.name], e.data]);
 			},
 			// 图片删除
@@ -150,6 +176,21 @@
 					}
 					that.$set(that, `typeList`, typeList);
 				}
+				//是否使用
+				res = await that.$api('/DictData', 'GET', {
+					type: 'is_use',
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					let is_useList = []
+					for (let val of res.data) {
+						is_useList.push({
+							text: val.label,
+							value: val.value
+						})
+					}
+					that.$set(that, `is_useList`, is_useList);
+				}
 			},
 		}
 	}

pagesMy/goods/index.vue

@@ -11,8 +11,21 @@
 		<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" @click="toView(item)">
-						
+					<view class="list" v-for="(item, index) in list" :key="index">
+						<view class="list_1">
+							<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
+							</image>
+							<view class="other">
+								<view class="name textOver">{{item.name||'暂无名称'}}</view>
+								<view class="type">类型：{{item.zhType||'暂无类型'}}</view>
+								<view class="type">销量：{{item.sell_num||'暂无销量'}}</view>
+								<view class="type">是否使用：{{item.zhUser||'暂无'}}</view>
+							</view>
+						</view>
+						<view class="btn">
+							<button size="mini" class="button" type="primary" @click="toEdit(item)">修改</button>
+							<button size="mini" class="button" type="primary" @click="toSpec(item)">新增规格</button>
+						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
 						<text>已经到底了！</text>
@@ -37,11 +50,19 @@
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,
+				// 字典表
+				typeList: [],
+				is_useList: [],
 			}
 		},
-		async onLoad() {
+		onLoad: async function() {
 			const that = this;
-			await that.searchToken();
+			that.searchToken();
+		},
+		onShow: async function() {
+			const that = this;
+			that.clearPage();
+			await that.searchOther();
 			await that.search();
 		},
 		onPullDownRefresh: async function() {
@@ -51,21 +72,18 @@
 			uni.stopPullDownRefresh();
 		},
 		methods: {
-			async searchToken() {
+			searchToken() {
 				const that = this;
-				uni.getStorage({
-					key: 'token',
-					success: function(res) {
-						that.$set(that, `user`, res.data);
-					},
-					fail: function(err) {
-						uni.showToast({
-							title: err.errmsg,
-							icon: 'error',
-							duration: 2000
-						});
-					}
-				})
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
 			},
 			async search() {
 				const that = this;
@@ -80,6 +98,12 @@
 				})
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						let type = that.typeList.find(i => i.value == val.type)
+						if (type) val.zhType = type.label;
+						let is_use = that.is_useList.find(i => i.value == val.is_use)
+						if (is_use) val.zhUser = is_use.label;
+					}
 					that.$set(that, `list`, list)
 					that.$set(that, `total`, res.total)
 				} else {
@@ -100,11 +124,40 @@
 				that.clearPage();
 				that.search();
 			},
+			// 新增
 			toAdd() {
 				uni.navigateTo({
 					url: `/pagesMy/goods/add`
 				})
 			},
+			// 修改
+			toEdit(e) {
+				uni.navigateTo({
+					url: `/pagesMy/goods/add?id=${e._id}`
+				})
+			},
+			// 新增规格
+			toSpec(e) {
+				uni.navigateTo({
+					url: `/pagesMy/spec/index?id=${e._id}`
+				})
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				//类型
+				res = await that.$api('/DictData', 'GET', {
+					type: 'goods_type',
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+				//是否使用
+				res = await that.$api('/DictData', 'GET', {
+					type: 'is_use',
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `is_useList`, res.data);
+			},
 			// 分页
 			toPage(e) {
 				const that = this;
@@ -177,19 +230,45 @@
 			position: relative;
 			flex-grow: 1;
 			background-color: var(--f9Color);
+			margin: 2vw 0 0 0;
 
 			.list {
-				background-color: #fff;
+				background-color: var(--mainColor);
 				border: 1px solid var(--f5Color);
 				padding: 2vw;
-				margin: 0 2vw 2vw 2vw;
+				margin: 2vw 2vw 0 2vw;
 				border-radius: 5px;
 
+				.list_1 {
+					display: flex;
+
+					.image {
+						width: 20vw;
+						height: 20vw;
+					}
+
+					.other {
+						margin: 0 0 0 2vw;
+
+						.name {
+							font-size: var(--font16Size);
+							margin: 0 0 1vw 0;
+						}
+
+						.type {
+							color: var(--f85Color);
+							font-size: var(--font14Size);
+						}
+					}
+				}
+
 				.btn {
-					text-align: right;
+					text-align: center;
 					margin: 1vw 0 0 0;
 
-					button {
+					.button {
+						background-color: var(--f3CColor);
+						color: var(--mainColor);
 						margin: 0 1vw 0 0;
 					}
 				}

pagesMy/spec/add.vue

@@ -0,0 +1,198 @@
+<template>
+	<view class="content">
+		<view class="one">
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="form" labelWidth="80px">
+				<uni-forms-item label="名称" required name="name">
+					<uni-easyinput v-model="form.name" placeholder="请输入名称" />
+				</uni-forms-item>
+				<uni-forms-item label="销售价格" required name="money">
+					<uni-easyinput v-model="form.money" placeholder="请输入销售价格" />
+				</uni-forms-item>
+				<uni-forms-item label="库存" required name="num">
+					<uni-easyinput v-model="form.num" placeholder="请输入库存" />
+				</uni-forms-item>
+				<uni-forms-item label="图片" required name="file">
+					<upload class='upload' :list="form.file" name="file" :count="6" @uplSuc="uplSuc" @uplDel="uplDel">
+					</upload>
+				</uni-forms-item>
+				<uni-forms-item label="是否使用" required name="is_use">
+					<uni-data-select v-model="form.is_use" :localdata="is_useList" @change="is_usechange">
+					</uni-data-select>
+				</uni-forms-item>
+			</uni-forms>
+			<button class="button" type="primary" @click="submit('valiForm')">确定</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '../../components/upload/index.vue';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				goods: '',
+				id: '',
+				user: {},
+				form: {
+					file: []
+				},
+				// 校验规则
+				rules: {
+					name: {
+						rules: [{
+							required: true,
+							errorMessage: '名称不能为空'
+						}]
+					},
+					money: {
+						rules: [{
+							required: true,
+							errorMessage: '销售价格不能为空'
+						}]
+					},
+					num: {
+						rules: [{
+							required: true,
+							errorMessage: '库存不能为空'
+						}]
+					},
+					file: {
+						rules: [{
+							required: true,
+							errorMessage: '图片不能为空'
+						}]
+					},
+					is_use: {
+						rules: [{
+							required: true,
+							errorMessage: '是否使用不能为空'
+						}]
+					},
+				},
+				// 字典表
+				is_useList: [],
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			that.$set(that, `goods`, e && e.goods || '');
+			that.searchToken();
+			await that.searchOther();
+			await that.search();
+		},
+
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+						that.$set(that.form, `goods`, that.goods);
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/Specs/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `form`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+				}
+			},
+			// 是否使用选择
+			is_usechange(is_use) {
+				const that = this;
+				that.$set(that.form, `is_use`, is_use);
+			},
+			// 图片上传
+			uplSuc(e) {
+				const that = this;
+				that.$set(that.form, `${e.name}`, [...that.form[e.name], e.data]);
+			},
+			// 图片删除
+			uplDel(e) {
+				const that = this;
+				let data = that.form[e.name];
+				let arr = data.filter((i, index) => index != e.data.index);
+				that.$set(that.form, `${e.name}`, arr)
+			},
+			// 提交
+			submit(ref) {
+				const that = this;
+				that.$refs[ref].validate().then(async params => {
+					let res;
+					if (that.id) res = await that.$api(`/Specs/${that.id}`, 'POST', that.form);
+					else res = await that.$api(`/Specs`, 'POST', that.form);
+					if (res.errcode == '0') {
+						uni.showToast({
+							title: '维护信息成功',
+							icon: 'none'
+						})
+						uni.navigateBack({
+							delta: 1
+						})
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				}).catch(err => {
+					console.log('err', err);
+				})
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				//类型
+				res = await that.$api('/DictData', 'GET', {
+					type: 'is_use',
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					let is_useList = []
+					for (let val of res.data) {
+						is_useList.push({
+							text: val.label,
+							value: val.value
+						})
+					}
+					that.$set(that, `is_useList`, is_useList);
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+
+		.one {
+			padding: 3vw;
+
+			.button {
+				margin: 2vw 0 0 0;
+				background-color: var(--f3CColor);
+				color: var(--mainColor);
+			}
+		}
+	}
+</style>

pagesMy/spec/index.vue

@@ -0,0 +1,289 @@
+<template>
+	<view class="content">
+		<view class="one">
+			<view class="one_1">
+				<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索规格">
+			</view>
+			<view class="one_2">
+				<button size="mini" class="button" type="primary" @click="toAdd">添加</button>
+			</view>
+		</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">
+						<view class="list_1">
+							<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
+							</image>
+							<view class="other">
+								<view class="name textOver">{{item.name||'暂无名称'}}</view>
+								<view class="type">销售价格：{{item.money||'暂无'}}元</view>
+								<view class="type">库存：{{item.num||'0'}}</view>
+								<view class="type">是否使用：{{item.zhUser||'暂无'}}</view>
+							</view>
+						</view>
+						<view class="btn">
+							<button size="mini" class="button" type="primary" @click="toEdit(item)">修改</button>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>已经到底了！</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				searchInfo: {},
+				user: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				is_useList: [],
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			that.searchToken();
+			await that.searchOther();
+		},
+		onShow: async function() {
+			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 {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let id = that.id;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					goods: id
+				}
+				const res = await that.$api(`/Specs`, 'GET', {
+					...info
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						let is_use = that.is_useList.find(i => i.value == val.is_use)
+						if (is_use) val.zhUser = is_use.label;
+					}
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			// 查看详情
+			async toView(item) {
+				console.log(item);
+			},
+			// 输入框
+			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();
+			},
+			// 新增
+			toAdd() {
+				const that = this;
+				uni.navigateTo({
+					url: `/pagesMy/spec/add?goods=${that.id}`
+				})
+			},
+			// 修改
+			toEdit(e) {
+				uni.navigateTo({
+					url: `/pagesMy/spec/add?id=${e._id}&goods=${e.goods}`
+				})
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				//是否使用
+				res = await that.$api('/DictData', 'GET', {
+					type: 'is_use',
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `is_useList`, res.data);
+			},
+			// 分页
+			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 {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 2vw;
+
+			.one_1 {
+				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);
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+			margin: 2vw 0 0 0;
+
+			.list {
+				background-color: var(--mainColor);
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+
+					.image {
+						width: 20vw;
+						height: 20vw;
+					}
+
+					.other {
+						margin: 0 0 0 2vw;
+
+						.name {
+							font-size: var(--font16Size);
+							margin: 0 0 1vw 0;
+						}
+
+						.type {
+							color: var(--f85Color);
+							font-size: var(--font14Size);
+						}
+					}
+				}
+
+				.btn {
+					text-align: center;
+					margin: 1vw 0 0 0;
+
+					.button {
+						background-color: var(--f3CColor);
+						color: var(--mainColor);
+						margin: 0 1vw 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>

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

@@ -25,6 +25,8 @@
         "record/index",
         "goods/index",
         "goods/add",
+        "spec/index",
+        "spec/add",
         "shop/index"
       ]
     }

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.wxml

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

unpackage/dist/dev/mp-weixin/pages/good/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/home/index.wxss

@@ -0,0 +1,80 @@
+@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;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 2vw;
+  background-color: var(--f9Color);
+}
+.content .thr .list {
+  position: relative;
+  width: 43vw;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .thr .list .image {
+  width: 100%;
+  height: 40vw;
+  border-top-right-radius: 10px;
+  border-top-left-radius: 10px;
+}
+.content .thr .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.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/market/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/market/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/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.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.wxss

@@ -0,0 +1,16 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+}
+.content .one {
+  padding: 3vw;
+}
+.content .one .button {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/account/index.wxss

@@ -0,0 +1,41 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+}
+.one .list {
+  margin: 2vw 0 0 0;
+  background-color: var(--f1Color);
+  display: flex;
+  justify-content: space-between;
+  padding: 3vw;
+  border-bottom: 1px solid var(--f9Color);
+}
+.one .list .left {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+}
+.one .list .left .title {
+  display: inline-block;
+  font-size: var(--font12Size);
+}
+.one .list .right {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+  color: var(--f99Color);
+}
+.two {
+  margin: 2vw 0 0 0;
+  background-color: var(--f1Color);
+}
+.two .button {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/account/info.wxss

@@ -0,0 +1,17 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+}
+.content .one {
+  padding: 3vw;
+}
+.content .one .button {
+  margin: 2vw 0 0 0;
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/account/update.wxss

@@ -0,0 +1,17 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+}
+.content .one {
+  padding: 3vw;
+}
+.content .one .button {
+  margin: 2vw 0 0 0;
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.wxml

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

unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.wxss

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

unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.wxml

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

unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.wxss

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

unpackage/dist/dev/mp-weixin/pagesMy/goods/add.wxss

@@ -0,0 +1,16 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+}
+.content .one {
+  padding: 3vw;
+}
+.content .one .button {
+  margin: 2vw 0 0 0;
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/goods/index.wxss

@@ -0,0 +1,90 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 2vw;
+}
+.content .one .one_1 {
+  padding: 0 2vw;
+  width: 75vw;
+}
+.content .one .one_1 input {
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.content .one .button {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+}
+.content .two {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+  margin: 2vw 0 0 0;
+}
+.content .two .list {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.content .two .list .list_1 {
+  display: flex;
+}
+.content .two .list .list_1 .image {
+  width: 20vw;
+  height: 20vw;
+}
+.content .two .list .list_1 .other {
+  margin: 0 0 0 2vw;
+}
+.content .two .list .list_1 .other .name {
+  font-size: var(--font16Size);
+  margin: 0 0 1vw 0;
+}
+.content .two .list .list_1 .other .type {
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+.content .two .list .btn {
+  text-align: center;
+  margin: 1vw 0 0 0;
+}
+.content .two .list .btn .button {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  margin: 0 1vw 0 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);
+}
+