修改

App.vue

@@ -97,7 +97,10 @@
 	.textOver {
 		overflow: hidden;
 		text-overflow: ellipsis;
-		white-space: nowrap;
+		word-break: break-all;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
 	}
 
 	// 弹框公共样式

pages/good/index.vue

@@ -1,7 +1,41 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<view class="one">
+			<view class="one_1">
+				<scroll-view scroll-y="true" class="scroll-view">
+					<view class="list-scroll-view">
+						<view class="list" :class="[active==index?'listActive':'']" v-for="(item,index) in typeList"
+							:key="index" @tap="toChange(index,item)">
+							<text>{{item.label}}</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="one_2">
+				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+					<view class="list-scroll-view">
+						<view class=" one_2_1">
+							<view class="list" v-for="(tag,index) in marketList" :key="index" @tap="toBuy(tag)">
+								<view class="img">
+									<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode="">
+									</image>
+								</view>
+								<view class="info">
+									<view class="name textOver">
+										<text>{{tag.name||'暂无'}}</text>
+									</view>
+									<view class="num">
+										<text>销量{{tag.sell_num||'0'}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="is_bottom" v-if="is_bottom">
+							<text>{{config.bottom_title}}</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -10,29 +44,271 @@
 	export default {
 		data() {
 			return {
-				title: '所有商品'
+				config: {},
+				user: {},
+				active: '0',
+				typeList: [],
+				type: '',
+				// 商品列表
+				marketList: [],
+				total: 0,
+				page: 0,
+				skip: 0,
+				limit: 10,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
 			}
 		},
-		onLoad() {
-
+		async onShow() {
+			const that = this;
+			that.clearPage();
+			that.searchToken();
+			that.searchConfig();
+			await that.search();
 		},
 		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
+					});
+				}
+			},
+			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(`/DictData`, 'GET', {
+					is_use: '0',
+					type: 'goods_type'
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `typeList`, res.data);
+					if (res.total > 0) {
+						that.$set(that, `type`, res.data[0].value);
+						that.searchMarket()
+					}
+				}
+			},
+			// 查询产品
+			async searchMarket(e) {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					type: that.type
+				}
+				const res = await that.$api(`/Good`, `GET`, {
+					...info,
+				})
+				if (res.errcode == '0') {
+					let list = [...that.marketList, ...res.data];
+					that.$set(that, `marketList`, list);
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg || '错误信息',
+						icon: 'none'
+					})
+				}
+			},
+			// 分页
+			toPage() {
+				const that = this;
+				let list = that.marketList;
+				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);
+			},
+			// 左侧一级选择
+			toChange(index, e) {
+				const that = this;
+				that.$set(that, `list`, []);
+				that.$set(that, `active`, index);
+				that.$set(that, `type`, e.value);
+				that.clearPage();
+				that.searchMarket();
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `marketList`, []);
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 10)
+				that.$set(that, `page`, 0)
+			},
+			// 清空总信息
+			clearPages() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `marketList`, [])
+				that.$set(that, `typeList`, [])
+				that.$set(that, `active`, '0')
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 10)
+				that.$set(that, `page`, 0)
+			},
+			// 购买
+			toBuy(e) {
+				const that = this;
+				uni.navigateTo({
+					url: `/pagesHome/order/detail?id=${e.id||e._id}`
+				})
+			},
+			// 菜单跳转
+			toPath(e) {
+				let url = `/${e.route}`;
+				if (e.type == '0') uni.redirectTo({
+					url
+				})
+				else {
+					uni.navigateTo({
+						url
+					})
+				}
+			},
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+
+		.one {
+			height: 100vh;
+			display: flex;
+			flex-direction: row;
+
+			.one_1 {
+				position: relative;
+				width: 25vw;
+				background-color: #fafafa;
+				display: flex;
+				flex-direction: column;
+
+				.list {
+					text-align: center;
+					padding: 2.5vw 0;
+					border-bottom: 1px solid var(--f1Color);
+
+					text {
+						font-size: var(--font14Size);
+					}
+				}
+
+				.listActive {
+					background-color: var(--fffColor);
+				}
+			}
+
+			.one_2 {
+				flex-grow: 1;
+				position: relative;
+				display: flex;
+				flex-direction: column;
+
+				.one_2_1 {
+					padding: 0 2vw;
+					width: 70vw;
+
+					.list {
+						display: flex;
+						width: 66vw;
+						margin: 0 0 2vw 0;
+						padding: 2vw;
+						box-shadow: 0 0 5px var(--f1Color);
+						border-radius: 5px;
+
+						.img {
+							width: 20vw;
+
+							.image {
+								width: 20vw;
+								height: 20vw;
+								border-radius: 5px;
+							}
+						}
+
+						.info {
+							width: 45vw;
+							padding: 0 0 0 2vw;
+
+							.name {
+								font-size: var(--font15Size);
+								margin: 0 0 1vw 0;
+							}
+
+							.num {
+								font-size: var(--font14Size);
+								color: #858585;
+								margin: 0 0 1vw 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>

pages/home/index.vue

@@ -17,13 +17,16 @@
 		<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 class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="aspectFill">
-						</image>
-						<view class="name textOver">{{item.name}}</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>已经到底了！</text>
+						<text>{{config.bottom_title}}</text>
 					</view>
 				</view>
 			</scroll-view>
@@ -35,6 +38,7 @@
 	export default {
 		data() {
 			return {
+				config:{},
 				moduleList: [],
 				list: [],
 				total: 0,
@@ -46,13 +50,15 @@
 				scrollTop: 0,
 			}
 		},
-		async onLoad() {
+		onLoad() {
+
+		},
+		async onShow() {
 			const that = this;
+			that.clearPage();
 			await that.searchToken();
+			that.searchConfig();
 			await that.search();
-		},
-		onShow() {
-
 		},
 		onPullDownRefresh: async function() {
 			const that = this;
@@ -94,6 +100,19 @@
 					}
 				})
 			},
+			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;
@@ -107,7 +126,8 @@
 					is_use: '0'
 				}
 				res = await that.$api(`/Good`, 'GET', {
-					...info
+					...info,
+					...that.searchInfo
 				})
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
@@ -205,29 +225,31 @@
 		.thr {
 			position: relative;
 			flex-grow: 1;
-			display: flex;
-			justify-content: space-between;
-			flex-wrap: wrap;
-			padding: 2vw;
 			background-color: var(--f9Color);
 
-			.list {
-				position: relative;
-				width: 43vw;
+			.thr_1 {
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
 				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;
-				}
+				.list {
+					width: 43vw;
+					padding: 2vw;
+					margin: 0 0 2vw 0;
+					border-radius: 10px;
+					background-color: var(--mainColor);
 
-				.name {
-					font-size: var(--font14Size);
+					.image {
+						width: 100%;
+						height: 40vw;
+						border-top-right-radius: 10px;
+						border-top-left-radius: 10px;
+					}
+
+					.name {
+						font-size: var(--font14Size);
+					}
 				}
 			}
 		}

pagesMy/account/update.vue

@@ -2,9 +2,6 @@
 	<view class="content">
 		<view class="one">
 			<uni-forms ref="valiForm" :rules="rules" :modelValue="form" labelWidth="80px">
-				<uni-forms-item label="联系电话" required name="tel">
-					<uni-easyinput disabled v-model="form.tel" placeholder="请输入联系电话" />
-				</uni-forms-item>
 				<uni-forms-item label="新密码" required name="newpassword">
 					<uni-easyinput type="password" v-model="form.newpassword" placeholder="请输入新密码" />
 				</uni-forms-item>

pagesMy/goods/index.vue

@@ -23,12 +23,13 @@
 							</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>
+							<button class="button" type="primary" size="mini" @click="toEdit(item)">修改</button>
+							<button class="button1" type="default" size="mini" @click="toSpec(item)">新增规格</button>
+							<button class="button1" type="warn" size="mini" @click="toDel(item)">删除</button>
 						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
-						<text>已经到底了！</text>
+						<text>{{config.bottom_title}}</text>
 					</view>
 				</view>
 			</scroll-view>
@@ -40,6 +41,7 @@
 	export default {
 		data() {
 			return {
+				config:{},
 				searchInfo: {},
 				user: {},
 				list: [],
@@ -58,6 +60,7 @@
 		onLoad: async function() {
 			const that = this;
 			that.searchToken();
+			that.searchConfig();
 		},
 		onShow: async function() {
 			const that = this;
@@ -85,6 +88,19 @@
 					});
 				}
 			},
+			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 user = that.user;
@@ -94,7 +110,8 @@
 					supplier_id: user._id
 				}
 				const res = await that.$api(`/Good`, 'GET', {
-					...info
+					...info,
+					...that.searchInfo
 				})
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
@@ -136,6 +153,15 @@
 					url: `/pagesMy/goods/add?id=${e._id}`
 				})
 			},
+			// 删除
+			async toDel(e) {
+				const that = this;
+				const res = await that.$api(`/Good/${e._id}`, 'DELETE', {})
+				if (res.errcode == 0) {
+					that.clearPage();
+					that.search();
+				}
+			},
 			// 新增规格
 			toSpec(e) {
 				uni.navigateTo({
@@ -248,6 +274,7 @@
 					}
 
 					.other {
+						width: 69vw;
 						margin: 0 0 0 2vw;
 
 						.name {
@@ -271,6 +298,10 @@
 						color: var(--mainColor);
 						margin: 0 1vw 0 0;
 					}
+
+					.button1 {
+						margin: 0 1vw 0 0;
+					}
 				}
 			}
 		}

pagesMy/spec/index.vue

@@ -23,11 +23,12 @@
 							</view>
 						</view>
 						<view class="btn">
-							<button size="mini" class="button" type="primary" @click="toEdit(item)">修改</button>
+							<button size="mini" class="button" @click="toEdit(item)">修改</button>
+							<button size="mini" type="warn" @click="toDel(item)">删除</button>
 						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
-						<text>已经到底了！</text>
+						<text>{{config.bottom_title}}</text>
 					</view>
 				</view>
 			</scroll-view>
@@ -41,6 +42,7 @@
 			return {
 				id: '',
 				searchInfo: {},
+				config:{},
 				user: {},
 				list: [],
 				total: 0,
@@ -58,6 +60,7 @@
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
 			that.searchToken();
+			that.searchConfig();
 			await that.searchOther();
 		},
 		onShow: async function() {
@@ -85,6 +88,19 @@
 					});
 				}
 			},
