From 4d8835187c60ad172942677f098f4b1cb4558c62 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Fri, 8 Sep 2023 18:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=85=A5=E5=BA=93=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98,=E5=9B=BE=E7=89=87=E5=A4=B1=E7=9C=9F?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=A7=94=E6=89=98=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   88 +-
 api/sale.js                                   |   34 +-
 components/WaterfallsFlow/WaterfallsFlows.vue |   25 +-
 .../WaterfallsFlowItems.vue                   |   36 +-
 components/plantConSwiper/index.vue           |    2 +-
 pages.json                                    |   38 +-
 pages/columnGoods/goods_search_con/index.vue  |    2 +
 .../commissionedSales/addDelegation/index.vue |  143 +-
 .../initiateDelegation/index.vue              |   96 +-
 pages/index/index.vue                         |  157 +-
 pages/product/list/index.vue                  | 1527 +++++++++--------
 pages/users/online_warehousing/index.vue      |    4 +-
 12 files changed, 1204 insertions(+), 948 deletions(-)

diff --git a/App.vue b/App.vue
index 08a81ad..082dc17 100644
--- a/App.vue
+++ b/App.vue
@@ -202,6 +202,8 @@
 
 
 
+			this.checknetwork()
+
 		},
 		onShow() {
 			let that = this
@@ -242,10 +244,81 @@
 				// })
 
 			});
