Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

App.vue

@@ -204,6 +204,8 @@
 
 
 
+			this.checknetwork()
+
 		},
 		onShow() {
 			let that = this
@@ -244,10 +246,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
+
+								}
+
+							}
+
+						})
+
+					}
+
+				})
+
+			},
+
+
+
+
 			/**
 			 * 语音播报
 			 * 
@@ -401,12 +474,13 @@
 			margin-top: -50rpx;
 			// box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3);
 		}
-		.custom_style-txt{
+
-			    display: flex;
+		.custom_style-txt {
-			    flex-direction: column;
+			display: flex;
-			    align-items: center;
+			flex-direction: column;
-				margin-top: 5rpx;
+			align-items: center;
-			
+			margin-top: 5rpx;
+
 		}
 	}
 

api/sale.js

@@ -7,4 +7,36 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import request from "@/utils/request.js";
+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);
+}

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) {

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'
-					})
-				}
-
-			},
 
 		}
 

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

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",
@@ -992,13 +1019,13 @@
 					"style": {
 						"navigationBarTitleText": "订单列表"
 					}
-				},{
+				}, {
 					"path": "financial_management/index",
 					"style": {
 						"navigationBarTitleText": "财务管理"
 					}
 				},
-				
+
 				{
 					"path": "orderRefund/index",
 					"style": {
@@ -1559,13 +1586,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",
@@ -1593,8 +1620,7 @@
 				"selectedIconPath": "static/tabbar_icon/e-a.png",
 				"text": "我的"
 			}
-		]
+		],
-		,
 		"midButton": {
 			"width": "68px",
 			"height": "70px",

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 = '';

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: [{
+				options1: [],
-					text: "Shenzhen1",
-					value: 1
-				}, {
 
-					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: {
-
+			list() {
-			// 日历确定
+				supplychain({
-			confirm(e) {
+					page: 1
-
+				}).then((res => {
-				let self = this
+					
-				if (e.range.after && e.range.before) {
+					for (let i in res.data.list) {
-					let star = new Date(e.range.after).getTime()
+						this.options1.push({
-					let stop = new Date(e.range.before).getTime()
+							text: res.data.list[i].mer_name,
-					let arr = stop - star
+							value: res.data.list[i].mer_id
-					this.date = Math.floor(arr / (24 * 3600 * 1000));
+						})
-					// console.log(days)
-					if (this.date < 0) {
-						this.date = this.date * -1
 					}
-				}
+					
+					// 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({
+				let that = this,
-					title: res.message,
+					value = that.formData;
-					icon: 'success'
+
+				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
+					});
 				})
+
 			}
 		}
 	}

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; //当前选的标签名
-
+				this.where.page = 1
-				if (this.tabTitle = "tabOne") {
+				this.where.status = e.type
-					this.where.page = 1
+				this.commislist()
-					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()
-				}
 			},
 			//新增委托
 			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()
+				})
 			}
 		}
 	}

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;
+			if (this.productList.length > 0) {
-			this.status = 'loading';
+				this.getGoods(false);
-			this.where.page = ++this.where.page;
+			} else {
-			this.getGoods()
+				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) {
+			getGoods: function(isPage) {
-
+                let that = this;
-				graphicLstApi(this.where).then(res => {
+				if (that.loadend) return;
-					this.cateGoods.push(...res.data.list)
+				if (that.loading) return;
-
+				
-					if (res.data.list.length < this.where.limit) this.status = 'nomore'
+				if (isPage === true) that.$set(that, 'productList', []);
-
+				that.loading = true;
-					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+				that.loadTitle = '';
-
+				graphicLstApi(that.where).then(res => {
-					// if (item) {
+					let list = res.data.list;
-
+					let productList = that.$util.SplitArray(list, that.productList);
-					// 	if (item.index == 1 && this.cateGoods[0]) {
+					let loadend = list.length < that.where.limit;
-					// 		uni.navigateTo({
+					that.loadend = loadend;
-					// 			// #ifdef MP || H5
+					that.loading = false;
-					// 			url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					// 			// #endif
+					that.$set(that, 'productList', productList);
-					// 			// #ifdef APP
+					// console.log(that.productList)
-					// 			url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
+					that.$set(that.where, 'page', that.where.page + 1);
-					// 			// #endif
+						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.loadend = false;
-				this.where.page = 1
+			    this.$set(this.where, 'page', 1)
-				this.getGoods(item)
+				this.getGoods(true)
 				this.street_id = item.id
 				this.tabsData.tabsActive = item.index
 

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) {