+			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 id = that.id;
@@ -94,7 +110,8 @@
 					goods: id
 				}
 				const res = await that.$api(`/Specs`, 'GET', {
-					...info
+					...info,
+					...that.searchInfo
 				})
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
@@ -135,6 +152,15 @@
 					url: `/pagesMy/spec/add?id=${e._id}&goods=${e.goods}`
 				})
 			},
+			// 删除
+			async toDel(e) {
+				const that = this;
+				const res = await that.$api(`/Good/${e._id}`, 'DELETE', {})
+				if (res.errcode == 0) {
+					that.clearPage();
+					that.search();
+				}
+			},
 			async searchOther() {
 				const that = this;
 				let res;
@@ -235,6 +261,7 @@
 					}
 
 					.other {
+						width: 69vw;
 						margin: 0 0 0 2vw;
 
 						.name {

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2414,7 +2414,10 @@
 .textOver {
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
 }
 .uni-dialog-content {
   padding: 2vw !important;

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

@@ -1,13 +1,86 @@
-
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content .one {
+  height: 100vh;
+  display: flex;
+  flex-direction: row;
 }
-.text-area {
-	display: flex;
-	justify-content: center;
+.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: #858585;
+  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.js

@@ -194,10 +194,14 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
 var _default =
 {
   data: function data() {
     return {
+      config: {},
       moduleList: [],
       list: [],
       total: 0,
@@ -209,13 +213,15 @@ var _default =
       scrollTop: 0 };
 
   },
-  onLoad: function onLoad() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
-              that = _this;_context.next = 3;return (
-                that.searchToken());case 3:_context.next = 5;return (
-                that.search());case 5:case "end":return _context.stop();}}}, _callee);}))();
-  },
-  onShow: function onShow() {
+  onLoad: function onLoad() {
 
+  },
+  onShow: function onShow() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
+              that = _this;
+              that.clearPage();_context.next = 4;return (
+                that.searchToken());case 4:
+              that.searchConfig();_context.next = 7;return (
+                that.search());case 7:case "end":return _context.stop();}}}, _callee);}))();
   },
   onPullDownRefresh: function () {var _onPullDownRefresh = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var that;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
               that = this;
@@ -257,6 +263,19 @@ var _default =
                   } });case 2:case "end":return _context4.stop();}}}, _callee4);}))();
 
     },