-			uni.setTabBarItem((e) => { console.log("点击了", e)});
+			uni.setTabBarItem((e) => {
+				console.log("点击了", e)
+			});
 		},
 
 		methods: {
+			//网络检测
+			checknetwork() {
+
+				uni.onNetworkStatusChange(function(res) {
+
+					if (res.isConnected) {
+
+
+						uni.reLaunch({
+
+							url: '/pages/index/index'
+
+						})
+
+					} else {
+
+						uni.showModal({
+
+							title: '系统提示',
+
+							content: '当前设备无网络或网络较差',
+
+							cancelText: '取消',
+
+							confirmText: '确定',
+
+							success: (res) => {
+
+								if (res.confirm) {
+
+									uni.reLaunch({
+
+										url: '/pages/index/index'
+
+									})
+
+								} else {
+
+									// #ifdef H5
+
+									uni.navigateTo({
+
+										url: '/pages/users/login/login_copy'
+
+									})
+
+									// #endif
+
+									// #ifdef APP-PLUS
+
+									plus.runtime.quit()
+
+									// #endif
+
+								}
+
+							}
+
+						})
+
+					}
+
+				})
+
+			},
+
+
+
+
 			/**
 			 * 语音播报
 			 * 
@@ -399,12 +472,13 @@
 			margin-top: -50rpx;
 			// box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3);
 		}
-		.custom_style-txt{
-			    display: flex;
-			    flex-direction: column;
-			    align-items: center;
-				margin-top: 5rpx;
-			
+
+		.custom_style-txt {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-top: 5rpx;
+
 		}
 	}
 
diff --git a/api/sale.js b/api/sale.js
index 7fc62dc..a11ed19 100644
--- a/api/sale.js
+++ b/api/sale.js
@@ -7,4 +7,36 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import request from "@/utils/request.js";
\ No newline at end of file
+import request from "@/utils/request.js";
+
+//发布委托商品选择 供应链商家接口
+export function supplychain(data) {
+  return request.get("community/supplychain/list", data);
+}
+
+//普通商家发布委托商品
+export function entrustchain(data) {
+  return request.post("community/entrust", data);
+}
+
+
+//获取委托商品列表
+export function entrustlist(data) {
+  return request.get("community/entrust/list", data);
+}
+
+//供应链商家是否同意委托
+export function checkchain(id,data) {
+  return request.post("community/entrust/check/"+id, data);
+}
+
+
+//供应链商家申请结束委托
+export function finishchain(id,data) {
+  return request.post("community/entrust/apply/finish/"+id, data);
+}
+
+//委托商品加入购物车
+export function addEntrustCart(data) {
+  return request.post("community/entrust/addEntrustCart", data);
+}
\ No newline at end of file
diff --git a/components/WaterfallsFlow/WaterfallsFlows.vue b/components/WaterfallsFlow/WaterfallsFlows.vue
index e5f9b95..a5312c8 100644
--- a/components/WaterfallsFlow/WaterfallsFlows.vue
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -7,7 +7,7 @@
             <view id="left" v-if="leftList.length">
                 <view v-for="(item,index) in leftList" :key="index"
                       class="wf-itema" @tap="itemTap(item)">
-                    <WaterfallsFlowItem :item="item" :isStore="isStore" :userid='userid' :type="type" @goShop="goShop"/>
+                    <WaterfallsFlowItem :item="item" :isStore="isStore"  :type="type" @goShop="goShop"/>
                 </view>
             </view>
         </view>
@@ -16,7 +16,7 @@
             <view id="right" v-if="rightList.length">
                 <view v-for="(item,index) in rightList" :key="index"
                       class="wf-itemb" @tap="itemTap(item)">					  
-                    <WaterfallsFlowItem :item="item" :isStore="isStore" :userid='userid' :type="type" @goShop="goShop"/>
+                    <WaterfallsFlowItem :item="item" :isStore="isStore"  :type="type" @goShop="goShop"/>
                 </view>
             </view>
         </view>
@@ -25,9 +25,7 @@
 
 <script>
 import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItems.vue'
-	import {
-		getUserInfo
-	} from '@/api/user.js';
+
 export default {
     components: {
         WaterfallsFlowItem
@@ -58,7 +56,7 @@ export default {
             rightList: [],     // 右边列表
             mark: 0,           // 列表标记
             boxHeight: [],     // 下标0和1分别为左列和右列高度
-			userid:'',
+			
         };
     },
     watch: {
@@ -118,18 +116,9 @@ export default {
             }
         }
     },
-	mounted(){
-		this.getUserInfo()
-	},
+
     methods: {
-		/**
-		 * 获取个人用户信息
-		 */
-		getUserInfo(){
-		getUserInfo().then(res => {
-			this.userid = res.data.uid
-		});	
-		},
+	
 	
         // 瀑布流排序
         waterFall() {
@@ -179,7 +168,7 @@ export default {
         },
         // item点击
         itemTap(item) {
-            // this.$emit('itemTap', item)
+            this.$emit('itemTap', item)
         },
 		// item点击
 		goShop(item) {
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
index b619aaf..3a39a74 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="wf-item-page" @click="gogogo(item)">
+	<view class="wf-item-page">
 
 		<image :src="item.image[0]" mode="widthFix" class="item-img" />
 
@@ -21,47 +21,21 @@
 			item: {
 				type: Object,
 				require: true
-			},
-			userid: {
-				type: String | Number,
-				require: true
-			},
+			}
+			
 		},
 
 
 
 		data() {
 			return {
-				user_id: ''
+				
 			}
 		},
 
 
 		methods: {
-			gogogo(item) {
-				if (this.userid) {
-					if (item.video_link.length > 0) {
-						uni.navigateTo({
-							// #ifdef MP || H5
-							url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
-							// #endif
-							// #ifdef APP
-							url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
-							// #endif
-						})
-					} else {
-						uni.navigateTo({
-							url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
-						})
-					}
-				} else {
-					this.$util.Tips({
-						title: '用户信息不存在,请完成登录在进行该操作',
-						icon: 'error'
-					})
-				}
-
-			},
+		
 
 		}
 
diff --git a/components/plantConSwiper/index.vue b/components/plantConSwiper/index.vue
index 119fb9d..ea15751 100644
--- a/components/plantConSwiper/index.vue
+++ b/components/plantConSwiper/index.vue
@@ -5,7 +5,7 @@
 		 
 			<block v-for="(item,index) in imgUrls" :key='index'>
 				<swiper-item>
-					<image :src="item" class="slide-image" />
+					<image :src="item" class="slide-image" mode="aspectFit" />
 					<!-- <view class="stop" v-if="isType == 2">
 						<image class="image" src="/static/images/stop.png"></image>
 					</view> -->
diff --git a/pages.json b/pages.json
index 45db4e9..aee82e2 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,32 @@
 {
 	"pages": [
+		//#ifdef APP-PLUS
+		//启动页
+		{
+			"path": "pages/guide/judge",
+			"style": {
+				"enablePullDownRefresh": false,
+				"onReachBottomDistance": 100,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"contentAdjust": false,
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/guide/guide",
+			"style": {
+				"enablePullDownRefresh": false,
+				"onReachBottomDistance": 100,
+				"navigationStyle": "custom",
+				"app-plus": {
+					"contentAdjust": false,
+					"bounce": "none"
+				}
+			}
+		},
+		// #endif
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -974,13 +1001,13 @@
 					"style": {
 						"navigationBarTitleText": "订单列表"
 					}
-				},{
+				}, {
 					"path": "financial_management/index",
 					"style": {
 						"navigationBarTitleText": "财务管理"
 					}
 				},
-				
+
 				{
 					"path": "orderRefund/index",
 					"style": {
@@ -1541,13 +1568,13 @@
 		"selectedColor": "#E93323",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-	
+
 		"list": [{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar_icon/a.png",
 				"selectedIconPath": "static/tabbar_icon/a-a.png",
 				"text": "泸州"
-			    
+
 			},
 			{
 				"pagePath": "pages/gather/gather",
@@ -1575,8 +1602,7 @@
 				"selectedIconPath": "static/tabbar_icon/e-a.png",
 				"text": "我的"
 			}
-		]
-		,
+		],
 		"midButton": {
 			"width": "68px",
 			"height": "70px",
diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index cdd6ad6..b9e1f69 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -821,8 +821,10 @@
 			//查找产品
 			get_product_list: function(isPage) {
 				let that = this;
+				
 				if (that.loadend) return;
 				if (that.loading) return;
+				console.log(that.loadend,that.loading)
 				if (isPage === true) that.$set(that, 'productList', []);
 				that.loading = true;
 				that.loadTitle = '';
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 8e91dfe..03783f3 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -9,15 +9,15 @@
 						<view class="item-one">
 							被委托商家
 						</view>
-						<e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select>
+						<e-select v-model="formData.entrust_mer_id" :options="options1" placeholder="选择选项"></e-select>
 					</view>
 					<view class="release_item-one">
 						<view class="item-one">
 							委托周期
 						</view>
-						<view class="" @click="calendar">
+						<view class="">
 
-							<input type="number" v-model="date" />
+							<input type="number" v-model="formData.entrust_day"  />
 						</view>
 						<!-- <e-select v-model="value1" :options="options1" placeholder="选择选项"></e-select> -->
 					</view>
@@ -57,13 +57,11 @@
 
 					</view>
 				</view>
-
+				<button class="release_btn button" form-type="submit">提交</button>
 			</view>
 		</form>
-		<button class="release_btn button" form-type="submit">提交</button>
-		<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
-			:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
-			:showMonth="info.showMonth" @close="close" />
+
+
 		<!-- 提到的宝贝弹窗 -->
 		<uni-popup ref="associated" type="bottom">
 			<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
@@ -74,7 +72,10 @@
 <script>
 	import associated from '@/components/realselist/realselist.vue';
 	import eselect from '@/components/e-select/e-select.vue';
-	// import {} from '@/api/sale.js'
+	import {
+		supplychain,
+		entrustchain
+	} from '@/api/sale.js'
 	export default {
 		components: {
 			associated,
@@ -84,20 +85,8 @@
 			return {
 				value1: 1,
 				value2: "",
-				options1: [{
-					text: "Shenzhen1",
-					value: 1
-				}, {
+				options1: [],
 
-					text: "Shenzhen2",
-					value: 2
-				}, {
-
-
-					text: "Shenzhen3",
-					value: 3
-				}],
-				date: 1,
 				productList: [],
 				info: {
 					startDate: '',
@@ -108,6 +97,14 @@
 					selected: [],
 					showMonth: false
 				},
+				formData: {
+					entrust_mer_id: '',
+					entrust_day: 0,
+					is_type: "4",
+					product_info: [],
+					content: ''
+				},
+				type: ''
 			};
 		},
 		computed: {
@@ -116,27 +113,42 @@
 		},
 
 
-		onLoad(options) {
+		onLoad(e) {
+		
+			this.id = e.id;
+			this.type = e.type
+			if (this.type) {
 
+				uni.setNavigationBarTitle({
+					title: '编辑打折'
+				})
+			} else {
+
+			}
+
+		},
+		mounted() {
+				this.list()
 		},
 
 		methods: {
-
-			// 日历确定
-			confirm(e) {
-
-				let self = this
-				if (e.range.after && e.range.before) {
-					let star = new Date(e.range.after).getTime()
-					let stop = new Date(e.range.before).getTime()
-					let arr = stop - star
-					this.date = Math.floor(arr / (24 * 3600 * 1000));
-					// console.log(days)
-					if (this.date < 0) {
-						this.date = this.date * -1
+			list() {
+				supplychain({
+					page: 1
+				}).then((res => {
+					
+					for (let i in res.data.list) {
+						this.options1.push({
+							text: res.data.list[i].mer_name,
+							value: res.data.list[i].mer_id
+						})
 					}
-				}
+					
+					// console.log(res)
+				}))
 			},
+
+
 			calendar() {
 				this.$refs.calendar.open()
 			},
@@ -150,16 +162,65 @@
 			},
 			//获取商品信息
 			getProduct(data) {
-				
+				console.log(data)
+				if (data.length > 0) {
+
+					for (let i in data) {
+						this.formData.content+=data[i].store_name+','
+						this.formData.product_info.push({
+							product_attr_unique: data[i].product_attr_unique,
+							number: Number(data[i].number),
+							price: data[i].price
+						})
+					}
+				}
 				this.$refs.associated.close()
 			},
 			//提交
 			formSubmit(e) {
 				console.log(e)
-				this.$util.Tips({
-					title: res.message,
-					icon: 'success'
+				let that = this,
+					value = that.formData;
+
+				if (value.entrust_day.length == 0 || value.entrust_day <= 0) return that.$util.Tips({
+					title: '请选择委托周期'
+				});
+				if (value.product_info.length == 0) return that.$util.Tips({
+					title: '请选择产品'
+				});
+				if (!value.entrust_mer_id) return that.$util.Tips({
+					title: '请添加商家'
+				});
+				entrustchain(value).then(res => {
+					if (res.status == '200') {
+						uni.hideLoading()
+						that.$util.Tips({
+							title: '提交成功',
+							icon: 'success'
+						});
+						that.formData = {
+							entrust_mer_id: '',
+							entrust_day: 0,
+							is_type: "4",
+							product_info: []
+						}
+						uni.redirectTo({
+							url: '/pages/commissionedSales/initiateDelegation/index'
+						})
+                   
+					} else {
+						that.$util.Tips({
+							title: res.messge,
+							icon: 'success'
+						});
+					}
+				}).catch(err => {
+
+					return that.$util.Tips({
+						title: err
+					});
 				})
+
 			}
 		}
 	}
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index edc0f73..bc22a0f 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -14,17 +14,17 @@
 				</view>
 				<view class="content-one-txt">
 					<view class="one-txt-a">
-						{{item.content}}
+						{{item.title}}
 					</view>
 					<view class="one-txt-b">
-						委托周期:{{item.day}}
+						委托周期:{{item.credit_buy}}
 					</view>
 				</view>
 			</view>
 
 
 
-			<view class="content-two_one" v-if="item.type==1">
+			<view class="content-two_one" v-if="item.mer_status==0">
 				<view class="content-two-edita">
 					待处理
 				</view>
@@ -38,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-two_oneq" v-if="item.type==2">
+			<view class="content-two_oneq" v-if="item.mer_status==1">
 				<view class="content-two-editb" @click="accepted">
 					已接受
 				</view>
@@ -52,7 +52,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-two_one" v-if="item.type==3">
+			<view class="content-two_one" v-if="item.mer_status==2">
 				<view class="content-two-editc" @click="declined">
 					已拒绝
 				</view>
@@ -94,7 +94,6 @@
 		</view>
 		<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
 		<uni-popup ref="bindmobile" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -106,16 +105,16 @@
 								委托申请处理
 							</view>
 							<view class="bg-content-b">
-								结算周期: <span>30天</span>
+								结算周期: <span>{{obj.settle_cycle}}天</span>
 							</view>
 							<view class="bg-content-c">
-								利息比例: <span>0.05%</span>
+								利息比例: <span>{{obj.interest_rate}}%</span>
 							</view>
 							<view class="entrust_bga_btn">
-								<view class="cancellation">
+								<view class="cancellation" @click="passDelete(obj)">
 									拒绝
 								</view>
-								<view class="determine">
+								<view class="determine" @click="passagree(obj)">
 									接受
 								</view>
 							</view>
@@ -218,11 +217,16 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
-	import {} from '@/api/sale.js'
+	import {
+		entrustlist,
+		finishchain,
+		checkchain
+	} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
-			emptyPage
+			emptyPage,
+
 		},
 		data() {
 			return {
@@ -232,22 +236,24 @@
 				orderList: [],
 				where: {
 					page: 1,
-					limit: 10
+					limit: 10,
+					type: 1,
+					status: 0
 				},
 				tabs: [{
 						name: "tabOne",
 						label: '待处理',
-						type: '1'
+						type: 0
 					},
 					{
 						name: "tabTwo",
 						label: '已接受',
-						type: '2'
+						type: 1
 					},
 					{
 						name: "tabThree",
 						label: '已拒绝',
-						type: '3'
+						type: 2
 					},
 
 				],
@@ -275,7 +281,8 @@
 						type: 4
 
 					}
-				]
+				],
+				obj: {}
 			}
 		},
 		onLoad() {
@@ -285,7 +292,7 @@
 
 		},
 		mounted() {
-
+			this.commislist()
 		},
 		methods: {
 			onReachBottom() {
@@ -301,27 +308,18 @@
 			},
 			//获取分类数据
 			commislist() {
-				// console.log('111111')
+				entrustlist(this.where).then((res) => {
+					this.orderList = res.data.list
+				})
 			},
 
 			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
-
-				if (this.tabTitle = "tabOne") {
-					this.where.page = 1
-					this.orderList = []
-					this.commislist()
-				} else if (this.tabTitle = "tabTwo") {
-					this.where.page = 1
-					this.orderList = []
-					this.commislist()
-				} else {
-					this.where.page = 1
-					this.orderList = []
-					this.commislist()
-				}
+				this.where.page = 1
+				this.where.status = e.type
+				this.commislist()
 			},
 			//新增委托
 			addDelegation() {
@@ -344,8 +342,9 @@
 				})
 			},
 			// 待处理
-			soldEdit() {
-
+			soldEdit(item) {
+				this.obj = item
+				console.log(item)
 				this.$refs.bindmobile.open()
 			},
 			//已接受
@@ -372,11 +371,32 @@
 			},
 			//审核通过 拒绝
 			passDelete() {
-
+				checkchain(item.entrust_mer_id, {
+					status: 2
+				}).then((res) => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle ="tabOne"
+					this.commislist()
+				})
 			},
 			//审核通过 同意
-			passagree() {
-
+			passagree(item) {
+				checkchain(item.entrust_mer_id, {
+					status: 1
+				}).then((res) => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle ="tabOne"
+					this.commislist()
+					this.$refs.bindmobile.close()
+				})
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3c4a503..57b6913 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,7 +21,7 @@
 			</view>
 
 			<zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr"
-				@kkchange="kkchange" @change="dchange">
+				@change="dchange">
 			</zbpSwiper>
 
 			<view class="tabs_wrapper">
@@ -30,7 +30,10 @@
 			</view>
 			<view class=""> </view>
 			<view class="goodslist">
-				<WaterfallsFlow :wfList="cateGoods" />
+				<WaterfallsFlow :wfList="productList" @itemTap='itemTap' :type="1" />
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
 			<view class="empty_wrapper" v-if="emptyShow">
 				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
@@ -39,7 +42,7 @@
 
 		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-		<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
+		
 		<!-- <view class="bg_color"></view> -->
 
 		<!--<m-tabbar native>
@@ -52,6 +55,8 @@
         </view>
       </template>
     </m-tabbar> -->
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
+			:isGoIndex="false"></authorize>
 		<view class="location" v-if="isshow">
 			<view class="locationa"> 位置权限使用说明 </view>
 			<view class="locationb"> 用于向你推荐最近门店 </view>
@@ -64,7 +69,10 @@
 	import zbpSwiper from '@/components/zbpSwiper'
 	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
 	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlows.vue'
-
+	import authorize from '@/components/Authorize';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import {
 		getSlideAPI
 	} from '@/api/lihai.js'
@@ -95,19 +103,21 @@
 			mTabbar,
 			zbpSwiper,
 			easyLoadimage,
-			WaterfallsFlow
+			WaterfallsFlow,
+			authorize
 		},
 		data() {
 			return {
+				isNewRenderDone: false, //锁的作用
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
 				activeStyle: {
-
 					color: '#333333',
 					fontWeight: 'bold',
 					transform: 'scale(1.04)'
 				},
 				isshow: false,
 				locationArr: ({}),
-				status: 'loadmore',
 				bgColor: '',
 				showPicker: false,
 				columnData: [],
@@ -123,14 +133,17 @@
 				where: {
 					category_id: 0,
 					page: 1,
-					limit: 6
+					limit: 10
 				},
+				loadend: false,
+				loading: false,
+				loadTitle: '加载更多',
 				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
 				keyword: '',
 				location: '',
 				emptyShow: false,
 				street: '',
-				cateGoods: [],
+				productList: [],
 				recoList: [],
 				articleList: [],
 				streeta_id: '',
@@ -139,13 +152,14 @@
 				backColor: 'rgba(252, 252, 252, 0)',
 				isFshow: false,
 				scrollTop: 0,
-				show: true
+				show: true,
+				userid: ''
 			}
 		},
 
 		onPullDownRefresh() {
 			this.getCateList()
-			this.cateGoods = []
+			this.productList = []
 			this.getGoods()
 			this.Area()
 			uni.stopPullDownRefresh()
@@ -186,12 +200,7 @@
 
 			}
 		},
-		onReachBottom() {
-			if (this.status == 'nomore') return;
-			this.status = 'loading';
-			this.where.page = ++this.where.page;
-			this.getGoods()
-		},
+		
 		mounted() {
 			this.selfLocation()
 			// #ifdef  H5
@@ -209,12 +218,17 @@
 
 		},
 		onReachBottom() {
-			if (this.status == 'nomore') return;
-			this.status = 'loading';
-			this.where.page = ++this.where.page;
-			this.getGoods()
+			if (this.productList.length > 0) {
+				this.getGoods(false);
+			} else {
+				this.getGoods()
+			}
+         
+			
+
 		},
 		mounted() {
+			this.getUserInfo()
 			this.selfLocation()
 			// #ifdef  H5
 			// 监听页面滚动事件
@@ -225,6 +239,7 @@
 				// 更新父组件的值 
 				this.street = newValue.split(',')[0]
 			});
+
 		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
@@ -269,7 +284,49 @@
 			this.$bus.$off('value-updated')
 		},
 		methods: {
+			// 授权回调
+			onLoadFun(data) {
+				this.getUserInfo();
 
+				this.isShowAuth = false;
+
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo() {
+				getUserInfo().then(res => {
+					this.userid = res.data.uid
+				});
+			},
+			//分栏视频 图文查看
+			itemTap(item) {
+
+				if (this.userid) {
+					if (item.video_link.length > 0) {
+						uni.navigateTo({
+							// #ifdef MP || H5
+							url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
+							// #endif
+							// #ifdef APP
+							url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
+							// #endif
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
+						})
+					}
+				} else {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
 			scrolling() {
 				// 滚动条距文档顶部的距离
 				let scrollTop =
@@ -320,9 +377,6 @@
 
 			},
 
-			kkchange(e) {
-				this.bgColor = e
-			},
 
 
 			tabsChange1(item) {
@@ -455,30 +509,29 @@
 					}
 				})
 			},
-			getGoods: function(item) {
-
-				graphicLstApi(this.where).then(res => {
-					this.cateGoods.push(...res.data.list)
-
-					if (res.data.list.length < this.where.limit) this.status = 'nomore'
-
-					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
-
-					// if (item) {
-
-					// 	if (item.index == 1 && this.cateGoods[0]) {
-					// 		uni.navigateTo({
-					// 			// #ifdef MP || H5
-					// 			url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
-					// 			// #endif
-					// 			// #ifdef APP
-					// 			url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
-					// 			// #endif
-					// 		})
-					// 	}
-					// }
-
-				})
+			getGoods: function(isPage) {
+                let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				
+				if (isPage === true) that.$set(that, 'productList', []);
+				that.loading = true;
+				that.loadTitle = '';
+				graphicLstApi(that.where).then(res => {
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.productList);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'productList', productList);
+					// console.log(that.productList)
+					that.$set(that.where, 'page', that.where.page + 1);
+						if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
 			},
 			/*获取分类列表*/
 			async getCateList() {
@@ -491,12 +544,12 @@
 				}, ...data]
 			},
 			tabsChange(item) {
-				this.cateGoods = []
+				this.productList = []
 				this.where.category_id = item.category_id
 				this.emptyShow = false
-				this.status = 'loadmore'
-				this.where.page = 1
-				this.getGoods(item)
+			    this.loadend = false;
+			    this.$set(this.where, 'page', 1)
+				this.getGoods(true)
 				this.street_id = item.id
 				this.tabsData.tabsActive = item.index
 
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index ce17901..8d6ccf7 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -1,817 +1,842 @@
 <template>
-  <view>
-    <view class="order-index" ref="container">
-      <view class="header">
-        <div class="header_count">
-          <swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4" indicator-active-color="#E93323"
-            previous-margin="0" next-margin="0" :current="swiperCur" @change="swiperChange">
-            <block>
-              <swiper-item :class="{ active: 0 == swiperCur }">
-                <view class="slide-navigator">
-                  <view class="item" hover-class='none' @click="jumpAddGoods">
-                    <image mode='widthFix' class="image" src="../static/images/product_add.png">
-                    </image>
-                    <text class="text">添加商品</text>
-                  </view>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_sales.png">
-                    </image>
-                    <text class="text">在售商品</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_out.png">
-                    </image>
-                    <text class="text">售罄商品</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_recycle.png">
-                    </image>
-                    <text class="text">回收站</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_cate.png">
-                    </image>
-                    <text class="text">店铺分类</text>
-                  </navigator>
-                </view>
-              </swiper-item>
-              <swiper-item :class="{ active: 1 == swiperCur }">
-                <view class="slide-navigator">
-                  <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_freight.png">
-                    </image>
-                    <text class="text">运费模板</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
-                    <text class="text">规格模板</text>
-                  </navigator>
-                  <navigator class="item"
-                    :url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
-                    <text class="text">商品导入</text>
-                  </navigator>
-                </view>
-              </swiper-item>
-            </block>
-          </swiper>
-        </div>
-      </view>
-      <view class="wrapper">
-        <view class='product_list acea-row row-between-wrapper'>
-          <block v-for="(item,index) in productList" :key="index">
-            <view class='item'>
-              <view class='image'>
-                <image :src='item.image'></image>
-                <text v-if="item.spec_type == 1" class="spec">多规格</text>
-              </view>
-              <view class='text'>
-                <view class='name'>
-                  <text v-if="item.is_gift_bag" class="font-org">礼包</text>
-                  <text class="text_name acea-row line1">{{item.store_name}}</text>
+	<view>
+		<view class="order-index" ref="container">
+			<view class="header">
+				<div class="header_count">
+					<swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4"
+						indicator-active-color="#E93323" previous-margin="0" next-margin="0" :current="swiperCur"
+						@change="swiperChange">
+						<block>
+							<swiper-item :class="{ active: 0 == swiperCur }">
+								<view class="slide-navigator">
+									<view class="item" hover-class='none' @click="jumpAddGoods">
+										<image mode='widthFix' class="image" src="../static/images/product_add.png">
+										</image>
+										<text class="text">添加商品</text>
+									</view>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_sales.png">
+										</image>
+										<text class="text">在售商品</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_out.png">
+										</image>
+										<text class="text">售罄商品</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_recycle.png">
+										</image>
+										<text class="text">回收站</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_cate.png">
+										</image>
+										<text class="text">店铺分类</text>
+									</navigator>
+								</view>
+							</swiper-item>
+							<swiper-item :class="{ active: 1 == swiperCur }">
+								<view class="slide-navigator">
+									<navigator class="item"
+										:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_freight.png">
+										</image>
+										<text class="text">运费模板</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image"
+											src="../static/images/product_specification.png"></image>
+										<text class="text">规格模板</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
+										<text class="text">商品导入</text>
+									</navigator>
+								</view>
+							</swiper-item>
+						</block>
+					</swiper>
+				</div>
+			</view>
+			<view class="wrapper">
+				<view class='product_list acea-row row-between-wrapper'>
+					<block v-for="(item,index) in productList" :key="index">
+						<view class='item'>
+							<view class='image'>
+								<image :src='item.image'></image>
+								<text v-if="item.spec_type == 1" class="spec">多规格</text>
+							</view>
+							<view class='text'>
+								<view class='name'>
+									<text v-if="item.is_gift_bag" class="font-org">礼包</text>
+									<text class="text_name acea-row line1">{{item.store_name}}</text>
 
-                </view>
-                <view class="sales">
-                  <text class="num">库存: {{item.stock}}</text>
-                  <text class="num">销量: {{item.sales}}</text>
-                </view>
-                <view class='money-wrap'>
-                  <text class='price font-color'>￥{{item.price}}</text>
-                  <text class='ot_price'>￥{{item.ot_price}}</text>
-                </view>
-              </view>
-              <view style="position: absolute; top: 10px; right: 10px;">
-                <!-- 插件无需手动引入，直接使用即可 -->
-                <!-- 里面···可以改为任意东西，图片也可以 -->
-                <!-- 参数$event不可修改，否则取不到点击事件详情 -->
-                <rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event, item.attrValue)">
-                  . . .
-                </rudon-rowMenuDotDotDot>
-              </view>
-            </view>
-            <view class="operation acea-row row-between-wrapper">
-              <view class="acea-row row-middle">
-                <view v-if="item.is_show == 1 && item.status == 1" class="bnt" @tap.stop="handleShelves(item,0)">下架
-                </view>
-                <view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架
-                </view>
-                <view @click="editGoods(item)" class="bnt">编辑</view>
-                <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
-                </view>
-                <view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">
-                  {{item.is_good ? '取消推荐' : '店铺推荐'}}
-                </view>
-              </view>
+								</view>
+								<view class="sales">
+									<text class="num">库存: {{item.stock}}</text>
+									<text class="num">销量: {{item.sales}}</text>
+								</view>
+								<view class='money-wrap'>
+									<text class='price font-color'>￥{{item.price}}</text>
+									<text class='ot_price'>￥{{item.ot_price}}</text>
+								</view>
+							</view>
+							<view style="position: absolute; top: 10px; right: 10px;">
+								<!-- 插件无需手动引入，直接使用即可 -->
+								<!-- 里面···可以改为任意东西，图片也可以 -->
+								<!-- 参数$event不可修改，否则取不到点击事件详情 -->
+								<rudon-rowMenuDotDotDot :localdata="options"
+									@change="menuAction($event, item.attrValue)">
+									. . .
+								</rudon-rowMenuDotDotDot>
+							</view>
+						</view>
+						<view class="operation acea-row row-between-wrapper">
+							<view class="acea-row row-middle">
+								<view v-if="item.is_show == 1 && item.status == 1" class="bnt"
+									@tap.stop="handleShelves(item,0)">下架
+								</view>
+								<view v-if="item.is_show == 0 && item.status == 1" class="bnt"
+									@tap.stop="handleShelves(item),1">上架
+								</view>
+								<view @click="editGoods(item)" class="bnt">编辑</view>
+								<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
+								</view>
+								<view class="bnt bnt_recommend" v-if="item.is_show == 1"
+									@tap.stop="handleRecommend(item)">
+									{{item.is_good ? '取消推荐' : '店铺推荐'}}
+								</view>
+							</view>
 