+    searchConfig: function searchConfig() {
+      var that = this;
+      try {
+        var res = uni.getStorageSync('config');
+        if (res) that.$set(that, "config", res);
+      } catch (e) {
+        uni.showToast({
+          title: err.errmsg,
+          icon: 'error',
+          duration: 2000 });
+
+      }
+    },
     search: function search() {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee5() {var that, res, info, list;return _regenerator.default.wrap(function _callee5$(_context5) {while (1) {switch (_context5.prev = _context5.next) {case 0:
                 that = _this3;_context5.next = 3;return (
 
@@ -269,8 +288,9 @@ var _default =
                   limit: that.limit,
                   is_use: '0' };_context5.next = 8;return (
 
-                  that.$api("/Good", 'GET', _objectSpread({},
-                  info)));case 8:res = _context5.sent;
+                  that.$api("/Good", 'GET', _objectSpread(_objectSpread({},
+                  info),
+                  that.searchInfo)));case 8:res = _context5.sent;
 
                 if (res.errcode == '0') {
                   list = [].concat(_toConsumableArray(that.list), _toConsumableArray(res.data));

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

@@ -34,27 +34,28 @@
 .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;
-  background-color: var(--f9Color);
 }
-.content .thr .list {
-  position: relative;
+.content .thr .thr_1 .list {
   width: 43vw;
   padding: 2vw;
   margin: 0 0 2vw 0;
   border-radius: 10px;
   background-color: var(--mainColor);
 }
-.content .thr .list .image {
+.content .thr .thr_1 .list .image {
   width: 100%;
   height: 40vw;
   border-top-right-radius: 10px;
   border-top-left-radius: 10px;
 }
-.content .thr .list .name {
+.content .thr .thr_1 .list .name {
   font-size: var(--font14Size);
 }
 .scroll-view {

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

@@ -177,9 +177,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
-//
 var _default =
 {
   data: function data() {

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

@@ -170,10 +170,12 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 var _default =
 {
   data: function data() {
     return {
+      config: {},
       searchInfo: {},
       user: {},
       list: [],
@@ -191,7 +193,8 @@ var _default =
   },
   onLoad: function () {var _onLoad = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
               that = this;
-              that.searchToken();case 2:case "end":return _context.stop();}}}, _callee, this);}));function onLoad() {return _onLoad.apply(this, arguments);}return onLoad;}(),
+              that.searchToken();
+              that.searchConfig();case 3:case "end":return _context.stop();}}}, _callee, this);}));function onLoad() {return _onLoad.apply(this, arguments);}return onLoad;}(),
 
   onShow: function () {var _onShow = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var that;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
               that = this;
@@ -219,6 +222,19 @@ var _default =
 
       }
     },