-            </view>
-          </block>
-        </view>
-      </view>
-      <Loading :loaded="loaded" :loading="loading"></Loading>
-    </view>
-    <u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
-      <image src="@/static/images/xianxia.png" mode="widthFix"></image>
-      <view class="popen">
-        <h4 v-if="this.on_line==1">线下入库</h4>
-        <h4 v-else>线上入库</h4>
-        <view class="guige">
-          <scroll-view scroll-y="true" class="scroll_y">
-            <view>
-              <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
-                <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
-                  @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
-                </u-radio>
-              </u-radio-group>
-            </view>
-          </scroll-view>
-        </view>
-        <view class="shuru" v-if="this.on_line == 1">
-          数量: <input type="number"  v-model="data.number" placeholder="请输入">
-        </view>
-        <view class="btn">
-          <button class="btn_l" @click="close()">取消</button>
-          <button class="btn_r" @click="creat()">提交</button>
-        </view>
-      </view>
-    </u-popup>
-  </view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<Loading :loaded="loaded" :loading="loading"></Loading>
+		</view>
+		<u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image src="@/static/images/xianxia.png" mode="widthFix"></image>
+			<view class="popen">
+				<h4 v-if="this.on_line==1">线下入库</h4>
+				<h4 v-else>线上入库</h4>
+				<view class="guige">
+					<scroll-view scroll-y="true" class="scroll_y">
+						<view>
+							<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+								<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
+									@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique"
+									v-if="item.sku">
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="shuru" v-if="this.on_line == 1">
+					数量: <input type="number" v-model="data.number" placeholder="请输入">
+				</view>
+				<view class="btn">
+					<button class="btn_l" @click="close()">取消</button>
+					<button class="btn_r" @click="creat()">提交</button>
+				</view>
+			</view>
+		</u-popup>
+		<u-loadmore :status="status" v-if="productList.length>0" />
+
+	</view>
 </template>
 
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  import {
-    productLstApi,
-    productDeleteApi,
-    productOffApi,
-    productRecommendApi,
-    postImport
-  } from "@/api/product";
-  import Loading from '@/components/Loading/index.vue';
-  import {
-    navigateTo,
-    navigateBack,
-    serialize,
-    setStorage,
-    getStorage,
-    removeStorage,
-    Toast,
-    Modal,
-  } from '../../../libs/uniApi.js';
-  export default {
-    name: 'productList',
-    components: {
-      Loading,
-    },
-    data() {
-      return {
-        current: "",
-        where: {
-          page: 1,
-          limit: 20
-        },
-        loaded: false,
-        loading: false,
-        mer_id: '',
-        productList: [],
-        swiperCur: 0,
-        circular: true,
-        attrValue: [],
-        options: [{
-            value: '0',
-            text: '线上入库'
-          },
-          {
-            value: '1',
-            text: '线下入库'
-          },
-          {
-            value: '2',
-            text: '预览'
-          }
-        ],
-        //线下
-        show: false,
-        //单选示例
-        checkboxValue1: '',
-        // 基本案列数据
-        checkboxList1: [],
-        data: {
-          product_id: '',
-          unique: "",
-          number:1
-        },
-        on_line: ''
-      }
-    },
-    onLoad(options) {
-      this.mer_id = options.mer_id;
-      this.getList(this.mer_id);
-    },
-    onPullDownRefresh() {
-      // this.where.page = 1
-      this.loading = false
-      this.loaded = false
-      this.getList(this.mer_id);
-      uni.stopPullDownRefresh()
-    },
-    onHide() {
-      this.show = false
-    },
-    methods: {
-      menuAction(action, rowId) {
-        // 忽略初始化时的传入的空操作
-        if (action === '') {
-          return
-        }
-        this.on_line = action
-        this.checkboxList1 = rowId
-    
-        if (this.checkboxList1.length == 1 && action == 0) {
-          // this.show = true
-          navigateTo(1, '/pages/users/online_warehousing/index', {
-            mer_id: this.mer_id,
-            product_id: this.data.product_id,
-            unique: this.data.unique,
-          });
-        } else if (this.checkboxList1.length == 1 && action == 1) {
-          this.show = true
-          this.data.product_id = this.checkboxList1[0].product_id
-          this.data.unique = this.checkboxList1[0].unique
-          console.log(this.data);
-        } else {
-          this.show = true
-        }
-        if (action == 2) {
-          uni.navigateTo({
-            url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
-          })
-        }
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		productLstApi,
+		productDeleteApi,
+		productOffApi,
+		productRecommendApi,
+		postImport
+	} from "@/api/product";
+	import Loading from '@/components/Loading/index.vue';
+	import {
+		navigateTo,
+		navigateBack,
+		serialize,
+		setStorage,
+		getStorage,
+		removeStorage,
+		Toast,
+		Modal,
+	} from '../../../libs/uniApi.js';
+	export default {
+		name: 'productList',
+		components: {
+			Loading,
+		},
+		data() {
+			return {
+				status: 'loadmore',
+				current: "",
+				where: {
+					page: 1,
+					limit: 20
+				},
+				loaded: false,
+				loading: false,
+				mer_id: '',
+				productList: [],
+				swiperCur: 0,
+				circular: true,
+				attrValue: [],
+				options: [{
+						value: '0',
+						text: '线上入库'
+					},
+					{
+						value: '1',
+						text: '线下入库'
+					},
+					{
+						value: '2',
+						text: '预览'
+					}
+				],
+				//线下
+				show: false,
+				//单选示例
+				checkboxValue1: '',
+				// 基本案列数据
+				checkboxList1: [],
+				data: {
+					product_id: '',
+					unique: "",
+					number: 1
+				},
+				on_line: ''
+			}
+		},
+		onLoad(options) {
+			this.mer_id = options.mer_id;
+			this.getList(this.mer_id);
+		},
+		onPullDownRefresh() {
+			this.where.page = 1
+			this.productList=[]
+			this.loading = false
+			this.loaded = false
+			this.getList(this.mer_id);
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			// console.log(this.status, '222222222')
+			if (this.status == 'nomore') return;
+			this.status = 'loading';
+			this.where.page = ++this.where.page;
+			this.getList(this.mer_id);
+		},
+		onHide() {
+			this.show = false
+		},
+		methods: {
+			menuAction(action, rowId) {
+				// 忽略初始化时的传入的空操作
+				if (action === '') {
+					return
+				}
+				this.on_line = action
+				this.checkboxList1 = rowId
+				console.log(this.on_line);
+				if (this.checkboxList1.length == 1 && action == 0) {
+					// this.show = true
+					navigateTo(1, '/pages/users/online_warehousing/index', {
+						mer_id: this.mer_id,
+						product_id: this.data.product_id,
+						unique: this.data.unique,
+					});
+				} else if (this.checkboxList1.length == 1 && action == 1) {
+					this.show = true
+					this.data.product_id = this.checkboxList1[0].product_id
+					this.data.unique = this.checkboxList1[0].unique
+					// console.log(this.data);
+				} else {
+					this.show = true
+				}
+				if (action == 2) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
+					})
+				}
 
-      },
-      close() {
-        this.show = false
-      },
-      //导入
-      creat() {
-        if (this.on_line == 1) {
-          if (this.data.number < 1) {
-            this.show = false
-            this.$util.Tips({
-              title: '入库数量不得小于一件'
-            })
-          } else {
-            postImport(this.mer_id, this.data).then(res => {
-              console.log(res);
-              this.show = false
-              this.$util.Tips({
-                title: res.message
-              })
-		    this.getList(this.mer_id);
-            }).catch(err => {
-              this.show = false
-              this.$util.Tips({
-                title: '请选择规格后再次进行入库'
-              })
-            })
-          }
-        }
-        if (this.on_line == 0) {
-          console.log('12');
-          if (!this.data.product_id) {
-            this.show = false
-            this.$util.Tips({
-              title: '请选择规格'
-            })
-          } else {
-            navigateTo(1, '/pages/users/online_warehousing/index', {
-              mer_id: this.mer_id,
-              product_id: this.data.product_id,
-              unique: this.data.unique,
+			},
+			close() {
+				this.show = false
+			},
+			//导入
+			creat() {
 
-            });
-          }
+				if (this.on_line == 1) {
+					if (this.data.number < 1) {
+						this.show = false
+						this.$util.Tips({
+							title: '入库数量不得小于一件'
+						})
+					} else {
+						postImport(this.mer_id, this.data).then(res => {
+							console.log(res);
+							this.show = false
+							this.$util.Tips({
+								title: res.message
+							})
+							this.productList = []
+							this.getList(this.mer_id);
+						}).catch(err => {
+							this.show = false
+							this.$util.Tips({
+								title: '请选择规格后再次进行入库'
+							})
+						})
+					}
+				}
+				if (this.on_line == 0) {
+					console.log('12');
+					if (!this.data.product_id) {
+						this.show = false
+						this.$util.Tips({
+							title: '请选择规格'
+						})
+					} else {
+						navigateTo(1, '/pages/users/online_warehousing/index', {
+							mer_id: this.mer_id,
+							product_id: this.data.product_id,
+							unique: this.data.unique,
 
-        }
+						});
+					}
 
-      },
-      //规格
-      checkboxChange(n) {
-        this.data.unique = n
-        console.log(n);
-      },
-      radioChange(n) {
-        this.data.product_id = n.product_id
-        // console.log(this.data);
-      },
-      // 跳转添加商品界面
-      jumpAddGoods() {
-        const data = getStorage('addGoodsFormData');
-        if (data && data.product_id) {
-          let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
-            'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
-          ];
-          waitDeleteData.forEach(item => {
-            if (getStorage(item)) {
-              removeStorage(item);
-            }
-          })
-        }
-        navigateTo(1, '/pages/product/addGoods/index', {
-          mer_id: this.mer_id
-        });
-      },
-      // swiper
-      swiperChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
-        if (source === 'touch') {
-          //根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug
-          this.swiperCur = e.detail.current;
-        }
-      },
-      getList: function(mer_id) {
-        var that = this;
-        if (that.loading || that.loaded) return;
-        that.loading = true;
-        productLstApi(mer_id, that.where).then(
-          res => {
-            that.loading = false;
-            that.loaded = res.data.list.length < that.where.limit;
-            that.productList.push.apply(that.productList, res.data.list);
-            that.where.page = that.where.page + 1;
+				}
 
-          },
-          error => {
-            that.$util.Tips({
-              title: error.msg
-            })
-          }
-        );
-      },
-      editGoods(item) {
-        let waitDeleteData = [
-          'addGoodsFormData',
-          'singleSpecification',
-          'attrValue',
-          'modifyPriceData',
-          'addGoodsSecoundData',
-          'goodsDis',
-          'editGoodsDetils',
-          'canChange',
-          'canChangeSecound'
-        ];
-        waitDeleteData.forEach(item => {
-          if (getStorage(item)) {
-            removeStorage(item);
-          }
-        });
-        navigateTo(1, '/pages/product/addGoods/index', {
-          mer_id: item.mer_id,
-          product_id: item.product_id
-        });
-      },
-      handleRecycle(item, index) {
-        let that = this;
-        Modal('温馨提示', `商品"${item.store_name}"将被加入回收站，请问是否继续?`).then(res => {
-          productDeleteApi(that.mer_id, item.product_id)
-            .then(res => {
-              that.$util.Tips({
-                title: res.message,
-                icon: 'success'
-              }, () => {
-                that.productList.splice(index, 1);
-              });
-            })
-            .catch(rej => {
-              Toast(`${rej}, 加入回收站失败`);
-            });
-        });
-      },
-      //下架 0
-      handleShelves(item, status) {
-        let that = this;
-        if (status == 0) {
-          uni.showModal({
-            content: '确定要下架该商品么？',
-            success: function(res) {
-              if (res.confirm) {
-                that.onAndOff(item, 0)
-                uni.showToast({
-                  title: '下架成功',
-                  icon: 'none'
-                })
-              } else if (res.cancel) {
-                // console.log('用户点击取消');
-              }
-            }
-          });
-        } else {
-          that.onAndOff(item, 1)
-        }
-      },
-      //上下架
-      onAndOff(item, status) {
-        let that = this;
-        productOffApi(that.mer_id, item.product_id, {
-          status: status
-        }).then((res) => {
-          that.$util.Tips({
-            title: res.message,
-            icon: 'success'
-          }, () => {
-            that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        });
-      },
-      //设置推荐
-      handleRecommend(item) {
-        let that = this
-        let is_good = item.is_good ? 0 : 1
-        productRecommendApi(that.mer_id, item.product_id, {
-          is_good: is_good
-        }).then((res) => {
-          that.$util.Tips({
-            title: res.message,
-            icon: 'success'
-          }, () => {
-            that.$set(item, 'is_good', item.is_good == 0 ? 1 : 0);
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        });
-      },
-      more(index) {
-        this.current = index
-      },
-    },
-    onReachBottom() {
-      this.getList(this.mer_id)
-    }
-  }
+			},
+			//规格
+			checkboxChange(n) {
+				this.data.unique = n
+				console.log(n);
+			},
+			radioChange(n) {
+				this.data.product_id = n.product_id
+				// console.log(this.data);
+			},
+			// 跳转添加商品界面
+			jumpAddGoods() {
+				const data = getStorage('addGoodsFormData');
+				if (data && data.product_id) {
+					let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+						'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
+					];
+					waitDeleteData.forEach(item => {
+						if (getStorage(item)) {
+							removeStorage(item);
+						}
+					})
+				}
+				navigateTo(1, '/pages/product/addGoods/index', {
+					mer_id: this.mer_id
+				});
+			},
+			// swiper
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'touch') {
+					//根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug
+					this.swiperCur = e.detail.current;
+				}
+			},
+			getList: function(mer_id) {
+
+				var that = this;
+				// if (that.loading || that.loaded) return;
+				that.loading = true;
+				productLstApi(mer_id, that.where).then(
+					res => {
+						that.loading = false;
+						that.loaded = res.data.list.length < that.where.limit;
+						that.productList.push(...res.data.list);
+						if (res.data.list.length < that.where.limit) that.status = 'nomore'
+
+					},
+					error => {
+						that.$util.Tips({
+							title: error.msg
+						})
+					}
+				);
+			},
+			editGoods(item) {
+				let waitDeleteData = [
+					'addGoodsFormData',
+					'singleSpecification',
+					'attrValue',
+					'modifyPriceData',
+					'addGoodsSecoundData',
+					'goodsDis',
+					'editGoodsDetils',
+					'canChange',
+					'canChangeSecound'
+				];
+				waitDeleteData.forEach(item => {
+					if (getStorage(item)) {
+						removeStorage(item);
+					}
+				});
+				navigateTo(1, '/pages/product/addGoods/index', {
+					mer_id: item.mer_id,
+					product_id: item.product_id
+				});
+			},
+			handleRecycle(item, index) {
+				let that = this;
+				Modal('温馨提示', `商品"${item.store_name}"将被加入回收站，请问是否继续?`).then(res => {
+					productDeleteApi(that.mer_id, item.product_id)
+						.then(res => {
+							that.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							}, () => {
+								that.productList.splice(index, 1);
+							});
+						})
+						.catch(rej => {
+							Toast(`${rej}, 加入回收站失败`);
+						});
+				});
+			},
+			//下架 0
+			handleShelves(item, status) {
+				let that = this;
+				if (status == 0) {
+					uni.showModal({
+						content: '确定要下架该商品么？',
+						success: function(res) {
+							if (res.confirm) {
+								that.onAndOff(item, 0)
+								uni.showToast({
+									title: '下架成功',
+									icon: 'none'
+								})
+							} else if (res.cancel) {
+								// console.log('用户点击取消');
+							}
+						}
+					});
+				} else {
+					that.onAndOff(item, 1)
+				}
+			},
+			//上下架
+			onAndOff(item, status) {
+				let that = this;
+				productOffApi(that.mer_id, item.product_id, {
+					status: status
+				}).then((res) => {
+					that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, () => {
+						that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			//设置推荐
+			handleRecommend(item) {
+				let that = this
+				let is_good = item.is_good ? 0 : 1
+				productRecommendApi(that.mer_id, item.product_id, {
+					is_good: is_good
+				}).then((res) => {
+					that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, () => {
+						that.$set(item, 'is_good', item.is_good == 0 ? 1 : 0);
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			more(index) {
+				this.current = index
+			},
+		},
+	
+	}
 </script>
 
 <style scoped lang="scss">
-  page {
-    background-color: #F5F5F5;
-  }
+	page {
+		background-color: #F5F5F5;
+	}
 
-  .order-index {
-    background-image: url('data:image/png;base64,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');
-    background-repeat: no-repeat;
-    background-size: 100%;
-  }
+	.order-index {
+		background-image: url('data:image/png;base64,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');
+		background-repeat: no-repeat;
+		background-size: 100%;
+	}
 
-  .popupn {
-    position: fixed;
-    width: 100%;
-    text-align: center;
-    top: 0;
-    left: 0;
-    background: transparent;
-    height: 90rpx;
-    line-height: 90rpx;
-    z-index: 5;
+	.popupn {
+		position: fixed;
+		width: 100%;
+		text-align: center;
+		top: 0;
+		left: 0;
+		background: transparent;
+		height: 90rpx;
+		line-height: 90rpx;
+		z-index: 5;
 
-    .spin {
-      display: block;
-      transform: rotate(180deg);
-      font-size: 36rpx;
-    }
+		.spin {
+			display: block;
+			transform: rotate(180deg);
+			font-size: 36rpx;
+		}
 
-    .title {
-      max-width: 560rpx;
-      margin: 0 auto;
-      position: relative;
-      display: inline;
-      padding: 10rpx 30rpx 10rpx 50rpx;
-      background-color: rgba(0, 0, 0, .25);
-      border-radius: 30rpx;
-      color: #FFFFFF;
-    }
+		.title {
+			max-width: 560rpx;
+			margin: 0 auto;
+			position: relative;
+			display: inline;
+			padding: 10rpx 30rpx 10rpx 50rpx;
+			background-color: rgba(0, 0, 0, .25);
+			border-radius: 30rpx;
+			color: #FFFFFF;
+		}
 
-    .iconfont {
-      display: inline-block;
-      position: relative;
-      top: 4rpx;
-      right: 0;
-    }
+		.iconfont {
+			display: inline-block;
+			position: relative;
+			top: 4rpx;
+			right: 0;
+		}
 
-    .mer_logo {
-      width: 34rpx;
-      height: 34rpx;
-      position: relative;
-      top: 6rpx;
-      right: 10px;
-    }
+		.mer_logo {
+			width: 34rpx;
+			height: 34rpx;
+			position: relative;
+			top: 6rpx;
+			right: 10px;
+		}
 
-    .mer_name {
-      display: inline-block;
-      max-width: 650rpx;
-    }
+		.mer_name {
+			display: inline-block;
+			max-width: 650rpx;
+		}
 
-    .invoice-content {
-      background-color: #ffffff;
-    }
-  }
+		.invoice-content {
+			background-color: #ffffff;
+		}
+	}
 
-  /deep/.uni-swiper-slides {
-    inset: 0 !important;
-  }
+	/deep/.uni-swiper-slides {
+		inset: 0 !important;
+	}
 
-  uni-swiper,
-  swiper {
-    height: 200rpx;
-  }
+	uni-swiper,
+	swiper {
+		height: 200rpx;
+	}
 
-  .header {
-    padding-top: 40rpx;
-    margin: 0 20rpx;
+	.header {
+		padding-top: 40rpx;
+		margin: 0 20rpx;
 
-    .header_count {
-      width: 710rpx;
-      padding: 30rpx 30rpx 0;
-      background: #ffffff;
-      border-radius: 10rpx;
-      position: relative;
-    }
+		.header_count {
+			width: 710rpx;
+			padding: 30rpx 30rpx 0;
+			background: #ffffff;
+			border-radius: 10rpx;
+			position: relative;
+		}
 
-    .item {
-      display: inline-block;
-      width: 130rpx;
-      text-align: center;
+		.item {
+			display: inline-block;
+			width: 130rpx;
+			text-align: center;
 
-      .image {
-        width: 84rpx;
-        height: 84rpx;
-      }
+			.image {
+				width: 84rpx;
+				height: 84rpx;
+			}
 
-      .text {
-        display: block;
-        text-align: center;
-        color: #666666;
-        font-size: 24rpx;
-        margin-top: 18rpx;
-      }
-    }
-  }
+			.text {
+				display: block;
+				text-align: center;
+				color: #666666;
+				font-size: 24rpx;
+				margin-top: 18rpx;
+			}
+		}
+	}
 
-  /deep/.uni-swiper-slides {
-    width: 650rpx;
-  }
+	/deep/.uni-swiper-slides {
+		width: 650rpx;
+	}
 
-  /deep/.uni-swiper-dot {
-    width: 15rpx;
-    height: 5rpx;
-  }
+	/deep/.uni-swiper-dot {
+		width: 15rpx;
+		height: 5rpx;
+	}
 
-  /deep/.uni-swiper-dots-horizontal .uni-swiper-dot {
-    margin-right: 0;
-  }
+	/deep/.uni-swiper-dots-horizontal .uni-swiper-dot {
+		margin-right: 0;
+	}
 
-  .product_list {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    width: 100%;
-    padding: 0 20rpx;
+	.product_list {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 20rpx;
 
-    .item {
-      position: relative;
-      display: flex;
-      align-items: center;
-      width: 100%;
-      padding: 30rpx 20rpx;
-      border-radius: 0;
-      margin-bottom: 0;
-      background: #ffffff;
-      margin-top: 30rpx;
-      border-radius: 10rpx 10rpx 0 0;
+		.item {
+			position: relative;
+			display: flex;
+			align-items: center;
+			width: 100%;
+			padding: 30rpx 20rpx;
+			border-radius: 0;
+			margin-bottom: 0;
+			background: #ffffff;
+			margin-top: 30rpx;
+			border-radius: 10rpx 10rpx 0 0;
 
-      .image,
-      image {
-        width: 150rpx;
-        height: 150rpx;
-        border-radius: 16rpx;
-        position: relative;
+			.image,
+			image {
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 16rpx;
+				position: relative;
 
-        .spec {
-          color: #ffffff;
-          background: rgba(0, 0, 0, 0.5);
-          border-radius: 16rpx 0 16rpx 0;
-          text-align: center;
-          font-size: 18rpx;
-          display: inline-block;
-          width: 84rpx;
-          line-height: 30rpx;
-          position: absolute;
-          bottom: 0;
-          right: 0;
-        }
+				.spec {
+					color: #ffffff;
+					background: rgba(0, 0, 0, 0.5);
+					border-radius: 16rpx 0 16rpx 0;
+					text-align: center;
+					font-size: 18rpx;
+					display: inline-block;
+					width: 84rpx;
+					line-height: 30rpx;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
 
-        uni-image {
-          width: 150rpx;
-          height: 150rpx;
-          border-radius: 16rpx;
-        }
-      }
+				uni-image {
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 16rpx;
+				}
+			}
 
-      .text {
-        position: relative;
-        flex: 1;
-        min-width: 0;
-        padding: 10rpx 10rpx 20rpx 30rpx;
+			.text {
+				position: relative;
+				flex: 1;
+				min-width: 0;
+				padding: 10rpx 10rpx 20rpx 30rpx;
 
-        .name {
-          color: #282828;
-          font-size: 30rpx;
-          font-family: "PingFang SC";
-          display: flex;
-          align-items: center;
-        }
+				.name {
+					color: #282828;
+					font-size: 30rpx;
+					font-family: "PingFang SC";
+					display: flex;
+					align-items: center;
+				}
 
-        .text_name {
-          display: inline-block;
-          max-width: 400rpx;
-        }
+				.text_name {
+					display: inline-block;
+					max-width: 400rpx;
+				}
 
-        .font-org {
-          background-color: #FC8327;
+				.font-org {
+					background-color: #FC8327;
 
-          display: inline-block;
-          color: #fff;
-          font-size: 16rpx;
-          text-align: center;
-          border-radius: 5rpx;
-          padding: 0 4rpx;
-          line-height: 28rpx;
-          margin-right: 8rpx;
-        }
+					display: inline-block;
+					color: #fff;
+					font-size: 16rpx;
+					text-align: center;
+					border-radius: 5rpx;
+					padding: 0 4rpx;
+					line-height: 28rpx;
+					margin-right: 8rpx;
+				}
 
-        .money-wrap {
-          margin-top: 20rpx;
+				.money-wrap {
+					margin-top: 20rpx;
 
-          .price {
-            font-size: 30rpx;
-            display: inline-block;
-            margin-right: 15rpx;
-          }
+					.price {
+						font-size: 30rpx;
+						display: inline-block;
+						margin-right: 15rpx;
+					}
 
-          .ot_price {
-            color: #bebebe;
-            font-size: 26rpx;
-            text-decoration: line-through;
-          }
-        }
+					.ot_price {
+						color: #bebebe;
+						font-size: 26rpx;
+						text-decoration: line-through;
+					}
+				}
 
-        .sales {
-          margin-top: 20rpx;
-          color: #868686;
-          font-size: 22rpx;
+				.sales {
+					margin-top: 20rpx;
+					color: #868686;
+					font-size: 22rpx;
 
-          .num {
-            display: inline-block;
-            margin-right: 20rpx;
-          }
-        }
-      }
-    }
+					.num {
+						display: inline-block;
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
 
-    .operation {
-      padding: 20upx 10px;
-      background: #ffffff;
-      width: 100%;
-      border-radius: 0 0 10rpx 10rpx;
+		.operation {
+			padding: 20upx 10px;
+			background: #ffffff;
+			width: 100%;
+			border-radius: 0 0 10rpx 10rpx;
 
-      .bnt {
-        font-size: 26rpx;
-        color: #999999;
-        width: 120rpx;
-        height: 58rpx;
-        border-radius: 30rpx;
-        border: 1px solid #999999;
-        text-align: center;
-        line-height: 58rpx;
+			.bnt {
+				font-size: 26rpx;
+				color: #999999;
+				width: 120rpx;
+				height: 58rpx;
+				border-radius: 30rpx;
+				border: 1px solid #999999;
+				text-align: center;
+				line-height: 58rpx;
 
-        ~.bnt {
-          margin-left: 18rpx;
-        }
+				~.bnt {
+					margin-left: 18rpx;
+				}
 
-        &.bnt_recommend {
-          width: 160rpx;
-          color: #ffffff;
-          background: linear-gradient(135deg, #FD6523 0%, #E93323 100%);
-          border-color: transparent;
-        }
-      }
-    }
+				&.bnt_recommend {
+					width: 160rpx;
+					color: #ffffff;
+					background: linear-gradient(135deg, #FD6523 0%, #E93323 100%);
+					border-color: transparent;
+				}
+			}
+		}
 
-    .acea-row.row-between-wrapper {
-      justify-content: flex-end;
-    }
-  }
+		.acea-row.row-between-wrapper {
+			justify-content: flex-end;
+		}
+	}
 
-  .genduo {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border: 1px solid #999999;
-    border-radius: 10px;
-    width: 30px;
-    height: 10px;
+	.genduo {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid #999999;
+		border-radius: 10px;
+		width: 30px;
+		height: 10px;
 
-    .gen_sel {
-      font-size: 12px
-    }
-  }
+		.gen_sel {
+			font-size: 12px
+		}
+	}
 
-  .popen {
-    position: absolute;
-    top: 110px;
-    width: 100%;
-    margin: auto;
-    padding: 10px;
-    z-index: 0;
+	.popen {
+		position: absolute;
+		top: 110px;
+		width: 100%;
+		margin: auto;
+		padding: 10px;
+		z-index: 0;
 
-    h4 {
-      font-weight: 400;
-      font-size: 20px;
-      padding: 5px;
-      text-align: center;
-    }
+		h4 {
+			font-weight: 400;
+			font-size: 20px;
+			padding: 5px;
+			text-align: center;
+		}
 
-    .guige {
-      margin: 10px 0 10px 20px;
+		.guige {
+			margin: 10px 0 10px 20px;
 
-      .scroll_y {
-        max-height: 150px;
-      }
-    }
+			.scroll_y {
+				max-height: 150px;
+			}
+		}
 
-    .guiges {
-      height: 100px;
-      margin: 10px 0 10px 20px;
-    }
+		.guiges {
+			height: 100px;
+			margin: 10px 0 10px 20px;
+		}
 
-    .shuru {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      padding: 5px;
-      margin-left: 20px;
+		.shuru {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			padding: 5px;
+			margin-left: 20px;
 
-      input {
-        background: #F5F5F5;
-        border-radius: 8px 8px 8px 8px;
-        border: 1px solid #999999;
-        padding-left: 3px;
-        margin-left: 3px;
-      }
+			input {
+				background: #F5F5F5;
+				border-radius: 8px 8px 8px 8px;
+				border: 1px solid #999999;
+				padding-left: 3px;
+				margin-left: 3px;
+			}
 
-    }
+		}
 
-    .btn {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      margin: 10px;
+		.btn {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 10px;
 
-      .btn_l {
-        padding: 5px;
-        width: 100px;
-        border-radius: 4px;
-      }
+			.btn_l {
+				padding: 5px;
+				width: 100px;
+				border-radius: 4px;
+			}
 
-      .btn_r {
-        width: 100px;
-        padding: 5px;
-        border-radius: 4px;
-        background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
-        border-radius: 27px 27px 27px 27px;
-        color: white;
-      }
-    }
-  }
+			.btn_r {
+				width: 100px;
+				padding: 5px;
+				border-radius: 4px;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+				color: white;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
index 75bfcaf..b22c69e 100644
--- a/pages/users/online_warehousing/index.vue
+++ b/pages/users/online_warehousing/index.vue
@@ -155,7 +155,7 @@
 				that.where.page = 1;
 				that.shopList = [];
 				getOrderList(that.where, that.mer_id).then(res => {
-					console.log(res);
+					// console.log(res);
 					that.shopList = res.data.list
 					console.log(that.shopList);
 				})
@@ -166,7 +166,7 @@
 				getOrderList(this.where, this.mer_id).then(res => {
 					// console.log(res);
 					this.shopList = res.data.list
-					console.log(this.shopList);
+					// console.log(this.shopList);
 				})
 			},
 			importshop(order_id, product_id, unique) {