+    searchConfig: function searchConfig() {
+      var that = this;
+      try {
+        var res = uni.getStorageSync('config');
+        if (res) that.$set(that, "config", res);
+      } catch (e) {
+        uni.showToast({
+          title: err.errmsg,
+          icon: 'error',
+          duration: 2000 });
+
+      }
+    },
     search: function search() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4() {var that, user, info, res, list, _iterator, _step, _loop;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:
                 that = _this;
                 user = that.user;
@@ -227,8 +243,9 @@ var _default =
                   limit: that.limit,
                   supplier_id: user._id };_context4.next = 5;return (
 
-                  that.$api("/Good", 'GET', _objectSpread({},
-                  info)));case 5:res = _context4.sent;
+                  that.$api("/Good", 'GET', _objectSpread(_objectSpread({},
+                  info),
+                  that.searchInfo)));case 5:res = _context4.sent;
 
                 if (res.errcode == '0') {
                   list = [].concat(_toConsumableArray(that.list), _toConsumableArray(res.data));_iterator = _createForOfIteratorHelper(
@@ -270,27 +287,36 @@ var _default =
         url: "/pagesMy/goods/add?id=".concat(e._id) });
 
     },
+    // 删除
+    toDel: function toDel(e) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var that, res;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
+                that = _this2;_context6.next = 3;return (
+                  that.$api("/Good/".concat(e._id), 'DELETE', {}));case 3:res = _context6.sent;
+                if (res.errcode == 0) {
+                  that.clearPage();
+                  that.search();
+                }case 5:case "end":return _context6.stop();}}}, _callee6);}))();
+    },
     // 新增规格
     toSpec: function toSpec(e) {
       uni.navigateTo({
         url: "/pagesMy/spec/index?id=".concat(e._id) });
 
     },
-    searchOther: function searchOther() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var that, res;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
-                that = _this2;_context6.next = 3;return (
+    searchOther: function searchOther() {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee7() {var that, res;return _regenerator.default.wrap(function _callee7$(_context7) {while (1) {switch (_context7.prev = _context7.next) {case 0:
+                that = _this3;_context7.next = 3;return (
 
 
                   that.$api('/DictData', 'GET', {
                     type: 'goods_type',
-                    is_use: '0' }));case 3:res = _context6.sent;
+                    is_use: '0' }));case 3:res = _context7.sent;
 
                 if (res.errcode == '0') that.$set(that, "typeList", res.data);
                 //是否使用
-                _context6.next = 7;return that.$api('/DictData', 'GET', {
+                _context7.next = 7;return that.$api('/DictData', 'GET', {
                   type: 'is_use',
-                  is_use: '0' });case 7:res = _context6.sent;
+                  is_use: '0' });case 7:res = _context7.sent;
 
-                if (res.errcode == '0') that.$set(that, "is_useList", res.data);case 9:case "end":return _context6.stop();}}}, _callee6);}))();
+                if (res.errcode == '0') that.$set(that, "is_useList", res.data);case 9:case "end":return _context7.stop();}}}, _callee7);}))();
     },
     // 分页
     toPage: function toPage(e) {

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

@@ -48,6 +48,7 @@
   height: 20vw;
 }
 .content .two .list .list_1 .other {
+  width: 69vw;
   margin: 0 0 0 2vw;
 }
 .content .two .list .list_1 .other .name {
@@ -67,6 +68,9 @@
   color: var(--mainColor);
   margin: 0 1vw 0 0;
 }
+.content .two .list .btn .button1 {
+  margin: 0 1vw 0 0;
+}
 .scroll-view {
   position: absolute;
   top: 0;

unpackage/dist/dev/mp-weixin/pagesMy/spec/index.js

@@ -169,12 +169,14 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 var _default =
 {
   data: function data() {
     return {
       id: '',
       searchInfo: {},
+      config: {},
       user: {},
       list: [],
       total: 0,
@@ -191,8 +193,9 @@ var _default =
   onLoad: function () {var _onLoad = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee(e) {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
               that = this;
               that.$set(that, "id", e && e.id || '');
-              that.searchToken();_context.next = 5;return (
-                that.searchOther());case 5:case "end":return _context.stop();}}}, _callee, this);}));function onLoad(_x) {return _onLoad.apply(this, arguments);}return onLoad;}(),
+              that.searchToken();
+              that.searchConfig();_context.next = 6;return (
+                that.searchOther());case 6:case "end":return _context.stop();}}}, _callee, this);}));function onLoad(_x) {return _onLoad.apply(this, arguments);}return onLoad;}(),
 
   onShow: function () {var _onShow = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var that;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
               that = this;
@@ -219,6 +222,19 @@ var _default =
 
       }
     },
+    searchConfig: function searchConfig() {
+      var that = this;
+      try {
+        var res = uni.getStorageSync('config');
+        if (res) that.$set(that, "config", res);
+      } catch (e) {
+        uni.showToast({
+          title: err.errmsg,
+          icon: 'error',
+          duration: 2000 });
+
+      }
+    },
     search: function search() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4() {var that, id, info, res, list, _iterator, _step, _loop;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:
                 that = _this;
                 id = that.id;
@@ -227,8 +243,9 @@ var _default =
                   limit: that.limit,
                   goods: id };_context4.next = 5;return (
 
-                  that.$api("/Specs", 'GET', _objectSpread({},
-                  info)));case 5:res = _context4.sent;
+                  that.$api("/Specs", 'GET', _objectSpread(_objectSpread({},
+                  info),
+                  that.searchInfo)));case 5:res = _context4.sent;
 
                 if (res.errcode == '0') {
                   list = [].concat(_toConsumableArray(that.list), _toConsumableArray(res.data));_iterator = _createForOfIteratorHelper(
@@ -269,15 +286,24 @@ var _default =
         url: "/pagesMy/spec/add?id=".concat(e._id, "&goods=").concat(e.goods) });
 
     },
-    searchOther: function searchOther() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var that, res;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
+    // 删除
+    toDel: function toDel(e) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var that, res;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
                 that = _this2;_context6.next = 3;return (
+                  that.$api("/Good/".concat(e._id), 'DELETE', {}));case 3:res = _context6.sent;
+                if (res.errcode == 0) {
+                  that.clearPage();
+                  that.search();
+                }case 5:case "end":return _context6.stop();}}}, _callee6);}))();
+    },
+    searchOther: function searchOther() {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee7() {var that, res;return _regenerator.default.wrap(function _callee7$(_context7) {while (1) {switch (_context7.prev = _context7.next) {case 0:
+                that = _this3;_context7.next = 3;return (
 
 
                   that.$api('/DictData', 'GET', {
                     type: 'is_use',
-                    is_use: '0' }));case 3:res = _context6.sent;
+                    is_use: '0' }));case 3:res = _context7.sent;
 
-                if (res.errcode == '0') that.$set(that, "is_useList", res.data);case 5:case "end":return _context6.stop();}}}, _callee6);}))();
+                if (res.errcode == '0') that.$set(that, "is_useList", res.data);case 5:case "end":return _context7.stop();}}}, _callee7);}))();
     },
     // 分页
     toPage: function toPage(e) {

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

@@ -48,6 +48,7 @@
   height: 20vw;
 }
 .content .two .list .list_1 .other {
+  width: 69vw;
   margin: 0 0 0 2vw;
 }
 .content .two .list .list_1 .other .name {